diff --git a/.decidim-version b/.decidim-version
index 12a91df0e0b30..3edc695dcea5c 100644
--- a/.decidim-version
+++ b/.decidim-version
@@ -1 +1 @@
-0.26.4
+0.27.2
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000000..811628826f16e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+
+open_collective: decidim
diff --git a/.github/actions/module-rspec/action.yml b/.github/actions/module-rspec/action.yml
index 2ad1e16db6896..bdc49b056afbb 100644
--- a/.github/actions/module-rspec/action.yml
+++ b/.github/actions/module-rspec/action.yml
@@ -7,14 +7,18 @@ inputs:
   github_token:
     description: 'Github token'
     required: true
-  ruby-version:
+  ruby_version:
     description: 'Ruby Version'
-    default: "2.7.5"
+    default: "3.0.2"
     required: false
-  node-version:
+  node_version:
     description: 'Node version'
     default: '16.9.1'
     required: false
+  processor_count:
+    description: "Number or parallel jobs to run"
+    default: "4"
+    required: false
 
 runs:
   using: "composite"
@@ -25,11 +29,11 @@ runs:
         GITHUB_TOKEN: " ${{ inputs.github_token }}"
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ inputs.ruby-version }}
+        ruby-version: ${{ inputs.ruby_version }}
         bundler-cache: true
     - uses: actions/setup-node@v1
       with:
-        node-version: ${{ inputs.node-version }}
+        node-version: ${{ inputs.node_version }}
     - name: Get npm cache directory path
       id: npm-cache-dir-path
       run: echo "::set-output name=dir::$(npm get cache)-${{ inputs.name }}"
@@ -56,3 +60,9 @@ runs:
       name: Scanning Security issues on module
       working-directory: ${{ inputs.name }}
       shell: "bash"
+    - run: bundle exec rake parallel:create parallel:migrate
+      name: Parallel tests
+      shell: "bash"
+      working-directory: ./spec/decidim_dummy_app/
+      env:
+        PARALLEL_TEST_PROCESSORS: " ${{ inputs.processor_count }}"
diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 0000000000000..cf7b595d5a5b9
--- /dev/null
+++ b/.github/config.yml
@@ -0,0 +1,14 @@
+# Configuration for request-info - https://github.com/behaviorbot/request-info
+#
+requestInfoReplyComment: >
+  It seems like you didn't give us much information about what you're trying to do here.
+  We would appreciate it if you could provide us with more info about this issue/PR!
+
+checkIssueTemplate: true
+
+checkPullRequestTemplate: true
+
+requestInfoOn:
+  pullRequest: true
+  issue: true
+
diff --git a/.github/stale.yml b/.github/stale.yml
index d93c65225aa99..add96c6074f9d 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 60
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: false
 # Ignore issues in a project
 exemptProjects: true
 # Ignore issues in a milestone
@@ -14,8 +14,12 @@ exemptLabels:
   - "type: bug"
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions. @carolromero & @andreslucena feel free to chime in.
+  Thank you for your contribution. This issue has been automatically marked
+  as stale because it has not had recent activity.
+
+  Is this still relevant? If so, what is blocking it? Is there anything you
+  can do to help move it forward?
+
+  @carolromero & @andreslucena feel free to chime in.
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 9b735bb9a522e..7570018e38779 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -20,7 +20,7 @@ Individual workflows with changes:
   working-directory: ${{ env.DECIDIM_MODULE }}
 ```
 
-- `ci_comments.yml`: Runs tests for the JS files. Tests must run from the project root folder. You'll need to install NodeJS and the JS dependencies:
+- `ci_javascript.yml`: Runs tests for the JS files. Tests must run from the project root folder. You'll need to install NodeJS and the JS dependencies:
 
 ```yml
 - uses: actions/setup-node@master
@@ -32,8 +32,15 @@ Individual workflows with changes:
   name: Test JS files
 ```
 
-- Proposals specs are split in three workflows:
+- Some specs are split in three workflows, so if we need to retry this particular workflow we don't need to retry all the module suite. For instance proposals:
 
   - `ci_proposals_system_admin.yml`: Runs the system specs for the admin section
   - `ci_proposals_system_public.yml`: Runs the system specs for the public section
   - `ci_proposals_unit_tests.yml`: Runs the unit tests
+
+- `ci_performance_metrics_monitoring.yml`: Runs Lighthouse metrics expectations against the app to detect any performance regression. The expectations can be found in `lighthouse_budget.json`, where a time is defined for each metric:
+
+  - [First Contentful Paint](https://web.dev/first-contentful-paint/): 2 seconds
+  - [Speed Index](https://web.dev/speed-index/): 4 seconds
+  - [Time to Interactive](https://web.dev/interactive/): 5 seconds
+  - [Largest Contentful Paint](https://web.dev/lcp/): 2.5 seconds
diff --git a/.github/workflows/ci_accountability.yml b/.github/workflows/ci_accountability.yml
index 5b9916af2b891..ce4c56daedd8e 100644
--- a/.github/workflows/ci_accountability.yml
+++ b/.github/workflows/ci_accountability.yml
@@ -23,9 +23,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-accountability
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -61,7 +62,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_admin.yml b/.github/workflows/ci_admin.yml
index 2851d6f87c63c..c9b344e1fe998 100644
--- a/.github/workflows/ci_admin.yml
+++ b/.github/workflows/ci_admin.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-admin
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -52,7 +53,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!system)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_admin_system_1.yml b/.github/workflows/ci_admin_system.yml
similarity index 85%
rename from .github/workflows/ci_admin_system_1.yml
rename to .github/workflows/ci_admin_system.yml
index 260b6342b38b3..5c5a1cd14b10d 100644
--- a/.github/workflows/ci_admin_system_1.yml
+++ b/.github/workflows/ci_admin_system.yml
@@ -1,4 +1,4 @@
-name: "[CI] Admin (system tests 1)"
+name: "[CI] Admin (system tests)"
 on:
   push:
     branches:
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-admin
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -56,11 +57,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "1,$(echo $half)p" | xargs)
-          bundle exec rspec $list_of_files
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/system]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_api.yml b/.github/workflows/ci_api.yml
index b74bc376cba6d..5ce7bf4506d06 100644
--- a/.github/workflows/ci_api.yml
+++ b/.github/workflows/ci_api.yml
@@ -19,9 +19,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-api
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -53,7 +54,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_assemblies.yml b/.github/workflows/ci_assemblies.yml
index 2b1cfdebcf777..4c7c8a0defbba 100644
--- a/.github/workflows/ci_assemblies.yml
+++ b/.github/workflows/ci_assemblies.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-assemblies
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -56,7 +57,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_blogs.yml b/.github/workflows/ci_blogs.yml
index 325afedc45462..3930887bded1e 100644
--- a/.github/workflows/ci_blogs.yml
+++ b/.github/workflows/ci_blogs.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-blogs
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -59,7 +60,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_budgets.yml b/.github/workflows/ci_budgets.yml
index d42cb042f9bf9..ec5ac83370458 100644
--- a/.github/workflows/ci_budgets.yml
+++ b/.github/workflows/ci_budgets.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-budgets
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -58,7 +59,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_comments.yml b/.github/workflows/ci_comments.yml
index cae48432a1f4c..9a50851a1a397 100644
--- a/.github/workflows/ci_comments.yml
+++ b/.github/workflows/ci_comments.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-comments
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -56,7 +57,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_conferences.yml b/.github/workflows/ci_conferences.yml
index d424f7220c616..4fc4e87865af8 100644
--- a/.github/workflows/ci_conferences.yml
+++ b/.github/workflows/ci_conferences.yml
@@ -19,9 +19,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-conferences
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -57,7 +58,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_consultations.yml b/.github/workflows/ci_consultations.yml
index 4824fc15a8f5b..001d35e9bd129 100644
--- a/.github/workflows/ci_consultations.yml
+++ b/.github/workflows/ci_consultations.yml
@@ -19,9 +19,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-consultations
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -57,7 +58,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_core_lib.yml b/.github/workflows/ci_core_lib.yml
index f2b5e5766eab0..869e961e4676c 100644
--- a/.github/workflows/ci_core_lib.yml
+++ b/.github/workflows/ci_core_lib.yml
@@ -14,12 +14,14 @@ on:
       - "decidim-api/**"
       - "decidim-core/**"
       - "decidim-dev/**"
+      - "packages/**"
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-core
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -51,7 +53,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/lib
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/lib]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_core_system.yml b/.github/workflows/ci_core_system.yml
index 7f8a56f6bb8d0..28d20e6d3fedf 100644
--- a/.github/workflows/ci_core_system.yml
+++ b/.github/workflows/ci_core_system.yml
@@ -17,9 +17,11 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-core
+  PARALLEL_TEST_PROCESSORS: 2
+  DECIDIM_SERVICE_WORKER_ENABLED: true
 
 jobs:
   main:
@@ -55,11 +57,17 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/system
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: |
+          sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 & # optional
+          bundle exec rake parallel:spec[^spec/system]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
           SIMPLECOV: "true"
+          DISPLAY: ":99"
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH
         name: Upload coverage
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/ci_admin_system_2.yml b/.github/workflows/ci_core_system_ssl.yml
similarity index 68%
rename from .github/workflows/ci_admin_system_2.yml
rename to .github/workflows/ci_core_system_ssl.yml
index 4fea30c920bee..e466f1c2ef91b 100644
--- a/.github/workflows/ci_admin_system_2.yml
+++ b/.github/workflows/ci_core_system_ssl.yml
@@ -1,4 +1,4 @@
-name: "[CI] Admin (system tests 2)"
+name: "[CI] Core (system specs SSL)"
 on:
   push:
     branches:
@@ -11,16 +11,17 @@ on:
     paths:
       - "*"
       - ".github/**"
-      - "decidim-admin/**"
       - "decidim-core/**"
       - "decidim-dev/**"
-      - "decidim-participatory_processes/**"
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
-  DECIDIM_MODULE: decidim-admin
+  DECIDIM_MODULE: decidim-core
+  PARALLEL_TEST_PROCESSORS: 2
+  DECIDIM_SERVICE_WORKER_ENABLED: true
+  TEST_SSL: true
 
 jobs:
   main:
@@ -39,11 +40,15 @@ jobs:
           --health-retries 5
         env:
           POSTGRES_PASSWORD: postgres
+      validator:
+        image: ghcr.io/validator/validator:latest
+        ports: ["8888:8888"]
     env:
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: postgres
       DATABASE_HOST: localhost
       RUBYOPT: '-W:no-deprecated'
+      VALIDATOR_HTML_URI: http://localhost:8888/
     steps:
       - uses: actions/checkout@v2.0.0
         with:
@@ -52,15 +57,17 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
       - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "$(expr $half + 1), $(echo $count)p" | xargs)
-          bundle exec rspec $list_of_files
+          sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 & # optional
+          bundle exec rake parallel:spec[spec/system/data_consent/organization_spec.rb]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
           SIMPLECOV: "true"
+          DISPLAY: ":99"
       - run: ./.github/upload_coverage.sh $DECIDIM_MODULE $GITHUB_EVENT_PATH
         name: Upload coverage
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/ci_core_unit.yml b/.github/workflows/ci_core_unit.yml
index 6364021bb915d..d194825824ecf 100644
--- a/.github/workflows/ci_core_unit.yml
+++ b/.github/workflows/ci_core_unit.yml
@@ -17,9 +17,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-core
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -51,7 +52,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/{system,lib}/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!(system|lib))']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_debates.yml b/.github/workflows/ci_debates.yml
index 2e68aa6acae7b..3809e47a53f95 100644
--- a/.github/workflows/ci_debates.yml
+++ b/.github/workflows/ci_debates.yml
@@ -19,9 +19,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-debates
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -57,7 +58,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_dev_system.yml b/.github/workflows/ci_dev_system.yml
index 9b63b096d3bc0..7b3071bf22c6a 100644
--- a/.github/workflows/ci_dev_system.yml
+++ b/.github/workflows/ci_dev_system.yml
@@ -16,9 +16,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-dev
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -50,6 +51,9 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
       - run: bundle exec rspec spec/system
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
diff --git a/.github/workflows/ci_elections_system_admin_1.yml b/.github/workflows/ci_elections_system_admin.yml
similarity index 89%
rename from .github/workflows/ci_elections_system_admin_1.yml
rename to .github/workflows/ci_elections_system_admin.yml
index db42892332694..8b52f892a4769 100644
--- a/.github/workflows/ci_elections_system_admin_1.yml
+++ b/.github/workflows/ci_elections_system_admin.yml
@@ -1,4 +1,4 @@
-name: "[CI] Elections (system admin 1)"
+name: "[CI] Elections (system admin)"
 on:
   push:
     branches:
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-elections
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -46,7 +47,7 @@ jobs:
         image: ghcr.io/validator/validator:latest
         ports: ["8888:8888"]
       bulletin_board:
-        image: codegram/decidim-bulletin-board:0.22.3
+        image: decidim/decidim-bulletin-board:0.23.0
         ports: ["8000:8000"]
         env:
           DATABASE_URL: postgresql://postgres:postgres@postgres/bb
@@ -71,11 +72,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/admin/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/admin/*_spec.rb | sed -n "1,$(echo $half)p" | xargs)
-          bundle exec rspec $list_of_files
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/system/admin]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_elections_system_admin_2.yml b/.github/workflows/ci_elections_system_admin_2.yml
deleted file mode 100644
index 9e00e1479709f..0000000000000
--- a/.github/workflows/ci_elections_system_admin_2.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: "[CI] Elections (system admin 2)"
-on:
-  push:
-    branches:
-      - develop
-      - release/*
-      - "*-stable"
-  pull_request:
-    branches-ignore:
-      - "chore/l10n*"
-    paths:
-      - "*"
-      - ".github/**"
-      - "decidim-admin/**"
-      - "decidim-bulletin_board/**"
-      - "decidim-core/**"
-      - "decidim-dev/**"
-      - "decidim-elections/**"
-      - "decidim-forms/**"
-      - "decidim-proposals/**"
-
-env:
-  CI: "true"
-  RUBY_VERSION: 2.7.5
-  NODE_VERSION: 16.9.1
-  DECIDIM_MODULE: decidim-elections
-
-jobs:
-  main:
-    name: Tests
-    runs-on: ubuntu-latest
-    if: "!startsWith(github.head_ref, 'chore/l10n')"
-    timeout-minutes: 60
-    services:
-      postgres:
-        image: postgres:11
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_PASSWORD: postgres
-      bulletin_board:
-        image: codegram/decidim-bulletin-board:0.22.3
-        ports: ["8000:8000"]
-        env:
-          DATABASE_URL: postgresql://postgres:postgres@postgres/bb
-          RAILS_ENV: test
-          SEED: 1
-          IDENTIFICATION_PRIVATE_KEY: '{"kty":"RSA","n":"zMXsZpYPKkDlSmezX898y7zNOaJ7ENIN4kj4UhQ95Vm4HlgTpIs2VMMsO0eqynMaOR_G1mXdqbpbaJtXijBe4V8323QwGm6WVAa71E7pDXa5g6-uo5f8GePitN0YER9y2yNQN4uTaNzJiWV2uLBUYfMdj3SIif31YwLULHAOj3B_oleFK8coE_Qr3NzATcYBmsqE8AR4NljxTO6KDmP1SLdf5GBOBhOAIFbnL_Kpj2xkm7MS3hjMVKpiRhqA1UgX5oKZ8ixBv46fNJF0pBsHi3fHNjK9oZzgdx_AI-YFpdE_40-8bh_g9sWzxacqOM2-MdQLHbvRPEVltO3E8tr6I5YWrylcP7l9VD8OJeqjq2qFYHnGYdmLoD2XuXmI9EuBvSb9H4-qcartxZSIQCimKib_fxZvgrG1FSRRhK6YpvIdGv4-G2zfCCRsC4XD80TYI2bf-oYCoy7eU3_eVHFMV2yg4p1Wnuw2Vgq0edPL_bKaV9JvGx7F-U5juxNN0WZR9LzbPl4ReejzN95lyHgbj0nTH_u3bSpZmgJrQF-PwdnPcG46deVjJgUeosrlC4lQxVrRz0GL58BuFunnz2uYDBDrcJCiG60EbdkAFHjOcXU4wrUWATin7je_aqdBXhSnkTafcJAMvL7Y2Ld7vDge8nLqjAVlAi5am3rN0kqKT6M","e":"AQAB","kid":"a8e86f02ca27e1861bfc49e2a9a4614ca9068f8efdb6d42d19d3aab0eb2a31be"}'
-          DISABLE_DATABASE_ENVIRONMENT_CHECK: 1
-          RAILS_SERVE_STATIC_FILES: enabled
-          DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
-    env:
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: postgres
-      DATABASE_HOST: localhost
-      RUBYOPT: "-W:no-deprecated"
-      ELECTIONS_BULLETIN_BOARD_SERVER: http://localhost:8000/api
-    steps:
-      - uses: actions/checkout@v2.0.0
-        with:
-          fetch-depth: 1
-      - uses: ./.github/actions/module-rspec
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/admin/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/admin/*_spec.rb | sed -n "$(expr $half + 1), $(echo $count)p" | xargs)
-          bundle exec rspec $list_of_files
-        name: RSpec
-        working-directory: ${{ env.DECIDIM_MODULE }}
-        env:
-          SIMPLECOV: "true"
-      - run: ./.github/upload_coverage.sh decidim-elections-system-admin $GITHUB_EVENT_PATH
-        name: Upload coverage
-      - uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: screenshots
-          path: ./spec/decidim_dummy_app/tmp/screenshots
-          if-no-files-found: ignore
diff --git a/.github/workflows/ci_elections_system_public.yml b/.github/workflows/ci_elections_system_public.yml
index b3ee2724f3c2f..428ff0300d953 100644
--- a/.github/workflows/ci_elections_system_public.yml
+++ b/.github/workflows/ci_elections_system_public.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-elections
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -46,7 +47,7 @@ jobs:
         image: ghcr.io/validator/validator:latest
         ports: ["8888:8888"]
       bulletin_board:
-        image: codegram/decidim-bulletin-board:0.22.3
+        image: decidim/decidim-bulletin-board:0.23.0
         ports: ["8000:8000"]
         env:
           DATABASE_URL: postgresql://postgres:postgres@postgres/bb
@@ -71,6 +72,9 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
       - run: bundle exec rspec spec/system/ --exclude-pattern 'spec/system/admin/**/*_spec.rb'
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
diff --git a/.github/workflows/ci_elections_unit_tests.yml b/.github/workflows/ci_elections_unit_tests.yml
index fc10cc94236d9..aefa45bb7d55e 100644
--- a/.github/workflows/ci_elections_unit_tests.yml
+++ b/.github/workflows/ci_elections_unit_tests.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-elections
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -43,7 +44,7 @@ jobs:
         env:
           POSTGRES_PASSWORD: postgres
       bulletin_board:
-        image: codegram/decidim-bulletin-board:0.22.3
+        image: decidim/decidim-bulletin-board:0.23.0
         ports: ["8000:8000"]
         env:
           DATABASE_URL: postgresql://postgres:postgres@postgres/bb
@@ -67,7 +68,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!system)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_forms.yml b/.github/workflows/ci_forms.yml
index 607012f7d2e02..7cbd8187ea0a4 100644
--- a/.github/workflows/ci_forms.yml
+++ b/.github/workflows/ci_forms.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-forms
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -52,7 +53,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_generators.yml b/.github/workflows/ci_generators.yml
index ce4a8c3ba456b..7a95dd99803e8 100644
--- a/.github/workflows/ci_generators.yml
+++ b/.github/workflows/ci_generators.yml
@@ -16,9 +16,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-generators
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -73,7 +74,7 @@ jobs:
       - run: bundle exec brakeman --rails6 --force-scan .
         name: Scanning Security issues on module
         working-directory: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_initiatives.yml b/.github/workflows/ci_initiatives.yml
index 2280c67b736ab..0a33a016e7af2 100644
--- a/.github/workflows/ci_initiatives.yml
+++ b/.github/workflows/ci_initiatives.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-initiatives
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -54,7 +55,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!system)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_initiatives_system_admin.yml b/.github/workflows/ci_initiatives_system_admin.yml
index 53c81faafdbcb..abe78ea7534e3 100644
--- a/.github/workflows/ci_initiatives_system_admin.yml
+++ b/.github/workflows/ci_initiatives_system_admin.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-initiatives
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -58,7 +59,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/system/admin
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/system/admin]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_initiatives_system_public.yml b/.github/workflows/ci_initiatives_system_public.yml
index e0a6648b2259a..85a253035ee00 100644
--- a/.github/workflows/ci_initiatives_system_public.yml
+++ b/.github/workflows/ci_initiatives_system_public.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-initiatives
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -58,7 +59,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/system/ --exclude-pattern 'spec/system/admin/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/system\/(?!admin)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_javascript.yml b/.github/workflows/ci_javascript.yml
new file mode 100644
index 0000000000000..ae91bcfe1561b
--- /dev/null
+++ b/.github/workflows/ci_javascript.yml
@@ -0,0 +1,54 @@
+name: "[CI] Javascript"
+on:
+  push:
+    branches:
+      - develop
+      - release/*
+      - "*-stable"
+  pull_request:
+    branches-ignore:
+      - "chore/l10n*"
+    paths:
+      - "*"
+      - ".github/**"
+      - "decidim-admin/**"
+      - "decidim-comments/**"
+      - "decidim-core/**"
+      - "decidim-dev/**"
+
+env:
+  CI: "true"
+  NODE_VERSION: 16.9.1
+
+jobs:
+  main:
+    name: Tests
+    runs-on: ubuntu-20.04
+    if: "!startsWith(github.head_ref, 'chore/l10n')"
+    timeout-minutes: 60
+    steps:
+      - uses: rokroskar/workflow-run-cleanup-action@v0.3.3
+        if: "github.ref != 'refs/heads/develop'"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/checkout@v2.0.0
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Get npm cache directory path
+        id: npm-cache-dir-path
+        run: echo "::set-output name=dir::$(npm get cache)-javascript"
+      - uses: actions/cache@v2
+        id: npm-cache
+        with:
+          path: ${{ steps.npm-cache-dir-path.outputs.dir }}
+          key: npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            npm-
+      - name: Install JS dependencies
+        run: npm ci
+      - run: npm run test
+        name: Test JS files
+
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
index 36ef1772f1fe8..89ea508233caa 100644
--- a/.github/workflows/ci_main.yml
+++ b/.github/workflows/ci_main.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
 
 jobs:
diff --git a/.github/workflows/ci_meetings_system_admin.yml b/.github/workflows/ci_meetings_system_admin.yml
index 11ba9ff9f01c9..fa7ddb061574c 100644
--- a/.github/workflows/ci_meetings_system_admin.yml
+++ b/.github/workflows/ci_meetings_system_admin.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-meetings
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -59,7 +60,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/system/admin
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/system/admin]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_meetings_system_public_1.yml b/.github/workflows/ci_meetings_system_public.yml
similarity index 85%
rename from .github/workflows/ci_meetings_system_public_1.yml
rename to .github/workflows/ci_meetings_system_public.yml
index ba7aaf643db14..b9467b576bca5 100644
--- a/.github/workflows/ci_meetings_system_public_1.yml
+++ b/.github/workflows/ci_meetings_system_public.yml
@@ -1,4 +1,4 @@
-name: "[CI] Meetings (system public 1)"
+name: "[CI] Meetings (system public)"
 on:
   push:
     branches:
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-meetings
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -59,11 +60,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "1,$(echo $half)p" | xargs)
-          bundle exec rspec $list_of_files
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/system\/(?!admin)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_meetings_system_public_2.yml b/.github/workflows/ci_meetings_system_public_2.yml
deleted file mode 100644
index 3e7e08bfa6007..0000000000000
--- a/.github/workflows/ci_meetings_system_public_2.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: "[CI] Meetings (system public 2)"
-on:
-  push:
-    branches:
-      - develop
-      - release/*
-      - "*-stable"
-  pull_request:
-    branches-ignore:
-      - "chore/l10n*"
-    paths:
-      - "*"
-      - ".github/**"
-      - "decidim-admin/**"
-      - "decidim-assemblies/**"
-      - "decidim-core/**"
-      - "decidim-dev/**"
-      - "decidim-forms/**"
-      - "decidim-meetings/**"
-      - "decidim-participatory_processes/**"
-
-env:
-  CI: "true"
-  RUBY_VERSION: 2.7.5
-  NODE_VERSION: 16.9.1
-  DECIDIM_MODULE: decidim-meetings
-
-jobs:
-  main:
-    name: Tests
-    runs-on: ubuntu-latest
-    if: "!startsWith(github.head_ref, 'chore/l10n')"
-    timeout-minutes: 60
-    services:
-      postgres:
-        image: postgres:11
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_PASSWORD: postgres
-    env:
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: postgres
-      DATABASE_HOST: localhost
-      RUBYOPT: '-W:no-deprecated'
-    steps:
-      - uses: actions/checkout@v2.0.0
-        with:
-          fetch-depth: 1
-      - uses: ./.github/actions/module-rspec
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "$(expr $half + 1), $(echo $count)p" | xargs)
-          bundle exec rspec $list_of_files
-        name: RSpec
-        working-directory: ${{ env.DECIDIM_MODULE }}
-        env:
-          SIMPLECOV: "true"
-      - run: ./.github/upload_coverage.sh decidim-meetings-system-public $GITHUB_EVENT_PATH
-        name: Upload coverage
-      - uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: screenshots
-          path: ./spec/decidim_dummy_app/tmp/screenshots
-          if-no-files-found: ignore
diff --git a/.github/workflows/ci_meetings_unit_tests.yml b/.github/workflows/ci_meetings_unit_tests.yml
index 65223a0fb1712..4d28ca30f931e 100644
--- a/.github/workflows/ci_meetings_unit_tests.yml
+++ b/.github/workflows/ci_meetings_unit_tests.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-meetings
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -55,7 +56,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!system)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_pages.yml b/.github/workflows/ci_pages.yml
index dfe045b831392..9ebd6919d9ee8 100644
--- a/.github/workflows/ci_pages.yml
+++ b/.github/workflows/ci_pages.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-pages
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -56,7 +57,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_participatory_processes.yml b/.github/workflows/ci_participatory_processes.yml
index c7fb39309078c..8ef0118a59292 100644
--- a/.github/workflows/ci_participatory_processes.yml
+++ b/.github/workflows/ci_participatory_processes.yml
@@ -19,9 +19,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-participatory_processes
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -57,7 +58,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_performance_metrics_monitoring.yml b/.github/workflows/ci_performance_metrics_monitoring.yml
new file mode 100644
index 0000000000000..98903e6363f80
--- /dev/null
+++ b/.github/workflows/ci_performance_metrics_monitoring.yml
@@ -0,0 +1,92 @@
+name: "[CI] Performance Metrics monitoring"
+on:
+  push:
+    branches:
+      - develop
+      - release/*
+      - "*-stable"
+  pull_request:
+    branches-ignore:
+      - "chore/l10n*"
+    paths:
+      - "*"
+      - ".github/**"
+      - "decidim-api/**"
+      - "decidim-core/**"
+      - "decidim-dev/**"
+
+env:
+  CI: "true"
+  SIMPLECOV: "true"
+  RUBY_VERSION: 3.0.2
+  NODE_VERSION: 16.9.1
+  RAILS_ENV: development
+
+jobs:
+  main:
+    name: Tests
+    runs-on: ubuntu-20.04
+    if: "!startsWith(github.head_ref, 'chore/l10n')"
+    timeout-minutes: 60
+    services:
+      postgres:
+        image: postgres:11
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          POSTGRES_PASSWORD: postgres
+    env:
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: postgres
+      DATABASE_HOST: localhost
+      RUBYOPT: '-W:no-deprecated'
+    steps:
+      - uses: rokroskar/workflow-run-cleanup-action@v0.3.3
+        if: "github.ref != 'refs/heads/develop'"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/checkout@v2.0.0
+        with:
+          fetch-depth: 1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ env.RUBY_VERSION }}
+          bundler-cache: true
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Get npm cache directory path
+        id: npm-cache-dir-path
+        run: echo "::set-output name=dir::$(npm get cache)-${{ env.DECIDIM_MODULE }}"
+      - uses: actions/cache@v2
+        id: npm-cache
+        with:
+          path: ${{ steps.npm-cache-dir-path.outputs.dir }}
+          key: npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            npm-
+      - run: bundle exec rake development_app
+        name: Create development app
+      - run: bundle exec rails assets:precompile
+        name: Precompile assets
+        working-directory: ./development_app/
+      - run: bundle exec rails decidim:lighthouse:prepare_urls
+        name: Setup lighthouse urls
+        working-directory: ./development_app/
+      - run: bundle exec rails dev:cache
+        name: Activate Rails cache
+        working-directory: ./development_app/
+      - run: bundle exec rails server -b localhost -d
+        name: Run Rails server
+        working-directory: ./development_app/
+      - name: Audit URLs using Lighthouse
+        uses: treosh/lighthouse-ci-action@v8
+        with:
+          runs: 3 # run more than once to warm up the application
+          uploadArtifacts: true
+          budgetPath: ./.github/workflows/lighthouse_budget.json # test performance budgets
+          temporaryPublicStorage: true
diff --git a/.github/workflows/ci_proposals_system_admin.yml b/.github/workflows/ci_proposals_system_admin.yml
index 50717bb43a7a6..064b6a3353598 100644
--- a/.github/workflows/ci_proposals_system_admin.yml
+++ b/.github/workflows/ci_proposals_system_admin.yml
@@ -23,9 +23,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-proposals
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -61,7 +62,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec spec/system/admin
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec[^spec/system/admin]
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_proposals_system_public_1.yml b/.github/workflows/ci_proposals_system_public.yml
similarity index 85%
rename from .github/workflows/ci_proposals_system_public_1.yml
rename to .github/workflows/ci_proposals_system_public.yml
index d551f91fe0186..791cc31a09355 100644
--- a/.github/workflows/ci_proposals_system_public_1.yml
+++ b/.github/workflows/ci_proposals_system_public.yml
@@ -1,4 +1,4 @@
-name: "[CI] Proposals (system public 1)"
+name: "[CI] Proposals (system public)"
 on:
   push:
     branches:
@@ -23,9 +23,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-proposals
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -61,11 +62,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "1,$(echo $half)p" | xargs)
-          bundle exec rspec $list_of_files
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/system\/(?!admin)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_proposals_system_public_2.yml b/.github/workflows/ci_proposals_system_public_2.yml
deleted file mode 100644
index 616d06902c8b0..0000000000000
--- a/.github/workflows/ci_proposals_system_public_2.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: "[CI] Proposals (system public2)"
-on:
-  push:
-    branches:
-      - develop
-      - release/*
-      - "*-stable"
-  pull_request:
-    branches-ignore:
-      - "chore/l10n*"
-    paths:
-      - "*"
-      - ".github/**"
-      - "decidim-admin/**"
-      - "decidim-assemblies/**"
-      - "decidim-budgets/**"
-      - "decidim-comments/**"
-      - "decidim-core/**"
-      - "decidim-dev/**"
-      - "decidim-meetings/**"
-      - "decidim-participatory_processes/**"
-      - "decidim-proposals/**"
-
-env:
-  CI: "true"
-  RUBY_VERSION: 2.7.5
-  NODE_VERSION: 16.9.1
-  DECIDIM_MODULE: decidim-proposals
-
-jobs:
-  main:
-    name: Tests
-    runs-on: ubuntu-latest
-    if: "!startsWith(github.head_ref, 'chore/l10n')"
-    timeout-minutes: 60
-    services:
-      postgres:
-        image: postgres:11
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_PASSWORD: postgres
-    env:
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: postgres
-      DATABASE_HOST: localhost
-      RUBYOPT: '-W:no-deprecated'
-    steps:
-      - uses: actions/checkout@v2.0.0
-        with:
-          fetch-depth: 1
-      - uses: ./.github/actions/module-rspec
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ env.DECIDIM_MODULE }}
-      - run: |
-          count=$(ls spec/system/*_spec.rb | wc -l | tr -d ' ')
-          half=$(expr $count / 2)
-          list_of_files=$(ls spec/system/*_spec.rb | sed -n "$(expr $half + 1), $(echo $count)p" | xargs)
-          bundle exec rspec $list_of_files
-        name: RSpec
-        working-directory: ${{ env.DECIDIM_MODULE }}
-        env:
-          SIMPLECOV: "true"
-      - run: ./.github/upload_coverage.sh decidim-proposals-system-public $GITHUB_EVENT_PATH
-        name: Upload coverage
-      - uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: screenshots
-          path: ./spec/decidim_dummy_app/tmp/screenshots
-          if-no-files-found: ignore
diff --git a/.github/workflows/ci_proposals_unit_tests.yml b/.github/workflows/ci_proposals_unit_tests.yml
index 31cc0d03148cb..486cd74810bce 100644
--- a/.github/workflows/ci_proposals_unit_tests.yml
+++ b/.github/workflows/ci_proposals_unit_tests.yml
@@ -23,9 +23,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-proposals
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -57,7 +58,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec --exclude-pattern 'spec/system/**/*_spec.rb'
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec['spec\/(?!system)']
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_sortitions.yml b/.github/workflows/ci_sortitions.yml
index d3723609188fb..3442e204f1e02 100644
--- a/.github/workflows/ci_sortitions.yml
+++ b/.github/workflows/ci_sortitions.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-sortitions
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -58,7 +59,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_surveys.yml b/.github/workflows/ci_surveys.yml
index 17f34a2303087..21114ded733bc 100644
--- a/.github/workflows/ci_surveys.yml
+++ b/.github/workflows/ci_surveys.yml
@@ -21,9 +21,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-surveys
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -59,7 +60,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_system.yml b/.github/workflows/ci_system.yml
index e4b464a31a492..947eecbd38ec7 100644
--- a/.github/workflows/ci_system.yml
+++ b/.github/workflows/ci_system.yml
@@ -17,9 +17,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-system
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -55,7 +56,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_templates.yml b/.github/workflows/ci_templates.yml
index c8dd390a95df8..2f8b43b17185a 100644
--- a/.github/workflows/ci_templates.yml
+++ b/.github/workflows/ci_templates.yml
@@ -20,9 +20,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-templates
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -58,7 +59,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/ci_verifications.yml b/.github/workflows/ci_verifications.yml
index a62bc1b42b7df..b0baf13a49cbb 100644
--- a/.github/workflows/ci_verifications.yml
+++ b/.github/workflows/ci_verifications.yml
@@ -18,9 +18,10 @@ on:
 
 env:
   CI: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
   DECIDIM_MODULE: decidim-verifications
+  PARALLEL_TEST_PROCESSORS: 2
 
 jobs:
   main:
@@ -56,7 +57,10 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ env.DECIDIM_MODULE }}
-      - run: bundle exec rspec
+          processor_count: ${{ env.PARALLEL_TEST_PROCESSORS }}
+          ruby_version: ${{ env.RUBY_VERSION }}
+          node_version: ${{ env.NODE_VERSION }}
+      - run: bundle exec rake parallel:spec
         name: RSpec
         working-directory: ${{ env.DECIDIM_MODULE }}
         env:
diff --git a/.github/workflows/lighthouse_budget.json b/.github/workflows/lighthouse_budget.json
new file mode 100644
index 0000000000000..1c67544218853
--- /dev/null
+++ b/.github/workflows/lighthouse_budget.json
@@ -0,0 +1,23 @@
+[
+  {
+    "path": "/*",
+    "timings": [
+      {
+        "metric": "first-contentful-paint",
+        "budget": 2000
+      },
+      {
+        "metric": "speed-index",
+        "budget": 4000
+      },
+      {
+        "metric": "interactive",
+        "budget": 5000
+      },
+      {
+        "metric": "largest-contentful-paint",
+        "budget": 2500
+      }
+    ]
+  }
+]
diff --git a/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml
index 78f4f048bc1b3..eb830c43e247e 100644
--- a/.github/workflows/lint_code.yml
+++ b/.github/workflows/lint_code.yml
@@ -12,7 +12,7 @@ on:
 env:
   CI: "true"
   SIMPLECOV: "true"
-  RUBY_VERSION: 2.7.5
+  RUBY_VERSION: 3.0.2
   NODE_VERSION: 16.9.1
 
 jobs:
diff --git a/.gitignore b/.gitignore
index 6fead199957f3..f274592e37ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,7 @@ public/decidim-packs
 tmp
 # webpack packs output
 decidim-packs
+# inner package-lock files inside the packages/ folder
+packages/**/package-lock.json
 
 temporary_changelog.md
diff --git a/.lighthouserc.json b/.lighthouserc.json
new file mode 100644
index 0000000000000..bff6072848ded
--- /dev/null
+++ b/.lighthouserc.json
@@ -0,0 +1,15 @@
+{
+  "_comment": "This configuration is used by .github/workflows/ci_metrics_monitoring.yml workflow",
+  "ci": {
+    "collect": {
+      "_comment": "url is empty because is filled dynamically in CI execution",
+      "url": [],
+      "settings": {
+        "chromeFlags": "--disable-gpu --no-sandbox",
+        "throttlingMethod": "devtools",
+        "preset": "desktop"
+      }
+    }
+  }
+}
+
diff --git a/.rubocop-disabled.yml b/.rubocop-disabled.yml
new file mode 100644
index 0000000000000..de7949f88de4a
--- /dev/null
+++ b/.rubocop-disabled.yml
@@ -0,0 +1,11 @@
+Style/OpenStructUse:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+RSpec/VerifiedDoubleReference:
+  Enabled: false
diff --git a/.rubocop.yml b/.rubocop.yml
index 870c0b9fff2d6..0975cd3a003af 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,4 @@
 inherit_from:
   - .rubocop_ruby.yml
   - .rubocop_rails.yml
+  - .rubocop-disabled.yml
diff --git a/.rubocop_ruby.yml b/.rubocop_ruby.yml
index 299a4ada0d7d2..657b02344b045 100644
--- a/.rubocop_ruby.yml
+++ b/.rubocop_ruby.yml
@@ -13,11 +13,13 @@ AllCops:
     - "**/Gemfile"
     - "**/Rakefile"
   Exclude:
+    - "**/node_modules/**/*"
     - "**/vendor/**/*"
     - "development_app/**/*"
     - "decidim_app-design/node_modules/**/*"
     - "spec/decidim_dummy_app/**/*"
     - "node_modules/**/*"
+    - "decidim-initiatives/lib/gem_overrides/origami/date.rb"
   # Default formatter will be used if no -f/--format option is given.
   DefaultFormatter: progress
   # Cop names are not displayed in offense messages by default. Change behavior
@@ -68,12 +70,12 @@ AllCops:
   # If a value is specified for TargetRubyVersion then it is used.
   # Else if .ruby-version exists and it contains an MRI version it is used.
   # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
-  RSpec:
-    Patterns:
-      - "(?:^|/)spec/"
-      - "(?:^|/)test/"
+#  RSpec:
+#    Patterns:
+#      - "(?:^|/)spec/"
+#      - "(?:^|/)test/"
 
 # Indent private/protected/public as deep as method definitions
 Layout/AccessModifierIndentation:
@@ -1269,10 +1271,11 @@ RSpec/NamedSubject:
   Enabled: false
 
 RSpec/RepeatedExampleGroupDescription:
-  Enabled: false
+  Enabled: true
 
 RSpec/RepeatedExampleGroupBody:
-  Enabled: false
+  Enabled: true
+
 RSpec/VerifiedDoubles:
   Enabled: false
 
diff --git a/.ruby-version b/.ruby-version
index a603bb50a29e3..b50214693056f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.5
+3.0.2
diff --git a/.simplecov b/.simplecov
index 76114887f8c90..fbd58ab7f2dd5 100644
--- a/.simplecov
+++ b/.simplecov
@@ -7,7 +7,7 @@ if ENV["SIMPLECOV"]
   SimpleCov.start do
     # `ENGINE_ROOT` holds the name of the engine we're testing.
     # This brings us to the main Decidim folder.
-    root File.expand_path("..", ENV["ENGINE_ROOT"])
+    root File.expand_path("..", ENV.fetch("ENGINE_ROOT", nil))
 
     # We make sure we track all Ruby files, to avoid skipping unrequired files
     # We need to include the `../` section, otherwise it only tracks files from the
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1e730d0c264..c204f5054f504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,5 @@
 # Change Log
-
-## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
-
-Nothing.
-
-## [0.26.4](https://github.com/decidim/decidim/tree/v0.26.4)
+## [0.27.2](https://github.com/decidim/decidim/tree/0.27.2)
 
 ### Added
 
@@ -16,60 +11,61 @@ Nothing.
 
 ### Fixed
 
-- **decidim-core**: Backport 'Prevent the account edit route through Devise' to v0.26 [\#9932](https://github.com/decidim/decidim/pull/9932)
-- **decidim-participatory processes**: Backport 'Fix unpublished processes shown in the group process count' to v0.26 [\#9934](https://github.com/decidim/decidim/pull/9934)
-- **decidim-admin**: Backport 'Fix global moderation types not translated' to v0.26 [\#9937](https://github.com/decidim/decidim/pull/9937)
-- **decidim-admin**: Backport 'Fix updating organization settings in case there were errors' to v0.26 [\#9938](https://github.com/decidim/decidim/pull/9938)
-- **decidim-budgets**, **decidim-core**, **decidim-elections**, **decidim-proposals**: Backport 'Do not import resources multiple times' to v0.26 [\#9942](https://github.com/decidim/decidim/pull/9942)
-- **decidim-forms**, **decidim-surveys**: Backport 'Fix form answer attachments breaking the answer view' to v0.26 [\#9945](https://github.com/decidim/decidim/pull/9945)
-- **decidim-comments**: Backport 'Fix "disappearing" underscores with comments' to v0.26 [\#9949](https://github.com/decidim/decidim/pull/9949)
-- **decidim-admin**, **decidim-core**: Backport 'Fix editor content saving when the content has only one video' to v0.26 [\#9951](https://github.com/decidim/decidim/pull/9951)
-- **decidim-proposals**: Backport 'Fix collaborative drafts page when there are errors on the form' to v0.26 [\#9955](https://github.com/decidim/decidim/pull/9955)
-- **decidim-debates**: Backport 'Fix the finite value on the debate form when editing an existing debate' to v0.26 [\#9957](https://github.com/decidim/decidim/pull/9957)
-- **decidim-pages**: Backport 'Fix exporting and importing a page component' to v0.26 [\#9959](https://github.com/decidim/decidim/pull/9959)
-- **decidim-participatory processes**: Backport 'Fix importing participatory process from legacy format' to v0.26 [\#9964](https://github.com/decidim/decidim/pull/9964)
-- **decidim-assemblies**, **decidim-core**, **decidim-participatory processes**: Backport 'Fix duplicate stats on home page and participatory space main page' to v0.26 [\#9966](https://github.com/decidim/decidim/pull/9966)
-- **decidim-budgets**, **decidim-core**, **decidim-proposals**, **decidim-templates**: Backport 'Address Crowdin feedback' to v0.26 [\#9970](https://github.com/decidim/decidim/pull/9970)
-- **decidim-core**: Backport 'Limit invitation redirects only to paths within the application' to v0.26 [\#9973](https://github.com/decidim/decidim/pull/9973)
-- **decidim-initiatives**: Backport 'Fix initiative sign if the authorization metadata is set to `nil`' to v0.26 [\#9981](https://github.com/decidim/decidim/pull/9981)
-- **decidim-initiatives**: Backport 'Add missing i18n key in Initiatives' to v0.26 [\#9983](https://github.com/decidim/decidim/pull/9983)
-- **decidim-core**: Backport 'Fix correct resource linking for amendments' to v0.26 [\#9988](https://github.com/decidim/decidim/pull/9988)
-- **decidim-core**: Backport 'Fix user sign up with invalid name' to v0.26 [\#9991](https://github.com/decidim/decidim/pull/9991)
-- **decidim-initiatives**: Backport 'Make initiatives order translatable' to v0.26 [\#9995](https://github.com/decidim/decidim/pull/9995)
-- **decidim-core**: Backport 'Make ToS agreement translatable' to v0.26 [\#9997](https://github.com/decidim/decidim/pull/9997)
-- **decidim-debates**: Backport 'Make Scopes field in debates translatable' to v0.26 [\#9999](https://github.com/decidim/decidim/pull/9999)
-- **decidim-core**: Backport 'Remove invitations badge' to v0.26 [\#10001](https://github.com/decidim/decidim/pull/10001)
-- **decidim-conferences**: Backport 'Fix conference invitations' to v0.26 [\#10004](https://github.com/decidim/decidim/pull/10004)
-- **decidim-admin**, **decidim-core**: Backport 'Fix preserving bold text in the rich text editor when pasting content' to v0.26 [\#9962](https://github.com/decidim/decidim/pull/9962)
-- **decidim-admin**, **decidim-assemblies**, **decidim-initiatives**, **decidim-participatory processes**, **decidim-verifications**: Backport 'Add missing active actions on admin navigation menu' to v0.26 [\#9993](https://github.com/decidim/decidim/pull/9993)
-- **decidim-core**: Backport 'Fix disappearing sub-lists in rich text editors' to v0.26 [\#9968](https://github.com/decidim/decidim/pull/9968)
-- **decidim-elections**: Backport 'Define the component import routes, permissions and controller at votings' to v0.26 [\#9977](https://github.com/decidim/decidim/pull/9977)
-- **decidim-core**, **decidim-proposals**: Backport 'Fix proposal etiquette and length validator with base64 images' to v0.26 [\#10010](https://github.com/decidim/decidim/pull/10010)
-- **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Refactor cell titles' to v0.26 [\#10041](https://github.com/decidim/decidim/pull/10041)
-- **decidim-admin**, **decidim-comments**: Backport 'Fix moderations for comments that are mapped to deleted resources' to v0.26 [\#9941](https://github.com/decidim/decidim/pull/9941)
-- **decidim-comments**, **decidim-core**, **decidim-verifications**: Backport 'Fix user related absolute URLs' to v0.26 [\#9947](https://github.com/decidim/decidim/pull/9947)
-- **decidim-core**: Backport 'Fix duplicate user activity records when public spaces have private users' to v0.26 [\#9979](https://github.com/decidim/decidim/pull/9979)
-- **decidim-meetings**: Backport 'Refactor the meeting list item title display' to v0.26 [\#10047](https://github.com/decidim/decidim/pull/10047)
-- **decidim-accountability**, **decidim-admin**, **decidim-proposals**: Backport 'Reformat CSV help for import files on Accountability and Proposals' to v0.26 [\#10055](https://github.com/decidim/decidim/pull/10055)
-- **decidim-system**: Backport 'Fix organization SMTP password not saved (became blank) in system panel' to v0.26 [\#10053](https://github.com/decidim/decidim/pull/10053)
-- **decidim-budgets**, **decidim-elections**, **decidim-proposals**, **decidim-sortitions**: Backport 'Fix usages of `reorder` and `paginate`' to v0.26 [\#10051](https://github.com/decidim/decidim/pull/10051)
-- **decidim-admin**: Backport 'Show only ToS acceptance when admin hasn't accepted it' to v0.26 [\#10057](https://github.com/decidim/decidim/pull/10057)
-- **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Refactor admin listing titles' to v0.26 [\#10049](https://github.com/decidim/decidim/pull/10049)
-- **decidim-core**: Backport 'Fix date/time formats at component forms' to v0.26 [\#9953](https://github.com/decidim/decidim/pull/9953)
+- **decidim-core**: Backport 'Fix: The i18n locales selector is showing a dropdown with 3 languages' to v0.27 [\#10087](https://github.com/decidim/decidim/pull/10087)
+- **decidim-core**: Backport 'Remove unecessary line in push notifications spec' to v0.27 [\#10088](https://github.com/decidim/decidim/pull/10088)
+- Backport 'Lock GitHub actions to Ubuntu 20.04 due to OpenSSL 3.0 issues' to v0.27 [\#10225](https://github.com/decidim/decidim/pull/10225)
+- **decidim-core**: Add date format to Conversation [\#10224](https://github.com/decidim/decidim/pull/10224)
+- **decidim-core**: Backport 'Allow blocking a UserGroup' to v0.27 [\#10255](https://github.com/decidim/decidim/pull/10255)
+- **decidim-admin**, **decidim-assemblies**, **decidim-elections**, **decidim-initiatives**, **decidim-pages**, **decidim-participatory processes**: Backport 'Fix wrong capitalization in i18n values and add missing keys' to v0.27 [\#10256](https://github.com/decidim/decidim/pull/10256)
+- **decidim-api**, **decidim-core**: Backport 'Fix machine translations at the API' to v0.27 [\#10257](https://github.com/decidim/decidim/pull/10257)
+- **decidim-budgets**: Backport 'Correct the "voted for this" string in the budgets component' to v0.27 [\#10258](https://github.com/decidim/decidim/pull/10258)
+- **decidim-conferences**, **decidim-core**: Backport 'Fix translations missing on admin log' to v0.27 [\#10259](https://github.com/decidim/decidim/pull/10259)
+- **decidim-core**: Backport 'Fix push notifications URL method' to v0.27 [\#10262](https://github.com/decidim/decidim/pull/10262)
+- **decidim-conferences**: Backport 'Add correct call for conference speaker' to v0.27 [\#10260](https://github.com/decidim/decidim/pull/10260)
+- **decidim-meetings**: Backport 'Fix missing fields on duplicate meetings functionality' to v0.27 [\#10261](https://github.com/decidim/decidim/pull/10261)
+- **decidim-core**: Backport 'Fix resource_icon with component or manifest nil' to v0.27 [\#10263](https://github.com/decidim/decidim/pull/10263)
+- **decidim-budgets**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**, **decidim-sortitions**: Backport 'Fix filter URL not updated with the text search input' to v0.27 [\#10264](https://github.com/decidim/decidim/pull/10264)
+- **decidim-core**: Backport 'Add missing logs for UserGroup block and unblock actions' to v0.27 [\#10266](https://github.com/decidim/decidim/pull/10266)
+- **decidim-admin**, **decidim-core**: Backport 'Don't show the 'unreport' action when user is blocked' to v0.27 [\#10267](https://github.com/decidim/decidim/pull/10267)
+- **decidim-admin**, **decidim-core**: Backport 'Fix bug when blocking two UserGroups' to v0.27 [\#10269](https://github.com/decidim/decidim/pull/10269)
+- **decidim-core**: Backport 'Add order by in linked_participatory_space_resources' to v0.27 [\#10270](https://github.com/decidim/decidim/pull/10270)
+- **decidim-blogs**: Backport 'Move i18n attribute key of Post's body' to v0.27 [\#10265](https://github.com/decidim/decidim/pull/10265)
+- **decidim-core**: Backport 'Fix dependency resolver trying to fetch gem paths from lazy specifications' to v0.27 [\#10272](https://github.com/decidim/decidim/pull/10272)
+- **decidim-core**: Backport 'Fix double parentheses in the titled upload modal with existing attachment' to v0.27 [\#10273](https://github.com/decidim/decidim/pull/10273)
+- **decidim-proposals**: Backport 'Removed "disabled" status from proposals' main categories' to v0.27 [\#10274](https://github.com/decidim/decidim/pull/10274)
+- **decidim-core**: Backport 'Improve link handling of the redirect engine' to v0.27 [\#10276](https://github.com/decidim/decidim/pull/10276)
+- **decidim-core**: Backport 'Fix pipeline asset absolute URLs' to v0.27 [\#10275](https://github.com/decidim/decidim/pull/10275)
+- **decidim-accountability**, **decidim-initiatives**, **decidim-participatory processes**: Backport 'Added missing localizations' to v0.27 [\#10278](https://github.com/decidim/decidim/pull/10278)
+- **decidim-blogs**: Backport 'Remove unused permissions on Blogs' to v0.27 [\#10268](https://github.com/decidim/decidim/pull/10268)
+- **decidim-initiatives**: Backport 'Respect "rich text editor" setting in Initiatives' to v0.27 [\#10271](https://github.com/decidim/decidim/pull/10271)
+- **decidim-proposals**: Backport 'Prevent sending proposal create event until is commited' to v0.27 [\#10279](https://github.com/decidim/decidim/pull/10279)
+- **decidim-initiatives**: Backport 'Fix initiatives count in initiatives index page' to v0.27 [\#10280](https://github.com/decidim/decidim/pull/10280)
+- **decidim-core**: Backport 'User's group endorsement no longer disappears after personal endorsement removed' to v0.27 [\#10281](https://github.com/decidim/decidim/pull/10281)
+- **decidim-core**: Backport 'Fix bug regarding user group moderation action logs' to v0.27 [\#10254](https://github.com/decidim/decidim/pull/10254)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-participatory processes**: Backport 'Do not display unpublished spaces in linked spaces' to v0.27 [\#10346](https://github.com/decidim/decidim/pull/10346)
+- **decidim-assemblies**, **decidim-meetings**: Backport 'Display Published meetings in Assembly cell' to v0.27 [\#10340](https://github.com/decidim/decidim/pull/10340)
+- **decidim-core**: Backport 'Uploading files - Explanation %{attribute} not translate' to v0.27 [\#10348](https://github.com/decidim/decidim/pull/10348)
+- **decidim-admin**, **decidim-core**: Backport 'Fix newsletters unwanted CSS and 404 page on preview' to v0.27 [\#10354](https://github.com/decidim/decidim/pull/10354)
+- **decidim-admin**: Backport 'A Valuator should not be able to access Global Moderation' to v0.27 [\#10350](https://github.com/decidim/decidim/pull/10350)
+- **decidim-core**: Backport 'Fix an edge case with the attribute object forms with arrays/enums' (#10218) to v0.27 [\#10358](https://github.com/decidim/decidim/pull/10358)
+- **decidim-initiatives**: Backport 'Fixing some typos in the english translations' to v0.27 [\#10361](https://github.com/decidim/decidim/pull/10361)
 
 ### Removed
 
 Nothing.
 
+### Developer improvements
+
+- Backport 'Remove unecessary line in push notifications spec' to v0.27 [\#10088](https://github.com/decidim/decidim/pull/10088)
+
 ### Internal
 
-- Backport 'Fix importing a page component without a body' to v0.26 [\#10023](https://github.com/decidim/decidim/pull/10023)
+- Backport 'Lock GitHub actions to Ubuntu 20.04 due to OpenSSL 3.0 issues' to v0.27 [\#10225](https://github.com/decidim/decidim/pull/10225)
 
-### Developer improvements
+### Unsorted
 
-Nothing.
 
-## [0.26.3](https://github.com/decidim/decidim/tree/v0.26.3)
+## [0.27.1](https://github.com/decidim/decidim/tree/0.27.1)
 
 ### Added
 
@@ -81,547 +77,870 @@ Nothing.
 
 ### Fixed
 
-- **decidim-core**: Backport 'Fix / Expose createMapController properly to let overriding' to v0.26 [\#9520](https://github.com/decidim/decidim/pull/9520)
-- **decidim-elections**: Backport 'Capture unhandled errors from JS promises and inform the user' to v0.26 [\#9521](https://github.com/decidim/decidim/pull/9521)
-- **decidim-elections**: Backport 'Remove description from questions in elections' to v0.26 [\#9522](https://github.com/decidim/decidim/pull/9522)
-- **decidim-initiatives**: Backport 'Return 404 when there isn't an initiative' to v0.26 [\#9523](https://github.com/decidim/decidim/pull/9523)
-- **decidim-forms**, **decidim-meetings**, **decidim-surveys**: Backport 'Fix rollback questionnaire answer when file is invalid' to v0.26 [\#9524](https://github.com/decidim/decidim/pull/9524)
-- **decidim-elections**: Backport 'Make sure component is published when starting an election' to v0.26 [\#9525](https://github.com/decidim/decidim/pull/9525)
-- **decidim-core**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix email subject when resource title has special characters' to v0.26 [\#9526](https://github.com/decidim/decidim/pull/9526)
-- **decidim-core**: Backport 'Prevent users to validate nicknames/emails taken by user groups' to v0.26 [\#9527](https://github.com/decidim/decidim/pull/9527)
-- **decidim-elections**: Backport 'Fix hardcoded hour in election dashboard' to v0.26 [\#9528](https://github.com/decidim/decidim/pull/9528)
-- **decidim-comments**, **decidim-core**: Backport 'Fix long word breaking on comments and cards' to v0.26 [\#9529](https://github.com/decidim/decidim/pull/9529)
-- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-core**, **decidim-elections**, **decidim-initiatives**, **decidim-participatory processes**: Backport 'Fix background-image URLs with weird characters' to v0.26 [\#9531](https://github.com/decidim/decidim/pull/9531)
-- **decidim-assemblies**, **decidim-conferences**, **decidim-elections**: Backport 'Fix cache hash on Hightlighted spaces' to v0.26 [\#9536](https://github.com/decidim/decidim/pull/9536)
-- **decidim-accountability**: Backport 'Add short format to result date' to v0.26 [\#9540](https://github.com/decidim/decidim/pull/9540)
-- **decidim-elections**: Backport 'Advertise users if BB connection is lost in trustees/admin zones' to v0.26 [\#9535](https://github.com/decidim/decidim/pull/9535)
-- **decidim-core**: Backport 'Fix email subject when participatory space title is present' to v0.26 [\#9573](https://github.com/decidim/decidim/pull/9573)
-- **decidim-conferences**: Backport 'Fix published conferences order' to v0.26 [\#9688](https://github.com/decidim/decidim/pull/9688)
-- **decidim-comments**: Backport 'Fix creation notification when editing a comment ' to v0.26 [\#9690](https://github.com/decidim/decidim/pull/9690)
-- **decidim-elections**: Backport 'Remove margin-bottom on votings navigation' to v0.26 [\#9692](https://github.com/decidim/decidim/pull/9692)
-- **decidim-initiatives**: Backport 'Use public link on initiatives mailer' to v0.26 [\#9694](https://github.com/decidim/decidim/pull/9694)
-- **decidim-accountability**: Backport 'Disallow creating grandchildren results' to v0.26 [\#9698](https://github.com/decidim/decidim/pull/9698)
-- **decidim-forms**, **decidim-meetings**: Backport 'Prevent showing announcement on meetings registrations' to v0.26 [\#9700](https://github.com/decidim/decidim/pull/9700)
-- **decidim-initiatives**: Backport 'Fix for initiative mailer when promoting committee is disabled' to v0.26 [\#9696](https://github.com/decidim/decidim/pull/9696)
-- **decidim-elections**: Backport 'Improve steps election check page with census' to v0.26 [\#9702](https://github.com/decidim/decidim/pull/9702)
-- **decidim-core**: Backport 'Fix translated attributes field type change' to v0.26 [\#9704](https://github.com/decidim/decidim/pull/9704)
-- **decidim-core**: Backport 'Prevent missing ActionLog entries to break the application' to v0.26 [\#9706](https://github.com/decidim/decidim/pull/9706)
-- **decidim-proposals**: Backport 'Fix publish event on official proposals' to v0.26 [\#9708](https://github.com/decidim/decidim/pull/9708)
-- **decidim-admin**, **decidim-proposals**: Backport 'Add help text for proposals' 'publish answers immediately' setting ' to v0.26 [\#9712](https://github.com/decidim/decidim/pull/9712)
-- **decidim-conferences**: Backport 'Return 404 when there isn't a valid component in program' to v0.26 [\#9717](https://github.com/decidim/decidim/pull/9717)
-- **decidim-budgets**: Backport 'Fix budgets seeds on non development apps' to v0.26 [\#9719](https://github.com/decidim/decidim/pull/9719)
-- **decidim-core**: Backport 'Fix creating automatic nicknames when taken by user_groups' to v0.26 [\#9721](https://github.com/decidim/decidim/pull/9721)
-- **decidim-debates**: Backport 'Fix resource endorsed notification with Debates' to v0.26 [\#9723](https://github.com/decidim/decidim/pull/9723)
-- **decidim-meetings**: Backport 'Fix agenda_item association with agenda' to v0.26 [\#9728](https://github.com/decidim/decidim/pull/9728)
-- **decidim-verifications**: Backport 'Fix absolute urls on 'managed user error' event' to v0.26 [\#9730](https://github.com/decidim/decidim/pull/9730)
-- **decidim-core**: Backport 'Fix mobile notifications switch component overlaps' to v0.26 [\#9732](https://github.com/decidim/decidim/pull/9732)
-- **decidim-core**: Backport 'Fix blocked user nickname and avatar in user presenter' to v0.26 [\#9741](https://github.com/decidim/decidim/pull/9741)
-- **decidim-admin**: Backport 'Fix form error overlap with character counter in the admin panel' to v0.26 [\#9749](https://github.com/decidim/decidim/pull/9749)
-- **decidim-core**: Backport 'Fix the endorsement permissions' to v0.26 [\#9734](https://github.com/decidim/decidim/pull/9734)
-- **decidim-meetings**: Backport 'Fix order when filtering Meetings' to v0.26 [\#9751](https://github.com/decidim/decidim/pull/9751)
-- **decidim-proposals**: Backport 'Fix redundant notification on comments with linked proposals' to v0.26 [\#9746](https://github.com/decidim/decidim/pull/9746)
-- **decidim-core**: Backport 'Make the HERE Map display in the currently selected language' to v0.26 [\#9714](https://github.com/decidim/decidim/pull/9714)
-- **decidim-admin**, **decidim-forms**: Backport 'Fix admin language selector with more than 4 locales' to v0.26 [\#9710](https://github.com/decidim/decidim/pull/9710)
-- **decidim-meetings**: Backport 'Ignore participatory spaces without models in meetings visible_for scope' to v0.26 [\#9794](https://github.com/decidim/decidim/pull/9794)
-- **decidim-admin**: Backport 'Fix leaking emails on admin user search controller' to 0.26 [\#9797](https://github.com/decidim/decidim/pull/9797)
-- **decidim-assemblies**, **decidim-participatory processes**: Backport 'Fix import of images on spaces' to v0.26 [\#9803](https://github.com/decidim/decidim/pull/9803)
-- **decidim-core**: Backport 'Fix hashtags not recognized at the beginning of the string' to v0.26 [\#9811](https://github.com/decidim/decidim/pull/9811)
-- **decidim-accountability**, **decidim-core**, **decidim-debates**, **decidim-initiatives**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix version pages showing a HTTP 500 error when the version does not exist' to v0.26 [\#9809](https://github.com/decidim/decidim/pull/9809)
-- **decidim-core**: Backport 'Fix hidden error messages on the registration form' to v0.26 [\#9813](https://github.com/decidim/decidim/pull/9813)
-- **decidim-core**: Backport 'Fix multitenant organizations stats cache' to v0.26 [\#9807](https://github.com/decidim/decidim/pull/9807)
-- **decidim-admin**, **decidim-initiatives**: Backport 'Fix initiatives components' to v0.26 [\#9825](https://github.com/decidim/decidim/pull/9825)
-- Backport 'Fix doorkeeper initialization after 5.6.0 release' to v0.26 [\#9788](https://github.com/decidim/decidim/pull/9788)
+- **decidim-participatory processes**: Backport 'Fix unpublished processes shown in the group process count' to v0.27 [\#9935](https://github.com/decidim/decidim/pull/9935)
+- **decidim-admin**: Backport 'Fix global moderation types not translated' to v0.27 [\#9936](https://github.com/decidim/decidim/pull/9936)
+- **decidim-admin**: Backport 'Fix updating organization settings in case there were errors' to v0.27 [\#9939](https://github.com/decidim/decidim/pull/9939)
+- **decidim-budgets**, **decidim-core**, **decidim-elections**, **decidim-proposals**: Backport 'Do not import resources multiple times' to v0.27 [\#9943](https://github.com/decidim/decidim/pull/9943)
+- **decidim-forms**, **decidim-surveys**: Backport 'Fix form answer attachments breaking the answer view' to v0.27 [\#9944](https://github.com/decidim/decidim/pull/9944)
+- **decidim-comments**, **decidim-core**, **decidim-verifications**: Backport 'Fix user related absolute URLs' to v0.27 [\#9946](https://github.com/decidim/decidim/pull/9946)
+- **decidim-comments**: Backport 'Fix "disappearing" underscores with comments' to v0.27 [\#9948](https://github.com/decidim/decidim/pull/9948)
+- **decidim-admin**, **decidim-core**: Backport 'Fix editor content saving when the content has only one video' to v0.27 [\#9950](https://github.com/decidim/decidim/pull/9950)
+- **decidim-core**: Backport 'Fix date/time formats at component forms' to v0.27 [\#9952](https://github.com/decidim/decidim/pull/9952)
+- **decidim-proposals**: Backport 'Fix collaborative drafts page when there are errors on the form' to v0.27 [\#9954](https://github.com/decidim/decidim/pull/9954)
+- **decidim-debates**: Backport 'Fix the finite value on the debate form when editing an existing debate' to v0.27 [\#9956](https://github.com/decidim/decidim/pull/9956)
+- **decidim-pages**: Backport 'Fix exporting and importing a page component' to v0.27 [\#9958](https://github.com/decidim/decidim/pull/9958)
+- **decidim-core**: Backport 'Fix webpacker crashes on missing icons' to v0.27 [\#9960](https://github.com/decidim/decidim/pull/9960)
+- **decidim-participatory processes**: Backport 'Fix importing participatory process from legacy format' to v0.27 [\#9963](https://github.com/decidim/decidim/pull/9963)
+- **decidim-assemblies**, **decidim-core**, **decidim-participatory processes**: Backport 'Fix duplicate stats on home page and participatory space main page' to v0.27 [\#9965](https://github.com/decidim/decidim/pull/9965)
+- **decidim-budgets**, **decidim-core**, **decidim-proposals**, **decidim-templates**: Backport 'Address Crowdin feedback' to v0.27 [\#9969](https://github.com/decidim/decidim/pull/9969)
+- **decidim-core**, **decidim-proposals**: Backport 'Fix cryptic file validation errors' to v0.27 [\#9971](https://github.com/decidim/decidim/pull/9971)
+- **decidim-core**: Backport 'Limit invitation redirects only to paths within the application' to v0.27 [\#9972](https://github.com/decidim/decidim/pull/9972)
+- **decidim-admin**, **decidim-assemblies**, **decidim-participatory processes**: Backport 'Add malformed file errors when CSV reading fails' to v0.27 [\#9974](https://github.com/decidim/decidim/pull/9974)
+- **decidim-elections**: Backport 'Define the component import routes, permissions and controller at votings' to v0.27 [\#9976](https://github.com/decidim/decidim/pull/9976)
+- **decidim-core**: Backport 'Fix duplicate user activity records when public spaces have private users' to v0.27 [\#9978](https://github.com/decidim/decidim/pull/9978)
+- **decidim-initiatives**: Backport 'Fix initiative sign if the authorization metadata is set to `nil`' to v0.27 [\#9980](https://github.com/decidim/decidim/pull/9980)
+- **decidim-initiatives**: Backport 'Add missing i18n key in Initiatives' to v0.27 [\#9982](https://github.com/decidim/decidim/pull/9982)
+- **decidim-comments**: Backport 'Fix commenting field disabled when polling new comments' to v0.27 [\#9986](https://github.com/decidim/decidim/pull/9986)
+- **decidim-core**: Backport 'Fix correct resource linking for amendments' to v0.27 [\#9987](https://github.com/decidim/decidim/pull/9987)
+- **decidim-core**: Backport 'Fix last activity page showing recently updated records' to v0.27 [\#9989](https://github.com/decidim/decidim/pull/9989)
+- **decidim-core**: Backport 'Fix user sign up with invalid name' to v0.27 [\#9990](https://github.com/decidim/decidim/pull/9990)
+- **decidim-core**: Backport 'Fix user sign up with invalid name' to v0.27 [\#9990](https://github.com/decidim/decidim/pull/9990)
+- **decidim-admin**, **decidim-assemblies**, **decidim-initiatives**, **decidim-participatory processes**, **decidim-verifications**: Backport 'Add missing active actions on admin navigation menu' to v0.27 [\#9992](https://github.com/decidim/decidim/pull/9992)
+- **decidim-admin**, **decidim-assemblies**, **decidim-initiatives**, **decidim-participatory processes**, **decidim-verifications**: Backport 'Add missing active actions on admin navigation menu' to v0.27 [\#9992](https://github.com/decidim/decidim/pull/9992)
+- **decidim-admin**, **decidim-assemblies**, **decidim-initiatives**, **decidim-participatory processes**, **decidim-verifications**: Backport 'Add missing active actions on admin navigation menu' to v0.27 [\#9992](https://github.com/decidim/decidim/pull/9992)
+- **decidim-initiatives**: Backport 'Make initiatives order translatable' to v0.27 [\#9994](https://github.com/decidim/decidim/pull/9994)
+- **decidim-core**: Backport 'Make ToS agreement translatable' to v0.27 [\#9996](https://github.com/decidim/decidim/pull/9996)
+- **decidim-debates**: Backport 'Make Scopes field in debates translatable' to v0.27 [\#9998](https://github.com/decidim/decidim/pull/9998)
+- **decidim-core**: Backport 'Remove invitations badge' to v0.27 [\#10000](https://github.com/decidim/decidim/pull/10000)
+- **decidim-conferences**: Backport 'Fix conference invitations' to v0.27 [\#10003](https://github.com/decidim/decidim/pull/10003)
+- **decidim-admin**, **decidim-core**: Backport 'Fix preserving bold text in the rich text editor when pasting content' to v0.27 [\#9961](https://github.com/decidim/decidim/pull/9961)
+- **decidim-core**, **decidim-proposals**: Backport 'Fix proposal etiquette and length validator with base64 images' to v0.27 [\#10009](https://github.com/decidim/decidim/pull/10009)
+- **decidim-core**: Backport 'Fix disappearing sub-lists in rich text editors' to v0.27 [\#9967](https://github.com/decidim/decidim/pull/9967)
+- **decidim-meetings**, **decidim-proposals**: Backport 'Fix invalid rendering of meeting and proposal body texts' to v0.27 [\#10002](https://github.com/decidim/decidim/pull/10002)
+- **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Refactor cell titles' to v0.27 [\#10040](https://github.com/decidim/decidim/pull/10040)
+- **decidim-admin**, **decidim-comments**: Backport 'Fix moderations for comments that are mapped to deleted resources' to v0.27 [\#9940](https://github.com/decidim/decidim/pull/9940)
+- **decidim-meetings**: Backport 'Refactor the meeting list item title display' to v0.27 [\#10046](https://github.com/decidim/decidim/pull/10046)
+- **decidim-system**: Backport 'Fix organization SMTP password not saved (became blank) in system panel' to v0.27 [\#10052](https://github.com/decidim/decidim/pull/10052)
+- **decidim-accountability**, **decidim-admin**, **decidim-proposals**: Backport 'Reformat CSV help for import files on Accountability and Proposals' to v0.27 [\#10054](https://github.com/decidim/decidim/pull/10054)
+- **decidim-budgets**, **decidim-elections**, **decidim-proposals**, **decidim-sortitions**: Backport 'Fix usages of `reorder` and `paginate`' to v0.27 [\#10050](https://github.com/decidim/decidim/pull/10050)
+- **decidim-admin**: Backport 'Show only ToS acceptance when admin hasn't accepted it' to v0.27 [\#10056](https://github.com/decidim/decidim/pull/10056)
+- **decidim-participatory processes**: Backport 'Fix usages of sanitize helper methods for editable content provided by admins' to v0.27 [\#10058](https://github.com/decidim/decidim/pull/10058)
+- **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport 'Refactor admin listing titles' to v0.27 [\#10048](https://github.com/decidim/decidim/pull/10048)
 
 ### Removed
 
 Nothing.
 
+### Developer improvements
+
+Nothing.
+
 ### Internal
 
-- Backport 'Fix invalid translation in spec' to v0.26 [\#9435](https://github.com/decidim/decidim/pull/9435)
-- Backport 'Remove the description field from the elections component seeds' to v0.26 [\#9553](https://github.com/decidim/decidim/pull/9553)
-- Fix API GraphiQL system spec for 0.26 with newer ChromeDriver [\#9556](https://github.com/decidim/decidim/pull/9556)
-- Backport 'Update `rokroskar/workflow-run-cleanup-action` GitHub action to v0.3.3' to v0.26 [\#9829](https://github.com/decidim/decidim/pull/9829)
-- Backport 'Split parallel test coverage reports into their own folders' to v0.26 [\#9819](https://github.com/decidim/decidim/pull/9819)
-- Backport 'Improve release process' to v0.26 [\#9864](https://github.com/decidim/decidim/pull/9864)
+- **decidim-dev**: Backport 'Ignore the problematics HTML validation checks with hidden inputs' to v0.27 [\#10025](https://github.com/decidim/decidim/pull/10025)
+- Backport 'Bump versions on install docs' to v0.27 [\#10008](https://github.com/decidim/decidim/pull/10008)
+- **decidim-assemblies**: Backport 'Fix importing a page component without a body' to v0.27 [\#10029](https://github.com/decidim/decidim/pull/10029)
 
-### Developer improvements
+## [0.27.0](https://github.com/decidim/decidim/tree/0.27.0)
 
-Nothing.
+### Detailed changes
 
-## [0.26.2](https://github.com/decidim/decidim/tree/v0.26.2)
+#### Added
 
-### Added
+Nothing.
+
+#### Changed
 
 Nothing.
 
-### Changed
+#### Fixed
 
 Nothing.
 
-### Fixed
+#### Removed
 
-- **decidim-comments**, **decidim-core**, **decidim-meetings**: Backport "Fix timeout in comment view and during meetings" to v0.26 [\#9091](https://github.com/decidim/decidim/pull/9091)
-- **decidim-core**: Backport "Dont add external link container inside editor" to v0.26 [\#9108](https://github.com/decidim/decidim/pull/9108)
-- **decidim-core**: Backport "Add base URI to meta image URLs" to v0.26 [\#9153](https://github.com/decidim/decidim/pull/9153)
-- **decidim-initiatives**: Backport "Remove 'edit link' in topbar for initiative's authors" to v0.26 [\#9239](https://github.com/decidim/decidim/pull/9239)
-- **decidim-elections**: Backport 'Clarify message to user when checking census' to v0.26 [\#9240](https://github.com/decidim/decidim/pull/9240)
-- **decidim-participatory processes**: Backport 'Fix processes count in processes group title cell' to v0.26 [\#9242](https://github.com/decidim/decidim/pull/9242)
-- **decidim-elections**: Backport 'Improve wording when casting your vote' to v0.26 [\#9243](https://github.com/decidim/decidim/pull/9243)
-- **decidim-proposals**: Backport 'Add 'not answered' as a possible answer in proposals' to v0.26 [\#9246](https://github.com/decidim/decidim/pull/9246)
-- **decidim-meetings**: Backport 'Fix meetings minutes migration' to v0.26 [\#9247](https://github.com/decidim/decidim/pull/9247)
-- **decidim-assemblies**, **decidim-proposals**: Backport "Fix absolute urls on 'assembly member' and 'collaborative drafts' events" to v0.26 [\#9248](https://github.com/decidim/decidim/pull/9248)
-- **decidim-accountability**, **decidim-consultations**: Backport 'Fix components navbar in consultations mobile ' to v0.26 [\#9249](https://github.com/decidim/decidim/pull/9249)
-- **decidim-meetings**: Backport 'Move modal to body and fix condition' to v0.26 [\#9250](https://github.com/decidim/decidim/pull/9250)
-- **decidim-meetings**: Backport 'Do not send upcoming meeting notification for hidden or withdrawn meetings' to v0.26 [\#9251](https://github.com/decidim/decidim/pull/9251)
-- **decidim-core**: Backport 'Show only current organization in verification conflicts with multitenants' to v0.26 [\#9252](https://github.com/decidim/decidim/pull/9252)
-- **decidim-elections**: Backport 'Send email to newly added trustees' to v0.26 [\#9253](https://github.com/decidim/decidim/pull/9253)
-- **decidim-meetings**: Backport 'Fix registration type field highlighted in admin meeting creation form' to v0.26 [\#9254](https://github.com/decidim/decidim/pull/9254)
-- **decidim-surveys**: Backport 'Fix contradictory form errors on survey form' to v0.26 [\#9257](https://github.com/decidim/decidim/pull/9257)
-- **decidim-initiatives**: Backport 'Add edit and delete actions in InitiativeType admin table' to v0.26 [\#9260](https://github.com/decidim/decidim/pull/9260)
-- **decidim-surveys**: Backport 'Clarify unregistered answers on surveys behavior' to v0.26 [\#9261](https://github.com/decidim/decidim/pull/9261)
-- **decidim-elections**: Backport 'Fix voting with single election' to v0.26 [\#9262](https://github.com/decidim/decidim/pull/9262)
-- **decidim-initiatives**: Backport 'Fix initiative print link, margin, and organization logo' to v0.26 [\#9263](https://github.com/decidim/decidim/pull/9263)
-- **decidim-elections**: Backport 'Remove show more button on elections' to v0.26 [\#9264](https://github.com/decidim/decidim/pull/9264)
-- **decidim-surveys**: Backport 'Fix survey activity log entries' to v0.26 [\#9265](https://github.com/decidim/decidim/pull/9265)
-- **decidim-budgets**: Backport 'Remove beforeunload confirmation panel from the budgets voting' to v0.26 [\#9266](https://github.com/decidim/decidim/pull/9266)
-- **decidim-admin**, **decidim-elections**: Backport 'Fix newsletters and Decidim Votings' to v0.26 [\#9258](https://github.com/decidim/decidim/pull/9258)
-- **decidim-core**: Backport 'Fix notifications where resources are missing' to v0.26 [\#9256](https://github.com/decidim/decidim/pull/9256)
-- **decidim-core**: Backport 'Enforce password validation rules on 'Forgot your password?' form' to v0.26 [\#9245](https://github.com/decidim/decidim/pull/9245)
-- **decidim-core**: Backport 'Fix displaying blocked users in account follow pages' to v0.26 [\#9255](https://github.com/decidim/decidim/pull/9255)
-- **decidim-core**: Backport 'Fix Leaflet trying to load "infinite amount of tiles"' to v0.26  [\#9269](https://github.com/decidim/decidim/pull/9269)
-- **decidim-system**: Backport 'Enforce password validation rules on system admins' to v0.26 [\#9259](https://github.com/decidim/decidim/pull/9259)
-- **decidim-meetings**: Backport 'Remove presenters in the meetings admin backoffice' to v0.26 [\#9323](https://github.com/decidim/decidim/pull/9323)
-- **decidim-elections**: Backport 'Correctly show trustees and votings menu' to v0.26 [\#9324](https://github.com/decidim/decidim/pull/9324)
-- **decidim-core**: Backport 'Fix hashtag parsing on URLs with fragments' to v0.26 [\#9326](https://github.com/decidim/decidim/pull/9326)
-- **decidim-comments**, **decidim-core**: Backport 'Add missing events locales' to v0.26 [\#9327](https://github.com/decidim/decidim/pull/9327)
-- **decidim-conferences**: Backport 'Make conference's partners logos always mandatory' to v0.26 [\#9328](https://github.com/decidim/decidim/pull/9328)
-- **decidim-admin**: Backport 'Fix margin around warning message in colour settings' to v0.26 [\#9329](https://github.com/decidim/decidim/pull/9329)
-- **decidim-elections**: Backport 'Hide more information link when there's no description on an election' to v0.26 [\#9331](https://github.com/decidim/decidim/pull/9331)
-- **decidim-admin**, **decidim-assemblies**, **decidim-budgets**, **decidim-core**, **decidim-elections**, **decidim-meetings**, **decidim-pages**, **decidim-proposals**: Backport 'Apply crowdin feedback' to v0.26 [\#9333](https://github.com/decidim/decidim/pull/9333)
-- **decidim-comments**, **decidim-core**: Backport 'Don't show deleted resources in last activities ' to v0.26 [\#9330](https://github.com/decidim/decidim/pull/9330)
-- **decidim-elections**: Backport 'Fix election label translations' to v0.26 [\#9343](https://github.com/decidim/decidim/pull/9343)
-- **decidim-verifications**: Backport 'Allow to renew expired verifications (if renewable)' to v0.26 [\#9344](https://github.com/decidim/decidim/pull/9344)
-- **decidim-elections**: Backport 'Add error message when adding question and election has started' to v0.26 [\#9404](https://github.com/decidim/decidim/pull/9404)
-- **decidim-core**: Backport 'Fix user interests' to v0.26 [\#9406](https://github.com/decidim/decidim/pull/9406)
-- **decidim-elections**: Backport 'Fix regular expression on census check' to v0.26 [\#9408](https://github.com/decidim/decidim/pull/9408)
-- **decidim-elections**: Backport 'Enforce YYYYmmdd format in birthdate when uploading census' to v0.26 [\#9410](https://github.com/decidim/decidim/pull/9410)
-- **decidim-consultations**: Backport 'Return 404 when there isn't a question' to v0.26 [\#9414](https://github.com/decidim/decidim/pull/9414)
-- **decidim-consultations**: Backport 'Return 404 when there isn't a consultation' to v0.26 [\#9413](https://github.com/decidim/decidim/pull/9413)
-- **decidim-elections**: Backport 'Return 404 when there isn't a voting in elections_log' to v0.26 [\#9415](https://github.com/decidim/decidim/pull/9415)
-- **decidim-proposals**: Backport 'Fix proposals creation with Participatory Texts ' to v0.26 [\#9416](https://github.com/decidim/decidim/pull/9416)
-- **decidim-elections**: Backport 'Fix ActionLog when a ballot style is deleted' to v0.26 [\#9411](https://github.com/decidim/decidim/pull/9411)
-- **decidim-elections**: Backport 'Only show that the code can be requested via SMS if its true' to v0.26 [\#9409](https://github.com/decidim/decidim/pull/9409)
-- **decidim-budgets**, **decidim-proposals**: Backport 'Add missing translation keys proposals import and proposals picker' to v0.26 [\#9412](https://github.com/decidim/decidim/pull/9412)
-- **decidim-elections**: Backport 'Fix HTML safe content in election voting' to v0.26 [\#9405](https://github.com/decidim/decidim/pull/9405)
-- **decidim-core**: Backport 'Fix for internal links not displaying on page title' to v0.26 [\#9407](https://github.com/decidim/decidim/pull/9407)
+Nothing.
 
-### Removed
+#### Developer improvements
 
 Nothing.
 
-### Internal
+## [0.27.0.rc2](https://github.com/decidim/decidim/tree/0.27.0.rc2)
 
-- Backport 'Fix generators specs target branch' to v0.26 [\#9290](https://github.com/decidim/decidim/pull/9290)
+### Detailed changes
 
-### Developer improvements
+#### Added
 
 Nothing.
 
-## [0.26.1](https://github.com/decidim/decidim/tree/v0.26.1)
+#### Changed
 
-### Added
+Nothing.
+
+#### Fixed
+
+- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-core**, **decidim-elections**, **decidim-initiatives**, **decidim-participatory processes**: Backport 'Fix background-image URLs with weird characters' to v0.27 [\#9495](https://github.com/decidim/decidim/pull/9495)
+- **decidim-comments**, **decidim-core**: Backport 'Fix long word breaking on comments and cards' to v0.27 [\#9530](https://github.com/decidim/decidim/pull/9530)
+- **decidim-core**: Backport 'Fix nested attributes model mapping' to v0.27 [\#9532](https://github.com/decidim/decidim/pull/9532)
+- **decidim-initiatives**: Backport 'Add the rexml gem as a requirement for Ruby 3.0.0+ compatibility' to v0.27 [\#9533](https://github.com/decidim/decidim/pull/9533)
+- **decidim-elections**: Backport 'Advertise users if BB connection is lost in trustees/admin zones' to v0.27 [\#9534](https://github.com/decidim/decidim/pull/9534)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-elections**: Backport 'Fix cache hash on Hightlighted spaces' to v0.27 [\#9537](https://github.com/decidim/decidim/pull/9537)
+- **decidim-core**: Backport 'Fix email subject when participatory space title is present' to v0.27 [\#9538](https://github.com/decidim/decidim/pull/9538)
+- **decidim-accountability**: Backport 'Add short format to result date' to v0.27 [\#9541](https://github.com/decidim/decidim/pull/9541)
+- **decidim-conferences**: Backport 'Fix published conferences order' to v0.27 [\#9687](https://github.com/decidim/decidim/pull/9687)
+- **decidim-comments**: Backport 'Fix creation notification when editing a comment ' to v0.27 [\#9689](https://github.com/decidim/decidim/pull/9689)
+- **decidim-elections**: Backport 'Remove margin-bottom on votings navigation' to v0.27 [\#9691](https://github.com/decidim/decidim/pull/9691)
+- **decidim-initiatives**: Backport 'Use public link on initiatives mailer' to v0.27 [\#9693](https://github.com/decidim/decidim/pull/9693)
+- **decidim-accountability**: Backport 'Disallow creating grandchildren results' to v0.27 [\#9697](https://github.com/decidim/decidim/pull/9697)
+- **decidim-forms**, **decidim-meetings**: Backport 'Prevent showing announcement on meetings registrations' to v0.27 [\#9699](https://github.com/decidim/decidim/pull/9699)
+- **decidim-initiatives**: Backport 'Fix for initiative mailer when promoting committee is disabled' to v0.27 [\#9695](https://github.com/decidim/decidim/pull/9695)
+- **decidim-elections**: Backport 'Improve steps election check page with census' to v0.27 [\#9701](https://github.com/decidim/decidim/pull/9701)
+- **decidim-core**: Backport 'Fix translated attributes field type change' to v0.27 [\#9703](https://github.com/decidim/decidim/pull/9703)
+- **decidim-core**: Backport 'Prevent missing ActionLog entries to break the application' to v0.27 [\#9705](https://github.com/decidim/decidim/pull/9705)
+- **decidim-proposals**: Backport 'Fix publish event on official proposals' to v0.27 [\#9707](https://github.com/decidim/decidim/pull/9707)
+- **decidim-admin**, **decidim-proposals**: Backport 'Add help text for proposals' 'publish answers immediately' setting ' to v0.27 [\#9711](https://github.com/decidim/decidim/pull/9711)
+- **decidim-conferences**: Backport 'Return 404 when there isn't a valid component in program' to v0.27 [\#9716](https://github.com/decidim/decidim/pull/9716)
+- **decidim-budgets**: Backport 'Fix budgets seeds on non development apps' to v0.27 [\#9718](https://github.com/decidim/decidim/pull/9718)
+- **decidim-core**: Backport 'Fix creating automatic nicknames when taken by user_groups' to v0.27 [\#9720](https://github.com/decidim/decidim/pull/9720)
+- **decidim-debates**: Backport 'Fix resource endorsed notification with Debates' to v0.27 [\#9722](https://github.com/decidim/decidim/pull/9722)
+- **decidim-core**: Backport 'Set push notifications in user locale' to v0.27 [\#9724](https://github.com/decidim/decidim/pull/9724)
+- **decidim-elections**: Backport 'Improve census importing process in elections/votings space' to v0.27 [\#9725](https://github.com/decidim/decidim/pull/9725)
+- **decidim-core**: Backport 'Strip tags keeping entity characters' to v0.27 [\#9726](https://github.com/decidim/decidim/pull/9726)
+- **decidim-meetings**: Backport 'Fix agenda_item association with agenda' to v0.27 [\#9727](https://github.com/decidim/decidim/pull/9727)
+- **decidim-verifications**: Backport 'Fix absolute urls on 'managed user error' event' to v0.27 [\#9729](https://github.com/decidim/decidim/pull/9729)
+- **decidim-core**: Backport 'Fix mobile notifications switch component overlaps' to v0.27 [\#9731](https://github.com/decidim/decidim/pull/9731)
+- **decidim-core**: Backport 'Fix account update without password change' to v0.27 [\#9735](https://github.com/decidim/decidim/pull/9735)
+- **decidim-meetings**: Backport 'Fix order when filtering Meetings' to v0.27 [\#9737](https://github.com/decidim/decidim/pull/9737)
+- **decidim-admin**: Backport 'Fix admin autocomplete when a locale is defined in the URL' to v0.27 [\#9738](https://github.com/decidim/decidim/pull/9738)
+- **decidim-core**: Backport 'Fix blocked user nickname and avatar in user presenter' to v0.27 [\#9740](https://github.com/decidim/decidim/pull/9740)
+- **decidim-core**: Backport 'Change the custom public port ENV variable name to HTTP_PORT' to v0.27 [\#9747](https://github.com/decidim/decidim/pull/9747)
+- **decidim-admin**: Backport 'Fix form error overlap with character counter in the admin panel' to v0.27 [\#9748](https://github.com/decidim/decidim/pull/9748)
+- **decidim-core**: Backport 'Fix the endorsement permissions' to v0.27 [\#9733](https://github.com/decidim/decidim/pull/9733)
+- **decidim-core**: Backport 'Fix PWA install prompt keeps appearing more than once' to v0.27 [\#9744](https://github.com/decidim/decidim/pull/9744)
+- **decidim-core**: Backport 'Fix issues with daily and weekly notifications' to v0.27 [\#9739](https://github.com/decidim/decidim/pull/9739)
+- **decidim-proposals**: Backport 'Fix redundant notification on comments with linked proposals' to v0.27 [\#9745](https://github.com/decidim/decidim/pull/9745)
+- **decidim-generators**: Backport 'Add missing queue close_meeting_reminder to sidekiq configuration' to v0.27 [\#9715](https://github.com/decidim/decidim/pull/9715)
+- **decidim-core**: Backport 'Make the HERE Map display in the currently selected language' to v0.27 [\#9713](https://github.com/decidim/decidim/pull/9713)
+- **decidim-admin**, **decidim-forms**: Backport 'Fix admin language selector with more than 4 locales' to v0.27 [\#9709](https://github.com/decidim/decidim/pull/9709)
+- **decidim-core**, **decidim-dev**, **decidim-generators**: Backport 'Fix data consent expiry' to v0.27 [\#9742](https://github.com/decidim/decidim/pull/9742)
+- **decidim-core**: Backport 'Fix uninitialized constant errors with custom set of modules' to v0.27 [\#9743](https://github.com/decidim/decidim/pull/9743)
+- **decidim-meetings**: Backport 'Ignore participatory spaces without models in meetings visible_for scope' to v0.27 [\#9795](https://github.com/decidim/decidim/pull/9795)
+- **decidim-admin**: Backport 'Fix leaking emails on admin user search controller' to 0.27 [\#9796](https://github.com/decidim/decidim/pull/9796)
+- **decidim-core**: Backport 'Fix order of last activities' to v0.27 [\#9802](https://github.com/decidim/decidim/pull/9802)
+- **decidim-conferences**: Backport 'Fix conference speaker avatars' to v0.27 [\#9823](https://github.com/decidim/decidim/pull/9823)
+- **decidim-core**: Backport 'Prevent the account edit route through Devise' to v0.27 [\#9806](https://github.com/decidim/decidim/pull/9806)
+- **decidim-accountability**, **decidim-core**, **decidim-debates**, **decidim-initiatives**, **decidim-meetings**, **decidim-proposals**: Backport 'Fix version pages showing a HTTP 500 error when the version does not exist' to v0.27 [\#9810](https://github.com/decidim/decidim/pull/9810)
+- **decidim-core**: Backport 'Fix hashtags not recognized at the beginning of the string' to v0.27 [\#9812](https://github.com/decidim/decidim/pull/9812)
+- **decidim-comments**: Backport 'Fix posting comments before the initial load has run' to v0.27 [\#9815](https://github.com/decidim/decidim/pull/9815)
+- **decidim-core**: Backport 'Fix hidden error messages on the registration form' to v0.27 [\#9814](https://github.com/decidim/decidim/pull/9814)
+- **decidim-core**: Backport 'Fix multitenant organizations stats cache' to v0.27 [\#9808](https://github.com/decidim/decidim/pull/9808)
+- **decidim-core**: Backport 'Fix character counter for the WYSIWYG editor' to v0.27 [\#9816](https://github.com/decidim/decidim/pull/9816)
+- **decidim-admin**, **decidim-initiatives**: Backport 'Fix initiatives components' to v0.27 [\#9824](https://github.com/decidim/decidim/pull/9824)
+- **decidim-core**, **decidim-meetings**: Backport 'Fix iframe disabling producing invalid HTML' to v0.27 [\#9805](https://github.com/decidim/decidim/pull/9805)
+- **decidim-assemblies**, **decidim-participatory processes**: Backport 'Fix import of images on spaces' to v0.27 [\#9804](https://github.com/decidim/decidim/pull/9804)
+- **decidim-core**: Backport 'Fix doorkeeper initialization after 5.6.0 release' to v0.27 [\#9787](https://github.com/decidim/decidim/pull/9787)
+
+#### Removed
 
 Nothing.
 
-### Changed
+#### Developer improvements
 
 Nothing.
 
-### Fixed
+## [0.27.0.rc1](https://github.com/decidim/decidim/tree/0.27.0.rc1)
 
-- **decidim-meetings**: Backport "Fix the meetings export to also include unpublished meetings" to v0.26 [\#8939](https://github.com/decidim/decidim/pull/8939)
-- **decidim-system**, **decidim-verifications**: Backport "Fix verification report with multitenants" to v0.26 [\#8940](https://github.com/decidim/decidim/pull/8940)
-- **decidim-core**: Backport "Fix officialized user event missing translations" to v0.26 [\#8942](https://github.com/decidim/decidim/pull/8942)
-- **decidim-verifications**: Backport "Fix email for verification conflict with managed users" to v0.26 [\#8945](https://github.com/decidim/decidim/pull/8945)
-- **decidim-core**: Backport "Fix profile notifications" to v0.26 [\#8949](https://github.com/decidim/decidim/pull/8949)
-- **decidim-assemblies**, **decidim-budgets**, **decidim-comments**, **decidim-consultations**, **decidim-core**, **decidim-elections**, **decidim-forms**, **decidim-initiatives**, **decidim-participatory processes**, **decidim-proposals**: Backport several accessibility fixes to v0.26 [\#8950](https://github.com/decidim/decidim/pull/8950)
-- **decidim-core**: Backport "Add missing 'Locale' string in i18n in account page" to v0.26 [\#8980](https://github.com/decidim/decidim/pull/8980)
-- **decidim-meetings**: Backport "Truncate the meetings card description" to v0.26 [\#8979](https://github.com/decidim/decidim/pull/8979)
-- **decidim-proposals**: Backport "Fix proposals' cards with big images" to v0.26 [\#8978](https://github.com/decidim/decidim/pull/8978)
-- **decidim-initiatives**: Backport "Fix link to docs in initiatives admin" to v0.26 [\#8975](https://github.com/decidim/decidim/pull/8975)
-- **decidim-comments**: Backport "Fix budget hard dependency and caching flag issues in comments" to v0.26 [\#8973](https://github.com/decidim/decidim/pull/8973)
-- **decidim-participatory processes**: Backport "Fix processes creation form with stats, metrics and announcements" to v0.26 [\#8977](https://github.com/decidim/decidim/pull/8977)
-- **decidim-initiatives**: Backport "Show signatures in answered initiatives" to v0.26 [\#8991](https://github.com/decidim/decidim/pull/8991)
-- **decidim-core**: Backport "Add missing reveal__title classes" to v0.26 [\#8999](https://github.com/decidim/decidim/pull/8999)
-- **decidim-core**: Backport "Remove the label from the dropdown menu opener" to v0.26 [\#9002](https://github.com/decidim/decidim/pull/9002)
-- **decidim-core**: Backport "Fix mobile nav keyboard focus" to v0.26 [\#9001](https://github.com/decidim/decidim/pull/9001)
-- **decidim-core**: Backport "Fix main navigation aria-current attribute" to v0.26 [\#9000](https://github.com/decidim/decidim/pull/9000)
-- **decidim-core**: Backport "Show character counter when replying to message" to v0.26 [\#9003](https://github.com/decidim/decidim/pull/9003)
-- **decidim-core**: Backport "Fix character counter with emoji picker close to maximum characters" to v0.26 [\#9012](https://github.com/decidim/decidim/pull/9012)
-- **decidim-api**, **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-initiatives**, **decidim-meetings**, **decidim-participatory processes**, **decidim-proposals**: Backport "Fix API when meetings have proposal linking disabled" to v0.26 [\#8992](https://github.com/decidim/decidim/pull/8992)
-- **decidim-core**: Backport "Fix Devise flash messages translation" to v0.26 [\#9043](https://github.com/decidim/decidim/pull/9043)
-- **decidim-core**: Backport "Disable new conversation next button when no users selected" to v0.26 [\#9054](https://github.com/decidim/decidim/pull/9054)
-- **decidim-initiatives**: Backport "Fix initiatives signatures issues" to v0.26 [\#8974](https://github.com/decidim/decidim/pull/8974)
-- **decidim-blogs**, **decidim-core**, **decidim-debates**, **decidim-proposals**: Backport "Fix for endorsed_by with other user group's member" to v0.26 [\#9062](https://github.com/decidim/decidim/pull/9062)
-- **decidim-proposals**: Backport "Fix footer actions caching on proposals' card" to v0.26 [\#9063](https://github.com/decidim/decidim/pull/9063)
-- **decidim-admin**: Backport "Add missing 'Locale' string in i18n in selective newsletter" to v0.26 [\#9064](https://github.com/decidim/decidim/pull/9064)
-- **decidim-core**: Backport "Fix social share button sharing" to v0.26 [\#9065](https://github.com/decidim/decidim/pull/9065)
-- **decidim-meetings**: Backport "Use published meetings scope on processes landing and proposal's form" to v0.26 [\#9066](https://github.com/decidim/decidim/pull/9066)
-- **decidim-core**: Backport "Require omniauth/rails_csrf_protection explicitly" to v0.26 [\#9067](https://github.com/decidim/decidim/pull/9067)
-- **decidim-core**, **decidim-proposals**: Backport "Fix amendable events title" to v0.26 [\#9079](https://github.com/decidim/decidim/pull/9079)
-- **decidim-proposals**: Backport "Create admin log records when proposals are imported from a file" to v0.26 [\#9077](https://github.com/decidim/decidim/pull/9077)
-- **decidim-comments**, **decidim-core**, **decidim-proposals**: Backport "Add noreferrer and ugc to links" to v0.26 [\#9078](https://github.com/decidim/decidim/pull/9078)
-- **decidim-meetings**: Backport "Fix submit in meetings admin form" to v0.26 [\#9076](https://github.com/decidim/decidim/pull/9076)
-- **decidim-core**: Backport "Fix session cookie SameSite policy" to v0.26 [\#9059](https://github.com/decidim/decidim/pull/9059)
-- **decidim-budgets**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Backport "Fix cache URLs on cards" to v0.26 [\#9074](https://github.com/decidim/decidim/pull/9074)
-- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-core**, **decidim-initiatives**, **decidim-participatory processes**: Backport "Fix Twitter hashtag search when it starts with a number" to v0.26 [\#9075](https://github.com/decidim/decidim/pull/9075)
+### 1. Upgrade notes
 
-### Removed
+As usual, we recommend that you have a full backup, of the database, application code and static files.
 
-Nothing.
+To update, follow these steps:
 
-### Internal
+#### 1.1. Update your Gemfile
 
-- Backport "Fix ActionMailer preview loading" to v0.26 [\#8963](https://github.com/decidim/decidim/pull/8963)
-- Backport "Fix flaky spec in meetings multi-date selectors" to v0.26 [\#8976](https://github.com/decidim/decidim/pull/8976)
-- Backport "Local HTML validator for the CI" to v0.26 [\#9004](https://github.com/decidim/decidim/pull/9004)
-- Backport "Fix API when meetings have proposal linking disabled" to v0.26 [\#8992](https://github.com/decidim/decidim/pull/8992)
+```ruby
+gem "decidim", "0.27.0.rc1"
+gem "decidim-dev", "0.27.0.rc1"
+```
 
-### Developer improvements
+#### 1.2. Run these commands
 
-- Backport "Fix Devise configs that depend on Decidim configs" to v0.26 [\#9022](https://github.com/decidim/decidim/pull/9022)
-- Backport "Fix Faker address country code in seeds" to v0.26 [\#9046](https://github.com/decidim/decidim/pull/9046)
+```console
+bundle update decidim
+bin/rails decidim:upgrade
+bin/rails db:migrate
+```
 
-## [0.26.0](https://github.com/decidim/decidim/tree/v0.26.0)
+#### 1.3. Follow the steps and commands detailed in these notes
 
-### Added
+### 2. General notes
 
-Nothing.
+#### 2.1. Ruby update to 3.0
 
-### Changed
+We have updated the Ruby version to 3.0.2. Upgrading to this version will require either to install the Ruby Version on your host, or change the decidim docker image to use ruby:3.0.2.
 
-- **decidim-comments**: Backport "Show hidden comments replies" to v0.26 [\#8868](https://github.com/decidim/decidim/pull/8868)
+You can read more about this change on PR [\#8452](https://github.com/decidim/decidim/pull/8452).
 
-### Fixed
+#### 2.2. Rails update to 6.1
 
-- **decidim-proposals**: Backport "Fix geocoding NaN values" to v0.26 [\#8778](https://github.com/decidim/decidim/pull/8778)
-- **decidim-core**: Backport "Add 'nofollow noopener' rel to the profile personal URL" to v0.26 [\#8780](https://github.com/decidim/decidim/pull/8780)
-- **decidim-generators**: Backport "Add .keep file to empty directory to include on git committing" to v0.26 [\#8788](https://github.com/decidim/decidim/pull/8788)
-- **decidim-core**: Backport "Fix avatar upload validation errors are displayed twice" to v0.26 [\#8798](https://github.com/decidim/decidim/pull/8798)
-- **decidim-meetings**: Backport "Fix displaying hidden meetings in homepage's 'upcoming meetings' content block" to v0.26 [\#8819](https://github.com/decidim/decidim/pull/8819)
-- **decidim-participatory processes**: Backport "Fix characters not encoded in highlighted participatory processes groups title" to v0.26 [\#8824](https://github.com/decidim/decidim/pull/8824)
-- **decidim-comments**: Backport "Fix displaying hidden related resources" to v0.26 [\#8835](https://github.com/decidim/decidim/pull/8835)
-- **decidim-generators**: Backport "Add natively a .keep file to empty directory to include on git committing" to v0.26 [\#8836](https://github.com/decidim/decidim/pull/8836)
-- **decidim-consultations**, **decidim-core**, **decidim-elections**: Backport "Fix report moderation for all the spaces" to v0.26 [\#8841](https://github.com/decidim/decidim/pull/8841)
-- **decidim-meetings**, **decidim-participatory processes**: Backport "Fix displaying hidden meetings in show process page" to v0.26 [\#8843](https://github.com/decidim/decidim/pull/8843)
-- **decidim-meetings**: Backport "Fix displaying hidden resources in global search" to v0.26  [\#8850](https://github.com/decidim/decidim/pull/8850)
-- **decidim-core**: Backport "Fix activity cell disappearing author images" to v0.26 [\#8848](https://github.com/decidim/decidim/pull/8848)
-- **decidim-initiatives**: Backport "Fix scope validation on initiative's creation" to v0.26 [\#8857](https://github.com/decidim/decidim/pull/8857)
-- **decidim-accountability**: Backport "Fix accountability categories' colors" to v0.26 [\#8858](https://github.com/decidim/decidim/pull/8858)
-- **decidim-debates**: Backport "Remove actions from debates' cards" to v0.26 [\#8861](https://github.com/decidim/decidim/pull/8861)
-- **decidim-assemblies**: Backport "Fix assemblies title when there are unpublished children" to v0.26 [\#8860](https://github.com/decidim/decidim/pull/8860)
-- **decidim-core**: Backport "Fix cache_hash generation in AuthorCell" to v0.26 [\#8862](https://github.com/decidim/decidim/pull/8862)
-- **decidim-meetings**, **decidim-participatory processes**: Backport "Fix displaying hidden meetings in processes group's 'upcoming meetings' content block" to v0.26 [\#8864](https://github.com/decidim/decidim/pull/8864)
-- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-proposals**: Backport "Fix notifications when there is a note proposal in other spaces than processes" to v0.26 [\#8865](https://github.com/decidim/decidim/pull/8865)
-- **decidim-proposals**: Backport "Fix answered proposals display" to v0.26 [\#8863](https://github.com/decidim/decidim/pull/8863)
-- **decidim-comments**: Backport "Show hidden comments replies" to v0.26 [\#8868](https://github.com/decidim/decidim/pull/8868)
-- **decidim-meetings**: Backport "Fix meetings iframe embed code" to v0.26 [\#8884](https://github.com/decidim/decidim/pull/8884)
+We have updated the Ruby on Rails version to 6.1. This will be done automatically when doing the `bundle update`. If you had any code customization you'll probably need to take this into account and update your code. Some important aspects to mention:
 
-### Removed
+- ActionMailer - Change default queue name of the deliver (:mailers) job to be the job adapter's default (:default)
+- ActiveSupport - Remove deprecated fallback to I18n.default_locale when config.i18n.fallbacks is empty. This change should be transparent for all the Decidim users that have configured the `Decidim.default_locale`
+- If you are using Spring, it is highly suggested to add the following line at the top of your application's `config/spring.rb` (especially if you are seeing the following messages in the console `ERROR: directory is already being watched!`):
 
-Nothing.
+```ruby
+require "decidim/spring"
+```
 
-### Internal
+You can read more about this change on PR [\#8411](https://github.com/decidim/decidim/pull/8411).
 
-- Backport "Fix flaky test in UpdateAssemblyMember" to v0.26 [\#8803](https://github.com/decidim/decidim/pull/8803)
+#### 2.3. Data consent change (aka "cookie consent")
 
-### Developer improvements
+Local data consent management has been updated, generally also referred to as "cookie consent". Supported data consent categories are essential, preferences, analytics and marketing.
 
-Nothing.
+This feature is many times referred to as "cookie consent" due to historic reasons but in Decidim we prefer to call it "data consent" because this can also include other data stored in the user's browser using its APIs, such as data added to LocalStorage.
 
-## [0.26.0.rc2](https://github.com/decidim/decidim/tree/v0.26.0.rc2)
+As many non-technical people are still more familiar with the "cookie" terminology, the user interface talks only about "Cookie consent" to make it easier to understand for non-technical participants.
 
-### Added
+Iframe HTML elements that are added with the editor or meeting forms are disabled until data consent is given for all data categories. Scripts that require local data to be stored in the user's browser could be added as follows:
 
-Nothing.
-#### Moderated content can now be removed from search index
-PR [\#8811](https://github.com/decidim/decidim/pull/8811) is addressing an issue when the moderated resources are not removed from the general search index.
+```html
+<script type="text/plain" data-consent="marketing">
+  console.log("marketing data consent given");
+</script>
+```
 
-This will automatically work for new moderated resources. For already existing ones, we have introduced a new task that will remove the moderated content from being displayed in search:
+Note that you need to define the `type="text/plain"` for the script that adds local data to the user's browser in order to prevent the script from being executed before data consent is given. You should also define the metadata for all the local data that you or your 3rd party scripts are adding to the user's browser.
 
-```ruby
+Mind that we also changed the data consent cookie from "decidim-cc" to "decidim-consent" by default. You can change it on your initializer, or update your legal notice accordingly.
+
+Learn more about [Data consent at Decidim Documentation](https://docs.decidim.org/en/customize/data_consent). You can read more about this change on PR [\#9271](https://github.com/decidim/decidim/pull/9271).
+
+#### 2.4. Configuration via Environment Variables
+
+We've modified the default installation to configure most of the application through Environment Variables. For existing installations we recommend that you migrate to this new model so its easier to configure your applications.
+
+As an example, after migrating to this, if you want to enable a setting, you'll need to:
+
+a. Set the correct Environment Variable
+b. Restart the server
+
+Until now the flow could be something like:
+
+a. Change your initializer
+b. Commit to git
+c. Push to git server
+d. Deploy to the server
+e. Restart the server
+
+For migrating:
+
+1. Backup your `config/secrets.yml` and `config/initializers/decidim.rb`
+1. Generate a new decidim app and copy your generated files
+1. Migrate your old settings to the new Environment Variables.
+
+Learn more about [Environment Variables at Decidim Documentation](https://docs.decidim.org/en/configure/environment_variables/). You can read more about this change on PR [\#8725](https://github.com/decidim/decidim/pull/8725).
+
+#### 2.5. GraphQL API documentation change
+
+We've replaced the `graphql-docs` npm package with gem. You shouldn't need to do anything as this will be handled automatically.
+
+The static documentation will be rendered into the `app/views/static/api/docs` directory, which is being refreshed automatically when you run `bin/rails decidim:upgrade`.
+
+You can read more about this change on PR [\#8631](https://github.com/decidim/decidim/pull/8631).
+
+#### 2.6. Custom icons new uploader
+
+We now only allow PNG images at Favicon so we can provide higher quality versions to mobile devices.
+
+You can read more about this change on PR [\#8645](https://github.com/decidim/decidim/pull/8645).
+
+#### 2.7. Strong password rules for admin users
+
+For extra security, there are new password rules for administrator users which are enabled by default. This means that:
+
+- This will force the current administrators to change their passwords after 90 days has passed from the previous login.
+- For development/testing/staging environments this also means that the default user passwords have changed to `decidim123456789` to match the minimum length rules for admins.
+- For consistency reasons, regular users password has also been changed with the seed data.
+
+The relevant [Environment Variables](https://docs.decidim.org/en/configure/environment_variables/) are:
+
+| Name | Value | Default value |
+| -------- | -------- | -------- |
+| DECIDIM_ADMIN_PASSWORD_STRONG     | Enable strong password rules for admin users.     | true     |
+| DECIDIM_ADMIN_PASSWORD_EXPIRATION_DAYS | Defines how many days admin passwords are valid before they need to be reset. | 90 |
+| DECIDIM_ADMIN_PASSWORD_REPETITION_TIMES | Defines how many previous passwords are compared against new admin user passwords. | 5 |
+| DECIDIM_ADMIN_PASSWORD_MIN_LENGTH | The minimum character length for admin user passwords. | 15 |
+
+You can read more about this change on PR [\#9347](https://github.com/decidim/decidim/pull/9347).
+
+#### 2.8 Service workers
+
+For the Progressive Web Application related features, like Push Notifications and Add To Home Screen, you'll need to update your webpack configuration:
+
+```console
+bin/rails decidim:webpacker:install
+```
+
+You'll need to also add these to your .gitignore:
+
+```gitignore
+public/sw.js
+public/sw.js.map
+```
+
+These files will be generated by the asset compilation task in your production server. Most of the time this should be handled automatically by your deployment process (like Capistrano or Heroku). In case that you need to run that manually, this is the command:
+
+```console
+bin/rails assets:precompile
+```
+
+In your development environment this should be happening automatically behind the scenes or if you are running the `./bin/webpack-dev-server` manually, during the recompilation process.
+
+### 3. One time actions
+
+These are one time actions that need to be done after the code is updated in the production database.
+
+#### 3.1. Moderated content can now be removed from search index
+
+We have fixed a bug where moderated resources weren't removed from the general search index. This will automatically work for new moderated resources. For already existing ones, we have introduced a new task that will remove the moderated content from being displayed in search:
+
+```console
 bin/rails decidim:upgrade:moderation:remove_from_search
 ```
 
-#### Default Decidim app fully configurable via ENV vars
+You can read more about this change on PR [\#8811](https://github.com/decidim/decidim/pull/8811).
 
-### Changed
+#### 3.2. New Comments statistics structure
 
-Nothing.
+We've fixed the stastics of comments in participatory spaces. You'll need to run the task:
 
-### Fixed
+```console
+bin/rails decidim_comments:update_participatory_process_in_comments
+```
 
-- **decidim-meetings**: Backport "Fix for preview unpublished meetings by admin user" to v0.26 [\#8724](https://github.com/decidim/decidim/pull/8724)
-- **decidim-comments**: Backport "Adds emojis when user edits a comment" to v0.26 [\#8743](https://github.com/decidim/decidim/pull/8743)
-- **decidim-core**: Backport "Properly mark sender and recipient in Conversation" to v0.26 [\#8746](https://github.com/decidim/decidim/pull/8746)
-- **decidim-participatory processes**: Backport "Fix order by weight in processes groups' processes content block" to v0.26 [\#8771](https://github.com/decidim/decidim/pull/8771)
-- **decidim-core**: Backport "Don't display blocked users in mentions" to v0.26 [\#8770](https://github.com/decidim/decidim/pull/8770)
+You can read more about this change on PR [\#8012](https://github.com/decidim/decidim/pull/8012).
 
-### Removed
+#### 3.3. Push Notifications
 
-Nothing.
+We've implemented Push Notifications for improving the engagement with the platform. To configure it:
 
-### Internal
+##### 3.3.1. Generate the VAPID keys by running the command
 
-- Backport "Revert the i18n-tasks initialization syntax" to v0.26 [\#8696](https://github.com/decidim/decidim/pull/8696)
-- Backport "Lock graphql version to 1.12 minor" to v0.26 [\#8695](https://github.com/decidim/decidim/pull/8695)
-- Disable codeclimate's stylelint [\#8711](https://github.com/decidim/decidim/pull/8711)
+```console
+bin/rails decidim:pwa:generate_vapid_keys
+```
 
-### Developer improvements
+##### 3.3.2. Copy them to your [Environment Variables](https://docs.decidim.org/en/configure/environment_variables/) file
 
-- Backport "Fix webpacker generator for modules" to v0.26 [\#8750](https://github.com/decidim/decidim/pull/8750)
+The relevant [Environment Variables](https://docs.decidim.org/en/configure/environment_variables/) are:
 
-## [0.26.0.rc1](https://github.com/decidim/decidim/tree/v0.26.0.rc1)
+| Name | Value | Default value |
+| -------- | -------- | -------- |
+| VAPID_PUBLIC_KEY | VAPID public key that will be used to sign the Push API requests. |  |
+| VAPID_PRIVATE_KEY | VAPID private key that will be used to sign the Push API requests. |  |
 
-### Migration notes
-#### Register assets paths
-To prevent Zeitwerk from trying to autoload classes from the `app/packs` folder, it's necesary to register these paths for each module and for the application using the method `Decidim.register_assets_path` on initializers. This is explained in the webpacker migration guides for [applications](https://github.com/decidim/decidim/blob/develop/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc#help-decidim-to-know-the-applications-assets-folder) and [modules](https://github.com/decidim/decidim/blob/develop/docs/modules/develop/pages/guide_migrate_webpacker_module.adoc#help-decidim-to-know-the-modules-assets-folder)), and was implemented in [\#8449](https://github.com/decidim/decidim/pull/8449).
+These will be printed to the console when you run the command instructed in the previous step.
 
-#### Unconfirmed access disabled by default
-As per [\#8233](https://github.com/decidim/decidim/pull/8233), by default all participants must confirm their email account to sign in. Implementors can change this setting as a [initializer configuration](https://docs.decidim.org/en/configure/initializer/#_unconfirmed_access_for_users):
+You can read more about this change on PR [\#8774](https://github.com/decidim/decidim/pull/8774).
 
-```ruby
-Decidim.configure do |config|
-  config.unconfirmed_access_for = 2.days
-end
+#### 3.4. Categories' description is deprecated
+
+The `description` field in the categories admin forms has been removed (this applies to any participatory space using categories). For now it's still available in the database, so you can extract it with the following command:
+
+```console
+bin/rails runner -e production 'Decidim::Category.pluck(:id, :name, :description).map { |row| puts row.join(";") }'
 ```
 
-#### User workflows change to prevent user enumeration attacks
+In the next version (v0.28.0) it will be fully removed from the database.
 
-Until now it was possible to see if an email account was registered in Decidim, by using features like "Forgot your password", as the response changed if the email existed ("`You will receive an email with instructions on how to reset your password in a few minutes`") that's different to a non-existing user account ("`could not be found. Did you sign up previously?`"). This allows User Enumration attacks, where a malicious actor can check if anyone has an acount in the platform. As per [\#8537](https://github.com/decidim/decidim/pull/8537), anyone has the same answer always "`If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes`".
+You can read more about this change on PR [\#8617](https://github.com/decidim/decidim/pull/8617).
 
-#### Blocked user in global search
+#### 3.5. Global search user by nickname
 
-PR [\#8658](https://github.com/decidim/decidim/pull/8658) Blocked users are present in global search, to update the search and make them disappear, Run in a rails console or create a migration with:
+We've added the ability to search for a user by nickname. You'll need to update the existing search index by running this in (be aware that it could take a while if your database has a lot of Users!):
 
-```ruby
-  Decidim::User.find_each(&:try_update_index_for_search_resource)
+```console
+bin/rails runner -e production 'Decidim::User.find_each { |u| puts "Processing user #{u.id}" ; u.try_update_index_for_search_resource }'
 ```
 
-Please be aware that it could take a while if your database has a lot of Users.
+You can read more about this change on PR [\#8658](https://github.com/decidim/decidim/pull/8658).
 
-#### Fix statistics in Comments
+#### 3.6. Add CORS policy for dynamic file uploads
 
-As per [#8012](https://github.com/decidim/decidim/pull/8012), for fixing statistic in comments. There's a rake task that you need to run:
+This release allows Decidim users to upload files to Decidim dynamically from their browsers. If you are using any external file storage providers, such as Amazon S3, Google Cloud Storage or Azure Storage, you need to configure a CORS policy for these service providers to make the uploads work for the end users. If you are using the default configurations with a local file storage, you don't have to do any extra configuration to make this work.
 
-```ruby
-rake decidim_comments:update_participatory_process_in_comments
+To configure the CORS policy for each 3rd party service, please refer to the [Active Storage section](https://docs.decidim.org/en/services/activestorage.html) of the documentation.
+
+You can read more about this change on PR [\#8681](https://github.com/decidim/decidim/pull/8681).
+
+### 4. Scheduled tasks
+
+Implementers need to configure these changes it in your scheduler task system in the production server. We give the examples with `crontab`, although alternatively you could use `whenever` gem or the scheduled jobs of your hosting provider.
+
+#### 4.1. Reminders for participants
+
+We have added the possibility to send reminders for some actions, like pending budgets orders or user generated meetings that weren't closed.
+
+```console
+# Generate reminders
+4 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:reminders:all
+```
+
+You can read more about this change on PR [\#8621](https://github.com/decidim/decidim/pull/8621).
+
+#### 4.2. Mail Notifications digest
+
+Participants can configure if they want to receive notifications in real-time (one email by any action that they're notified to), or a daily or weekly notifications digest (a highlight with some of the notifications).
+
+```console
+# Send notification mail digest daily
+5 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:mailers:notifications_digest_daily
+
+# Send notification mail digest weekly on saturdays
+5 0 * * 6 cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:mailers:notifications_digest_weekly
 ```
 
-#### Base64 images migration
+You can read more about this change on PR [\#8833](https://github.com/decidim/decidim/pull/8833).
 
-As per [\#8250](https://github.com/decidim/decidim/pull/8250), we've replaced the default base64 editor images attachment with the use of ActiveStorage attachments. This PR also adds a task to parse all editor contents and replace existing base64 images with attachments. The task parses all the attributes which can be edited from admin using the WYSIWYG editor. The task requires an argument with the email of an admin used to create EditorImage instances. To run this task execute:
+#### 4.3. Rename data portability to download your data
 
+"Data portability" has been renamed to "Download you data". As this was a scheduled task that was already configured you'll need to change it. Where you had:
+
+```console
+# Remove expired data portability files
+0 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:delete_data_portability_files
 ```
-rails decidim:active_storage_migrations:migrate_inline_images_to_active_storage[admin_email]
+
+Changes to:
+
+```console
+# Remove expired download your data files
+0 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:delete_download_your_data_files
 ```
 
-### Added
+You can read more about this change on PR [\#9196](https://github.com/decidim/decidim/pull/9196).
 
-- **decidim-budgets**: Port decidim-budgets improvements from AjuntamentdeBarcelona/decidim [\#8249](https://github.com/decidim/decidim/pull/8249)
-- **decidim-elections**: Improve evote admin logs [\#8263](https://github.com/decidim/decidim/pull/8263)
-- **decidim-blogs**, **decidim-meetings**: Add card images to meetings and blog posts [\#8276](https://github.com/decidim/decidim/pull/8276)
-- **decidim-admin**: Align UI groups filtering with the rest of decidim  [\#8105](https://github.com/decidim/decidim/pull/8105)
-- **decidim-admin**, **decidim-proposals**: Improve error messages in admin panel [\#8193](https://github.com/decidim/decidim/pull/8193)
-- **decidim-elections**: Allow to mark trustees as missing [\#8314](https://github.com/decidim/decidim/pull/8314)
-- **decidim-admin**: Add sorting to private participants in a participatory space [\#8242](https://github.com/decidim/decidim/pull/8242)
-- **decidim-comments**: Improve control of comments in meetings and debates [\#8027](https://github.com/decidim/decidim/pull/8027)
-- **decidim-proposals**: Offer a way to see all proposals in withdrawn proposal list [\#8251](https://github.com/decidim/decidim/pull/8251)
-- **decidim-admin**, **decidim-proposals**: Configurable default order for proposals [\#8295](https://github.com/decidim/decidim/pull/8295)
-- **decidim-assemblies**: Filter assemblies by assembly type in admin [\#7153](https://github.com/decidim/decidim/pull/7153)
-- **decidim-assemblies**: Non participant assembly members avatar [\#8277](https://github.com/decidim/decidim/pull/8277)
-- **decidim-core**: Add image file upload in QuillJS editor [\#8250](https://github.com/decidim/decidim/pull/8250)
-- **decidim-meetings**: Make meeting report editable by the author in front-end [\#8209](https://github.com/decidim/decidim/pull/8209)
-- **decidim-core**: Improve dialog accessibility [\#8294](https://github.com/decidim/decidim/pull/8294)
-- **decidim-meetings**: Ability for users to withdraw their meetings [\#8248](https://github.com/decidim/decidim/pull/8248)
-- **decidim-admin**: Add colors accessibility warning in admin Appearance [\#8354](https://github.com/decidim/decidim/pull/8354)
-- **decidim-proposals**: Import proposal answers [\#8271](https://github.com/decidim/decidim/pull/8271)
-- **decidim-core**: Add more actions in QuillJS toolbar [\#8120](https://github.com/decidim/decidim/pull/8120)
-- **decidim-meetings**: Add more filter options to directory meetings page [\#8333](https://github.com/decidim/decidim/pull/8333)
-- **decidim-assemblies**, **decidim-conferences**, **decidim-participatory processes**: Add filters for Participatory process admins section [\#8106](https://github.com/decidim/decidim/pull/8106)
-- **decidim-budgets**: Show modal when user is trying to leave with pending vote [\#8387](https://github.com/decidim/decidim/pull/8387)
-- **decidim-meetings**: Meetings iframe visibility [\#8307](https://github.com/decidim/decidim/pull/8307)
-- **decidim-budgets**: Add search, filters and sorting to admin panel budget projects [\#8592](https://github.com/decidim/decidim/pull/8592)
-- **decidim-core**: Describe the notifications' time with words [\#8564](https://github.com/decidim/decidim/pull/8564)
-- **decidim-comments**, **decidim-core**: Add link to comments in Notifications [\#8607](https://github.com/decidim/decidim/pull/8607)
-- **decidim-comments**, **decidim-core**: Add full content of comments in notifications [\#8581](https://github.com/decidim/decidim/pull/8581)
-- **decidim-core**: Change colors on mobile navigation bar [\#8628](https://github.com/decidim/decidim/pull/8628)
-- **decidim-core**, **decidim-proposals**: Add author to proposals in notifications [\#8603](https://github.com/decidim/decidim/pull/8603)
-- **decidim-comments**, **decidim-core**, **decidim-meetings**, **decidim-proposals**: Allow participants to receive translated content by email [\#8174](https://github.com/decidim/decidim/pull/8174)
-- **decidim-admin**: Add search, filters, pagination and sorting to moderated users [\#8620](https://github.com/decidim/decidim/pull/8620)
-- **decidim-surveys**: Add "title and description" in surveys [\#8588](https://github.com/decidim/decidim/pull/8588)
+### 5. Changes in APIs
 
-### Changed
+#### 5.1. Javascript load at the bottom of the pages
 
-- **decidim-elections**: Validate census CSV headers [\#8264](https://github.com/decidim/decidim/pull/8264)
-- **decidim-meetings**: Improve Attendees count error handling on frontend [\#8238](https://github.com/decidim/decidim/pull/8238)
-- **decidim-core**: Disable unconfirmed access by default [\#8233](https://github.com/decidim/decidim/pull/8233)
-- **decidim-meetings**: Rename 'upcoming events' content block to 'upcoming meetings' [\#8412](https://github.com/decidim/decidim/pull/8412)
-- **decidim-core**: Change user workflows to prevent user enumeration attacks [\#8537](https://github.com/decidim/decidim/pull/8537)
+For improving performance and load times, we've moved javascript snippets to the bottom of `body` sections.
 
-### Fixed
+If you are redefining Decidim layout, using partials including javascript packs, or have the "HTML snippet" option enabled, you might need to review them.
 
-- **decidim-accountability**: Fix accountability notifications proposal title [\#8240](https://github.com/decidim/decidim/pull/8240)
-- **decidim-elections**: Remove white spaces in Census [\#8262](https://github.com/decidim/decidim/pull/8262)
-- **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Fix characters not encoded in title [\#8253](https://github.com/decidim/decidim/pull/8253)
-- **decidim-proposals**: Fix flaky test on proposals splitting [\#8302](https://github.com/decidim/decidim/pull/8302)
-- **decidim-core**: Fix invalid i18n values for diff changeset [\#8299](https://github.com/decidim/decidim/pull/8299)
-- **decidim-meetings**: Fix live? missing method delegation in online_meeting cell [\#8241](https://github.com/decidim/decidim/pull/8241)
-- **decidim-comments**: Fix statistics in Comments [\#8012](https://github.com/decidim/decidim/pull/8012)
-- **decidim-budgets**: Fix some explore budgets specs [\#8303](https://github.com/decidim/decidim/pull/8303)
-- **decidim-core**: Fix missing icons after CORS [\#8290](https://github.com/decidim/decidim/pull/8290)
-- **decidim-core**: Remove unnecessary spacer from external link indicator [\#8291](https://github.com/decidim/decidim/pull/8291)
-- **decidim-core**: [CVE-2021-22942] Possible Open Redirect in Host Authorization Middleware [\#8265](https://github.com/decidim/decidim/pull/8265)
-- **decidim-debates**: Fix "last comment by" when commenter is a user group [\#8279](https://github.com/decidim/decidim/pull/8279)
-- **decidim-proposals**: Similar proposal functionality breaks when the machine translation is enabled.  [\#8098](https://github.com/decidim/decidim/pull/8098)
-- **decidim-core**: Fix regex that parses users and groups references inside content. [\#8297](https://github.com/decidim/decidim/pull/8297)
-- **decidim-assemblies**: Fix birthday attribute type in Assembly Members [\#8311](https://github.com/decidim/decidim/pull/8311)
-- **decidim-comments**: Fix issues with dynamic comments polling [\#8317](https://github.com/decidim/decidim/pull/8317)
-- **decidim-assemblies**: Fix "Edit" and "View public page" in Assembly Members [\#8312](https://github.com/decidim/decidim/pull/8312)
-- **decidim-comments**: Fix "View all comments" link in single comment page [\#8308](https://github.com/decidim/decidim/pull/8308)
-- **decidim-budgets**: Fix dont allow budget exceeding in project view [\#8261](https://github.com/decidim/decidim/pull/8261)
-- **decidim-debates**: Fix title meta tag for debates [\#8323](https://github.com/decidim/decidim/pull/8323)
-- **decidim-proposals**: Fix UserAnswersSerializer for CSV exports [\#8329](https://github.com/decidim/decidim/pull/8329)
-- **decidim-admin**: Do not block registered users with InviteUserAgain [\#8268](https://github.com/decidim/decidim/pull/8268)
-- **decidim-conferences**: Fix error when accessing the meetings of a conference with speakers related  [\#8369](https://github.com/decidim/decidim/pull/8369)
-- **decidim-conferences**: Fix details on conference speakers: affiliation order, personal URL link, seeds and more info link  [\#8378](https://github.com/decidim/decidim/pull/8378)
-- **decidim-meetings**: Define localized fields in Decidim::Meetings:DiffRenderer [\#8381](https://github.com/decidim/decidim/pull/8381)
-- **decidim-core**: Include only public entities in the following page [\#8361](https://github.com/decidim/decidim/pull/8361)
-- **decidim-proposals**: Any user can access proposal's pages representing the "create a proposal" steps [\#8390](https://github.com/decidim/decidim/pull/8390)
-- **decidim-core**: Fix localized faker with single locale [\#8394](https://github.com/decidim/decidim/pull/8394)
-- **decidim-core**: Fix user activity page error message with missing username [\#8403](https://github.com/decidim/decidim/pull/8403)
-- **decidim-core**: Fix conversation with deleted account [\#8409](https://github.com/decidim/decidim/pull/8409)
-- **decidim-core**: Fix javascript exception when geocoding proposals is disabled [\#8413](https://github.com/decidim/decidim/pull/8413)
-- **decidim-blogs**: Add missing translations [\#8426](https://github.com/decidim/decidim/pull/8426)
-- **decidim-comments**: Refresh comments component after updating [\#8362](https://github.com/decidim/decidim/pull/8362)
-- **decidim-core**: Fix webpacker issue when using zeitwerk [\#8444](https://github.com/decidim/decidim/pull/8444)
-- **decidim-core**: Improve Zeitwerk assets paths to ignore [\#8449](https://github.com/decidim/decidim/pull/8449)
-- **decidim-surveys**: Fix notification after creating survey [\#8463](https://github.com/decidim/decidim/pull/8463)
-- **decidim-budgets**, **decidim-comments**: Fix comment's get link in project view [\#8450](https://github.com/decidim/decidim/pull/8450)
-- **decidim-elections**: Fix report missing trustee admin log entry [\#8468](https://github.com/decidim/decidim/pull/8468)
-- **decidim-system**: Add `pptx` in allowed_file_extensions (of admin) [\#8502](https://github.com/decidim/decidim/pull/8502)
-- **decidim-core**: Fix 404 link in 'how to participate' home content block [\#8513](https://github.com/decidim/decidim/pull/8513)
-- **decidim-meetings**: Fix meetings with multiple dates [\#8497](https://github.com/decidim/decidim/pull/8497)
-- **decidim-core**: Fix pt-BR issue [\#8523](https://github.com/decidim/decidim/pull/8523)
-- **decidim-generators**: Freezing webpacker to RC.5 until RC.7 is fixed [\#8531](https://github.com/decidim/decidim/pull/8531)
-- **decidim-conferences**: Fix conference speakers when there isn't any avatar [\#8520](https://github.com/decidim/decidim/pull/8520)
-- **decidim-assemblies**, **decidim-participatory processes**: Fix the copy of components weights in participatory processes and assemblies [\#8498](https://github.com/decidim/decidim/pull/8498)
-- **decidim-meetings**: Fix meetings input when rich text editor is disabled [\#8534](https://github.com/decidim/decidim/pull/8534)
-- **decidim-meetings**: Fix showing created meetings in 'my public profile' [\#8519](https://github.com/decidim/decidim/pull/8519)
-- **decidim-meetings**, **decidim-proposals**: Fix various proposal picker issues when there are thousands of proposals [\#8558](https://github.com/decidim/decidim/pull/8558)
-- **decidim-core**: Remove border on all the fieldsets [\#8561](https://github.com/decidim/decidim/pull/8561)
-- **decidim-initiatives**: Remove wrong </div> in initiatives header [\#8563](https://github.com/decidim/decidim/pull/8563)
-- **decidim-core**: Fix CSS layout wrapper top padding [\#8562](https://github.com/decidim/decidim/pull/8562)
-- **decidim-forms**, **decidim-surveys**: Fix duplicated answers in surveys [\#8560](https://github.com/decidim/decidim/pull/8560)
-- **decidim-meetings**: Fix the meeting copy functionality [\#8430](https://github.com/decidim/decidim/pull/8430)
-- **decidim-core**: Move social login buttons to the top of the login modal [\#8574](https://github.com/decidim/decidim/pull/8574)
-- **decidim-comments**, **decidim-meetings**: Fix HTML injection in comments and meeting's description [\#8511](https://github.com/decidim/decidim/pull/8511)
-- **decidim-core**: Fix avatar thumbnail in participants' profile [\#8577](https://github.com/decidim/decidim/pull/8577)
-- **decidim-core**: Rename index to avoid conflicts with decidim_awesome module migrations [\#8613](https://github.com/decidim/decidim/pull/8613)
-- **decidim-core**: Fix group mentions in notifications [\#8598](https://github.com/decidim/decidim/pull/8598)
-- **decidim-forms**, **decidim-surveys**: Fix surveys exports with free text in multiple option [\#8582](https://github.com/decidim/decidim/pull/8582)
-- **decidim-core**: Fix reply to a conversation with deleted participants [\#8635](https://github.com/decidim/decidim/pull/8635)
-- **decidim-admin**, **decidim-debates**, **decidim-proposals**: Fix consistency in creation actions phrasing: "Participants can create XXX" [\#8650](https://github.com/decidim/decidim/pull/8650)
-- **decidim-core**: Fix wrong display of deleted accounts in conversations [\#8641](https://github.com/decidim/decidim/pull/8641)
-- **decidim-core**: Fix cache key on ActivityCell [\#8654](https://github.com/decidim/decidim/pull/8654)
-- **decidim-participatory processes**: Fix participatory groups leaks on other organizations/tenants [\#8651](https://github.com/decidim/decidim/pull/8651)
-- **decidim-core**: Fix blocked users appear in search [\#8658](https://github.com/decidim/decidim/pull/8658)
-- **decidim-meetings**: Don't start poll meetings component when DOM elements are not present [\#8676](https://github.com/decidim/decidim/pull/8676)
-- **decidim-initiatives**, **decidim-proposals**: Fix initiative attachments [\#7452](https://github.com/decidim/decidim/pull/7452)
-- **decidim-assemblies**: Fix performance issues on assemblies page when having many private users [\#8509](https://github.com/decidim/decidim/pull/8509)
-- **decidim-proposals**: Add location data to proposals export and import [\#8679](https://github.com/decidim/decidim/pull/8679)
-- **decidim-meetings**: Fix meetings form embed type visibility [\#8602](https://github.com/decidim/decidim/pull/8602)
-- **decidim-meetings**: Do not send upcoming meeting events notification for past events [\#8665](https://github.com/decidim/decidim/pull/8665)
+Also, you can no longer call jQuery or any other library in your views directly. For example the following snippet won't work:
 
-### Removed
+```javascript
+<script>
+$(() => {
+  $(".some-element").addClass("page-loadded"); // THIS WON'T WORK!
+});
+</script>
+```
 
-- **decidim-proposals**: Remove "Allow card image" setting from Proposals [\#8281](https://github.com/decidim/decidim/pull/8281)
-- **decidim-assemblies**: Remove designation_mode field from Assembly Members [\#8310](https://github.com/decidim/decidim/pull/8310)
-- **decidim-participatory processes**: Remove admin show page in Participatory Process Groups [\#8313](https://github.com/decidim/decidim/pull/8313)
+Instead of that, you should encapsulate it in a `content_for(:js_content)` block, that will render the snippet
+right after javascript bundles have been loaded.
+
+```javascript
+<% content_for(:js_content) do %>
+  <script>
+    $(() => {
+      $(".some-element").addClass("page-loadded");
+    });
+  </script>
+<% end %>
+```
 
-### Developer improvements
+You can read more about this change on PR [\#9156](https://github.com/decidim/decidim/pull/9156).
 
-- Fix Luxembourgish locale [\#8270](https://github.com/decidim/decidim/pull/8270)
-- Fix ARIA roles for dialogs and tooltips [\#8293](https://github.com/decidim/decidim/pull/8293)
-- Add selectors on edit_form_fields [\#8353](https://github.com/decidim/decidim/pull/8353)
-- Fix HTTPOnly and secure flag on the cookie acceptance cookie [\#8358](https://github.com/decidim/decidim/pull/8358)
-- Add Brakeman to GitHub Actions for improving security [\#6832](https://github.com/decidim/decidim/pull/6832)
-- Disallow redirection to the host when performing redirect_back [\#8296](https://github.com/decidim/decidim/pull/8296)
-- Improve performance on the serializers by using includes, query counter [\#8278](https://github.com/decidim/decidim/pull/8278)
-- Enforce redirects to include the organization host [\#8385](https://github.com/decidim/decidim/pull/8385)
-- Fix issues with the session/environment security configs [\#8360](https://github.com/decidim/decidim/pull/8360)
-- Improve extendability on some controllers [\#8398](https://github.com/decidim/decidim/pull/8398)
-- Add avatar eager logging to UserEntityFinder #8416 [\#8417](https://github.com/decidim/decidim/pull/8417)
-- Increase text contrast in current phase of a participatory process [\#8422](https://github.com/decidim/decidim/pull/8422)
-- Fix CVE-2021-41136 (HTTP Request Smuggling in puma) [\#8431](https://github.com/decidim/decidim/pull/8431)
-- Remove anchored dependency [\#8453](https://github.com/decidim/decidim/pull/8453)
-- Fix pt-BR issue [\#8523](https://github.com/decidim/decidim/pull/8523)
-- Add rendered view instrumentation information [\#8530](https://github.com/decidim/decidim/pull/8530)
-- Optimize open data exporter for large amount of data [\#8503](https://github.com/decidim/decidim/pull/8503)
-- Add cache key separator to cache_hash [\#8559](https://github.com/decidim/decidim/pull/8559)
-- Improve generation of the opendata export [\#8593](https://github.com/decidim/decidim/pull/8593)
-- Add several cache keys to cells [\#8566](https://github.com/decidim/decidim/pull/8566)
-- Update password strength check [\#8455](https://github.com/decidim/decidim/pull/8455)
-- Remove etherpad-lite dependency [\#8541](https://github.com/decidim/decidim/pull/8541)
-- Fix Rack::Attack initializer custom parameter configuration [\#8643](https://github.com/decidim/decidim/pull/8643)
+#### 5.2. Dynamic attachment uploads
 
-### Internal
+We've changed the way file uploads work in Decidim. Files are now dynamically uploaded inside the modal so we can give the user immediate feedback on validation. If you didn't have any customization involving file uploads you can ignore this.
+
+There are now two different types of file fields: titled and untitled. Titled file fields related to ```Decidim::Attachment``` internally.
+
+**To update your module** you probably have to update forms and commands related to upload field (also views should be updated in case of titled attachments). After successful a upload and submitting a form, request params should contain signed_id of [ActiveStorage::Blob](https://api.rubyonrails.org/classes/ActiveStorage/Blob.html) which you need to find the blob at the backend. Some examples:
+
+- To update view with titled file field see example: [edit_form_fields.html.erb](https://github.com/decidim/decidim/pull/8681/files#diff-17a22480fdfa3d439edcb26eb0a1a52bed5521d61ba36e0cc6ca83e838f03e9b)
+- To update untitled form example: [import_form.rb](https://github.com/decidim/decidim/pull/8681/files#diff-5ce71b5873906c6f8919f4bc1f8c330bd97e8757760705a66c789f375eb743c1)
+- To update untitled command example: [update_account.rb](https://github.com/decidim/decidim/pull/8681/files#diff-ed1274f76cd0ac1d5b223648dcdae670c2127c7dffa0d38540c1536a86f36abb)
 
-- Fix dependencies locks after 0.26.0.dev bump [\#8247](https://github.com/decidim/decidim/pull/8247)
-- Add modules recommendations in documentation [\#8218](https://github.com/decidim/decidim/pull/8218)
-- Fix webpacker dependency lock [\#8272](https://github.com/decidim/decidim/pull/8272)
-- Improve README with examples [\#8244](https://github.com/decidim/decidim/pull/8244)
-- Update foundation-sites to 6.7.0 for better Dart Sass compatibility [\#8273](https://github.com/decidim/decidim/pull/8273)
-- Fix NPM packages versioning during release process [\#8280](https://github.com/decidim/decidim/pull/8280)
-- Add 'Lint PR title' workflow to CI [\#8285](https://github.com/decidim/decidim/pull/8285)
-- Don't trigger PR linting on pushes, only on PRs [\#8304](https://github.com/decidim/decidim/pull/8304)
-- Prevent root package.json to be treated as a package [\#8315](https://github.com/decidim/decidim/pull/8315)
-- Fix CSS validation tests caused by a bug on the validation service [\#8322](https://github.com/decidim/decidim/pull/8322)
-- **decidim-core**: Remove npm decidim packages with dependencies from other decidim packages [\#8330](https://github.com/decidim/decidim/pull/8330)
-- **decidim-core**: Fix problems introduced by #8330 [\#8341](https://github.com/decidim/decidim/pull/8341)
-- Update Node and NPM version [\#8343](https://github.com/decidim/decidim/pull/8343)
-- Remove hack for CSS validation [\#8326](https://github.com/decidim/decidim/pull/8326)
-- Update docs in migrating to webpacker [\#8349](https://github.com/decidim/decidim/pull/8349)
-- **decidim-comments**: Ignore errors during comments migration task [\#8351](https://github.com/decidim/decidim/pull/8351)
-- **decidim-meetings**: Fix published and title in seeded meetings [\#8359](https://github.com/decidim/decidim/pull/8359)
-- **decidim-core**: Fix SQL to make version display faster [\#8393](https://github.com/decidim/decidim/pull/8393)
-- Remove GraphQL deprecated API call [\#8432](https://github.com/decidim/decidim/pull/8432)
-- **decidim-generators**: Fixing generator webpacker issues [\#8427](https://github.com/decidim/decidim/pull/8427)
-- **decidim-generators**: Fix railties requirements on created applications [\#8415](https://github.com/decidim/decidim/pull/8415)
-- **decidim-core**: Update omniauth gem and dependencies [\#8388](https://github.com/decidim/decidim/pull/8388)
-- Document how to enable machine translations on organization [\#8458](https://github.com/decidim/decidim/pull/8458)
-- **decidim-dev**: Improves manual installation documentation [\#8508](https://github.com/decidim/decidim/pull/8508)
-- Update the i18n-tasks initialization syntax [\#8544](https://github.com/decidim/decidim/pull/8544)
-- Documentation: improve develop section  [\#8553](https://github.com/decidim/decidim/pull/8553)
-- Change default window size in Capybara configuration [\#8576](https://github.com/decidim/decidim/pull/8576)
-- Fix security instructions [\#8587](https://github.com/decidim/decidim/pull/8587)
-- Temporarily ignore CSS validation issue in CI [\#8597](https://github.com/decidim/decidim/pull/8597)
-- Update nokogiri to 1.12.5 [\#8609](https://github.com/decidim/decidim/pull/8609)
-- Update paper_trail to 12.1 [\#8608](https://github.com/decidim/decidim/pull/8608)
-- Update ruby to 2.7.5 [\#8629](https://github.com/decidim/decidim/pull/8629)
-- Remove truncato dependency [\#8507](https://github.com/decidim/decidim/pull/8507)
-- Change figaro to rbenv-vars in "manual installation" documentation [\#8575](https://github.com/decidim/decidim/pull/8575)
-- Add instructions PostgreSQL configuration in development app [\#8618](https://github.com/decidim/decidim/pull/8618)
-- Fix etherpad doc reference in initializer [\#8632](https://github.com/decidim/decidim/pull/8632)
-- Clarifies git branches conventions in doc [\#8644](https://github.com/decidim/decidim/pull/8644)
-- Fix changelog link [\#8671](https://github.com/decidim/decidim/pull/8671)
-- Enable simplecov only for rspec step [\#8674](https://github.com/decidim/decidim/pull/8674)
-- **decidim-dev**: Improve machine translation documentation and comments [\#8668](https://github.com/decidim/decidim/pull/8668)
-- Split the workflows files for CI [\#8675](https://github.com/decidim/decidim/pull/8675)
-- DRY GitHub workflows with composite actions [\#8677](https://github.com/decidim/decidim/pull/8677)
-- Change Gitter to Matrix.org in documentation [\#8466](https://github.com/decidim/decidim/pull/8466)
+Learn more about [Direct Uploads at Rails Documentation](https://edgeguides.rubyonrails.org/active_storage_overview.html#direct-uploads). You can read more about this change on PR [\#8681](https://github.com/decidim/decidim/pull/8681).
+
+Module developers should also notice that when using `<%= form.upload :file %>` in your views, these fields are now automatically converted to dynamic upload fields. Regarding this, you will need to do a couple of changes in your code:
+
+1. In your form classes, specify the attribute type as `Decidim::Attributes::Blob`, e.g. `attribute :file, Decidim::Attributes::Blob`
+1. In your system tests, you might have previously used something like `attach_file(:your_form_file, file_fixture("your-test-file.xyz"))` to attach your file. Change these to `dynamically_attach_file(:your_form_file, file_fixture("your-test-file.xyz"))` in order to let the test helper handle the attachment for you as it has a few steps.
+1. In other tests (such as commands, controllers, etc.), you might have previously used something like `fixture_file_upload(file_fixture("your-test-file.xyz"), "text/plain")`. This will not work anymore after you do the changes in the forms as they now expect either blobs or blob signed ID references. To fix this, replace these with `upload_test_file(Rack::Test::UploadedFile.new(file_fixture("your-test-file.xyz"), "text/plain"))`.
+1. If you need to process files locally within your form classes or commands, you need to include the `Decidim::ProcessesFileLocally` concern and use the method it provides `process_file_locally(blob)` to get local access to the files that may be stored at 3rd party file storages. The method takes the ActiveStorage Blob as an argument and yields the path to the local file for the provided block argument.
+
+#### 5.3. `Decidim::Form`s no longer use `Rectify::Form` and `Virtus` should be no longer used
+
+If you don't have any customization involving Forms or `Virtus` you can ignore this.
+
+As per [\#8669](https://github.com/decidim/decidim/pull/8669), your `Decidim::Form`s will no longer use `Rectify::Form` or `Virtus.model` attributes because `Virtus` is discontinued and Decidim is loosening the dependency on the `virtus` gem. Instead, the attributes implementation is now based on [`ActiveModel::Attributes`](https://api.rubyonrails.org/classes/ActiveModel/Attributes/ClassMethods.html) with an integration layer within Decidim that aims to provide as much backwards compatibility as possible with the `Virtus.model` attributes that were previously used.
+
+For most cases, no changes in the code should be needed but there are specific differences with the implementation which may require changes in the 3rd party code as well. Both `Rectify::Form` and `Virtus` will be still available in the core (through the `rectify` gem) but you should migrate away from them as soon as possible as they may be removed in future versions of Decidim.
+
+There are specific things that you need to change regarding your Form or `Virtus.model` classes when migrating to `Decidim::AttributeObject`:
+
+- Change all instances of `YourForm < Rectify::Form` to `YourForm < Decidim::Form`. It should be very rare to find any classes in your code that inherit directly from `Rectify::Form` but in case you have used that, replace those references with `Decidim::Form`.
+- Change all instances of `include Virtus.model` to `include Decidim::AttributeObject::Model`.
+- For all file objects that may be of type `String` or `ActionDispatch::Http::UploadedFile`, remove the `String` type casting from these attributes as otherwise the uploaded file objects would be converted to strings. In other words, change all `attribute :uploaded_image, String` definitions within the forms to `attribute :uploaded_image` which allows them to be of any type.
+- Change all `attribute :attr_name, Hash` to `attribute :attr_name, Hash[Symbol => ExpectedType]` where `ExpectedType` is the type you are expecting the hash values to be. The new layer will default the hash key types to `Symbol` and hash value types to `Object` (= any type). The Virtus Hash attribute did not force any default types for these. It should be preferred to use the actual expected type for the values instead of `Object` (= any type) to make your code more robust and less buggy.
+- Change all `attribute :attr_name, Array` to `attribute :attr_name, Array[ExpectedType]` where `ExpectedType` is the type you are expecting the array values to be. It should be preferred to use the actual expected type for the values instead of `Object` (= any type) to make your code more robust and less buggy.
+- The original form attribute values are no longer available through the `@attr_name` instance variables within the Form or `Virtus.model` classes. Instead, change all these references to `@attributes["attr_name"].value` in case you want to fetch the original value of the attribute without using its accessor method. Another way is to provide an alias for the original attribute method before overriding it. If you have not overridden the original attribute accessor, simply remove the `@` character in front of the attribute name to fetch the attribute value using the original accessor method.
+- When calling the `attributes` method of the model/form classes, use strings to refer to the attribute names, not symbols as you might have done with `Virtus` or `Rectify::Form`. Change all `model.attributes[:attr_name]` method calls to `model.attributes["attr_name"]`.
+- When calling `model.attributes.slice(...)`, you also need to use strings to refer to the attribute keys. Change all instances of `model.attributes.slice(:attr1, :attr2)` to `model.attributes.slice("attr1", "attr2")`
+- If you had overridden any of the [`Rectify::Form` methods](https://github.com/andypike/rectify/blob/v0.13.0/lib/rectify/form.rb) within your form classes, remove those overrides. For example, you might have overridden the `form_attributes_valid?` method which no longer does anything. Instead, define a custom validation in order to add extra validations to your forms.
+- Very rarely, when defining a an attribute of type `Rails::Engine`, you need to change `attribute :attr_name, Rails::Engine` to `attribute :attr_name, Rails::Engine, **{}`. This is because we want to preserve the method signature against `ActiveModel::Attributes` for the `attribute` class method intead of the legacy `Virtus.model`. There is a limitation in the Ruby language that if the method has default values for the previous arguments and defines keyword arguments, the last argument will always receive a `respond_to?(:to_hash)` call to it which doesn't work for `Rails::Engine` (you can try it out in the Rails console by calling `Rails::Engine.respond_to?(:to_hash)`).
+- Test all your form and command classes thoroughly to notice any differences between the two implementations. The new layer is a bit more "robust" with some of the type castings, so some things may break during the migration in case you have relied on some of the oversights within `Virtus`.
+
+#### 5.4. `Rectify::Presenter` deprecated
+
+PR [\#8758](https://github.com/decidim/decidim/pull/8758) is deprecating the implementation of `Rectify::Presenter` in favour of `SimpleDelegator`
+
+#### 5.5. Searchlight removal
+
+The `searchlight` gem has been removed in favor of Ransack as of [\#8748](https://github.com/decidim/decidim/pull/8748) in order to standardize all searches within Decidim around a single way of performing searches. Ransack was selected as the preferred search backend because it is better maintained and has a larger community of developers around it compared to Searchlight.
+
+Ransack provides a search API that produces the search queries semi-automatically against the available database columns and ActiveRecord scopes made available for the Ransack searches while Searchlight used to require to write all the search logic manually in the search classes. Due to the inner workings of the Ransack gem and for consistency reasons, the following changes have been made for the search filtering:
+
+- For search scopes that are doing more than matching against a specific column in the database or require special programming logic during the searches, there is a new scope convention introduced with the `with_*` and `with_any_*` scope names. The `with_*` convention should be used when providing a search scope that searches against one key, such as `with_category(1)` and the `with_any_*` convention should be used when providing a search scope that searches against one or multiple keys, such as `with_any_category(1, 2, 3)`.
+  - An example of such scope is `with_any_category` provided by the `HasCategory` concern which searches against the provided category IDs or any sub-category of those category IDs. You can find all the introduced (or changed) scopes by searching for `scope :with_` within the Decidim codebase.
+  - With Searchlight, these search parameters were provided e.g. as `category_id` which was then used to perform the explained search query manually in the ResourceSearch class which is now used for a different purpose. As the search now happens through Ransack and the ActiveRecord scopes, these parameters have been renamed to better explain what they do. With Ransack, matching e.g. against the `category_id_eq` key would mean that the search is done against this specific column in the record's database table and only searching for the provided search input (and not e.g. the parent categories in the category case).
+- The origin scopes provided by `Decidim::Authorable` and `Decidim::Coauthorable` have been renamed with the `with_` prefix as explained above.
+- All the filtering key changes have been reflected to the participant filtering views (`_filters.html.erb` in most modules) as well as the controller methods `default_filter_params` where applicable.
+- The `default_filter_params` method within the participant-facing controllers now defines all the parameters that are allowed in the search queries and only these parameters are passed to the Ransack search. This limitation is made in order to protect the participant views from providing more searching options through the URL parameters than they are supposed to provide. In the past, the `Searchlight::Search` classes took care of utilizing only the allowed parameters but Ransacker does not have any middle-layer that would do the same, which is why the limitation is done at the controller side.
+- The `search_collection` method now defines the base collection used for the searches within the filtering controllers. In previous versions, there used to be a method that defined a `search_klass` method that defined the `Searchlight::Search` class to be used as the basis for the search. Now, the `search_collection` defines the base collection instead against which the Ransack search is run.
+
+3rd party developers that have developed their own modules or customizations for the core controllers or filtering views, should revisit their customizations and make sure they reflect these changes made for the controllers or filtering views. It is suggested to remove the customizations related to the filtering views/controllers and re-do from scratch what needs to be customized in order to ensure full compatibility with the changed filtering APIs. In case you had created your own `Searchlight::Search` (or `ResourceSearch`) classes, you should scrap those and start over using Ransack.
+
+More information on using Ransack can be found from the [Ransack documentation](https://github.com/activerecord-hackery/ransack). You can find examples for filtering in the core filtering views and controllers.
+
+Related changes include:
+
+- **decidim-core**: The `Decidim::ActivitySearch` class has been rewritten as `Decidim::PublicActivities` which is now a `Rectify::Query` class instead of `Searchlight::Search` class due to the removal of Searchlight at [\#8748](https://github.com/decidim/decidim/pull/8748).
+- **decidim-core**: The `Decidim::ResourceSearch` class now inherits from `Ransack::Search` instead of `Searchlight::Search` as of [\#8748](https://github.com/decidim/decidim/pull/8748). The new `ResourceSearch` class provides extra search functionality for contextual searches that require context information in addition to the search parameters, such as current user or current component. It has barely anything to do with the `ResourceSearch` class in the previous versions which contained much more logic. Please review all your search classes that were inheriting from this class. You should migrate your search filtering to Ransack.
+- **decidim-debates**, **decidim-initiatives**, **decidim-meetings**: The resource search classes `Decidim::Debates::DebateSearch`, `Decidim::Intitatives::InitiativeSearch` and `Decidim::Meetings::MeetingSearch` are rewritten for the Ransack searches due to Searchlight removal at [\#8748](https://github.com/decidim/decidim/pull/8748). The role of these classes is now to pass contextual information to the searches, such as the current user. All other search filtering should happen directly through Ransack.
+- **decidim-meetings**: The `visible_meetings_for` scope for the `Meeting` model has been renamed to `visible_for` in [\#8748](https://github.com/decidim/decidim/pull/8748) for consistency.
+- **decidim-core**: The `official_origin`, `participants_origin`, `user_group_origin` and `meeting_origin` scopes for the `Decidim::Authorable` and `Decidim::Coauthorable` concerns have been changed to `with_official_origin`, `with_participants_origin`, `with_user_group_origin` and `with_meeting_origin` respectively in [\#8748](https://github.com/decidim/decidim/pull/8748) for consistency. See the Searchlight removal change notes for reasoning.
+- **decidim-core**: Nicknames are now differents case insensitively, a rake task has been created to check every nickname and modify them if some are similar (Launch it with "bundle exec rake decidim:upgrade:fix_nickname_uniqueness"). Routing and mentions has been made case insensitive for every tab in profiles.
+
+### Detailed changes
+
+#### Added
+
+- **decidim-core**: Implement service workers and custom offline fallback page  [\#8594](https://github.com/decidim/decidim/pull/8594)
+- **decidim-core**: Add emojis to Conversations [\#8735](https://github.com/decidim/decidim/pull/8735)
+- **decidim-budgets**, **decidim-core**: Add reminders for pending orders in budgets [\#8621](https://github.com/decidim/decidim/pull/8621)
+- **decidim-core**: Add favicon pwa uploader and icons in manifest [\#8645](https://github.com/decidim/decidim/pull/8645)
+- **decidim-core**: Allow users to be searched by nickname [\#8663](https://github.com/decidim/decidim/pull/8663)
+- **decidim-core**: Add items to set a splash screen [\#8649](https://github.com/decidim/decidim/pull/8649)
+- **decidim-core**: Add VAPID keys' generator for webpush notifications  [\#8738](https://github.com/decidim/decidim/pull/8738)
+- **decidim-core**: Add anchors on the homepage [\#8756](https://github.com/decidim/decidim/pull/8756)
+- **decidim-admin**, **decidim-assemblies**, **decidim-participatory processes**:  Add a privacy warning on non-transparent private spaces  [\#8753](https://github.com/decidim/decidim/pull/8753)
+- **decidim-core**: Show the Add2HomeScreen option in compatible browsers  [\#8736](https://github.com/decidim/decidim/pull/8736)
+- **decidim-assemblies**: Allow assembly admins administer children assemblies [\#8773](https://github.com/decidim/decidim/pull/8773)
+- **decidim-core**: Dynamic attachment uploads [\#8681](https://github.com/decidim/decidim/pull/8681)
+- **decidim-participatory processes**: Create process types to allow filtering Processes by them [\#8583](https://github.com/decidim/decidim/pull/8583)
+- **decidim-core**: Accessible character counter for screen readers [\#9009](https://github.com/decidim/decidim/pull/9009)
+- **decidim-budgets**, **decidim-core**: Show users own voting activity [\#8914](https://github.com/decidim/decidim/pull/8914)
+- **decidim-core**: Add autocomplete attribute to Devise fields [\#9038](https://github.com/decidim/decidim/pull/9038)
+- **decidim-core**: Allow admins to disable email notifications for reported users [\#9072](https://github.com/decidim/decidim/pull/9072)
+- **decidim-meetings**: Add reminders for publishing reports to meeting authors [\#8757](https://github.com/decidim/decidim/pull/8757)
+- **decidim-meetings**: Export calendar improvements [\#9035](https://github.com/decidim/decidim/pull/9035)
+- **decidim-core**: Remove all the private participants from a participatory space [\#8866](https://github.com/decidim/decidim/pull/8866)
+- **decidim-core**: Performance: replace moment by dayjs [\#9161](https://github.com/decidim/decidim/pull/9161)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-core**, **decidim-meetings**, **decidim-participatory processes**: Homepage optimization: tune images' caches and query includes [\#9145](https://github.com/decidim/decidim/pull/9145)
+- **decidim-accountability**, **decidim-assemblies**, **decidim-conferences**, **decidim-core**, **decidim-elections**, **decidim-meetings**, **decidim-proposals**: Cache highlighted resources for components cells [\#9143](https://github.com/decidim/decidim/pull/9143)
+- **decidim-core**: Can resend and cancel email confirmation [\#8996](https://github.com/decidim/decidim/pull/8996)
+- **decidim-core**: Performance optimization: load JavaScript at page's bottom [\#9156](https://github.com/decidim/decidim/pull/9156)
+- **decidim-meetings**: Configure online meetings embedded services with ENV vars [\#9219](https://github.com/decidim/decidim/pull/9219)
+- **decidim-elections**: Add an option to hide the "Can I vote?" page [\#9191](https://github.com/decidim/decidim/pull/9191)
+- **decidim-core**: Add autocomplete in user account [\#9217](https://github.com/decidim/decidim/pull/9217)
+- **decidim-budgets**: Bulk actions for budgeting projects in admin panel [\#8986](https://github.com/decidim/decidim/pull/8986)
+- **decidim-comments**: Load comments with ajax [\#9144](https://github.com/decidim/decidim/pull/9144)
+- **decidim-admin**, **decidim-participatory processes**: Add admin log when importing, exporting and duplicating a process [\#9244](https://github.com/decidim/decidim/pull/9244)
+- **decidim-core**: Mail notifications digest [\#8833](https://github.com/decidim/decidim/pull/8833)
+- **decidim-core**: Send push notifications to client [\#8774](https://github.com/decidim/decidim/pull/8774)
+- **decidim-admin**, **decidim-core**: Add admin log when updating component or its permissions [\#9270](https://github.com/decidim/decidim/pull/9270)
+- **decidim-admin**, **decidim-core**: Add admin log when creating, updating or deleting attachment collections [\#9276](https://github.com/decidim/decidim/pull/9276)
+- **decidim-initiatives**: Add admin log when creating, updating or deleting initiative types [\#9310](https://github.com/decidim/decidim/pull/9310)
+- **decidim-admin**: Add admin log when creating, updating or deleting scope types [\#9312](https://github.com/decidim/decidim/pull/9312)
+- **decidim-accountability**: Add admin log when creating, updating or deleting accountability's status [\#9320](https://github.com/decidim/decidim/pull/9320)
+- **decidim-admin**, **decidim-assemblies**: Add admin log when duplicating, exporting or importing assemblies [\#9338](https://github.com/decidim/decidim/pull/9338)
+- **decidim-admin**: Add admin log when creating, updating or deleting area types [\#9316](https://github.com/decidim/decidim/pull/9316)
+- **decidim-accountability**, **decidim-admin**: Add admin log when creating, updating or deleting accountability's timeline entries [\#9321](https://github.com/decidim/decidim/pull/9321)
+- **decidim-admin**, **decidim-core**: Add admin log when creating, updating or deleting attachments [\#9282](https://github.com/decidim/decidim/pull/9282)
+- **decidim-core**: Group creator can leave group [\#9315](https://github.com/decidim/decidim/pull/9315)
+- **decidim-meetings**: Short URLs to fix long export calendar URLs [\#9383](https://github.com/decidim/decidim/pull/9383)
+- **decidim-core**: Accept and reject cookies [\#9271](https://github.com/decidim/decidim/pull/9271)
+- **decidim-admin**: Add admin log when creating, updating or deleting categories [\#9317](https://github.com/decidim/decidim/pull/9317)
+- **decidim-admin**: Add admin log when updating external domains or help sections [\#9339](https://github.com/decidim/decidim/pull/9339)
+- **decidim-templates**: Add admin log when creating, deleting, duplicating and updating templates [\#9363](https://github.com/decidim/decidim/pull/9363)
+- **decidim-forms**: Add admin log when updating survey questionnaire [\#9385](https://github.com/decidim/decidim/pull/9385)
+- **decidim-meetings**: Add admin log when updating the meeting questionnaire [\#9273](https://github.com/decidim/decidim/pull/9273)
+- **decidim-admin**, **decidim-core**: Add admin log when exporting a component  [\#9390](https://github.com/decidim/decidim/pull/9390)
+- **decidim-blogs**: Add admin log when creating, updating and deleting blog posts [\#9386](https://github.com/decidim/decidim/pull/9386)
+- **decidim-comments**, **decidim-initiatives**: Add configuration option for initiative type to deactivate comments [\#9318](https://github.com/decidim/decidim/pull/9318)
+- **decidim-initiatives**: Add order setting to initiatives [\#9377](https://github.com/decidim/decidim/pull/9377)
+- **decidim-api**, **decidim-blogs**: Add official blog posts [\#9429](https://github.com/decidim/decidim/pull/9429)
+- **decidim-core**: External link improvements [\#9402](https://github.com/decidim/decidim/pull/9402)
+- **decidim-admin**, **decidim-core**: Strong passwords for admins [\#9347](https://github.com/decidim/decidim/pull/9347)
+- **decidim-budgets**: Add geocoding to budgets projects [\#9280](https://github.com/decidim/decidim/pull/9280)
+
+#### Changed
+
+- **decidim-admin**: Change default sort order on admin moderations [\#8667](https://github.com/decidim/decidim/pull/8667)
+- **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Replace 'citizens' terminology with 'participants' [\#8697](https://github.com/decidim/decidim/pull/8697)
+- **decidim-core**, **decidim-elections**, **decidim-initiatives**, **decidim-proposals**, **decidim-system**, **decidim-verifications**: Change to a inclusive language: replace he/she/his/her with they/their [\#8684](https://github.com/decidim/decidim/pull/8684)
+- **decidim-generators**: Make Decidim fully configurable via ENV vars [\#8725](https://github.com/decidim/decidim/pull/8725)
+- **decidim-core**: Replace Decidim mentions in UI with 'the platform' [\#8827](https://github.com/decidim/decidim/pull/8827)
+- **decidim-admin**: Clarify the locales on the list of admins [\#8838](https://github.com/decidim/decidim/pull/8838)
+- **decidim-core**: Display friendly report reason and details in moderation emails [\#8840](https://github.com/decidim/decidim/pull/8840)
+- **decidim-comments**: Show hidden comments replies [\#8828](https://github.com/decidim/decidim/pull/8828)
+- **decidim-generators**: Make Decidim fully configurable via ENV vars part II [\#8990](https://github.com/decidim/decidim/pull/8990)
+- Reduce d3 bundle size [\#9034](https://github.com/decidim/decidim/pull/9034)
+- **decidim-elections**: Add help text when verifying your vote [\#9190](https://github.com/decidim/decidim/pull/9190)
+- **decidim-accountability**: Add timeline entry title in Accountability projects [\#9127](https://github.com/decidim/decidim/pull/9127)
+- **decidim-core**: Rename data portability to download your data [\#9196](https://github.com/decidim/decidim/pull/9196)
+- **decidim-elections**: Better wording when verifying an offline voter [\#9357](https://github.com/decidim/decidim/pull/9357)
+- **decidim-initiatives**: Add signature collection period title in header [\#9314](https://github.com/decidim/decidim/pull/9314)
+
+#### Fixed
+
+- **decidim-admin**, **decidim-assemblies**, **decidim-budgets**, **decidim-conferences**, **decidim-consultations**, **decidim-core**, **decidim-elections**, **decidim-forms**, **decidim-initiatives**, **decidim-meetings**, **decidim-participatory processes**, **decidim-proposals**: Fix deprecation warnings from rails 6.1 update (#8610) [\#8610](https://github.com/decidim/decidim/pull/8610)
+- **decidim-core**: Remove 'required field' explanation from conversation textearea [\#8701](https://github.com/decidim/decidim/pull/8701)
+- **decidim-core**: Fix some non-localized user emails [\#8719](https://github.com/decidim/decidim/pull/8719)
+- **decidim-meetings**: Fix for preview unpublished meetings by admin user [\#8713](https://github.com/decidim/decidim/pull/8713)
+- **decidim-participatory processes**: Fix order by weight in processes groups' processes content block [\#8734](https://github.com/decidim/decidim/pull/8734)
+- **decidim-admin**, **decidim-core**: Change scope picker button to disabled when necessary [\#8733](https://github.com/decidim/decidim/pull/8733)
+- **decidim-comments**: Add emojis when user edits a comment [\#8731](https://github.com/decidim/decidim/pull/8731)
+- **decidim-admin**, **decidim-meetings**, **decidim-proposals**: Fix reporting a proposal when author is a meeting [\#8737](https://github.com/decidim/decidim/pull/8737)
+- **decidim-core**: Don't display blocked users in mentions [\#8687](https://github.com/decidim/decidim/pull/8687)
+- **decidim-core**: Properly mark sender and recipient in Conversation [\#8742](https://github.com/decidim/decidim/pull/8742)
+- **decidim-proposals**: Fix geocoding NaN values [\#8762](https://github.com/decidim/decidim/pull/8762)
+- **decidim-core**: Add "nofollow noopener" rel to the profile personal URL [\#8779](https://github.com/decidim/decidim/pull/8779)
+- **decidim-generators**: Add .keep file to empty directory to include on git committing [\#8786](https://github.com/decidim/decidim/pull/8786)
+- **decidim-core**: Fix reminder manifest, replace virtus with attribute object [\#8785](https://github.com/decidim/decidim/pull/8785)
+- **decidim-core**: Fix avatar upload validation errors are displayed twice [\#8794](https://github.com/decidim/decidim/pull/8794)
+- **decidim-meetings**: Fix displaying hidden meetings in homepage's "upcoming meetings" content block [\#8809](https://github.com/decidim/decidim/pull/8809)
+- **decidim-meetings**, **decidim-participatory processes**: Fix displaying hidden meetings in processes group's "upcoming meetings" content block [\#8818](https://github.com/decidim/decidim/pull/8818)
+- **decidim-participatory processes**: Fix characters not encoded in highlighted participatory process group title [\#8820](https://github.com/decidim/decidim/pull/8820)
+- **decidim-initiatives**: Fix scope validation on initiative's creation  [\#8755](https://github.com/decidim/decidim/pull/8755)
+- **decidim-generators**: Add natively a .keep file to empty directory to include on git committing  [\#8830](https://github.com/decidim/decidim/pull/8830)
+- **decidim-core**, **decidim-meetings**, **decidim-proposals**: Fix displaying hidden related resources [\#8812](https://github.com/decidim/decidim/pull/8812)
+- **decidim-consultations**, **decidim-core**, **decidim-elections**: Fix report moderation for all the spaces [\#8813](https://github.com/decidim/decidim/pull/8813)
+- **decidim-meetings**, **decidim-participatory processes**: Fix displaying hidden meetings in show process page [\#8823](https://github.com/decidim/decidim/pull/8823)
+- **decidim-accountability**: Fix accountability text search [\#8831](https://github.com/decidim/decidim/pull/8831)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-proposals**: Fix notifications when there is a note proposal in other spaces than processes [\#8822](https://github.com/decidim/decidim/pull/8822)
+- **decidim-core**: Fix activity cell disappearing author images [\#8826](https://github.com/decidim/decidim/pull/8826)
+- **decidim-accountability**: Fix accountability categories' colors [\#8844](https://github.com/decidim/decidim/pull/8844)
+- **decidim-meetings**: Fix displaying hidden resources in global search [\#8811](https://github.com/decidim/decidim/pull/8811)
+- **decidim-assemblies**: Fix assemblies title when there are unpublished children [\#8855](https://github.com/decidim/decidim/pull/8855)
+- **decidim-debates**: Remove actions from debates' cards [\#8854](https://github.com/decidim/decidim/pull/8854)
+- **decidim-core**: Fix cache_hash generation in AuthorCell [\#8852](https://github.com/decidim/decidim/pull/8852)
+- **decidim-proposals**: Fix answered proposals display [\#8851](https://github.com/decidim/decidim/pull/8851)
+- **decidim-comments**: Show hidden comments replies [\#8828](https://github.com/decidim/decidim/pull/8828)
+- **decidim-meetings**: Fix meetings iframe embed code  [\#8875](https://github.com/decidim/decidim/pull/8875)
+- **decidim-core**: Fix the way the results are displayed in search page [\#8873](https://github.com/decidim/decidim/pull/8873)
+- **decidim-meetings**: Fix display warning message in meetings [\#8872](https://github.com/decidim/decidim/pull/8872)
+- **decidim-core**: Translate the remove recipient button correctly for new conversation [\#8894](https://github.com/decidim/decidim/pull/8894)
+- **decidim-core**: Fix diff mode selector accessibility [\#8879](https://github.com/decidim/decidim/pull/8879)
+- **decidim-core**: Add a unique title to the new group page [\#8882](https://github.com/decidim/decidim/pull/8882)
+- **decidim-core**: Fix illogical heading order for the versions list [\#8880](https://github.com/decidim/decidim/pull/8880)
+- **decidim-core**: Improve logo link aria label [\#8878](https://github.com/decidim/decidim/pull/8878)
+- **decidim-core**: Add the "choose language" string in all locales to the language chooser [\#8883](https://github.com/decidim/decidim/pull/8883)
+- **decidim-core**: Change the correct element type for the change password button [\#8890](https://github.com/decidim/decidim/pull/8890)
+- **decidim-budgets**: Fix duplicate ID on the budgets index page [\#8908](https://github.com/decidim/decidim/pull/8908)
+- **decidim-core**: Fix accessibility issue related to the documents collection toggle [\#8907](https://github.com/decidim/decidim/pull/8907)
+- **decidim-participatory processes**: Fix heading order in the process steps page [\#8906](https://github.com/decidim/decidim/pull/8906)
+- **decidim-elections**: Fix illogical heading orders in the elections component [\#8905](https://github.com/decidim/decidim/pull/8905)
+- **decidim-forms**: Fix the form questionnaires heading orders [\#8903](https://github.com/decidim/decidim/pull/8903)
+- **decidim-budgets**: Fix the illogical heading orders with the budget component views [\#8904](https://github.com/decidim/decidim/pull/8904)
+- **decidim-core**: Fix the component index views heading order for the subtitle change [\#8902](https://github.com/decidim/decidim/pull/8902)
+- **decidim-comments**: Fix comments heading order [\#8876](https://github.com/decidim/decidim/pull/8876)
+- **decidim-proposals**: Fix display withdraw warning message in proposals [\#8870](https://github.com/decidim/decidim/pull/8870)
+- **decidim-core**: Make the button link font weight consistent with normal links [\#8891](https://github.com/decidim/decidim/pull/8891)
+- **decidim-proposals**: Fix illogical heading order for a single proposal [\#8877](https://github.com/decidim/decidim/pull/8877)
+- **decidim-core**: Fix the HTML diff mode accessibility [\#8915](https://github.com/decidim/decidim/pull/8915)
+- **decidim-assemblies**, **decidim-core**, **decidim-initiatives**, **decidim-participatory processes**: Change the participatory space header's subtitle element to a `<p>` to fix heading order issues [\#8901](https://github.com/decidim/decidim/pull/8901)
+- **decidim-comments**: Fix Foundation Abide errors for Rails remote (AJAX) forms [\#8889](https://github.com/decidim/decidim/pull/8889)
+- **decidim-core**: Fix logical heading order for the endorsers list [\#8892](https://github.com/decidim/decidim/pull/8892)
+- **decidim-comments**, **decidim-core**: Fix emoji picker hiding Foundation Abide form errors [\#8886](https://github.com/decidim/decidim/pull/8886)
+- **decidim-comments**: Fix budget hard dependency and caching flag issues in comments  [\#8899](https://github.com/decidim/decidim/pull/8899)
+- **decidim-core**: Fix diff mode selector roles and tabindexes [\#8912](https://github.com/decidim/decidim/pull/8912)
+- **decidim-consultations**: Fix heading order in the consultation question page [\#8920](https://github.com/decidim/decidim/pull/8920)
+- **decidim-meetings**: Fix the meetings export to also include unpublished meetings [\#8874](https://github.com/decidim/decidim/pull/8874)
+- **decidim-initiatives**: Fix initiatives signatures issues [\#8448](https://github.com/decidim/decidim/pull/8448)
+- **decidim-initiatives**: Fix link to docs in initiatives admin [\#8921](https://github.com/decidim/decidim/pull/8921)
+- **decidim-core**: Fix translatable presence validator for hyphenated locales [\#8795](https://github.com/decidim/decidim/pull/8795)
+- **decidim-participatory processes**: Fix processes creation form with stats, metrics and announcements [\#8925](https://github.com/decidim/decidim/pull/8925)
+- **decidim-system**, **decidim-verifications**: Fix verification report with multitenants: notify it only to admins of that organization [\#8929](https://github.com/decidim/decidim/pull/8929)
+- **decidim-core**: Fix officialized user event missing translations [\#8927](https://github.com/decidim/decidim/pull/8927)
+- **decidim-verifications**: Fix email for verification conflict with managed users [\#8926](https://github.com/decidim/decidim/pull/8926)
+- **decidim-core**: Fix profile notifications [\#8943](https://github.com/decidim/decidim/pull/8943)
+- **decidim-elections**: Add a subtitle to votings page [\#8919](https://github.com/decidim/decidim/pull/8919)
+- **decidim-assemblies**, **decidim-participatory processes**: Add a subtitle to assemblies and processes pages [\#8918](https://github.com/decidim/decidim/pull/8918)
+- **decidim-meetings**: Truncate the meetings card description [\#8954](https://github.com/decidim/decidim/pull/8954)
+- **decidim-proposals**: Fix proposals' cards with big images [\#8952](https://github.com/decidim/decidim/pull/8952)
+- **decidim-core**: Add missing reveal__title classes [\#8958](https://github.com/decidim/decidim/pull/8958)
+- **decidim-core**: Fix multiple mentions correct focus on element (recipient) removal [\#8959](https://github.com/decidim/decidim/pull/8959)
+- **decidim-core**: Add missing 'Locale' string in i18n in account page [\#8969](https://github.com/decidim/decidim/pull/8969)
+- **decidim-core**: Fix main navigation aria-current attribute [\#8968](https://github.com/decidim/decidim/pull/8968)
+- **decidim-core**: Fix mobile nav keyboard focus [\#8962](https://github.com/decidim/decidim/pull/8962)
+- **decidim-core**: Remove the label from the dropdown menu opener [\#8972](https://github.com/decidim/decidim/pull/8972)
+- **decidim-blogs**, **decidim-core**, **decidim-debates**, **decidim-proposals**: Fix for endorsed_by with other user group's member [\#8967](https://github.com/decidim/decidim/pull/8967)
+- **decidim-proposals**: Fix footer actions caching on proposals' card [\#8987](https://github.com/decidim/decidim/pull/8987)
+- **decidim-initiatives**: Show signatures in answered initiatives [\#8747](https://github.com/decidim/decidim/pull/8747)
+- **decidim-api**, **decidim-meetings**, **decidim-proposals**: Fix API when meetings have proposal linking disabled [\#8971](https://github.com/decidim/decidim/pull/8971)
+- **decidim-meetings**, **decidim-proposals**: Fix proposals seeds after reordering of modules loading [\#8993](https://github.com/decidim/decidim/pull/8993)
+- **decidim-core**: Show character counter when replying to message [\#8922](https://github.com/decidim/decidim/pull/8922)
+- **decidim-core**: Fix character counter with emoji picker close to maximum characters [\#8916](https://github.com/decidim/decidim/pull/8916)
+- **decidim-budgets**, **decidim-core**, **decidim-debates**, **decidim-meetings**, **decidim-proposals**: Fix cache URLs on cards [\#8988](https://github.com/decidim/decidim/pull/8988)
+- **decidim-core**: Fix submit form with enter when there are attachments [\#9019](https://github.com/decidim/decidim/pull/9019)
+- **decidim-core**: Fix Devise flash messages translation [\#9025](https://github.com/decidim/decidim/pull/9025)
+- **decidim-admin**: Add missing 'Locale' string in i18n in selective newsletter [\#9037](https://github.com/decidim/decidim/pull/9037)
+- **decidim-core**: Disable new conversation next button when no users selected [\#9024](https://github.com/decidim/decidim/pull/9024)
+- **decidim-core**: Fix social share button sharing (`Can't find variable: SocialShareButton` console error) [\#9041](https://github.com/decidim/decidim/pull/9041)
+- **decidim-meetings**: Use published meetings scope on processes landing and proposal's form [\#9023](https://github.com/decidim/decidim/pull/9023)
+- **decidim-core**: Require omniauth/rails_csrf_protection explicitly [\#9053](https://github.com/decidim/decidim/pull/9053)
+- **decidim-core**: Fix session cookie SameSite policy [\#9051](https://github.com/decidim/decidim/pull/9051)
+- **decidim-conferences**: Fix conference partner logo is not optional on create [\#9045](https://github.com/decidim/decidim/pull/9045)
+- **decidim-comments**, **decidim-core**, **decidim-proposals**: Add noreferrer and ugc to links [\#9047](https://github.com/decidim/decidim/pull/9047)
+- **decidim-proposals**: Create admin log records when proposals are imported from a file [\#9006](https://github.com/decidim/decidim/pull/9006)
+- **decidim-meetings**: Remove presenters in the meetings admin backoffice [\#9052](https://github.com/decidim/decidim/pull/9052)
+- **decidim-meetings**: Fix submit in meetings admin form [\#9061](https://github.com/decidim/decidim/pull/9061)
+- **decidim-core**, **decidim-proposals**: Fix amendable events title [\#9050](https://github.com/decidim/decidim/pull/9050)
+- **decidim-assemblies**, **decidim-conferences**, **decidim-consultations**, **decidim-core**, **decidim-initiatives**, **decidim-participatory processes**: Fix Twitter hashtag search when it starts with a number [\#9039](https://github.com/decidim/decidim/pull/9039)
+- **decidim-initiatives**: Remove 'edit link' in topbar for initiative's authors [\#8997](https://github.com/decidim/decidim/pull/8997)
+- **decidim-comments**, **decidim-core**, **decidim-meetings**: Fix timeout in comment view and during meetings [\#9070](https://github.com/decidim/decidim/pull/9070)
+- **decidim-core**: Dont add external link container inside editor [\#9095](https://github.com/decidim/decidim/pull/9095)
+- **decidim-core**, **decidim-dev**: VAPID key generator availabe in core [\#9107](https://github.com/decidim/decidim/pull/9107)
+- **decidim-assemblies**: Allow assembly admins to manage components in child assemblies [\#8955](https://github.com/decidim/decidim/pull/8955)
+- **decidim-core**: Add base URI to meta image URLs [\#9125](https://github.com/decidim/decidim/pull/9125)
+- **decidim-elections**: Clarify message to user when checking census [\#9112](https://github.com/decidim/decidim/pull/9112)
+- **decidim-elections**: Fix attachments when called from Cells [\#9136](https://github.com/decidim/decidim/pull/9136)
+- **decidim-participatory processes**: Fix processes count in processes group title cell [\#9087](https://github.com/decidim/decidim/pull/9087)
+- **decidim-meetings**: Do not send upcoming meeting notification for hidden or withdrawn meetings [\#9134](https://github.com/decidim/decidim/pull/9134)
+- **decidim-elections**: Improve wording when casting your vote [\#9098](https://github.com/decidim/decidim/pull/9098)
+- **decidim-core**: Prevent race condition between prevenTimeout and show modal [\#9092](https://github.com/decidim/decidim/pull/9092)
+- **decidim-generators**: Fix app generator when creating a development_app [\#9142](https://github.com/decidim/decidim/pull/9142)
+- **decidim-meetings**: Fix meetings minutes migration [\#9148](https://github.com/decidim/decidim/pull/9148)
+- **decidim-core**: Enforce password validation rules on 'Forgot your password?' form [\#9090](https://github.com/decidim/decidim/pull/9090)
+- **decidim-proposals**: Add 'not answered' as a possible answer in proposals [\#9021](https://github.com/decidim/decidim/pull/9021)
+- **decidim-budgets**: Fix vote reminder email urls [\#9152](https://github.com/decidim/decidim/pull/9152)
+- **decidim-meetings**: Move modal to body and fix condition [\#9158](https://github.com/decidim/decidim/pull/9158)
+- **decidim-assemblies**, **decidim-proposals**: Fix absolute urls on 'create assembly member' and proposals' 'collaborative drafts' events [\#9146](https://github.com/decidim/decidim/pull/9146)
+- **decidim-accountability**, **decidim-consultations**: Fix components navbar in consultations mobile  [\#9155](https://github.com/decidim/decidim/pull/9155)
+- **decidim-core**: Show only current organization in verification conflicts with multitenants [\#9033](https://github.com/decidim/decidim/pull/9033)
+- **decidim-elections**: Send email to newly added trustees [\#9100](https://github.com/decidim/decidim/pull/9100)
+- **decidim-meetings**: Fix registration type field highlighted in admin meeting creation form [\#9160](https://github.com/decidim/decidim/pull/9160)
+- **decidim-core**: Fix displaying blocked users in account follow pages [\#9164](https://github.com/decidim/decidim/pull/9164)
+- **decidim-core**: Separate validation messages for image dimensions and size [\#9165](https://github.com/decidim/decidim/pull/9165)
+- **decidim-core**: Fix notifications where resources are missing [\#9183](https://github.com/decidim/decidim/pull/9183)
+- **decidim-core**: Fix encoding organization name in A2HS [\#9184](https://github.com/decidim/decidim/pull/9184)
+- **decidim-surveys**: Fix contradictory form errors on survey form [\#9186](https://github.com/decidim/decidim/pull/9186)
+- **decidim-admin**, **decidim-elections**: Fix newsletters and Decidim Votings [\#9188](https://github.com/decidim/decidim/pull/9188)
+- **decidim-meetings**: Fix typo in meeting's copy calendar string [\#9193](https://github.com/decidim/decidim/pull/9193)
+- **decidim-initiatives**: Fix typo and improves copy in initiatives admin [\#9194](https://github.com/decidim/decidim/pull/9194)
+- **decidim-system**: Enforce password validation rules on system admins [\#9207](https://github.com/decidim/decidim/pull/9207)
+- **decidim-initiatives**: Add edit and delete actions in InitiativeType admin table [\#9151](https://github.com/decidim/decidim/pull/9151)
+- **decidim-surveys**: Clarify unregistered answers on surveys behavior [\#9205](https://github.com/decidim/decidim/pull/9205)
+- **decidim-elections**: Fix voting with single election [\#9097](https://github.com/decidim/decidim/pull/9097)
+- **decidim-admin**: Fix invalid translation call [\#9218](https://github.com/decidim/decidim/pull/9218)
+- **decidim-initiatives**: Fix initiative print link, margin, and organization logo [\#9162](https://github.com/decidim/decidim/pull/9162)
+- **decidim-elections**: Fix election label translations [\#9102](https://github.com/decidim/decidim/pull/9102)
+- **decidim-elections**: Remove show more button on elections [\#9103](https://github.com/decidim/decidim/pull/9103)
+- **decidim-surveys**: Fix survey activity log entries [\#9173](https://github.com/decidim/decidim/pull/9173)
+- **decidim-core**: Fix dynamic validation and title change for titled attachments [\#9175](https://github.com/decidim/decidim/pull/9175)
+- **decidim-budgets**: Remove beforeunload confirmation panel from the budgets voting [\#9224](https://github.com/decidim/decidim/pull/9224)
+- **decidim-core**: Fix nicknames uniqueness with different cases [\#8792](https://github.com/decidim/decidim/pull/8792)
+- **decidim-core**: Fix Leaflet trying to load "infinite amount of tiles" [\#9233](https://github.com/decidim/decidim/pull/9233)
+- **decidim-verifications**: Allow to renew expired verifications (if renewable) [\#8192](https://github.com/decidim/decidim/pull/8192)
+- **decidim-elections**: Correctly show trustees and votings menu [\#9192](https://github.com/decidim/decidim/pull/9192)
+- **decidim-core**: Fix hashtag parsing on URLs with fragments [\#9221](https://github.com/decidim/decidim/pull/9221)
+- **decidim-comments**, **decidim-core**: Add missing events locales [\#9199](https://github.com/decidim/decidim/pull/9199)
+- **decidim-conferences**: Make conference's partners logos always mandatory [\#9214](https://github.com/decidim/decidim/pull/9214)
+- **decidim-admin**: Fix margin around warning message in colour settings [\#9278](https://github.com/decidim/decidim/pull/9278)
+- **decidim-comments**, **decidim-core**: Don't show deleted resources in last activities  [\#9293](https://github.com/decidim/decidim/pull/9293)
+- **decidim-elections**: Hide more information link when there's no description on an election [\#9099](https://github.com/decidim/decidim/pull/9099)
+- **decidim-admin**: Fix local storage protocol options for uploaders [\#9285](https://github.com/decidim/decidim/pull/9285)
+- **decidim-admin**, **decidim-assemblies**, **decidim-budgets**, **decidim-core**, **decidim-elections**, **decidim-meetings**, **decidim-pages**, **decidim-proposals**: Apply crowdin feedback [\#9301](https://github.com/decidim/decidim/pull/9301)
+- **decidim-participatory processes**: Update file validation for process import [\#9236](https://github.com/decidim/decidim/pull/9236)
+- **decidim-core**: Fix user interests [\#9225](https://github.com/decidim/decidim/pull/9225)
+- **decidim-elections**: Add error message when adding question and election has started [\#9189](https://github.com/decidim/decidim/pull/9189)
+- **decidim-elections**: Fix HTML safe content in election voting [\#9210](https://github.com/decidim/decidim/pull/9210)
+- **decidim-elections**: Fix ActionLog when a ballot style is deleted [\#9355](https://github.com/decidim/decidim/pull/9355)
+- **decidim-elections**: Enforce YYYYmmdd format in birthdate when uploading census [\#9354](https://github.com/decidim/decidim/pull/9354)
+- **decidim-elections**: Only show that the code can be requested via SMS if its true [\#9353](https://github.com/decidim/decidim/pull/9353)
+- **decidim-meetings**: Short URLs to fix long export calendar URLs [\#9383](https://github.com/decidim/decidim/pull/9383)
+- **decidim-core**: Fix for internal links not displaying on page title [\#9228](https://github.com/decidim/decidim/pull/9228)
+- **decidim-elections**: Fix regular expression on census check [\#9352](https://github.com/decidim/decidim/pull/9352)
+- **decidim-budgets**, **decidim-proposals**: Add missing translation keys proposals import and proposals picker [\#9359](https://github.com/decidim/decidim/pull/9359)
+- **decidim-consultations**: Return 404 when there isn't a consultation [\#9374](https://github.com/decidim/decidim/pull/9374)
+- **decidim-consultations**: Return 404 when there isn't a question [\#9375](https://github.com/decidim/decidim/pull/9375)
+- **decidim-elections**: Return 404 when there isn't a voting in elections_log [\#9376](https://github.com/decidim/decidim/pull/9376)
+- **decidim-proposals**: Fix proposals creation with Participatory Texts  [\#9381](https://github.com/decidim/decidim/pull/9381)
+- **decidim-forms**, **decidim-meetings**, **decidim-surveys**: Fix rollback questionnaire answer when file is invalid [\#9361](https://github.com/decidim/decidim/pull/9361)
+- **decidim-core**: Create tempfile when Active Storage service doesn't implement path_for method [\#9362](https://github.com/decidim/decidim/pull/9362)
+- **decidim-core**: Fix / Expose createMapController properly to let overriding [\#9425](https://github.com/decidim/decidim/pull/9425)
+- **decidim-elections**: Capture unhandled errors from JS promises and inform the user [\#9430](https://github.com/decidim/decidim/pull/9430)
+- **decidim-elections**: Make sure component is published when starting an election [\#9358](https://github.com/decidim/decidim/pull/9358)
+- **decidim-elections**: Remove description from questions in elections [\#9401](https://github.com/decidim/decidim/pull/9401)
+- **decidim-initiatives**: Return 404 when there isn't an initiative [\#9427](https://github.com/decidim/decidim/pull/9427)
+- **decidim-core**, **decidim-meetings**, **decidim-proposals**: Fix email subject when resource title has special characters [\#9392](https://github.com/decidim/decidim/pull/9392)
+- **decidim-core**, **decidim-generators**: Fix service worker cache in development environment [\#9424](https://github.com/decidim/decidim/pull/9424)
+- **decidim-core**: Prevent users to validate nicknames/emails taken by user groups (#9452) [\#9452](https://github.com/decidim/decidim/pull/9452)
+- **decidim-elections**: Fix hardcoded hour in election dashboard (#9465) [\#9465](https://github.com/decidim/decidim/pull/9465)
+
+#### Removed
+
+- **decidim-meetings**: Clean meetings form with registrations [\#8500](https://github.com/decidim/decidim/pull/8500)
+- **decidim-core**: Remove 'required field' explanation from conversation textearea [\#8701](https://github.com/decidim/decidim/pull/8701)
+- **decidim-admin**, **decidim-assemblies**, **decidim-conferences**, **decidim-participatory processes**: Remove category description [\#8617](https://github.com/decidim/decidim/pull/8617)
+- **decidim-core**: The `rectify` gem has been removed from the stack as of [\#9101](https://github.com/decidim/decidim/pull/9101). If you are a library developer, replace any `Rectify::Query` with `Decidim::Query`, replace any `Rectify::Command` with `Decidim::Command`. Replace any `Rectify::Presenter` with `SimpleDelegator` (Already deprecated in [\#8758](https://github.com/decidim/decidim/pull/8758))
+- **decidim-core**: The `searchlight` gem has been removed in favor of Ransach as of [\#8748](https://github.com/decidim/decidim/pull/8748). Please review the **Changed** notes regarding the required changes. Please review all your search classes that were inheriting from `Searchlight::Search`. You should migrate your search filtering to Ransack.
+- **decidim-core**: The `search_params` and `default_search_params` methods within the participant-facing controllers are now removed in favor of using `filter_params` and `default_filter_params` as of [\#8748](https://github.com/decidim/decidim/pull/8748). The duplicate methods were redundant after the Ransack migration which is why they were removed. In case you had overridden these methods in your controllers, they no longer do anything. In case you were calling these methods before, you will now receive a `NoMethodError` because they are removed. Please use `filter_params` and `default_filter_params` instead.
+- **decidim-accountability**, **decidim-assemblies**, **decidim-budgets**, **decidim-consultations**, **decidim-core**, **decidim-elections**, **decidim-initiatives**, **decidim-participatory_processes**, **decidim-proposals**, **decidim-sortitions**: The search service classes inheriting from `Searchlight::Search` that are no longer necessary due to the Ransack migration have been removed in all modules as of [\#8748](https://github.com/decidim/decidim/pull/8748). This includes `Decidim::Accountability::ResultSearch`, `Decidim::Assemblies::AssemblySearch`, `Decidim::Budgets::ProjectSearch`, `Decidim::Consultations::ConsultationSearch`, `Decidim::HomeActivitySearch`, `Decidim::ParticipatorySpaceSearch`, `Decidim::Elections::ElectionsSearch`, `Decidim::Votings::VotingSearch`, `Decidim::Meetings::Directory::MeetingSearch`, `Decidim::ParticipatoryProcesses::ParticipatoryProcessesSearch`, `Decidim::Proposals::CollaborativeDraftSearch`, `Decidim::Proposals::ProposalSearch` and `Decidim::Sortitions::SortitionSearch`.
+
+#### Developer improvements
+
+- Replace graphql-docs npm package with gem  [\#8631](https://github.com/decidim/decidim/pull/8631)
+- Migrate from `Virtus` to `ActiveModel::Attributes` (and get rid of `Rectify::Form`) [\#8669](https://github.com/decidim/decidim/pull/8669)
+- Replace various autocomplete solutions [\#8524](https://github.com/decidim/decidim/pull/8524)
+- Fix webpacker generator for modules [\#8715](https://github.com/decidim/decidim/pull/8715)
+- Add parallel_tests for test suite in CI [\#8678](https://github.com/decidim/decidim/pull/8678)
+- Replace `searchlight` with `ransack` which is already a core dependency [\#8748](https://github.com/decidim/decidim/pull/8748)
+- Update docs in Webpacker app migration [\#8881](https://github.com/decidim/decidim/pull/8881)
+- Move VAPID keys generators to core [\#8923](https://github.com/decidim/decidim/pull/8923)
+- Update docs in Webpacker app migration (part II) [\#8911](https://github.com/decidim/decidim/pull/8911)
+- Fix Devise configs that depend on Decidim configs [\#9014](https://github.com/decidim/decidim/pull/9014)
+- Update rails to 6.1 [\#8411](https://github.com/decidim/decidim/pull/8411)
+- Add useful error for custom-authorizations development [\#8834](https://github.com/decidim/decidim/pull/8834)
+- Prevent Faker Address country_code from raising RetryLimitExceeded [\#9036](https://github.com/decidim/decidim/pull/9036)
+- Fix Spring errors with Rails 6.1 [\#9032](https://github.com/decidim/decidim/pull/9032)
+- Disable webpack-dev-server overlay [\#9082](https://github.com/decidim/decidim/pull/9082)
+- Make frontend development 10-12x faster (compile SCSS through sass-embedded) [\#9081](https://github.com/decidim/decidim/pull/9081)
+- Fix webpacker configuration when sass-loader is not available [\#9149](https://github.com/decidim/decidim/pull/9149)
+- Remove Rectify Gem dependency [\#9101](https://github.com/decidim/decidim/pull/9101)
+- Fix webpacker thread safety [\#9203](https://github.com/decidim/decidim/pull/9203)
+- Fix budget amounts in project seeds [\#9174](https://github.com/decidim/decidim/pull/9174)
+- Update ruby to 3.0 [\#8452](https://github.com/decidim/decidim/pull/8452)
+- Remove unused helper method from UserInterestsController [\#9237](https://github.com/decidim/decidim/pull/9237)
+- Light refactor for fetching admins [\#9287](https://github.com/decidim/decidim/pull/9287)
+- Fix local storage protocol options for uploaders [\#9285](https://github.com/decidim/decidim/pull/9285)
+- Add empty database (aka no seed) installation manual [\#9349](https://github.com/decidim/decidim/pull/9349)
+- Bump letter_opener_web from 1.3 to 2.0 [\#9395](https://github.com/decidim/decidim/pull/9395)
+- Change docs to use decidim_system:create_admin command [\#9372](https://github.com/decidim/decidim/pull/9372)
+- Add documentation for logic customization [\#9325](https://github.com/decidim/decidim/pull/9325)
+- External link improvements [\#9402](https://github.com/decidim/decidim/pull/9402)
+- Improve asset routing logic [\#9403](https://github.com/decidim/decidim/pull/9403)
+- Remove the threads limit from the Capybara Puma server [\#9422](https://github.com/decidim/decidim/pull/9422)
 
 ## Previous versions
 
-Please check [release/0.25-stable](https://github.com/decidim/decidim/blob/release/0.25-stable/CHANGELOG.md) for previous changes.
+Please check [release/0.26-stable](https://github.com/decidim/decidim/blob/release/0.26-stable/CHANGELOG.md) for previous changes.
diff --git a/Gemfile b/Gemfile
index 36a8274c232ce..f04324cbe98e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,29 +13,24 @@ gem "decidim-templates", path: "."
 
 gem "bootsnap", "~> 1.4"
 
-gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"
-gem "puma", ">= 5.5.1"
+gem "puma", ">= 5.6.2"
 
 gem "faker", "~> 2.14"
 
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
 
-  # Use latest simplecov from master until next version of simplecov is
-  # released (greather than 0.18.5)
-  # See https://github.com/decidim/decidim/issues/6230
-  gem "simplecov", "~> 0.19.0"
-
   gem "decidim-dev", path: "."
 
-  gem "brakeman", "~> 5.1"
+  gem "brakeman", "~> 5.2"
+  gem "parallel_tests", "~> 3.7"
 end
 
 group :development do
-  gem "letter_opener_web", "~> 1.3"
+  gem "letter_opener_web", "~> 2.0"
   gem "listen", "~> 3.1"
   gem "rubocop-faker"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "4.0.4"
+  gem "web-console", "~> 4.2"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ed050bce7ec3..9169869252e4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,72 +1,62 @@
-GIT
-  remote: https://github.com/sgruhier/foundation_rails_helper.git
-  revision: 45709e28f567b2e619a06091eb63d4f050f861d8
-  specs:
-    foundation_rails_helper (3.0.0)
-      actionpack (>= 4.1, < 7.0)
-      activemodel (>= 4.1, < 7.0)
-      activesupport (>= 4.1, < 7.0)
-      railties (>= 4.1, < 7.0)
-
 PATH
   remote: .
   specs:
-    decidim (0.26.4)
-      decidim-accountability (= 0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-api (= 0.26.4)
-      decidim-assemblies (= 0.26.4)
-      decidim-blogs (= 0.26.4)
-      decidim-budgets (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-debates (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-generators (= 0.26.4)
-      decidim-meetings (= 0.26.4)
-      decidim-pages (= 0.26.4)
-      decidim-participatory_processes (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-      decidim-sortitions (= 0.26.4)
-      decidim-surveys (= 0.26.4)
-      decidim-system (= 0.26.4)
-      decidim-templates (= 0.26.4)
-      decidim-verifications (= 0.26.4)
-    decidim-accountability (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-admin (0.26.4)
+    decidim (0.27.2)
+      decidim-accountability (= 0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-api (= 0.27.2)
+      decidim-assemblies (= 0.27.2)
+      decidim-blogs (= 0.27.2)
+      decidim-budgets (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-debates (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-generators (= 0.27.2)
+      decidim-meetings (= 0.27.2)
+      decidim-pages (= 0.27.2)
+      decidim-participatory_processes (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+      decidim-sortitions (= 0.27.2)
+      decidim-surveys (= 0.27.2)
+      decidim-system (= 0.27.2)
+      decidim-templates (= 0.27.2)
+      decidim-verifications (= 0.27.2)
+    decidim-accountability (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-admin (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-api (0.26.4)
+    decidim-api (0.27.2)
       graphql (~> 1.12, < 1.13)
+      graphql-docs (~> 2.1.0)
       rack-cors (~> 1.0)
+    decidim-assemblies (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-blogs (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-budgets (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-comments (0.27.2)
+      decidim-core (= 0.27.2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-assemblies (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-blogs (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-budgets (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-comments (0.26.4)
-      decidim-core (= 0.26.4)
-      redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-meetings (= 0.26.4)
+    decidim-conferences (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-meetings (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-consultations (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-core (0.26.4)
+    decidim-consultations (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-core (0.27.2)
       active_link_to (~> 1.0)
       acts_as_list (~> 0.9)
       batch-loader (~> 1.2)
@@ -75,17 +65,17 @@ PATH
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
-      date_validator (~> 0.9.0)
-      decidim-api (= 0.26.4)
+      date_validator (~> 0.12.0)
+      decidim-api (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       diffy (~> 3.3)
       doorkeeper (~> 5.1)
       doorkeeper-i18n (~> 4.0)
-      file_validators (~> 2.1)
+      file_validators (~> 3.0)
       fog-local (~> 0.6)
-      foundation_rails_helper
-      geocoder (~> 1.7.5)
+      foundation_rails_helper (~> 4.0)
+      geocoder (~> 1.8)
       hashdiff (>= 0.4.0, < 2.0.0)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
@@ -104,144 +94,145 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.3)
       rack-attack (~> 6.0)
-      rails (~> 6.0.4)
+      rails (~> 6.1.0)
       rails-i18n (~> 6.0)
       ransack (~> 2.4.1)
-      rectify (~> 0.13.0)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      searchlight (~> 4.1)
       seven_zip_ruby (~> 1.3)
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
-    decidim-debates (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-dev (0.26.4)
+    decidim-debates (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-dev (0.27.2)
       axe-core-rspec (~> 4.1.0)
       byebug (~> 11.0)
       capybara (~> 3.24)
       db-query-matchers (~> 0.10.0)
-      decidim (= 0.26.4)
+      decidim (= 0.27.2)
       erb_lint (~> 0.0.35)
       factory_bot_rails (~> 4.8)
       i18n-tasks (~> 0.9.18)
       mdl (~> 0.5)
-      nokogiri (~> 1.12)
+      nokogiri (~> 1.13)
+      parallel_tests (~> 3.7)
       puma (~> 5.0)
       rails-controller-testing (~> 1.0)
-      rspec-cells (~> 0.3.4)
+      rspec-cells (~> 0.3.7)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 4.0)
       rspec-retry (~> 0.6.2)
       rspec_junit_formatter (~> 0.3.0)
-      rubocop (~> 0.92.0)
-      rubocop-rails (~> 2.8)
-      rubocop-rspec (= 1.43.2)
-      selenium-webdriver (~> 3.142)
-      simplecov (~> 0.19.0)
-      simplecov-cobertura (~> 1.3.1)
-      system_test_html_screenshots (~> 0.2)
+      rubocop (~> 1.28.0)
+      rubocop-rails (~> 2.14)
+      rubocop-rspec (~> 2.10)
+      selenium-webdriver (~> 4.1.0)
+      simplecov (~> 0.21.0)
+      simplecov-cobertura (~> 2.1.0)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.26.4)
-      decidim-bulletin_board (= 0.22.3)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-proposals (= 0.26.4)
+    decidim-elections (0.27.2)
+      decidim-bulletin_board (= 0.23)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-proposals (= 0.27.2)
       rack-attack (~> 6.0)
-      voting_schemes-dummy (= 0.22.3)
-      voting_schemes-electionguard (= 0.22.3)
-    decidim-forms (0.26.4)
-      decidim-core (= 0.26.4)
+      voting_schemes-dummy (= 0.23)
+      voting_schemes-electionguard (= 0.23)
+    decidim-forms (0.27.2)
+      decidim-core (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-initiatives (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-verifications (= 0.26.4)
+    decidim-generators (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-initiatives (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-verifications (= 0.27.2)
       origami (~> 2.1)
-      virtus-multiparams (~> 0.1)
+      rexml (~> 3.2.5)
       wicked (~> 1.3)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-meetings (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
+    decidim-meetings (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
       icalendar (~> 2.5)
-    decidim-pages (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-participatory_processes (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-proposals (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      doc2text (~> 0.4.4)
+    decidim-pages (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-participatory_processes (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-proposals (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      doc2text (~> 0.4.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-    decidim-surveys (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-templates (= 0.26.4)
-    decidim-system (0.26.4)
+    decidim-sortitions (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+    decidim-surveys (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-templates (= 0.27.2)
+    decidim-system (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-templates (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-    decidim-verifications (0.26.4)
-      decidim-core (= 0.26.4)
+    decidim-templates (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+    decidim-verifications (0.27.2)
+      decidim-core (= 0.27.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4.1)
-      actionpack (= 6.0.4.1)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -249,25 +240,27 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activestorage (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4.1)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activestorage (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activesupport (= 6.1.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.8.0)
@@ -295,9 +288,9 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.7.5)
-      msgpack (~> 1.0)
-    brakeman (5.1.1)
+    bootsnap (1.10.3)
+      msgpack (~> 1.2)
+    brakeman (5.2.2)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -310,7 +303,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (2.2.3)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -332,7 +325,7 @@ GEM
     charlock_holmes (0.7.7)
     chef-utils (18.0.172)
       concurrent-ruby
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coffee-rails (5.0.0)
@@ -343,21 +336,22 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    commonmarker (0.23.6)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.12.0)
+    css_parser (1.14.0)
       addressable
-    date_validator (0.9.0)
-      activemodel
-      activesupport
+    date_validator (0.12.0)
+      activemodel (>= 3)
+      activesupport (>= 3)
     db-query-matchers (0.10.0)
       activesupport (>= 4.0, < 7)
       rspec (~> 3.0)
-    decidim-bulletin_board (0.22.3)
+    decidim-bulletin_board (0.23.0)
       byebug (~> 11.0)
-      graphlient (~> 0.4.0)
+      graphlient (~> 0.5.0)
       jwt (~> 2.2.2)
       rails (~> 6.0, >= 5.0.0)
       wisper (~> 2.0.0)
@@ -374,20 +368,19 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.10.2)
       devise (>= 4.8.0)
-    devise_invitable (2.0.6)
+    devise_invitable (2.0.7)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.0)
     diffy (3.4.2)
-    doc2text (0.4.4)
-      nokogiri (>= 1.12.5, < 1.13.0)
+    doc2text (0.4.5)
+      nokogiri (>= 1.13.2, < 1.14.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.0)
+    doorkeeper (5.6.4)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     dumb_delegator (1.0.0)
-    equalizer (0.0.11)
     erb_lint (0.0.37)
       activesupport
       better_html (~> 1.0.7)
@@ -399,14 +392,17 @@ GEM
     erbse (0.1.4)
       temple
     erubi (1.10.0)
-    excon (0.93.1)
+    escape_utils (1.3.0)
+    excon (0.99.0)
     execjs (2.8.1)
+    extended-markdown-filter (0.7.0)
+      html-pipeline (~> 2.9)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (2.18.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
     faraday (1.10.2)
       faraday-em_http (~> 1.0)
@@ -433,8 +429,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.1)
-    file_validators (2.3.0)
+    ffi (1.15.5)
+    file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
     fog-core (2.3.0)
@@ -445,10 +441,16 @@ GEM
     fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     formatador (1.1.0)
-    geocoder (1.7.5)
-    globalid (0.5.2)
+    foundation_rails_helper (4.0.1)
+      actionpack (>= 4.1, < 7.1)
+      activemodel (>= 4.1, < 7.1)
+      activesupport (>= 4.1, < 7.1)
+      railties (>= 4.1, < 7.1)
+    gemoji (3.0.1)
+    geocoder (1.8.1)
+    globalid (1.0.0)
       activesupport (>= 5.0)
-    graphlient (0.4.0)
+    graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
@@ -456,12 +458,24 @@ GEM
     graphql-client (0.18.0)
       activesupport (>= 3.0)
       graphql
+    graphql-docs (2.1.0)
+      commonmarker (~> 0.16)
+      escape_utils (~> 1.2)
+      extended-markdown-filter (~> 0.4)
+      gemoji (~> 3.0)
+      graphql (~> 1.12)
+      html-pipeline (~> 2.9)
+      sass (~> 3.4)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    highline (2.0.3)
+    highline (2.1.0)
+    hkdf (0.3.0)
+    html-pipeline (2.14.3)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -482,7 +496,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    json (2.6.2)
+    json (2.6.3)
     jwt (2.2.3)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -502,13 +516,14 @@ GEM
       kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    letter_opener_web (1.4.0)
-      actionmailer (>= 3.2)
-      letter_opener (~> 1.0)
-      railties (>= 3.2)
-    listen (3.5.1)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
+      rexml
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.1)
@@ -528,22 +543,26 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    msgpack (1.4.2)
+    msgpack (1.4.5)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mustache (1.1.1)
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -558,7 +577,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -587,49 +606,52 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parallel_tests (3.7.3)
+      parallel
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    premailer (1.18.0)
+    premailer (1.19.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.11.1)
+    premailer-rails (1.12.0)
       actionmailer (>= 3)
+      net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    public_suffix (4.0.6)
-    puma (5.5.2)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (3.0.2)
+    rack-protection (3.0.5)
       rack
-    rack-proxy (0.7.4)
+    rack-proxy (0.7.6)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.1)
-      actioncable (= 6.0.4.1)
-      actionmailbox (= 6.0.4.1)
-      actionmailer (= 6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actiontext (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.4.1)
+    rails (6.1.6)
+      actioncable (= 6.1.6)
+      actionmailbox (= 6.1.6)
+      actionmailer (= 6.1.6)
+      actionpack (= 6.1.6)
+      actiontext (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activemodel (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -643,35 +665,29 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rectify (0.13.0)
-      activemodel (>= 4.1.0)
-      activerecord (>= 4.1.0)
-      activesupport (>= 4.1.0)
-      virtus (~> 1.0.5)
-      wisper (>= 1.6.1)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
     redis (4.8.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.3.1)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -680,15 +696,15 @@ GEM
     rspec-cells (0.3.8)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (>= 3.0.0, < 6.1.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (4.1.2)
@@ -704,26 +720,26 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.92.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
@@ -732,18 +748,26 @@ GEM
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    searchlight (4.1.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     seven_zip_ruby (1.3.0)
-    simplecov (0.19.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-cobertura (1.3.1)
-      simplecov (~> 0.8)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
@@ -762,33 +786,29 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.1)
-    system_test_html_screenshots (0.2.0)
-      actionpack (>= 5.2, < 6.1.a)
-    temple (0.9.1)
+    temple (0.10.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
+    timeout (0.3.1)
     tomlrb (2.0.3)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.1.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
     version_gem (1.1.1)
-    virtus (1.0.5)
+    virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    virtus-multiparams (0.1.1)
-      virtus (~> 1.0)
-    voting_schemes-dummy (0.22.3)
+    voting_schemes-dummy (0.23.0)
       rails (>= 5.0.0)
-    voting_schemes-electionguard (0.22.3)
+    voting_schemes-electionguard (0.23.0)
       rails (>= 5.0.0)
     w3c_rspec_validators (0.3.0)
       rails
@@ -800,7 +820,7 @@ GEM
       rexml (~> 3.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.0.4)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -814,6 +834,9 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webpush (1.1.0)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -823,17 +846,17 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap (~> 1.4)
-  brakeman (~> 5.1)
+  brakeman (~> 5.2)
   byebug (~> 11.0)
   decidim!
   decidim-conferences!
@@ -843,18 +866,17 @@ DEPENDENCIES
   decidim-initiatives!
   decidim-templates!
   faker (~> 2.14)
-  foundation_rails_helper!
-  letter_opener_web (~> 1.3)
+  letter_opener_web (~> 2.0)
   listen (~> 3.1)
-  puma (>= 5.5.1)
+  parallel_tests (~> 3.7)
+  puma (>= 5.6.2)
   rubocop-faker
-  simplecov (~> 0.19.0)
   spring (~> 2.0)
   spring-watcher-listen (~> 2.0)
-  web-console (= 4.0.4)
+  web-console (~> 4.2)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.5
+   2.3.20
diff --git a/README.adoc b/README.adoc
index af2273591ef9c..7720f92965286 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,5 +1,3 @@
-D:doctype: book
-
 image::https://cdn.rawgit.com/decidim/decidim/develop/logo.svg[Decidim Logo,400]
 
 The participatory democracy framework.
@@ -9,7 +7,7 @@ Free Open-Source participatory democracy, citizen participation and open governm
 ____
 
 https://decidim.org[Decidim] is a participatory democracy framework, written in Ruby on Rails, originally developed for the Barcelona City government online and offline participation website.
-Installing these libraries will provide you a generator and gems to help you develop web applications like the ones found on <<example-applications,example applications>> or like http://staging.decidim.codegram.com[our demo application].
+Installing these libraries will provide you a generator and gems to help you develop web applications like the ones found on <<example-applications,example applications>> or like https://try.decidim.org[our demo application].
 
 All members of the Decidim community agree with http://www.decidim.org/contract/[Decidim Social Contract or Code of Democratic Guarantees].
 
@@ -19,38 +17,7 @@ image:https://img.shields.io/gem/v/decidim.svg[Gem,link=https://rubygems.org/gem
 
 Code quality
 
-image:https://codecov.io/gh/decidim/decidim/branch/develop/graph/badge.svg[codecov,link=https://codecov.io/gh/decidim/decidim] image:https://api.codeclimate.com/v1/badges/ad8fa445086e491486b6/maintainability[Maintainability,link=https://codeclimate.com/github/decidim/decidim/maintainability] image:https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg[Crowdin,link=https://crowdin.com/project/decidim] image:http://inch-ci.org/github/decidim/decidim.svg?branch=develop[Inline docs,link=http://inch-ci.org/github/decidim/decidim] image:https://rocketvalidator.com/badges/a11y_issues.svg?url=http://staging.decidim.codegram.com/[Accessibility issues,link=https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=a11y] image:https://rocketvalidator.com/badges/html_issues.svg?url=http://staging.decidim.codegram.com/[HTML issues,link=https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=html]
-
-Test suite
-
-+++<details>++++++<summary>+++See all+++</summary>+++
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Accountability/develop.svg?label=%5BCI%5D%20Accountability[Accountability,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Api/develop.svg?label=%5BCI%5D%20Api[Api,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Assemblies/develop.svg?label=%5BCI%5D%20Assemblies[Assemblies,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Blogs/develop.svg?label=%5BCI%5D%20Blogs[Blogs,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Budgets/develop.svg?label=%5BCI%5D%20Budgets[Budgets,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Comments/develop.svg?label=%5BCI%5D%20Comments[Comments,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Conferences/develop.svg?label=%5BCI%5D%20Conferences[Conferences,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Consultations/develop.svg?label=%5BCI%5D%20Consultations[Consultations,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Core/develop.svg?label=%5BCI%5D%20Core[Core,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Debates/develop.svg?label=%5BCI%5D%20Debates[Debates,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Forms/develop.svg?label=%5BCI%5D%20Forms[Forms,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Generators/develop.svg?label=%5BCI%5D%20Generators[Generators,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Initiatives/develop.svg?label=%5BCI%5D%20Initiatives[Initiatives,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Main%20folder/develop.svg?label=%5BCI%5D%20Main[Main,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Meetings/develop.svg?label=%5BCI%5D%20Meetings[Meetings,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Pages/develop.svg?label=%5BCI%5D%20Pages[Pages,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Participatory%20processes/develop.svg?label=%5BCI%5D%20Participatory%20processes[Participatory processes,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Proposals%20(system%20admin)/develop.svg?label=%5BCI%5D%20Proposals%20(system%20admin)[Proposals (system admin),link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Proposals%20(system%20public)/develop.svg?label=%5BCI%5D%20Proposals%20(system%20public)[Proposals (system admin),link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Proposals%20(unit%20tests)/develop.svg?label=%5BCI%5D%20Proposals%20(unit%20tests)[Proposals (unit tests),link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Sortitions/develop.svg?label=%5BCI%5D%20Sortitions[Sortitions,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Surveys/develop.svg?label=%5BCI%5D%20Surveys[Surveys,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20System/develop.svg?label=%5BCI%5D%20System[System,link=https://github.com/decidim/decidim/actions]
-image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20Verifications/develop.svg?label=%5BCI%5D%20Verifications[Verifications,link=https://github.com/decidim/decidim/actions]
-+++</details>+++
-
-'''
+image:https://codecov.io/gh/decidim/decidim/branch/develop/graph/badge.svg[codecov,link=https://codecov.io/gh/decidim/decidim] image:https://api.codeclimate.com/v1/badges/ad8fa445086e491486b6/maintainability[Maintainability,link=https://codeclimate.com/github/decidim/decidim/maintainability] image:https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg[Crowdin,link=https://crowdin.com/project/decidim]
 
 = What do you need to do?
 
@@ -58,7 +25,11 @@ image:https://img.shields.io/github/workflow/status/decidim/decidim/%5BCI%5D%20V
 - <<getting-started-with-decidim,Getting started with Decidim>>
 - <<how-to-contribute,Contribute to the project>>
 - <<modules,Modules>>
-- <<browse-decidim,Create & browse development app>>
+- <<authorizations-strategies,Authorizations Strategies>>
+- <<following-our-license,Following our license>>
+- <<example-applications,Example applications>>
+- <<security,Security>>
+- <<donations,Donations>>
 
 '''
 
@@ -115,3 +86,7 @@ Security is very important to us.
 If you have any issue regarding security, please disclose the information responsibly by sending an email to security [at] decidim [dot] org and not by creating a github/metadecidim issue.
 We appreciate your effort to make Decidim more secure.
 See xref:SECURITY.adoc[full security policy].
+
+== Donations
+
+If you want to support the project, consider making a donation through our https://opencollective.com/decidim[OpenCollective profile].
diff --git a/SECURITY.adoc b/SECURITY.adoc
index 5976fd090631a..a6b5326ba586d 100644
--- a/SECURITY.adoc
+++ b/SECURITY.adoc
@@ -7,10 +7,10 @@ Until we have the version 1.0 we support only the last minor and major version w
 |===
 | Version | Supported
 
-| 0.25.x
+| 0.26.x
 | :white_check_mark:
 
-| \<= 0.24
+| \<= 0.25
 | :x:
 |===
 
diff --git a/babel.config.json b/babel.config.json
index e5811e1aec20c..551d4bec5e5db 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -20,11 +20,9 @@
         "corejs": false
       }
     ],
-    [
-      "@babel/plugin-transform-regenerator",
-      {
-        "async": false
-      }
-    ]
+    [ "@babel/plugin-transform-regenerator", { "async": false }],
+    [ "@babel/plugin-proposal-private-property-in-object", { "loose": true }],
+    ["@babel/plugin-proposal-private-methods", { "loose": true }],
+    ["@babel/plugin-proposal-class-properties", { "loose": true }]
   ]
 }
diff --git a/bin/changelog_generator b/bin/changelog_generator
index 860b00feb55fc..e2f828b5c2075 100755
--- a/bin/changelog_generator
+++ b/bin/changelog_generator
@@ -4,171 +4,204 @@
 require "json"
 require "ruby-progressbar"
 
-# rubocop:disable Style/GlobalVars
+class EmptyTokenError < RuntimeError
+  def full_message
+    <<~HELP
+      Decidim's changelog generator.
 
-$github_token = ARGV[0]
-$since_sha = ARGV[1] || "HEAD~5"
+      ## Example
 
-if $github_token.nil? || $github_token == "--help"
-  puts <<~HELP
-    Decidim's changelog generator.
+          bin/changelog_generator <GITHUB PERSONAL ACCESS TOKEN> <SHA>
 
-    ## Example
+      ## Params
 
-        bin/changelog_generator <GITHUB PERSONAL ACCESS TOKEN> <SHA>
+      The <GITHUB PERSONAL ACCESS TOKEN> can be obtained from https://github.com/settings/tokens/new
+      You'll need to create one with `public_repo` access.
 
-    ## Params
+      The <SHA> is the git commit SHA from which to consider the changes. It's
+      usually the last commit that modified the `.decidim_version` file.
 
-    The <GITHUB PERSONAL ACCESS TOKEN> can be obtained from https://github.com/settings/tokens/new
-    You'll need to create one with `public_repo` access.
+      ## Explanation
 
-    The <SHA> is the git commit SHA from which to consider the changes. It's
-    usually the last commit that modified the `.decidim_version` file.
+      This script will generate the sections needed for the changelog, using the
+      labels of the merged PRs as a source of truth. It will add a section at the
+      end, "Unsorted", with the list of PRs that couldn't be classified.
 
-    ## Explanation
+      It ignores any Crowdin PR.
+    HELP
+  end
+end
 
-    This script will generate the sections needed for the changelog, using the
-    labels of the merged PRs as a source of truth. It will add a section at the
-    end, "Unsorted", with the list of PRs that couldn't be classified.
+class ChangeLogGenerator
+  TYPES = {
+    "Added" => {
+      label: "type: feature",
+      skip_modules: false
+    },
+    "Changed" => {
+      label: "type: change",
+      skip_modules: false
+    },
+    "Fixed" => {
+      label: "type: fix",
+      skip_modules: false
+    },
+    "Removed" => {
+      label: "type: removal",
+      skip_modules: false
+    },
+    "Developer improvements" => {
+      label: "target: developer-experience",
+      skip_modules: true
+    },
+    "Internal" => {
+      label: "type: internal",
+      skip_modules: false
+    }
+  }.freeze
+
+  def initialize(github_token, since_sha)
+    @github_token = github_token
+    @since_sha = since_sha
+    @output_file = []
+    @handled_ids = []
+
+    @progress_bar = ProgressBar.create(title: "PRs", total: list_of_commits.count)
+  end
 
-    It ignores any Crowdin PR.
-  HELP
+  def run
+    raise EmptyTokenError if github_token.nil? || github_token == "--help"
 
-  exit 1
-end
+    TYPES.each do |type_title, type_data|
+      type_prs = prs.select do |_commit_title, data|
+        next unless data
 
-list_of_commits = `git log #{$since_sha}..HEAD --oneline`.split("\n").reverse
+        data[:type].include?(type_data[:label])
+      end
 
-$output_file = []
-$progressbar = ProgressBar.create(title: "PRs", total: list_of_commits.count)
+      output "### #{type_title}"
+      output ""
 
-def crowdin?(commit)
-  !commit.match(/New Crowdin updates/).nil?
-end
+      if type_prs.any?
+        type_prs.each do |_pr_title, data|
+          process_single_pr(data, type_data)
+        end
+      else
+        output "Nothing."
+      end
 
-def get_pr_id(commit)
-  id = commit.scan(/#\d+/).last
-  return unless id
+      output ""
+    end
 
-  id.delete_prefix("#")
-end
+    process_unsorted_prs
+    write_data_file!
+  end
 
-def get_pr_data(commit)
-  $progressbar.increment
+  private
 
-  id = get_pr_id(commit)
-  return nil unless id
+  def write_data_file!
+    File.write("temporary_changelog.md", @output_file.join("\n"))
+    puts "Written file: temporary_changelog.md"
+  end
 
-  data = get_data_for_pr(id)
-  labels = data["labels"].map { |l| l["name"] }.sort
-  title = data["title"]
+  def process_single_pr(data, type_data)
+    modules_list = data[:modules].map { |l| "**decidim-#{l.delete_prefix("module: ")}**" }
+    id = data[:id]
+    title = data[:title]
 
-  {
-    id: id,
-    title: title,
-    labels: labels,
-    type: labels.select { |l| l.match(/^type: /) || l == "target: developer-experience" },
-    modules: labels.select { |l| l.match(/^module: /) }
-  }
-end
+    @handled_ids << id
 
-def get_data_for_pr(id)
-  uri = "https://api.github.com/repos/decidim/decidim/issues/#{id}"
-  response = `curl -s -H "Authorization: token #{$github_token}" "#{uri}"`
-  JSON.parse(response)
-end
+    if type_data[:skip_modules] || modules_list.empty?
+      output "- #{title} #{pr_link(id)}"
+    else
+      output "- #{modules_list.join(", ")}: #{title} #{pr_link(id)}"
+    end
+  end
 
-def pr_link(id)
-  # We need to do this so that it generates the expected Markdown format.
-  # String interpolation messes with the format.
-  "[#{"\\#" + id.to_s}](https://github.com/decidim/decidim/pull/#{id})" # rubocop:disable Style/StringConcatenation
-end
+  def process_unsorted_prs
+    return unless unsorted_prs.any?
 
-def output(str)
-  $output_file << str
-end
+    output "### Unsorted"
+    output ""
 
-handled_ids = []
+    unsorted_prs.map do |title, data|
+      pr_data = data || {}
+      output "- #{title} #{pr_link(pr_data[:id])} || #{data}"
+    end
+  end
 
-prs = list_of_commits.inject({}) do |acc, commit|
-  next acc if crowdin?(commit)
+  def unsorted_prs
+    @unsorted_prs ||= prs.reject do |_commit_title, data|
+      pr_data = data || {}
 
-  acc.update(commit => get_pr_data(commit))
-end
+      @handled_ids.include?(pr_data[:id])
+    end
+  end
+
+  attr_reader :github_token, :since_sha
+
+  def prs
+    @prs ||= list_of_commits.inject({}) do |acc, commit|
+      next acc if crowdin?(commit)
 
-types = {
-  "Added" => {
-    label: "type: feature",
-    skip_modules: false
-  },
-  "Changed" => {
-    label: "type: change",
-    skip_modules: false
-  },
-  "Fixed" => {
-    label: "type: fix",
-    skip_modules: false
-  },
-  "Removed" => {
-    label: "type: removal",
-    skip_modules: false
-  },
-  "Internal" => {
-    label: "type: internal",
-    skip_modules: true
-  },
-  "Developer improvements" => {
-    label: "target: developer-experience",
-    skip_modules: true
-  }
-}
-
-types.each do |type_title, type_data|
-  type_prs = prs.select do |_commit_title, data|
-    next unless data
-
-    data[:type].include?(type_data[:label])
+      acc.update(commit => get_pr_data(commit))
+    end
   end
 
-  output "### #{type_title}"
-  output ""
+  def list_of_commits
+    @list_of_commits ||= `git log #{since_sha}..HEAD --oneline`.split("\n").reverse
+  end
 
-  if type_prs.any?
-    type_prs.each do |_pr_title, data|
-      modules_list = data[:modules].map { |l| "**decidim-#{l.delete_prefix("module: ")}**" }
-      id = data[:id]
-      title = data[:title]
+  def crowdin?(commit)
+    !commit.match(/New Crowdin updates/).nil?
+  end
 
-      handled_ids << id
+  def get_pr_id(commit)
+    id = commit.scan(/#\d+/).last
+    return unless id
 
-      if type_data[:skip_modules] || modules_list.empty?
-        output "- #{title} #{pr_link(id)}"
-      else
-        output "- #{modules_list.join(", ")}: #{title} #{pr_link(id)}"
-      end
-    end
-  else
-    output "Nothing."
+    id.delete_prefix("#")
   end
 
-  output ""
-end
+  def get_pr_data(commit)
+    @progress_bar.increment
 
-unsorted_prs = prs.reject do |_commit_title, data|
-  pr_data = data || {}
+    id = get_pr_id(commit)
+    return nil unless id
 
-  handled_ids.include?(pr_data[:id])
-end
+    data = get_data_for_pr(id)
+    labels = data["labels"].map { |l| l["name"] }.sort
+    title = data["title"]
+
+    {
+      id: id,
+      title: title,
+      labels: labels,
+      type: labels.select { |l| l.match(/^type: /) || l == "target: developer-experience" },
+      modules: labels.select { |l| l.match(/^module: /) }
+    }
+  end
 
-if unsorted_prs.any?
-  output "### Unsorted"
-  output ""
+  def get_data_for_pr(id)
+    uri = "https://api.github.com/repos/decidim/decidim/issues/#{id}"
+    response = `curl -s -H "Authorization: token #{github_token}" "#{uri}"`
+    JSON.parse(response)
+  end
+
+  def pr_link(id)
+    # We need to do this so that it generates the expected Markdown format.
+    # String interpolation messes with the format.
+    "[#{"\\#" + id.to_s}](https://github.com/decidim/decidim/pull/#{id})" # rubocop:disable Style/StringConcatenation
+  end
 
-  unsorted_prs.map do |title, data|
-    pr_data = data || {}
-    output "- #{title} #{pr_link(pr_data[:id])} || #{data}"
+  def output(str)
+    @output_file << str
   end
 end
 
-File.write("temporary_changelog.md", $output_file.join("\n"))
-# rubocop:enable Style/GlobalVars
+begin
+  ChangeLogGenerator.new(ARGV[0], ARGV[1] || "HEAD~5").run
+rescue EmptyTokenError => e
+  puts e.full_message
+  exit 1
+end
diff --git a/bin/rspec b/bin/rspec
index 50d5ccf425ed3..a6e61fc541f0e 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -17,7 +17,7 @@ if ARGV[0]
 
     other_parts = argument_parts[1..-1]
 
-    new_args = [!other_parts.empty? ? other_parts.join("/") : nil, *ARGV[1..-1]].compact
+    new_args = [other_parts.empty? ? nil : other_parts.join("/"), *ARGV[1..-1]].compact
 
     ARGV.replace(new_args)
   end
diff --git a/codecov.yml b/codecov.yml
index 822796e9636a0..70b8ad488a139 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -6,6 +6,7 @@ ignore:
   - "decidim-*/lib/decidim/**/participatory_space.rb"
 coverage:
   status:
+    patch: false
     project:
       default:
         threshold: 0.1%
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 2d6367dcd2106..3a3148116c0ca 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -65,6 +65,7 @@ search:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
   exclude:
     - decidim-dev/lib/decidim/dev/assets/iso-8859-15.md
+    - decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv
     - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js
     - decidim-comments/app/assets/javascripts/decidim/comments/bundle.js.map
     - "*.jpeg"
@@ -109,6 +110,7 @@ ignore_missing:
   - decidim.budgets.projects_helper.current_rule_explanation.*
   - decidim.budgets.projects_helper.current_rule_description.*
   - decidim.debates.debate_m.footer.commented_time_ago
+  - explanation
 
 # Consider these keys used:
 ignore_unused:
@@ -132,6 +134,7 @@ ignore_unused:
   - decidim.forms.errors.*
   - decidim.forms.file_help.*
   - decidim.forms.user_answers_serializer.*
+  - decidim.forms.admin_log.questionnaire.update
   - decidim.proposals.answers.*
   - decidim.proposals.collaborative_drafts.show.see_other_versions
   - decidim.proposals.collaborative_drafts.wizard_aside.back
@@ -296,7 +299,7 @@ ignore_unused:
   - decidim.elections.trustee_zone.trustees.show.identification_keys.upload_error.*
   - decidim.elections.feedback.answer.*
   - decidim.elections.trustee_zone.elections.key_ceremony_steps.keys.*
-  - decidim.elections.trustee_zone.elections.tally_steps.keys.*
+  - decidim.elections.trustee_zone.elections.tally_started_steps.keys.*
   - decidim.votings.admin_log.*
   - decidim.votings.admin.content_blocks.landing_page.*
   - decidim.votings.census.admin.census.new.file_help.*
@@ -317,6 +320,9 @@ ignore_unused:
   - decidim.assemblies.admin.assembly_members.form.explanation
   - decidim.assemblies.admin.assembly_members.form.image_guide
   - decidim.assemblies.admin.assembly_members.form.non_user_avatar_help
+  - decidim.blogs.admin_log.*
+  - decidim.templates.admin_log.*
+  - decidim.forms.upload_help.explanation
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:
diff --git a/decidim-accountability/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb b/decidim-accountability/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
index dba15a314a849..96a4e5fc2aded 100644
--- a/decidim-accountability/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
+++ b/decidim-accountability/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
@@ -21,7 +21,7 @@ def show
       private
 
       def results
-        @results ||= Decidim::Accountability::Result.where(component: model).order_randomly(rand * 2 - 1)
+        @results ||= Decidim::Accountability::Result.where(component: model).order_randomly((rand * 2) - 1)
       end
 
       def results_to_render
@@ -31,6 +31,18 @@ def results_to_render
       def results_count
         @results_count ||= results.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/accountability/highlighted_results_for_component"
+        hash << results.cache_key_with_version
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
+
+      def cache_expiry_time
+        10.minutes
+      end
     end
   end
 end
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/create_imported_result.rb b/decidim-accountability/app/commands/decidim/accountability/admin/create_imported_result.rb
index 72334d1608257..73f4dcd47ee63 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/create_imported_result.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/create_imported_result.rb
@@ -5,7 +5,7 @@ module Accountability
     module Admin
       # This command is executed when the user creates a Result from the admin
       # panel.
-      class CreateImportedResult < Rectify::Command
+      class CreateImportedResult < Decidim::Command
         def initialize(form, parent_id = nil)
           @form = form
           @parent_id = parent_id
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/create_result.rb b/decidim-accountability/app/commands/decidim/accountability/admin/create_result.rb
index b7be58e3039db..2f17ab9c3adb3 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/create_result.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/create_result.rb
@@ -5,7 +5,7 @@ module Accountability
     module Admin
       # This command is executed when the user creates a Result from the admin
       # panel.
-      class CreateResult < Rectify::Command
+      class CreateResult < Decidim::Command
         def initialize(form)
           @form = form
         end
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/create_status.rb b/decidim-accountability/app/commands/decidim/accountability/admin/create_status.rb
index 66759635eb6fc..e976bd33a09e1 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/create_status.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/create_status.rb
@@ -5,9 +5,10 @@ module Accountability
     module Admin
       # This command is executed when the user creates a Status from the admin
       # panel.
-      class CreateStatus < Rectify::Command
-        def initialize(form)
+      class CreateStatus < Decidim::Command
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Creates the status if valid.
@@ -28,7 +29,9 @@ def call
         attr_reader :status
 
         def create_status
-          @status = Status.create!(
+          @status = Decidim.traceability.create!(
+            Status,
+            @user,
             component: @form.current_component,
             key: @form.key,
             name: @form.name,
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/create_timeline_entry.rb b/decidim-accountability/app/commands/decidim/accountability/admin/create_timeline_entry.rb
index 7def45b2d973a..8cc2c26d88a69 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/create_timeline_entry.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/create_timeline_entry.rb
@@ -5,9 +5,10 @@ module Accountability
     module Admin
       # This command is executed when the user creates a TimelineEntry
       # for a Result from the admin panel.
-      class CreateTimelineEntry < Rectify::Command
-        def initialize(form)
+      class CreateTimelineEntry < Decidim::Command
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Creates the timeline_entry if valid.
@@ -28,7 +29,9 @@ def call
         attr_reader :timeline_entry, :form
 
         def create_timeline_entry
-          @timeline_entry = TimelineEntry.create!(
+          @timeline_entry = Decidim.traceability.create!(
+            TimelineEntry,
+            @user,
             decidim_accountability_result_id: form.decidim_accountability_result_id,
             entry_date: form.entry_date,
             title: form.title,
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/destroy_result.rb b/decidim-accountability/app/commands/decidim/accountability/admin/destroy_result.rb
index fc570baa66324..7dc3850967b8c 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/destroy_result.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/destroy_result.rb
@@ -5,7 +5,7 @@ module Accountability
     module Admin
       # This command is executed when the user destroys a Result from the admin
       # panel.
-      class DestroyResult < Rectify::Command
+      class DestroyResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # result - The current instance of the result to be destroyed.
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/update_imported_result.rb b/decidim-accountability/app/commands/decidim/accountability/admin/update_imported_result.rb
index 28a896dace13c..0b041f269b8c6 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/update_imported_result.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/update_imported_result.rb
@@ -5,7 +5,7 @@ module Accountability
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateImportedResult < Rectify::Command
+      class UpdateImportedResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/update_result.rb b/decidim-accountability/app/commands/decidim/accountability/admin/update_result.rb
index 3ec5eb79aebc1..23f6fb1daa3b9 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/update_result.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/update_result.rb
@@ -5,7 +5,7 @@ module Accountability
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateResult < Rectify::Command
+      class UpdateResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/update_status.rb b/decidim-accountability/app/commands/decidim/accountability/admin/update_status.rb
index b778f14dc98b6..d013d8f453527 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/update_status.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/update_status.rb
@@ -5,14 +5,15 @@ module Accountability
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateStatus < Rectify::Command
+      class UpdateStatus < Decidim::Command
         # Initializes an UpdateStatus Command.
         #
         # form - The form from which to get the data.
         # status - The current instance of the status to be updated.
-        def initialize(form, status)
+        def initialize(form, status, user)
           @form = form
           @status = status
+          @user = user
         end
 
         # Updates the status if valid.
@@ -33,7 +34,9 @@ def call
         attr_reader :status, :form
 
         def update_status
-          status.update!(
+          Decidim.traceability.update!(
+            status,
+            @user,
             key: @form.key,
             name: @form.name,
             description: @form.description,
diff --git a/decidim-accountability/app/commands/decidim/accountability/admin/update_timeline_entry.rb b/decidim-accountability/app/commands/decidim/accountability/admin/update_timeline_entry.rb
index 1feee2a24cb3c..6a787db870138 100644
--- a/decidim-accountability/app/commands/decidim/accountability/admin/update_timeline_entry.rb
+++ b/decidim-accountability/app/commands/decidim/accountability/admin/update_timeline_entry.rb
@@ -5,14 +5,15 @@ module Accountability
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateTimelineEntry < Rectify::Command
+      class UpdateTimelineEntry < Decidim::Command
         # Initializes an UpdateTimelineEntry Command.
         #
         # form - The form from which to get the data.
         # timeline_entry - The current instance of the timeline_entry to be updated.
-        def initialize(form, timeline_entry)
+        def initialize(form, timeline_entry, user)
           @form = form
           @timeline_entry = timeline_entry
+          @user = user
         end
 
         # Updates the timeline_entry if valid.
@@ -33,7 +34,9 @@ def call
         attr_reader :timeline_entry, :form
 
         def update_timeline_entry
-          timeline_entry.update!(
+          Decidim.traceability.update!(
+            timeline_entry,
+            @user,
             entry_date: form.entry_date,
             title: form.title,
             description: form.description
diff --git a/decidim-accountability/app/controllers/decidim/accountability/admin/statuses_controller.rb b/decidim-accountability/app/controllers/decidim/accountability/admin/statuses_controller.rb
index d9fb24bd2efac..996fc4cda109e 100644
--- a/decidim-accountability/app/controllers/decidim/accountability/admin/statuses_controller.rb
+++ b/decidim-accountability/app/controllers/decidim/accountability/admin/statuses_controller.rb
@@ -18,7 +18,7 @@ def create
 
           @form = form(StatusForm).from_params(params)
 
-          CreateStatus.call(@form) do
+          CreateStatus.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("statuses.create.success", scope: "decidim.accountability.admin")
               redirect_to statuses_path
@@ -42,7 +42,7 @@ def update
 
           @form = form(StatusForm).from_params(params)
 
-          UpdateStatus.call(@form, status) do
+          UpdateStatus.call(@form, status, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("statuses.update.success", scope: "decidim.accountability.admin")
               redirect_to statuses_path
@@ -58,7 +58,9 @@ def update
         def destroy
           enforce_permission_to :destroy, :status, status: status
 
-          status.destroy!
+          Decidim.traceability.perform_action!("delete", status, current_user) do
+            status.destroy!
+          end
 
           flash[:notice] = I18n.t("statuses.destroy.success", scope: "decidim.accountability.admin")
 
diff --git a/decidim-accountability/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb b/decidim-accountability/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
index c9778d07cbdb8..0b6fe64e2e3e6 100644
--- a/decidim-accountability/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
+++ b/decidim-accountability/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
@@ -19,7 +19,7 @@ def create
           @form = form(TimelineEntryForm).from_params(params)
           @form.decidim_accountability_result_id = params[:result_id]
 
-          CreateTimelineEntry.call(@form) do
+          CreateTimelineEntry.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("timeline_entries.create.success", scope: "decidim.accountability.admin")
               redirect_to result_timeline_entries_path(params[:result_id])
@@ -43,7 +43,7 @@ def update
 
           @form = form(TimelineEntryForm).from_params(params)
 
-          UpdateTimelineEntry.call(@form, timeline_entry) do
+          UpdateTimelineEntry.call(@form, timeline_entry, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("timeline_entries.update.success", scope: "decidim.accountability.admin")
               redirect_to result_timeline_entries_path(params[:result_id])
@@ -59,7 +59,9 @@ def update
         def destroy
           enforce_permission_to :destroy, :timeline_entry, timeline_entry: timeline_entry
 
-          timeline_entry.destroy!
+          Decidim.traceability.perform_action!("delete", timeline_entry, current_user) do
+            timeline_entry.destroy!
+          end
 
           flash[:notice] = I18n.t("timeline_entries.destroy.success", scope: "decidim.accountability.admin")
 
diff --git a/decidim-accountability/app/controllers/decidim/accountability/results_controller.rb b/decidim-accountability/app/controllers/decidim/accountability/results_controller.rb
index e3eebb3b72461..d666bd396cfca 100644
--- a/decidim-accountability/app/controllers/decidim/accountability/results_controller.rb
+++ b/decidim-accountability/app/controllers/decidim/accountability/results_controller.rb
@@ -17,30 +17,30 @@ def show
       private
 
       def results
-        parent_id = params[:parent_id].presence
-        @results ||= search.results.where(parent_id: parent_id).page(params[:page]).per(12)
+        @results ||= begin
+          parent_id = params[:parent_id].presence
+          search.result.where(
+            parent_id: [parent_id] + Result.where(parent_id: parent_id).pluck(:id)
+          ).page(params[:page]).per(12)
+        end
       end
 
       def result
-        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:id])
+        @result ||= search_collection.includes(:timeline_entries).find_by(id: params[:id])
       end
 
-      def search_klass
-        ResultSearch
+      def search_collection
+        Result.where(component: current_component)
       end
 
       def default_filter_params
         {
-          search_text: "",
-          scope_id: "",
-          category_id: ""
+          search_text_cont: "",
+          with_scope: "",
+          with_category: ""
         }
       end
 
-      def context_params
-        { component: current_component, organization: current_organization }
-      end
-
       def first_class_categories
         @first_class_categories ||= current_participatory_space.categories.first_class
       end
diff --git a/decidim-accountability/app/forms/decidim/accountability/admin/result_form.rb b/decidim-accountability/app/forms/decidim/accountability/admin/result_form.rb
index a8a38c1d0f8fa..3ea263cedf000 100644
--- a/decidim-accountability/app/forms/decidim/accountability/admin/result_form.rb
+++ b/decidim-accountability/app/forms/decidim/accountability/admin/result_form.rb
@@ -59,14 +59,14 @@ def projects
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the result
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category
diff --git a/decidim-accountability/app/helpers/decidim/accountability/breadcrumb_helper.rb b/decidim-accountability/app/helpers/decidim/accountability/breadcrumb_helper.rb
index 837f724e5a417..018f1cbaecf42 100644
--- a/decidim-accountability/app/helpers/decidim/accountability/breadcrumb_helper.rb
+++ b/decidim-accountability/app/helpers/decidim/accountability/breadcrumb_helper.rb
@@ -10,7 +10,7 @@ def stats_calculator
       end
 
       def current_scope
-        params[:filter][:scope_id] if params[:filter]
+        params[:filter][:with_scope] if params[:filter]
       end
 
       def progress_calculator(scope_id, category_id)
@@ -18,7 +18,7 @@ def progress_calculator(scope_id, category_id)
       end
 
       def category
-        return if (category_id = params.dig(:filter, :category_id)).blank?
+        return if (category_id = params.dig(:filter, :with_category)).blank?
 
         @category ||= current_participatory_space.categories.find(category_id.is_a?(Array) ? category_id.first : category_id)
       end
diff --git a/decidim-accountability/app/models/decidim/accountability/result.rb b/decidim-accountability/app/models/decidim/accountability/result.rb
index 5d6b5875eb51e..b44bca63ff500 100644
--- a/decidim-accountability/app/models/decidim/accountability/result.rb
+++ b/decidim-accountability/app/models/decidim/accountability/result.rb
@@ -15,10 +15,11 @@ class Result < Accountability::ApplicationRecord
       include Decidim::Comments::CommentableWithComponent
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Randomable
       include Decidim::Searchable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       component_manifest_name "accountability"
 
@@ -81,14 +82,17 @@ def allow_resource_permissions?
         true
       end
 
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_category, :with_scope]
+      end
+
       ransacker :id_string do
         Arel.sql(%{cast("decidim_accountability_results"."id" as text)})
       end
 
-      # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       private
 
diff --git a/decidim-accountability/app/models/decidim/accountability/status.rb b/decidim-accountability/app/models/decidim/accountability/status.rb
index f72d575fada3f..b1f26ee23077c 100644
--- a/decidim-accountability/app/models/decidim/accountability/status.rb
+++ b/decidim-accountability/app/models/decidim/accountability/status.rb
@@ -7,6 +7,8 @@ module Accountability
     class Status < Accountability::ApplicationRecord
       include Decidim::HasComponent
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
+      include Decidim::Traceable
 
       component_manifest_name "accountability"
 
@@ -18,8 +20,10 @@ class Status < Accountability::ApplicationRecord
       validates :name, presence: true
 
       # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-      ransacker :name do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      ransacker_i18n :name
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Accountability::AdminLog::StatusPresenter
       end
     end
   end
diff --git a/decidim-accountability/app/models/decidim/accountability/timeline_entry.rb b/decidim-accountability/app/models/decidim/accountability/timeline_entry.rb
index 90be57c3e430b..ba1ce22ce2d20 100644
--- a/decidim-accountability/app/models/decidim/accountability/timeline_entry.rb
+++ b/decidim-accountability/app/models/decidim/accountability/timeline_entry.rb
@@ -6,10 +6,15 @@ module Accountability
     # It stores a date, and localized description.
     class TimelineEntry < Accountability::ApplicationRecord
       include Decidim::TranslatableResource
+      include Decidim::Traceable
 
       translatable_fields :title
       translatable_fields :description
       belongs_to :result, foreign_key: "decidim_accountability_result_id", class_name: "Decidim::Accountability::Result", inverse_of: :timeline_entries
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Accountability::AdminLog::TimelineEntryPresenter
+      end
     end
   end
 end
diff --git a/decidim-accountability/app/presenters/decidim/accountability/admin_log/status_presenter.rb b/decidim-accountability/app/presenters/decidim/accountability/admin_log/status_presenter.rb
new file mode 100644
index 0000000000000..7d3de7c21b356
--- /dev/null
+++ b/decidim-accountability/app/presenters/decidim/accountability/admin_log/status_presenter.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Accountability::Status`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    StatusPresenter.new(action_log, view_helpers).present
+      class StatusPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.accountability.admin_log.status.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            key: :string,
+            name: :i18n,
+            description: :i18n,
+            progress: :integer
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-accountability/app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb b/decidim-accountability/app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb
new file mode 100644
index 0000000000000..4597d21eb0d41
--- /dev/null
+++ b/decidim-accountability/app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Accountability::TimelineEntry`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #     TimelineEntryPresenter.new(action_log, view_helpers).present
+      class TimelineEntryPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.accountability.admin_log.timeline_entry.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            entry_date: :date,
+            description: :i18n,
+            title: :i18n
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-accountability/app/services/decidim/accountability/result_search.rb b/decidim-accountability/app/services/decidim/accountability/result_search.rb
deleted file mode 100644
index e5a63decc32ed..0000000000000
--- a/decidim-accountability/app/services/decidim/accountability/result_search.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    # This class handles search and filtering of results. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the results.
-    class ResultSearch < ResourceSearch
-      text_search_fields :title, :description
-
-      # Public: Initializes the service.
-      #
-      # options - A hash of options to modify the search. These options will be
-      #          converted to methods by SearchLight so they can be used on filter
-      #          methods. (Default {})
-      #          * component - A Decidim::Component to get the results from.
-      #          * organization - A Decidim::Organization object.
-      #          * parent_id - The parent ID of the result. The value is forced to false to force
-      #                        the filter execution when the value is nil
-      #          * deep_search - Whether to perform the search on all children levels or just the
-      #                          first one. True by default.
-      def initialize(options = {})
-        options = options.dup
-        options[:deep_search] = true if options[:deep_search].nil?
-        options[:parent_id] = "root" if options[:parent_id].nil?
-        super(Result.all, options)
-      end
-
-      # Handle parent_id filter
-      def search_parent_id
-        parent_id = options[:parent_id]
-        parent_id = nil if parent_id == "root"
-
-        if options[:deep_search]
-          query.where(parent_id: [parent_id] + children_ids(parent_id))
-        else
-          query.where(parent_id: parent_id)
-        end
-      end
-
-      private
-
-      def children_ids(parent_id)
-        Result.where(parent_id: parent_id).pluck(:id)
-      end
-    end
-  end
-end
diff --git a/decidim-accountability/app/services/decidim/accountability/results_calculator.rb b/decidim-accountability/app/services/decidim/accountability/results_calculator.rb
index 67225a60ec23e..fd86ac4faf85d 100644
--- a/decidim-accountability/app/services/decidim/accountability/results_calculator.rb
+++ b/decidim-accountability/app/services/decidim/accountability/results_calculator.rb
@@ -22,12 +22,16 @@ def progress
       attr_reader :component, :scope_id, :category_id
 
       def results
-        @results ||= ResultSearch.new(
-          component: component,
-          scope_id: scope_id,
-          category_id: category_id,
-          deep_search: false
-        ).results
+        @results ||= begin
+          query = Result.where(
+            parent_id: nil,
+            component: component
+          )
+          query = query.with_any_scope(scope_id) if scope_id
+          query = query.with_any_category(category_id) if category_id
+
+          query
+        end
       end
     end
   end
diff --git a/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb
index 268e715b55486..c76972622c904 100644
--- a/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb
@@ -20,7 +20,7 @@
         <tbody>
           <% timeline_entries.each do |timeline_entry| %>
             <tr data-id="<%= timeline_entry.id %>">
-              <td><%= timeline_entry.entry_date %><br></td>
+              <td><%= l timeline_entry.entry_date, format: :decidim_short %><br></td>
               <td><%= translated_attribute(timeline_entry.title) %></td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :timeline_entry, timeline_entry: timeline_entry %>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_home_categories.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_home_categories.html.erb
index e2b8837e119b4..b82b0f04e6f10 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_home_categories.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_home_categories.html.erb
@@ -26,7 +26,7 @@
             <div class="category--section small-12 medium-4 columns">
               <div class="category--title">
                 <p class="heading3">
-                <%= link_to translated_attribute(category.name),results_path(filter: { category_id: category, scope_id: current_scope }) %></p>
+                <%= link_to translated_attribute(category.name),results_path(filter: { with_category: category, with_scope: current_scope }) %></p>
 
                 <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
                   <div class="progress">
@@ -51,7 +51,7 @@
               <div class="row">
                 <% category.subcategories.each do |subcategory| %>
                   <% if (subcategory_results_count = count_calculator(current_scope, subcategory.id)) > 0 %>
-                    <%= link_to results_path(filter: { category_id: subcategory, scope_id: current_scope }), class: "medium-4 columns end card__link card__link--block" do %>
+                    <%= link_to results_path(filter: { with_category: subcategory, with_scope: current_scope }), class: "medium-4 columns end card__link card__link--block" do %>
                       <div class="category--line">
                         <strong><%= translated_attribute(subcategory.name) %></strong>
 
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb
index 0b873d3519bd5..3853fe4dff040 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb
@@ -7,7 +7,7 @@
   <% if category.present? && category.parent.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(category.parent.name), results_path(filter: { category_id: category.parent_id, scope_id: current_scope }) %>
+      <%= link_to translated_attribute(category.parent.name), results_path(filter: { with_category: category.parent_id, with_scope: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
       <% end %>
@@ -17,7 +17,7 @@
   <% if category.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(category.name), results_path(filter: { category_id: category.id, scope_id: current_scope }) %>
+      <%= link_to translated_attribute(category.name), results_path(filter: { with_category: category.id, with_scope: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
       <% end %>
@@ -27,7 +27,7 @@
   <% if result && result.parent.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
-      <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { scope_id: current_scope }) %>
+      <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { with_category: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage result.parent.progress %></span>
       <% end %>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_results_leaf.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_results_leaf.html.erb
index 5a3408b8b47c5..891cce27b5649 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_results_leaf.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_results_leaf.html.erb
@@ -42,6 +42,6 @@
         </div>
       <% end %>
     </div>
-    <%= decidim_paginate results, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+    <%= decidim_paginate results, order_start_time: params[:order_start_time], with_scope: params.dig(:filter, :with_scope) %>
   </div>
 </div>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_results_parent.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_results_parent.html.erb
index 72d4e82b3196d..26cc24c8b3e44 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_results_parent.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_results_parent.html.erb
@@ -27,6 +27,6 @@
         </div>
       <% end %>
     </div>
-    <%= decidim_paginate results, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+    <%= decidim_paginate results, order_start_time: params[:order_start_time], with_scope: params.dig(:filter, :with_scope) %>
   </div>
 </div>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_scope_filters.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_scope_filters.html.erb
index c2fe194eda2a0..39eceb8a615fa 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_scope_filters.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_scope_filters.html.erb
@@ -4,7 +4,7 @@
 
     <ul class="tags tags--action">
       <li <%= active_class_if_current(nil) %>>
-          <%= link_to url_for(filter: { category_id: category.try(:id) }) do %>
+          <%= link_to url_for(filter: { with_category: category.try(:id) }) do %>
             <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 2) %></span>
             <%= t("results.filters.all", scope: "decidim.accountability") %>
           <% end %>
@@ -12,7 +12,7 @@
 
       <% if current_participatory_space.scope %>
         <li <%= active_class_if_current(current_participatory_space.scope.id) %>>
-          <%= link_to url_for(filter: { scope_id: current_participatory_space.scope.id, category_id: category.try(:id) }) do %>
+          <%= link_to url_for(filter: { with_scope: current_participatory_space.scope.id, with_category: category.try(:id) }) do %>
             <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
             <%= translated_attribute(current_participatory_space.scope.name) %>
           <% end %>
@@ -20,7 +20,7 @@
       <% end %>
       <% current_participatory_space.subscopes.each do |scope| %>
         <li <%= active_class_if_current(scope.id) %>>
-          <%= link_to url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) do %>
+          <%= link_to url_for(filter: { with_scope: scope.id, with_category: category.try(:id) }) do %>
             <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
             <%= translated_attribute(scope.name) %>
           <% end %>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/_search.html.erb b/decidim-accountability/app/views/decidim/accountability/results/_search.html.erb
index dc03a8a627476..3b06737b6fbf9 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/_search.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/_search.html.erb
@@ -1,7 +1,7 @@
 <%= form_tag results_path, method: :get do %>
   <div class="filters__search">
     <div class="input-group">
-      <%= search_field_tag "filter[search_text]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title:  t(".search") %>
+      <%= search_field_tag "filter[search_text_cont]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title:  t(".search") %>
       <div class="input-group-button">
         <button type="submit" class="button">
           <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
diff --git a/decidim-accountability/app/views/decidim/accountability/results/home.html.erb b/decidim-accountability/app/views/decidim/accountability/results/home.html.erb
index aa7125d6838e1..b10afddbca36c 100644
--- a/decidim-accountability/app/views/decidim/accountability/results/home.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/results/home.html.erb
@@ -6,4 +6,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_accountability" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_accountability" %>
+<% end %>
diff --git a/decidim-accountability/app/views/decidim/accountability/versions/show.html.erb b/decidim-accountability/app/views/decidim/accountability/versions/show.html.erb
index 8802b2b00d9a3..86711cb60fe0d 100644
--- a/decidim-accountability/app/views/decidim/accountability/versions/show.html.erb
+++ b/decidim-accountability/app/views/decidim/accountability/versions/show.html.erb
@@ -1,4 +1,6 @@
-<%= javascript_pack_tag "decidim_accountability" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_accountability" %>
+<% end %>
 <div class="row accountability">
   <div class="small-12 columns">
     <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: versioned_resource.parent.try(:category) || versioned_resource.try(:category) } %>
diff --git a/decidim-accountability/app/views/decidim/participatory_spaces/_result.html.erb b/decidim-accountability/app/views/decidim/participatory_spaces/_result.html.erb
index 5c4bb0b36b5bd..3a4aea23b83f2 100644
--- a/decidim-accountability/app/views/decidim/participatory_spaces/_result.html.erb
+++ b/decidim-accountability/app/views/decidim/participatory_spaces/_result.html.erb
@@ -9,12 +9,12 @@
       <div class="text-small card--meta">
         <% if result.start_date %>
             <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
-            <span><%= result.start_date %></span>
+            <span><%= l result.start_date, format: :short %></span>
         <% end %>
 
         <% if result.end_date %>
             <strong><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></strong>
-            <span><%= result.end_date %></span>
+            <span><%= l result.end_date, format: :short %></span>
         <% end %>
 
         <% if result.status %>
diff --git a/decidim-accountability/config/locales/ar.yml b/decidim-accountability/config/locales/ar.yml
index 8a12578600339..292e357a2de69 100644
--- a/decidim-accountability/config/locales/ar.yml
+++ b/decidim-accountability/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -9,7 +10,7 @@ ar:
         end_date: تاريخ الانتهاء
         progress: تقدم
         project_ids: المشاريع المدرجة
-        proposals: وشملت المقترحات
+        proposals: المقترحات المدرجة
         start_date: تاريخ البدء
         title: عنوان
         updated_at: تم التحديث �ي
@@ -21,9 +22,10 @@ ar:
       timeline_entry:
         description: وص�
         entry_date: تاريخ
+        title: العنوان
     models:
-      decidim/accountability/proposal_linked_event: اقتراح المدرجة �ي النتيجة
-      decidim/accountability/result_progress_updated_event: نتيجة التقدم المحدث
+      decidim/accountability/proposal_linked_event: الاقتراح المدرج �ي نتيجة
+      decidim/accountability/result_progress_updated_event: النتائج المحدثة
   activerecord:
     models:
       decidim/accountability/result:
@@ -36,13 +38,13 @@ ar:
   decidim:
     accountability:
       actions:
-        attachment_collections: المجلدات
+        attachment_collections: الحا�ظات
         attachments: المر�قات
         confirm_destroy: هل أنت متأكد أنك تريد حذ� هذا %{name}؟
         destroy: حذ�
         edit: تعديل
         import_csv: استيراد CSV
-        new: جديد %{name}
+        new: '%{name} جديد'
         preview: معاينة
         timeline_entries: تطور المشروع
         title: الإجراءات
@@ -52,7 +54,28 @@ ar:
           results: النتائج
         import_results:
           new:
+            download_export: تحميل التصدير بصيغه CSV
             import: استيراد
+            info: |
+              <p>نحن ننصح باتباع هذه الخطوات:</p>
+              <ol>
+               <li>قم بإنشاء حالات النتائج التي تريد إضا�تها (<a href="%{link_new_status}" target="_blank">الرابط</a>)</li>
+               <li>قم بإنشاء نتيجة واحدة على الأقل يدويًا من خلال لوحة المدير هذه (<a href="%{link_new_result}" target="_blank">link</a>) قبل أستخدام الاستيراد, للحصول على �هم أ�ضل للتنسيق وما ستحتاج لملئه.</li>
+               <li>قم بتنزيل التصدير بتنسيق CSV(%{link_export_csv})</li>
+               <li>قم بإجراء التغييرات محليًا على جهازك. يمكنك �قط تغيير الأعمدة التالية من مل� CSV:</li>
+              </ol>
+              <ul>
+               <li><b>category/id:</b>رقم مٌعر� لل�ئه</li>
+               <li><b>scope/id:</b>رقم مٌعر� للمجال</li>
+               <li><b>parent/id:</b> رقم مٌعر� بالأب (للنتائج ذات الصلة). اختياري</li>
+               <li><b>title/I18N:</b> عنوان اللغه</li>
+               <li><b>description/I18N:</b> وص� اللغه</li>
+               <li><b>start_date:</b>التاريخ الذي يبدأ �يه تن�يذ النتيجة (التنسيق YYYY-MM-DD)</li>
+               <li><b>end_date:</b> التاريخ الذي ينتهى �يه تن�يذ النتيجة (التنسيق YYYY-MM-DD</li>
+               <li><b>status/id:</b> رقم مٌعر� لحالة النتيجة</li>
+               <li><b>progress:</b> النسبة المئوية (من 0 الى 100) للتن�يذ</li>
+               <li><b>proposals_ids:</b> رقم م�عر� داخلى للمقترحات ذات الصلة (م�صولاً ب�اصلة). يتم تحويله تلقائيًا إلى <span class="attribute-name">رابط للمقترح</span></li>
+              </ul>
             title: استيراد النتائج من مل� CSV
         imports:
           create:
@@ -83,7 +106,7 @@ ar:
             success: تم تحديث النتيجة بنجاح
         shared:
           subnav:
-            statuses: الأوضاع
+            statuses: الحالات
         statuses:
           create:
             invalid: كانت هناك مشكلة �ي إنشاء هذه الحالة
@@ -94,7 +117,7 @@ ar:
             title: تحرير الحالة
             update: تحديث الحالة
           index:
-            title: الأوضاع
+            title: الحالات
           new:
             create: إنشاء الحالة
             title: حالة جديدة
@@ -108,21 +131,29 @@ ar:
           destroy:
             success: تم حذ� الإدخال بنجاح
           edit:
-            title: تحرير دخول
+            title: تحرير الإدخال
             update: تحديث الإدخال
           index:
             title: إدخالات الجدول الزمني للمشروع
           new:
-            create: إنشاء دخول
-            title: دخول جديد
+            create: إنشاء الإدخال
+            title: إدخال جديد
           update:
             invalid: حدثت مشكلة أثناء تحديث هذا الإدخال
             success: تم تحديث الإدخال بنجاح
       admin_log:
         result:
-          create: "%{user_name} نتيجة تم إنشاؤها %{resource_name} �ي %{space_name}"
+          create: "%{user_name} أنشأ النتيجة %{resource_name} �ي %{space_name}"
           delete: "%{user_name} حذ� النتيجة %{resource_name} �ي %{space_name}"
-          update: "%{user_name} نتيجة محدثة %{resource_name} �ي %{space_name}"
+          update: "%{user_name} حدث النتيجة %{resource_name} �ي %{space_name}"
+        status:
+          create: "%{user_name} أنشأ حالة %{resource_name}"
+          delete: "%{user_name} حذ� حالة %{resource_name}"
+          update: "%{user_name} حدث حالة %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} أنشأ إدخال الجدول الزمني %{resource_name}"
+          delete: "%{user_name} حذ� إدخال الجدول الزمني %{resource_name}"
+          update: "%{user_name} حدث إدخال الجدول الزمني %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'لم يتم العثور على الأصل �ي قاعدة البيانات (الرقم-الم�عر�: %{id})'
@@ -144,7 +175,7 @@ ar:
         result:
           fields:
             category: ال�ئة
-            created_at: أنشئ
+            created_at: تم الإنشاء
             end_date: تاريخ الانتهاء
             id: المعر� ID
             progress: تقدم
@@ -160,8 +191,8 @@ ar:
             progress: تقدم
         timeline_entry:
           fields:
-            description: وص�
             entry_date: تاريخ
+            title: العنوان
       result_m:
         executed: تم التن�يذ
         view: عرض
@@ -178,7 +209,7 @@ ar:
           all: الكل
           scopes: نطاقات
         home:
-          categories_label: الاقسام
+          categories_label: ال�ئات
           subcategories_label: ال�ئات ال�رعية
         home_header:
           global_status: حالة التن�يذ العالمي
@@ -188,7 +219,7 @@ ar:
           search: البحث عن الإجراءات
         show:
           stats:
-            attendees: الحاضرين
+            attendees: الحضور
             back_to_resource: العودة إلى النتيجة
             comments: تعليقات
             contributions: مساهمات
@@ -232,16 +263,16 @@ ar:
         proposal_linked:
           email_intro: 'تم تضمين الاقتراح "%{proposal_title}" �ي النتيجة. يمكنك أن ترى ذلك من هذه الص�حة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{proposal_title}". يمكنك إيقا� تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: تحديث إلى %{proposal_title}
+          email_subject: تحديث حول %{proposal_title}
           notification_title: تم إدراج الاقتراح <a href="%{proposal_path}">%{proposal_title}</a> �ي النتيجة <a href="%{resource_path}">%{resource_title}</a>.
         result_progress_updated:
           email_intro: 'النتيجة "%{resource_title}" ، التي تتضمن الاقتراح "%{proposal_title}" ، اكتملت الآن بنسبة %{progress}٪. يمكنك أن ترى ذلك من هذه الص�حة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{proposal_title}" ، ويتم تضمين هذا الاقتراح �ي النتيجة "%{resource_title}". يمكنك إيقا� تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: تحديث إلى %{resource_title} التقدم
+          email_subject: تحديث حول تقدم %{resource_title}
           notification_title: النتيجة <a href="%{resource_path}">%{resource_title}</a>، التي تتضمن الاقتراح <a href="%{proposal_path}">%{proposal_title}</a>، اكتملت الآن بنسبة %{progress}٪.
     metrics:
       results:
-        description: عدد النتائج التي تم إنشاؤها
+        description: عدد النتائج التي تم توليدها
         object: النتائج
         title: النتائج
     participatory_spaces:
@@ -251,6 +282,6 @@ ar:
       included_projects:
         result_project: المشاريع المدرجة �ي هذه النتيجة
       included_proposals:
-        result_proposal: المقترحات المدرجة �ي هذه النتيجة
+        result_proposal: الاقتراحات المدرجة �ي هذه النتيجة
     statistics:
       results_count: النتائج
diff --git a/decidim-accountability/config/locales/bg.yml b/decidim-accountability/config/locales/bg.yml
index 7bbc56a63dc51..3c61732a93308 100644
--- a/decidim-accountability/config/locales/bg.yml
+++ b/decidim-accountability/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
@@ -144,7 +145,6 @@ bg:
             progress: �апредък
         timeline_entry:
           fields:
-            description: Опи�ание
             entry_date: Дата
       results:
         count:
diff --git a/decidim-accountability/config/locales/ca.yml b/decidim-accountability/config/locales/ca.yml
index b38227b35e454..dd740705070ad 100644
--- a/decidim-accountability/config/locales/ca.yml
+++ b/decidim-accountability/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ ca:
       timeline_entry:
         description: Descripció
         entry_date: Data
+        title: Títol
     models:
       decidim/accountability/proposal_linked_event: Proposta inclosa a un resultat
       decidim/accountability/result_progress_updated_event: Progrés del resultat actualitzat
@@ -141,6 +143,14 @@ ca:
           create: "%{user_name} ha creat el resultat %{resource_name} en %{space_name}"
           delete: "%{user_name} ha eliminat el resultat %{resource_name} de l'espai %{space_name}"
           update: "%{user_name} ha actualitzat el resultat %{resource_name} en %{space_name}"
+        status:
+          create: "%{user_name} ha creat l'estat %{resource_name}"
+          delete: "%{user_name} ha eliminat l'estat %{resource_name}"
+          update: "%{user_name} ha actualitzat l'estat %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} ha creat l'entrada %{resource_name} a la línia de temps"
+          delete: "%{user_name} ha eliminat l'entrada %{resource_name} a la línia de temps"
+          update: "%{user_name} ha actualitzat l'entrada %{resource_name} a la línia de temps"
         value_types:
           parent_presenter:
             not_found: 'No s''ha trobat el pare a la base de dades (ID: %{id})'
@@ -178,8 +188,8 @@ ca:
             progress: Progrés
         timeline_entry:
           fields:
-            description: Descripció
             entry_date: Data
+            title: Títol
       result_m:
         executed: Executat
         view: Veure
diff --git a/decidim-accountability/config/locales/cs.yml b/decidim-accountability/config/locales/cs.yml
index 07d8f7a8899ff..5beebd0768f95 100644
--- a/decidim-accountability/config/locales/cs.yml
+++ b/decidim-accountability/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ cs:
       timeline_entry:
         description: Popis
         entry_date: Datum
+        title: Název
     models:
       decidim/accountability/proposal_linked_event: Návrh zahrnutý do výsledku
       decidim/accountability/result_progress_updated_event: Výsledek byl aktualizován
@@ -52,6 +54,27 @@ cs:
           new:
             download_export: Stáhnout export s CSV formátem
             import: Importovat
+            info: |
+              <p>Doporu�ujeme postupovat podle těchto kroků:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>Vytvořit stavy pro výsledky</a>, které chcete přidat</li>
+              <li><a href='%{link_new_result}' target='_blank'>Vytvořte alespoň jeden výsledek manuálně</a> přes tento Admin panel před použitím Importu, za lepší pochopení formátu a toho, co budete muset vyplnit.</li>
+              <li>%{link_export_csv}</li>
+              <li>Změňte lokálně. Můžete změnit pouze následující sloupce CSV:
+                <ul>
+                <li><b>category/id:</b> ID pro kategorii</li>
+                <li><b>scope/id:</b> ID pro rozsah</li>
+                <li><b>parent/id:</b> ID rodi�ů (pro související výsledky). Volitelné</li>
+                <li><b>title/en:</b> Název v angli�tině. To bude záviset na konfiguraci jazyka vaší platformy.</li>
+                <li><b>description/en:</b> Popis anglického jazyka. To bude záviset na konfiguraci jazyka vaší platformy.</li>
+                <li><b>start_date:</b> datum zahájení provádění výsledků (formát YYYY-MM-DD)</li>
+                <li><b>end_date:</b> datum ukon�ení provedení výsledků (formát YYYY-MM-DD)</li>
+                <li><b>status/id:</b> ID statusu pro tento výsledek</li>
+                <li><b>progress:</b> procento (od 0 do 100) provedení</li>
+                <li><b>proposals_ids:</b> interní ID souvisejících návrhů (oddělené �árkou). Automaticky se převede na <span class='attribute-name'>proposal_url</span></li>
+                </ul>
+              </li>
+              </ol>
             title: Importovat výsledky z CSV
         imports:
           create:
@@ -122,6 +145,14 @@ cs:
           create: "%{user_name} vytvořen výsledek %{resource_name} v %{space_name}"
           delete: "%{user_name} odstranil %{resource_name} výsledek v %{space_name}"
           update: "%{user_name} aktualizovaný výsledek %{resource_name} v %{space_name}"
+        status:
+          create: "%{user_name} vytvořil/a stav %{resource_name}"
+          delete: "%{user_name} odstranil stav %{resource_name}"
+          update: "%{user_name} aktualizoval stav %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} vytvořil záznam %{resource_name} �asové osy"
+          delete: "%{user_name} odstranil záznam %{resource_name} �asové osy"
+          update: "%{user_name} aktualizoval záznam %{resource_name} �asové osy"
         value_types:
           parent_presenter:
             not_found: 'Nadřazený nebyl nalezen v databázi (ID: %{id})'
@@ -159,8 +190,8 @@ cs:
             progress: Průběh
         timeline_entry:
           fields:
-            description: Popis
             entry_date: Datum
+            title: Název
       result_m:
         executed: Provedeno
         view: Zobrazit
diff --git a/decidim-accountability/config/locales/da.yml b/decidim-accountability/config/locales/da.yml
index 245d5875cca62..2799c6e1ac06d 100644
--- a/decidim-accountability/config/locales/da.yml
+++ b/decidim-accountability/config/locales/da.yml
@@ -1,3 +1,4 @@
+---
 da:
   activemodel:
     attributes:
@@ -144,7 +145,6 @@ da:
             progress: Fremskridt
         timeline_entry:
           fields:
-            description: Beskrivelse
             entry_date: Dato
       results:
         count:
diff --git a/decidim-accountability/config/locales/de.yml b/decidim-accountability/config/locales/de.yml
index 9e008a3b7f868..df5b33301a9b8 100644
--- a/decidim-accountability/config/locales/de.yml
+++ b/decidim-accountability/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ de:
       timeline_entry:
         description: Beschreibung
         entry_date: Datum
+        title: Titel
     models:
       decidim/accountability/proposal_linked_event: Vorschlag in einem Ergebnis enthalten
       decidim/accountability/result_progress_updated_event: Ergebnisfortschritt aktualisiert
@@ -48,6 +50,7 @@ de:
           results: Ergebnisse
         import_results:
           new:
+            download_export: Export im CSV-Format herunterladen
             import: Importieren
             title: Ergebnisse von CSV importieren
         imports:
@@ -119,6 +122,14 @@ de:
           create: "%{user_name} hat das Ergebnis %{resource_name} in %{space_name} erstellt"
           delete: "%{user_name} hat das Ergebnis %{resource_name} in %{space_name} gelöscht"
           update: "%{user_name} hat das Ergebnis %{resource_name} in %{space_name} aktualisiert"
+        status:
+          create: "%{user_name} hat den Status %{resource_name} erstellt"
+          delete: "%{user_name} hat den Status %{resource_name} gelöscht"
+          update: "%{user_name} hat den Status %{resource_name} aktualisiert"
+        timeline_entry:
+          create: "%{user_name} hat den Zeiteintrag %{resource_name} erstellt"
+          delete: "%{user_name} hat den Zeiteintrag %{resource_name} gelöscht"
+          update: "%{user_name} hat den Zeiteintrag %{resource_name} aktualisiert"
         value_types:
           parent_presenter:
             not_found: 'Das übergeordnete Objekt wurde nicht in der Datenbank gefunden (ID: %{id})'
@@ -156,8 +167,8 @@ de:
             progress: Fortschritt
         timeline_entry:
           fields:
-            description: Beschreibung
             entry_date: Datum
+            title: Titel
       result_m:
         executed: Ausgeführt
         view: Ansicht
diff --git a/decidim-accountability/config/locales/el.yml b/decidim-accountability/config/locales/el.yml
index c669b1e6f88f3..efbfc97e5e0ed 100644
--- a/decidim-accountability/config/locales/el.yml
+++ b/decidim-accountability/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ el:
             progress: Π�όοδος
         timeline_entry:
           fields:
-            description: Πε�ιγ�αφή
             entry_date: Ημε�ομηνία
       result_m:
         executed: Εκτελέσθηκε
diff --git a/decidim-accountability/config/locales/en.yml b/decidim-accountability/config/locales/en.yml
index 9b2c53d84e715..8543ea685bbbe 100644
--- a/decidim-accountability/config/locales/en.yml
+++ b/decidim-accountability/config/locales/en.yml
@@ -143,6 +143,14 @@ en:
           create: "%{user_name} created result %{resource_name} in %{space_name}"
           delete: "%{user_name} deleted the %{resource_name} result in %{space_name}"
           update: "%{user_name} updated result %{resource_name} in %{space_name}"
+        status:
+          create: "%{user_name} created the %{resource_name} status"
+          delete: "%{user_name} deleted the %{resource_name} status"
+          update: "%{user_name} updated the %{resource_name} status"
+        timeline_entry:
+          create: "%{user_name} created the %{resource_name} timeline entry"
+          delete: "%{user_name} deleted the %{resource_name} timeline entry"
+          update: "%{user_name} updated the %{resource_name} timeline entry"
         value_types:
           parent_presenter:
             not_found: 'The parent was not found on the database (ID: %{id})'
diff --git a/decidim-accountability/config/locales/es-MX.yml b/decidim-accountability/config/locales/es-MX.yml
index 452a98514aab6..b773f774ceeda 100644
--- a/decidim-accountability/config/locales/es-MX.yml
+++ b/decidim-accountability/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ es-MX:
       timeline_entry:
         description: Descripción
         entry_date: Fecha
+        title: Título
     models:
       decidim/accountability/proposal_linked_event: Propuesta incluida en un resultado
       decidim/accountability/result_progress_updated_event: Progreso del resultado actualizado
@@ -141,6 +143,14 @@ es-MX:
           create: "%{user_name} creó el resultado %{resource_name} en %{space_name}"
           delete: "%{user_name} borró el resultado %{resource_name} en %{space_name}"
           update: "%{user_name} actualizó el resultado %{resource_name} en %{space_name}"
+        status:
+          create: "%{user_name} ha creado el estado %{resource_name}"
+          delete: "%{user_name} ha eliminado el estado %{resource_name}"
+          update: "%{user_name} ha actualizado el estado %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} ha creado la entrada %{resource_name} en la línea de tiempo"
+          delete: "%{user_name} ha eliminado la entrada %{resource_name} en la línea de tiempo"
+          update: "%{user_name} ha actualizado la entrada %{resource_name} en la línea de tiempo"
         value_types:
           parent_presenter:
             not_found: 'El padre no se encontró en la base de datos (ID: %{id})'
@@ -178,8 +188,8 @@ es-MX:
             progress: Progreso
         timeline_entry:
           fields:
-            description: Descripción
             entry_date: Fecha
+            title: Título
       result_m:
         executed: Ejecutado
         view: Ver
diff --git a/decidim-accountability/config/locales/es-PY.yml b/decidim-accountability/config/locales/es-PY.yml
index ac438bcc13dc0..d02fa47810afd 100644
--- a/decidim-accountability/config/locales/es-PY.yml
+++ b/decidim-accountability/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ es-PY:
       timeline_entry:
         description: Descripción
         entry_date: Fecha
+        title: Título
     models:
       decidim/accountability/proposal_linked_event: Propuesta incluida en un resultado
       decidim/accountability/result_progress_updated_event: Progreso del resultado actualizado
@@ -141,6 +143,14 @@ es-PY:
           create: "%{user_name} creó el resultado %{resource_name} en %{space_name}"
           delete: "%{user_name} borró el resultado %{resource_name} en %{space_name}"
           update: "%{user_name} actualizó el resultado %{resource_name} en %{space_name}"
+        status:
+          create: "%{user_name} ha creado el estado %{resource_name}"
+          delete: "%{user_name} ha eliminado el estado %{resource_name}"
+          update: "%{user_name} ha actualizado el estado %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} ha creado la entrada %{resource_name} en la línea de tiempo"
+          delete: "%{user_name} ha eliminado la entrada %{resource_name} en la línea de tiempo"
+          update: "%{user_name} ha actualizado la entrada %{resource_name} en la línea de tiempo"
         value_types:
           parent_presenter:
             not_found: 'El padre no se encontró en la base de datos (ID: %{id})'
@@ -178,8 +188,8 @@ es-PY:
             progress: Progreso
         timeline_entry:
           fields:
-            description: Descripción
             entry_date: Fecha
+            title: Título
       result_m:
         executed: Ejecutado
         view: Ver
diff --git a/decidim-accountability/config/locales/es.yml b/decidim-accountability/config/locales/es.yml
index 5810f782d2f89..b074263ca8a57 100644
--- a/decidim-accountability/config/locales/es.yml
+++ b/decidim-accountability/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ es:
       timeline_entry:
         description: Descripción
         entry_date: Fecha
+        title: Título
     models:
       decidim/accountability/proposal_linked_event: Propuesta incluida en un resultado
       decidim/accountability/result_progress_updated_event: Progreso del resultado actualizado
@@ -141,6 +143,14 @@ es:
           create: "%{user_name} creó el resultado %{resource_name} en %{space_name}"
           delete: "%{user_name} borró el resultado %{resource_name} en %{space_name}"
           update: "%{user_name} actualizó el resultado %{resource_name} en %{space_name}"
+        status:
+          create: "%{user_name} ha creado el estado %{resource_name}"
+          delete: "%{user_name} ha eliminado el estado %{resource_name}"
+          update: "%{user_name} ha actualizado el estado %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} ha creado la entrada %{resource_name} en la línea de tiempo"
+          delete: "%{user_name} ha eliminado la entrada %{resource_name} en la línea de tiempo"
+          update: "%{user_name} ha actualizado la entrada %{resource_name} en la línea de tiempo"
         value_types:
           parent_presenter:
             not_found: 'El padre no se encontró en la base de datos (ID: %{id})'
@@ -178,8 +188,8 @@ es:
             progress: Progreso
         timeline_entry:
           fields:
-            description: Descripción
             entry_date: Fecha
+            title: Título
       result_m:
         executed: Ejecutado
         view: Ver
diff --git a/decidim-accountability/config/locales/eu.yml b/decidim-accountability/config/locales/eu.yml
index 3046863e1050a..2715b032e71fd 100644
--- a/decidim-accountability/config/locales/eu.yml
+++ b/decidim-accountability/config/locales/eu.yml
@@ -1,15 +1,16 @@
+---
 eu:
   activemodel:
     attributes:
       result:
         decidim_accountability_status_id: Egoera
         decidim_category_id: Kategoria
-        decidim_scope_id: Esparrua
+        decidim_scope_id: Eremua
         description: Deskribapena
         end_date: Bukaera-data
         progress: Aurrerapena
-        project_ids: Proiektu barne
-        proposals: Proposamen sortak
+        project_ids: Barne dauden proiektuak
+        proposals: Barne dauden proposamenak
         start_date: Hasiera-data
         title: Izenburua
         updated_at: Noiz eguneratua
@@ -19,8 +20,9 @@ eu:
         name: Izena
         progress: Aurrerapena
       timeline_entry:
-        description: Descripción
+        description: Deskribapena
         entry_date: Data
+        title: Izena
     models:
       decidim/accountability/proposal_linked_event: Emaitza batean sartutako proposamena
       decidim/accountability/result_progress_updated_event: Emaitzen aurrerapena eguneratu da
@@ -37,7 +39,7 @@ eu:
         confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
-        import_csv: Inportatu CSV
+        import_csv: Inportatu CSV fichategia
         new: '%{name} berria'
         preview: Aurreikusi
         timeline_entries: Proiektuen bilakaera
@@ -48,7 +50,29 @@ eu:
           results: Emaitzak
         import_results:
           new:
+            download_export: Deskargatu esportatutakoa CSV formatuan
             import: Inportatu
+            info: |
+              <p>Ondoko urrats hauek ematea gomendatzen dizugu:</p>
+              <ol>
+              <li>Sortu egoerak erantsi nahi dituzun emaitzetarako (<a href='%{link_new_status}' target='_blank'> link </a>)</li>
+              <li>Sortu emaitza bat gutxienez eskuz administrazioaren panelaren bidez (<a href='%{link_new_result}' target='_blank'>link</a>) inportatu baino lehen, hobeto ulertzeko formatua eta nola bete.</li>
+              <li>Deskargatu CSV formatuko artxiboa (%{link_export_csv})</li>
+              <li>Egin aldaketak lokalean. CSVren ondoko zutabeak baino ezin dituzu aldatu:
+                <ul>
+                <li><b> id category/id:</b> ID kategoriarako </li>
+                <li><b>scope /id:</b> ID eremurako </li>
+                <li><b>parent /id:</b> ID aitarentzat (erlazionatutako emaitzetarako). Aukerakoa </li>
+                <li><b>title /I18N:</b> Izenburua hizkuntzan X</li>
+                <li><b> deskribapena /I18N:</b> deskribapena hizkuntzan X</li>
+                <li><b>start_date:</b> emaitza gauzatzen den hasiera-data (AAAA-MM-DD formatua)</li>
+                <li><b>end emaitza gauzatzen den amaiera-data (AAAA-MM-DD formatua) </li>
+                <li><b> status /id:</b> egoeraren ID emaitza honetarako </li>
+                <li><b>progress:</b> gauzatzearen ehunekoa (0tik 100era) </li>
+                <li><b>proposals_ids:</b>erlazionatutako proposamenen barneko ID (komez bidez bereizita). Automatikoki bihurtuko da:<span class = 'attribute-name'>proposal_url</span></li>
+                </ul>
+              </li>
+              </ol>
             title: Inportatu emaitzak CSVtik
         imports:
           create:
@@ -119,6 +143,10 @@ eu:
           create: "%{user_name} emaitza sortu da %{resource_name} en %{space_name}"
           delete: "%{user_name} %{resource_name} %{space_name} emaitza ezabatu da"
           update: "%{user_name} emaitza eguneratu %{resource_name} en %{space_name}"
+        status:
+          create: "%{user_name} k %{resource_name} egoera sortu du"
+          delete: "%{user_name} k %{resource_name} egoera ezabatu du"
+          update: "%{user_name} k %{resource_name} egoera eguneratu du"
         value_types:
           parent_presenter:
             not_found: 'Gurasoa ez zen datu-basean aurkitu (ID: %{id})'
@@ -135,7 +163,7 @@ eu:
           subject: Emaitzak zuzen inportatu dira
           success: Emaitzak zuzen inportatu dira. Emaitzak administrazioaren panelaren bidez berrikusi ahal dituzu.
       last_activity:
-        new_result_at_html: "<span> %{link}</span>emaitza berrian"
+        new_result_at_html: "<span> %{link}</span>-ean emaitza berria"
       models:
         result:
           fields:
@@ -156,8 +184,8 @@ eu:
             progress: Aurrerapena
         timeline_entry:
           fields:
-            description: Deskribapena
             entry_date: Data
+            title: Izenburua
       result_m:
         executed: Burutua
         view: Ikusi
diff --git a/decidim-accountability/config/locales/fi-plain.yml b/decidim-accountability/config/locales/fi-plain.yml
index 318a68b9c5c94..ac3e14fe84e41 100644
--- a/decidim-accountability/config/locales/fi-plain.yml
+++ b/decidim-accountability/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ fi-pl:
       timeline_entry:
         description: Kuvaus
         entry_date: Päivämäärä
+        title: Otsikko
     models:
       decidim/accountability/proposal_linked_event: Ehdotus sisältyy tulokseen
       decidim/accountability/result_progress_updated_event: Tuloksen edistyminen päivitetty
@@ -141,6 +143,14 @@ fi-pl:
           create: "%{user_name} loi tuloksen %{resource_name} tilassa %{space_name}"
           delete: "%{user_name} poisti tuloksen %{resource_name} tilassa %{space_name}"
           update: "%{user_name} päivitti tuloksen %{resource_name} tilassa %{space_name}"
+        status:
+          create: "%{user_name} loi tilan %{resource_name}"
+          delete: "%{user_name} poisti tilan %{resource_name}"
+          update: "%{user_name} päivitti tilaa %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} loi aikajanan merkinnän %{resource_name}"
+          delete: "%{user_name} poisti aikajanan merkinnän %{resource_name}"
+          update: "%{user_name} päivitti aikajanan merkintää %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Pääelementtiä ei löytynyt tietokannasta (ID: %{id})'
@@ -178,8 +188,8 @@ fi-pl:
             progress: Edistyminen
         timeline_entry:
           fields:
-            description: Kuvaus
             entry_date: Päivämäärä
+            title: Otsikko
       result_m:
         executed: Valmistunut
         view: Näytä
diff --git a/decidim-accountability/config/locales/fi.yml b/decidim-accountability/config/locales/fi.yml
index 38f41ae6adbdc..3dd95b1679ac1 100644
--- a/decidim-accountability/config/locales/fi.yml
+++ b/decidim-accountability/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ fi:
       timeline_entry:
         description: Kuvaus
         entry_date: Päivämäärä
+        title: Otsikko
     models:
       decidim/accountability/proposal_linked_event: Ehdotus sisältyy tulokseen
       decidim/accountability/result_progress_updated_event: Tuloksen edistyminen päivitetty
@@ -141,6 +143,14 @@ fi:
           create: "%{user_name} loi tuloksen %{resource_name} osallistumistilassa %{space_name}"
           delete: "%{user_name} poisti tuloksen %{resource_name} osallistumistilassa %{space_name}"
           update: "%{user_name} päivitti tuloksen %{resource_name} osallistumistilassa %{space_name}"
+        status:
+          create: "%{user_name} loi tilan %{resource_name}"
+          delete: "%{user_name} poisti tilan %{resource_name}"
+          update: "%{user_name} päivitti tilaa %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} loi aikajanan merkinnän %{resource_name}"
+          delete: "%{user_name} poisti aikajanan merkinnän %{resource_name}"
+          update: "%{user_name} päivitti aikajanan merkintää %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Pääelementtiä ei löytynyt tietokannasta (ID: %{id})'
@@ -178,8 +188,8 @@ fi:
             progress: Edistyminen
         timeline_entry:
           fields:
-            description: Kuvaus
             entry_date: Päivämäärä
+            title: Otsikko
       result_m:
         executed: Valmistunut
         view: Näytä
diff --git a/decidim-accountability/config/locales/fr-CA.yml b/decidim-accountability/config/locales/fr-CA.yml
index 2f073a03e55e7..8d0b4d077e8a7 100644
--- a/decidim-accountability/config/locales/fr-CA.yml
+++ b/decidim-accountability/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ fr-CA:
       timeline_entry:
         description: Description
         entry_date: Date
+        title: Titre
     models:
       decidim/accountability/proposal_linked_event: Proposition incluse dans une réalisation
       decidim/accountability/result_progress_updated_event: Résultat du progrès mis à jour
@@ -56,18 +58,18 @@ fr-CA:
               <li><a href='%{link_new_status}' target='_blank'>Créer les Status pour les résultats</a> que vous voulez ajouter</li>
               <li><a href='%{link_new_result}' target='_blank'>Créer au moins un résultat manuellement</a> via ce panneau admin avant d'utiliser l'import, pour mieux comprendre le format et ce que vous devrez compléter.</li>
               <li>%{link_export_csv}</li>
-              <li>Appliquer les changement localement. Vous ne pouvez changer que les colonnes suivantes du CSV:
+              <li>Faites les changements directement sur le fichier. Vous ne pouvez changer que les colonnes suivantes du CSV:
                 <ul>
                 <li><b>category/id:</b> ID de la catégorie</li>
-                <li><b>scope/id:</b> ID du périmètre d'application</li>
-                <li><b>parent/id:</b> ID du parent (pour résultat liés). Optionel</li>
+                <li><b>scope/id:</b> ID du secteur</li>
+                <li><b>parent/id:</b> ID du résultat parent (résultat liés). Facultatif</li>
                 <li><b>title/en:</b> Titre en anglais. Cela dépend de la configuration des langues sur votre plateforme.</li>
                 <li><b>description/en:</b> Description en anglais. Cela dépend de la configuration des langues sur votre plateforme.</li>
                 <li><b>start_date:</b> date à partir de laquelle le résultat est mis en œuvre (format AAAA-MM-JJ)</li>
                 <li><b>end_date:</b> date à laquelle se termine la mise en œuvre du résultat (format AAAA-MM-JJ)</li>
-                <li><b>status/id:</b> ID du status de ce résultat</li>
-                <li><b>progress:</b> Pourcentage (de 0 à 100) de l'exécution</li>
-                <li><b>proposals_ids:</b> IDs des propositions liées (séparés par une virgule). C'est automatiquement converti en  <span class='attribute-name'>proposal_url</span></li>
+                <li><b>status/id:</b> ID du statut de ce résultat</li>
+                <li><b>progress:</b> Pourcentage d'exécution (de 0 à 100)</li>
+                <li><b>proposals_ids:</b> IDs des propositions liées (séparés par une virgule). Ces ID seront automatiquement converti en <span class='attribute-name'>proposal_url</span></li>
                 </ul>
               </li>
               </ol>
@@ -141,6 +143,14 @@ fr-CA:
           create: "%{user_name} a créé la réalisation %{resource_name} dans %{space_name}"
           delete: "%{user_name} a supprimé la réalisation %{resource_name} dans %{space_name}"
           update: "%{user_name} a mis à jour la réalisation %{resource_name} dans %{space_name}"
+        status:
+          create: "%{user_name} a créé le statut %{resource_name}"
+          delete: "%{user_name} a supprimé le statut %{resource_name}"
+          update: "%{user_name} a mis à jour le statut %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} a créé l'étape d'évolution de la réalisation %{resource_name}"
+          delete: "%{user_name} a supprimé l'étape d'évolution de la réalisation %{resource_name}"
+          update: "%{user_name} a mis à jour l'étape d'évolution de la réalisation %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Le parent n''a pas été trouvé dans la base de données (ID: %{id})'
@@ -178,8 +188,8 @@ fr-CA:
             progress: Avancement
         timeline_entry:
           fields:
-            description: Description
             entry_date: Date
+            title: Titre
       result_m:
         executed: Exécuté
         view: Voir
diff --git a/decidim-accountability/config/locales/fr.yml b/decidim-accountability/config/locales/fr.yml
index 338b7546cd957..905894b977252 100644
--- a/decidim-accountability/config/locales/fr.yml
+++ b/decidim-accountability/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ fr:
       timeline_entry:
         description: Description
         entry_date: Date
+        title: Titre
     models:
       decidim/accountability/proposal_linked_event: Proposition incluse dans une réalisation
       decidim/accountability/result_progress_updated_event: Résultat du progrès mis à jour
@@ -56,18 +58,18 @@ fr:
               <li><a href='%{link_new_status}' target='_blank'>Créer les Status pour les résultats</a> que vous voulez ajouter</li>
               <li><a href='%{link_new_result}' target='_blank'>Créer au moins un résultat manuellement</a> via ce panneau admin avant d'utiliser l'import, pour mieux comprendre le format et ce que vous devrez compléter.</li>
               <li>%{link_export_csv}</li>
-              <li>Appliquer les changement localement. Vous ne pouvez changer que les colonnes suivantes du CSV:
+              <li>Faites les changements directement sur le fichier. Vous ne pouvez changer que les colonnes suivantes du CSV:
                 <ul>
                 <li><b>category/id:</b> ID de la catégorie</li>
-                <li><b>scope/id:</b> ID du périmètre d'application</li>
-                <li><b>parent/id:</b> ID du parent (pour résultat liés). Optionel</li>
+                <li><b>scope/id:</b> ID du secteur</li>
+                <li><b>parent/id:</b> ID du résultat parent (résultat liés). Facultatif</li>
                 <li><b>title/en:</b> Titre en anglais. Cela dépend de la configuration des langues sur votre plateforme.</li>
                 <li><b>description/en:</b> Description en anglais. Cela dépend de la configuration des langues sur votre plateforme.</li>
                 <li><b>start_date:</b> date à partir de laquelle le résultat est mis en œuvre (format AAAA-MM-JJ)</li>
                 <li><b>end_date:</b> date à laquelle se termine la mise en œuvre du résultat (format AAAA-MM-JJ)</li>
-                <li><b>status/id:</b> ID du status de ce résultat</li>
-                <li><b>progress:</b> Pourcentage (de 0 à 100) de l'exécution</li>
-                <li><b>proposals_ids:</b> IDs des propositions liées (séparés par une virgule). C'est automatiquement converti en  <span class='attribute-name'>proposal_url</span></li>
+                <li><b>status/id:</b> ID du statut de ce résultat</li>
+                <li><b>progress:</b> Pourcentage d'exécution (de 0 à 100)</li>
+                <li><b>proposals_ids:</b> IDs des propositions liées (séparés par une virgule). Ces ID seront automatiquement converti en <span class='attribute-name'>proposal_url</span></li>
                 </ul>
               </li>
               </ol>
@@ -141,6 +143,14 @@ fr:
           create: "%{user_name} a créé la réalisation %{resource_name} dans %{space_name}"
           delete: "%{user_name} a supprimé la réalisation %{resource_name} dans %{space_name}"
           update: "%{user_name} a mis à jour la réalisation %{resource_name} dans %{space_name}"
+        status:
+          create: "%{user_name} a créé le statut %{resource_name}"
+          delete: "%{user_name} a supprimé le statut %{resource_name}"
+          update: "%{user_name} a mis à jour le statut %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} a créé l'étape d'évolution de la réalisation %{resource_name}"
+          delete: "%{user_name} a supprimé l'étape d'évolution de la réalisation %{resource_name}"
+          update: "%{user_name} a mis à jour l'étape d'évolution de la réalisation %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Le parent n''a pas été trouvé dans la base de données (ID: %{id})'
@@ -178,8 +188,8 @@ fr:
             progress: Avancement
         timeline_entry:
           fields:
-            description: Description
             entry_date: Date
+            title: Titre
       result_m:
         executed: Exécuté
         view: Voir
diff --git a/decidim-accountability/config/locales/ga-IE.yml b/decidim-accountability/config/locales/ga-IE.yml
index e8978232894ee..de2fe52fd551b 100644
--- a/decidim-accountability/config/locales/ga-IE.yml
+++ b/decidim-accountability/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-accountability/config/locales/gl.yml b/decidim-accountability/config/locales/gl.yml
index bc0bbddaeb0b4..11b32d3caecc9 100644
--- a/decidim-accountability/config/locales/gl.yml
+++ b/decidim-accountability/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ gl:
             progress: Progreso
         timeline_entry:
           fields:
-            description: Descrición
             entry_date: Data
       result_m:
         executed: Executado
diff --git a/decidim-accountability/config/locales/hu.yml b/decidim-accountability/config/locales/hu.yml
index a1519c9223b83..bd16ba0c428cf 100644
--- a/decidim-accountability/config/locales/hu.yml
+++ b/decidim-accountability/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ hu:
       timeline_entry:
         description: Leírás
         entry_date: Dátum
+        title: Cím
     models:
       decidim/accountability/proposal_linked_event: Az eredményhez kapcsolódó javaslat
       decidim/accountability/result_progress_updated_event: Az eredmények frissítve
@@ -119,6 +121,14 @@ hu:
           create: "%{user_name} által létrehozott eredmény: %{resource_name} (itt: %{space_name})"
           delete: "%{user_name} törölte a(z) %{resource_name} eredményt innen: %{space_name}"
           update: "%{user_name} frissítette a(z) %{resource_name} eredmény itt: %{space_name}"
+        status:
+          create: "%{user_name} létrehozta a(z) %{resource_name} állapotot"
+          delete: "%{user_name} törölte a(z) %{resource_name} állapotot"
+          update: "%{user_name} frissítette a(z) %{resource_name} állapotot"
+        timeline_entry:
+          create: "%{user_name} létrehozta az %{resource_name} idővonal bejegyzést"
+          delete: "%{user_name} törölte a(z) %{resource_name} idővonal bejegyzést"
+          update: "%{user_name} frissítette a %{resource_name} idővonal bejegyzést"
         value_types:
           parent_presenter:
             not_found: 'Nem található az adatbázisban (ID: %{id})'
@@ -156,8 +166,8 @@ hu:
             progress: Folyamat
         timeline_entry:
           fields:
-            description: Leírás
             entry_date: Dátum
+            title: Cím
       result_m:
         executed: Végrehajtva
         view: Nézet
diff --git a/decidim-accountability/config/locales/id-ID.yml b/decidim-accountability/config/locales/id-ID.yml
index 6003c48adb398..aa6f0bbb71917 100644
--- a/decidim-accountability/config/locales/id-ID.yml
+++ b/decidim-accountability/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -128,7 +129,6 @@ id:
             progress: Kemajuan
         timeline_entry:
           fields:
-            description: Deskripsi
             entry_date: Tanggal
       results:
         count:
diff --git a/decidim-accountability/config/locales/is-IS.yml b/decidim-accountability/config/locales/is-IS.yml
index 7d9e5c9c40560..41048dd15656d 100644
--- a/decidim-accountability/config/locales/is-IS.yml
+++ b/decidim-accountability/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       result:
@@ -144,7 +145,6 @@ is-IS:
             progress: Framfarir
         timeline_entry:
           fields:
-            description: Lýsing
             entry_date: Dagsetning
       result_m:
         executed: Framkvæmt
diff --git a/decidim-accountability/config/locales/it.yml b/decidim-accountability/config/locales/it.yml
index ff6a5b520b19d..496f459249198 100644
--- a/decidim-accountability/config/locales/it.yml
+++ b/decidim-accountability/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ it:
             progress: Avanzamento
         timeline_entry:
           fields:
-            description: Descrizione
             entry_date: Data
       result_m:
         executed: Eseguito
diff --git a/decidim-accountability/config/locales/ja.yml b/decidim-accountability/config/locales/ja.yml
index 8de5ddeca41e0..d305f5a59e5de 100644
--- a/decidim-accountability/config/locales/ja.yml
+++ b/decidim-accountability/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ ja:
       timeline_entry:
         description: 説明
         entry_date: 日付
+        title: タイトル
     models:
       decidim/accountability/proposal_linked_event: �果��案を����
       decidim/accountability/result_progress_updated_event: �果�進�状��更新�れ���
@@ -47,7 +49,29 @@ ja:
           results: �果
         import_results:
           new:
+            download_export: CSV形��エクス�ートをダウンロード
             import: イン�ート
+            info: |
+              <p>以下�手順を�勧����:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>追加����果�ステータスを作��る</a></li>
+              <li><a href='%{link_new_result}' target='_blank'>イン�ートを使用�る�����管�パ�ル�ら少���も1���果を手動�作���フォーマット�必�事項をよりよ��解��るよ��������。</a></li>
+              <li>%{link_export_csv}</li>
+              <li>ローカル�変更���。変更��る���CSV�以下�列����:
+                <ul>
+                <li><b>category/id:</b> カテゴリ�ID</li>
+                <li><b>scope/id:</b> スコープ�ID</li>
+                <li><b>parent/id:</b> 関連�る�果�親ID. (オプション)</li>
+                <li><b>title/en:</b> 英語�タイトル �れ�プラットフォーム�言語設定��存���.</li>
+                <li><b>description/en:</b> 英語�説明. �れ�プラットフォーム�言語設定��存���.</li>
+                <li><b>start_date:</b> �果�実行開始日 (YYYY-MM-DD形�)</li>
+                <li><b>end_date:</b> �果�実行終了日 (YYYY-MM-DD形�)</li>
+                <li><b>status/id:</b> �果�ステータスID</li>
+                <li><b>progress:</b> 進行�パーセンテージ(0 〜 100)</li>
+                <li><b>proposals_ids:</b> 関連�る�案�内部ID（カンマ区切り）. 自動的�<span class='attribute-name'>proposal_url</span>�変��れ��</li>
+                </ul>
+              </li>
+              </ol>
             title: CSV�ら�果をイン�ート
         imports:
           create:
@@ -118,6 +142,14 @@ ja:
           create: "%{user_name} ��果 %{resource_name} を %{space_name} �作�����"
           delete: "%{user_name} � %{resource_name} ��果 %{space_name} を削除����"
           update: "%{user_name} ��果 %{resource_name} を %{space_name} �更新����"
+        status:
+          create: "%{user_name} � %{resource_name} ステータスを作�����"
+          delete: "%{user_name} � %{resource_name} ステータスを削除����"
+          update: "%{user_name} � %{resource_name} ステータスを更新����"
+        timeline_entry:
+          create: "%{user_name} � %{resource_name} タイムラインエントリを作�����"
+          delete: "%{user_name} � %{resource_name} タイムラインエントリを削除����"
+          update: "%{user_name} � %{resource_name} タイムラインエントリを更新����"
         value_types:
           parent_presenter:
             not_found: '親�データベース上�見��り��ん��� (ID: %{id})'
@@ -155,8 +187,8 @@ ja:
             progress: 進�状�
         timeline_entry:
           fields:
-            description: 説明
             entry_date: 日付
+            title: タイトル
       result_m:
         executed: 実行日時
         view: 表示
diff --git a/decidim-accountability/config/locales/ka-GE.yml b/decidim-accountability/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-accountability/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-accountability/config/locales/lb.yml b/decidim-accountability/config/locales/lb.yml
index 37a2d7b06c705..37bddea6bf7c8 100644
--- a/decidim-accountability/config/locales/lb.yml
+++ b/decidim-accountability/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ lb:
             progress: Fortschritt
         timeline_entry:
           fields:
-            description: Beschreiwung
             entry_date: Datum
       result_m:
         executed: Ausgeführt
diff --git a/decidim-accountability/config/locales/lt.yml b/decidim-accountability/config/locales/lt.yml
index 9ef24d7061a69..8b1f0dece2f9a 100644
--- a/decidim-accountability/config/locales/lt.yml
+++ b/decidim-accountability/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ lt:
       timeline_entry:
         description: Aprašymas
         entry_date: Data
+        title: Pavadinimas
     models:
       decidim/accountability/proposal_linked_event: Pasiūlymas įtrauktas į rezultatą
       decidim/accountability/result_progress_updated_event: Rezultato progresas atnaujintas
@@ -121,6 +123,14 @@ lt:
           create: "%{user_name} sukūrė rezultatą %{resource_name} erdvėje %{space_name}"
           delete: "%{user_name} pašalino %{resource_name} rezultatą erdvėje %{space_name}"
           update: "%{user_name} atnaujino rezultatÄ… %{resource_name} erdvÄ—je %{space_name}"
+        status:
+          create: "%{user_name} sukūrė %{resource_name} būseną"
+          delete: "%{user_name} pašalino %{resource_name} būseną"
+          update: "%{user_name} atnaujino %{resource_name} būseną"
+        timeline_entry:
+          create: "%{user_name} sukūrė %{resource_name} laiko juostos įrašą"
+          delete: "%{user_name} pašalino %{resource_name} laiko juostos įrašą"
+          update: "%{user_name} atnaujino %{resource_name} laiko juostos įrašą"
         value_types:
           parent_presenter:
             not_found: 'Motininis elementas duomenų bazėje nerastas (ID: %{id})'
@@ -158,8 +168,8 @@ lt:
             progress: Progresas
         timeline_entry:
           fields:
-            description: Aprašymas
             entry_date: Data
+            title: Pavadinimas
       result_m:
         executed: Įvykdyta
         view: Rodymas
diff --git a/decidim-accountability/config/locales/lv.yml b/decidim-accountability/config/locales/lv.yml
index aac3223a752d1..cf45ffb071b4f 100644
--- a/decidim-accountability/config/locales/lv.yml
+++ b/decidim-accountability/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -141,7 +142,6 @@ lv:
             name: Nosaukums
         timeline_entry:
           fields:
-            description: Apraksts
             entry_date: Datums
       results:
         count:
diff --git a/decidim-accountability/config/locales/nl.yml b/decidim-accountability/config/locales/nl.yml
index 322f457b33179..91f0ebdf8062f 100644
--- a/decidim-accountability/config/locales/nl.yml
+++ b/decidim-accountability/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ nl:
       timeline_entry:
         description: Beschrijving
         entry_date: Datum
+        title: Titel
     models:
       decidim/accountability/proposal_linked_event: Voorstel opgenomen in een resultaat
       decidim/accountability/result_progress_updated_event: Resultaat voortgang bijgewerkt
@@ -119,6 +121,14 @@ nl:
           create: "%{user_name} heeft het resultaat %{resource_name} gemaakt in %{space_name}"
           delete: "%{user_name} verwijderde het resultaat %{resource_name} in %{space_name}"
           update: "%{user_name} bijgewerkt resultaat %{resource_name} in %{space_name}"
+        status:
+          create: "%{user_name} heeft %{resource_name} status aangemaakt"
+          delete: "%{user_name} heeft %{resource_name} status verwijderd"
+          update: "%{user_name} heeft %{resource_name} status bijgewerkt"
+        timeline_entry:
+          create: "%{user_name} heeft timeline entry %{resource_name} aangemaakt"
+          delete: "%{user_name} heeft timeline entry %{resource_name} verwijderd"
+          update: "%{user_name} heeft timeline entry %{resource_name} bijgewerkt"
         value_types:
           parent_presenter:
             not_found: 'Het bovenliggende element is niet gevonden in de database (ID: %{id})'
@@ -156,8 +166,8 @@ nl:
             progress: Vooruitgang
         timeline_entry:
           fields:
-            description: Beschrijving
             entry_date: Datum
+            title: Titel
       result_m:
         executed: Uitgevoerd
         view: Bekijk
diff --git a/decidim-accountability/config/locales/no.yml b/decidim-accountability/config/locales/no.yml
index b187deceecde9..4aa6979e8a271 100644
--- a/decidim-accountability/config/locales/no.yml
+++ b/decidim-accountability/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -21,6 +22,7 @@
       timeline_entry:
         description: Beskrivelse
         entry_date: Dato
+        title: Tittel
     models:
       decidim/accountability/proposal_linked_event: Forslag inkludert i et resultat
       decidim/accountability/result_progress_updated_event: Resultat fremgang oppdatert
@@ -119,6 +121,14 @@
           create: "%{user_name} opprettet resultat %{resource_name} i %{space_name}"
           delete: "%{user_name} slettet %{resource_name} resultatet i %{space_name}"
           update: "%{user_name} oppdaterte rusultat%{resource_name} i %{space_name}"
+        status:
+          create: "%{user_name} har opprettet statusen %{resource_name}"
+          delete: "%{user_name} slettet statusen %{resource_name}"
+          update: "%{user_name} oppdaterte statusen %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} opprettet %{resource_name} i tidslinjen"
+          delete: "%{user_name} slettet %{resource_name} i tidslinjen"
+          update: "%{user_name} oppdaterte %{resource_name} i tidslinjen"
         value_types:
           parent_presenter:
             not_found: 'Overordnede ble ikke funnet i databasen (ID: %{id})'
@@ -156,8 +166,8 @@
             progress: Framgang
         timeline_entry:
           fields:
-            description: Beskrivelse
             entry_date: Dato
+            title: Tittel
       result_m:
         executed: Utført
         view: Vis
diff --git a/decidim-accountability/config/locales/pl.yml b/decidim-accountability/config/locales/pl.yml
index 4428cafb69fb9..8fb48080c12cf 100644
--- a/decidim-accountability/config/locales/pl.yml
+++ b/decidim-accountability/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ pl:
       timeline_entry:
         description: Opis
         entry_date: Data
+        title: Tytuł
     models:
       decidim/accountability/proposal_linked_event: Propozycja zawarta w wyniku
       decidim/accountability/result_progress_updated_event: Aktualizacja postępu wyników
@@ -122,6 +124,14 @@ pl:
           create: "%{user_name} utworzył(a) wynik %{resource_name} w %{space_name}"
           delete: "%{user_name} usunął/usunęła wynik %{resource_name} z %{space_name}"
           update: "%{user_name} zaktualizował(a) wynik %{resource_name} w %{space_name}"
+        status:
+          create: "%{user_name} utworzył status %{resource_name}"
+          delete: "%{user_name} usunÄ…Å‚ %{resource_name} status"
+          update: "%{user_name} zaktualizował %{resource_name} status"
+        timeline_entry:
+          create: "%{user_name} utworzył wpis linii czasu %{resource_name}"
+          delete: "%{user_name} usunÄ…Å‚ wpis linii czasu %{resource_name}"
+          update: "%{user_name} zaktualizował wpis linii czasu %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Nie znaleziono elementu nadrzędnego w bazie danych (ID: %{id})'
@@ -159,8 +169,8 @@ pl:
             progress: Postęp
         timeline_entry:
           fields:
-            description: Opis
             entry_date: Data
+            title: Tytuł
       result_m:
         executed: Wykonane
         view: Zobacz
diff --git a/decidim-accountability/config/locales/pt-BR.yml b/decidim-accountability/config/locales/pt-BR.yml
index 8dbbad22378ba..4d3d283a7e404 100644
--- a/decidim-accountability/config/locales/pt-BR.yml
+++ b/decidim-accountability/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ pt-BR:
       timeline_entry:
         description: Descrição
         entry_date: Encontro
+        title: Título
     models:
       decidim/accountability/proposal_linked_event: Proposta incluída em um resultado
       decidim/accountability/result_progress_updated_event: Progresso do resultado atualizado
@@ -157,8 +159,8 @@ pt-BR:
             progress: Progresso
         timeline_entry:
           fields:
-            description: Descrição
             entry_date: Data
+            title: Título
       result_m:
         executed: Executado
         view: Visualizar
diff --git a/decidim-accountability/config/locales/pt.yml b/decidim-accountability/config/locales/pt.yml
index de881e94778ea..4b8e0c1571eaa 100644
--- a/decidim-accountability/config/locales/pt.yml
+++ b/decidim-accountability/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ pt:
             progress: Progresso
         timeline_entry:
           fields:
-            description: Descrição
             entry_date: Data
       result_m:
         executed: Executado
diff --git a/decidim-accountability/config/locales/ro-RO.yml b/decidim-accountability/config/locales/ro-RO.yml
index 9c354f76552c6..feae0ce67ccb9 100644
--- a/decidim-accountability/config/locales/ro-RO.yml
+++ b/decidim-accountability/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -12,7 +13,7 @@ ro:
         proposals: Propuneri incluse
         start_date: Data de început
         title: Titlu
-        updated_at: Actualizat la
+        updated_at: Ultima actualizare
       status:
         description: Descriere
         key: Cheie
@@ -21,6 +22,7 @@ ro:
       timeline_entry:
         description: Descriere
         entry_date: Data
+        title: Titlu
     models:
       decidim/accountability/proposal_linked_event: Propunere inclusă în rezultat
       decidim/accountability/result_progress_updated_event: Progresul rezultatului actualizat
@@ -35,7 +37,7 @@ ro:
       actions:
         attachment_collections: Dosare
         attachments: Atașamente
-        confirm_destroy: Sigur dorești să ștergi acest %{name}?
+        confirm_destroy: Sunteți sigur că doriți să ștergeți %{name}?
         destroy: Ștergere
         edit: Editare
         import_csv: Importă CSV
@@ -49,11 +51,12 @@ ro:
           results: Rezultate
         import_results:
           new:
+            download_export: Descarcați Export cu format CSV
             import: Importă
             title: Importați rezultate de la CSV
         imports:
           create:
-            success: Fişierul a început importul. Veţi primi un e-mail în următoarele câteva minute cu rezultatul importului
+            success: Fișierul a început importul. Veți primi un e-mail în următoarele câteva minute cu rezultatul importului
         models:
           result:
             name: Rezultat
@@ -120,6 +123,12 @@ ro:
           create: "%{user_name} a creat %{resource_name} în %{space_name}"
           delete: "%{user_name} a șters %{resource_name} în %{space_name}"
           update: "%{user_name} a actualizat %{resource_name} în %{space_name}"
+        status:
+          update: "%{user_name} a actualizat starea %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} a creat intrarea de cronologie pentru %{resource_name}"
+          delete: "%{user_name} a șters intrarea de cronologie pentru %{resource_name}"
+          update: "%{user_name} a actualizat intrarea de cronologie pentru %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Elementul-părinte nu a fost găsit în baza de date (ID: %{id})'
@@ -157,8 +166,8 @@ ro:
             progress: Progres
         timeline_entry:
           fields:
-            description: Descriere
             entry_date: Dată
+            title: Titlu
       result_m:
         executed: Executat
         view: Vizualizare
@@ -224,12 +233,12 @@ ro:
     events:
       accountability:
         proposal_linked:
-          email_intro: 'Propunerea "%{proposal_title}" a fost inclusă într-un rezultat. O puteţi vedea de pe această pagină:'
+          email_intro: 'Propunerea "%{proposal_title}" a fost inclusă într-un rezultat. O puteți vedea de pe această pagină:'
           email_outro: Ai primit această notificare deoarece urmărești „%{proposal_title}�. Poți anula aceste notificări de la link-ul anterior.
           email_subject: O actualizare la %{proposal_title}
           notification_title: Propunerea <a href="%{proposal_path}">%{proposal_title}</a> a fost inclusă în rezultatul <a href="%{resource_path}">%{resource_title}</a>.
         result_progress_updated:
-          email_intro: 'Rezultatul "%{resource_title}", care include propunerea "%{proposal_title}", este acum %{progress}% complet. Îl puteţi vedea de pe această pagină:'
+          email_intro: 'Rezultatul "%{resource_title}", care include propunerea "%{proposal_title}", este acum %{progress}% complet. Îl puteți vedea de pe această pagină:'
           email_outro: Ai primit această notificare deoarece urmărești „%{proposal_title}� și această propunere este inclusă în rezultatul „%{resource_title}�. Poți înceta să primești notificări urmând link-ul anterior.
           email_subject: O actualizare la progresul %{resource_title}
           notification_title: Rezultatul <a href="%{resource_path}">%{resource_title}</a>, care include propunerea <a href="%{proposal_path}">%{proposal_title}</a>, este acum %{progress}% complet.
diff --git a/decidim-accountability/config/locales/ru.yml b/decidim-accountability/config/locales/ru.yml
index e326a2e6a0602..c75064b790696 100644
--- a/decidim-accountability/config/locales/ru.yml
+++ b/decidim-accountability/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -131,7 +132,6 @@ ru:
             progress: Продвижение
         timeline_entry:
           fields:
-            description: Опи�ание
             entry_date: Дата
       results:
         count:
diff --git a/decidim-accountability/config/locales/si-LK.yml b/decidim-accountability/config/locales/si-LK.yml
index 1b7b24d2d73c1..620b1f12cb083 100644
--- a/decidim-accountability/config/locales/si-LK.yml
+++ b/decidim-accountability/config/locales/si-LK.yml
@@ -1,3 +1,4 @@
+---
 si:
   activemodel:
     attributes:
@@ -56,7 +57,6 @@ si:
       models:
         timeline_entry:
           fields:
-            description: සවිස්තරය
             entry_date: දිනය
       results:
         show:
diff --git a/decidim-accountability/config/locales/sk.yml b/decidim-accountability/config/locales/sk.yml
index 0765bcbe9b15e..49cd6ca2e75a0 100644
--- a/decidim-accountability/config/locales/sk.yml
+++ b/decidim-accountability/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -151,7 +152,6 @@ sk:
             progress: Postup
         timeline_entry:
           fields:
-            description: Popis
             entry_date: Dátum
       result_m:
         view: Zobraziť
diff --git a/decidim-accountability/config/locales/sl.yml b/decidim-accountability/config/locales/sl.yml
index c6309d71815f1..1eeb6707cde2a 100644
--- a/decidim-accountability/config/locales/sl.yml
+++ b/decidim-accountability/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
@@ -96,7 +97,6 @@ sl:
             progress: Napredek
         timeline_entry:
           fields:
-            description: Opis
             entry_date: Datum
       results:
         filters:
diff --git a/decidim-accountability/config/locales/sr-CS.yml b/decidim-accountability/config/locales/sr-CS.yml
index 89a064154ad13..1243ad749ed5a 100644
--- a/decidim-accountability/config/locales/sr-CS.yml
+++ b/decidim-accountability/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
@@ -130,7 +131,6 @@ sr:
             progress: Napredak
         timeline_entry:
           fields:
-            description: Opis
             entry_date: Datum
       results:
         count:
diff --git a/decidim-accountability/config/locales/sv.yml b/decidim-accountability/config/locales/sv.yml
index 1dd8592457bab..eec01767793b7 100644
--- a/decidim-accountability/config/locales/sv.yml
+++ b/decidim-accountability/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ sv:
       timeline_entry:
         description: Beskrivning
         entry_date: Datum
+        title: Titel
     models:
       decidim/accountability/proposal_linked_event: Förslag som ingår i ett resultat
       decidim/accountability/result_progress_updated_event: Uppdaterat resultatutvecklingen
@@ -48,7 +50,29 @@ sv:
           results: Resultat
         import_results:
           new:
+            download_export: Ladda ner exporten som CSV
             import: Importera
+            info: |
+              <p>Vi rekommenderar att du följer dessa steg:</p>
+              <ol>
+              <li><a href='%{link_new_status}' target='_blank'>Skapa statusarna för de resultat</a> som du vill lägga till</li>
+              <li><a href='%{link_new_result}' target='_blank'>Skapa minst ett resultat manuellt</a> via denna administratörspanel innan du använder Import, för att få en bättre förståelse för formatet och vad du behöver fylla i.</li>
+              <li>%{link_export_csv}</li>
+              <li>Genomför ändringarna lokalt. Du kan endast ändra följande kolumner i CSV-filen:
+              <ul>
+              <li><b>category/id:</b> ID för kategorin</li>
+              <li><b>scope/id:</b> ID för tillämpningsområdet</li>
+              <li><b>parent/id:</b> ID för överordnad (för relaterade resultat). Alternativ</li>
+              <li><b>title/I18N:</b> Titel på X språk</li>
+              <li><b>description/I18N:</b> Beskrivning av X språk</li>
+              <li><b>start_date:</b> datum då resultatet börjar genomföras (format ÅÅÅÅ-MM-DD)</li>
+              <li><b>end_date:</b> datum då resultatet slutar genomföras (format ÅÅÅÅ-MM-DD)</li>
+              <li><b>status/id:</b> ID för statusen för detta resultat</li>
+              <li><b>progress:</b> Procent (från 0 till 100) av genomförandet</li>
+              <li><b>proposals_ids:</b>internt ID för relaterade förslag (kommaseparerade). Omvandlas automatiskt till <span class='attribute-name'>proposal_url</span></li>
+              </ul>
+              </li>
+              </ol>
             title: Importera resultat från CSV
         imports:
           create:
@@ -119,6 +143,14 @@ sv:
           create: "%{user_name} skapade resultatet %{resource_name} i %{space_name}"
           delete: "%{user_name} raderade resultatet %{resource_name} i %{space_name}"
           update: "%{user_name} uppdaterade resultatet %{resource_name} i %{space_name}"
+        status:
+          create: "%{user_name} skapade statusen %{resource_name}"
+          delete: "%{user_name} raderade statusen %{resource_name}"
+          update: "%{user_name} uppdaterade statusen %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} skapade steget %{resource_name} för tidslinjen"
+          delete: "%{user_name} raderade steget %{resource_name} i tidslinjen"
+          update: "%{user_name} uppdaterade steget %{resource_name} i tidslinjen"
         value_types:
           parent_presenter:
             not_found: 'Föräldraposten hittades inte i databasen (ID: %{id})'
@@ -156,8 +188,8 @@ sv:
             progress: Behandling
         timeline_entry:
           fields:
-            description: Beskrivning
             entry_date: Datum
+            title: Titel
       result_m:
         executed: Utfört
         view: Visa
diff --git a/decidim-accountability/config/locales/tr-TR.yml b/decidim-accountability/config/locales/tr-TR.yml
index 98753197f080b..f623dbfc93814 100644
--- a/decidim-accountability/config/locales/tr-TR.yml
+++ b/decidim-accountability/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -21,6 +22,7 @@ tr:
       timeline_entry:
         description: Açıklama
         entry_date: tarih
+        title: BaÅŸlik / Unvani 
     models:
       decidim/accountability/proposal_linked_event: Teklif bir sonuca dahil edildi
       decidim/accountability/result_progress_updated_event: Sonuç ilerlemesi güncellendi
@@ -32,6 +34,8 @@ tr:
   decidim:
     accountability:
       actions:
+        attachment_collections: Klasörler 
+        attachments: Ekler 
         confirm_destroy: Bu %{name}silmek istediÄŸinize emin misiniz?
         destroy: silmek
         edit: Düzenle
@@ -46,7 +50,29 @@ tr:
           results: Sonuçlar
         import_results:
           new:
+            download_export: '  İhracat i CSV formatında indirin '
             import: İçe aktar
+            info: |
+              <p>bu adımları uygulamanızı öneririz <p>
+              <ol>
+              <li><a herf='%{link_new_status}'
+              target='_bank`>eklemek istediğniz sonuçlar için durumlar oluşturun</a>istediğnizi ekleyiniz</li><li><a herf=%{link_new_result}`target=`_blank`>manuell olarak en az bir sonuç oluşturun</a> İçe aktarmayı kullanmadan önce, formatı ve doldurmanız gerekenleri daha iyi anlamak için bu yönetici paneli uygulayın </li><li>%{link_export_csv}<li>
+              <li>değişiklikleri yerel olarak yapın. CSV` nin yalnızca aşağıdaki sütunlarını değiştirebilirsiniz:
+              <ul>
+              <li><b>kategori/ID:</b>kategorisinin kimliÄŸi</li>
+              <li><><b>kapsam/kimlik:</b>kapsam kimliÄŸi</li>
+              <li><b>ebeveyn/ID:</b>ebeveyin kimliği(ilgili sonuçlar için).isteğe bağlı</li>
+              <li><b>başlık/en:</b>başlık inglizce olarak.Bu platformunuzdaki dil yapılandırmasına bağlı dır.<li>
+              <li><b>açıklama/en:</b>ingluzce olarak açıklama. Bu platformunuza bağlı olarak dır</li>
+              <li><b>başlangıç_tarihi:</b>sonucun yürütme ye başladığı tarih(format YYYY-AA-GG)</li>
+              <li><b>bitiş_tarihi:</b>sonucun yürütmeyi bitirdiği tarih(format YYY-AA-GG)<li>
+              <li><b>durum/kimlik:</b>bu sonuç için durumun kimliği<li>
+              <li><b>ilerleme:</b>yürütme yüzdesı(0'dan 100'e)<li>
+              <li><b>fikir_önerisi:</b>ilgılı tekliflerin dahili kimliği(virgüle ayrılmış ). Otomatik olarak biçimine dönüşüyor<span class='atttibute-name'>proposal_url</span>
+              </li>
+              </ul>
+              </li>
+              </ol>
             title: Sonuçları CSV'den içe aktar
         imports:
           create:
@@ -154,7 +180,6 @@ tr:
             progress: Ä°lerleme
         timeline_entry:
           fields:
-            description: Açıklama
             entry_date: tarih
       result_m:
         executed: Yürütüldü
diff --git a/decidim-accountability/config/locales/uk.yml b/decidim-accountability/config/locales/uk.yml
index 7820ee5f9a368..dd62dc26c6b0b 100644
--- a/decidim-accountability/config/locales/uk.yml
+++ b/decidim-accountability/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -128,7 +129,6 @@ uk:
             progress: Перебіг
         timeline_entry:
           fields:
-            description: Опи�
             entry_date: Дата
       results:
         count:
diff --git a/decidim-accountability/config/locales/zh-CN.yml b/decidim-accountability/config/locales/zh-CN.yml
index 8c7472b1b0196..f7e36b78d2292 100644
--- a/decidim-accountability/config/locales/zh-CN.yml
+++ b/decidim-accountability/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -143,7 +144,6 @@ zh-CN:
             progress: 进展情况
         timeline_entry:
           fields:
-            description: �述
             entry_date: 日期
       results:
         count:
diff --git a/decidim-accountability/db/migrate/20220331150008_add_title_to_timeline_entries.rb b/decidim-accountability/db/migrate/20220331150008_add_title_to_timeline_entries.rb
index 082e29b91f56d..c0fd23a4dc4e3 100644
--- a/decidim-accountability/db/migrate/20220331150008_add_title_to_timeline_entries.rb
+++ b/decidim-accountability/db/migrate/20220331150008_add_title_to_timeline_entries.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddTitleToTimelineEntries < ActiveRecord::Migration[6.0]
+class AddTitleToTimelineEntries < ActiveRecord::Migration[6.1]
   def change
     add_column :decidim_accountability_timeline_entries, :title, :jsonb
   end
diff --git a/decidim-accountability/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb b/decidim-accountability/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
index 1eacf57a97b55..253617a3e7b5b 100644
--- a/decidim-accountability/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
+++ b/decidim-accountability/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MoveLegacyDescriptionToTitleOfTimelineEntries < ActiveRecord::Migration[6.0]
+class MoveLegacyDescriptionToTitleOfTimelineEntries < ActiveRecord::Migration[6.1]
   class TimelineEntry < ApplicationRecord
     self.table_name = :decidim_accountability_timeline_entries
   end
diff --git a/decidim-accountability/decidim-accountability.gemspec b/decidim-accountability/decidim-accountability.gemspec
index d09dd9272e8a7..24180b091044b 100644
--- a/decidim-accountability/decidim-accountability.gemspec
+++ b/decidim-accountability/decidim-accountability.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-accountability"
   s.summary = "Decidim accountability module"
diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
index d9902d7879b53..d29995caad330 100644
--- a/decidim-accountability/lib/decidim/accountability/version.rb
+++ b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-accountability/spec/cells/decidim/accountability/result_m_cell_spec.rb b/decidim-accountability/spec/cells/decidim/accountability/result_m_cell_spec.rb
index cf02eb1a7465f..5225ff4f49a15 100644
--- a/decidim-accountability/spec/cells/decidim/accountability/result_m_cell_spec.rb
+++ b/decidim-accountability/spec/cells/decidim/accountability/result_m_cell_spec.rb
@@ -24,7 +24,7 @@ module Decidim::Accountability
         expect(subject).to have_css(".card--result")
       end
 
-      it "renders the start and end time " do
+      it "renders the start and end time" do
         result_start = I18n.l(start_date.to_date, format: :decidim_short)
         result_end = I18n.l(end_date.to_date, format: :decidim_short)
 
diff --git a/decidim-accountability/spec/commands/admin/create_status_spec.rb b/decidim-accountability/spec/commands/admin/create_status_spec.rb
index 81658d525c91a..e8f2fcb86f1d4 100644
--- a/decidim-accountability/spec/commands/admin/create_status_spec.rb
+++ b/decidim-accountability/spec/commands/admin/create_status_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Accountability
   describe Admin::CreateStatus do
-    subject { described_class.new(form) }
+    subject { described_class.new(form, user) }
 
     let(:organization) { create :organization, available_locales: [:en] }
+    let(:user) { create(:user, organization: organization) }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:current_component) { create :component, manifest_name: "accountability", participatory_space: participatory_process }
 
@@ -61,6 +62,18 @@ module Decidim::Accountability
         subject.call
         expect(status.progress).to eq progress
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::Accountability::Status, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-accountability/spec/commands/admin/create_timeline_entry_spec.rb b/decidim-accountability/spec/commands/admin/create_timeline_entry_spec.rb
index 6431a0c2fb8a3..bd8f82a7e5417 100644
--- a/decidim-accountability/spec/commands/admin/create_timeline_entry_spec.rb
+++ b/decidim-accountability/spec/commands/admin/create_timeline_entry_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Accountability
   describe Admin::CreateTimelineEntry do
-    subject { described_class.new(form) }
+    subject { described_class.new(form, user) }
 
     let(:organization) { create :organization, available_locales: [:en] }
+    let(:user) { create :user, organization: organization }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:current_component) { create :accountability_component, participatory_space: participatory_process }
     let(:result) { create :result, component: current_component }
@@ -60,6 +61,18 @@ module Decidim::Accountability
         subject.call
         expect(timeline_entry.result).to eq(result)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::Accountability::TimelineEntry, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-accountability/spec/commands/admin/update_status_spec.rb b/decidim-accountability/spec/commands/admin/update_status_spec.rb
index e5b21743698b2..a0216777c0638 100644
--- a/decidim-accountability/spec/commands/admin/update_status_spec.rb
+++ b/decidim-accountability/spec/commands/admin/update_status_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Accountability
   describe Admin::UpdateStatus do
-    subject { described_class.new(form, status) }
+    subject { described_class.new(form, status, user) }
 
     let(:organization) { create :organization, available_locales: [:en] }
+    let(:user) { create :user, organization: organization }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:current_component) { create :accountability_component, participatory_space: participatory_process }
 
@@ -56,6 +57,18 @@ module Decidim::Accountability
         subject.call
         expect(status.progress).to eq progress
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:update, status, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-accountability/spec/commands/admin/update_timeline_entry_spec.rb b/decidim-accountability/spec/commands/admin/update_timeline_entry_spec.rb
index 47d4f57596c78..cbe8e2f62108e 100644
--- a/decidim-accountability/spec/commands/admin/update_timeline_entry_spec.rb
+++ b/decidim-accountability/spec/commands/admin/update_timeline_entry_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Accountability
   describe Admin::UpdateTimelineEntry do
-    subject { described_class.new(form, timeline_entry) }
+    subject { described_class.new(form, timeline_entry, user) }
 
     let(:organization) { create :organization, available_locales: [:en] }
+    let(:user) { create :user, organization: organization }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:current_component) { create :accountability_component, participatory_space: participatory_process }
     let(:result) { create :result, component: current_component }
@@ -45,6 +46,18 @@ module Decidim::Accountability
         subject.call
         expect(translated(timeline_entry.description)).to eq description
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:update, Decidim::Accountability::TimelineEntry, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-accountability/spec/mailers/import_mailer_spec.rb b/decidim-accountability/spec/mailers/import_mailer_spec.rb
index 5e044b95cd47b..861a50f05f43c 100644
--- a/decidim-accountability/spec/mailers/import_mailer_spec.rb
+++ b/decidim-accountability/spec/mailers/import_mailer_spec.rb
@@ -13,9 +13,9 @@ module Accountability
       let(:participatory_process) { create :participatory_process, organization: organization }
       let(:current_component) { create :accountability_component, participatory_space: participatory_process, id: 16 }
       let!(:category) { create :category, id: 16, participatory_space: current_component.participatory_space }
-      let!(:status_6) { create :status, id: 6, component: current_component }
-      let!(:status_7) { create :status, id: 7, component: current_component }
-      let!(:status_8) { create :status, id: 8, component: current_component }
+      let!(:status6) { create :status, id: 6, component: current_component }
+      let!(:status7) { create :status, id: 7, component: current_component }
+      let!(:status8) { create :status, id: 8, component: current_component }
       let(:valid_csv) { File.read("spec/fixtures/valid_result.csv") }
       let(:invalid_csv) { File.read("spec/fixtures/invalid_result.csv") }
 
diff --git a/decidim-accountability/spec/permissions/decidim/accountability/admin/permissions_spec.rb b/decidim-accountability/spec/permissions/decidim/accountability/admin/permissions_spec.rb
index 0c1ee17c03212..818ac227d1341 100644
--- a/decidim-accountability/spec/permissions/decidim/accountability/admin/permissions_spec.rb
+++ b/decidim-accountability/spec/permissions/decidim/accountability/admin/permissions_spec.rb
@@ -13,7 +13,7 @@
   end
   let(:extra_context) { {} }
   let(:accountability_component) { create :accountability_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   shared_examples "crud permissions" do
     describe "create" do
@@ -21,7 +21,7 @@
         { scope: :admin, action: :create, subject: action_subject }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     describe "update" do
@@ -30,7 +30,7 @@
       end
 
       context "when the resource is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the resource is not present" do
@@ -46,7 +46,7 @@
       end
 
       context "when the resource is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the resource is not present" do
diff --git a/decidim-accountability/spec/permissions/decidim/accountability/permissions_spec.rb b/decidim-accountability/spec/permissions/decidim/accountability/permissions_spec.rb
index 635286cf5cedc..f72e80058bce0 100644
--- a/decidim-accountability/spec/permissions/decidim/accountability/permissions_spec.rb
+++ b/decidim-accountability/spec/permissions/decidim/accountability/permissions_spec.rb
@@ -12,7 +12,7 @@
     }
   end
   let(:accountability_component) { create :accountability_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
diff --git a/decidim-accountability/spec/requests/result_search_spec.rb b/decidim-accountability/spec/requests/result_search_spec.rb
new file mode 100644
index 0000000000000..053024d84b9c3
--- /dev/null
+++ b/decidim-accountability/spec/requests/result_search_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Result search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  let(:component) { create :accountability_component }
+  let(:participatory_space) { component.participatory_space }
+  let(:parent_id) { nil }
+  let(:filter_params) { {} }
+
+  let!(:result1) do
+    create(
+      :result,
+      title: Decidim::Faker::Localized.literal("A doggo in the title"),
+      component: component,
+      parent: nil,
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:result2) do
+    create(
+      :result,
+      description: Decidim::Faker::Localized.literal("There is a doggo in the office"),
+      component: component,
+      parent: result1,
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:result3) do
+    create(
+      :result,
+      component: component,
+      parent: result2,
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:result4) do
+    create(
+      :result,
+      component: component,
+      parent: nil,
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+
+  let(:request_path) { main_component_path(component) }
+
+  before do
+    get(
+      request_path,
+      params: { parent_id: parent_id, filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  describe "home" do
+    subject { response.body }
+
+    it "displays all categories that have top-level results" do
+      expect(subject).to include(translated(result1.category.name))
+      expect(subject).to include(translated(result4.category.name))
+    end
+
+    it "does not display the categories that only have sub-results" do
+      expect(subject).not_to include(translated(result2.category.name))
+      expect(subject).not_to include(translated(result3.category.name))
+    end
+  end
+
+  describe "results" do
+    subject { assigns(:results) }
+
+    let(:request_path) { "#{main_component_path(component)}/results" }
+
+    context "when deep searching" do
+      context "when the parent_id is nil" do
+        it "returns the search on all results" do
+          expect(subject).to match_array [result1, result2, result4]
+        end
+      end
+
+      context "when the parent_id is result1" do
+        let(:parent_id) { result1.id }
+
+        it "returns the search on the children of result" do
+          expect(subject).to match_array [result2, result3]
+        end
+      end
+
+      context "when the parent_id is result2" do
+        let(:parent_id) { result2.id }
+
+        it "returns the search on the children of result" do
+          expect(subject).to match_array [result3]
+        end
+      end
+    end
+
+    context "when searching by text" do
+      let(:filter_params) { { search_text_cont: "doggo" } }
+
+      it "returns the search results matching the word in title or description" do
+        expect(subject).to match_array [result1, result2]
+      end
+    end
+  end
+end
diff --git a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
index 10b3803f98e22..23b2831255c33 100644
--- a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
+++ b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
@@ -41,7 +41,7 @@
         start_date: :date,
         title_en: :i18n
       }
-      types = subject.map { |attribute, data| [attribute.to_sym, data[:type]] }.to_h
+      types = subject.to_h { |attribute, data| [attribute.to_sym, data[:type]] }
       expect(types).to eq expected_types
     end
 
@@ -52,7 +52,7 @@
         start_date: "Start date",
         title_en: "Title (English)"
       }
-      labels = subject.map { |attribute, data| [attribute.to_sym, data[:label]] }.to_h
+      labels = subject.to_h { |attribute, data| [attribute.to_sym, data[:label]] }
       expect(labels).to eq expected_labels
     end
 
@@ -76,7 +76,7 @@
           start_date: "Start date",
           title_en: "Title (English)"
         }
-        labels = subject.map { |attribute, data| [attribute.to_sym, data[:label]] }.to_h
+        labels = subject.to_h { |attribute, data| [attribute.to_sym, data[:label]] }
         expect(labels).to eq expected_labels
       end
     end
diff --git a/decidim-accountability/spec/services/decidim/accountability/result_search_spec.rb b/decidim-accountability/spec/services/decidim/accountability/result_search_spec.rb
deleted file mode 100644
index 71f9ab47772aa..0000000000000
--- a/decidim-accountability/spec/services/decidim/accountability/result_search_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Accountability
-  describe ResultSearch do
-    subject { described_class.new(params).results }
-
-    let(:component) { create :accountability_component }
-    let(:participatory_space) { component.participatory_space }
-    let(:default_params) do
-      { component: component, deep_search: true }
-    end
-    let(:params) { default_params }
-
-    it_behaves_like "a resource search", :result
-    it_behaves_like "a resource search with scopes", :result
-    it_behaves_like "a resource search with categories", :result
-
-    describe "filters" do
-      let!(:result1) do
-        create(
-          :result,
-          component: component,
-          parent: nil
-        )
-      end
-      let!(:result2) do
-        create(
-          :result,
-          component: component,
-          parent: result1
-        )
-      end
-      let!(:result3) do
-        create(
-          :result,
-          component: component,
-          parent: result2
-        )
-      end
-
-      describe "parent_id" do
-        context "when deep searching" do
-          context "when the parent_id is nil" do
-            let(:params) { default_params.merge(parent_id: nil) }
-
-            it "returns the search on all results" do
-              expect(subject).to match_array [result1, result2]
-            end
-          end
-
-          context "when the parent_id is result1" do
-            let(:params) { default_params.merge(parent_id: result1.id) }
-
-            it "returns the search on the children of result" do
-              expect(subject).to match_array [result2, result3]
-            end
-          end
-
-          context "when the parent_id is result2" do
-            let(:params) { default_params.merge(parent_id: result2.id) }
-
-            it "returns the search on the children of result" do
-              expect(subject).to match_array [result3]
-            end
-          end
-        end
-
-        context "when not deep searching" do
-          context "when the parent_id is nil" do
-            let(:params) { default_params.merge(parent_id: nil, deep_search: false) }
-
-            it "returns the search on the result without parent" do
-              expect(subject).to match_array [result1]
-            end
-          end
-
-          context "when the parent_id is result1" do
-            let(:params) { default_params.merge(parent_id: result1.id, deep_search: false) }
-
-            it "returns the search on the children of result" do
-              expect(subject).to match_array [result2]
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-accountability/spec/services/decidim/accountability/results_csv_importer_spec.rb b/decidim-accountability/spec/services/decidim/accountability/results_csv_importer_spec.rb
index fc81c7e65e1b6..1ba273c618983 100644
--- a/decidim-accountability/spec/services/decidim/accountability/results_csv_importer_spec.rb
+++ b/decidim-accountability/spec/services/decidim/accountability/results_csv_importer_spec.rb
@@ -11,9 +11,9 @@
   let(:participatory_process) { create :participatory_process, organization: organization }
   let(:current_component) { create :accountability_component, participatory_space: participatory_process, id: 16 }
   let!(:category) { create :category, id: 16, participatory_space: current_component.participatory_space }
-  let!(:status_6) { create :status, id: 6, component: current_component }
-  let!(:status_7) { create :status, id: 7, component: current_component }
-  let!(:status_8) { create :status, id: 8, component: current_component }
+  let!(:status6) { create :status, id: 6, component: current_component }
+  let!(:status7) { create :status, id: 7, component: current_component }
+  let!(:status8) { create :status, id: 8, component: current_component }
   let(:valid_csv) { File.read("spec/fixtures/valid_result.csv") }
   let(:invalid_csv) { File.read("spec/fixtures/invalid_result.csv") }
 
@@ -28,7 +28,7 @@
       end
 
       context "when results exist" do
-        let!(:result1) { create :result, component: current_component, progress: 0, id: 69, status: status_6 }
+        let!(:result1) { create :result, component: current_component, progress: 0, id: 69, status: status6 }
 
         it "Update the result1 progress attribute" do
           subject.import!
diff --git a/decidim-accountability/spec/services/decidim/accountability/searchable_result_resource_spec.rb b/decidim-accountability/spec/services/decidim/accountability/searchable_result_resource_spec.rb
index d6cf677c2ba88..d4abe3f549a41 100644
--- a/decidim-accountability/spec/services/decidim/accountability/searchable_result_resource_spec.rb
+++ b/decidim-accountability/spec/services/decidim/accountability/searchable_result_resource_spec.rb
@@ -16,7 +16,7 @@ module Decidim
         component: current_component,
         scope: scope1,
         title: Decidim::Faker::Localized.name,
-        description: description_1
+        description: description1
       )
     end
 
diff --git a/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb b/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb
index ba0459c212eab..2956973357278 100644
--- a/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb
+++ b/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb
@@ -10,12 +10,12 @@
                                             name: { "ca" => "Scope2", "en" => "Scope3" }),
                       component: current_component,
                       category: create(:category, participatory_space: participatory_space),
-                      created_at: Time.current - 2.days),
+                      created_at: 2.days.ago),
       create(:result, scope: create(:scope, organization: component.organization,
                                             name: { "ca" => "Scope3", "en" => "Scope1" }),
                       component: current_component,
                       category: create(:category, participatory_space: participatory_space),
-                      created_at: Time.current - 1.day),
+                      created_at: 1.day.ago),
       create(:result, scope: create(:scope, organization: component.organization,
                                             name: { "ca" => "Scope1", "en" => "Scope2" }),
                       component: current_component,
diff --git a/decidim-accountability/spec/system/explore_results_spec.rb b/decidim-accountability/spec/system/explore_results_spec.rb
index 8dbbc8a7e09f0..193a41ca4ed83 100644
--- a/decidim-accountability/spec/system/explore_results_spec.rb
+++ b/decidim-accountability/spec/system/explore_results_spec.rb
@@ -18,16 +18,32 @@
 
   before do
     component.update(settings: { scopes_enabled: true })
+
     visit path
   end
 
   describe "home" do
+    let!(:other_category) { create :category, participatory_space: participatory_space }
+    let!(:other_scope) { create :scope, organization: organization }
+
+    let(:subcategory) { create :subcategory, parent: category }
+    let(:other_subcategory) { create :subcategory, parent: other_category }
+
     let(:path) { decidim_participatory_process_accountability.root_path(participatory_process_slug: participatory_process.slug, component_id: component.id) }
 
+    before do
+      # Add scopes and categories for the results to test they work correctly
+      results[0..2].each { |r| r.update!(category: subcategory, scope: scope) }
+      results[3..-1].each { |r| r.update!(category: other_subcategory, scope: other_scope) }
+
+      # Revisit the path to load updated results
+      visit path
+    end
+
     it "shows categories and subcategories with results" do
       participatory_process.categories.each do |category|
-        results_count = Decidim::Accountability::ResultsCalculator.new(component, nil, category.id).count
-        expect(page).to have_content(translated(category.name)) if !category.subcategories.empty? || results_count.positive?
+        category_count = Decidim::Accountability::ResultsCalculator.new(component, nil, category.id).count
+        expect(page).to have_content(translated(category.name)) if category_count.positive?
       end
     end
 
@@ -48,6 +64,64 @@
         expect(page).to have_no_selector(".progress-figure")
       end
     end
+
+    context "with a scope" do
+      before do
+        within "ul.tags.tags--action" do
+          click_link translated(scope.name)
+        end
+      end
+
+      it "shows current scope active" do
+        within "ul.tags.tags--action li.active" do
+          expect(page).to have_content(translated(scope.name))
+        end
+      end
+
+      it "shows only the categories with results matching the current scope" do
+        participatory_process.categories.each do |category|
+          category_count = Decidim::Accountability::ResultsCalculator.new(component, scope.id, category.id).count
+          if category_count.positive?
+            expect(page).to have_content(translated(category.name))
+          else
+            expect(page).not_to have_content(translated(category.name))
+          end
+        end
+      end
+    end
+
+    context "when searching" do
+      let!(:matching_result1) do
+        create(
+          :result,
+          title: Decidim::Faker::Localized.literal("A doggo in the title"),
+          component: component
+        )
+      end
+      let!(:matching_result2) do
+        create(
+          :result,
+          title: Decidim::Faker::Localized.literal("Other matching result"),
+          description: Decidim::Faker::Localized.literal("There is a doggo in the office"),
+          component: component
+        )
+      end
+
+      it "displays the correct search results" do
+        fill_in :filter_search_text_cont, with: "doggo"
+        within "form .filters__search" do
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("2 RESULTS")
+        expect(page).to have_content(translated(matching_result1.title))
+        expect(page).to have_content(translated(matching_result2.title))
+
+        results.each do |result|
+          expect(page).not_to have_content(translated(result.title))
+        end
+      end
+    end
   end
 
   describe "index" do
@@ -74,7 +148,7 @@
 
       let(:path) do
         decidim_participatory_process_accountability.results_path(
-          participatory_process_slug: participatory_process.slug, component_id: component.id, filter: { category_id: category.id, scope_id: scope.id }
+          participatory_process_slug: participatory_process.slug, component_id: component.id, filter: { with_category: category.id, with_scope: scope.id }
         )
       end
 
diff --git a/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning/show.erb b/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning/show.erb
new file mode 100644
index 0000000000000..bd873c6c9d574
--- /dev/null
+++ b/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning/show.erb
@@ -0,0 +1,3 @@
+<% if private_space? && !(transparent_space?) %>
+  <div class="callout warning"><%= t("decidim.admin.attachments_privacy_warning.message") %></div>
+<% end %>
diff --git a/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning_cell.rb b/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning_cell.rb
new file mode 100644
index 0000000000000..722ce4c4a8387
--- /dev/null
+++ b/decidim-admin/app/cells/decidim/admin/attachments_privacy_warning_cell.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class AttachmentsPrivacyWarningCell < Decidim::ViewModel
+      delegate :current_participatory_space, to: :controller
+
+      private
+
+      def private_space?
+        current_participatory_space.private_space if current_participatory_space.respond_to?(:private_space)
+      end
+
+      def transparent_space?
+        current_participatory_space.is_transparent if current_participatory_space.respond_to?(:is_transparent)
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/commands/decidim/admin/block_user.rb b/decidim-admin/app/commands/decidim/admin/block_user.rb
index e734500a81cfd..e16bb986a3424 100644
--- a/decidim-admin/app/commands/decidim/admin/block_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/block_user.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class BlockUser < Rectify::Command
+    class BlockUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form - BlockUserForm
diff --git a/decidim-admin/app/commands/decidim/admin/close_session_managed_user.rb b/decidim-admin/app/commands/decidim/admin/close_session_managed_user.rb
index cfaccb6d871d5..9220561513393 100644
--- a/decidim-admin/app/commands/decidim/admin/close_session_managed_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/close_session_managed_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to close a current impersonation session.
-    class CloseSessionManagedUser < Rectify::Command
+    class CloseSessionManagedUser < Decidim::Command
       # Public: Initializes the command.
       #
       # user         - The user impersonated.
diff --git a/decidim-admin/app/commands/decidim/admin/create_area.rb b/decidim-admin/app/commands/decidim/admin/create_area.rb
index a5d8d88f685ae..d8801ef38c8a3 100644
--- a/decidim-admin/app/commands/decidim/admin/create_area.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_area.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating an area
-    class CreateArea < Rectify::Command
+    class CreateArea < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/create_area_type.rb b/decidim-admin/app/commands/decidim/admin/create_area_type.rb
index 13076fc61c0be..872e2139323b4 100644
--- a/decidim-admin/app/commands/decidim/admin/create_area_type.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_area_type.rb
@@ -3,12 +3,13 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating an area type.
-    class CreateAreaType < Rectify::Command
+    class CreateAreaType < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      def initialize(form)
+      def initialize(form, user)
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -29,7 +30,9 @@ def call
       attr_reader :form
 
       def create_area_type
-        AreaType.create!(
+        Decidim.traceability.create!(
+          AreaType,
+          @user,
           name: form.name,
           organization: form.organization,
           plural: form.plural
diff --git a/decidim-admin/app/commands/decidim/admin/create_attachment.rb b/decidim-admin/app/commands/decidim/admin/create_attachment.rb
index a7530dc97ebe9..785025af52d35 100644
--- a/decidim-admin/app/commands/decidim/admin/create_attachment.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_attachment.rb
@@ -4,14 +4,15 @@ module Decidim
   module Admin
     # A command with all the business logic to add an attachment to a
     # participatory process.
-    class CreateAttachment < Rectify::Command
+    class CreateAttachment < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
       # attached_to - The ActiveRecord::Base that will hold the attachment
-      def initialize(form, attached_to)
+      def initialize(form, attached_to, user)
         @form = form
         @attached_to = attached_to
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -26,9 +27,12 @@ def call
         build_attachment
 
         if @attachment.valid?
-          @attachment.save!
-          notify_followers
-          broadcast(:ok)
+          Decidim.traceability.perform_action!(:create, Decidim::Attachment, @user) do
+            @attachment.save!
+            notify_followers
+            broadcast(:ok)
+            @attachment
+          end
         else
           @form.errors.add :file, @attachment.errors[:file] if @attachment.errors.has_key? :file
           broadcast(:invalid)
@@ -47,7 +51,7 @@ def build_attachment
           weight: form.weight,
           attachment_collection: form.attachment_collection,
           file: form.file, # Define attached_to before this
-          content_type: form.file.content_type
+          content_type: blob(form.file).content_type
         )
       end
 
@@ -61,6 +65,10 @@ def notify_followers
           followers: @attachment.attached_to.followers
         )
       end
+
+      def blob(signed_id)
+        ActiveStorage::Blob.find_signed(signed_id)
+      end
     end
   end
 end
diff --git a/decidim-admin/app/commands/decidim/admin/create_attachment_collection.rb b/decidim-admin/app/commands/decidim/admin/create_attachment_collection.rb
index 72fb2a148a421..88baba63e8346 100644
--- a/decidim-admin/app/commands/decidim/admin/create_attachment_collection.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_attachment_collection.rb
@@ -4,14 +4,15 @@ module Decidim
   module Admin
     # A command with all the business logic to add an attachment collection
     # to a participatory space.
-    class CreateAttachmentCollection < Rectify::Command
+    class CreateAttachmentCollection < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
       # collection_for - The ActiveRecord::Base that will hold the collection
-      def initialize(form, collection_for)
+      def initialize(form, collection_for, user)
         @form = form
         @collection_for = collection_for
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -32,12 +33,20 @@ def call
       attr_reader :form
 
       def create_attachment_collection
-        AttachmentCollection.create!(
+        Decidim.traceability.create!(
+          AttachmentCollection,
+          @user,
+          attributes
+        )
+      end
+
+      def attributes
+        {
           name: form.name,
           weight: form.weight,
           description: form.description,
           collection_for: @collection_for
-        )
+        }
       end
     end
   end
diff --git a/decidim-admin/app/commands/decidim/admin/create_category.rb b/decidim-admin/app/commands/decidim/admin/create_category.rb
index 2e5658ab781c6..581b29f1f5e1c 100644
--- a/decidim-admin/app/commands/decidim/admin/create_category.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_category.rb
@@ -4,15 +4,16 @@ module Decidim
   module Admin
     # A command with all the business logic to create a new category in the
     # system.
-    class CreateCategory < Rectify::Command
+    class CreateCategory < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
       # participatory_space - The participatory space that will hold the
       #   category
-      def initialize(form, participatory_space)
+      def initialize(form, participatory_space, user)
         @form = form
         @participatory_space = participatory_space
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -33,10 +34,11 @@ def call
       attr_reader :form
 
       def create_category
-        Category.create!(
+        Decidim.traceability.create!(
+          Category,
+          @user,
           name: form.name,
           weight: form.weight,
-          description: form.description,
           parent_id: form.parent_id,
           participatory_space: @participatory_space
         )
diff --git a/decidim-admin/app/commands/decidim/admin/create_component.rb b/decidim-admin/app/commands/decidim/admin/create_component.rb
index cff14a49efb61..64522a88750dc 100644
--- a/decidim-admin/app/commands/decidim/admin/create_component.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_component.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command gets called when a component is created from the admin panel.
-    class CreateComponent < Rectify::Command
+    class CreateComponent < Decidim::Command
       attr_reader :form, :manifest, :participatory_space
 
       # Public: Initializes the command.
diff --git a/decidim-admin/app/commands/decidim/admin/create_import.rb b/decidim-admin/app/commands/decidim/admin/create_import.rb
index 732c78dbd2bd5..ba6f8f69a1842 100644
--- a/decidim-admin/app/commands/decidim/admin/create_import.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_import.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class CreateImport < Rectify::Command
+    class CreateImport < Decidim::Command
       def initialize(form)
         @form = form
       end
@@ -14,13 +14,12 @@ def call
         transaction do
           form.importer.import!
 
-          return broadcast(:ok, imported_data)
+          broadcast(:ok, imported_data)
         rescue StandardError
+          # Something went wrong with import/finish
+          broadcast(:invalid)
           raise ActiveRecord::Rollback
         end
-
-        # Something went wrong with import/finish
-        broadcast(:invalid)
       end
 
       attr_reader :form
diff --git a/decidim-admin/app/commands/decidim/admin/create_import_example.rb b/decidim-admin/app/commands/decidim/admin/create_import_example.rb
index f10dc0e714f85..7a41982f161c6 100644
--- a/decidim-admin/app/commands/decidim/admin/create_import_example.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_import_example.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class CreateImportExample < Rectify::Command
+    class CreateImportExample < Decidim::Command
       def initialize(form)
         @form = form
       end
diff --git a/decidim-admin/app/commands/decidim/admin/create_newsletter.rb b/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
index 973570ce44766..de80dedeef7e1 100644
--- a/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_newsletter.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # Creates a newsletter and assigns the right author and
     # organization.
-    class CreateNewsletter < Rectify::Command
+    class CreateNewsletter < Decidim::Command
       # Initializes the command.
       #
       # form - The source fo data for this newsletter.
diff --git a/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb b/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb
index f438ad6262057..21c4f5a5d4be9 100644
--- a/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_participatory_space_private_user.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic when creating a new participatory space
     # private user in the system.
-    class CreateParticipatorySpacePrivateUser < Rectify::Command
+    class CreateParticipatorySpacePrivateUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/create_scope.rb b/decidim-admin/app/commands/decidim/admin/create_scope.rb
index 0fa9aad5adda7..60cacb724dc34 100644
--- a/decidim-admin/app/commands/decidim/admin/create_scope.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_scope.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating a static scope.
-    class CreateScope < Rectify::Command
+    class CreateScope < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/create_scope_type.rb b/decidim-admin/app/commands/decidim/admin/create_scope_type.rb
index a92c351fd7310..eef4079ccc339 100644
--- a/decidim-admin/app/commands/decidim/admin/create_scope_type.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_scope_type.rb
@@ -3,12 +3,13 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating a scope type.
-    class CreateScopeType < Rectify::Command
+    class CreateScopeType < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      def initialize(form)
+      def initialize(form, user)
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -29,7 +30,9 @@ def call
       attr_reader :form
 
       def create_scope_type
-        ScopeType.create!(
+        Decidim.traceability.create!(
+          ScopeType,
+          @user,
           name: form.name,
           organization: form.organization,
           plural: form.plural
diff --git a/decidim-admin/app/commands/decidim/admin/create_static_page.rb b/decidim-admin/app/commands/decidim/admin/create_static_page.rb
index a0970d2ef17a9..94d831085d19c 100644
--- a/decidim-admin/app/commands/decidim/admin/create_static_page.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_static_page.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating a static page.
-    class CreateStaticPage < Rectify::Command
+    class CreateStaticPage < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/create_static_page_topic.rb b/decidim-admin/app/commands/decidim/admin/create_static_page_topic.rb
index 93ad0295791e4..6a639efc58193 100644
--- a/decidim-admin/app/commands/decidim/admin/create_static_page_topic.rb
+++ b/decidim-admin/app/commands/decidim/admin/create_static_page_topic.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when creating a static page topic.
-    class CreateStaticPageTopic < Rectify::Command
+    class CreateStaticPageTopic < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/deliver_newsletter.rb b/decidim-admin/app/commands/decidim/admin/deliver_newsletter.rb
index db8e1ca7ef475..04530b9983803 100644
--- a/decidim-admin/app/commands/decidim/admin/deliver_newsletter.rb
+++ b/decidim-admin/app/commands/decidim/admin/deliver_newsletter.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # Delivers the newsletter to its recipients.
-    class DeliverNewsletter < Rectify::Command
+    class DeliverNewsletter < Decidim::Command
       # Initializes the command.
       #
       # newsletter - The newsletter to deliver.
@@ -16,12 +16,12 @@ def initialize(newsletter, form, user)
       end
 
       def call
-        @newsletter.with_lock do
-          return broadcast(:invalid) if @form.send_to_all_users && !@user.admin?
-          return broadcast(:invalid) unless @form.valid?
-          return broadcast(:invalid) if @newsletter.sent?
-          return broadcast(:no_recipients) if recipients.blank?
+        return broadcast(:invalid) if @form.send_to_all_users && !@user.admin?
+        return broadcast(:invalid) unless @form.valid?
+        return broadcast(:invalid) if @newsletter.sent?
+        return broadcast(:no_recipients) if recipients.blank?
 
+        @newsletter.with_lock do
           send_newsletter!
         end
 
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_area.rb b/decidim-admin/app/commands/decidim/admin/destroy_area.rb
index 3db686ded7a56..56e9ca8c78838 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_area.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_area.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy an area.
-    class DestroyArea < Rectify::Command
+    class DestroyArea < Decidim::Command
       # Public: Initializes the command.
       #
       # area - The area to destroy
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_category.rb b/decidim-admin/app/commands/decidim/admin/destroy_category.rb
index 86586fb5c804b..f5c198fa19a36 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_category.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_category.rb
@@ -4,12 +4,13 @@ module Decidim
   module Admin
     # A command with all the business logic to destroy a category in the
     # system.
-    class DestroyCategory < Rectify::Command
+    class DestroyCategory < Decidim::Command
       # Public: Initializes the command.
       #
       # category - A Category that will be destroyed
-      def initialize(category)
+      def initialize(category, user)
         @category = category
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -30,7 +31,9 @@ def call
       attr_reader :category
 
       def destroy_category
-        category.destroy!
+        Decidim.traceability.perform_action!(:delete, category, @user) do
+          category.destroy!
+        end
       end
     end
   end
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_component.rb b/decidim-admin/app/commands/decidim/admin/destroy_component.rb
index 013eb57af4fe2..87a3c87369588 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_component.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_component.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command deals with destroying a Component from the admin panel.
-    class DestroyComponent < Rectify::Command
+    class DestroyComponent < Decidim::Command
       # Public: Initializes the command.
       #
       # component - The Component to be destroyed.
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_newsletter.rb b/decidim-admin/app/commands/decidim/admin/destroy_newsletter.rb
index 45932496ac888..f24986ef79bf6 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_newsletter.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_newsletter.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command deals with destroying a newsletter from the admin panel.
-    class DestroyNewsletter < Rectify::Command
+    class DestroyNewsletter < Decidim::Command
       # Public: Initializes the command.
       #
       # newsletter - The Newsletter to be destroyed.
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb b/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb
index 2f9f79367491a..bdd02dc71ac0b 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_participatory_space_private_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy a participatory space private user.
-    class DestroyParticipatorySpacePrivateUser < Rectify::Command
+    class DestroyParticipatorySpacePrivateUser < Decidim::Command
       # Public: Initializes the command.
       #
       # participatory_space_private_user - The participatory space private user to destroy
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_scope.rb b/decidim-admin/app/commands/decidim/admin/destroy_scope.rb
index 1987bf554a42c..e3d343ad239fa 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_scope.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_scope.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy a scope.
-    class DestroyScope < Rectify::Command
+    class DestroyScope < Decidim::Command
       # Public: Initializes the command.
       #
       # scope - The Scope to destroy
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_share_token.rb b/decidim-admin/app/commands/decidim/admin/destroy_share_token.rb
index 38bc1e5d7a0a8..6042d1f5ec858 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_share_token.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_share_token.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy a share token.
-    class DestroyShareToken < Rectify::Command
+    class DestroyShareToken < Decidim::Command
       # Public: Initializes the command.
       #
       # share_token - The share_token to destroy
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_static_page.rb b/decidim-admin/app/commands/decidim/admin/destroy_static_page.rb
index 4da697d9ee1c4..f437aef00ce53 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_static_page.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_static_page.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command deals with destroying a StaticPage from the admin panel.
-    class DestroyStaticPage < Rectify::Command
+    class DestroyStaticPage < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPage to be destroyed.
diff --git a/decidim-admin/app/commands/decidim/admin/destroy_static_page_topic.rb b/decidim-admin/app/commands/decidim/admin/destroy_static_page_topic.rb
index c3f680ea8fa9b..842499e442cdf 100644
--- a/decidim-admin/app/commands/decidim/admin/destroy_static_page_topic.rb
+++ b/decidim-admin/app/commands/decidim/admin/destroy_static_page_topic.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command deals with destroying a StaticPageTopic from the admin panel.
-    class DestroyStaticPageTopic < Rectify::Command
+    class DestroyStaticPageTopic < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPageTopic to be destroyed.
diff --git a/decidim-admin/app/commands/decidim/admin/hide_resource.rb b/decidim-admin/app/commands/decidim/admin/hide_resource.rb
index 6fcbf46ff3541..dc5cd0c2eccf9 100644
--- a/decidim-admin/app/commands/decidim/admin/hide_resource.rb
+++ b/decidim-admin/app/commands/decidim/admin/hide_resource.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when a user hides a resource.
-    class HideResource < Rectify::Command
+    class HideResource < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::Reportable
@@ -60,7 +60,7 @@ def send_hide_notification_to_author
           affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
         }
 
-        Decidim::EventsManager.publish(data)
+        Decidim::EventsManager.publish(**data)
       end
 
       def report_reasons
diff --git a/decidim-admin/app/commands/decidim/admin/impersonate_user.rb b/decidim-admin/app/commands/decidim/admin/impersonate_user.rb
index 9e9318dea2ffd..4634d57e89de7 100644
--- a/decidim-admin/app/commands/decidim/admin/impersonate_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/impersonate_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to impersonate a managed user.
-    class ImpersonateUser < Rectify::Command
+    class ImpersonateUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - The form with the authorization info
diff --git a/decidim-admin/app/commands/decidim/admin/invite_admin.rb b/decidim-admin/app/commands/decidim/admin/invite_admin.rb
index da41b728784f7..c8920971b8529 100644
--- a/decidim-admin/app/commands/decidim/admin/invite_admin.rb
+++ b/decidim-admin/app/commands/decidim/admin/invite_admin.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command to invite an admin.
-    class InviteAdmin < Rectify::Command
+    class InviteAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/officialize_user.rb b/decidim-admin/app/commands/decidim/admin/officialize_user.rb
index 3cbb12b19b577..8af3c5d41e1f3 100644
--- a/decidim-admin/app/commands/decidim/admin/officialize_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/officialize_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when officializing a user.
-    class OfficializeUser < Rectify::Command
+    class OfficializeUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form - The officialization form.
diff --git a/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb b/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
index 7939ad825ae44..0896ba8578edb 100644
--- a/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
+++ b/decidim-admin/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
@@ -4,7 +4,9 @@
 
 module Decidim
   module Admin
-    class ProcessParticipatorySpacePrivateUserImportCsv < Rectify::Command
+    class ProcessParticipatorySpacePrivateUserImportCsv < Decidim::Command
+      include Decidim::ProcessesFileLocally
+
       # Public: Initializes the command.
       #
       # form - the form object containing the uploaded file
@@ -32,8 +34,10 @@ def call
       private
 
       def process_csv
-        CSV.foreach(@form.file.path, encoding: "BOM|UTF-8") do |email, user_name|
-          ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, @current_user) if email.present? && user_name.present?
+        process_file_locally(@form.file) do |file_path|
+          CSV.foreach(file_path, encoding: "BOM|UTF-8") do |email, user_name|
+            ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, @current_user) if email.present? && user_name.present?
+          end
         end
       end
     end
diff --git a/decidim-admin/app/commands/decidim/admin/process_user_group_verification_csv.rb b/decidim-admin/app/commands/decidim/admin/process_user_group_verification_csv.rb
index 957c6223f6788..49bdc6960ee94 100644
--- a/decidim-admin/app/commands/decidim/admin/process_user_group_verification_csv.rb
+++ b/decidim-admin/app/commands/decidim/admin/process_user_group_verification_csv.rb
@@ -6,7 +6,9 @@ module Decidim
   module Admin
     # A command with all the business logic when processing the CSV to verify
     # user groups.
-    class ProcessUserGroupVerificationCsv < Rectify::Command
+    class ProcessUserGroupVerificationCsv < Decidim::Command
+      include Decidim::ProcessesFileLocally
+
       # Public: Initializes the command.
       #
       # form - the form object containing the uploaded file
@@ -33,9 +35,11 @@ def process_csv
         verifier = @form.current_user
         organization = @form.current_organization
 
-        CSV.foreach(@form.file.path) do |row|
-          email = row[0]
-          VerifyUserGroupFromCsvJob.perform_later(email, verifier, organization) if email.present?
+        process_file_locally(@form.file) do |file_path|
+          CSV.foreach(file_path) do |row|
+            email = row[0]
+            VerifyUserGroupFromCsvJob.perform_later(email, verifier, organization) if email.present?
+          end
         end
       end
     end
diff --git a/decidim-admin/app/commands/decidim/admin/promote_managed_user.rb b/decidim-admin/app/commands/decidim/admin/promote_managed_user.rb
index be600aea77fe7..b395efd6067c0 100644
--- a/decidim-admin/app/commands/decidim/admin/promote_managed_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/promote_managed_user.rb
@@ -7,7 +7,7 @@ module Admin
     # Managed users can be promoted to standard users. It means they
     # will be invited to the application and will lose the managed flag
     # so the user cannot be impersonated anymore.
-    class PromoteManagedUser < Rectify::Command
+    class PromoteManagedUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-admin/app/commands/decidim/admin/publish_component.rb b/decidim-admin/app/commands/decidim/admin/publish_component.rb
index 0b70b564d424a..de18bb2dd9f1e 100644
--- a/decidim-admin/app/commands/decidim/admin/publish_component.rb
+++ b/decidim-admin/app/commands/decidim/admin/publish_component.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command gets called when a component is published from the admin panel.
-    class PublishComponent < Rectify::Command
+    class PublishComponent < Decidim::Command
       # Public: Initializes the command.
       #
       # component - The component to publish.
diff --git a/decidim-admin/app/commands/decidim/admin/reject_user_group.rb b/decidim-admin/app/commands/decidim/admin/reject_user_group.rb
index d73996edad685..6ca740c685218 100644
--- a/decidim-admin/app/commands/decidim/admin/reject_user_group.rb
+++ b/decidim-admin/app/commands/decidim/admin/reject_user_group.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when rejecting a user_group.
-    class RejectUserGroup < Rectify::Command
+    class RejectUserGroup < Decidim::Command
       # Public: Initializes the command.
       #
       # user_group - The user_group to reject
diff --git a/decidim-admin/app/commands/decidim/admin/remove_admin.rb b/decidim-admin/app/commands/decidim/admin/remove_admin.rb
index 6f694d8a98448..ff0bef932f0db 100644
--- a/decidim-admin/app/commands/decidim/admin/remove_admin.rb
+++ b/decidim-admin/app/commands/decidim/admin/remove_admin.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command to remove the admin privilege to an user.
-    class RemoveAdmin < Rectify::Command
+    class RemoveAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # user - the user that will no longer be an admin
diff --git a/decidim-admin/app/commands/decidim/admin/reorder_content_blocks.rb b/decidim-admin/app/commands/decidim/admin/reorder_content_blocks.rb
index a9422ae79f7d7..3cb5017d34fe9 100644
--- a/decidim-admin/app/commands/decidim/admin/reorder_content_blocks.rb
+++ b/decidim-admin/app/commands/decidim/admin/reorder_content_blocks.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command that reorders a collection of content blocks. It also creates
     # the ones that might be missing.
-    class ReorderContentBlocks < Rectify::Command
+    class ReorderContentBlocks < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - the Organization where the content blocks reside
diff --git a/decidim-admin/app/commands/decidim/admin/transfer_user.rb b/decidim-admin/app/commands/decidim/admin/transfer_user.rb
index 6771c864d3d01..1cbc559408044 100644
--- a/decidim-admin/app/commands/decidim/admin/transfer_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/transfer_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to transfer a managed user.
-    class TransferUser < Rectify::Command
+    class TransferUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form
diff --git a/decidim-admin/app/commands/decidim/admin/unblock_user.rb b/decidim-admin/app/commands/decidim/admin/unblock_user.rb
index 021183ddfbece..80cc01464d311 100644
--- a/decidim-admin/app/commands/decidim/admin/unblock_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/unblock_user.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnblockUser < Rectify::Command
+    class UnblockUser < Decidim::Command
       # Public: Initializes the command.
       #
       # blocked_user - the user that is unblocked
@@ -39,7 +39,7 @@ def unblock!
           @blocked_user.blocked = false
           @blocked_user.blocked_at = nil
           @blocked_user.block_id = nil
-          @blocked_user.name = @blocked_user.user_name
+          @blocked_user.name = @blocked_user.extended_data["user_name"]
           @blocked_user.save!
         end
       end
diff --git a/decidim-admin/app/commands/decidim/admin/unhide_resource.rb b/decidim-admin/app/commands/decidim/admin/unhide_resource.rb
index 0d0f498442926..a98d6c6b464d2 100644
--- a/decidim-admin/app/commands/decidim/admin/unhide_resource.rb
+++ b/decidim-admin/app/commands/decidim/admin/unhide_resource.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when a user hides a resource.
-    class UnhideResource < Rectify::Command
+    class UnhideResource < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::Reportable
diff --git a/decidim-admin/app/commands/decidim/admin/unofficialize_user.rb b/decidim-admin/app/commands/decidim/admin/unofficialize_user.rb
index a24232d6cf958..bad5fd843b467 100644
--- a/decidim-admin/app/commands/decidim/admin/unofficialize_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/unofficialize_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when unofficializing a user.
-    class UnofficializeUser < Rectify::Command
+    class UnofficializeUser < Decidim::Command
       # Public: Initializes the command.
       #
       # user - The user to be unofficialized.
diff --git a/decidim-admin/app/commands/decidim/admin/unpublish_component.rb b/decidim-admin/app/commands/decidim/admin/unpublish_component.rb
index 840378d984aee..a2761103a3558 100644
--- a/decidim-admin/app/commands/decidim/admin/unpublish_component.rb
+++ b/decidim-admin/app/commands/decidim/admin/unpublish_component.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command gets called when a component is unpublished from the admin panel.
-    class UnpublishComponent < Rectify::Command
+    class UnpublishComponent < Decidim::Command
       # Public: Initializes the command.
       #
       # component - The component to unpublish.
diff --git a/decidim-admin/app/commands/decidim/admin/unreport_resource.rb b/decidim-admin/app/commands/decidim/admin/unreport_resource.rb
index 0bfcec4623d3b..27fe8f8128ff7 100644
--- a/decidim-admin/app/commands/decidim/admin/unreport_resource.rb
+++ b/decidim-admin/app/commands/decidim/admin/unreport_resource.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when a user unreports a resource.
-    class UnreportResource < Rectify::Command
+    class UnreportResource < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::Reportable
diff --git a/decidim-admin/app/commands/decidim/admin/unreport_user.rb b/decidim-admin/app/commands/decidim/admin/unreport_user.rb
index 7f38fa417e200..028e4cce026ce 100644
--- a/decidim-admin/app/commands/decidim/admin/unreport_user.rb
+++ b/decidim-admin/app/commands/decidim/admin/unreport_user.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnreportUser < Rectify::Command
+    class UnreportUser < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::User - The user reported
diff --git a/decidim-admin/app/commands/decidim/admin/update_area.rb b/decidim-admin/app/commands/decidim/admin/update_area.rb
index b5a83c4740865..0a4a0d8c9cc62 100644
--- a/decidim-admin/app/commands/decidim/admin/update_area.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_area.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area.
-    class UpdateArea < Rectify::Command
+    class UpdateArea < Decidim::Command
       # Public: Initializes the command.
       #
       # area - The Area to update
diff --git a/decidim-admin/app/commands/decidim/admin/update_area_type.rb b/decidim-admin/app/commands/decidim/admin/update_area_type.rb
index 6b94bd7b2c489..3c655e5e5b716 100644
--- a/decidim-admin/app/commands/decidim/admin/update_area_type.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_area_type.rb
@@ -3,14 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area type.
-    class UpdateAreaType < Rectify::Command
+    class UpdateAreaType < Decidim::Command
       # Public: Initializes the command.
       #
       # area_type - The AreaType to update
       # form - A form object with the params.
-      def initialize(area_type, form)
+      def initialize(area_type, form, user)
         @area_type = area_type
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +32,11 @@ def call
       attr_reader :form
 
       def update_area_type
-        @area_type.update!(attributes)
+        Decidim.traceability.update!(
+          @area_type,
+          @user,
+          attributes
+        )
       end
 
       def attributes
diff --git a/decidim-admin/app/commands/decidim/admin/update_attachment.rb b/decidim-admin/app/commands/decidim/admin/update_attachment.rb
index b4a80e2110029..1b056806b1adf 100644
--- a/decidim-admin/app/commands/decidim/admin/update_attachment.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_attachment.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic to update an attachment from a
     # participatory process.
-    class UpdateAttachment < Rectify::Command
+    class UpdateAttachment < Decidim::Command
       include ::Decidim::AttachmentAttributesMethods
 
       attr_reader :attachment
@@ -13,9 +13,10 @@ class UpdateAttachment < Rectify::Command
       #
       # attachment - the Attachment to update
       # form - A form object with the params.
-      def initialize(attachment, form)
+      def initialize(attachment, form, user)
         @attachment = attachment
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -36,7 +37,7 @@ def call
       attr_reader :form
 
       def update_attachment
-        attachment.update!(attributes)
+        Decidim.traceability.update!(@attachment, @user, attributes)
       end
 
       def attributes
diff --git a/decidim-admin/app/commands/decidim/admin/update_attachment_collection.rb b/decidim-admin/app/commands/decidim/admin/update_attachment_collection.rb
index 325c6798c4cd7..17e27163513e3 100644
--- a/decidim-admin/app/commands/decidim/admin/update_attachment_collection.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_attachment_collection.rb
@@ -3,14 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an attachment collection.
-    class UpdateAttachmentCollection < Rectify::Command
+    class UpdateAttachmentCollection < Decidim::Command
       # Public: Initializes the command.
       #
       # attachment_collection - The AttachmentCollection to update
       # form - A form object with the params.
-      def initialize(attachment_collection, form)
+      def initialize(attachment_collection, form, user)
         @attachment_collection = attachment_collection
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +32,11 @@ def call
       attr_reader :form
 
       def update_attachment_collection
-        @attachment_collection.update!(attributes)
+        Decidim.traceability.update!(
+          @attachment_collection,
+          @user,
+          attributes
+        )
       end
 
       def attributes
diff --git a/decidim-admin/app/commands/decidim/admin/update_category.rb b/decidim-admin/app/commands/decidim/admin/update_category.rb
index f80988df780c8..3fca9e9286eaa 100644
--- a/decidim-admin/app/commands/decidim/admin/update_category.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_category.rb
@@ -4,16 +4,17 @@ module Decidim
   module Admin
     # A command with all the business logic when updating a category in the
     # system.
-    class UpdateCategory < Rectify::Command
+    class UpdateCategory < Decidim::Command
       attr_reader :category
 
       # Public: Initializes the command.
       #
       # category - the Category to update
       # form - A form object with the params.
-      def initialize(category, form)
+      def initialize(category, form, user)
         @category = category
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -34,15 +35,18 @@ def call
       attr_reader :form
 
       def update_category
-        category.update!(attributes)
+        Decidim.traceability.update!(
+          category,
+          @user,
+          attributes
+        )
       end
 
       def attributes
         {
           name: form.name,
           weight: form.weight,
-          parent_id: form.parent_id,
-          description: form.description
+          parent_id: form.parent_id
         }
       end
     end
diff --git a/decidim-admin/app/commands/decidim/admin/update_component.rb b/decidim-admin/app/commands/decidim/admin/update_component.rb
index 975bf993626e1..f011fb8545713 100644
--- a/decidim-admin/app/commands/decidim/admin/update_component.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_component.rb
@@ -3,17 +3,18 @@
 module Decidim
   module Admin
     # This command gets called when a component is created from the admin panel.
-    class UpdateComponent < Rectify::Command
+    class UpdateComponent < Decidim::Command
       attr_reader :form, :component, :previous_settings
 
       # Public: Initializes the command.
       #
       # form    - The form from which the data in this component comes from.
       # component - The component to update.
-      def initialize(form, component)
+      def initialize(form, component, user)
         @manifest = component.manifest
         @form = form
         @component = component
+        @user = user
       end
 
       # Public: Creates the Component.
@@ -22,9 +23,11 @@ def initialize(form, component)
       def call
         return broadcast(:invalid) if form.invalid?
 
-        transaction do
-          update_component
-          run_hooks
+        Decidim.traceability.perform_action!("update", @component, @user) do
+          transaction do
+            update_component
+            run_hooks
+          end
         end
 
         broadcast(:ok, settings_changed?, previous_settings, current_settings)
diff --git a/decidim-admin/app/commands/decidim/admin/update_component_permissions.rb b/decidim-admin/app/commands/decidim/admin/update_component_permissions.rb
index a9bf17af92585..e98321a3d1369 100644
--- a/decidim-admin/app/commands/decidim/admin/update_component_permissions.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_component_permissions.rb
@@ -4,16 +4,17 @@ module Decidim
   module Admin
     # This command gets called when permissions for a component are updated
     # in the admin panel.
-    class UpdateComponentPermissions < Rectify::Command
+    class UpdateComponentPermissions < Decidim::Command
       # Public: Initializes the command.
       #
       # form    - The form from which the data in this component comes from.
       # component - The component to update.
       # resource - The resource to update.
-      def initialize(form, component, resource)
+      def initialize(form, component, resource, user)
         @form = form
         @component = component
         @resource = resource
+        @user = user
       end
 
       # Public: Sets the permissions for a component.
@@ -22,9 +23,11 @@ def initialize(form, component, resource)
       def call
         return broadcast(:invalid) unless form.valid?
 
-        transaction do
-          update_permissions
-          run_hooks
+        Decidim.traceability.perform_action!("update_permissions", @component, @user) do
+          transaction do
+            update_permissions
+            run_hooks
+          end
         end
 
         broadcast(:ok)
@@ -45,7 +48,7 @@ def update_permissions
           handlers_content = {}
 
           selected_handlers(value).each do |handler_key|
-            opts = value.authorization_handlers_options[handler_key.to_sym]
+            opts = value.authorization_handlers_options[handler_key.to_s]
             handlers_content[handler_key] = opts ? { options: opts } : {}
           end
 
diff --git a/decidim-admin/app/commands/decidim/admin/update_content_block.rb b/decidim-admin/app/commands/decidim/admin/update_content_block.rb
index 09403f51e9a42..fae2ccdb1ed88 100644
--- a/decidim-admin/app/commands/decidim/admin/update_content_block.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_content_block.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This command gets called when a content block is updated from the admin
     # panel.
-    class UpdateContentBlock < Rectify::Command
+    class UpdateContentBlock < Decidim::Command
       attr_reader :form, :content_block, :scope
 
       # Public: Initializes the command.
diff --git a/decidim-admin/app/commands/decidim/admin/update_external_domain_whitelist.rb b/decidim-admin/app/commands/decidim/admin/update_external_domain_whitelist.rb
index 7b1a0f0312038..f1f571ca5c043 100644
--- a/decidim-admin/app/commands/decidim/admin/update_external_domain_whitelist.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_external_domain_whitelist.rb
@@ -2,18 +2,21 @@
 
 module Decidim
   module Admin
-    class UpdateExternalDomainWhitelist < Rectify::Command
+    class UpdateExternalDomainWhitelist < Decidim::Command
       attr_reader :form, :organization
 
-      def initialize(form, organization)
+      def initialize(form, organization, user)
         @form = form
         @organization = organization
+        @user = user
       end
 
       def call
         return broadcast(:invalid) if form.invalid?
 
-        save_domains!
+        Decidim.traceability.perform_action!("update_external_domain", @organization, @user) do
+          save_domains!
+        end
 
         broadcast(:ok)
       end
diff --git a/decidim-admin/app/commands/decidim/admin/update_help_sections.rb b/decidim-admin/app/commands/decidim/admin/update_help_sections.rb
index e50a4387a754a..3aafc5f232cd7 100644
--- a/decidim-admin/app/commands/decidim/admin/update_help_sections.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_help_sections.rb
@@ -4,10 +4,11 @@ module Decidim
   module Admin
     # This command gets called when a content block is updated from the admin
     # panel.
-    class UpdateHelpSections < Rectify::Command
-      def initialize(form, organization)
+    class UpdateHelpSections < Decidim::Command
+      def initialize(form, organization, user)
         @form = form
         @organization = organization
+        @user = user
       end
 
       def call
@@ -15,12 +16,25 @@ def call
 
         ActiveRecord::Base.transaction do
           @form.sections.each do |section|
-            ContextualHelpSection.set_content(@organization, section.id, section.content)
+            next unless content_has_changed?(section)
+
+            Decidim.traceability.perform_action!("update", ContextualHelpSection, @user, { "resource" => { "title" => section.id.humanize } }) do
+              ContextualHelpSection.set_content(@organization, section.id, section.content)
+              ContextualHelpSection.find_by(organization: @organization, section_id: section.id)
+            end
           end
         end
 
         broadcast(:ok)
       end
+
+      private
+
+      def content_has_changed?(section)
+        return if ContextualHelpSection.find_by(organization: @organization, section_id: section.id).nil? && section.content.compact_blank.blank?
+
+        section.content != ContextualHelpSection.find_content(@organization, section.id).except("machine_translations")
+      end
     end
   end
 end
diff --git a/decidim-admin/app/commands/decidim/admin/update_newsletter.rb b/decidim-admin/app/commands/decidim/admin/update_newsletter.rb
index 3c67fe24ffcb6..d21818e4f7ff8 100644
--- a/decidim-admin/app/commands/decidim/admin/update_newsletter.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_newsletter.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # Updates the newsletter given form data.
-    class UpdateNewsletter < Rectify::Command
+    class UpdateNewsletter < Decidim::Command
       # Initializes the command.
       #
       # newsletter - The Newsletter to update.
diff --git a/decidim-admin/app/commands/decidim/admin/update_organization.rb b/decidim-admin/app/commands/decidim/admin/update_organization.rb
index 8d4e6199f2a97..9ad3e34ea9030 100644
--- a/decidim-admin/app/commands/decidim/admin/update_organization.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_organization.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic for updating the current
     # organization.
-    class UpdateOrganization < Rectify::Command
+    class UpdateOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - The Organization that will be updated.
diff --git a/decidim-admin/app/commands/decidim/admin/update_organization_appearance.rb b/decidim-admin/app/commands/decidim/admin/update_organization_appearance.rb
index c0c043bf910ab..e73fcb84cf8bc 100644
--- a/decidim-admin/app/commands/decidim/admin/update_organization_appearance.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_organization_appearance.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic for updating the current
     # organization appearance.
-    class UpdateOrganizationAppearance < Rectify::Command
+    class UpdateOrganizationAppearance < Decidim::Command
       include ::Decidim::AttachmentAttributesMethods
 
       # Public: Initializes the command.
diff --git a/decidim-admin/app/commands/decidim/admin/update_organization_tos_version.rb b/decidim-admin/app/commands/decidim/admin/update_organization_tos_version.rb
index ca661d88ef60b..0d5941d56f99b 100644
--- a/decidim-admin/app/commands/decidim/admin/update_organization_tos_version.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_organization_tos_version.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with the business logic for updating the current
     # organization tos_version attribute.
-    class UpdateOrganizationTosVersion < Rectify::Command
+    class UpdateOrganizationTosVersion < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - The Organization that will be updated.
diff --git a/decidim-admin/app/commands/decidim/admin/update_resource_permissions.rb b/decidim-admin/app/commands/decidim/admin/update_resource_permissions.rb
index faa01150e318b..145714887d5b4 100644
--- a/decidim-admin/app/commands/decidim/admin/update_resource_permissions.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_resource_permissions.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This command gets called when permissions for a resource not related with
     # a component are updated in the admin panel.
-    class UpdateResourcePermissions < Rectify::Command
+    class UpdateResourcePermissions < Decidim::Command
       # Public: Initializes the command.
       #
       # form     - The form from which the data in this resource comes from.
@@ -40,7 +40,7 @@ def configured_permissions
       def update_permissions
         permissions = configured_permissions.inject({}) do |result, (key, value)|
           handlers_content = selected_handlers(value).inject({}) do |handlers_content_result, handler_key|
-            opts = value.authorization_handlers_options[handler_key.to_sym]
+            opts = value.authorization_handlers_options[handler_key.to_s]
 
             handlers_content_result.update(handler_key => opts ? { options: opts } : {})
           end
diff --git a/decidim-admin/app/commands/decidim/admin/update_scope.rb b/decidim-admin/app/commands/decidim/admin/update_scope.rb
index d1d35b9348ee9..795b65c607745 100644
--- a/decidim-admin/app/commands/decidim/admin/update_scope.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_scope.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a scope.
-    class UpdateScope < Rectify::Command
+    class UpdateScope < Decidim::Command
       # Public: Initializes the command.
       #
       # scope - The Scope to update
diff --git a/decidim-admin/app/commands/decidim/admin/update_scope_type.rb b/decidim-admin/app/commands/decidim/admin/update_scope_type.rb
index 48ae773b7bad0..21ac9dbfb75d9 100644
--- a/decidim-admin/app/commands/decidim/admin/update_scope_type.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_scope_type.rb
@@ -3,14 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a scope type.
-    class UpdateScopeType < Rectify::Command
+    class UpdateScopeType < Decidim::Command
       # Public: Initializes the command.
       #
       # scope_type - The ScopeType to update
       # form - A form object with the params.
-      def initialize(scope_type, form)
+      def initialize(scope_type, form, user)
         @scope_type = scope_type
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +32,11 @@ def call
       attr_reader :form
 
       def update_scope_type
-        @scope_type.update!(attributes)
+        Decidim.traceability.update!(
+          @scope_type,
+          @user,
+          attributes
+        )
       end
 
       def attributes
diff --git a/decidim-admin/app/commands/decidim/admin/update_static_page.rb b/decidim-admin/app/commands/decidim/admin/update_static_page.rb
index f1fa45f22b98a..f9472fa735a21 100644
--- a/decidim-admin/app/commands/decidim/admin/update_static_page.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_static_page.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a static page.
-    class UpdateStaticPage < Rectify::Command
+    class UpdateStaticPage < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPage to update
diff --git a/decidim-admin/app/commands/decidim/admin/update_static_page_topic.rb b/decidim-admin/app/commands/decidim/admin/update_static_page_topic.rb
index fc88753f3379b..30f42dbade10b 100644
--- a/decidim-admin/app/commands/decidim/admin/update_static_page_topic.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_static_page_topic.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a static page topic.
-    class UpdateStaticPageTopic < Rectify::Command
+    class UpdateStaticPageTopic < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPageTopic to update
diff --git a/decidim-admin/app/commands/decidim/admin/update_user_groups.rb b/decidim-admin/app/commands/decidim/admin/update_user_groups.rb
index cea8ec4eb886c..667e8b3d4a290 100644
--- a/decidim-admin/app/commands/decidim/admin/update_user_groups.rb
+++ b/decidim-admin/app/commands/decidim/admin/update_user_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a usergroup.
-    class UpdateUserGroups < Rectify::Command
+    class UpdateUserGroups < Decidim::Command
       # Public: Initializes the command.
       #
       # scope - The Scope to update
diff --git a/decidim-admin/app/commands/decidim/admin/verify_user_group.rb b/decidim-admin/app/commands/decidim/admin/verify_user_group.rb
index 4c68d3f910298..e97c47e81f333 100644
--- a/decidim-admin/app/commands/decidim/admin/verify_user_group.rb
+++ b/decidim-admin/app/commands/decidim/admin/verify_user_group.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when verifying a user_group.
-    class VerifyUserGroup < Rectify::Command
+    class VerifyUserGroup < Decidim::Command
       # Public: Initializes the command.
       #
       # user_group - The user_group to verify
diff --git a/decidim-admin/app/controllers/concerns/decidim/admin/filterable.rb b/decidim-admin/app/controllers/concerns/decidim/admin/filterable.rb
index a0e0a677f67c4..f462d1fbcf15f 100644
--- a/decidim-admin/app/controllers/concerns/decidim/admin/filterable.rb
+++ b/decidim-admin/app/controllers/concerns/decidim/admin/filterable.rb
@@ -31,7 +31,7 @@ module Filterable
         delegate :scopes, to: :current_organization
 
         def query
-          @query ||= base_query.ransack(ransack_params)
+          @query ||= base_query.ransack(ransack_params, search_context: :admin, auth_object: current_user)
         end
 
         private
diff --git a/decidim-admin/app/controllers/concerns/decidim/admin/participatory_space_export.rb b/decidim-admin/app/controllers/concerns/decidim/admin/participatory_space_export.rb
index 1ae5086f94744..0012b968149f1 100644
--- a/decidim-admin/app/controllers/concerns/decidim/admin/participatory_space_export.rb
+++ b/decidim-admin/app/controllers/concerns/decidim/admin/participatory_space_export.rb
@@ -11,7 +11,9 @@ module ParticipatorySpaceExport
         def create
           enforce_permission_to :create, :export_space, participatory_space: exportable_space
 
-          ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, manifest_name, default_format)
+          Decidim.traceability.perform_action!("export", exportable_space, current_user) do
+            ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, manifest_name, default_format)
+          end
 
           flash[:notice] = t("decidim.admin.exports.notice")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/application_controller.rb b/decidim-admin/app/controllers/decidim/admin/application_controller.rb
index 1863ac08fae58..512c674ebd06d 100644
--- a/decidim-admin/app/controllers/decidim/admin/application_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/application_controller.rb
@@ -6,6 +6,7 @@ module Admin
     class ApplicationController < ::DecidimController
       include NeedsOrganization
       include NeedsPermission
+      include NeedsPasswordChange
       include NeedsSnippets
       include FormFactory
       include LocaleSwitcher
diff --git a/decidim-admin/app/controllers/decidim/admin/area_types_controller.rb b/decidim-admin/app/controllers/decidim/admin/area_types_controller.rb
index 0f30eadfc003f..076ac24e5774a 100644
--- a/decidim-admin/app/controllers/decidim/admin/area_types_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/area_types_controller.rb
@@ -21,7 +21,7 @@ def create
         enforce_permission_to :create, :area_type
         @form = form(AreaTypeForm).from_params(params)
 
-        CreateAreaType.call(@form) do
+        CreateAreaType.call(@form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.create.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -43,7 +43,7 @@ def update
         enforce_permission_to :update, :area_type, area_type: area_type
         @form = form(AreaTypeForm).from_params(params)
 
-        UpdateAreaType.call(area_type, @form) do
+        UpdateAreaType.call(area_type, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.update.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -58,7 +58,10 @@ def update
 
       def destroy
         enforce_permission_to :destroy, :area_type, area_type: area_type
-        area_type.destroy!
+
+        Decidim.traceability.perform_action!("delete", area_type, current_user) do
+          area_type.destroy!
+        end
 
         flash[:notice] = I18n.t("area_types.destroy.success", scope: "decidim.admin")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb b/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
index e9554bd4e2b1e..4f3a282c21715 100644
--- a/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/block_user_controller.rb
@@ -21,7 +21,7 @@ def create
         BlockUser.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("officializations.block.success", scope: "decidim.admin")
-            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+            redirect_to moderated_users_path(blocked: true)
           end
 
           on(:invalid) do
@@ -44,13 +44,13 @@ def destroy
           end
         end
 
-        redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+        redirect_to moderated_users_path(blocked: false)
       end
 
       private
 
       def user
-        @user ||= Decidim::User.find_by(
+        @user ||= Decidim::UserBaseEntity.find_by(
           id: params[:user_id],
           organization: current_organization
         )
diff --git a/decidim-admin/app/controllers/decidim/admin/categories_controller.rb b/decidim-admin/app/controllers/decidim/admin/categories_controller.rb
index fbb7148c819e3..91fc880ccb648 100644
--- a/decidim-admin/app/controllers/decidim/admin/categories_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/categories_controller.rb
@@ -21,7 +21,7 @@ def create
         enforce_permission_to :create, :category
         @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        CreateCategory.call(@form, current_participatory_space) do
+        CreateCategory.call(@form, current_participatory_space, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)
@@ -45,7 +45,7 @@ def update
         enforce_permission_to :update, :category, category: @category
         @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        UpdateCategory.call(@category, @form) do
+        UpdateCategory.call(@category, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
             redirect_to categories_path(current_participatory_space)
@@ -67,7 +67,7 @@ def destroy
         @category = collection.find(params[:id])
         enforce_permission_to :destroy, :category, category: @category
 
-        DestroyCategory.call(@category) do
+        DestroyCategory.call(@category, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.destroy.success", scope: "decidim.admin")
           end
diff --git a/decidim-admin/app/controllers/decidim/admin/component_permissions_controller.rb b/decidim-admin/app/controllers/decidim/admin/component_permissions_controller.rb
index 2ba502e6bc574..5ec9c72d4b00a 100644
--- a/decidim-admin/app/controllers/decidim/admin/component_permissions_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/component_permissions_controller.rb
@@ -20,7 +20,7 @@ def update
         enforce_permission_to :update, :component, component: component
         @permissions_form = PermissionsForm.from_params(params)
 
-        UpdateComponentPermissions.call(@permissions_form, component, resource) do
+        UpdateComponentPermissions.call(@permissions_form, component, resource, current_user) do
           on(:ok) do
             flash[:notice] = t("component_permissions.update.success", scope: "decidim.admin")
             redirect_to return_path
diff --git a/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb b/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
index 2e3313fddfa67..66f5129f662c6 100644
--- a/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/components/base_controller.rb
@@ -15,6 +15,7 @@ class BaseController < Decidim::Admin::ApplicationController
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
         helper Decidim::Admin::ImportsHelper
+        helper Decidim::Admin::RemindersHelper
         helper Decidim::Admin::BulkActionsHelper
         helper Decidim::Admin::ResourcePermissionsHelper
 
diff --git a/decidim-admin/app/controllers/decidim/admin/components_controller.rb b/decidim-admin/app/controllers/decidim/admin/components_controller.rb
index da6a071e112f7..09b7134477bfa 100644
--- a/decidim-admin/app/controllers/decidim/admin/components_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/components_controller.rb
@@ -58,7 +58,7 @@ def update
         @form = form(@component.form_class).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
-        UpdateComponent.call(@form, @component) do
+        UpdateComponent.call(@form, @component, current_user) do
           on(:ok) do |settings_changed, previous_settings, current_settings|
             handle_component_settings_change(previous_settings, current_settings) if settings_changed
 
diff --git a/decidim-admin/app/controllers/decidim/admin/concerns/has_attachment_collections.rb b/decidim-admin/app/controllers/decidim/admin/concerns/has_attachment_collections.rb
index 6e3bd70a84ed0..f9374e796ef56 100644
--- a/decidim-admin/app/controllers/decidim/admin/concerns/has_attachment_collections.rb
+++ b/decidim-admin/app/controllers/decidim/admin/concerns/has_attachment_collections.rb
@@ -31,7 +31,7 @@ def create
             enforce_permission_to :create, :attachment_collection
             @form = form(AttachmentCollectionForm).from_params(params, collection_for: collection_for)
 
-            CreateAttachmentCollection.call(@form, collection_for) do
+            CreateAttachmentCollection.call(@form, collection_for, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachment_collections.create.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -56,7 +56,7 @@ def update
             enforce_permission_to :update, :attachment_collection, attachment_collection: @attachment_collection
             @form = form(AttachmentCollectionForm).from_params(params, collection_for: collection_for)
 
-            UpdateAttachmentCollection.call(@attachment_collection, @form) do
+            UpdateAttachmentCollection.call(@attachment_collection, @form, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachment_collections.update.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -78,7 +78,10 @@ def show
           def destroy
             @attachment_collection = collection.find(params[:id])
             enforce_permission_to :destroy, :attachment_collection, attachment_collection: @attachment_collection
-            @attachment_collection.destroy!
+
+            Decidim.traceability.perform_action!("delete", @attachment_collection, current_user) do
+              @attachment_collection.destroy!
+            end
 
             flash[:notice] = I18n.t("attachment_collections.destroy.success", scope: "decidim.admin")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb b/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb
index 98089b682118b..71d01c3628d56 100644
--- a/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb
+++ b/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb
@@ -31,7 +31,7 @@ def create
             enforce_permission_to :create, :attachment, attached_to: attached_to
             @form = form(::Decidim::Admin::AttachmentForm).from_params(params, attached_to: attached_to)
 
-            CreateAttachment.call(@form, attached_to) do
+            CreateAttachment.call(@form, attached_to, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachments.create.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -56,7 +56,7 @@ def update
             enforce_permission_to :update, :attachment, attachment: attachment
             @form = form(::Decidim::Admin::AttachmentForm).from_params(attachment_params, attached_to: attached_to)
 
-            UpdateAttachment.call(@attachment, @form) do
+            UpdateAttachment.call(@attachment, @form, current_user) do
               on(:ok) do
                 flash[:notice] = I18n.t("attachments.update.success", scope: "decidim.admin")
                 redirect_to action: :index
@@ -78,7 +78,10 @@ def show
           def destroy
             @attachment = collection.find(params[:id])
             enforce_permission_to :destroy, :attachment, attachment: attachment
-            @attachment.destroy!
+
+            Decidim.traceability.perform_action!("delete", @attachment, current_user) do
+              @attachment.destroy!
+            end
 
             flash[:notice] = I18n.t("attachments.destroy.success", scope: "decidim.admin")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb b/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb
index 1538fae9061ed..ba85559e2d84b 100644
--- a/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb
+++ b/decidim-admin/app/controllers/decidim/admin/concerns/has_private_users_csv_import.rb
@@ -18,6 +18,7 @@ module HasPrivateUsersCsvImport
           def new
             enforce_permission_to :csv_import, :space_private_user
             @form = form(ParticipatorySpacePrivateUserCsvImportForm).from_params({}, privatable_to: privatable_to)
+            @count = Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).count
             render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
           end
 
@@ -38,6 +39,12 @@ def create
             end
           end
 
+          def destroy_all
+            enforce_permission_to :csv_import, :space_private_user
+            Decidim::ParticipatorySpacePrivateUser.by_participatory_space(privatable_to).delete_all
+            redirect_to new_participatory_space_private_users_csv_imports_path
+          end
+
           # Public: Returns a String or Object that will be passed to `redirect_to` after
           # importing private users. By default it redirects to the privatable_to.
           #
diff --git a/decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb b/decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb
index 9402a0c3c4864..f3112ebebf7b6 100644
--- a/decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/dashboard_controller.rb
@@ -27,7 +27,8 @@ def latest_action_logs
       def metrics_presenter
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: true,
-          organization: current_organization
+          organization: current_organization,
+          view_context: view_context
         )
       end
 
@@ -37,10 +38,10 @@ def users_counter
         last_month = Time.zone.today.prev_month
 
         {
-          total_admins_last_24: users_count(last_day, true),
+          total_admins_last_day: users_count(last_day, true),
           total_admins_last_week: users_count(last_week, true),
           total_admins_last_month: users_count(last_month, true),
-          total_participants_last_24: users_count(last_day, false),
+          total_participants_last_day: users_count(last_day, false),
           total_participants_last_week: users_count(last_week, false),
           total_participants_last_month: users_count(last_month, false)
         }
diff --git a/decidim-admin/app/controllers/decidim/admin/exports_controller.rb b/decidim-admin/app/controllers/decidim/admin/exports_controller.rb
index b669293837fcc..069df07976239 100644
--- a/decidim-admin/app/controllers/decidim/admin/exports_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/exports_controller.rb
@@ -9,7 +9,10 @@ class ExportsController < Decidim::Admin::ApplicationController
       def create
         enforce_permission_to :export, :component_data, component: component
         name = params[:id]
-        ExportJob.perform_later(current_user, component, name, params[:format] || default_format, params[:resource_id].presence)
+
+        Decidim.traceability.perform_action!("export_component", component, current_user, { name: name, format: params[:format] || default_format }) do
+          ExportJob.perform_later(current_user, component, name, params[:format] || default_format, params[:resource_id].presence)
+        end
 
         flash[:notice] = t("decidim.admin.exports.notice")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/help_sections_controller.rb b/decidim-admin/app/controllers/decidim/admin/help_sections_controller.rb
index a55185867ade8..f16c9d6268c70 100644
--- a/decidim-admin/app/controllers/decidim/admin/help_sections_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/help_sections_controller.rb
@@ -25,7 +25,7 @@ def update
           params[:help_sections]
         )
 
-        UpdateHelpSections.call(@form, current_organization) do
+        UpdateHelpSections.call(@form, current_organization, current_user) do
           on(:ok) do
             flash[:notice] = t("help_sections.success", scope: "decidim.admin")
             redirect_to action: :show
diff --git a/decidim-admin/app/controllers/decidim/admin/metrics_controller.rb b/decidim-admin/app/controllers/decidim/admin/metrics_controller.rb
index ae57abb8a67dc..8fc6154509869 100644
--- a/decidim-admin/app/controllers/decidim/admin/metrics_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/metrics_controller.rb
@@ -14,7 +14,8 @@ def index
       def metrics_presenter
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: false,
-          organization: current_organization
+          organization: current_organization,
+          view_context: view_context
         )
       end
     end
diff --git a/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb b/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb
index 048f46a2307c2..b7cb95b2f7df6 100644
--- a/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb
@@ -67,16 +67,18 @@ def unhide
 
       private
 
+      def ransack_params
+        query_params[:q] || { s: "created_at desc" }
+      end
+
       # Private: This method is used by the `Filterable` concern as the base query
       #          without applying filtering and/or sorting options.
       def collection
-        @collection ||= begin
-          if params[:hidden]
-            participatory_space_moderations.hidden
-          else
-            participatory_space_moderations.not_hidden
-          end
-        end
+        @collection ||= if params[:hidden]
+                          participatory_space_moderations.hidden
+                        else
+                          participatory_space_moderations.not_hidden
+                        end
       end
 
       # Private: Returns a collection of `Moderation` filtered and/or sorted by
diff --git a/decidim-admin/app/controllers/decidim/admin/newsletter_templates_controller.rb b/decidim-admin/app/controllers/decidim/admin/newsletter_templates_controller.rb
index fb3bc271df601..ec717d5f41a67 100644
--- a/decidim-admin/app/controllers/decidim/admin/newsletter_templates_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/newsletter_templates_controller.rb
@@ -15,7 +15,7 @@ def index
       def show; end
 
       def preview
-        email = NewsletterMailer.newsletter(current_user, fake_newsletter)
+        email = NewsletterMailer.newsletter(current_user, fake_newsletter, preview: true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end
diff --git a/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb b/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
index 8ffbc5f9e9701..0c157ac40660b 100644
--- a/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb
@@ -28,7 +28,7 @@ def show
       def preview
         enforce_permission_to :read, :newsletter, newsletter: newsletter
 
-        email = NewsletterMailer.newsletter(current_user, newsletter)
+        email = NewsletterMailer.newsletter(current_user, newsletter, preview: true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end
diff --git a/decidim-admin/app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb b/decidim-admin/app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
index 1bc833673808b..da541cb443697 100644
--- a/decidim-admin/app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
@@ -16,7 +16,7 @@ def update
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationExternalDomainWhitelistForm).from_params(params)
 
-        UpdateExternalDomainWhitelist.call(@form, current_organization) do
+        UpdateExternalDomainWhitelist.call(@form, current_organization, current_user) do
           on(:ok) do
             flash[:notice] = t("domain_whitelist.update.success", scope: "decidim.admin")
             redirect_to edit_organization_external_domain_whitelist_path
diff --git a/decidim-admin/app/controllers/decidim/admin/reminders_controller.rb b/decidim-admin/app/controllers/decidim/admin/reminders_controller.rb
new file mode 100644
index 0000000000000..57b5065810788
--- /dev/null
+++ b/decidim-admin/app/controllers/decidim/admin/reminders_controller.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class RemindersController < Admin::ApplicationController
+      include Decidim::ComponentPathHelper
+
+      helper_method :reminder_manifest
+
+      def new
+        enforce_permission_to :create, :reminder
+
+        @form = reminder_form_from_params(name: reminder_manifest.name)
+        render :new
+      end
+
+      def create
+        enforce_permission_to :create, :reminder
+
+        @form = reminder_form_from_params(params)
+
+        command_class.call(@form) do
+          on(:ok) do |reminders_queued|
+            flash[:notice] = t("decidim.admin.reminders.create.success", count: reminders_queued)
+            redirect_to manage_component_path(current_component)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = t("decidim.admin.reminders.create.error")
+            render :new
+          end
+        end
+      end
+
+      private
+
+      def reminder_form_from_params(params)
+        form(reminder_manifest.form_class).from_params(
+          params,
+          current_component: current_component
+        )
+      end
+
+      def reminder_manifest
+        @reminder_manifest ||= Decidim.reminders_registry.for(reminder_name)
+      end
+
+      def reminder_name
+        params[:name]
+      end
+
+      def command_class
+        reminder_manifest.command_class
+      end
+
+      def current_component
+        @current_component ||= current_participatory_space.components.find(params[:component_id])
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/controllers/decidim/admin/resource_permissions_controller.rb b/decidim-admin/app/controllers/decidim/admin/resource_permissions_controller.rb
index 28a9cca29803b..8a496f9cf419b 100644
--- a/decidim-admin/app/controllers/decidim/admin/resource_permissions_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/resource_permissions_controller.rb
@@ -47,8 +47,8 @@ def resource_symbol
       def permission_forms
         actions.inject({}) do |result, action|
           form = PermissionForm.new(
-            authorization_handlers: authorizations_for(action),
-            authorizations_handlers_options: options_for(action)
+            authorization_handlers: authorizations_for(action).keys,
+            authorization_handlers_options: options_for(action)
           )
 
           result.update(action => form)
diff --git a/decidim-admin/app/controllers/decidim/admin/scope_types_controller.rb b/decidim-admin/app/controllers/decidim/admin/scope_types_controller.rb
index d1d8ec4fa18c3..dbbf09921ccc4 100644
--- a/decidim-admin/app/controllers/decidim/admin/scope_types_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/scope_types_controller.rb
@@ -21,7 +21,7 @@ def create
         enforce_permission_to :create, :scope_type
         @form = form(ScopeTypeForm).from_params(params)
 
-        CreateScopeType.call(@form) do
+        CreateScopeType.call(@form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("scope_types.create.success", scope: "decidim.admin")
             redirect_to scope_types_path
@@ -43,7 +43,7 @@ def update
         enforce_permission_to :update, :scope_type, scope_type: scope_type
         @form = form(ScopeTypeForm).from_params(params)
 
-        UpdateScopeType.call(scope_type, @form) do
+        UpdateScopeType.call(scope_type, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("scope_types.update.success", scope: "decidim.admin")
             redirect_to scope_types_path
@@ -58,7 +58,10 @@ def update
 
       def destroy
         enforce_permission_to :destroy, :scope_type, scope_type: scope_type
-        scope_type.destroy!
+
+        Decidim.traceability.perform_action!("delete", scope_type, current_user) do
+          scope_type.destroy!
+        end
 
         flash[:notice] = I18n.t("scope_types.destroy.success", scope: "decidim.admin")
 
diff --git a/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb b/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb
index 4966283313470..21976e00938ec 100644
--- a/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb
+++ b/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb
@@ -82,13 +82,7 @@ def form_params
         form_params = params.to_unsafe_hash
         form_params["static_page"] ||= {}
         form_params["static_page"]["organization"] = current_organization
-        form_params["static_page"]["allow_public_access"] ||= begin
-          if page
-            page.allow_public_access
-          else
-            false
-          end
-        end
+        form_params["static_page"]["allow_public_access"] ||= page ? page.allow_public_access : false
 
         return form_params unless page
 
diff --git a/decidim-admin/app/forms/decidim/admin/block_user_form.rb b/decidim-admin/app/forms/decidim/admin/block_user_form.rb
index 451ffcac30e5a..f43e92fa8b7e2 100644
--- a/decidim-admin/app/forms/decidim/admin/block_user_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/block_user_form.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # A form object used to officialize users from the admin dashboard.
+    # A form object used to block users or user groups on the admin dashboard.
     class BlockUserForm < Form
       attribute :user_id, Integer
       attribute :justification, String
@@ -15,7 +15,7 @@ def map_model(user)
       end
 
       def user
-        @user ||= Decidim::User.find_by(
+        @user ||= Decidim::UserBaseEntity.find_by(
           id: user_id,
           organization: current_organization
         )
diff --git a/decidim-admin/app/forms/decidim/admin/category_form.rb b/decidim-admin/app/forms/decidim/admin/category_form.rb
index 7819ace8f3162..597b4716126ee 100644
--- a/decidim-admin/app/forms/decidim/admin/category_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/category_form.rb
@@ -9,12 +9,11 @@ class CategoryForm < Form
 
       translatable_attribute :name, String
       attribute :weight, Integer, default: 0
-      translatable_attribute :description, String
       attribute :parent_id, Integer
 
       mimic :category
 
-      validates :name, :description, translatable_presence: true
+      validates :name, translatable_presence: true
       validates :parent_id, inclusion: { in: :parent_categories_ids }, allow_blank: true
 
       delegate :current_participatory_space, to: :context, prefix: false
diff --git a/decidim-admin/app/forms/decidim/admin/component_form.rb b/decidim-admin/app/forms/decidim/admin/component_form.rb
index 8ad8cd2f62fde..aabd19fc23574 100644
--- a/decidim-admin/app/forms/decidim/admin/component_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/component_form.rb
@@ -21,10 +21,12 @@ class ComponentForm < Decidim::Form
 
       attribute :settings, Object
       attribute :default_step_settings, Object
-      attribute :step_settings, Hash[String => Object]
+      attribute(:step_settings, { String => Object })
 
       attribute :share_tokens, Array[ShareToken]
 
+      validate :validate_settings, :validate_step_settings
+
       def settings?
         settings.manifest.attributes.any?
       end
@@ -39,13 +41,20 @@ def map_model(model)
 
       private
 
-      # Overwrites Rectify::Form#form_attributes_valid? to validate nested `step_settings` attributes.
-      def form_attributes_valid?
-        return false unless errors.empty? && settings_errors_empty? # Preserves errors from custom validation methods
+      def validate_settings
+        return unless errors.empty? && settings_errors_empty? # Preserves errors from custom validation methods
+
+        attributes.each do |key, value|
+          next unless value.respond_to?(:valid?)
+
+          errors.add(key, :invalid) unless value.valid?
+        end
+      end
+
+      def validate_step_settings
+        return unless step_settings.respond_to?(:attributes)
 
-        attributes_that_respond_to(:valid?).concat(
-          step_settings.each_value.select { |attribute| attribute.respond_to?(:valid?) }
-        ).all?(&:valid?)
+        errors.add(:step_settings, :invalid) unless step_settings.attributes.values.all? { |v| !v.respond_to?(:valid?) || v.valid? }
       end
 
       def settings_errors_empty?
diff --git a/decidim-admin/app/forms/decidim/admin/import_example_form.rb b/decidim-admin/app/forms/decidim/admin/import_example_form.rb
index bcece5da6b487..fb56a41b7fea6 100644
--- a/decidim-admin/app/forms/decidim/admin/import_example_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/import_example_form.rb
@@ -35,11 +35,7 @@ def example_data
       end
 
       def reader
-        @reader ||= begin
-          return unless reader_klass
-
-          reader_klass.new("/dev/null")
-        end
+        @reader ||= reader_klass ? reader_klass.new("/dev/null") : nil
       end
 
       def reader_klass
diff --git a/decidim-admin/app/forms/decidim/admin/import_form.rb b/decidim-admin/app/forms/decidim/admin/import_form.rb
index 6181657402f85..5ab5f44803e59 100644
--- a/decidim-admin/app/forms/decidim/admin/import_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/import_form.rb
@@ -5,9 +5,10 @@ module Admin
     class ImportForm < Form
       ACCEPTED_MIME_TYPES = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES
       include Decidim::HasUploadValidations
+      include Decidim::ProcessesFileLocally
 
       attribute :name, String
-      attribute :file
+      attribute :file, Decidim::Attributes::Blob
 
       validates :file, presence: true
       validates :name, presence: true
@@ -16,7 +17,7 @@ class ImportForm < Form
       validate :verify_import, if: -> { file.present? && accepted_mime_type? && !importer.invalid_file? }
 
       def importer
-        @importer ||= importer_for(file_path, mime_type)
+        @importer ||= importer_for(file, mime_type)
       end
 
       private
@@ -44,15 +45,11 @@ def check_invalid_file
       def verify_import
         return if importer.verify
 
-        importer.errors.each do |_col, message|
-          errors.add(:file, message)
+        importer.errors.each do |error|
+          errors.add(:file, error.message)
         end
       end
 
-      def file_path
-        file&.path
-      end
-
       def mime_type
         file&.content_type
       end
@@ -61,9 +58,9 @@ def creator_class
         manifest.creator
       end
 
-      def importer_for(filepath, mime_type)
+      def importer_for(path, mime_type)
         Import::ImporterFactory.build(
-          filepath,
+          path,
           mime_type,
           context: importer_context,
           creator: creator_class
diff --git a/decidim-admin/app/forms/decidim/admin/managed_user_promotion_form.rb b/decidim-admin/app/forms/decidim/admin/managed_user_promotion_form.rb
index 5ead30aaf6d11..d6fdc01a0277b 100644
--- a/decidim-admin/app/forms/decidim/admin/managed_user_promotion_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/managed_user_promotion_form.rb
@@ -7,7 +7,7 @@ module Admin
     class ManagedUserPromotionForm < Form
       attribute :email, String
 
-      validates :email, presence: true, 'valid_email_2/email': { disposable: true }
+      validates :email, presence: true, "valid_email_2/email": { disposable: true }
       validate :unique_email
 
       private
diff --git a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb b/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
index 9cf8fd11d1fe5..94a3ba9d00919 100644
--- a/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
@@ -8,20 +8,25 @@ module Admin
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
       include Decidim::HasUploadValidations
+      include Decidim::ProcessesFileLocally
 
-      attribute :file
+      attribute :file, Decidim::Attributes::Blob
       attribute :user_name, String
       attribute :email, String
 
-      validates :file, presence: true
+      validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
       validate :validate_csv
 
       def validate_csv
         return if file.blank?
 
-        CSV.foreach(file.path) do |_email, user_name|
-          errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+        process_file_locally(file) do |file_path|
+          CSV.foreach(file_path, encoding: "BOM|UTF-8") do |_email, user_name|
+            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+          end
         end
+      rescue CSV::MalformedCSVError
+        errors.add(:file, :malformed)
       end
     end
   end
diff --git a/decidim-admin/app/forms/decidim/admin/permission_form.rb b/decidim-admin/app/forms/decidim/admin/permission_form.rb
index cf3e75febf591..bc1daf32956b9 100644
--- a/decidim-admin/app/forms/decidim/admin/permission_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/permission_form.rb
@@ -4,15 +4,21 @@ module Decidim
   module Admin
     # This form handles permissions for a particular action in the admin panel.
     class PermissionForm < Form
-      attribute :authorization_handlers, Hash
-      attribute :authorization_handlers_options, Hash
+      attribute :authorization_handlers, Array[String]
+      attribute(:authorization_handlers_options, { String => Object })
+
+      def authorization_handlers
+        handlers = super || []
+
+        handlers.index_with { |name| { "options" => authorization_handler_options(name) } }
+      end
 
       def authorization_handlers_names
         authorization_handlers.keys.map(&:to_s)
       end
 
       def authorization_handler_options(handler_name)
-        find_handler(handler_name)&.dig("options") || {}
+        authorization_handlers_options&.dig(handler_name.to_s) || {}
       end
 
       def manifest(handler_name)
@@ -33,11 +39,6 @@ def options_attributes(handler_name)
       def options_manifest(handler_name)
         manifest(handler_name).options
       end
-
-      def find_handler(handler_name)
-        authorization_handlers[handler_name.to_s] ||
-          authorization_handlers[handler_name.to_sym]
-      end
     end
   end
 end
diff --git a/decidim-admin/app/forms/decidim/admin/permissions_form.rb b/decidim-admin/app/forms/decidim/admin/permissions_form.rb
index 8094f3de9ec40..e4d9b6837fa6e 100644
--- a/decidim-admin/app/forms/decidim/admin/permissions_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/permissions_form.rb
@@ -7,16 +7,7 @@ module Admin
     class PermissionsForm < Form
       mimic :component_permissions
 
-      attribute :permissions, Hash[String => PermissionForm]
-
-      private
-
-      # Overriding Rectify::Form#form_attributes_valid? to preserve errors from custom method validations.
-      def form_attributes_valid?
-        return false unless errors.empty? && permissions.each_value.map(&:errors).all?(&:empty?)
-
-        super && permissions.values.all?(&:valid?)
-      end
+      attribute(:permissions, { String => PermissionForm })
     end
   end
 end
diff --git a/decidim-admin/app/forms/decidim/admin/user_group_csv_verification_form.rb b/decidim-admin/app/forms/decidim/admin/user_group_csv_verification_form.rb
index 208314ec5b04f..25d2add0ce8c8 100644
--- a/decidim-admin/app/forms/decidim/admin/user_group_csv_verification_form.rb
+++ b/decidim-admin/app/forms/decidim/admin/user_group_csv_verification_form.rb
@@ -6,10 +6,20 @@ module Admin
     #
     class UserGroupCsvVerificationForm < Form
       include Decidim::HasUploadValidations
+      include Decidim::ProcessesFileLocally
 
-      attribute :file
+      attribute :file, Decidim::Attributes::Blob
 
-      validates :file, presence: true
+      validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
+      validate :validate_csv, unless: ->(f) { f.file.blank? }
+
+      def validate_csv
+        process_file_locally(file) do |file_path|
+          CSV.open(file_path, &:readline)
+        end
+      rescue CSV::MalformedCSVError
+        errors.add(:file, :malformed)
+      end
     end
   end
 end
diff --git a/decidim-admin/app/helpers/decidim/admin/bulk_actions_helper.rb b/decidim-admin/app/helpers/decidim/admin/bulk_actions_helper.rb
index a71ec2694802c..1c37e77664e57 100644
--- a/decidim-admin/app/helpers/decidim/admin/bulk_actions_helper.rb
+++ b/decidim-admin/app/helpers/decidim/admin/bulk_actions_helper.rb
@@ -3,10 +3,6 @@
 module Decidim
   module Admin
     module BulkActionsHelper
-      def proposal_find(id)
-        Decidim::Proposals::Proposal.find(id)
-      end
-
       # Public: Generates a select field with the categories. Only leaf categories can be set as selected.
       #
       # categories - A collection of categories.
@@ -14,9 +10,8 @@ def proposal_find(id)
       # Returns a String.
       def bulk_categories_select(collection)
         categories = bulk_categories_for_select collection
-        disabled = bulk_disabled_categories_for collection
         prompt = t("decidim.proposals.admin.proposals.index.change_category")
-        select(:category, :id, options_for_select(categories, selected: [], disabled: disabled), prompt: prompt)
+        select(:category, :id, options_for_select(categories, selected: []), prompt: prompt)
       end
 
       def bulk_categories_for_select(scope)
@@ -39,10 +34,6 @@ def bulk_categories_for_select(scope)
         end
       end
 
-      def bulk_disabled_categories_for(scope)
-        scope.first_class.joins(:subcategories).pluck(:id)
-      end
-
       # Public: Generates a select field with the components.
       #
       # siblings - A collection of components.
diff --git a/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb b/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
index b91df789ccd73..1df398f1d3df9 100644
--- a/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
+++ b/decidim-admin/app/helpers/decidim/admin/moderations/reports_helper.rb
@@ -6,22 +6,31 @@ module Moderations
       # This module includes helpers to show moderation reports in admin
       module ReportsHelper
         include Decidim::Messaging::ConversationHelper
+        include Decidim::ResourceHelper
+        include Decidim::TranslationsHelper
 
         # Public: Returns the reportable's author names separated by commas.
         def reportable_author_name(reportable)
           reportable_authors = reportable.try(:authors) || [reportable.try(:normalized_author)]
           content_tag :ul, class: "reportable-authors" do
             reportable_authors.select(&:present?).map do |author|
-              if author.is_a? User
+              case author
+              when User
                 content_tag :li do
                   link_to current_or_new_conversation_path_with(author), target: "_blank", rel: "noopener" do
                     "#{author.name} #{icon "envelope-closed"}".html_safe
                   end
                 end
+              when Decidim::Meetings::Meeting
+                content_tag :li do
+                  link_to resource_locator(author).path, target: "_blank", rel: "noopener" do
+                    translated_attribute(author.title)
+                  end
+                end
               else
                 content_tag(:li, author.name)
               end
-            end.join("").html_safe
+            end.join.html_safe
           end
         end
 
diff --git a/decidim-admin/app/helpers/decidim/admin/reminders_helper.rb b/decidim-admin/app/helpers/decidim/admin/reminders_helper.rb
new file mode 100644
index 0000000000000..8963daf4f8394
--- /dev/null
+++ b/decidim-admin/app/helpers/decidim/admin/reminders_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module RemindersHelper
+      # Route to the correct reminder for a component.
+      def admin_reminders_path(component, options = {})
+        EngineRouter.admin_proxy(component.participatory_space).new_component_reminder_path(options.merge(component_id: component))
+      end
+    end
+  end
+end
diff --git a/decidim-admin/app/models/decidim/admin/fake_newsletter.rb b/decidim-admin/app/models/decidim/admin/fake_newsletter.rb
index a3f89abbac614..3ed865f9f38d7 100644
--- a/decidim-admin/app/models/decidim/admin/fake_newsletter.rb
+++ b/decidim-admin/app/models/decidim/admin/fake_newsletter.rb
@@ -41,6 +41,26 @@ def sent_at
         nil
       end
 
+      def draft?
+        true
+      end
+
+      def url(**_)
+        "#"
+      end
+
+      def notifications_settings_url(**_)
+        "#"
+      end
+
+      def unsubscribe_newsletters_url(**_)
+        "#"
+      end
+
+      def organization_official_url
+        "#"
+      end
+
       private
 
       attr_reader :organization, :manifest
diff --git a/decidim-admin/app/packs/entrypoints/decidim_admin.js b/decidim-admin/app/packs/entrypoints/decidim_admin.js
index 98e1bbc937461..602396fe70952 100644
--- a/decidim-admin/app/packs/entrypoints/decidim_admin.js
+++ b/decidim-admin/app/packs/entrypoints/decidim_admin.js
@@ -10,7 +10,6 @@ import Rails from "@rails/ujs"
 import "foundation-sites"
 import "src/decidim/vendor/foundation-datepicker"
 import "src/decidim/foundation_datepicker_locales"
-import "jquery.autocomplete"
 import "jquery-serializejson"
 
 import "src/decidim/admin/tab_focus"
@@ -34,6 +33,8 @@ import "src/decidim/ajax_modals"
 import "src/decidim/admin/officializations"
 import "src/decidim/session_timeouter"
 import "src/decidim/slug_form"
+import "src/decidim/direct_uploads/upload_field"
+import "src/decidim/admin/admin_autocomplete"
 
 // CSS
 import "entrypoints/decidim_admin.scss";
diff --git a/decidim-admin/app/packs/src/decidim/admin/admin_autocomplete.js b/decidim-admin/app/packs/src/decidim/admin/admin_autocomplete.js
new file mode 100644
index 0000000000000..ef75c0bf18c63
--- /dev/null
+++ b/decidim-admin/app/packs/src/decidim/admin/admin_autocomplete.js
@@ -0,0 +1,86 @@
+import AutoComplete from "src/decidim/autocomplete";
+
+/**
+ * This function can be used to create an autocomplete input automatically
+ * from the following kind of div:
+ *   <div data-autocomplete="{...}"></div>
+ *
+ * The data-autocomplete attribute should contain the following configuration
+ * as an encoded JSON, which is used to generate the AutoComplete options:
+ * - name: assembly_member[user_id],
+ * - options: [],
+ * - placeholder: "Select a participant",
+ * - searchURL: "http://..."
+ * - selected: "",
+ *
+ * @param {HTMLElement} el The element to generate the autocomplete for.
+ * @returns {AutoComplete} An instance of the AutoComplete class.
+ */
+const autoConfigure = (el) => {
+  const config = JSON.parse(el.dataset.autocomplete);
+  const searchUrl = new URL(config.searchURL);
+  const textInput = document.createElement("input");
+  textInput.type = "text";
+  textInput.className = "autocomplete-input";
+  el.appendChild(textInput);
+  let mode = config.mode || "sticky"
+  let selected = null;
+  if (config.selected) {
+    switch (mode) {
+    case "multi":
+      selected = config.selected.map((item) => (
+        {
+          key: "label",
+          value: {
+            value: item.value,
+            label: item.label
+          }
+        }
+      ));
+      break;
+    case "sticky":
+      selected = { key: "label", value: config.options[config.options.length - 1] };
+      break;
+    default:
+      selected = config.selected;
+    }
+  }
+
+  const dataSource = (query, callback) => {
+    const params = new URLSearchParams({
+      ...Object.fromEntries(searchUrl.searchParams),
+      term: query
+    });
+    fetch(`${searchUrl.origin}${searchUrl.pathname}?${params.toString()}`, {
+      method: "GET",
+      headers: { "Content-Type": "application/json" }
+    }).then((response) => response.json()).then((data) => {
+      callback(data)
+    });
+  };
+
+  const ac = new AutoComplete(textInput, {
+    name: config.name,
+    placeholder: config.placeholder,
+    selected: selected,
+    mode: mode,
+    searchPrompt: true,
+    searchPromptText: config.searchPromptText,
+    threshold: 3,
+    dataMatchKeys: ["label"],
+    dataSource
+  });
+
+  return ac;
+}
+
+$(() => {
+  const $autocompleteDiv = $("[data-autocomplete]");
+  if ($autocompleteDiv.length < 1) {
+    return;
+  }
+
+  $autocompleteDiv.each((_index, element) => {
+    autoConfigure(element);
+  })
+})
diff --git a/decidim-admin/app/packs/src/decidim/admin/application.js b/decidim-admin/app/packs/src/decidim/admin/application.js
index e0dcba5669137..233f92b362f3c 100644
--- a/decidim-admin/app/packs/src/decidim/admin/application.js
+++ b/decidim-admin/app/packs/src/decidim/admin/application.js
@@ -1,13 +1,10 @@
 /* eslint-disable no-invalid-this */
 
-import * as React from "react";
-import * as ReactDOM from "react-dom";
 import toggleNav from "src/decidim/admin/toggle_nav"
 import createSortList from "src/decidim/admin/sort_list.component"
 import createQuillEditor from "src/decidim/editor"
 import formDatePicker from "src/decidim/form_datepicker"
 import DataPicker from "src/decidim/data_picker"
-import Autocomplete from "src/decidim/admin/autocomplete.component";
 import FormFilterComponent from "src/decidim/form_filter"
 import Configuration from "src/decidim/configuration"
 import InputCharacterCounter from "src/decidim/input_character_counter"
@@ -18,17 +15,6 @@ window.Decidim.managedUsersForm = managedUsersForm
 window.Decidim.config = new Configuration()
 window.Decidim.InputCharacterCounter = InputCharacterCounter;
 
-const renderAutocompleteSelects = (nodeSelector) => {
-  window.$(nodeSelector).each((index, node) => {
-    const props = { ...window.$(node).data("autocomplete") };
-
-    ReactDOM.render(
-      React.createElement(Autocomplete, props),
-      node
-    );
-  });
-};
-
 $(() => {
   window.theDataPicker = new DataPicker($(".data-picker"));
 
@@ -36,8 +22,6 @@ $(() => {
 
   toggleNav();
 
-  renderAutocompleteSelects('[data-plugin="autocomplete"]');
-
   createSortList("#steps tbody", {
     placeholder: $('<tr style="border-style: dashed; border-color: #000"><td colspan="4">&nbsp;</td></tr>')[0],
     onSortUpdate: ($children) => {
diff --git a/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.js b/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.js
deleted file mode 100644
index 1a8051d965fa9..0000000000000
--- a/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/* eslint no-unused-vars: 0 */
-/* eslint consistent-return: 0 */
-
-import axios from "axios";
-import * as React from "react";
-import { Async as AsyncSelect } from "react-select";
-import "react-select/scss/default.scss";
-import PropTypes from "prop-types";
-
-export class Autocomplete extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.minCharactersToSearch = 3;
-
-    this.handleChange = (selectedOption) => {
-      this.setState({ selectedOption });
-      if (this.props.changeURL) {
-        axios.get(this.props.changeURL, {
-          headers: {
-            Accept: "text/javascript"
-          },
-          withCredentials: true,
-          params: {
-            id: selectedOption.value
-          }
-        }).
-          then((response) => {
-            const script = document.createElement("script");
-            script.type = "text/javascript";
-            script.innerHTML = response.data;
-            document.getElementsByTagName("head")[0].appendChild(script);
-          }).
-          catch((error) => {
-            if (axios.isCancel(error)) {
-              // console.log("Request canceled", error.message);
-            }
-            else {
-              //
-            }
-          });
-      }
-    };
-
-    this.filterOptions = (options, filter, excludeOptions) => {
-      // Do no filtering, just return all options because
-      // we return a filtered set from server
-      return options;
-    };
-
-    this.onInputChange = (query) => {
-      if (query.length < this.minCharactersToSearch) {
-        this.setState({ noResultsText: this.props.searchPromptText });
-      }
-      else {
-        this.setState({ noResultsText: this.props.noResultsText });
-      }
-    };
-
-    this.loadOptions = (query, callback) => {
-      const lowerQuery = query.toLowerCase();
-
-      if (this.cancelTokenSource) {
-        this.cancelTokenSource.cancel();
-      }
-
-      if (lowerQuery.length < this.minCharactersToSearch) {
-        return callback(null, { options: [], complete: false });
-      }
-
-      this.cancelTokenSource = axios.CancelToken.source();
-      axios.get(this.props.searchURL, {
-        cancelToken: this.cancelTokenSource.token,
-        headers: {
-          Accept: "application/json"
-        },
-        withCredentials: true,
-        params: {
-          term: lowerQuery
-        }
-      }).
-        then((response) => {
-          // CAREFUL! Only set complete to true when there are no more options,
-          // or more specific queries will not be sent to the server.
-          return callback(null, { options: response.data, complete: true });
-        }).
-        catch((error) => {
-          if (!axios.isCancel(error)) {
-            return callback(error, { options: [], complete: false });
-          }
-        });
-    };
-
-    this.state = {
-      options: props.options,
-      selectedOption: props.selected,
-      searchPromptText: props.searchPromptText,
-      noResultsText: props.noResultsText
-    };
-  }
-
-  render() {
-    const { autoload, name, placeholder } = this.props;
-    const { selectedOption, options, searchPromptText, noResultsText } = this.state;
-
-    return (
-      React.createElement("div", { className: "autocomplete-field" },
-        React.createElement(AsyncSelect, {
-          cache: false,
-          name: name,
-          value: selectedOption,
-          options: options,
-          placeholder: placeholder,
-          searchPromptText: searchPromptText,
-          noResultsText: noResultsText,
-          onChange: this.handleChange,
-          onInputChange: this.onInputChange,
-          loadOptions: this.loadOptions,
-          filterOptions: this.filterOptions,
-          autoload: autoload,
-          removeSelected: true,
-          escapeClearsValue: false,
-          onCloseResetsInput: false
-        })
-      )
-    );
-  }
-}
-
-Autocomplete.defaultProps = {
-  autoload: false
-};
-
-Autocomplete.propTypes = {
-  changeURL: PropTypes.string,
-  searchPromptText: PropTypes.string,
-  noResultsText: PropTypes.string,
-  searchURL: PropTypes.string,
-  selected: PropTypes.string,
-  options: PropTypes.array,
-  autoload: PropTypes.bool,
-  name: PropTypes.string,
-  placeholder: PropTypes.string
-}
-
-export default Autocomplete;
diff --git a/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.test.js b/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.test.js
deleted file mode 100644
index 897d1625cbb6e..0000000000000
--- a/decidim-admin/app/packs/src/decidim/admin/autocomplete.component.test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { shallow } from "enzyme";
-import * as React from "react";
-import Autocomplete from "./autocomplete.component";
-
-describe("<Autocomplete />", () => {
-  const name = "custom[name]";
-  const selected = "";
-  const options = [];
-  const placeholder = "Pick a value";
-  const noResultsText = "No results found";
-  const searchPromptText = "Type to search";
-  const searchURL = "/some/url";
-  const changeURL = "/some/other/url";
-
-  it("renders a div of Select", () => {
-    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} changeURL={changeURL} />);
-    expect(wrapper.find(".autocomplete-field").exists()).toBeTruthy();
-  });
-});
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/_decidim.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/_decidim.scss
index 095692f42a048..049874f8addaf 100755
--- a/decidim-admin/app/packs/stylesheets/decidim/admin/_decidim.scss
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/_decidim.scss
@@ -17,7 +17,6 @@
 @import "stylesheets/decidim/admin/modules/modules";
 @import "stylesheets/decidim/admin/plugins/jquery.auto-complete";
 @import "stylesheets/decidim/admin/components/accordion";
-@import "stylesheets/decidim/admin/components/autocomplete_select.component";
 @import "stylesheets/decidim/admin/components/dropdown-menu";
 @import "stylesheets/decidim/admin/components/sortable";
 @import "stylesheets/decidim/vizzs";
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss
deleted file mode 100644
index f1f962128396b..0000000000000
--- a/decidim-admin/app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.autocomplete-field{
-  margin-bottom: 1.5rem;
-
-  .Select{
-    .Select-control,
-    .Select-input,
-    .Select-placeholder,
-    &.Select--single > .Select-control .Select-value{
-      height: 3rem;
-      line-height: 3rem;
-    }
-  }
-}
-
-.autocomplete-field--results-inline{
-  .Select-menu-outer{
-    position: relative;
-  }
-}
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/extra/_quill.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/extra/_quill.scss
index 8c1edf137457e..df4a60e6e7989 100644
--- a/decidim-admin/app/packs/stylesheets/decidim/admin/extra/_quill.scss
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/extra/_quill.scss
@@ -3,3 +3,10 @@
     background: #eee;
   }
 }
+
+.editor-container{
+  ul,
+  ol{
+    margin-bottom: 1rem;
+  }
+}
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss
new file mode 100644
index 0000000000000..4c780a63d3f15
--- /dev/null
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss
@@ -0,0 +1,5 @@
+@import "stylesheets/decidim/modules/autocomplete";
+
+.autoComplete_wrapper{
+  margin-bottom: 1.5rem;
+}
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_modules.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_modules.scss
index 9d43d857829ce..30155f9a49aa8 100644
--- a/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_modules.scss
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_modules.scss
@@ -4,6 +4,7 @@
 @import "stylesheets/decidim/admin/modules/buttons";
 @import "stylesheets/decidim/admin/modules/forms";
 @import "stylesheets/decidim/admin/modules/tabs";
+@import "stylesheets/decidim/admin/modules/autocomplete";
 
 //General layout
 @import "stylesheets/decidim/admin/modules/layout";
@@ -30,6 +31,7 @@
 @import "stylesheets/decidim/admin/modules/draggable-list";
 @import "stylesheets/decidim/admin/modules/loading-spinner";
 @import "stylesheets/decidim/admin/modules/reveal";
+@import "stylesheets/decidim/admin/modules/upload_modal";
 
 // mentions__container
 @import "stylesheets/decidim/modules/tags";
diff --git a/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss
new file mode 100644
index 0000000000000..0111366babae9
--- /dev/null
+++ b/decidim-admin/app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss
@@ -0,0 +1,42 @@
+@import "stylesheets/decidim/modules/upload_modal";
+
+.upload-modal{
+  button{
+    cursor: pointer;
+  }
+
+  .upload-items{
+    .upload-item-first-row{
+      display: flex;
+
+      .file-name-span{
+        flex: 4 1 0;
+      }
+
+      .title-container{
+        flex: 3.5 1 0;
+      }
+    }
+
+    .upload-item-second-row{
+      display: flex;
+
+      .progress-bar-wrapper{
+        flex: 4 1 0;
+        margin-right: 1rem;
+
+        .progress-bar-border{
+          border: 1px solid map-get($foundation-palette, primary);
+
+          .progress-bar{
+            background-color: map-get($foundation-palette, primary);
+          }
+        }
+      }
+
+      .remove-upload-item{
+        flex: 1 1 0;
+      }
+    }
+  }
+}
diff --git a/decidim-admin/app/permissions/decidim/admin/permissions.rb b/decidim-admin/app/permissions/decidim/admin/permissions.rb
index a5c4812e68e34..0ce409b22b969 100644
--- a/decidim-admin/app/permissions/decidim/admin/permissions.rb
+++ b/decidim-admin/app/permissions/decidim/admin/permissions.rb
@@ -29,7 +29,7 @@ def permissions
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
-        allow! if permission_action.subject == :global_moderation && admin_terms_accepted?
+        apply_global_moderations_permission_for_admin!
 
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
@@ -58,6 +58,7 @@ def permissions
           allow! if permission_action.subject == :static_page_topic
           allow! if permission_action.subject == :help_sections
           allow! if permission_action.subject == :share_token
+          allow! if permission_action.subject == :reminder
         end
 
         permission_action
@@ -78,6 +79,23 @@ def read_admin_dashboard_action?
         toggle_allow(user.admin? || space_allows_admin_access_to_current_action?)
       end
 
+      def apply_global_moderations_permission_for_admin!
+        return unless admin_terms_accepted?
+        return unless permission_action.subject == :global_moderation
+        return allow! if user.admin?
+
+        return allow! if Decidim.participatory_space_manifests.flat_map.any? do |manifest|
+          Decidim
+                         .find_participatory_space_manifest(manifest.name)
+                         .participatory_spaces
+                         .call(user.organization)&.any? do |space|
+            space.respond_to?(:user_roles) && space.user_roles(:admin).where(user: user).or(space.user_roles(:moderator).where(user: user)).any?
+          end
+        end
+
+        disallow!
+      end
+
       def apply_newsletter_permissions_for_admin!
         return unless admin_terms_accepted?
         return unless permission_action.subject == :newsletter
diff --git a/decidim-admin/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb b/decidim-admin/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb
index 883259bbb8830..694a9cd01cb0f 100644
--- a/decidim-admin/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb
+++ b/decidim-admin/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb
@@ -3,7 +3,9 @@
 module Decidim
   module Admin
     class DashboardMetricChartsPresenter < Decidim::MetricChartsPresenter
-      attribute :summary, Boolean
+      def summary?
+        __getobj__.fetch(:summary)
+      end
 
       def render_not_highlighted(metrics)
         safe_join(
diff --git a/decidim-admin/app/queries/decidim/admin/active_users_counter.rb b/decidim-admin/app/queries/decidim/admin/active_users_counter.rb
index 04285ed2d7f0e..111cb5dc02dc0 100644
--- a/decidim-admin/app/queries/decidim/admin/active_users_counter.rb
+++ b/decidim-admin/app/queries/decidim/admin/active_users_counter.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # Counts active users making a distinction between whether they are admins or participants
-    class ActiveUsersCounter < Rectify::Query
+    class ActiveUsersCounter < Decidim::Query
       # Initializes the class.
       #
       # @param organization [Organization] Current organization
diff --git a/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb b/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
index a2b8e21f78689..5bbff6f024a01 100644
--- a/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
+++ b/decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A class used to find the recipients of the
     # Newsletter depending on the params of the form
-    class NewsletterRecipients < Rectify::Query
+    class NewsletterRecipients < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # form - params to filter the query
@@ -56,7 +56,7 @@ def spaces
           if type.ids.include?("all")
             object_class.where(organization: @organization)
           else
-            object_class.where(id: type.ids.reject(&:blank?))
+            object_class.where(id: type.ids.compact_blank)
           end
         end.flatten.compact
       end
diff --git a/decidim-admin/app/queries/decidim/admin/user_filter.rb b/decidim-admin/app/queries/decidim/admin/user_filter.rb
index 9ff69a2207942..b196f70048578 100644
--- a/decidim-admin/app/queries/decidim/admin/user_filter.rb
+++ b/decidim-admin/app/queries/decidim/admin/user_filter.rb
@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A class used to filter users by whitelisted scope or searches on their
     # name
-    class UserFilter < Rectify::Query
+    class UserFilter < Decidim::Query
       WHITELISTED_STATE_SCOPES = %w(
         officialized
         not_officialized
diff --git a/decidim-admin/app/queries/decidim/admin/user_groups_evaluation.rb b/decidim-admin/app/queries/decidim/admin/user_groups_evaluation.rb
index 222b231ab2847..608415466f270 100644
--- a/decidim-admin/app/queries/decidim/admin/user_groups_evaluation.rb
+++ b/decidim-admin/app/queries/decidim/admin/user_groups_evaluation.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A class used to find the UserGroup's by their evaluation state.
-    class UserGroupsEvaluation < Rectify::Query
+    class UserGroupsEvaluation < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_groups - the initial User Group relation that needs to be filtered.
diff --git a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
index eb422969377a0..e85aa7c28aebc 100644
--- a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
@@ -9,6 +9,7 @@
   </div>
 
   <div class="card-section">
+    <%= cell("decidim/admin/attachments_privacy_warning", attached_to.attachments) %>
     <% if attached_to.attachments.any? %>
       <div class="table-scroll">
         <table class="table-list">
diff --git a/decidim-admin/app/views/decidim/admin/categories/_form.html.erb b/decidim-admin/app/views/decidim/admin/categories/_form.html.erb
index b5db23134d1a4..351c6da42efc9 100644
--- a/decidim-admin/app/views/decidim/admin/categories/_form.html.erb
+++ b/decidim-admin/app/views/decidim/admin/categories/_form.html.erb
@@ -12,10 +12,6 @@
       <%= form.number_field :weight %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
-
     <div class="row column">
       <%= form.label :parent_id %>
       <%= select :category, :parent_id, @form.parent_categories.collect { |c| [c.name[current_organization.default_locale], c.id] }, include_blank: true %>
diff --git a/decidim-admin/app/views/decidim/admin/categories/show.html.erb b/decidim-admin/app/views/decidim/admin/categories/show.html.erb
index 5ee8a3ba0f6d7..a1d97207dd96a 100644
--- a/decidim-admin/app/views/decidim/admin/categories/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/categories/show.html.erb
@@ -8,6 +8,5 @@
 
 <dl>
   <%= display_for @category,
-    :name,
-    :description %>
+    :name %>
 </dl>
diff --git a/decidim-admin/app/views/decidim/admin/moderated_users/index.html.erb b/decidim-admin/app/views/decidim/admin/moderated_users/index.html.erb
index d4f180e80ea3d..d76ff812e4db7 100644
--- a/decidim-admin/app/views/decidim/admin/moderated_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/moderated_users/index.html.erb
@@ -60,7 +60,7 @@
             </td>
 
             <td class="actions">
-              <% if allowed_to?(:unreport, :moderate_users) %>
+              <% if !moderation.user.blocked? && allowed_to?(:unreport, :moderate_users) %>
                 <%= icon_link_to "action-undo", ignore_moderated_user_path(id: moderation), t(".actions.unreport"), class: "action-icon--unreport", method: :put %>
               <% end %>
               <% if allowed_to?(:block, :moderate_users) %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_appearance/form/_images.html.erb b/decidim-admin/app/views/decidim/admin/organization_appearance/form/_images.html.erb
index 9ea95d472ba86..8170cda569553 100644
--- a/decidim-admin/app/views/decidim/admin/organization_appearance/form/_images.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_appearance/form/_images.html.erb
@@ -14,7 +14,8 @@
         <%= form.upload(
               :favicon,
               dimensions_info: current_organization.attached_uploader(:favicon).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist,
+              help_i18n_scope: "decidim.forms.file_help.icon"
             ) %>
       </div>
 
@@ -22,7 +23,7 @@
         <%= form.upload(
               :logo,
               dimensions_info: current_organization.attached_uploader(:logo).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:logo).extension_allowlist
             ) %>
       </div>
 
@@ -30,7 +31,7 @@
         <%= form.upload(
               :official_img_header,
               dimensions_info: current_organization.attached_uploader(:official_img_header).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:official_img_header).extension_allowlist
             ) %>
       </div>
 
@@ -38,7 +39,7 @@
         <%= form.upload(
               :official_img_footer,
               dimensions_info: current_organization.attached_uploader(:official_img_footer).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:official_img_footer).extension_allowlist
             ) %>
       </div>
     </div>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb b/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
index 78378ca138a13..34c8314e16f9b 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t(".title") %>
       <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_import_path, class: "button tiny button--title import" %>
+        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button tiny button--title import" %>
         <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>
diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb b/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
index 80416e46d4446..4799dfd6708cf 100644
--- a/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
@@ -1,3 +1,22 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".destroy.title") %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <% if @count != 0 %>
+      <p><%= t(".destroy.explanation", count: @count) %></p>
+      <%= link_to t(".destroy.button"),
+                  destroy_all_participatory_space_private_users_csv_imports_path,
+                  method: :delete,
+                  class: "button alert",
+                  data: { confirm: t(".destroy.confirm") } %>
+    <% else %>
+      <p><%= t(".destroy.empty") %></p>
+    <% end %>
+  </div>
+</div>
 <div class="card" id='user-groups'>
   <div class="card-divider">
     <h2 class="card-title">
@@ -5,7 +24,7 @@
     </h2>
   </div>
   <div class="card-section">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_import_path, html: { class: "form" }) do |form| %>
+    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form" }) do |form| %>
       <p><%= t(".explanation") %></p>
       <div class="row column">
         <%= form.upload :file, optional: false %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
new file mode 100644
index 0000000000000..f85d88d57cb30
--- /dev/null
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -0,0 +1,21 @@
+<%= decidim_form_for(@form, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title flex--sbc">
+        <%= reminder_manifest.message(:title, count: @form.try(:reminder_amount)) %>
+      </h2>
+    </div>
+    <div class="card-section">
+      <div class="row">
+        <div class="columns small-12">
+          <p><%= reminder_manifest.message(:description) %></p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="columns small-12 text-center">
+          <%= form.submit t(".submit") %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb b/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
index 8740c1be3ce0f..79f40bcf7cb0a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/_gallery.html.erb
@@ -15,7 +15,12 @@
     <% end %>
 
     <div class="row column">
-      <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
+      <%= form.attachment :photos,
+        multiple: true,
+        label: t(".add_images"),
+        button_label: t(".add_images"),
+        button_edit_label: t(".edit_images"),
+        help_i18n_scope: "decidim.forms.file_help.image" %>
     </div>
   </fieldset>
 </div>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb b/decidim-admin/app/views/decidim/admin/shared/_js-callout.html.erb
similarity index 100%
rename from decidim-proposals/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb
rename to decidim-admin/app/views/decidim/admin/shared/_js-callout.html.erb
diff --git a/decidim-admin/app/views/decidim/admin/users_statistics/_users_count.html.erb b/decidim-admin/app/views/decidim/admin/users_statistics/_users_count.html.erb
index 175cfcdcedf49..59d822931c36d 100644
--- a/decidim-admin/app/views/decidim/admin/users_statistics/_users_count.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users_statistics/_users_count.html.erb
@@ -24,13 +24,13 @@
           <td class="title"><%= t(".participants") %></td>
           <td><%= result[:total_participants_last_month] %></td>
           <td><%= result[:total_participants_last_week] %></td>
-          <td><%= result[:total_participants_last_24] %></td>
+          <td><%= result[:total_participants_last_day] %></td>
         </tr>
         <tr>
           <td class="title"><%= t(".admins") %></td>
           <td><%= result[:total_admins_last_month] %></td>
           <td><%= result[:total_admins_last_week] %></td>
-          <td><%= result[:total_admins_last_24] %></td>
+          <td><%= result[:total_admins_last_day] %></td>
         </tr>
       </tbody>
     </table>
diff --git a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
index 353cbe54c2f34..026ede429911b 100644
--- a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
+++ b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
@@ -29,5 +29,7 @@
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
+
+    <%= snippets.display(:foot) %>
   </body>
 </html>
diff --git a/decidim-admin/config/locales/ar.yml b/decidim-admin/config/locales/ar.yml
index 20007e1e69fee..6b727c5c07542 100644
--- a/decidim-admin/config/locales/ar.yml
+++ b/decidim-admin/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -10,34 +11,41 @@ ar:
         organization: المنظمة
         plural: صيغة الجمع
       attachment:
-        attachment_collection_id: المجلد
+        attachment_collection_id: الحا�ظة
         description: الوص�
         file: مل�
         title: الم�ر�ق أو اسم الصورة
+        weight: موضع الطلب
       attachment_collection:
         description: الوص�
         name: اسم
+        weight: موضع الطلب
       category:
         description: الوص�
         name: اسم
-        parent_id: الأبوين
+        parent_id: الأصل
+        weight: موضع الطلب
       component:
         name: اسم
-        published_at: نشرت �ي
+        published_at: نشر �ي
         weight: موضع الطلب
-      id: هوية شخصية
+      external_domain:
+        value: القيمة
+      help_section:
+        content: المحتوى
+      id: المعر� ID
       import:
-        user_group_id: إنشاء واردات ك
+        user_group_id: إنشاء الاستيرادات ك
       newsletter:
-        body: المحتوى
+        body: النص
         subject: الموضوع
       organization:
         admin_terms_of_use_body: نص شروط الاستخدام للمدير
         alert_color: تنبيه
         available_authorizations: التراخيص المتاحة
         badges_enabled: تمكين الشارات
-        comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال للقيمة الا�تراضية)
-        cta_button_path: دعوة إلى العمل مسار زر
+        comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الا�تراضية)
+        cta_button_path: مسار زر دعوة إلى العمل call to action
         cta_button_text: نص زر Call To Action
         customize_welcome_notification: تخصيص إشعار الترحيب
         default_locale: اللغة الا�تراضية
@@ -153,7 +161,7 @@ ar:
         reject: ر�ض
         share: مشاركة
         user:
-          new: مستخدم جديد
+          new: مدير جديد
         verify: التحقق
       admin_terms_of_use:
         accept:
@@ -309,7 +317,7 @@ ar:
       dashboard:
         show:
           view_more_logs: عرض المزيد من السجلات
-          welcome: مرحبًا بكم �ي لوحة إدارة Decidim.
+          welcome: أهلا بك على اللوح الإداري.
       domain_whitelist:
         form:
           domain_too_short: نطاق الدومين قصير جداً
@@ -743,8 +751,17 @@ ar:
         create:
           invalid: حدثت مشكلة �ي قراءة مل� CSV.
         new:
+          destroy:
+            button: حذ� جميع المشاركين الخاصين
+            confirm: هل أنت متأكد من أنك تريد حذ� جميع المشاركين الخاصين؟ لا يمكن التراجع عن هذا الإجراء، ولن تتمكن من استرجاعهم.
+            empty: ليس لديك أي مشاركين خاصين.
+            explanation: لديك %{count} مشاركين خاصين.
+            title: حذ� جميع المشاركين الخاصين
           title: حمّل مل� CSV الخاص بك
           upload: حمّل
+      reminders:
+        new:
+          submit: إرسال
       resource_permissions:
         edit:
           submit: خضع
@@ -789,6 +806,7 @@ ar:
       shared:
         gallery:
           delete_image: احذ� الصورة
+          edit_images: تعديل الصورة
       static_page_topics:
         create:
           error: كانت هناك مشكلة �ي إنشاء موضوع جديد.
@@ -846,7 +864,7 @@ ar:
         static_pages: ص�حات
         statistics: النشاط
         user_groups: المجموعات
-        users: المشاركون
+        users: المدراء
       user_group:
         csv_verify:
           invalid: حدثت مشكلة �ي قراءة مل� CSV.
@@ -882,7 +900,7 @@ ar:
           role: وظي�ة
         new:
           create: دعا
-          title: دعوة مشارك كمسؤول
+          title: دعوة مدير جديد
       users_statistics:
         users_count:
           admins: المدراء
@@ -928,7 +946,7 @@ ar:
             report_count: عد
             reportable_type: النوع
             reported_content_url: تم الإبلاغ عن عنوان URL للمحتوى
-            reports: تقارير
+            reports: التقارير
             visit_url: زيارة العنوان الشبكي
         report:
           fields:
@@ -941,8 +959,6 @@ ar:
   layouts:
     decidim:
       admin:
-        global_moderations:
-          title: م�شر� عام
         newsletters:
           title: النشرات الإخبارية
         settings:
diff --git a/decidim-admin/config/locales/bg.yml b/decidim-admin/config/locales/bg.yml
index 08457d22cd6b6..1c71e1142cb7f 100644
--- a/decidim-admin/config/locales/bg.yml
+++ b/decidim-admin/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-admin/config/locales/ca.yml b/decidim-admin/config/locales/ca.yml
index 1808f2e23cfec..a6f3a91918f19 100644
--- a/decidim-admin/config/locales/ca.yml
+++ b/decidim-admin/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ ca:
         description: Descripció
         file: Arxiu
         title: Nom de l'adjunt o imatge
+        weight: Ordre de posició
       attachment_collection:
         description: Descripció
         name: Nom
+        weight: Ordre de posició
       category:
         description: Descripció
         name: Nom
         parent_id: Pare
+        weight: Ordre de posició
       component:
         name: Nom
         published_at: Publicat el
         weight: Ordre de posició
+      external_domain:
+        value: Valor
+      help_section:
+        content: Contingut
       id: ID
       import:
         user_group_id: Importar com
@@ -92,6 +100,9 @@ ca:
         welcome_notification_body: Cos de la notificació de benvinguda
         welcome_notification_subject: Assumpte de la notificació de benvinguda
         youtube_handler: Nom d'usuària de YouTube
+      participatory_space_private_user:
+        email: Correu electrònic
+        name: Nom
       scope:
         code: Codi
         name: Nom
@@ -113,6 +124,7 @@ ca:
         show_in_footer: Mostra al peu de pàgina
         slug: Nom curt d'URL
         title: Títol
+        topic_id: Assumpte
         weight: Ordre de posició
       static_page_topic:
         description: Descripció
@@ -133,6 +145,14 @@ ca:
               allowed_file_content_types: Fitxer d'imatge no vàlid
             official_img_header:
               allowed_file_content_types: Fitxer d'imatge no vàlid
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ ca:
         reject: Rebutjar
         share: Compartir
         user:
-          new: Nou usuari
+          new: Nova administradora
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquest adjunt.
           success: Adjunt actualitzat correctament.
+      attachments_privacy_warning:
+        message: Tingues cura quan treballis amb adjunts en un espai privat. Qualsevol participant pot compartir aquest document amb tercers.
       autocomplete:
         no_results: No s'han trobat resultats
         search_prompt: Escriu com a mínim tres caràcters per cercar
@@ -342,7 +364,7 @@ ca:
       dashboard:
         show:
           view_more_logs: Veure més registres
-          welcome: Benvinguda al tauler d'administració de Decidim.
+          welcome: Benvinguda al Tauler d'Aministració.
       domain_whitelist:
         form:
           domain_too_short: El domini és massa curt
@@ -704,7 +726,7 @@ ca:
         select_recipients_to_deliver:
           all_spaces: Totes
           all_users_help: Envia el butlletí a tots els usuaris confimats.
-          confirm_deliver: Estàs segura que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
+          confirm_deliver: Segur que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
           deliver: Enviar butlletí
           followers_help: Envia el butlletí a tots els usuaris confirmats que segueixin qualsevol dels espais participatius seleccionats a la llista.
           none: Cap
@@ -816,7 +838,7 @@ ca:
           inactive_content_blocks: Blocs de contingut inactiu
       organization_homepage_content_blocks:
         edit:
-          update: Actualitza
+          update: Actualitzar
       participatory_space_private_users:
         create:
           error: S'ha produït un error en afegir una participant privada a aquest espai de participació.
@@ -835,9 +857,23 @@ ca:
           invalid: S'ha produït un error en llegir el fitxer CSV.
           success: Arxiu CSV carregat correctament, s'està enviant un missatge de correu electrònic d'invitació als participants. Pot tardar una mica.
         new:
+          destroy:
+            button: Esborrar totes les participants privades
+            confirm: Segur que vols esborrar totes les participants privades? Aquesta acció no es pot desfer, no podràs recuperar-les.
+            empty: No hi ha participants privades.
+            explanation: Hi ha %{count} participant/s privada/ades.
+            title: Esborrar les participants privades
           explanation: 'Carrega el teu arxiu CSV. Ha de tenir dues columnes amb l''adreça de correu electrònic a la primera columna i el nom a la segona (adreça electrònica, nom) dels usuaris que vulguis afegir a l''espai de participació, sense capçaleres. Evita emprar caràcter invàlids com `<>?%&^*#@()[]=+:;"{}\|` al nom d''usuari.'
           title: Puja el fitxer CSV
           upload: Carrega
+      reminders:
+        create:
+          error: Hi ha hagut un problema en crear els recordatoris.
+          success:
+            one: "Es recordarà a %{count} usuària."
+            other: "Es recordarà a %{count} usuàries."
+        new:
+          submit: Envia
       resource_permissions:
         edit:
           submit: Enviar
@@ -895,6 +931,7 @@ ca:
         gallery:
           add_images: Afegir imatges
           delete_image: Esborrar la imatge
+          edit_images: Editar imatges
           gallery_legend: Afegir una galeria d'imatges (opcional)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ ca:
         static_pages: Pàgines
         statistics: Activitat
         user_groups: Grups
-        users: Participants
+        users: Administradores
       user_group:
         csv_verify:
           invalid: S'ha produït un error en llegir el fitxer CSV.
@@ -991,7 +1028,7 @@ ca:
           role: Rol
         new:
           create: Convidar
-          title: Convidar una participant com a administradora
+          title: Convidar una nova administradora
       users_statistics:
         users_count:
           admins: Administradores
@@ -1039,14 +1076,14 @@ ca:
         moderation:
           fields:
             created_at: Data de creació
-            deleted_resource: Elimina el recurs
+            deleted_resource: Recurs eliminat
             hidden_at: Data d'ocultació
             participatory_space: Espai de participació
             report_count: Recompte
             reportable_id: ID
             reportable_type: Tipus
             reported_content_url: URL contingut del contingut reportat
-            reports: Denúncies
+            reports: Informes
             visit_url: Visiteu l'URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/cs.yml b/decidim-admin/config/locales/cs.yml
index 525065ab8dc90..21019203ef48e 100644
--- a/decidim-admin/config/locales/cs.yml
+++ b/decidim-admin/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ cs:
         description: Popis
         file: Soubor
         title: Název přílohy nebo obrázku
+        weight: Pozice v řazení
       attachment_collection:
         description: Popis
         name: Název
+        weight: Pozice v řazení
       category:
         description: Popis
         name: Název
         parent_id: Nadřazená
+        weight: Pozice v řazení
       component:
         name: Název
         published_at: Publikováno v
         weight: Pozice v řazení
+      external_domain:
+        value: Hodnota
+      help_section:
+        content: Obsah
       id: ID
       import:
         user_group_id: Vytvořit importy jako
@@ -92,6 +100,9 @@ cs:
         welcome_notification_body: Tělo uvítacího oznámení
         welcome_notification_subject: Předmět uvítacího oznámení
         youtube_handler: YouTube handler
+      participatory_space_private_user:
+        email: E-mail
+        name: Název
       scope:
         code: Kód
         name: Název
@@ -113,6 +124,7 @@ cs:
         show_in_footer: Zobrazit v zápatí
         slug: URL slug
         title: Titul
+        topic_id: Téma
         weight: Pozice v řazení
       static_page_topic:
         description: Popis
@@ -133,6 +145,14 @@ cs:
               allowed_file_content_types: Neplatný soubor s obrázkem
             official_img_header:
               allowed_file_content_types: Neplatný soubor s obrázkem
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Chybný importní soubor, pře�těte si pozorně pokyny a ujistěte se, že soubor je kódovaný UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Chybný importní soubor, pře�těte si pozorně pokyny a ujistěte se, že soubor je kódovaný UTF-8.
       new_import:
         attributes:
           file:
@@ -177,13 +197,14 @@ cs:
         reject: Odmítnout
         share: Sdílet
         user:
-          new: Nový uživatel
+          new: Nový administrátor
         verify: Ověřit
       admin_terms_of_use:
         accept:
           error: Při přijímání správcovských podmínek použití došlo k chybě.
           success: Skvělé! Přijali jste administrátorské podmínky použití.
         actions:
+          accept: Souhlasím s podmínkami
           are_you_sure: Opravdu chcete odmítnout Podmínky použití pro správce?
           refuse: Odmítnout administrátorské podmínky
           title: Souhlasit s podmínkami používání
@@ -259,6 +280,8 @@ cs:
         update:
           error: Při aktualizaci této přílohy došlo k chybě.
           success: Příloha byla úspěšně aktualizována.
+      attachments_privacy_warning:
+        message: Bu�te opatrní při práci s přílohami v soukromém prostoru. Každý ú�astník by mohl sdílet tento dokument s ostatními.
       autocomplete:
         no_results: Nenalezeny žádné výsledky
         search_prompt: Zadejte nejméně tři znaky, které chcete vyhledat
@@ -341,7 +364,7 @@ cs:
       dashboard:
         show:
           view_more_logs: Zobrazit další protokoly
-          welcome: Vítejte v administrátorském panelu Decidim.
+          welcome: Vítejte v Admin panelu.
       domain_whitelist:
         form:
           domain_too_short: Doména je příliš krátká
@@ -842,9 +865,25 @@ cs:
           invalid: Při �tení souboru CSV došlo k chybě.
           success: CSV soubor byl úspěšně nahrán, posíláme e-maily na ú�astníky. To může trvat nějakou dobu.
         new:
+          destroy:
+            button: Odstranit všechny soukromé ú�astníky
+            confirm: Jste si jisti, že chcete odstranit všechny soukromé ú�astníky? Tuto akci nelze vrátit zpět, nebudete je moci obnovit.
+            empty: Nemáte žádné soukromé ú�astníky.
+            explanation: Máte %{count} soukromých ú�astníků.
+            title: Odstranit soukromé ú�astníky
           explanation: 'Nahrajte soubor CSV. Musí mít dva sloupce s e-mailem v prvním sloupci souboru a jméno v posledním sloupci souboru (e-mail, jméno) uživatelů, které chcete přidat do participa�ního prostoru, bez záhlaví. Vyhněte se používání neplatných znaků jako `<>?%&^*#@()[]=+:;"{}\|` v uživatelském jméně.'
           title: Nahrajte Váš CSV soubor
           upload: Nahrát
+      reminders:
+        create:
+          error: Při vytváření připomenutí došlo k chybě.
+          success:
+            one: "%{count} uživatel bude upozorněn."
+            few: "%{count} uživatelé budou upozorněni."
+            many: "%{count} uživatelů bude upozorněno."
+            other: "%{count} uživatelů bude upozorněno."
+        new:
+          submit: Odeslat
       resource_permissions:
         edit:
           submit: Předložit
@@ -902,6 +941,7 @@ cs:
         gallery:
           add_images: Přidat obrázky
           delete_image: Odstranit obrázek
+          edit_images: Upravit obrázky
           gallery_legend: Přidat galerii obrázků (volitelné)
       static_page_topics:
         create:
@@ -962,7 +1002,7 @@ cs:
         static_pages: Stránky
         statistics: Aktivita
         user_groups: Skupiny
-        users: Ú�astníci
+        users: Administrátoři
       user_group:
         csv_verify:
           invalid: Při �tení souboru CSV došlo k chybě.
@@ -998,7 +1038,7 @@ cs:
           role: Role
         new:
           create: Pozvat
-          title: Pozvat ú�astníka jako administrátora
+          title: Pozvat nového administrátora
       users_statistics:
         users_count:
           admins: Administrátoři
@@ -1045,7 +1085,7 @@ cs:
       models:
         moderation:
           fields:
-            created_at: Datum vytvoření
+            created_at: Datum vzniku
             deleted_resource: Smazaný dokument
             hidden_at: Skryté u
             participatory_space: Participativní prostor
@@ -1053,7 +1093,7 @@ cs:
             reportable_id: ID
             reportable_type: Typ
             reported_content_url: Oznámená adresa URL obsahu
-            reports: Zprávy
+            reports: Hlášení
             visit_url: Navštívit URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/de.yml b/decidim-admin/config/locales/de.yml
index 84f2292310b20..6e51d62f0e34b 100644
--- a/decidim-admin/config/locales/de.yml
+++ b/decidim-admin/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ de:
         description: Beschreibung
         file: Datei
         title: Anhang oder Bildname
+        weight: Reihenfolge
       attachment_collection:
         description: Beschreibung
         name: Name
+        weight: Reihenfolge
       category:
         description: Beschreibung
         name: Name
         parent_id: Ãœbergeordnete Kategorie
+        weight: Reihenfolge
       component:
         name: Name
         published_at: Veröffentlicht unter
-        weight: Bestellposition
+        weight: Reihenfolge
+      external_domain:
+        value: Wert
+      help_section:
+        content: Inhalt
       id: ID
       import:
         user_group_id: Importierte Inhalte erstellen als
@@ -92,6 +100,9 @@ de:
         welcome_notification_body: Text der Willkommens-Benachrichtigung
         welcome_notification_subject: Betreff der Willkommens-Benachrichtigung
         youtube_handler: YouTube-Handler
+      participatory_space_private_user:
+        email: E-Mail
+        name: Name
       scope:
         code: Code
         name: Name
@@ -113,12 +124,13 @@ de:
         show_in_footer: In der Fußzeile anzeigen
         slug: URL-Block
         title: Titel
-        weight: Bestellposition
+        topic_id: Thema
+        weight: Reihenfolge
       static_page_topic:
         description: Beschreibung
         show_in_footer: In der Fußzeile anzeigen
         title: Titel
-        weight: Bestellposition
+        weight: Reihenfolge
       user_group_csv_verification:
         file: Datei
     errors:
@@ -177,7 +189,7 @@ de:
         reject: Ablehnen
         share: Teilen
         user:
-          new: Neuer Benutzer
+          new: Neuer Administrator
         verify: Überprüfen
       admin_terms_of_use:
         accept:
@@ -259,6 +271,8 @@ de:
         update:
           error: Beim Aktualisieren dieses Anhangs ist ein Fehler aufgetreten.
           success: Anhang wurde erfolgreich aktualisiert.
+      attachments_privacy_warning:
+        message: Seien Sie vorsichtig, wenn Sie mit Anhängen in einem privaten Raum arbeiten. Jeder Teilnehmer kann dieses Dokument mit anderen teilen.
       autocomplete:
         no_results: keine Ergebnisse gefunden
         search_prompt: Geben Sie mindestens drei Zeichen ein, um zu suchen
@@ -341,7 +355,7 @@ de:
       dashboard:
         show:
           view_more_logs: Weitere Protokolle anzeigen
-          welcome: Willkommen im Decidim Admin Panel.
+          welcome: Willkommen beim Admin-Panel von Decidim.
       domain_whitelist:
         form:
           domain_too_short: Domain zu kurz
@@ -834,9 +848,23 @@ de:
           invalid: Beim Lesen der CSV-Datei ist ein Fehler aufgetreten.
           success: CSV-Datei wurde erfolgreich hochgeladen, wir senden eine Einladungs-E-Mail an die Teilnehmer. Dies kann eine Weile dauern.
         new:
+          destroy:
+            button: Alle private Teilnehmende auswählen
+            confirm: Sind Sie sicher, dass Sie alle private Teilnehmende entfernen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Sie werden sie nicht wiederherstellen können.
+            empty: Sie haben keine private Teilnehmende.
+            explanation: Sie haben %{count} private Teilnehmende.
+            title: Alle private Teilnehmende entfernen
           explanation: 'Laden Sie Ihre CSV-Datei hoch. Diese muss zwei Spalten haben ohne Kopfzeile, mit E-Mail in der ersten Spalte der Datei und Namen in der letzten Spalte der Datei (E-Mail, Name) in Bezug auf die Benutzer, die Sie dem Beteiligungsbereich hinzufügen möchten. Vermeiden sie ungültige Zeichen wie `<>?%&^*#@()[]=+:;"{}\|` im Namen des Nutzers zu verwenden.'
           title: CSV-Datei hochladen
           upload: Hochladen
+      reminders:
+        create:
+          error: Beim Erstellen dieser Erinnerungen ist ein Problem aufgetreten.
+          success:
+            one: "%{count} Benutzer wird erinnert."
+            other: "%{count} Benutzer werden erinnert."
+        new:
+          submit: Senden
       resource_permissions:
         edit:
           submit: einreichen
@@ -894,6 +922,7 @@ de:
         gallery:
           add_images: Bilder hinzufügen
           delete_image: Bild löschen
+          edit_images: Bilder bearbeiten
           gallery_legend: Bildergalerie hinzufügen (Optional)
       static_page_topics:
         create:
@@ -954,7 +983,7 @@ de:
         static_pages: Seiten
         statistics: Aktivität
         user_groups: Benutzergruppen
-        users: Teilnehmer
+        users: Administratoren
       user_group:
         csv_verify:
           invalid: Beim Lesen der CSV-Datei ist ein Fehler aufgetreten.
@@ -990,7 +1019,7 @@ de:
           role: Rolle
         new:
           create: Einladen
-          title: Benutzer als Administrator einladen
+          title: Neuen Administrator einladen
       users_statistics:
         users_count:
           admins: Admins
diff --git a/decidim-admin/config/locales/el.yml b/decidim-admin/config/locales/el.yml
index bde77ee9ad119..c68699e1ba5b6 100644
--- a/decidim-admin/config/locales/el.yml
+++ b/decidim-admin/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -171,8 +172,6 @@ el:
         permissions: Δικαιώματα
         reject: Από��ιψη
         share: Κοινοποίηση
-        user:
-          new: �έος χ�ήστης
         verify: Επαλήθευση
       admin_terms_of_use:
         accept:
@@ -336,7 +335,6 @@ el:
       dashboard:
         show:
           view_more_logs: Π�οβολή πε�ισσότε�ων α�χείων καταγ�αφής
-          welcome: Καλώς ο�ίσατε στον Πίνακα διαχει�ιστή Decidim.
       domain_whitelist:
         form:
           domain_too_short: Πολ� σ�ντομος τομέας
@@ -904,7 +902,6 @@ el:
         static_pages: Σελίδες
         statistics: Δ�αστη�ιότητα
         user_groups: Ομάδες
-        users: Συμμετέχοντες
       user_group:
         csv_verify:
           invalid: Υπή�ξε ένα π�όβλημα κατά την ανάγνωση του α�χείου CSV.
@@ -940,7 +937,6 @@ el:
           role: Ρόλος
         new:
           create: Π�όσκληση
-          title: Π�οσκαλέστε τον συμμετέχοντα ως διαχει�ιστή
       users_statistics:
         users_count:
           admins: Διαχει�ιστές
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 13273e64c03b0..d2e1bb1bc6f35 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -15,17 +15,24 @@ en:
         description: Description
         file: File
         title: Attachment or image name
+        weight: Order position
       attachment_collection:
         description: Description
         name: Name
+        weight: Order position
       category:
         description: Description
         name: Name
         parent_id: Parent
+        weight: Order position
       component:
         name: Name
         published_at: Published at
         weight: Order position
+      external_domain:
+        value: Value
+      help_section:
+        content: Content
       id: ID
       import:
         user_group_id: Create imports as
@@ -93,6 +100,9 @@ en:
         welcome_notification_body: Welcome notification body
         welcome_notification_subject: Welcome notification subject
         youtube_handler: YouTube handler
+      participatory_space_private_user:
+        email: Email
+        name: Name
       scope:
         code: Code
         name: Name
@@ -114,6 +124,7 @@ en:
         show_in_footer: Show in the footer
         slug: URL slug
         title: Title
+        topic_id: Topic
         weight: Order position
       static_page_topic:
         description: Description
@@ -134,6 +145,14 @@ en:
               allowed_file_content_types: Invalid image file
             official_img_header:
               allowed_file_content_types: Invalid image file
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.
       new_import:
         attributes:
           file:
@@ -178,7 +197,7 @@ en:
         reject: Reject
         share: Share
         user:
-          new: New user
+          new: New admin
         verify: Verify
       admin_terms_of_use:
         accept:
@@ -261,6 +280,8 @@ en:
         update:
           error: There was a problem updating this attachment.
           success: Attachment updated successfully.
+      attachments_privacy_warning:
+        message: Be careful when working with attachments in a private space. Any participant could share this document to others.
       autocomplete:
         no_results: No results found
         search_prompt: Type at least three characters to search
@@ -343,7 +364,7 @@ en:
       dashboard:
         show:
           view_more_logs: View more logs
-          welcome: Welcome to the Decidim Admin Panel.
+          welcome: Welcome to the Admin Panel.
       domain_whitelist:
         form:
           domain_too_short: Domain too short
@@ -836,9 +857,23 @@ en:
           invalid: There was a problem reading the CSV file.
           success: CSV file uploaded successfully, we're sending an invitation email to participants. This might take a while.
         new:
+          destroy:
+            button: Delete all private participants
+            confirm: Are you sure you want to delete all private participants? This action can't be undone, you will not be able to recover them.
+            empty: You have no private participants.
+            explanation: You have %{count} private participants.
+            title: Delete private participants
           explanation: Upload your CSV file. It must have two columns with email in the first column of the file and name in the last column of the file (email, name) of the users that you want to add to the participatory space, without headers. Avoid using invalid chars like `<>?%&^*#@()[]=+:;"{}\|` in user name.
           title: Upload your CSV file
           upload: Upload
+      reminders:
+        create:
+          error: There was a problem creating reminders.
+          success:
+            one: "%{count} user will be reminded."
+            other: "%{count} users will be reminded."
+        new:
+          submit: Send
       resource_permissions:
         edit:
           submit: Submit
@@ -896,6 +931,7 @@ en:
         gallery:
           add_images: Add images
           delete_image: Delete Image
+          edit_images: Edit images
           gallery_legend: Add an image gallery (Optional)
       static_page_topics:
         create:
@@ -956,7 +992,7 @@ en:
         static_pages: Pages
         statistics: Activity
         user_groups: Groups
-        users: Participants
+        users: Administrators
       user_group:
         csv_verify:
           invalid: There was a problem reading the CSV file.
@@ -992,7 +1028,7 @@ en:
           role: Role
         new:
           create: Invite
-          title: Invite participant as administrator
+          title: Invite new administrator
       users_statistics:
         users_count:
           admins: Admins
diff --git a/decidim-admin/config/locales/eo.yml b/decidim-admin/config/locales/eo.yml
index cf517f589830e..225eda575ff9e 100644
--- a/decidim-admin/config/locales/eo.yml
+++ b/decidim-admin/config/locales/eo.yml
@@ -1,3 +1,4 @@
+---
 eo:
   activemodel:
     attributes:
diff --git a/decidim-admin/config/locales/es-MX.yml b/decidim-admin/config/locales/es-MX.yml
index da6aa3f2bcaac..6057274c8bed2 100644
--- a/decidim-admin/config/locales/es-MX.yml
+++ b/decidim-admin/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ es-MX:
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
+        weight: Orden de posición
       attachment_collection:
         description: Descripción
         name: Nombre
+        weight: Orden de posición
       category:
         description: Descripción
         name: Nombre
         parent_id: Superior
+        weight: Orden de posición
       component:
         name: Nombre
         published_at: Publicado en
         weight: Orden de posición
+      external_domain:
+        value: Valor
+      help_section:
+        content: Contenido
       id: ID
       import:
         user_group_id: Importar como
@@ -92,6 +100,9 @@ es-MX:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
+      participatory_space_private_user:
+        email: Correo electrónico
+        name: Nombre
       scope:
         code: Código
         name: Nombre
@@ -113,6 +124,7 @@ es-MX:
         show_in_footer: Mostrar en el pie de página
         slug: Texto corto de URL
         title: Título
+        topic_id: Asunto
         weight: Orden de posición
       static_page_topic:
         description: Descripción
@@ -133,6 +145,14 @@ es-MX:
               allowed_file_content_types: Archivo de imagen no válido
             official_img_header:
               allowed_file_content_types: Archivo de imagen no válido
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ es-MX:
         reject: Rechazar
         share: Compartir
         user:
-          new: Nuevo ususario
+          new: Nueva administradora
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ es-MX:
         update:
           error: Se ha producido un error al actualizar este archivo adjunto.
           success: Adjunto actualizado correctamente.
+      attachments_privacy_warning:
+        message: Tenga cuidado al trabajar con archivos adjuntos en un espacio privado. Cualquier participante podría compartir este documento a otras personas.
       autocomplete:
         no_results: No se han encontrado resultados
         search_prompt: Escriba al menos tres caracteres para buscar
@@ -342,7 +364,7 @@ es-MX:
       dashboard:
         show:
           view_more_logs: Ver más registros
-          welcome: Bienvenido al panel de administración de Decidim.
+          welcome: Bienvenida al panel de administración.
       domain_whitelist:
         form:
           domain_too_short: Dominio demasiado corto
@@ -835,9 +857,23 @@ es-MX:
           invalid: Se produjo un error al leer el archivo CSV.
           success: Archivo CSV subido correctamente, estamos enviando un correo electrónico de invitación a las participantes. Esto puede tardar un tiempo.
         new:
+          destroy:
+            button: Borrar todas las participantes privadas
+            confirm: '¿Estás segura que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recupararlas.'
+            empty: No hay participantes privadas.
+            explanation: Hay %{count} participante/s privada/s.
+            title: Borrar las participantes privadas
           explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo (correo electrónico, nombre) de los usuarios que deseas añadir al espacio participativo, sin encabezados. Evitar usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuario.'
           title: Sube tu archivo CSV
           upload: Subir
+      reminders:
+        create:
+          error: Se ha producido un error al crear los recordatorios.
+          success:
+            one: "%{count} usuaria será recordada."
+            other: "%{count} usuarias serán recordadas."
+        new:
+          submit: Enviar
       resource_permissions:
         edit:
           submit: Enviar
@@ -895,6 +931,7 @@ es-MX:
         gallery:
           add_images: Añadir imágenes
           delete_image: Borrar la imagen
+          edit_images: Editar imagenes
           gallery_legend: Añadir una galería de imágenes (opccional)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ es-MX:
         static_pages: Páginas
         statistics: Actividad
         user_groups: Grupos de usuarios
-        users: Participantes
+        users: Administradoras
       user_group:
         csv_verify:
           invalid: Se produjo un error al leer el archivo CSV.
@@ -991,7 +1028,7 @@ es-MX:
           role: Rol
         new:
           create: Invitar
-          title: Invitar a un usuario como administrador
+          title: Invitar nueva administradora
       users_statistics:
         users_count:
           admins: Administradores
@@ -1039,14 +1076,14 @@ es-MX:
         moderation:
           fields:
             created_at: Fecha de creación
-            deleted_resource: Eliminar recurso
+            deleted_resource: Recurso eliminado
             hidden_at: Fecha de ocultación
             participatory_space: Espacio participativo
             report_count: Recuento
             reportable_id: ID
             reportable_type: Tipo
             reported_content_url: URL del contenido reportado
-            reports: Denuncias
+            reports: Informes
             visit_url: Visita la URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/es-PY.yml b/decidim-admin/config/locales/es-PY.yml
index 83f1c8f6fd3c1..ee6e59316fb7d 100644
--- a/decidim-admin/config/locales/es-PY.yml
+++ b/decidim-admin/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ es-PY:
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
+        weight: Orden de posición
       attachment_collection:
         description: Descripción
         name: Nombre
+        weight: Orden de posición
       category:
         description: Descripción
         name: Nombre
         parent_id: Superior
+        weight: Orden de posición
       component:
         name: Nombre
         published_at: Publicado en
         weight: Orden de posición
+      external_domain:
+        value: Valor
+      help_section:
+        content: Contenido
       id: ID
       import:
         user_group_id: Importar como
@@ -92,6 +100,9 @@ es-PY:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
+      participatory_space_private_user:
+        email: Correo electrónico
+        name: Nombre
       scope:
         code: Código
         name: Nombre
@@ -113,6 +124,7 @@ es-PY:
         show_in_footer: Mostrar en el pie de página
         slug: Texto corto de URL
         title: Título
+        topic_id: Asunto
         weight: Orden de posición
       static_page_topic:
         description: Descripción
@@ -133,6 +145,14 @@ es-PY:
               allowed_file_content_types: Archivo de imagen no válido
             official_img_header:
               allowed_file_content_types: Archivo de imagen no válido
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ es-PY:
         reject: Rechazar
         share: Compartir
         user:
-          new: Nuevo ususario
+          new: Nueva administradora
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ es-PY:
         update:
           error: Se ha producido un error al actualizar este archivo adjunto.
           success: Adjunto actualizado correctamente.
+      attachments_privacy_warning:
+        message: Por favor ten cuidado al trabajar con archivos adjuntos en un espacio privado. Cualquier participante puede compartir este documento con otras.
       autocomplete:
         no_results: No se han encontrado resultados
         search_prompt: Escriba al menos tres caracteres para buscar
@@ -342,7 +364,7 @@ es-PY:
       dashboard:
         show:
           view_more_logs: Ver más registros
-          welcome: Bienvenido al panel de administración de Decidim.
+          welcome: Bienvenida al panel de administración.
       domain_whitelist:
         form:
           domain_too_short: Dominio demasiado corto
@@ -835,9 +857,23 @@ es-PY:
           invalid: Se produjo un error al leer el archivo CSV.
           success: Archivo CSV subido correctamente, estamos enviando un correo electrónico de invitación a las participantes. Esto puede tardar un tiempo.
         new:
+          destroy:
+            button: Borrar todas las participantes privadas
+            confirm: '¿Estás segura que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recupararlas.'
+            empty: No hay participantes privadas.
+            explanation: Hay %{count} participante/s privada/s.
+            title: Borrar las participantes privadas
           explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo (correo electrónico, nombre) de los usuarios que deseas añadir al espacio participativo, sin encabezados. Evitar usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuario.'
           title: Sube tu archivo CSV
           upload: Subir
+      reminders:
+        create:
+          error: Se ha producido un error al crear los recordatorios.
+          success:
+            one: "%{count} usuaria será recordada."
+            other: "%{count} usuarias serán recordadas."
+        new:
+          submit: Enviar
       resource_permissions:
         edit:
           submit: Enviar
@@ -895,6 +931,7 @@ es-PY:
         gallery:
           add_images: Añadir imágenes
           delete_image: Borrar la imagen
+          edit_images: Editar imagenes
           gallery_legend: Añadir una galería de imágenes (opccional)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ es-PY:
         static_pages: Páginas
         statistics: Actividad
         user_groups: Grupos de usuarios
-        users: Participantes
+        users: Administradoras
       user_group:
         csv_verify:
           invalid: Se produjo un error al leer el archivo CSV.
@@ -991,7 +1028,7 @@ es-PY:
           role: Rol
         new:
           create: Invitar
-          title: Invitar a un usuario como administrador
+          title: Invitar nueva administradora
       users_statistics:
         users_count:
           admins: Administradores
@@ -1039,14 +1076,14 @@ es-PY:
         moderation:
           fields:
             created_at: Fecha de creación
-            deleted_resource: Eliminar recurso
+            deleted_resource: Recurso eliminado
             hidden_at: Fecha de ocultación
             participatory_space: Espacio participativo
             report_count: Recuento
             reportable_id: ID
             reportable_type: Tipo
             reported_content_url: URL del contenido reportado
-            reports: Denuncias
+            reports: Informes
             visit_url: Visita la URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/es.yml b/decidim-admin/config/locales/es.yml
index 3e67d46362234..5fb3844ed74bf 100644
--- a/decidim-admin/config/locales/es.yml
+++ b/decidim-admin/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ es:
         description: Descripción
         file: Archivo
         title: Nombre del adjunto o imagen
+        weight: Orden de posición
       attachment_collection:
         description: Descripción
         name: Nombre
+        weight: Orden de posición
       category:
         description: Descripción
         name: Nombre
         parent_id: Superior
+        weight: Orden de posición
       component:
         name: Nombre
         published_at: Publicado en
         weight: Orden de posición
+      external_domain:
+        value: Valor
+      help_section:
+        content: Contenido
       id: ID
       import:
         user_group_id: Importar como
@@ -92,6 +100,9 @@ es:
         welcome_notification_body: Cuerpo del mensaje de notificación de bienvenida
         welcome_notification_subject: Asunto del mensaje de notificación de bienvenida
         youtube_handler: Nombre de YouTube
+      participatory_space_private_user:
+        email: Correo electrónico
+        name: Nombre
       scope:
         code: Código
         name: Nombre
@@ -113,6 +124,7 @@ es:
         show_in_footer: Mostrar en el pie de página
         slug: Texto corto de URL
         title: Título
+        topic_id: Asunto
         weight: Orden de posición
       static_page_topic:
         description: Descripción
@@ -133,6 +145,14 @@ es:
               allowed_file_content_types: Archivo de imagen no válido
             official_img_header:
               allowed_file_content_types: Archivo de imagen no válido
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ es:
         reject: Rechazar
         share: Compartir
         user:
-          new: Nuevo ususario
+          new: Nueva administradora
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ es:
         update:
           error: Se ha producido un error al actualizar este adjunto.
           success: Adjunto actualizado correctamente.
+      attachments_privacy_warning:
+        message: Por favor ten cuidado al trabajar con archivos adjuntos en un espacio privado. Cualquier participante puede compartir este documento con otras.
       autocomplete:
         no_results: No se han encontrado resultados
         search_prompt: Escriba al menos tres caracteres para buscar
@@ -342,7 +364,7 @@ es:
       dashboard:
         show:
           view_more_logs: Ver más registros
-          welcome: Bienvenida al panel de administración de Decidim.
+          welcome: Bienvenida al panel de administración.
       domain_whitelist:
         form:
           domain_too_short: Dominio demasiado corto
@@ -689,7 +711,7 @@ es:
           all: todos
           all_users: 'Todos los usuarios '
           and: 'y '
-          confirm_delete: '¿Estás seguro de que quieres eliminar este boletín?'
+          confirm_delete: '¿Seguro que quieres eliminar este boletín?'
           followers: 'seguidores '
           has_been_sent_to: 'Se ha enviado a: '
           no_scopes: Sin ámbitos
@@ -704,7 +726,7 @@ es:
         select_recipients_to_deliver:
           all_spaces: Todos
           all_users_help: Envía el boletín de noticias a todos las participantes confirmadas.
-          confirm_deliver: '¿Estás segura de que quieres enviar este boletín? Esta acción no se puede deshacer.'
+          confirm_deliver: '¿Seguro que quieres enviar este boletín? Esta acción no se puede deshacer.'
           deliver: Enviar boletín
           followers_help: Envía el boletín de noticias a todas las participantes confirmadas que sigan cualquier espacio participativo seleccionado en la lista.
           none: Ninguno
@@ -835,9 +857,23 @@ es:
           invalid: Se produjo un error al leer el archivo CSV.
           success: Archivo CSV subido correctamente, estamos enviando un correo electrónico de invitación a las participantes. Esto puede tardar un tiempo.
         new:
+          destroy:
+            button: Borrar todas las participantes privadas
+            confirm: '¿Seguro que quieres eliminar todas las participantes privadas? Esta acción no se puede deshacer, no podrás recuperarlas.'
+            empty: No hay participantes privadas.
+            explanation: Hay %{count} participante/s privada/s.
+            title: Borrar las participantes privadas
           explanation: 'Sube tu archivo CSV. Debe tener dos columnas con correo electrónico en la primera columna del archivo y el nombre en la última columna del archivo (correo electrónico, nombre) de los usuarios que deseas añadir al espacio participativo, sin encabezados. Evitar usar caracteres no válidos como `<>?%&^*#@()[]=+:;"{}\|` en el nombre de usuario.'
           title: Sube tu archivo CSV
           upload: Subir
+      reminders:
+        create:
+          error: Se ha producido un error al crear los recordatorios.
+          success:
+            one: "%{count} usuaria será recordada."
+            other: "%{count} usuarias serán recordadas."
+        new:
+          submit: Enviar
       resource_permissions:
         edit:
           submit: Enviar
@@ -895,6 +931,7 @@ es:
         gallery:
           add_images: Añadir imágenes
           delete_image: Borrar la imagen
+          edit_images: Editar imagenes
           gallery_legend: Añadir una galería de imágenes (opcional)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ es:
         static_pages: Páginas
         statistics: Actividad
         user_groups: Grupos
-        users: Participantes
+        users: Administradoras
       user_group:
         csv_verify:
           invalid: Se produjo un error al leer el archivo CSV.
@@ -991,7 +1028,7 @@ es:
           role: Rol
         new:
           create: Invitar
-          title: Invitar a la participante como administradora
+          title: Invitar nueva administradora
       users_statistics:
         users_count:
           admins: Administradoras
@@ -1039,14 +1076,14 @@ es:
         moderation:
           fields:
             created_at: Fecha de creación
-            deleted_resource: Eliminar recurso
+            deleted_resource: Recurso eliminado
             hidden_at: Fecha de ocultación
             participatory_space: Espacio participativo
             report_count: Recuento
             reportable_id: ID
             reportable_type: Tipo
             reported_content_url: URL del contenido reportado
-            reports: Denuncias
+            reports: Informes
             visit_url: Visita la URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/eu.yml b/decidim-admin/config/locales/eu.yml
index 0425ecd5e81d7..d462beefe1787 100644
--- a/decidim-admin/config/locales/eu.yml
+++ b/decidim-admin/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ eu:
         description: Descripción
         file: Fitxategia
         title: Erantsitakoaren edo irudiaren izena
+        weight: Kokapenaren hurrenkera
       attachment_collection:
         description: Deskribapena
         name: Izena
+        weight: Kokapenaren hurrenkera
       category:
         description: Descripción
         name: Izena
         parent_id: Nagusia
+        weight: Kokapenaren hurrenkera
       component:
         name: Izena
         published_at: Argitaratu at
         weight: Kokapenaren hurrenkera
+      external_domain:
+        value: Balioa
+      help_section:
+        content: Edukia
       id: NAN
       import:
         user_group_id: Inportatu hau bezala
@@ -92,6 +100,9 @@ eu:
         welcome_notification_body: Ongietorri-jakinarazpenaren mezuaren atala
         welcome_notification_subject: Ongietorri-jakinarazpenaren mezuaren gaia
         youtube_handler: YouTube kudeatzailea
+      participatory_space_private_user:
+        email: Helbide elektronikoa
+        name: Izena
       scope:
         code: Kodea
         name: Izena
@@ -113,6 +124,7 @@ eu:
         show_in_footer: Erakutsi orri-oinean
         slug: URL laburra
         title: Titulua
+        topic_id: Gaia
         weight: Kokapenaren hurrenkera
       static_page_topic:
         description: Deskribapena
@@ -123,12 +135,24 @@ eu:
         file: file
     errors:
       models:
+        newsletter:
+          attributes:
+            base:
+              at_least_one_space: Aukeratu parte hartzeko espazio bat gutxienez
         organization:
           attributes:
             official_img_footer:
               allowed_file_content_types: Irudi fitxategi baliogabea
             official_img_header:
               allowed_file_content_types: Irudi fitxategi baliogabea
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Fitxategia akastuna da. Irakurri arretaz jarraibideak eta ziurtatu fitxategia UTF-8an kodifikatuta dagoela.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Fitxategia akastuna da. Irakurri arretaz jarraibideak eta ziurtatu fitxategia UTF-8an kodifikatuta dagoela.
       new_import:
         attributes:
           file:
@@ -173,7 +197,7 @@ eu:
         reject: Ukatu
         share: Partekatu
         user:
-          new: Beste erabiltzaile bat
+          new: Administratzaile berria
         verify: Egiaztatu
       admin_terms_of_use:
         accept:
@@ -197,7 +221,7 @@ eu:
           success: Area mota behar bezala suntsitu da
         edit:
           title: Editatu eremu mota
-          update: Eguneratzearen
+          update: Onartu
         new:
           create: Sortu eremu mota
           title: Area mota berria
@@ -213,7 +237,7 @@ eu:
           success: Area behar bezala suntsitu da
         edit:
           title: Editatu eremua
-          update: Eguneratzearen
+          update: Onartu
         new:
           create: Sortu eremua
           title: Area berria
@@ -229,7 +253,7 @@ eu:
           success: Karpeta ondo suntsitu da.
         edit:
           title: Editatu karpeta
-          update: Eguneratzearen
+          update: Onartu
         index:
           attachment_collection_used: Karpeta hau ezin da ezabatu erabiltzen ari delako.
           attachment_collections_title: Eranskinen karpetak
@@ -256,6 +280,8 @@ eu:
         update:
           error: Errorea gertatu da fitxategi erantsi bat eguneratzean.
           success: Fitxategi erantsia zuzen eguneratu da.
+      attachments_privacy_warning:
+        message: Kontuz ibili fitxategi erantsiekin espazio pribatu batean lan egiten duzunean, edozein parte-hartzailek parteka dezake dokumentu hau beste pertsona batzuekin.
       autocomplete:
         no_results: Ez da emaitzarik aurkitu
         search_prompt: Idatzi bilaketak gutxienez hiru karaktere
@@ -297,7 +323,7 @@ eu:
           success: Osagaia zuzen ezabatu da.
         edit:
           title: Editatu osagaia
-          update: Eguneratzearen
+          update: Onartu
         form:
           default_step_settings: Urratsen ezarpen lehenetsiak
           global_settings: Ezarpen globalak
@@ -338,7 +364,6 @@ eu:
       dashboard:
         show:
           view_more_logs: Ikusi gehiago erregistroak
-          welcome: Ongi etorri Decidim Admin Panelera.
       domain_whitelist:
         form:
           domain_too_short: Domeinu laburregia
@@ -426,7 +451,7 @@ eu:
       help_sections:
         error: Errore bat gertatu da laguntza-atalak eguneratuz
         form:
-          save: Save
+          save: Gorde
         success: Laguntza atalak behar bezala eguneratu dira
       impersonatable_users:
         index:
@@ -466,6 +491,9 @@ eu:
         data_errors:
           duplicate_headers:
             detail: Mesedez, egiaztatu fitxategiak behin bakarrik eskatzen diren zutabeak edo goiburuak dituela.
+            message:
+              one: Bikoiztu zutabeak %{columns}.
+              other: Bikoiztu %{columns} zutabe.
           invalid_indexes:
             lines:
               detail: "\nEgiaztatu erregistro horiek formatu zuzena dutela eta baliozko erregistroak dituztela."
@@ -511,7 +539,7 @@ eu:
         moderation: Moderazio globalak
         newsletters: Buletinak
         participants: Parte-hartzaileak
-        reported_users: Erabiltzaile erreportatuak
+        reported_users: Erabiltzaile informatuak
         scope_types: Esparru motak
         scopes: Esparruak
         settings: Ezarpenak
@@ -610,7 +638,7 @@ eu:
           nickname: Ezizena
           reason: Arrazoia
           reports: Salaketa kopurua
-          title: Erreportatutako erabiltzaileen zerrenda
+          title: Informatutako erabiltzaileen zerrenda
         report:
           reasons:
             does_not_belong: Ez da bidezkoa
@@ -794,7 +822,7 @@ eu:
           inactive_content_blocks: Eduki eduki gabeko blokeak
       organization_homepage_content_blocks:
         edit:
-          update: Eguneratu
+          update: Onartu
       participatory_space_private_users:
         create:
           error: Errore bat gertatu da partaidetza espazio honen erabiltzaile pribatua gehitzean.
@@ -933,7 +961,6 @@ eu:
         static_pages: Orriak
         statistics: Jarduera
         user_groups: Erabiltzaile-taldeak
-        users: Parte-hartzaileak
       user_group:
         csv_verify:
           invalid: Errore bat gertatu da CSV fitxategia irakurtzean.
@@ -969,7 +996,6 @@ eu:
           role: Rola
         new:
           create: Gonbit egin
-          title: Gonbit egin erabiltzaile bati administratzaile gisa
       users_statistics:
         users_count:
           admins: Administratzaileak
@@ -1020,9 +1046,10 @@ eu:
             hidden_at: Ezkutatze-data
             participatory_space: Parte hartzeko esparrua
             report_count: Zenbaketa
+            reportable_id: ID
             reportable_type: Mota
             reported_content_url: Emandako edukiaren URLa
-            reports: Salaketak
+            reports: Txostenak
             visit_url: Bisitatu URLa
         report:
           fields:
diff --git a/decidim-admin/config/locales/fi-plain.yml b/decidim-admin/config/locales/fi-plain.yml
index 689a379b4fba0..3a51880a4db7a 100644
--- a/decidim-admin/config/locales/fi-plain.yml
+++ b/decidim-admin/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ fi-pl:
         description: Kuvaus
         file: Tiedosto
         title: Liitetiedoston tai kuvan nimi
+        weight: Järjestysnumero
       attachment_collection:
         description: Kuvaus
         name: Nimi
+        weight: Järjestysnumero
       category:
         description: Kuvaus
         name: Nimi
         parent_id: Yläaihepiiri
+        weight: Järjestysnumero
       component:
         name: Nimi
         published_at: Julkaistu osoitteessa
         weight: Järjestysnumero
+      external_domain:
+        value: Arvo
+      help_section:
+        content: Sisältö
       id: ID
       import:
         user_group_id: Tuo käyttäjänä
@@ -92,6 +100,9 @@ fi-pl:
         welcome_notification_body: Tervetuloilmoituksen runko
         welcome_notification_subject: Tervetuloilmoituksen otsikko
         youtube_handler: YouTube-käsittelijä
+      participatory_space_private_user:
+        email: Sähköpostiosoite
+        name: Nimi
       scope:
         code: Koodi
         name: Nimi
@@ -113,6 +124,7 @@ fi-pl:
         show_in_footer: Näytä alatunnisteessa
         slug: URL-tunniste
         title: Otsikko
+        topic_id: Aihe
         weight: Järjestysnumero
       static_page_topic:
         description: Kuvaus
@@ -133,6 +145,14 @@ fi-pl:
               allowed_file_content_types: Virheellinen kuvatiedosto
             official_img_header:
               allowed_file_content_types: Virheellinen kuvatiedosto
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ fi-pl:
         reject: Hylkää
         share: Jaa
         user:
-          new: Uusi käyttäjä
+          new: Uusi hallintakäyttäjä
         verify: Vahvista
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ fi-pl:
         update:
           error: Tämän liitteen päivityksessä tapahtui virhe.
           success: Liite luotu onnistuneesti.
+      attachments_privacy_warning:
+        message: Ole varovainen, kun työskentelet liitetiedostojen kanssa yksityisessä tilassa. Kuka tahansa osallistuja voi jakaa tämän asiakirjan muille.
       autocomplete:
         no_results: Ei tuloksia
         search_prompt: Kirjoita vähintään kolme merkkiä hakuun
@@ -342,7 +364,7 @@ fi-pl:
       dashboard:
         show:
           view_more_logs: Näytä lisää lokitietoja
-          welcome: Tervetuloa Decidimin hallintapaneeliin.
+          welcome: Tervetuloa hallintapaneeliin.
       domain_whitelist:
         form:
           domain_too_short: Verkkotunnus on liian lyhyt
@@ -835,9 +857,23 @@ fi-pl:
           invalid: CSV-tiedoston käsittelyssä tapahtui virhe.
           success: CSV-tiedosto ladattu onnistuneesti. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
         new:
+          destroy:
+            button: Poista kaikki yksityiset osallistujat
+            confirm: Oletko varma, että haluat poistaa kaikki yksityiset osallistujat? Tätä toimintoa ei voi peruuttaa ja poistettuja osallistujia ei voi palauttaa.
+            empty: Tässä osallistumistilassa ei ole yksityisiä osallistujia.
+            explanation: Tässä osallistumistilassa on %{count} yksityistä osallistujaa.
+            title: Poista kaikki yksityiset osallistujat
           explanation: 'Lataa CSV-tiedosto osallistumistilan käyttäjistä. Tiedostossa on oltava kaksi saraketta tuotaville käyttäjille ilman sarakeotsikoita: sähköpostiosoitteet ensimmäisessä ja nimi toisessa sarakkeessa (sähköposti, nimi). Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
           title: Lataa CSV-tiedosto
           upload: Lataa
+      reminders:
+        create:
+          error: Muistutusten luonti epäonnistui.
+          success:
+            one: "%{count} käyttäjää muistutetaan."
+            other: "%{count} käyttäjää muistutetaan."
+        new:
+          submit: Lähetä
       resource_permissions:
         edit:
           submit: Lähetä
@@ -895,6 +931,7 @@ fi-pl:
         gallery:
           add_images: Lisää kuvia
           delete_image: Poista kuva
+          edit_images: Muokkaa kuvia
           gallery_legend: Lisää kuvagalleria (valinnainen)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ fi-pl:
         static_pages: Sivut
         statistics: Toiminta
         user_groups: Käyttäjäryhmät
-        users: Osallistujat
+        users: Hallintakäyttäjät
       user_group:
         csv_verify:
           invalid: CSV-tiedoston käsittelyssä tapahtui virhe.
@@ -991,7 +1028,7 @@ fi-pl:
           role: Rooli
         new:
           create: Kutsu
-          title: Kutsu käyttäjä hallinnoijaksi
+          title: Luo uusi hallintakäyttäjä
       users_statistics:
         users_count:
           admins: Ylläpitäjät
@@ -1038,7 +1075,7 @@ fi-pl:
       models:
         moderation:
           fields:
-            created_at: Luonnin ajankohta
+            created_at: Luontipäivämäärä
             deleted_resource: Poistettu tietue
             hidden_at: Piilotuksen ajankohta
             participatory_space: Osallistumistila
@@ -1046,7 +1083,7 @@ fi-pl:
             reportable_id: ID
             reportable_type: Tyyppi
             reported_content_url: Raportoidun sisällön URL
-            reports: Raportit
+            reports: Ilmoitukset
             visit_url: Vieraile URL-osoitteessa
         report:
           fields:
diff --git a/decidim-admin/config/locales/fi.yml b/decidim-admin/config/locales/fi.yml
index 1ce09f917594d..cd7f808dc57af 100644
--- a/decidim-admin/config/locales/fi.yml
+++ b/decidim-admin/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ fi:
         description: Kuvaus
         file: Tiedosto
         title: Liitetiedoston tai kuvan nimi
+        weight: Järjestysnumero
       attachment_collection:
         description: Kuvaus
         name: Nimi
+        weight: Järjestysnumero
       category:
         description: Kuvaus
         name: Nimi
         parent_id: Yläaihepiiri
+        weight: Järjestysnumero
       component:
         name: Nimi
         published_at: Julkaistu osoitteessa
         weight: Järjestysnumero
+      external_domain:
+        value: Arvo
+      help_section:
+        content: Sisältö
       id: ID
       import:
         user_group_id: Tuo käyttäjänä
@@ -92,6 +100,9 @@ fi:
         welcome_notification_body: Tervetuloilmoituksen runko
         welcome_notification_subject: Tervetuloilmoituksen otsikko
         youtube_handler: YouTube-käsittelijä
+      participatory_space_private_user:
+        email: Sähköpostiosoite
+        name: Nimi
       scope:
         code: Koodi
         name: Nimi
@@ -113,6 +124,7 @@ fi:
         show_in_footer: Näytä alatunnisteessa
         slug: URL-tunniste
         title: Otsikko
+        topic_id: Aihe
         weight: Järjestysnumero
       static_page_topic:
         description: Kuvaus
@@ -133,6 +145,14 @@ fi:
               allowed_file_content_types: Virheellinen kuvatiedosto
             official_img_header:
               allowed_file_content_types: Virheellinen kuvatiedosto
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ fi:
         reject: Hylkää
         share: Jaa
         user:
-          new: Uusi käyttäjä
+          new: Uusi hallintakäyttäjä
         verify: Vahvista
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ fi:
         update:
           error: Liitteen päivitys epäonnistui.
           success: Liitteen luonti onnistui.
+      attachments_privacy_warning:
+        message: Ole varovainen, kun työskentelet liitetiedostojen kanssa yksityisessä tilassa. Kuka tahansa osallistuja voi jakaa tämän asiakirjan muille.
       autocomplete:
         no_results: Ei tuloksia
         search_prompt: Kirjoita vähintään kolme merkkiä hakuun
@@ -342,7 +364,7 @@ fi:
       dashboard:
         show:
           view_more_logs: Näytä lisää lokitietoja
-          welcome: Tervetuloa Decidimin hallintapaneeliin.
+          welcome: Tervetuloa hallintapaneeliin.
       domain_whitelist:
         form:
           domain_too_short: Verkkotunnus on liian lyhyt
@@ -812,8 +834,8 @@ fi:
           title: Sallittujen ulkoisten verkkotunnusten lista
       organization_homepage:
         edit:
-          active_content_blocks: Aktiiviset sisältöblokit
-          inactive_content_blocks: Ei-aktiiviset sisältöblokit
+          active_content_blocks: Aktiiviset sisältölohkot
+          inactive_content_blocks: Käytöstä poistetut sisältölohkot
       organization_homepage_content_blocks:
         edit:
           update: Päivitä
@@ -835,9 +857,23 @@ fi:
           invalid: CSV-tiedoston käsittely epäonnistui.
           success: CSV-tiedosto ladattu onnistuneesti. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
         new:
+          destroy:
+            button: Poista kaikki yksityiset osallistujat
+            confirm: Oletko varma, että haluat poistaa kaikki yksityiset osallistujat? Tätä toimintoa ei voi peruuttaa ja poistettuja osallistujia ei voi palauttaa.
+            empty: Tässä osallistumistilassa ei ole yksityisiä osallistujia.
+            explanation: Tässä osallistumistilassa on %{count} yksityistä osallistujaa.
+            title: Poista kaikki yksityiset osallistujat
           explanation: 'Lataa CSV-tiedosto osallistumistilan käyttäjistä. Tiedostossa on oltava kaksi saraketta tuotaville käyttäjille ilman sarakeotsikoita: sähköpostiosoitteet ensimmäisessä ja nimi toisessa sarakkeessa (sähköposti, nimi). Vältä erikoismerkkejä nimessä, kuten `<>?%&^*#@()[]=+:;"{}\|`.'
           title: Lataa CSV-tiedosto
           upload: Lataa
+      reminders:
+        create:
+          error: Muistutusten luonti epäonnistui.
+          success:
+            one: "%{count} käyttäjää muistutetaan."
+            other: "%{count} käyttäjää muistutetaan."
+        new:
+          submit: Lähetä
       resource_permissions:
         edit:
           submit: Lähetä
@@ -895,6 +931,7 @@ fi:
         gallery:
           add_images: Lisää kuvia
           delete_image: Poista kuva
+          edit_images: Muokkaa kuvia
           gallery_legend: Lisää kuvagalleria (valinnainen)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ fi:
         static_pages: Sivut
         statistics: Toiminta
         user_groups: Käyttäjäryhmät
-        users: Osallistujat
+        users: Hallintakäyttäjät
       user_group:
         csv_verify:
           invalid: CSV-tiedoston käsittely epäonnistui.
@@ -991,7 +1028,7 @@ fi:
           role: Rooli
         new:
           create: Kutsu
-          title: Kutsu käyttäjä hallinnointikäyttäjäksi
+          title: Luo uusi hallintakäyttäjä
       users_statistics:
         users_count:
           admins: Ylläpitäjät
@@ -1038,7 +1075,7 @@ fi:
       models:
         moderation:
           fields:
-            created_at: Luonnin ajankohta
+            created_at: Luontipäivämäärä
             deleted_resource: Poistettu tietue
             hidden_at: Piilotuksen ajankohta
             participatory_space: Osallistumistila
@@ -1046,7 +1083,7 @@ fi:
             reportable_id: ID
             reportable_type: Tyyppi
             reported_content_url: Raportoidun sisällön URL
-            reports: Raportit
+            reports: Ilmoitukset
             visit_url: Vieraile URL-osoitteessa
         report:
           fields:
diff --git a/decidim-admin/config/locales/fr-CA.yml b/decidim-admin/config/locales/fr-CA.yml
index a8a2180f142bb..0c51ed67de7d7 100644
--- a/decidim-admin/config/locales/fr-CA.yml
+++ b/decidim-admin/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ fr-CA:
         description: Description
         file: Fichier
         title: Nom de la pièce jointe ou de l'image
+        weight: Rang d'affichage
       attachment_collection:
         description: Description
         name: Titre
+        weight: Rang d'affichage
       category:
         description: Description
         name: Titre
         parent_id: Parent
+        weight: Rang d'affichage
       component:
         name: Titre
         published_at: Publiée à
         weight: Rang
+      external_domain:
+        value: Valeur
+      help_section:
+        content: Contenu
       id: ID
       import:
         user_group_id: Créer des imports en tant que
@@ -92,6 +100,9 @@ fr-CA:
         welcome_notification_body: Corps du mail de bienvenue
         welcome_notification_subject: Objet du mail de bienvenue
         youtube_handler: Gestionnaire YouTube
+      participatory_space_private_user:
+        email: Email
+        name: Nom
       scope:
         code: Code
         name: Titre
@@ -113,6 +124,7 @@ fr-CA:
         show_in_footer: Montrer dans le pied de page
         slug: Identifiant
         title: Titre
+        topic_id: Sujet
         weight: Rang
       static_page_topic:
         description: La description
@@ -133,6 +145,14 @@ fr-CA:
               allowed_file_content_types: Fichier image invalide
             official_img_header:
               allowed_file_content_types: Fichier image invalide
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ fr-CA:
         reject: Rejeter
         share: Partager
         user:
-          new: Nouvel utilisateur
+          new: Nouvel administrateur
         verify: Vérifier
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ fr-CA:
         update:
           error: Une erreur s'est produite lors de la mise à jour de ce document lié.
           success: Document lié mis à jour avec succès.
+      attachments_privacy_warning:
+        message: Soyez prudent lorsque vous travaillez avec des pièces jointes dans un espace privé. Tout participant pourrait partager ce document à d'autres.
       autocomplete:
         no_results: Aucun résultat trouvé
         search_prompt: Renseignez au moins trois caractères pour lancer la recherche
@@ -342,7 +364,7 @@ fr-CA:
       dashboard:
         show:
           view_more_logs: Afficher plus
-          welcome: Bienvenue dans l'espace d'administration de Decidim.
+          welcome: Bienvenue dans l'espace d'administration.
       domain_whitelist:
         form:
           domain_too_short: Le nom de domaine est trop court
@@ -835,9 +857,23 @@ fr-CA:
           invalid: Une erreur s'est produite lors de la lecture du fichier CSV.
           success: Fichier CSV a été transféré avec succès, nous envoyons un courriel d'invitation aux participants. Cela peut prendre un certain temps.
         new:
+          destroy:
+            button: Supprimer tous les utilisateurs privés
+            confirm: Êtes-vous sûr de vouloir supprimer tous les utilisateurs privés ? Cette action ne peut pas être annulée, vous ne pourrez pas les récupérer.
+            empty: Vous n'avez aucun utilisateur privé.
+            explanation: Vous avez %{count} utilisateurs privés.
+            title: Supprimer les utilisateurs privés
           explanation: 'Téléchargez votre fichier CSV. Il doit avoir deux colonnes avec dans la première colonne les emails, et dans la deuxième colonne les noms (email, nom) des utilisateurs que vous souhaitez ajouter à l''espace participatif, sans en-tête. Évitez les caractères spéciaux comme `<>?%&^*#@()[]=+:;"{}\|` dans les noms des utilisateurs.'
           title: Téléchargez votre fichier CSV
           upload: Télécharger
+      reminders:
+        create:
+          error: Il y a eu un problème lors de la création des rappels.
+          success:
+            one: "%{count} utilisateur recevra un rappel."
+            other: "%{count} utilisateurs recevront un rappel."
+        new:
+          submit: Envoyer
       resource_permissions:
         edit:
           submit: Soumettre
@@ -895,6 +931,7 @@ fr-CA:
         gallery:
           add_images: Ajouter des images
           delete_image: Supprimer l'image
+          edit_images: Modifier les images
           gallery_legend: Ajouter une galerie d'images (facultatif)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ fr-CA:
         static_pages: Pages
         statistics: Activité
         user_groups: Groupes d'utilisateurs
-        users: Participants
+        users: Administrateurs
       user_group:
         csv_verify:
           invalid: Une erreur s'est produite lors de la lecture du fichier CSV.
@@ -991,7 +1028,7 @@ fr-CA:
           role: Rôle
         new:
           create: Inviter
-          title: Inviter l'utilisateur en tant qu'administrateur
+          title: Inviter un nouvel administrateur
       users_statistics:
         users_count:
           admins: Administrateurs
@@ -1046,7 +1083,7 @@ fr-CA:
             reportable_id: ID
             reportable_type: Type
             reported_content_url: URL
-            reports: Motif
+            reports: Signalements
             visit_url: Visitez l'URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/fr.yml b/decidim-admin/config/locales/fr.yml
index 75e8c0dbffba0..bcaa30c5a9faa 100644
--- a/decidim-admin/config/locales/fr.yml
+++ b/decidim-admin/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ fr:
         description: Description
         file: Fichier
         title: Nom de la pièce jointe ou de l'image
+        weight: Rang d'affichage
       attachment_collection:
         description: Description
         name: Titre
+        weight: Rang d'affichage
       category:
         description: Description
         name: Titre
         parent_id: Parent
+        weight: Rang d'affichage
       component:
         name: Titre
         published_at: Publiée à
         weight: Rang d'affichage
+      external_domain:
+        value: Valeur
+      help_section:
+        content: Contenu
       id: ID
       import:
         user_group_id: Créer des imports en tant que
@@ -92,6 +100,9 @@ fr:
         welcome_notification_body: Corps du mail de bienvenue
         welcome_notification_subject: Objet du mail de bienvenue
         youtube_handler: Gestionnaire YouTube
+      participatory_space_private_user:
+        email: Email
+        name: Nom
       scope:
         code: Code
         name: Titre
@@ -113,6 +124,7 @@ fr:
         show_in_footer: Montrer dans le pied de page
         slug: Identifiant
         title: Titre
+        topic_id: Sujet
         weight: Rang d'affichage
       static_page_topic:
         description: La description
@@ -133,6 +145,14 @@ fr:
               allowed_file_content_types: Fichier image invalide
             official_img_header:
               allowed_file_content_types: Fichier image invalide
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ fr:
         reject: Rejeter
         share: Partager
         user:
-          new: Nouvel utilisateur
+          new: Nouvel administrateur
         verify: Vérifier
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ fr:
         update:
           error: Une erreur s'est produite lors de la mise à jour de ce document lié.
           success: Document lié mis à jour avec succès.
+      attachments_privacy_warning:
+        message: Soyez prudent lorsque vous travaillez avec des pièces jointes dans un espace privé. Tout participant pourrait partager ce document à d'autres.
       autocomplete:
         no_results: Aucun résultat trouvé
         search_prompt: Renseignez au moins trois caractères pour lancer la recherche
@@ -342,7 +364,7 @@ fr:
       dashboard:
         show:
           view_more_logs: Afficher plus
-          welcome: Bienvenue dans l'espace d'administration de Decidim.
+          welcome: Bienvenue dans l'espace d'administration.
       domain_whitelist:
         form:
           domain_too_short: Le nom de domaine est trop court
@@ -835,9 +857,23 @@ fr:
           invalid: Une erreur s'est produite lors de la lecture du fichier CSV.
           success: Fichier CSV a été transféré avec succès, nous envoyons un courriel d'invitation aux participants. Cela peut prendre un certain temps.
         new:
+          destroy:
+            button: Supprimer tous les utilisateurs privés
+            confirm: Êtes-vous sûr de vouloir supprimer tous les utilisateurs privés ? Cette action ne peut pas être annulée, vous ne pourrez pas les récupérer.
+            empty: Vous n'avez aucun utilisateur privé.
+            explanation: Vous avez %{count} utilisateurs privés.
+            title: Supprimer les utilisateurs privés
           explanation: 'Téléchargez votre fichier CSV. Il doit avoir deux colonnes avec dans la première colonne les emails, et dans la deuxième colonne les noms (email, nom) des utilisateurs que vous souhaitez ajouter à l''espace participatif, sans en-tête. Évitez les caractères spéciaux comme `<>?%&^*#@()[]=+:;"{}\|` dans les noms des utilisateurs.'
           title: Téléchargez votre fichier CSV
           upload: Télécharger
+      reminders:
+        create:
+          error: Il y a eu un problème lors de la création des rappels.
+          success:
+            one: "%{count} utilisateur recevra un rappel."
+            other: "%{count} utilisateurs recevront un rappel."
+        new:
+          submit: Envoyer
       resource_permissions:
         edit:
           submit: Soumettre
@@ -895,6 +931,7 @@ fr:
         gallery:
           add_images: Ajouter des images
           delete_image: Supprimer l'image
+          edit_images: Modifier les images
           gallery_legend: Ajouter une galerie d'images (facultatif)
       static_page_topics:
         create:
@@ -955,7 +992,7 @@ fr:
         static_pages: Pages
         statistics: Activité
         user_groups: Groupes d'utilisateurs
-        users: Participants
+        users: Administrateurs
       user_group:
         csv_verify:
           invalid: Une erreur s'est produite lors de la lecture du fichier CSV.
@@ -991,7 +1028,7 @@ fr:
           role: Rôle
         new:
           create: Inviter
-          title: Inviter l'utilisateur en tant qu'administrateur
+          title: Inviter un nouvel administrateur
       users_statistics:
         users_count:
           admins: Administrateurs
@@ -1046,7 +1083,7 @@ fr:
             reportable_id: ID
             reportable_type: Type
             reported_content_url: URL
-            reports: Motif
+            reports: Signalements
             visit_url: Visitez l'URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/ga-IE.yml b/decidim-admin/config/locales/ga-IE.yml
index 45baa997932d6..bc0f4e6872b6d 100644
--- a/decidim-admin/config/locales/ga-IE.yml
+++ b/decidim-admin/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-admin/config/locales/gl.yml b/decidim-admin/config/locales/gl.yml
index d69bb61d9dc1f..4f34f040f9050 100644
--- a/decidim-admin/config/locales/gl.yml
+++ b/decidim-admin/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -172,7 +173,7 @@ gl:
         reject: Rexeitar
         share: Compartir
         user:
-          new: Novo usuario
+          new: Novo administrador
         verify: Verifique
       admin_terms_of_use:
         accept:
@@ -251,6 +252,8 @@ gl:
         update:
           error: Produciuse un erro ao actualizar este anexo.
           success: Adxunto actualizado correctamente.
+      attachments_privacy_warning:
+        message: Ten coidado ao traballar con ficheiros anexos nun espazo privado. Calquera participante podería compartir este documento con outra xente.
       autocomplete:
         no_results: Non se atoparon resultados
         search_prompt: Escriba polo menos tres caracteres para buscar
@@ -331,7 +334,7 @@ gl:
       dashboard:
         show:
           view_more_logs: Ver máis rexistros
-          welcome: Benvido ao Panel de administración de decisións.
+          welcome: Benvido/a ao panel de administración.
       domain_whitelist:
         form:
           domain_too_short: Dominio curto de máis
@@ -815,6 +818,14 @@ gl:
           explanation: 'Sube o teu ficheiro CSV. Ten de ter dúas columnas co correo electrónico na primeira e o nome na última (correo, nome) dos usuarios que desexes engadir ao espazo de participación, sen cabeceiras. Evita empregar os seguintes caracteres `<>?%&^*#@()[]=+:;"{}\|` no nome de usuario.'
           title: Sube o teu ficheiro CSV
           upload: Subir
+      reminders:
+        create:
+          error: Produciuse un problema ao crear os recordatorios.
+          success:
+            one: "Lembrarase a %{count} usuario."
+            other: "Lembrarase a %{count} usuarios."
+        new:
+          submit: Enviar
       resource_permissions:
         edit:
           submit: Enviar
@@ -872,6 +883,7 @@ gl:
         gallery:
           add_images: Engadir imaxes
           delete_image: Eliminar imaxe
+          edit_images: Editar imaxes
           gallery_legend: Engadir unha galería de imaxes (opcional)
       static_page_topics:
         create:
@@ -932,7 +944,7 @@ gl:
         static_pages: Páxinas
         statistics: Actividade
         user_groups: Grupos de usuarios
-        users: Participantes
+        users: Administradores
       user_group:
         csv_verify:
           invalid: Produciuse un erro ao ler o ficheiro CSV.
@@ -968,7 +980,7 @@ gl:
           role: Rol
         new:
           create: Invitar
-          title: Convidar ao usuario como administrador
+          title: Convidar a un novo administrador
       users_statistics:
         users_count:
           admins: Administradores
diff --git a/decidim-admin/config/locales/hu.yml b/decidim-admin/config/locales/hu.yml
index 051a6815c1e84..661909c5d4d31 100644
--- a/decidim-admin/config/locales/hu.yml
+++ b/decidim-admin/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -177,7 +178,7 @@ hu:
         reject: Elutasít
         share: Megosztás
         user:
-          new: Új felhasználó
+          new: Új adminisztrátor
         verify: Ellenőrzés
       admin_terms_of_use:
         accept:
@@ -259,6 +260,8 @@ hu:
         update:
           error: Hiba történt a melléklet frissítése során.
           success: Melléklet frissítése sikeres.
+      attachments_privacy_warning:
+        message: Legyen óvatos a mellékletek kezelése során. Bármely résztvevő megoszthatja a dokumentumokat bárkivel.
       autocomplete:
         no_results: Nincs találat
         search_prompt: Legalább három karakter szükséges a kereséshez
@@ -341,7 +344,7 @@ hu:
       dashboard:
         show:
           view_more_logs: További naplók megtekintése
-          welcome: Üdvözöljük a Decidim Admin Panelben.
+          welcome: Üdvözölünk az Admin Panelben.
       domain_whitelist:
         form:
           domain_too_short: Túl rövid domain
@@ -831,9 +834,23 @@ hu:
           invalid: Hiba történt a CSV fájl olvasásában.
           success: A CSV-fájl sikeresen feltöltődött, meghívó e-mailt küldünk a résztvevőknek. Ez eltarthat egy ideig.
         new:
+          destroy:
+            button: Az összes privát felhasználó törlése
+            confirm: Biztosan törölni akarja az összes privát felhasználót? Ezt a műveletet nem tudja visszavonni, vagy a felhasználókat később helyreállítani.
+            empty: Nincsenek privát résztvevők.
+            explanation: '%{count} privát résztvevője van.'
+            title: Privát felhasználók törlése
           explanation: 'Töltse fel a CSV-fájlt. Két oszlopnak kell lennie, e-mail címmel a fájl első oszlopában, és a fájl utolsó oszlopában (e-mail, név) azoknak a felhasználóknak az adataival, akiket fel akar venni a részvételi térbe, fejlécek nélkül. Kerülje az olyan érvénytelen karakterek használatát, mint a `<>?%&^*#@()[]=+:;"{}\|` a felhasználónévben.'
           title: Töltse fel a CSV fájlod
           upload: Feltölt
+      reminders:
+        create:
+          error: Hiba történt a bejegyzés létrehozása során.
+          success:
+            one: "%{count} felhasználó emlékeztetőt fog kapni."
+            other: "%{count} felhasználó emlékeztetőt fog kapni."
+        new:
+          submit: Küldés
       resource_permissions:
         edit:
           submit: Beküldés
@@ -891,6 +908,7 @@ hu:
         gallery:
           add_images: Képek hozzáadása
           delete_image: Kép törlése
+          edit_images: Kép szerkesztése
           gallery_legend: Képgaléria hozzáadása (opcionális)
       static_page_topics:
         create:
@@ -951,7 +969,7 @@ hu:
         static_pages: Oldalak
         statistics: Tevékenység
         user_groups: Csoportok
-        users: Résztvevők
+        users: Adminisztrátorok
       user_group:
         csv_verify:
           invalid: Hiba történt a CSV fájl olvasásában.
@@ -987,7 +1005,7 @@ hu:
           role: Szerep
         new:
           create: Meghívás
-          title: A résztvevő meghívása rendszergazdaként
+          title: Új adminisztrátor létrehozása
       users_statistics:
         users_count:
           admins: Adminok
diff --git a/decidim-admin/config/locales/id-ID.yml b/decidim-admin/config/locales/id-ID.yml
index 6e041418cc7cb..62effdca1819d 100644
--- a/decidim-admin/config/locales/id-ID.yml
+++ b/decidim-admin/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -245,7 +246,6 @@ id:
       dashboard:
         show:
           view_more_logs: Lihat lebih banyak log
-          welcome: Selamat datang di Panel Admin Decidim.
       exports:
         export_as: "%{name} sebagai %{export_format}"
         notice: Ekspor Anda sedang dalam proses. Anda akan menerima email setelah selesai.
@@ -597,7 +597,6 @@ id:
         scopes: Scopes
         static_pages: Halaman
         user_groups: Grup Pengguna
-        users: Peserta
       user_group:
         csv_verify:
           invalid: Ada kesalahan saat membaca file CSV.
@@ -633,7 +632,6 @@ id:
           role: Peran
         new:
           create: Undang
-          title: Undang pengguna sebagai administrator
       users_statistics:
         users_count:
           admins: Admin
@@ -661,10 +659,10 @@ id:
       models:
         moderation:
           fields:
+            created_at: Tanggal pembuatan
             hidden_at: Tersembunyi di
             report_count: Menghitung
             reported_content_url: URL konten yang dilaporkan
-            reports: Laporan
             visit_url: Kunjungi URL
   errors:
     messages:
diff --git a/decidim-admin/config/locales/is-IS.yml b/decidim-admin/config/locales/is-IS.yml
index 6fee5d3efc480..7a2f298af3009 100644
--- a/decidim-admin/config/locales/is-IS.yml
+++ b/decidim-admin/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       area:
@@ -140,8 +141,6 @@ is-IS:
         permissions: Heimildir
         reject: Hafna
         share: Deila
-        user:
-          new: Nýr notandi
         verify: Staðfestu
       area_types:
         create:
@@ -251,7 +250,6 @@ is-IS:
       dashboard:
         show:
           view_more_logs: Skoða fleiri logs
-          welcome: Velkomin á Decidim Admin Panel.
       exports:
         export_as: "%{name} sem %{export_format}"
         notice: Útflutningur þinn er í gangi. Þú færð tölvupóst þegar það er lokið.
@@ -445,6 +443,9 @@ is-IS:
           homepage_highlighted_content_banner_title: Hápunktur efni borði
           images:
             layout_appearance_title: Breyta útliti útlits
+      organization_homepage_content_blocks:
+        edit:
+          update: Uppfæra
       participatory_space_private_users:
         new:
           create: Búa til
@@ -533,10 +534,10 @@ is-IS:
       models:
         moderation:
           fields:
+            created_at: Sköpunardegi
             hidden_at: Falinn á
             report_count: Telja
             reported_content_url: Tilkynnt efni vefslóð
-            reports: Skýrslur
             visit_url: Heimsókn vefslóð
   errors:
     messages:
diff --git a/decidim-admin/config/locales/it.yml b/decidim-admin/config/locales/it.yml
index 133f38d72fe7b..a515fdb26ffa6 100644
--- a/decidim-admin/config/locales/it.yml
+++ b/decidim-admin/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -171,8 +172,6 @@ it:
         permissions: Permessi
         reject: Rifiuta
         share: Condividi
-        user:
-          new: Nuovo utente
         verify: Verifica
       admin_terms_of_use:
         accept:
@@ -336,7 +335,6 @@ it:
       dashboard:
         show:
           view_more_logs: Visualizza più registri
-          welcome: Benvenuti nel pannello di amministrazione di Decidim.
       domain_whitelist:
         form:
           domain_too_short: Dominio troppo corto
@@ -774,7 +772,7 @@ it:
           inactive_content_blocks: Blocchi di contenuto inattivo
       organization_homepage_content_blocks:
         edit:
-          update: Aggiornare
+          update: Aggiorna
       participatory_space_private_users:
         create:
           error: Si è verificato un errore durante l'aggiunta di un utente privato per questo spazio partecipativo.
@@ -796,6 +794,11 @@ it:
           explanation: 'Carica il file CSV. Il file deve contenere due colonne (e-mail e nome) senza intestazioni: nella prima sono elencati gli indirizzi e-mail degli utenti che si desidera aggiungere allo spazio partecipativo, nella seconda i loro nomi. Evita di usare caratteri non validi come `<>?%&^*#@()[]=+:;"{}\|` nella colonna dei nomi.'
           title: Carica il tuo file CSV
           upload: Carica File
+      reminders:
+        create:
+          error: Si è verificato un errore durante la creazione dei promemoria.
+        new:
+          submit: Invia
       resource_permissions:
         edit:
           submit: Invia
@@ -913,7 +916,6 @@ it:
         static_pages: Pagine
         statistics: Attività
         user_groups: Gruppi di utenti
-        users: Partecipanti
       user_group:
         csv_verify:
           invalid: Si è verificato un errore durante la lettura del file CSV.
@@ -949,7 +951,6 @@ it:
           role: Ruolo
         new:
           create: Invita
-          title: Invita l'utente in qualità di amministratrice/tore
       users_statistics:
         users_count:
           admins: Amministratori
diff --git a/decidim-admin/config/locales/ja.yml b/decidim-admin/config/locales/ja.yml
index 78f1c2cfee2a8..6fb265e8e58d7 100644
--- a/decidim-admin/config/locales/ja.yml
+++ b/decidim-admin/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ ja:
         description: 説明
         file: ファイル
         title: 添付ファイル���画��
+        weight: 並�順��置
       attachment_collection:
         description: 説明
         name: ��
+        weight: 並�順��置
       category:
         description: 説明
         name: ��
         parent_id: 親
+        weight: 並�順��置
       component:
         name: ��
         published_at: 公開日時
         weight: 順番��置
+      external_domain:
+        value: 値
+      help_section:
+        content: 内容
       id: ID
       import:
         user_group_id: イン�ートを作�
@@ -92,6 +100,9 @@ ja:
         welcome_notification_body: ウェルカム通知本文
         welcome_notification_subject: ウェルカム通知�件�
         youtube_handler: YouTube �ンドラー
+      participatory_space_private_user:
+        email: Eメールアドレス
+        name: ��
       scope:
         code: コード
         name: ��
@@ -113,6 +124,7 @@ ja:
         show_in_footer: フッター�表示
         slug: URL スラグ
         title: タイトル
+        topic_id: トピック
         weight: 順番��置
       static_page_topic:
         description: 説明
@@ -133,6 +145,14 @@ ja:
               allowed_file_content_types: 無効�画�ファイル
             official_img_header:
               allowed_file_content_types: 無効�画�ファイル
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: イン�ートファイル�形��正���り��ん。手順を見直���ファイル�UTF-8�エンコード�れ��る��を確�������。
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: イン�ートファイル�形��正���り��ん。手順を見直���ファイル�UTF-8�エンコード�れ��る��を確�������。
       new_import:
         attributes:
           file:
@@ -177,13 +197,14 @@ ja:
         reject: 拒�
         share: 共有
         user:
-          new: 新�ユーザー
+          new: 新��管�者
         verify: 確��る
       admin_terms_of_use:
         accept:
           error: 管�者��利用�約���中�エラー�発生����。
           success: �り���������管�者��利用�約�������。
         actions:
+          accept: 利用�約������
           are_you_sure: 管�者��利用�約を削除��もよ������？
           refuse: �����
           title: 利用�約����る
@@ -259,6 +280,8 @@ ja:
         update:
           error: ��添付ファイルを更新中��題�発生����。
           success: 添付ファイル�更新�れ���。
+      attachments_privacy_warning:
+        message: プライベートスペース�添付ファイルを扱�場��注�������．�����加者���文書を他�人�共有�る�������．
       autocomplete:
         no_results: �果�見��り��ん���
         search_prompt: 検索�る��少���も3文字を入力������
@@ -341,7 +364,7 @@ ja:
       dashboard:
         show:
           view_more_logs: も��ログを見る
-          welcome: Decidim 管�画��よ���。
+          welcome: 管�画��よ���。
       domain_whitelist:
         form:
           domain_too_short: ドメイン�短����
@@ -830,9 +853,22 @@ ja:
           invalid: CSVファイル�読�込���題�発生����。
           success: CSVファイル�正常�アップロード�れ���。出席者�招待メールを�信���。時間���る場���り��。
         new:
+          destroy:
+            button: ����プライベート�加者を削除
+            confirm: ����プライベート�加者を削除��もよ������？���作�元�戻���削除��データを復元����ん。
+            empty: プライベート��加者����ん。
+            explanation: '%{count} 人�プライベート�加者����。'
+            title: プライベート�加者を削除
           explanation: 'CSV ファイルをアップロード���。ファイル� 1列目�電�メール�2列目���を��形���る必���り��(email, name)。 ユーザー�� `<>?%&^*#@()[]=+:;"{}\|`�よ��無効�文字を使用��������。'
           title: CSVファイルをアップロード
           upload: アップロード
+      reminders:
+        create:
+          error: リマインダー作�中��題�発生����。
+          success:
+            other: "%{count} ユーザー�通知�れ��。"
+        new:
+          submit: �信
       resource_permissions:
         edit:
           submit: �信
@@ -890,6 +926,7 @@ ja:
         gallery:
           add_images: 画�を追加
           delete_image: 画�を削除
+          edit_images: 画�を編集
           gallery_legend: 画�ギャラリーを追加 (オプション)
       static_page_topics:
         create:
@@ -950,7 +987,7 @@ ja:
         static_pages: ページ
         statistics: アクティビティ
         user_groups: グループ
-        users: �加者
+        users: 管�者
       user_group:
         csv_verify:
           invalid: CSVファイル�読�込���題�発生����。
@@ -986,7 +1023,7 @@ ja:
           role: ロール
         new:
           create: 招待
-          title: 管�者����加者を招待
+          title: 新��管�者を招待�る
       users_statistics:
         users_count:
           admins: 管�者
@@ -1041,7 +1078,7 @@ ja:
             reportable_id: ID
             reportable_type: 種別
             reported_content_url: 報告�れ�コンテンツ URL
-            reports: レ�ート
+            reports: 報告
             visit_url: URL を�照
         report:
           fields:
diff --git a/decidim-admin/config/locales/ka-GE.yml b/decidim-admin/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-admin/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-admin/config/locales/lb.yml b/decidim-admin/config/locales/lb.yml
index eb59b47ebd642..c9d6aa7f26f08 100644
--- a/decidim-admin/config/locales/lb.yml
+++ b/decidim-admin/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -171,8 +172,6 @@ lb:
         permissions: Berechtigungen
         reject: Ablehnen
         share: Teilen
-        user:
-          new: Neuer Benutzer
         verify: Überprüfen
       admin_terms_of_use:
         accept:
@@ -336,7 +335,6 @@ lb:
       dashboard:
         show:
           view_more_logs: Weitere Protokolle anzeigen
-          welcome: Willkommen im Decidim Admin Panel.
       domain_whitelist:
         form:
           domain_too_short: Domain zu kurz
@@ -911,7 +909,6 @@ lb:
         static_pages: Seiten
         statistics: Aktivität
         user_groups: Benutzergruppen
-        users: Teilnehmer
       user_group:
         csv_verify:
           invalid: Beim Lesen der CSV-Datei ist ein Fehler aufgetreten.
@@ -947,7 +944,6 @@ lb:
           role: Rolle
         new:
           create: Einladen
-          title: Benutzer als Administrator einladen
       users_statistics:
         users_count:
           admins: Admins
diff --git a/decidim-admin/config/locales/lt.yml b/decidim-admin/config/locales/lt.yml
index 1b21e90a07894..168194f576a7b 100644
--- a/decidim-admin/config/locales/lt.yml
+++ b/decidim-admin/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -177,7 +178,7 @@ lt:
         reject: Atmesti
         share: Dalintis
         user:
-          new: Naujas naudotojas
+          new: Naujas administratorius
         verify: Patikrinti
       admin_terms_of_use:
         accept:
@@ -259,6 +260,8 @@ lt:
         update:
           error: Atnaujinant šį priedą iškilo problema.
           success: Priedas atnaujintas.
+      attachments_privacy_warning:
+        message: Elkitės atsargiai su priedais priva�iose aplinkose. Bet koks dalyvis gali pasidalinti dokumentais su kitais.
       autocomplete:
         no_results: Rezultatų nerasta
         search_prompt: Įveskite bent tris raides paieškai pradėti
@@ -341,7 +344,7 @@ lt:
       dashboard:
         show:
           view_more_logs: Peržiūrėti daugiau ataskaitų
-          welcome: '„Decidim“ administratoriaus sritis.'
+          welcome: Sveiki atvykę į administratorių puslapį.
       domain_whitelist:
         form:
           domain_too_short: Domenas per trumpas
@@ -842,9 +845,25 @@ lt:
           invalid: Skaitant CSV rinkmeną iškilo problema.
           success: CSV dokumentas įkeltas sėkmingai, dalyviai kvie�iami e. laišku - tai gali užtrukti.
         new:
+          destroy:
+            button: Ištrinti visus priva�ius dalyvius
+            confirm: Ar tikrai norite ištrinti visus priva�ius dalyvius? Atlikus šį veiksmą nebebus įmanoma sugražinti šių dalyvių į platformą.
+            empty: Neturite priva�ių dalyvių.
+            explanation: Turite %{count} priva�ių dalyvių.
+            title: Ištrinti priva�ius dalyvius
           explanation: 'Įkelkite CSV dokumentą. Jis turi turėti du stulpelius su naudotojų el. paštu pirmajame ir vardu paskutiniąjame. Dokumente neturėtų būti laukų pavadinimų ir šių simbolių naudotojų varduose "<>?%&^*#@()[]=+:;"{}\|".'
           title: Įkelkite CSV dokumentą
           upload: Įkelti
+      reminders:
+        create:
+          error: Kuriant priminimus iškilo problema.
+          success:
+            one: "%{count} naudotojui bus priminta."
+            few: "%{count} naudotojams bus priminta."
+            many: "%{count} naudotojų bus priminta."
+            other: "%{count} naudotojams bus priminta."
+        new:
+          submit: Siųsti
       resource_permissions:
         edit:
           submit: Pateikti
@@ -902,6 +921,7 @@ lt:
         gallery:
           add_images: Pridėti paveikslėlių
           delete_image: Pašalinti paveikslėlį
+          edit_images: Redaguoti paveikslėlį
           gallery_legend: Pridėti paveikslėlių galeriją (Neprivaloma)
       static_page_topics:
         create:
@@ -962,7 +982,7 @@ lt:
         static_pages: Puslapiai
         statistics: Veikla
         user_groups: GrupÄ—s
-        users: Dalyviai
+        users: Administratoriai
       user_group:
         csv_verify:
           invalid: Skaitant CSV rinkmeną iškilo problema.
@@ -998,7 +1018,7 @@ lt:
           role: RolÄ—
         new:
           create: Pakviesti
-          title: Kviesti dalyvį kaip administratorių
+          title: Pakviesti naują administratorių
       users_statistics:
         users_count:
           admins: Administratoriai
diff --git a/decidim-admin/config/locales/lv.yml b/decidim-admin/config/locales/lv.yml
index c87065a03c5ee..e5db5eccbe9fe 100644
--- a/decidim-admin/config/locales/lv.yml
+++ b/decidim-admin/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -262,7 +263,6 @@ lv:
       dashboard:
         show:
           view_more_logs: Skatīt vair�k ierakstu
-          welcome: Laipni lūdzam Decidim administratora panelī.
       exports:
         export_as: "%{name} k� %{export_format}"
         notice: Pašlaik notiek jūsu eksportēšana. Jūs saņemsiet e-pastu, kad t� būs pabeigta.
@@ -681,7 +681,6 @@ lv:
         static_pages: Lapas
         statistics: Aktivit�te
         user_groups: Grupas
-        users: Dalībnieki
       user_group:
         csv_verify:
           invalid: CSV faila lasīšanas laik� rad�s problēma.
@@ -717,7 +716,6 @@ lv:
           role: Loma
         new:
           create: Uzaicin�t
-          title: Uzaicin�t dalībnieku par administratoru
       users_statistics:
         users_count:
           admins: Administratori
@@ -749,10 +747,10 @@ lv:
       models:
         moderation:
           fields:
+            created_at: Izveides datums
             hidden_at: Paslēpts plkst.
             report_count: Skaits
             reported_content_url: Paziņot� satura URL
-            reports: Ziņojumi
             visit_url: Apmeklēt URL
   errors:
     messages:
diff --git a/decidim-admin/config/locales/nl.yml b/decidim-admin/config/locales/nl.yml
index ad1350d735f3a..38585c64d87d4 100644
--- a/decidim-admin/config/locales/nl.yml
+++ b/decidim-admin/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -177,7 +178,7 @@ nl:
         reject: Weigeren
         share: Deel
         user:
-          new: Nieuwe gebruiker
+          new: Nieuwe admin
         verify: Verifiëren
       admin_terms_of_use:
         accept:
@@ -259,6 +260,8 @@ nl:
         update:
           error: Er is een fout opgetreden bij het bijwerken van deze bijlage.
           success: Bijlage is succesvol bijgewerkt.
+      attachments_privacy_warning:
+        message: Wees voorzichtig bij het werken met bijlagen in een privéruimte. Elke deelnemer kan dit document delen met anderen.
       autocomplete:
         no_results: geen resultaten gevonden
         search_prompt: Typ minimaal drie tekens om te zoeken
@@ -341,7 +344,7 @@ nl:
       dashboard:
         show:
           view_more_logs: Bekijk meer logs
-          welcome: Welkom bij het Decidim Admin Panel.
+          welcome: Welkom bij de beheerder omgeving.
       domain_whitelist:
         form:
           domain_too_short: Domein te kort
@@ -834,9 +837,23 @@ nl:
           invalid: Er is een fout opgetreden bij het lezen van het CSV-bestand.
           success: Het CSV-bestand is succesvol geüploaded. We sturen een uitnodigingsmail naar de deelnemers. Dit kan even duren.
         new:
+          destroy:
+            button: Verwijder alle privé deelnemers
+            confirm: Weet je zeker dat je alle privédeelnemers wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt, je kan ze achteraf niet herstellen.
+            empty: Je hebt geen privé deelnemers.
+            explanation: Je hebt %{count} privédeelnemers.
+            title: Verwijder privé deelnemer
           explanation: 'Upload het CSV-bestand zonder headers. Het moet uit twee kolommen bestaan, met het e-mailadres in de eerste kolom en de naam in de laatste kolom van de gebruikers die je wil toevoegen aan de participatieve ruimte (e-mail, naam). Vermijd tekens als `<>?%&^*#@()[]=+:;"{}\|` in de namen.'
           title: Upload het CSV-bestand
           upload: Upload
+      reminders:
+        create:
+          error: Er is een probleem opgetreden bij het maken van herinneringen.
+          success:
+            one: "%{count} gebruiker zal een herinnering krijgen."
+            other: "%{count} gebruikers zullen een herinnering krijgen."
+        new:
+          submit: Verzenden
       resource_permissions:
         edit:
           submit: Bevestigen
@@ -894,6 +911,7 @@ nl:
         gallery:
           add_images: Afbeeldingen toevoegen
           delete_image: Afbeelding verwijderen
+          edit_images: Bewerk afbeeldingen
           gallery_legend: Voeg een afbeeldingsgalerij toe (optioneel)
       static_page_topics:
         create:
@@ -954,7 +972,7 @@ nl:
         static_pages: Pagina's
         statistics: Activiteit
         user_groups: groepen
-        users: Deelnemers
+        users: Beheerders
       user_group:
         csv_verify:
           invalid: Er is een fout opgetreden bij het lezen van het CSV-bestand.
@@ -990,7 +1008,7 @@ nl:
           role: Rol
         new:
           create: Nodig uit
-          title: Nodig deelnemer uit als beheerder
+          title: Nodig gebruiker uit als beheerder
       users_statistics:
         users_count:
           admins: Admins
@@ -1044,7 +1062,7 @@ nl:
             reportable_id: ID
             reportable_type: Type
             reported_content_url: Gerapporteerde inhouds-URL
-            reports: Meldingen
+            reports: Rapporten
             visit_url: Bezoek URL
         report:
           fields:
diff --git a/decidim-admin/config/locales/no.yml b/decidim-admin/config/locales/no.yml
index 2cd66e1bcbacf..cfb1f85918601 100644
--- a/decidim-admin/config/locales/no.yml
+++ b/decidim-admin/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -177,7 +178,7 @@
         reject: Avvis
         share: Del
         user:
-          new: Ny bruker
+          new: Ny admin
         verify: Verifiser
       admin_terms_of_use:
         accept:
@@ -259,6 +260,8 @@
         update:
           error: Det oppsto et problem med å oppdatere dette vedlegget.
           success: Vedlegg ble oppdatert.
+      attachments_privacy_warning:
+        message: Vær forsiktig når du arbeider med vedlegg i et privat rom. Alle deltakere kan dele dette dokumentet med andre.
       autocomplete:
         no_results: Ingen resultat funnet
         search_prompt: Skriv minst tre tegn for å søke
@@ -341,7 +344,7 @@
       dashboard:
         show:
           view_more_logs: Vis flere logger
-          welcome: Velkommen til Decidim administrator Panel.
+          welcome: Velkommen til Admin-panelet.
       domain_whitelist:
         form:
           domain_too_short: Domene er for kort
@@ -834,9 +837,23 @@
           invalid: Det oppstod et problem med å lese CSV-filen.
           success: CSV fil lastet opp. Vi sender en invitasjons email til deltakerne. Dette kan ta en stund.
         new:
+          destroy:
+            button: Slett alle private deltakere
+            confirm: Er du sikker på at du vil slette alle private deltakere? Denne handlingen kan ikke angres, du vil ikke kunne gjenopprette dem.
+            empty: Du har ingen private deltakere.
+            explanation: Du har %{count} private deltakere.
+            title: Slett private deltakere
           explanation: 'Last opp din CSV-fil. Det må være to kolonner uten overskrifter, e-post i den første kolonnen og navn i den siste kolonnen (e-post, navn) til brukerne du vil legge til i det deltakende rommet. Unngå å bruke ugyldige tegn som `<>?%&^*#@()[]=+:;"{}\″` med brukernavn.'
           title: Last opp din CSV fil
           upload: Last opp
+      reminders:
+        create:
+          error: Det oppsto et problem med å opprette påminnelser.
+          success:
+            one: "%{count} bruker vil bli påminnet."
+            other: "%{count} brukere vil bli påminnet."
+        new:
+          submit: Send
       resource_permissions:
         edit:
           submit: Send inn
@@ -894,6 +911,7 @@
         gallery:
           add_images: Legg til bilder
           delete_image: Slett bilde
+          edit_images: Rediger bilder
           gallery_legend: Legg til et bildegalleri (valgfritt)
       static_page_topics:
         create:
@@ -954,7 +972,7 @@
         static_pages: Sider
         statistics: Aktivitet
         user_groups: Grupper
-        users: Deltakere
+        users: Administratorer
       user_group:
         csv_verify:
           invalid: Det oppstod et problem med å lese CSV-filen.
@@ -990,7 +1008,7 @@
           role: Rolle
         new:
           create: Inviter
-          title: Inviter deltaker som administrator
+          title: Inviter ny administrator
       users_statistics:
         users_count:
           admins: Adminer
diff --git a/decidim-admin/config/locales/pl.yml b/decidim-admin/config/locales/pl.yml
index ea63ddbbb5b7f..e795272bfcf9f 100644
--- a/decidim-admin/config/locales/pl.yml
+++ b/decidim-admin/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -340,7 +341,7 @@ pl:
       dashboard:
         show:
           view_more_logs: Zobacz więcej logów
-          welcome: Witamy w panelu administracyjnym Decidim.
+          welcome: Witamy w Panelu Administracyjnym.
       domain_whitelist:
         form:
           domain_too_short: Domena jest zbyt krótka
@@ -841,9 +842,22 @@ pl:
           invalid: Wystąpił błąd podczas odczytu pliku CSV.
           success: Plik CSV został pomyślnie wgrany, wysyłamy e-mail z zaproszeniem do uczestników. To może zająć chwilę.
         new:
+          destroy:
+            button: Usuń wszystkich prywatnych uczestników
+            title: Usuń prywatnych uczestników
           explanation: 'Prześlij swój plik CSV. Plik musi składać się z dwóch kolumn: w pierwszej kolumnie adresy e-mail, w drugiej kolumnie imiona (adres e-mail, imię) użytkowników, których chcesz dodać do przestrzeni partycypacyjnej; bez nagłówków. Unikaj używania niepoprawnych znaków takich jak `<>?%&^*#@()[]=+:;"{}\|` w imieniu użytkownika.'
           title: Prześlij swój plik CSV
           upload: Prześlij
+      reminders:
+        create:
+          error: Wystąpił błąd podczas tworzenia przypomnień.
+          success:
+            one: "%{count} użytkownik otrzyma przypomnienie."
+            few: "%{count} użytkowników otrzyma przypomnienie."
+            many: "%{count} użytkowników otrzyma przypomnienie."
+            other: "%{count} użytkowników otrzyma przypomnienie."
+        new:
+          submit: Wyślij
       resource_permissions:
         edit:
           submit: Zatwierdź
@@ -901,6 +915,7 @@ pl:
         gallery:
           add_images: Dodaj obrazy
           delete_image: Usuń obraz
+          edit_images: Edytuj obrazy
           gallery_legend: Dodaj galerię obrazów (opcjonalnie)
       static_page_topics:
         create:
@@ -961,7 +976,7 @@ pl:
         static_pages: Strony
         statistics: Aktywność
         user_groups: Grupy użytkowników
-        users: Użytkownicy
+        users: Administratorzy
       user_group:
         csv_verify:
           invalid: Wystąpił błąd podczas odczytu pliku CSV.
@@ -997,7 +1012,7 @@ pl:
           role: Rola
         new:
           create: ZaproÅ›
-          title: Zaproś użytkownika jako administratora
+          title: ZaproÅ› nowego administratora
       users_statistics:
         users_count:
           admins: Administratorzy
diff --git a/decidim-admin/config/locales/pt-BR.yml b/decidim-admin/config/locales/pt-BR.yml
index d17a28a27dacf..e8d0e06efcdef 100644
--- a/decidim-admin/config/locales/pt-BR.yml
+++ b/decidim-admin/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -170,8 +171,6 @@ pt-BR:
         permissions: Permissões
         reject: Negar
         share: Compartilhar
-        user:
-          new: Novo usuário
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -330,7 +329,6 @@ pt-BR:
       dashboard:
         show:
           view_more_logs: Ver mais registros
-          welcome: Bem-vindo ao Decidim Admin Panel.
       domain_whitelist:
         form:
           domain_too_short: Domínio muito curto
@@ -898,7 +896,6 @@ pt-BR:
         static_pages: Páginas
         statistics: Atividade
         user_groups: Grupos de usuários
-        users: Participantes
       user_group:
         csv_verify:
           invalid: Ocorreu um erro ao ler o arquivo CSV.
@@ -934,7 +931,6 @@ pt-BR:
           role: Cargo
         new:
           create: Convite
-          title: Convide o usuário como administrador
       users_statistics:
         users_count:
           admins: Admins
@@ -997,7 +993,7 @@ pt-BR:
     decidim:
       admin:
         global_moderations:
-          title: Moderações globais
+          title: Moderadores globais
         newsletters:
           title: Boletins informativos
         settings:
diff --git a/decidim-admin/config/locales/pt.yml b/decidim-admin/config/locales/pt.yml
index bb7170174fa23..6363519fbdea7 100644
--- a/decidim-admin/config/locales/pt.yml
+++ b/decidim-admin/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -171,8 +172,6 @@ pt:
         permissions: Permissões
         reject: Rejeitar
         share: Partilhar
-        user:
-          new: Novo utilizador
         verify: Verificar
       admin_terms_of_use:
         accept:
@@ -336,7 +335,6 @@ pt:
       dashboard:
         show:
           view_more_logs: Ver mais registos
-          welcome: Bem-vindo ao Painel de Administração de Decidim.
       domain_whitelist:
         form:
           domain_too_short: Domínio demasiado curto
@@ -913,7 +911,6 @@ pt:
         static_pages: Páginas
         statistics: Atividade
         user_groups: Grupos
-        users: Participantes
       user_group:
         csv_verify:
           invalid: Ocorreu um problema ao ler o ficheiro CSV.
@@ -949,7 +946,6 @@ pt:
           role: Função
         new:
           create: Convidar
-          title: Convidar o(a) participante como administrador(a)
       users_statistics:
         users_count:
           admins: Administradores
diff --git a/decidim-admin/config/locales/ro-RO.yml b/decidim-admin/config/locales/ro-RO.yml
index acccb31b9b33b..57981c9a587c6 100644
--- a/decidim-admin/config/locales/ro-RO.yml
+++ b/decidim-admin/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ ro:
         description: Descriere
         file: FiÅŸier
         title: Numele fișierului sau al imaginii atașate
+        weight: Poziție
       attachment_collection:
         description: Descriere
         name: Nume
+        weight: Poziție
       category:
         description: Descriere
         name: Nume
         parent_id: Categoria mamă
+        weight: Poziție
       component:
         name: Nume
         published_at: Publicat în
-        weight: Ordinea în poziționare
+        weight: Poziție
+      external_domain:
+        value: Valoare
+      help_section:
+        content: Conținut
       id: ID
       import:
         user_group_id: Creează importuri ca
@@ -92,6 +100,9 @@ ro:
         welcome_notification_body: Conținutul notificării de bun venit
         welcome_notification_subject: Subiectul notificării de bun venit
         youtube_handler: Responsabil YouTube
+      participatory_space_private_user:
+        email: E-mail
+        name: Nume
       scope:
         code: Cod
         name: Nume
@@ -113,12 +124,13 @@ ro:
         show_in_footer: Afișează în subsol
         slug: URL slug
         title: Titlu
-        weight: Ordinea în poziționare
+        topic_id: Subiect
+        weight: Poziție
       static_page_topic:
         description: Descriere
         show_in_footer: Afișează în subsol
         title: Titlu
-        weight: Ordinea în poziționare
+        weight: Poziție
       user_group_csv_verification:
         file: FiÅŸier
     errors:
@@ -133,6 +145,14 @@ ro:
               allowed_file_content_types: Fișier invalid
             official_img_header:
               allowed_file_content_types: Fișier invalid
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Fişier de import malformat, vă rugăm să citiţi instrucţiunile cu atenţie şi asiguraţi-vă că fişierul este codificat UTF-8.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Fişier de import malformat, vă rugăm să citiţi instrucţiunile cu atenţie şi asiguraţi-vă că fişierul este codificat UTF-8.
       new_import:
         attributes:
           file:
@@ -177,7 +197,7 @@ ro:
         reject: Respinge
         share: Distribuie
         user:
-          new: Utilizator nou
+          new: Administrator nou
         verify: Verifică
       admin_terms_of_use:
         accept:
@@ -260,6 +280,8 @@ ro:
         update:
           error: A apărut o eroare la actualizarea acestui atașament.
           success: Atașamentul a fost actualizat cu succes.
+      attachments_privacy_warning:
+        message: Fiți precaut atunci când lucrați cu atașamente într-un spațiu privat. Orice participant poate distribui acest document altora.
       autocomplete:
         no_results: Nu a fost găsit niciun rezultat
         search_prompt: Tastați cel puțin trei caractere pentru a căuta
@@ -342,7 +364,7 @@ ro:
       dashboard:
         show:
           view_more_logs: Afișează mai multe înregistrări
-          welcome: Bine ați venit în Panoul de administrare Decidim.
+          welcome: Bine ați venit în Panoul de administrare.
       domain_whitelist:
         form:
           domain_too_short: Domeniul e prea scurt
@@ -839,9 +861,24 @@ ro:
           invalid: A apărut o problemă la citirea fișierului CSV.
           success: Fișier-ul CSV a fost încărcat cu succes, trimitem un e-mail de invitație participanților. Acest lucru ar putea dura puțin timp.
         new:
+          destroy:
+            button: Șterge toți participanții privați
+            confirm: Sunteți sigur că doriți să ștergeți toți participanții privați? Această acțiune nu poate fi anulată, și nu îi veți putea recupera.
+            empty: Nu aveți niciun participant privat.
+            explanation: Aveți %{count} participanți privați.
+            title: Ștergere participanți privați
           explanation: 'Încărcă fişierul tău CSV. Trebuie să aibă două coloane cu e-mail în prima coloană a fișierului și numele în ultima coloană (e-mail, numele) pentru utilizatorii pe care doriţi să îi adăugaţi în spaţiul participativ, fără antet. Evită folosirea caracterelor invalide, cum ar fi `<>?%&^*#@()[]=+:;"{}\<unk> ` în numele utilizatorului.'
           title: Încarcă fișierul tău CSV
           upload: Încarcă
+      reminders:
+        create:
+          error: A apărut o eroare la crearea de memento-uri.
+          success:
+            one: "I se va reaminti utilizatorului."
+            few: "Se va reaminti celor %{count} utilizatori."
+            other: "Se va reaminti celor %{count} utilizatori."
+        new:
+          submit: Trimite
       resource_permissions:
         edit:
           submit: Trimite
@@ -899,6 +936,7 @@ ro:
         gallery:
           add_images: Adaugă imagini
           delete_image: Șterge imaginea
+          edit_images: Editare imagini
           gallery_legend: Adaugă o galerie de imagini (opțional)
       static_page_topics:
         create:
@@ -959,7 +997,7 @@ ro:
         static_pages: Pagini
         statistics: Activitate
         user_groups: Grupuri
-        users: Participanți
+        users: Administratori
       user_group:
         csv_verify:
           invalid: A apărut o problemă la citirea fișierului CSV.
@@ -995,7 +1033,7 @@ ro:
           role: Rol
         new:
           create: Invită
-          title: Invită participantul ca administrator
+          title: Invită un administrator nou
       users_statistics:
         users_count:
           admins: Administratori
@@ -1047,6 +1085,7 @@ ro:
             hidden_at: Ascuns la
             participatory_space: Spațiu participativ
             report_count: Număr
+            reportable_id: ID
             reportable_type: Tip
             reported_content_url: URL-ul conținutului raportat
             reports: Rapoarte
@@ -1063,7 +1102,7 @@ ro:
     decidim:
       admin:
         global_moderations:
-          title: Moderare globală
+          title: Moderări globale
         newsletters:
           title: Buletine informative
         settings:
diff --git a/decidim-admin/config/locales/ru.yml b/decidim-admin/config/locales/ru.yml
index eeec00789b2ca..131090ed32947 100644
--- a/decidim-admin/config/locales/ru.yml
+++ b/decidim-admin/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -249,7 +250,6 @@ ru:
       dashboard:
         show:
           view_more_logs: Про�мотреть другие журналы
-          welcome: Добро пожаловать в админ-панель Де�идим!
       exports:
         export_as: "%{name} как %{export_format}"
         notice: Идет �охранение в виде файла. Вы получите �лектронное пи�ьмо, когда оно будет завершено.
@@ -501,6 +501,9 @@ ru:
         edit:
           active_content_blocks: Блоки дей�твующего �одержимого
           inactive_content_blocks: Блоки недей�твующего �одержимого
+      organization_homepage_content_blocks:
+        edit:
+          update: Обновить
       participatory_space_private_users:
         create:
           error: При попытке добавить ча�тного уча�тника в �то про�тран�тво �оуча�ти� произошла ошибка.
@@ -575,7 +578,6 @@ ru:
         scopes: Охваты
         static_pages: Страницы
         user_groups: Группы уча�тников
-        users: Уча�тники
       user_group:
         reject:
           invalid: При отказе от �той группы уча�тников произошла ошибка.
@@ -606,7 +608,6 @@ ru:
           role: Роль
         new:
           create: Пригла�ить
-          title: Пригла�ить уча�тника в каче�тве админи�тратора
       users_statistics:
         users_count:
           admins: �дмини�траторы
@@ -634,10 +635,10 @@ ru:
       models:
         moderation:
           fields:
+            created_at: Дата �оздани�
             hidden_at: 'Скрыто:'
             report_count: Количе�тво
             reported_content_url: Веб-адре� обжалованного �одержимого
-            reports: Жалобы
             visit_url: По�етите веб-адре�
   errors:
     messages:
diff --git a/decidim-admin/config/locales/sk.yml b/decidim-admin/config/locales/sk.yml
index 2d23aa3e93ec5..e96dbeab7be07 100644
--- a/decidim-admin/config/locales/sk.yml
+++ b/decidim-admin/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -264,7 +265,6 @@ sk:
       dashboard:
         show:
           view_more_logs: Zobraziť viac logov
-          welcome: Vitajte v Administrátorskom Paneli Decidim.
       exports:
         export_as: "%{name} ako %{export_format}"
         notice: Váš export práve prebieha. Obdržíte e-mail po dokon�ení.
@@ -688,7 +688,6 @@ sk:
         static_pages: Stránky
         statistics: Aktivita
         user_groups: Skupiny
-        users: Ú�astníci
       user_group:
         csv_verify:
           invalid: Vyskytol sa problém s �ítaním súboru CSV.
@@ -724,7 +723,6 @@ sk:
           role: Rola
         new:
           create: Pozvať
-          title: Pozvať ú�astníka ako administrátora
       users_statistics:
         users_count:
           admins: Administrátori
@@ -756,10 +754,10 @@ sk:
       models:
         moderation:
           fields:
+            created_at: Dátum vytvorenia
             hidden_at: Skryté
             report_count: Po�et
             reported_content_url: Nahlásiť URL obsahu
-            reports: Nahlásenia
             visit_url: Navštíviť URL
   errors:
     messages:
diff --git a/decidim-admin/config/locales/sl.yml b/decidim-admin/config/locales/sl.yml
index c533b0a0af289..ab8ac6ba48c26 100644
--- a/decidim-admin/config/locales/sl.yml
+++ b/decidim-admin/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-admin/config/locales/sr-CS.yml b/decidim-admin/config/locales/sr-CS.yml
index c5428be3316a1..d048c1575068c 100644
--- a/decidim-admin/config/locales/sr-CS.yml
+++ b/decidim-admin/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
@@ -264,7 +265,6 @@ sr:
       dashboard:
         show:
           view_more_logs: Pogledaj još zapisa iz evidencije
-          welcome: Dobrošli u Decidim Admin Panel.
       exports:
         export_as: "%{name} kao %{export_format}"
         notice: Vaš prenos podataka je u toku. Dobićete e-mail poruku kada bude završen.
@@ -556,6 +556,9 @@ sr:
           images:
             preview: Pregled
           omnipresent_banner_appearance_title: Izmeni sveprisutni baner
+      organization_homepage_content_blocks:
+        edit:
+          update: Ažuriraj
       shared:
         gallery:
           add_images: Dodaj slike
@@ -564,10 +567,14 @@ sr:
       titles:
         metrics: Metrika
         statistics: Aktivnost
-        users: U�esnici
       users_statistics:
         users_count:
           last_day: Poslednji dan
           last_month: Poslednji mesec
           last_week: Poslednje nedelje
           no_users_count_statistics_yet: Još nema statistike o broju korisnika
+    moderations:
+      models:
+        moderation:
+          fields:
+            created_at: Datum kreiranja
diff --git a/decidim-admin/config/locales/sv.yml b/decidim-admin/config/locales/sv.yml
index 74504efb3b08b..e1888698366da 100644
--- a/decidim-admin/config/locales/sv.yml
+++ b/decidim-admin/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -14,17 +15,24 @@ sv:
         description: Beskrivning
         file: Fil
         title: Bilaga eller bildnamn
+        weight: Ordning
       attachment_collection:
         description: Beskrivning
         name: Namn
+        weight: Ordning
       category:
         description: Beskrivning
         name: Namn
         parent_id: Överordnad
+        weight: Ordning
       component:
         name: Namn
         published_at: Publicerad
-        weight: Vikt
+        weight: Ordning
+      external_domain:
+        value: Värde
+      help_section:
+        content: Innehåll
       id: ID
       import:
         user_group_id: Skapa import som
@@ -92,6 +100,9 @@ sv:
         welcome_notification_body: Välkomstmeddelandets brödtext
         welcome_notification_subject: Välkomstmeddelandets ämnesrad
         youtube_handler: YouTube-hanterare
+      participatory_space_private_user:
+        email: E-post
+        name: Namn
       scope:
         code: Kod
         name: Namn
@@ -113,12 +124,13 @@ sv:
         show_in_footer: Visa i sidfoten
         slug: URL slug
         title: Titel
-        weight: Vikt
+        topic_id: Ämne
+        weight: Ordning
       static_page_topic:
         description: Beskrivning
         show_in_footer: Visa i sidfoten
         title: Titel
-        weight: Vikt
+        weight: Ordning
       user_group_csv_verification:
         file: Fil
     errors:
@@ -133,6 +145,14 @@ sv:
               allowed_file_content_types: Ogiltig bildfil
             official_img_header:
               allowed_file_content_types: Ogiltig bildfil
+        participatory_space_private_user_csv_import:
+          attributes:
+            file:
+              malformed: Fel format, läs igenom instruktionerna noga och se till att filen är UTF-8 kodad.
+        user_group_csv_verification:
+          attributes:
+            file:
+              malformed: Fel format, läs igenom instruktionerna noga och se till att filen är UTF-8 kodad.
       new_import:
         attributes:
           file:
@@ -184,6 +204,7 @@ sv:
           error: Ett fel inträffade när användarvillkoren för administratörer skulle godkännas.
           success: Du har godkänt användarvillkoren för administratörer.
         actions:
+          accept: Jag godkänner villkoren
           are_you_sure: Är du säker på att du vill avvisa administratörsvillkoren?
           refuse: Avvisa villkoren för administratörer
           title: Godkänn användarvillkoren
@@ -259,6 +280,8 @@ sv:
         update:
           error: Det gick inte att uppdatera bilagan.
           success: Bilagan har uppdaterats.
+      attachments_privacy_warning:
+        message: Var försiktig när du arbetar med bilagor i ett privat utrymme. En deltagare skulle kunna dela detta dokument utanför plattformen.
       autocomplete:
         no_results: Hittade inga resultat
         search_prompt: Sök genom att skriva minst tre tecken
@@ -341,7 +364,7 @@ sv:
       dashboard:
         show:
           view_more_logs: Visa fler loggar
-          welcome: Välkommen till Decidims adminpanel.
+          welcome: Välkommen till Adminpanelen.
       domain_whitelist:
         form:
           domain_too_short: Domänen är för kort
@@ -834,9 +857,23 @@ sv:
           invalid: Det gick inte att läsa CSV-filen.
           success: CSV-filen har skickats in och vi skickar inbjudningar via e-brev till deltagarna. Det kan ta en stund.
         new:
+          destroy:
+            button: Radera alla privata deltagare
+            confirm: Är du säker på att du vill radera alla privata deltagare? Den här åtgärden kan inte ångras.
+            empty: Det finns inga privata deltagare.
+            explanation: Det finns %{count} privata deltagare.
+            title: Radera privata deltagare
           explanation: 'Skicka in din CSV-fil. Den måste ha två kolumner över de användare som du vill lägga till deltagarutrymmet, utan rubriker, med e-postadressen i den första kolumnen i filen och namnet i den sista kolumnen i filen (e-post, namn). Undvik olämpliga karaktärer som `<>?%&^*#@()[]=+:;"{}\|` i användarnamn.'
           title: Skicka CSV-fil
           upload: Skicka
+      reminders:
+        create:
+          error: Det gick inte att skapa påminnelser.
+          success:
+            one: "%{count} användare kommer påminnas."
+            other: "%{count} användare kommer påminnas."
+        new:
+          submit: Skicka
       resource_permissions:
         edit:
           submit: Skicka in
@@ -894,6 +931,7 @@ sv:
         gallery:
           add_images: Lägg till bilder
           delete_image: Ta bort bild
+          edit_images: Redigera bilder
           gallery_legend: Lägg till ett bildgalleri (Frivilligt)
       static_page_topics:
         create:
@@ -954,7 +992,7 @@ sv:
         static_pages: Sidor
         statistics: Aktivitet
         user_groups: Grupper
-        users: Deltagare
+        users: Administratörer
       user_group:
         csv_verify:
           invalid: Det gick inte att läsa CSV-filen.
@@ -990,7 +1028,7 @@ sv:
           role: Roll
         new:
           create: Bjud in
-          title: Bjud in användaren som administratör
+          title: Bjud in ny administratör
       users_statistics:
         users_count:
           admins: Administratörer
@@ -1038,6 +1076,7 @@ sv:
         moderation:
           fields:
             created_at: Skapandedatum
+            deleted_resource: Borttagen resurs
             hidden_at: Dold
             participatory_space: Deltagarutrymme
             report_count: Antal
diff --git a/decidim-admin/config/locales/tr-TR.yml b/decidim-admin/config/locales/tr-TR.yml
index f390458dcbd53..bf2521bdebdaa 100644
--- a/decidim-admin/config/locales/tr-TR.yml
+++ b/decidim-admin/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -77,6 +78,8 @@ tr:
         welcome_notification_body: Karşılama bildirimi gövdesi
         welcome_notification_subject: Karşılama bildirimi konusu
         youtube_handler: YouTube iÅŸleyici
+      participatory_space_private_user:
+        name: Adı
       scope:
         code: kod
         name: isim
@@ -295,7 +298,6 @@ tr:
       dashboard:
         show:
           view_more_logs: Daha fazla günlükleri görüntüle
-          welcome: Decidim Yönetici Paneline hoş geldiniz.
       exports:
         export_as: "%{name} olarak %{export_format}"
         formats:
@@ -800,7 +802,6 @@ tr:
         static_pages: Sayfalar
         statistics: Aktivite
         user_groups: Kullanıcı Grupları
-        users: Katılımcılar
       user_group:
         csv_verify:
           invalid: CSV dosyasını okurken bir hata oluştu.
@@ -836,7 +837,6 @@ tr:
           role: Rol
         new:
           create: Davet et
-          title: Kullanıcıyı yönetici olarak davet et
       users_statistics:
         users_count:
           admins: Yöneticiler
diff --git a/decidim-admin/config/locales/uk.yml b/decidim-admin/config/locales/uk.yml
index 03ce9fbee6c89..ecbb03056a41d 100644
--- a/decidim-admin/config/locales/uk.yml
+++ b/decidim-admin/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -223,7 +224,6 @@ uk:
       dashboard:
         show:
           view_more_logs: Перегл�нути інші журнали
-          welcome: Ла�каво про�имо до адмін-панелі Де�ідім!
       exports:
         export_as: "%{name} �к %{export_format}"
         notice: Зараз відбуваєть�� збереженн� у вигл�ді файлу. Ви отримаєте електронного ли�та пі�л� його завершенн�.
@@ -457,6 +457,9 @@ uk:
         edit:
           active_content_blocks: Блоки діючого вмі�ту
           inactive_content_blocks: Блоки недіючого вмі�ту
+      organization_homepage_content_blocks:
+        edit:
+          update: Оновити
       participatory_space_private_users:
         create:
           error: При �пробі додати приватного уча�ника до цього про�тору �півуча�ті �тала�� помилка.
@@ -557,7 +560,6 @@ uk:
           role: Роль
         new:
           create: Запро�ити
-          title: Запро�ити уча�ника в �ко�ті адміні�тратора
       users_statistics:
         users_count:
           admins: �дміні�тратори
@@ -579,10 +581,10 @@ uk:
       models:
         moderation:
           fields:
+            created_at: Дата �творенн�
             hidden_at: 'Приховано:'
             report_count: Кількі�ть
             reported_content_url: Веб-адре�а о�карженого вмі�ту
-            reports: Скарги
             visit_url: Відвідайте веб-адре�у
   errors:
     messages:
diff --git a/decidim-admin/config/locales/val-ES.yml b/decidim-admin/config/locales/val-ES.yml
index ab90a2c7f0dea..a6d764b061962 100644
--- a/decidim-admin/config/locales/val-ES.yml
+++ b/decidim-admin/config/locales/val-ES.yml
@@ -1,3 +1,4 @@
+---
 val:
   decidim:
     admin:
diff --git a/decidim-admin/config/locales/zh-CN.yml b/decidim-admin/config/locales/zh-CN.yml
index b2dcb4d13f165..55c07da3f4b47 100644
--- a/decidim-admin/config/locales/zh-CN.yml
+++ b/decidim-admin/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -273,7 +274,6 @@ zh-CN:
       dashboard:
         show:
           view_more_logs: 查看更多日志
-          welcome: 欢迎�到Decidim管���
       exports:
         export_as: "%{name} 为 %{export_format}"
         formats:
@@ -731,7 +731,6 @@ zh-CN:
         static_pages: 页 次
         statistics: 活动
         user_groups: 群組
-        users: �加者
       user_group:
         csv_verify:
           invalid: 读�CSV文件时出现问题。
@@ -767,7 +766,6 @@ zh-CN:
           role: 作用
         new:
           create: 邀请
-          title: 邀请�与者作为管�员
       users_statistics:
         users_count:
           admins: 管�员
@@ -799,10 +797,10 @@ zh-CN:
       models:
         moderation:
           fields:
+            created_at: 创建日期
             hidden_at: ��于
             report_count: 计数
             reported_content_url: 报告的内容 URL
-            reports: 报告
             visit_url: 访问 URL
   errors:
     messages:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index eb1c6d3c0146e..60a7519adda15 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-admin"
   s.summary = "Decidim organization administration"
diff --git a/decidim-admin/lib/decidim/admin/engine.rb b/decidim-admin/lib/decidim/admin/engine.rb
index 2f3b8f6fe9c19..7d9399cff7e97 100644
--- a/decidim-admin/lib/decidim/admin/engine.rb
+++ b/decidim-admin/lib/decidim/admin/engine.rb
@@ -7,7 +7,6 @@
 require "devise-i18n"
 require "decidim/core"
 require "foundation_rails_helper"
-require "rectify"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "hashdiff"
diff --git a/decidim-admin/lib/decidim/admin/import/importer.rb b/decidim-admin/lib/decidim/admin/import/importer.rb
index 0f60544075eae..4881ac13f6119 100644
--- a/decidim-admin/lib/decidim/admin/import/importer.rb
+++ b/decidim-admin/lib/decidim/admin/import/importer.rb
@@ -10,6 +10,8 @@ module Import
       # You can also use the ImporterFactory class to create an Importer
       # instance.
       class Importer
+        include Decidim::ProcessesFileLocally
+
         delegate :errors, to: :verifier
 
         # Public: Initializes an Importer.
@@ -72,15 +74,15 @@ def collection_data
           return @collection_data if @collection_data
 
           @collection_data = []
-          reader.new(file).read_rows do |rowdata, index|
-            if index.zero?
-              @data_headers = rowdata.map { |d| d.to_s.to_sym }
-            else
-              @collection_data << Hash[
-                rowdata.each_with_index.map do |val, ind|
+          process_file_locally(file) do |file_path|
+            reader.new(file_path).read_rows do |rowdata, index|
+              if index.zero?
+                @data_headers = rowdata.map { |d| d.to_s.to_sym }
+              else
+                @collection_data << rowdata.each_with_index.to_h do |val, ind|
                   [@data_headers[ind], val]
                 end
-              ]
+              end
             end
           end
 
diff --git a/decidim-admin/lib/decidim/admin/import/readers/json.rb b/decidim-admin/lib/decidim/admin/import/readers/json.rb
index f2eea98d1d169..b7a02db7d84b1 100644
--- a/decidim-admin/lib/decidim/admin/import/readers/json.rb
+++ b/decidim-admin/lib/decidim/admin/import/readers/json.rb
@@ -39,7 +39,7 @@ def example_file(data)
             columns = data.shift
             json_data = data.map do |row|
               deep_hash(
-                columns.each_with_index.map { |col, ind| [col, row[ind]] }.to_h
+                columns.each_with_index.to_h { |col, ind| [col, row[ind]] }
               )
             end
 
diff --git a/decidim-admin/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb b/decidim-admin/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb
index 30267d1ec69f4..72a9f821dfb10 100644
--- a/decidim-admin/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb
@@ -7,6 +7,7 @@ module Admin
     shared_examples_for "CreateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "attachment_collection" => {
@@ -27,11 +28,11 @@ module Admin
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, collection_for) }
+        let(:command) { described_class.new(form, collection_for, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +56,18 @@ module Admin
               command.call
             end.to change(collection_for.attachment_collections, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/commands/create_category_examples.rb b/decidim-admin/lib/decidim/admin/test/commands/create_category_examples.rb
index 699fb0921c974..1916a5941292c 100644
--- a/decidim-admin/lib/decidim/admin/test/commands/create_category_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/commands/create_category_examples.rb
@@ -7,15 +7,13 @@ module Admin
     shared_examples_for "CreateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
               "name_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
+              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
             }
           }
         end
@@ -27,11 +25,11 @@ module Admin
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, participatory_space) }
+        let(:command) { described_class.new(form, participatory_space, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +53,18 @@ module Admin
               command.call
             end.to change(participatory_space.categories, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/commands/destroy_category_examples.rb b/decidim-admin/lib/decidim/admin/test/commands/destroy_category_examples.rb
index eba22d911a8b5..f369262777db6 100644
--- a/decidim-admin/lib/decidim/admin/test/commands/destroy_category_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/commands/destroy_category_examples.rb
@@ -7,8 +7,9 @@ module Admin
     shared_examples_for "DestroyCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
-        let(:command) { described_class.new(category) }
+        let(:command) { described_class.new(category, user) }
 
         describe "when the category is not present" do
           let(:category) { nil }
@@ -28,6 +29,21 @@ module Admin
           end
         end
 
+        context "when the category is a subcategory" do
+          let!(:parent_category) { create :category, participatory_space: participatory_space }
+
+          before do
+            category.parent = parent_category
+          end
+
+          it "destroy the category" do
+            category
+            expect do
+              command.call
+            end.to change(Category, :count).by(-1)
+          end
+        end
+
         describe "when the data is valid" do
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)
@@ -39,6 +55,18 @@ module Admin
               command.call
             end.to change(Category, :count).by(-1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:delete, category, user)
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("delete")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb b/decidim-admin/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb
index 9992183850481..46415c5c1f181 100644
--- a/decidim-admin/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb
@@ -7,6 +7,7 @@ module Admin
     shared_examples_for "UpdateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
         let(:form_params) do
           {
@@ -28,11 +29,11 @@ module Admin
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(attachment_collection, form) }
+        let(:command) { described_class.new(attachment_collection, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +59,18 @@ module Admin
 
             expect(translated(attachment_collection.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/commands/update_category_examples.rb b/decidim-admin/lib/decidim/admin/test/commands/update_category_examples.rb
index 2eb18ee44f632..8dc24c0787e73 100644
--- a/decidim-admin/lib/decidim/admin/test/commands/update_category_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/commands/update_category_examples.rb
@@ -7,16 +7,14 @@ module Admin
     shared_examples_for "UpdateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => "New title",
               "name_es" => "Title",
-              "name_ca" => "Title",
-              "description_en" => "Description",
-              "description_es" => "Description",
-              "description_ca" => "Description"
+              "name_ca" => "Title"
             }
           }
         end
@@ -28,11 +26,11 @@ module Admin
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(category, form) }
+        let(:command) { described_class.new(category, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +56,18 @@ module Admin
 
             expect(translated(category.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_user_roles_examples.rb b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_user_roles_examples.rb
index a8e11319f204b..e2329325e0ae6 100644
--- a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_user_roles_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_user_roles_examples.rb
@@ -99,7 +99,7 @@
         apply_filter("Invite accepted", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -110,7 +110,7 @@
         apply_filter("Invite accepted", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -123,7 +123,7 @@
         apply_filter("Ever logged in", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -134,7 +134,7 @@
         apply_filter("Ever logged in", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
diff --git a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
index cba5701f747ea..3df25dc1c1c1f 100644
--- a/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/filters_participatory_space_users_examples.rb
@@ -7,7 +7,7 @@
         apply_filter("Invitation sent", "Not sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -18,7 +18,7 @@
         apply_filter("Invitation sent", "Sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -31,7 +31,7 @@
         apply_filter("Invitation accepted", "Not accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -42,7 +42,7 @@
         apply_filter("Invitation accepted", "Accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
diff --git a/decidim-admin/lib/decidim/admin/test/forms/category_form_examples.rb b/decidim-admin/lib/decidim/admin/test/forms/category_form_examples.rb
index 4225429f8fa90..1d8c24dfae8a5 100644
--- a/decidim-admin/lib/decidim/admin/test/forms/category_form_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/forms/category_form_examples.rb
@@ -21,13 +21,6 @@ module Admin
           ca: "Nom"
         }
       end
-      let(:description) do
-        {
-          en: "Description",
-          es: "Descripción",
-          ca: "Descripció"
-        }
-      end
       let(:parent_id) { nil }
       let(:attributes) do
         {
@@ -35,10 +28,7 @@ module Admin
             "name_en" => name[:en],
             "name_es" => name[:es],
             "name_ca" => name[:ca],
-            "parent_id" => parent_id,
-            "description_en" => description[:en],
-            "description_es" => description[:es],
-            "description_ca" => description[:ca]
+            "parent_id" => parent_id
           }
         }
       end
@@ -59,16 +49,6 @@ module Admin
         it { is_expected.to be_invalid }
       end
 
-      context "when some language in description is missing" do
-        let(:description) do
-          {
-            ca: "Descripció"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when the parent_id is set" do
         let!(:category) { create :category, participatory_space: participatory_space }
 
diff --git a/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
index b71f15db85f60..9c32901e56b00 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb
@@ -48,8 +48,11 @@
           es: "Este documento contiene información importante",
           ca: "Aquest document conté informació important"
         )
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
 
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 
@@ -81,7 +84,11 @@
         )
 
         select translated(attachment_collection.name, locale: :en), from: "attachment_attachment_collection_id"
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 
diff --git a/decidim-admin/lib/decidim/admin/test/manage_categories_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_categories_examples.rb
index 1770f81562722..6a5c9d2e25a20 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_categories_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_categories_examples.rb
@@ -14,9 +14,6 @@
 
     expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
     expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
-    within ".editor .editor-container" do
-      expect(page).to have_content(strip_tags(translated(category.description, locale: :en)))
-    end
 
     expect(page).to have_selector("select#category_parent_id")
   end
@@ -32,13 +29,6 @@
         es: "Mi categoría",
         ca: "La meva categoria"
       )
-      fill_in_i18n_editor(
-        :category_description,
-        "#category-description-tabs",
-        en: "Description",
-        es: "Descripción",
-        ca: "Descripció"
-      )
 
       find("*[type=submit]").click
     end
diff --git a/decidim-admin/lib/decidim/admin/test/manage_component_permissions_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_component_permissions_examples.rb
index 14d9c03ad45d7..b0cbcfeb6072a 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_component_permissions_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_component_permissions_examples.rb
@@ -52,9 +52,7 @@
 
   context "when failing to set permissions" do
     before do
-      # rubocop:disable RSpec/AnyInstance
       allow_any_instance_of(Decidim::Admin::PermissionsForm).to receive(:valid?).and_return(false)
-      # rubocop:enable RSpec/AnyInstance
       within ".component-#{component.id}" do
         click_link "Permissions"
       end
diff --git a/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb
index d91128f9c19e5..90362d13085fb 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb
@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
+shared_examples "sorted moderations" do
+  let!(:moderations) do
+    reportables.first(reportables.length - 1).map do |reportable|
+      moderation = create(:moderation, reportable: reportable, report_count: 1, reported_content: reportable.reported_searchable_content_text)
+      create(:report, moderation: moderation)
+      moderation
+    end
+  end
+  let!(:moderation) { moderations.first }
+  let(:moderations_link_text) { "Moderations" }
+
+  before do
+    visit participatory_space_path
+    click_link moderations_link_text
+  end
+
+  it "sorts the most recent first" do
+    within ".pagination" do
+      click_link "Last"
+    end
+    all("tbody tr").each_with_index do |row, _index|
+      expect(row.find("td:first-child")).to have_content(reportables.first.id)
+    end
+  end
+end
+
 shared_examples "manage moderations" do
   let!(:moderations) do
     reportables.first(reportables.length - 1).map do |reportable|
@@ -146,11 +172,17 @@
   end
 
   context "when listing hidden resources" do
-    it "user can review them" do
+    before do
       within ".card-title" do
         click_link "Hidden"
       end
+    end
 
+    it "user can't unreport them" do
+      expect(page).not_to have_css(".action-icon--unreport")
+    end
+
+    it "user can review them" do
       hidden_moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
           expect(page).to have_css("a[href='#{moderation.reportable.reported_content_url}']")
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
index 7210b1ec5b77c..9bf37895124da 100644
--- a/decidim-admin/lib/decidim/admin/version.rb
+++ b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/block_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/block_user_spec.rb
index 23a48c243db20..aa0b8603acd6b 100644
--- a/decidim-admin/spec/commands/decidim/admin/block_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/block_user_spec.rb
@@ -8,68 +8,83 @@ module Decidim::Admin
 
     let(:organization) { create :organization }
     let(:current_user) { create :user, :admin, organization: organization }
-    let(:user_to_block) { create :user, :managed, name: "Testingname", organization: organization }
     let(:justification) { "justification for blocking the user" }
     let(:user_block) { create :justification, :user, :current_user }
 
-    context "when the form is valid" do
-      let(:form) do
-        double(
-          user: user_to_block,
-          current_user: current_user,
-          justification: :justification,
-          valid?: true
-        )
-      end
+    shared_examples "blocking user or group form" do
+      context "when the form is valid" do
+        let(:form) do
+          double(
+            user: user_to_block,
+            current_user: current_user,
+            justification: :justification,
+            valid?: true
+          )
+        end
 
-      it "broadcasts ok" do
-        expect { subject.call }.to broadcast(:ok, user_to_block)
-      end
+        it "broadcasts ok" do
+          expect { subject.call }.to broadcast(:ok, user_to_block)
+        end
 
-      it "user is notified" do
-        subject.call
-        expect(Decidim::BlockUserJob).to have_been_enqueued.on_queue("block_user")
-      end
+        it "user is notified" do
+          subject.call
+          expect(Decidim::BlockUserJob).to have_been_enqueued.on_queue("block_user")
+        end
 
-      it "user is updated" do
-        subject.call
-        expect(form.user.blocked).to be(true)
-        expect(form.user.extended_data["user_name"]).to eq("Testingname")
-        expect(form.user.name).to eq("Blocked user")
-      end
+        it "user is updated" do
+          subject.call
+          expect(form.user.blocked).to be(true)
+          expect(form.user.extended_data["user_name"]).to eq(user_name)
+          expect(form.user.name).to eq("Blocked user")
+        end
+
+        it "original username is stored in the action log entry's resource title" do
+          subject.call
+          log = Decidim::ActionLog.last
+          expect(log.resource).to eq(form.user)
+          expect(log.extra["resource"]["title"]).to eq(user_name)
+        end
 
-      it "original username is stored in the action log entry's resource title" do
-        subject.call
-        log = Decidim::ActionLog.last
-        expect(log.resource).to eq(form.user)
-        expect(log.extra["resource"]["title"]).to eq("Testingname")
+        it "tracks the changes" do
+          expect(Decidim.traceability).to receive(:perform_action!).with("block",
+                                                                         user_to_block,
+                                                                         current_user,
+                                                                         extra: {
+                                                                           reportable_type: form.user.class.name,
+                                                                           current_justification: form.justification
+                                                                         },
+                                                                         resource: {
+                                                                           title: form.user.name
+                                                                         })
+          subject.call
+        end
       end
 
-      it "tracks the changes" do
-        expect(Decidim.traceability).to receive(:perform_action!).with("block",
-                                                                       user_to_block,
-                                                                       current_user,
-                                                                       extra: {
-                                                                         reportable_type: form.user.class.name,
-                                                                         current_justification: form.justification
-                                                                       },
-                                                                       resource: {
-                                                                         title: form.user.name
-                                                                       })
-        subject.call
+      context "when the form is not ok" do
+        let(:form) do
+          double(
+            valid?: false
+          )
+        end
+
+        it "broadcasts invalid" do
+          expect { subject.call }.to broadcast(:invalid)
+        end
       end
     end
 
-    context "when the form is not ok" do
-      let(:form) do
-        double(
-          valid?: false
-        )
-      end
+    context "with a user" do
+      let(:user_to_block) { create :user, name: user_name, organization: organization }
+      let(:user_name) { "Testing user" }
 
-      it "broadcasts invalid" do
-        expect { subject.call }.to broadcast(:invalid)
-      end
+      it_behaves_like "blocking user or group form"
+    end
+
+    context "with a user group" do
+      let(:user_to_block) { create :user_group, name: user_name, organization: organization }
+      let(:user_name) { "Testing user group" }
+
+      it_behaves_like "blocking user or group form"
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/create_area_type_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_area_type_spec.rb
index 7069cb89a55d7..31582a50f0cdf 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_area_type_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_area_type_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Admin
   describe CreateAreaType do
-    subject { described_class.new(form) }
+    subject { described_class.new(form, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create(:user, organization: organization) }
     let(:name) { Decidim::Faker::Localized.literal("territorial") }
     let(:plural) { Decidim::Faker::Localized.literal("territorials") }
 
@@ -36,6 +37,18 @@ module Decidim::Admin
       it "creates a new scope type for the organization" do
         expect { subject.call }.to change { organization.area_types.count }.by(1)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::AreaType, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/create_attachment_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_attachment_spec.rb
index e2e336488c064..7fb7dbe2b0117 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_attachment_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_attachment_spec.rb
@@ -4,8 +4,8 @@
 
 module Decidim::Admin
   describe CreateAttachment do
-    subject { described_class.call(form, attached_to) }
-
+    subject { described_class.call(form, attached_to, user) }
+    let(:user) { create(:user) }
     let(:form) do
       instance_double(
         AttachmentForm,
@@ -24,12 +24,7 @@ module Decidim::Admin
         weight: 0
       )
     end
-    let(:file) do
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
-    end
+    let(:file) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
     let(:attached_to) { create(:participatory_process) }
 
     describe "when valid" do
@@ -60,6 +55,18 @@ module Decidim::Admin
 
         subject
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::Attachment, user)
+          .and_call_original
+
+        expect { subject }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
+      end
     end
 
     describe "when invalid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/create_component_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_component_spec.rb
index 411a633f6f58f..f271c48cba378 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_component_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_component_spec.rb
@@ -22,19 +22,19 @@ module Decidim::Admin
         manifest: manifest,
         participatory_space: participatory_process,
         settings: {
-          dummy_global_attribute_1: true,
-          dummy_global_attribute_2: false
+          dummy_global_attribute1: true,
+          dummy_global_attribute2: false
         },
         default_step_settings: {
           step.id.to_s => {
-            dummy_step_attribute_1: true,
-            dummy_step_attribute_2: false
+            dummy_step_attribute1: true,
+            dummy_step_attribute2: false
           }
         },
         step_settings: {
           step.id.to_s => {
-            dummy_step_attribute_1: true,
-            dummy_step_attribute_2: false
+            dummy_step_attribute1: true,
+            dummy_step_attribute2: false
           }
         }
       )
@@ -55,13 +55,13 @@ module Decidim::Admin
         expect(participatory_process.components).not_to be_empty
 
         component = participatory_process.components.first
-        expect(component.settings.dummy_global_attribute_1).to eq(true)
-        expect(component.settings.dummy_global_attribute_2).to eq(false)
+        expect(component.settings.dummy_global_attribute1).to be(true)
+        expect(component.settings.dummy_global_attribute2).to be(false)
         expect(component.weight).to eq 2
 
         step_settings = component.step_settings[step.id.to_s]
-        expect(step_settings.dummy_step_attribute_1).to eq(true)
-        expect(step_settings.dummy_step_attribute_2).to eq(false)
+        expect(step_settings.dummy_step_attribute1).to be(true)
+        expect(step_settings.dummy_step_attribute2).to be(false)
       end
 
       it "traces the action", versioning: true do
diff --git a/decidim-admin/spec/commands/decidim/admin/create_import_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_import_spec.rb
index 0e19e4116c2a1..056cf359b9e9f 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_import_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_import_spec.rb
@@ -10,7 +10,7 @@ module Decidim::Admin
     let(:organization) { create(:organization) }
     let(:participatory_space) { create(:participatory_process, organization: organization) }
     let!(:component) { create(:dummy_component, organization: organization) }
-    let(:file) { Decidim::Dev.test_file("verify_user_groups.csv", "text/csv") }
+    let(:file) { upload_test_file(Decidim::Dev.test_file("verify_user_groups.csv", "text/csv")) }
 
     let(:form) do
       Decidim::Admin::ImportForm.from_params(
diff --git a/decidim-admin/spec/commands/decidim/admin/create_newsletter_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_newsletter_spec.rb
index fb3d2b98672ff..3c785ec0930da 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_newsletter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_newsletter_spec.rb
@@ -75,7 +75,7 @@ module Decidim::Admin
           expect(newsletter.author).to eq(user)
           expect(newsletter.organization).to eq(organization)
           expect(newsletter.subject.deep_stringify_keys).to eq(form.subject.deep_stringify_keys)
-          expect(newsletter.sent?).to eq(false)
+          expect(newsletter.sent?).to be(false)
           expect(newsletter.template).to be_present
           expect(newsletter.template.settings.body.stringify_keys).to eq(newsletter_body.stringify_keys.except("machine_translations"))
         end
diff --git a/decidim-admin/spec/commands/create_participatory_space_private_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb
similarity index 97%
rename from decidim-admin/spec/commands/create_participatory_space_private_user_spec.rb
rename to decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb
index 64f21442ad40b..604ef8aba2f9c 100644
--- a/decidim-admin/spec/commands/create_participatory_space_private_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_participatory_space_private_user_spec.rb
@@ -15,10 +15,12 @@ module Decidim::Admin
     let(:form) do
       double(
         invalid?: invalid,
+        delete_current_private_participants?: delete,
         email: email,
         name: name
       )
     end
+    let(:delete) { false }
     let(:invalid) { false }
 
     context "when the form is not valid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/create_scope_type_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_scope_type_spec.rb
index efd39e43804cd..3ffc29562e5b1 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_scope_type_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_scope_type_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Admin
   describe CreateScopeType do
-    subject { described_class.new(form) }
+    subject { described_class.new(form, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create(:user, organization: organization) }
     let(:name) { Decidim::Faker::Localized.literal("province") }
     let(:plural) { Decidim::Faker::Localized.literal("provinces") }
 
@@ -36,6 +37,18 @@ module Decidim::Admin
       it "creates a new scope type for the organization" do
         expect { subject.call }.to change { organization.scope_types.count }.by(1)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::ScopeType, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/create_static_page_spec.rb b/decidim-admin/spec/commands/decidim/admin/create_static_page_spec.rb
index cc10ba07992c5..2a16040e2e39a 100644
--- a/decidim-admin/spec/commands/decidim/admin/create_static_page_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/create_static_page_spec.rb
@@ -16,7 +16,7 @@ module Decidim::Admin
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb b/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
index 75acd38203527..3d7129b732a0e 100644
--- a/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/deliver_newsletter_spec.rb
@@ -106,11 +106,11 @@ def user_localized_body(user)
 
           context "when interests match the selected scopes" do
             let!(:deliverable_users) do
-              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { "interested_scopes": scopes.first.id })
+              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { interested_scopes: scopes.first.id })
             end
 
             let!(:undeliverable_users) do
-              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { "interested_scopes": scopes.last.id })
+              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { interested_scopes: scopes.last.id })
             end
 
             it_behaves_like "selective newsletter"
@@ -119,7 +119,7 @@ def user_localized_body(user)
           context "when interest do not match the selected scopes" do
             let(:user_interest) { create(:scope, organization: organization) }
             let!(:deliverable_users) do
-              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { "interested_scopes": user_interest.id })
+              create_list(:user, rand(2..9), :confirmed, organization: organization, newsletter_notifications_at: Time.current, extended_data: { interested_scopes: user_interest.id })
             end
 
             it "is not valid" do
@@ -132,7 +132,7 @@ def user_localized_body(user)
       context "when sending to followers" do
         let(:send_to_followers) { true }
 
-        context "when no spaces selected " do
+        context "when no spaces selected" do
           it "is not valid" do
             expect { command.call }.to broadcast(:invalid)
           end
@@ -180,7 +180,7 @@ def user_localized_body(user)
       context "when sending to participants" do
         let(:send_to_participants) { true }
 
-        context "when no spaces selected " do
+        context "when no spaces selected" do
           it "is not valid" do
             expect { command.call }.to broadcast(:invalid)
           end
diff --git a/decidim-admin/spec/commands/decidim/admin/destroy_component_spec.rb b/decidim-admin/spec/commands/decidim/admin/destroy_component_spec.rb
index ceac6a68d2a9e..69feb59b50452 100644
--- a/decidim-admin/spec/commands/decidim/admin/destroy_component_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/destroy_component_spec.rb
@@ -37,9 +37,9 @@ module Decidim::Admin
 
         subject.call
 
-        component = results[:component]
-        expect(component.id).to eq(component.id)
-        expect(component).not_to be_persisted
+        result_component = results[:component]
+        expect(result_component.id).to eq(component.id)
+        expect(result_component).not_to be_persisted
       end
     end
   end
diff --git a/decidim-admin/spec/commands/decidim/admin/impersonate_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/impersonate_user_spec.rb
index a928d5b05055d..e15aa92affbac 100644
--- a/decidim-admin/spec/commands/decidim/admin/impersonate_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/impersonate_user_spec.rb
@@ -46,13 +46,13 @@ module Decidim::Admin
         it "creates a impersonation log" do
           expect do
             subject.call
-          end.to change { Decidim::ImpersonationLog.count }.by(1)
+          end.to change(Decidim::ImpersonationLog, :count).by(1)
         end
 
         it "creates a action log" do
           expect do
             subject.call
-          end.to change { Decidim::ActionLog.count }.by(1)
+          end.to change(Decidim::ActionLog, :count).by(1)
         end
 
         it "expires the impersonation session automatically" do
@@ -77,7 +77,7 @@ module Decidim::Admin
       it "creates a action log with reason" do
         expect do
           subject.call
-        end.to change { Decidim::ActionLog.count }.by(1)
+        end.to change(Decidim::ActionLog, :count).by(1)
 
         expect(Decidim::ActionLog.last.action).to eq("manage")
       end
diff --git a/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb b/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb
index ee14e8becd8e8..b9906ab3a181f 100644
--- a/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/process_participatory_space_private_user_import_csv_spec.rb
@@ -9,7 +9,7 @@ module Decidim::Admin
     let(:current_user) { create(:user, :admin, organization: organization) }
     let(:organization) { create(:organization) }
     let(:private_users_to) { create :participatory_process, organization: organization }
-    let(:file) { File.new Decidim::Dev.asset("import_participatory_space_private_users.csv") }
+    let(:file) { upload_test_file(Decidim::Dev.test_file("import_participatory_space_private_users.csv", "text/csv"), return_blob: true) }
     let(:validity) { true }
 
     let(:form) do
@@ -37,7 +37,7 @@ module Decidim::Admin
     end
 
     context "when the CSV file has BOM" do
-      let(:file) { File.new Decidim::Dev.asset("import_participatory_space_private_users_with_bom.csv") }
+      let(:file) { upload_test_file(Decidim::Dev.test_file("import_participatory_space_private_users_with_bom.csv", "text/csv"), return_blob: true) }
       let(:email) { "my_user@example.org" }
 
       it "broadcasts ok" do
diff --git a/decidim-admin/spec/commands/decidim/admin/process_user_group_verification_csv_spec.rb b/decidim-admin/spec/commands/decidim/admin/process_user_group_verification_csv_spec.rb
index 46ca463f416bd..e39f6cd86da29 100644
--- a/decidim-admin/spec/commands/decidim/admin/process_user_group_verification_csv_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/process_user_group_verification_csv_spec.rb
@@ -8,7 +8,7 @@ module Decidim::Admin
 
     let(:user) { create(:user, :admin, organization: organization) }
     let(:organization) { create(:organization) }
-    let(:file) { File.new Decidim::Dev.asset("verify_user_groups.csv") }
+    let(:file) { upload_test_file(Decidim::Dev.test_file("verify_user_groups.csv", "text/csv"), return_blob: true) }
     let(:validity) { true }
 
     let(:form) do
diff --git a/decidim-admin/spec/commands/decidim/admin/promote_managed_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/promote_managed_user_spec.rb
index 6d50544248fe3..b8b8c5e9e6484 100644
--- a/decidim-admin/spec/commands/decidim/admin/promote_managed_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/promote_managed_user_spec.rb
@@ -47,7 +47,7 @@ module Decidim::Admin
 
     context "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/reject_user_group_spec.rb b/decidim-admin/spec/commands/decidim/admin/reject_user_group_spec.rb
index ee4e25a3d8e07..5ec64ff8738af 100644
--- a/decidim-admin/spec/commands/decidim/admin/reject_user_group_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/reject_user_group_spec.rb
@@ -16,7 +16,7 @@ module Decidim::Admin
         let(:invalid) { true }
 
         it "broadcast invalid in return" do
-          expect(user_group).to receive(:valid?).and_return(false)
+          allow(user_group).to receive(:valid?).and_return(false)
           expect { subject.call }.to broadcast(:invalid)
 
           expect(user_group.rejected_at).to be_nil
@@ -49,7 +49,7 @@ module Decidim::Admin
         let(:invalid) { true }
 
         it "broadcast invalid in return and do not clean verified_at" do
-          expect(user_group).to receive(:valid?).and_return(false)
+          allow(user_group).to receive(:valid?).and_return(false)
           expect { subject.call }.to broadcast(:invalid)
 
           expect(user_group.verified_at).not_to be_nil
diff --git a/decidim-admin/spec/commands/decidim/admin/reorder_content_blocks_spec.rb b/decidim-admin/spec/commands/decidim/admin/reorder_content_blocks_spec.rb
index 3924423d3e163..2d4a900ce052f 100644
--- a/decidim-admin/spec/commands/decidim/admin/reorder_content_blocks_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/reorder_content_blocks_spec.rb
@@ -95,7 +95,7 @@ module Decidim::Admin
 
         expect(published_block2.weight).to eq 1
         expect(unpublished_block.weight).to eq 2
-        expect(published_block1.weight).to eq nil
+        expect(published_block1.weight).to be_nil
       end
 
       it "unpublishes a published block that disappears from the order" do
diff --git a/decidim-admin/spec/commands/decidim/admin/transfer_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/transfer_user_spec.rb
index 35941c5a4384c..08ae506caebf6 100644
--- a/decidim-admin/spec/commands/decidim/admin/transfer_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/transfer_user_spec.rb
@@ -42,18 +42,18 @@ module Decidim::Admin
       end
     end
 
-    context "when user  is missing" do
-      let(:current_user) {}
+    context "when user is missing" do
+      let(:current_user) { nil }
 
       it "broadcasts invalid" do
         expect { subject.call }.to broadcast(:invalid)
       end
     end
 
-    context "when solve conflict succeeds " do
+    context "when solve conflict succeeds" do
       it "mark conflict as solved" do
         subject.call
-        expect(conflict.reload.solved).to eq(true)
+        expect(conflict.reload.solved).to be(true)
       end
 
       it "update email" do
diff --git a/decidim-admin/spec/commands/decidim/admin/unblock_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/unblock_user_spec.rb
index 08e58fd5215ce..90bf1aca19122 100644
--- a/decidim-admin/spec/commands/decidim/admin/unblock_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/unblock_user_spec.rb
@@ -6,41 +6,57 @@ module Decidim::Admin
   describe UnblockUser do
     subject { described_class.new(user_to_unblock, current_user) }
 
+    let(:extended_data) { { user_name: user_name } }
     let(:current_user) { create :user, :admin }
-    let(:user_to_unblock) { create :user, :managed, blocked: true, name: "Testingname" }
 
-    context "when the blocking is valid" do
-      it "broadcasts ok" do
-        expect { subject.call }.to broadcast(:ok)
-      end
+    shared_examples "unblocking a user or group" do
+      context "when the blocking is valid" do
+        it "broadcasts ok" do
+          expect { subject.call }.to broadcast(:ok)
+        end
+
+        it "user is updated" do
+          subject.call
+          expect(user_to_unblock.blocked).to be(false)
+          expect(user_to_unblock.name).to eq(user_name)
+          expect(user_to_unblock.blocked_at).to be_nil
+          expect(user_to_unblock.block_id).to be_nil
+        end
 
-      it "user is updated" do
-        subject.call
-        expect(user_to_unblock.blocked).to be(false)
-        expect(user_to_unblock.name).to eq("Testingname")
-        expect(user_to_unblock.blocked_at).to be_nil
-        expect(user_to_unblock.block_id).to be_nil
+        it "tracks the changes" do
+          expect(Decidim.traceability).to receive(:perform_action!)
+            .with(
+              "unblock",
+              user_to_unblock,
+              current_user,
+              extra: {
+                reportable_type: user_to_unblock.class.name
+              }
+            )
+          subject.call
+        end
       end
 
-      it "tracks the changes" do
-        expect(Decidim.traceability).to receive(:perform_action!)
-          .with(
-            "unblock",
-            user_to_unblock,
-            current_user,
-            extra: {
-              reportable_type: user_to_unblock.class.name
-            }
-          )
-        subject.call
+      context "when the suspension is not valid" do
+        it "broadcasts invalid" do
+          allow(user_to_unblock).to receive(:blocked?).and_return(false)
+          expect { subject.call }.to broadcast(:invalid)
+        end
       end
     end
 
-    context "when the suspension is not valid" do
-      it "broadcasts invalid" do
-        allow(user_to_unblock).to receive(:blocked?).and_return(false)
-        expect { subject.call }.to broadcast(:invalid)
-      end
+    context "with a user" do
+      let(:user_to_unblock) { create :user, :blocked, extended_data: extended_data }
+      let(:user_name) { "Testing user" }
+
+      it_behaves_like "unblocking a user or group"
+    end
+
+    context "with a user group" do
+      let(:user_to_unblock) { create :user_group, :blocked, extended_data: extended_data }
+      let(:user_name) { "Testing user group" }
+
+      it_behaves_like "unblocking a user or group"
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/unreport_resource_spec.rb b/decidim-admin/spec/commands/decidim/admin/unreport_resource_spec.rb
index d2672adb616e5..2fb2422a8653f 100644
--- a/decidim-admin/spec/commands/decidim/admin/unreport_resource_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/unreport_resource_spec.rb
@@ -17,7 +17,7 @@ module Decidim::Admin
 
       it "deletes the moderation" do
         command.call
-        expect(reportable.reload.moderation).to be(nil)
+        expect(reportable.reload.moderation).to be_nil
       end
 
       it "traces the action", versioning: true do
diff --git a/decidim-admin/spec/commands/decidim/admin/unreport_user_spec.rb b/decidim-admin/spec/commands/decidim/admin/unreport_user_spec.rb
index dfb3242232a1e..fdfb012582e67 100644
--- a/decidim-admin/spec/commands/decidim/admin/unreport_user_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/unreport_user_spec.rb
@@ -17,7 +17,7 @@ module Decidim::Admin
 
       it "deletes the moderation" do
         command.call
-        expect(reportable.reload.user_moderation).to be(nil)
+        expect(reportable.reload.user_moderation).to be_nil
       end
 
       it "traces the action", versioning: true do
diff --git a/decidim-admin/spec/commands/decidim/admin/update_area_type_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_area_type_spec.rb
index b2e27fe0d3877..670d6ad4d5f9c 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_area_type_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_area_type_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Admin
   describe UpdateAreaType do
-    subject { described_class.new(area_type, form) }
+    subject { described_class.new(area_type, form, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create(:user, organization: organization) }
     let(:area_type) { create :area_type, organization: organization }
     let(:name) { Decidim::Faker::Localized.literal("new name") }
     let(:plural) { Decidim::Faker::Localized.literal("new names") }
@@ -41,6 +42,18 @@ module Decidim::Admin
       it "updates the plural of the scope" do
         expect(translated(area_type.plural)).to eq("new names")
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:update, area_type, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_attachment_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_attachment_spec.rb
new file mode 100644
index 0000000000000..54b2c7e11f195
--- /dev/null
+++ b/decidim-admin/spec/commands/decidim/admin/update_attachment_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Admin
+  describe UpdateAttachment do
+    let!(:participatory_process) { create(:participatory_process) }
+    let!(:attachment) { create(:attachment, attached_to: participatory_process) }
+    let!(:user) { create(:user) }
+
+    let(:form) do
+      instance_double(
+        AttachmentForm,
+        title: {
+          en: "An image",
+          ca: "Una imatge",
+          es: "Una imagen"
+        },
+        description: {
+          en: "A city",
+          ca: "Una ciutat",
+          es: "Una ciudad"
+        },
+        file: file,
+        attachment_collection: nil,
+        weight: 2
+      )
+    end
+    let(:file) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+
+    describe "when valid" do
+      before do
+        allow(form).to receive(:invalid?).and_return(false)
+      end
+
+      it "broadcasts :ok and updates the attachment" do
+        expect do
+          described_class.call(attachment, form, user)
+        end.to broadcast(:ok)
+
+        expect(attachment["title"]["en"]).to eq("An image")
+        expect(attachment.weight).to eq(2)
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:update, attachment, user, {})
+          .and_call_original
+
+        expect { described_class.call(attachment, form, user) }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
+    end
+
+    describe "when invalid" do
+      before do
+        allow(form).to receive(:invalid?).and_return(true)
+      end
+
+      it "does not update the component" do
+        expect do
+          described_class.call(attachment, form, user)
+        end.to broadcast(:invalid)
+
+        attachment.reload
+        expect(attachment.title["en"]).not_to eq("An image")
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_component_permissions_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_component_permissions_spec.rb
index 3208f91e43e76..588af51f5fcc6 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_component_permissions_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_component_permissions_spec.rb
@@ -4,10 +4,11 @@
 
 module Decidim::Admin
   describe UpdateComponentPermissions do
-    subject(:command) { described_class.call(form, component, resource) }
+    subject(:command) { described_class.call(form, component, resource, user) }
 
     let(:organization) { create(:organization, available_authorizations: ["dummy"]) }
     let(:participatory_process) { create(:participatory_process, :with_steps, organization: organization) }
+    let(:user) { create(:user, organization: organization) }
 
     let(:component) do
       create(
@@ -45,7 +46,7 @@ module Decidim::Admin
               dummy: { options: { "perry" => "mason" } }
             },
             authorization_handlers_names: ["dummy"],
-            authorization_handlers_options: { dummy: { "perry" => "mason" } }
+            authorization_handlers_options: { "dummy" => { "perry" => "mason" } }
           )
         }
       )
@@ -87,6 +88,18 @@ module Decidim::Admin
       expect(component.permissions).to eq(expected_permissions)
     end
 
+    it "traces the action", versioning: true do
+      expect(Decidim.traceability)
+        .to receive(:perform_action!)
+        .with("update_permissions", Decidim::Component, user)
+        .and_call_original
+
+      expect { subject }.to change(Decidim::ActionLog, :count)
+      action_log = Decidim::ActionLog.last
+      expect(action_log.action).to eq("update_permissions")
+      expect(action_log.version).to be_present
+    end
+
     context "when receives a resource" do
       let(:resource) { create(:dummy_resource, component: component) }
       let(:expected_permissions) { component.permissions.merge(changing_permissions) }
diff --git a/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
index 9e501e71fe350..e8e320c79ff77 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_component_spec.rb
@@ -8,6 +8,7 @@ module Decidim::Admin
     let(:step) { participatory_process.steps.first }
     let!(:component) { create(:component, :with_one_step, participatory_space: participatory_process) }
     let(:manifest) { component.manifest }
+    let(:user) { create :user }
 
     let(:form) do
       instance_double(
@@ -21,21 +22,21 @@ module Decidim::Admin
         invalid?: !valid,
         valid?: valid,
         settings: {
-          dummy_global_attribute_1: true,
-          dummy_global_attribute_2: false,
+          dummy_global_attribute1: true,
+          dummy_global_attribute2: false,
           readonly_attribute: false
         },
         default_step_settings: {
           step.id.to_s => {
-            dummy_step_attribute_1: true,
-            dummy_step_attribute_2: false,
+            dummy_step_attribute1: true,
+            dummy_step_attribute2: false,
             readonly_step_attribute: false
           }
         },
         step_settings: {
           step.id.to_s => {
-            dummy_step_attribute_1: true,
-            dummy_step_attribute_2: false,
+            dummy_step_attribute1: true,
+            dummy_step_attribute2: false,
             readonly_step_attribute: false
           }
         }
@@ -47,19 +48,19 @@ module Decidim::Admin
 
       it "broadcasts :ok and updates the component (except the readonly attribute)" do
         expect do
-          described_class.call(form, component)
+          described_class.call(form, component, user)
         end.to broadcast(:ok)
 
         expect(component["name"]["en"]).to eq("My component")
         expect(component.weight).to eq(3)
-        expect(component.settings.dummy_global_attribute_1).to eq(true)
-        expect(component.settings.dummy_global_attribute_2).to eq(false)
-        expect(component.settings.readonly_attribute).to eq(true)
+        expect(component.settings.dummy_global_attribute1).to be(true)
+        expect(component.settings.dummy_global_attribute2).to be(false)
+        expect(component.settings.readonly_attribute).to be(true)
 
         step_settings = component.step_settings[step.id.to_s]
-        expect(step_settings.dummy_step_attribute_1).to eq(true)
-        expect(step_settings.dummy_step_attribute_2).to eq(false)
-        expect(step_settings.readonly_step_attribute).to eq(true)
+        expect(step_settings.dummy_step_attribute1).to be(true)
+        expect(step_settings.dummy_step_attribute2).to be(false)
+        expect(step_settings.readonly_step_attribute).to be(true)
       end
 
       it "fires the hooks" do
@@ -69,7 +70,7 @@ module Decidim::Admin
           results[:component] = component
         end
 
-        described_class.call(form, component)
+        described_class.call(form, component, user)
 
         component = results[:component]
         expect(component.name["en"]).to eq("My component")
@@ -78,7 +79,7 @@ module Decidim::Admin
 
       it "broadcasts the previous and current settings" do
         expect do
-          described_class.call(form, component)
+          described_class.call(form, component, user)
         end.to broadcast(
           :ok,
           true,
@@ -93,6 +94,18 @@ module Decidim::Admin
           )
         )
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("update", Decidim::Component, user)
+          .and_call_original
+
+        expect { described_class.call(form, component, user) }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
 
     describe "when invalid" do
@@ -100,7 +113,7 @@ module Decidim::Admin
 
       it "does not update the component" do
         expect do
-          described_class.call(form, component)
+          described_class.call(form, component, user)
         end.to broadcast(:invalid)
 
         component.reload
diff --git a/decidim-admin/spec/commands/decidim/admin/update_content_block_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_content_block_spec.rb
index 06bc7198468a3..5845fa8c9ffaa 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_content_block_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_content_block_spec.rb
@@ -14,7 +14,7 @@ module Decidim::Admin
       }
     end
     let(:uploaded_image) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("city.jpeg")),
         filename: "city.jpeg",
         content_type: "image/jpeg"
@@ -54,7 +54,7 @@ module Decidim::Admin
       it "updates the content block settings" do
         subject.call
         content_block.reload
-        expect(content_block.settings.welcome_text[:en]).to eq("My text")
+        expect(content_block.settings.welcome_text["en"]).to eq("My text")
       end
 
       context "when the image does not exist" do
@@ -71,7 +71,7 @@ module Decidim::Admin
 
       context "when the image exists" do
         let(:original_image) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg"
diff --git a/decidim-admin/spec/commands/decidim/admin/update_external_domain_whitelist_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_external_domain_whitelist_spec.rb
index 4ac612ebac96b..de956ab3f6115 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_external_domain_whitelist_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_external_domain_whitelist_spec.rb
@@ -5,12 +5,13 @@
 module Decidim::Admin
   describe UpdateExternalDomainWhitelist do
     let(:organization) { create(:organization, external_domain_whitelist: []) }
+    let(:user) { create(:user, organization: organization) }
     let(:form) { Decidim::Admin::OrganizationExternalDomainWhitelistForm.from_params(attributes) }
-    let(:command) { described_class.new(form, organization) }
+    let(:command) { described_class.new(form, organization, user) }
     let(:domains) { ["erabaki.pamplona.es", "osallistu.hel.fi", "codefor.fr"] }
     let(:attributes) do
       {
-        "external_domains": {
+        external_domains: {
           "1613404734167" => { "value" => domains[0], "id" => "", "position" => "0", "deleted" => "false" },
           "1613404734172" => { "value" => domains[1], "id" => "", "position" => "1", "deleted" => "false" },
           "1613404734961" => { "value" => domains[2], "id" => "", "position" => "2", "deleted" => "false" }
@@ -32,6 +33,18 @@ module Decidim::Admin
         expect(organization.external_domain_whitelist).to include(domains[2])
         expect(organization.external_domain_whitelist.length).to eq(3)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("update_external_domain", organization, user)
+          .and_call_original
+
+        expect { command.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update_external_domain")
+        expect(action_log.version).to be_present
+      end
     end
 
     describe "when the form is not valid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/update_help_sections_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_help_sections_spec.rb
new file mode 100644
index 0000000000000..53d93b3c38741
--- /dev/null
+++ b/decidim-admin/spec/commands/decidim/admin/update_help_sections_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Admin
+  describe UpdateHelpSections do
+    let(:organization) { create(:organization, external_domain_whitelist: []) }
+    let(:user) { create(:user, organization: organization) }
+    let(:form) { Decidim::Admin::HelpSectionsForm.from_params(attributes) }
+    let(:command) { described_class.new(form, organization, user) }
+    let(:attributes) do
+      {
+        sections: {
+          1 => { "id" => "assembly", "content" => { en: "Repelle" } }
+        }
+      }
+    end
+
+    describe "when the form is valid" do
+      it "broadcasts ok" do
+        expect { command.call }.to broadcast(:ok)
+      end
+
+      it "update help sections" do
+        command.call
+        expect(Decidim::ContextualHelpSection.find_by("section_id" => "assembly").content).to eq({ "en" => "Repelle" })
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("update", Decidim::ContextualHelpSection, user, { "resource" => { "title" => "Assembly" } })
+          .and_call_original
+
+        expect { command.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
+    end
+
+    describe "when the form is not valid" do
+      before do
+        allow(form).to receive(:valid?).and_return(false)
+      end
+
+      it "broadcasts invalid" do
+        expect { command.call }.to broadcast(:invalid)
+      end
+
+      it "doesn't update help sections" do
+        expect(Decidim::ContextualHelpSection.find_by("id" => "assembly")).to be_nil
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_newsletter_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_newsletter_spec.rb
index 2d55f6d000302..1d04a15521e60 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_newsletter_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_newsletter_spec.rb
@@ -65,7 +65,7 @@ module Decidim::Admin
 
           expect(newsletter.author).to eq(user)
           expect(newsletter.subject.except("machine_translations")).to eq(form.subject.deep_stringify_keys.except("machine_translations"))
-          expect(newsletter.sent?).to eq(false)
+          expect(newsletter.sent?).to be(false)
           expect(newsletter.template).to be_present
           expect(newsletter.template.settings.body.stringify_keys).to eq(newsletter_body.stringify_keys.except("machine_translations"))
         end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_organization_appearance_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_organization_appearance_spec.rb
index e6a1af936d8f8..1280921c6a7a4 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_organization_appearance_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_organization_appearance_spec.rb
@@ -15,7 +15,7 @@ module Decidim::Admin
             description_ca: "La meva descripció",
             enable_omnipresent_banner: false,
             header_snippets: '<script>alert("Hello");</script>',
-            favicon: fixture_file_upload(File.new(Decidim::Dev.asset("icon.png")))
+            favicon: upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"))
           }
         }
       end
@@ -32,7 +32,7 @@ module Decidim::Admin
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -49,10 +49,10 @@ module Decidim::Admin
 
       describe "when the organization is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(false)
+          allow(form).to receive(:invalid?).and_return(false)
           expect(organization).to receive(:valid?).at_least(:once).and_return(false)
-          organization.errors.add(:official_img_header, "Image too big")
-          organization.errors.add(:official_img_footer, "Image too big")
+          organization.errors.add(:official_img_header, "File resolution is too large")
+          organization.errors.add(:official_img_footer, "File resolution is too large")
         end
 
         it "broadcasts invalid" do
diff --git a/decidim-admin/spec/commands/decidim/admin/update_organization_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_organization_spec.rb
index d1d5e0878d027..7d6ff0464104b 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_organization_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_organization_spec.rb
@@ -17,7 +17,7 @@ module Decidim::Admin
             badges_enabled: true,
             user_groups_enabled: true,
             send_welcome_notification: false,
-            admin_terms_of_use_body: { "en": Faker::Lorem.paragraph },
+            admin_terms_of_use_body: { en: Faker::Lorem.paragraph },
             rich_text_editor_in_public_views: true,
             machine_translation_display_priority: "translation",
             enable_machine_translations: true
@@ -37,7 +37,7 @@ module Decidim::Admin
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -75,8 +75,8 @@ module Decidim::Admin
           organization.reload
 
           expect(organization.name).to eq("My super organization")
-          expect(organization.rich_text_editor_in_public_views).to eq(true)
-          expect(organization.enable_machine_translations).to eq(true)
+          expect(organization.rich_text_editor_in_public_views).to be(true)
+          expect(organization.enable_machine_translations).to be(true)
         end
       end
     end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_scope_type_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_scope_type_spec.rb
index f4810d606058d..a15deb66bb5f7 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_scope_type_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_scope_type_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Admin
   describe UpdateScopeType do
-    subject { described_class.new(scope_type, form) }
+    subject { described_class.new(scope_type, form, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create(:user, organization: organization) }
     let(:scope_type) { create :scope_type, organization: organization }
     let(:name) { Decidim::Faker::Localized.literal("new name") }
     let(:plural) { Decidim::Faker::Localized.literal("new names") }
@@ -41,6 +42,18 @@ module Decidim::Admin
       it "updates the plural of the scope" do
         expect(translated(scope_type.plural)).to eq("new names")
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:update, scope_type, user, {})
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/commands/decidim/admin/update_static_page_spec.rb b/decidim-admin/spec/commands/decidim/admin/update_static_page_spec.rb
index 434a255bda284..0579c3ee0b837 100644
--- a/decidim-admin/spec/commands/decidim/admin/update_static_page_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/update_static_page_spec.rb
@@ -20,7 +20,7 @@ module Decidim::Admin
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -58,7 +58,7 @@ module Decidim::Admin
           page.reload
 
           expect(page.slug).to eq("new-slug")
-          expect(page.allow_public_access).to eq(true)
+          expect(page.allow_public_access).to be(true)
         end
       end
     end
diff --git a/decidim-admin/spec/commands/decidim/admin/verify_user_group_spec.rb b/decidim-admin/spec/commands/decidim/admin/verify_user_group_spec.rb
index 7088b49110dab..0a21d4f6c04fd 100644
--- a/decidim-admin/spec/commands/decidim/admin/verify_user_group_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/verify_user_group_spec.rb
@@ -17,7 +17,7 @@ module Decidim::Admin
         let(:invalid) { true }
 
         it "broadcasts invalid in return" do
-          expect(user_group).to receive(:valid?).and_return(false)
+          allow(user_group).to receive(:valid?).and_return(false)
           expect { subject.call }.to broadcast(:invalid)
 
           expect(user_group.rejected_at).to be_nil
@@ -50,7 +50,7 @@ module Decidim::Admin
         let(:invalid) { true }
 
         it "broadcasts invalid in return and do not clean rejected_at" do
-          expect(user_group).to receive(:valid?).and_return(false)
+          allow(user_group).to receive(:valid?).and_return(false)
           expect { subject.call }.to broadcast(:invalid)
 
           expect(user_group.rejected_at).not_to be_nil
diff --git a/decidim-admin/spec/controllers/block_user_controller_spec.rb b/decidim-admin/spec/controllers/block_user_controller_spec.rb
index aff59a870748b..3b550ec201056 100644
--- a/decidim-admin/spec/controllers/block_user_controller_spec.rb
+++ b/decidim-admin/spec/controllers/block_user_controller_spec.rb
@@ -16,77 +16,101 @@ module Admin
       end
 
       describe "unblock" do
-        let!(:user) { create(:user, :blocked, :confirmed, organization: organization, nickname: "some_nickname") }
+        shared_examples "unblocking a user or group" do
+          context "when having a user" do
+            it "flashes a notice message" do
+              delete :destroy, params: { user_id: user.id }
+
+              expect(flash[:notice]).to be_present
+              expect(user.reload.blocked?).to be(false)
+            end
+          end
 
-        context "when having a user" do
-          it "flashes a notice message" do
-            delete :destroy, params: { user_id: user.id }
+          context "when the user is not blocked" do
+            before do
+              user.blocked = false
+              user.save!
+            end
 
-            expect(flash[:notice]).to be_present
-            expect(user.reload.blocked?).to be(false)
-          end
-        end
+            it "flashes an alert message" do
+              delete :destroy, params: { user_id: user.id }
 
-        context "when the user is not blocked" do
-          before do
-            user.blocked = false
-            user.save!
+              expect(flash[:alert]).to be_present
+              expect(user.reload.blocked?).to be(false)
+            end
           end
 
-          it "flashes an alert message" do
-            delete :destroy, params: { user_id: user.id }
+          context "when current user is not an admin" do
+            before do
+              current_user.admin = false
+              current_user.save!
+            end
+
+            it "the user remains blocked" do
+              delete :destroy, params: { user_id: user.id }
 
-            expect(flash[:alert]).to be_present
-            expect(user.reload.blocked?).to be(false)
+              expect(user.reload.blocked?).to be(true)
+            end
           end
         end
 
-        context "when current user is not an admin" do
-          before do
-            current_user.admin = false
-            current_user.save!
-          end
+        context "when its a user" do
+          let!(:user) { create(:user, :blocked, :confirmed, organization: organization, nickname: "some_nickname") }
+
+          it_behaves_like "unblocking a user or group"
+        end
 
-          it "the user remains blocked" do
-            delete :destroy, params: { user_id: user.id }
+        context "when its a user group" do
+          let!(:user) { create(:user_group, :blocked, :confirmed, organization: organization, nickname: "another_nickname") }
 
-            expect(user.reload.blocked?).to be(true)
-          end
+          it_behaves_like "unblocking a user or group"
         end
       end
 
       describe "block" do
-        let!(:user) { create(:user, :confirmed, organization: organization, nickname: "some_nickname") }
+        shared_examples "blocking a user or group" do
+          context "when having a user" do
+            it "flashes a notice message" do
+              put :create, params: { user_id: user.id, justification: ::Faker::Lorem.sentence(word_count: 12) }
+
+              expect(flash[:notice]).to be_present
+              expect(user.reload.blocked?).to be(true)
+            end
+          end
 
-        context "when having a user" do
-          it "flashes a notice message" do
-            put :create, params: { user_id: user.id, justification: ::Faker::Lorem.sentence(word_count: 12) }
+          context "when form is invalid" do
+            it "flashes an alert message" do
+              put :create, params: { user_id: user.id, justification: nil }
 
-            expect(flash[:notice]).to be_present
-            expect(user.reload.blocked?).to be(true)
+              expect(flash[:alert]).to be_present
+              expect(user.reload.blocked?).to be(false)
+            end
           end
-        end
 
-        context "when form is invalid" do
-          it "flashes an alert message" do
-            put :create, params: { user_id: user.id, justification: nil }
+          context "when current user is not an admin" do
+            before do
+              current_user.admin = false
+              current_user.save!
+            end
 
-            expect(flash[:alert]).to be_present
-            expect(user.reload.blocked?).to be(false)
+            it "the user remains unblocked" do
+              put :create, params: { user_id: user.id, justification: ::Faker::Lorem.sentence(word_count: 12) }
+
+              expect(user.reload.blocked?).to be(false)
+            end
           end
         end
 
-        context "when current user is not an admin" do
-          before do
-            current_user.admin = false
-            current_user.save!
-          end
+        context "when its a user" do
+          let!(:user) { create(:user, :confirmed, organization: organization, nickname: "some_nickname") }
 
-          it "the user remains unblocked" do
-            put :create, params: { user_id: user.id, justification: ::Faker::Lorem.sentence(word_count: 12) }
+          it_behaves_like "blocking a user or group"
+        end
 
-            expect(user.reload.blocked?).to be(false)
-          end
+        context "when its a user group" do
+          let!(:user) { create(:user_group, :confirmed, organization: organization, nickname: "another_nickname") }
+
+          it_behaves_like "blocking a user or group"
         end
       end
     end
diff --git a/decidim-admin/spec/controllers/concerns/impersonate_users_spec.rb b/decidim-admin/spec/controllers/concerns/impersonate_users_spec.rb
index ca1444e57c783..e4b5103430409 100644
--- a/decidim-admin/spec/controllers/concerns/impersonate_users_spec.rb
+++ b/decidim-admin/spec/controllers/concerns/impersonate_users_spec.rb
@@ -27,17 +27,17 @@ class ImpersonateFakeController < Decidim::Admin::ApplicationController
             request.set_header k, [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
           end
           allow(controller).to receive(:request).and_return(request)
-          expect(controller.send(:check_impersonation_log_expired)).to eq(nil)
+          expect(controller.send(:check_impersonation_log_expired)).to be_nil
         end
 
         it "returns nil on non HTML responses" do
           request.set_header "HTTP_ACCEPT", [Mime[:js], Mime[:xml]].join(",")
           allow(controller).to receive(:request).and_return(request)
-          expect(controller.send(:check_impersonation_log_expired)).to eq(nil)
+          expect(controller.send(:check_impersonation_log_expired)).to be_nil
         end
 
         it "redirects when impersonated session is expired" do
-          expect(controller.send(:check_impersonation_log_expired)).to eq(nil)
+          expect(controller.send(:check_impersonation_log_expired)).to be_nil
           request.set_header "HTTP_ACCEPT", [Mime[:html], "text/html"].join(",")
 
           allow(controller).to receive(:real_user).and_return(user)
diff --git a/decidim-admin/spec/controllers/static_pages_controller_spec.rb b/decidim-admin/spec/controllers/static_pages_controller_spec.rb
index 5ec750041037a..2f18b3da21bad 100644
--- a/decidim-admin/spec/controllers/static_pages_controller_spec.rb
+++ b/decidim-admin/spec/controllers/static_pages_controller_spec.rb
@@ -26,7 +26,7 @@ module Admin
           it "assigns the default value for the allow_public_access" do
             post :create, params: {}
 
-            expect(assigns(:form).allow_public_access).to eq(false)
+            expect(assigns(:form).allow_public_access).to be(false)
           end
         end
 
@@ -34,13 +34,13 @@ module Admin
           it "does not overwrite it when unchecked" do
             put :create, params: { static_page: { allow_public_access: "0" } }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(false)
+            expect(assigns(:form).allow_public_access).to be(false)
           end
 
           it "does not overwrite it when checked" do
             post :create, params: { static_page: { allow_public_access: "1" } }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(true)
+            expect(assigns(:form).allow_public_access).to be(true)
           end
         end
       end
@@ -75,14 +75,14 @@ module Admin
             page.update!(allow_public_access: true)
             put :update, params: { id: page.id }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(true)
+            expect(assigns(:form).allow_public_access).to be(true)
           end
 
           it "injects it to the form when set to false" do
             page.update!(allow_public_access: false)
             put :update, params: { id: page.id }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(false)
+            expect(assigns(:form).allow_public_access).to be(false)
           end
         end
 
@@ -91,14 +91,14 @@ module Admin
             page.update!(allow_public_access: true)
             put :update, params: { id: page.id, static_page: { allow_public_access: "0" } }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(false)
+            expect(assigns(:form).allow_public_access).to be(false)
           end
 
           it "does not overwrite it when checked" do
             page.update!(allow_public_access: false)
             put :update, params: { id: page.id, static_page: { allow_public_access: "1" } }.with_indifferent_access
 
-            expect(assigns(:form).allow_public_access).to eq(true)
+            expect(assigns(:form).allow_public_access).to be(true)
           end
         end
       end
diff --git a/decidim-admin/spec/forms/block_user_form_spec.rb b/decidim-admin/spec/forms/block_user_form_spec.rb
index aff2a65afa4bd..2759ba3c11147 100644
--- a/decidim-admin/spec/forms/block_user_form_spec.rb
+++ b/decidim-admin/spec/forms/block_user_form_spec.rb
@@ -6,52 +6,63 @@ module Decidim
   module Admin
     describe BlockUserForm do
       let(:organization) { create(:organization) }
-
-      let(:user) { create(:user, organization: organization) }
-
       let(:justification) { "" }
 
-      describe "from a model" do
-        subject do
-          described_class.from_model(
-            user
-          ).with_context(
-            current_organization: organization
-          )
-        end
+      shared_examples "blocking a user or group" do
+        describe "from a model" do
+          subject do
+            described_class.from_model(
+              user
+            ).with_context(
+              current_organization: organization
+            )
+          end
 
-        context "when justification form is empty" do
-          it { is_expected.not_to be_valid }
+          context "when justification form is empty" do
+            it { is_expected.not_to be_valid }
+          end
         end
-      end
 
-      describe "from params" do
-        subject do
-          described_class.from_params(
-            justification: justification, user_id: user.id
-          ).with_context(
-            current_organization: organization
-          )
-        end
+        describe "from params" do
+          subject do
+            described_class.from_params(
+              justification: justification, user_id: user.id
+            ).with_context(
+              current_organization: organization
+            )
+          end
 
-        context "when justification has the correct length" do
-          let(:justification) { "Not TOS compliant." }
+          context "when justification has the correct length" do
+            let(:justification) { "Not TOS compliant." }
 
-          it { is_expected.to be_valid }
-        end
+            it { is_expected.to be_valid }
+          end
 
-        context "when justification is too short" do
-          let(:justification) { "Not TOS." }
+          context "when justification is too short" do
+            let(:justification) { "Not TOS." }
 
-          it { is_expected.not_to be_valid }
-        end
+            it { is_expected.not_to be_valid }
+          end
 
-        context "when the user does not exist" do
-          let(:user_id) { 9999 }
+          context "when the user does not exist" do
+            let(:user_id) { 9999 }
 
-          it { is_expected.not_to be_valid }
+            it { is_expected.not_to be_valid }
+          end
         end
       end
+
+      context "with a user" do
+        let(:user) { create(:user, organization: organization) }
+
+        it_behaves_like "blocking a user or group"
+      end
+
+      context "with a user group" do
+        let(:user) { create(:user_group, organization: organization) }
+
+        it_behaves_like "blocking a user or group"
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/forms/decidim/admin/import_form_spec.rb b/decidim-admin/spec/forms/decidim/admin/import_form_spec.rb
index f596758fec30c..347d49d14bf3c 100644
--- a/decidim-admin/spec/forms/decidim/admin/import_form_spec.rb
+++ b/decidim-admin/spec/forms/decidim/admin/import_form_spec.rb
@@ -10,7 +10,7 @@ module Admin
       let(:organization) { create(:organization) }
       let!(:component) { create(:dummy_component, organization: organization) }
       let(:user) { create(:user, :confirmed, :admin, organization: organization) }
-      let(:file) { Decidim::Dev.test_file("import_proposals.csv", "text/csv") }
+      let(:file) { upload_test_file(Decidim::Dev.test_file("import_proposals.csv", "text/csv")) }
       let(:name) { "dummies" }
 
       let(:params) { { file: file, name: name } }
@@ -28,17 +28,17 @@ module Admin
       end
 
       context "when content type is not accepted" do
-        let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:file) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
 
         it { is_expected.not_to be_valid }
       end
 
       context "when the file is not a valid file" do
-        let(:file) { Decidim::Dev.test_file("Exampledocument.pdf", Decidim::Admin::Import::Readers::XLSX::MIME_TYPE) }
+        let(:file) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", Decidim::Admin::Import::Readers::XLSX::MIME_TYPE)) }
 
         it "reports invalid and adds the correct error for the file field" do
           expect(subject).not_to be_valid
-          expect(subject.errors[:file]).to include("Invalid file provided, please check that the file is correctly formatted")
+          expect(subject.errors[:file]).to include("Invalid mime type")
         end
       end
     end
diff --git a/decidim-admin/spec/forms/decidim/admin/transfer_user_form_spec.rb b/decidim-admin/spec/forms/decidim/admin/transfer_user_form_spec.rb
index 43879b707bbfe..b5f3554aba958 100644
--- a/decidim-admin/spec/forms/decidim/admin/transfer_user_form_spec.rb
+++ b/decidim-admin/spec/forms/decidim/admin/transfer_user_form_spec.rb
@@ -34,13 +34,13 @@ module Admin
       end
 
       context "when no current_user is passed" do
-        let(:current_user) {}
+        let(:current_user) { nil }
 
         it { is_expected.to be_invalid }
       end
 
       context "when no conflict is passed" do
-        let(:conflict) {}
+        let(:conflict) { nil }
 
         it { is_expected.to be_invalid }
       end
diff --git a/decidim-admin/spec/forms/managed_user_promotion_form_spec.rb b/decidim-admin/spec/forms/managed_user_promotion_form_spec.rb
index 8cd35f44ee9ab..28feba9e5ceb8 100644
--- a/decidim-admin/spec/forms/managed_user_promotion_form_spec.rb
+++ b/decidim-admin/spec/forms/managed_user_promotion_form_spec.rb
@@ -29,7 +29,7 @@ module Admin
       end
 
       context "when email is missing" do
-        let(:email) {}
+        let(:email) { nil }
 
         it { is_expected.to be_invalid }
       end
diff --git a/decidim-admin/spec/forms/organization_appearance_form_spec.rb b/decidim-admin/spec/forms/organization_appearance_form_spec.rb
index 48243aa066084..3375ec983bb1b 100644
--- a/decidim-admin/spec/forms/organization_appearance_form_spec.rb
+++ b/decidim-admin/spec/forms/organization_appearance_form_spec.rb
@@ -101,7 +101,7 @@ module Admin
         let(:highlighted_content_banner_action_title) { Decidim::Faker::Localized.sentence(word_count: 2) }
         let(:highlighted_content_banner_action_subtitle) { Decidim::Faker::Localized.sentence(word_count: 2) }
         let(:highlighted_content_banner_action_url) { ::Faker::Internet.url }
-        let(:highlighted_content_banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:highlighted_content_banner_image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
 
         it { is_expected.to be_valid }
 
@@ -130,12 +130,12 @@ module Admin
         end
 
         context "and highlighted_content_banner_image is blank" do
-          let(:highlighted_content_banner_image) { "" }
+          let(:highlighted_content_banner_image) { nil }
 
           it { is_expected.not_to be_valid }
 
           context "and the organization already has an image set" do
-            let(:organization) { create :organization, highlighted_content_banner_image: Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+            let(:organization) { create :organization, highlighted_content_banner_image: upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
             let(:highlighted_content_banner_image) { nil }
 
             it { is_expected.to be_valid }
diff --git a/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb b/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb
index 43a12338c1716..914efc6edfdac 100644
--- a/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb
+++ b/decidim-admin/spec/forms/participatory_space_private_user_csv_import_form_spec.rb
@@ -22,7 +22,7 @@ module Admin
           "file" => file
         }
       end
-      let(:file) { File.new Decidim::Dev.asset("import_participatory_space_private_users.csv") }
+      let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users.csv")) }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }
@@ -35,10 +35,21 @@ module Admin
       end
 
       context "when user name contains invalid chars" do
-        let(:file) { File.new Decidim::Dev.asset("import_participatory_space_private_users_nok.csv") }
+        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_nok.csv")) }
 
         it { is_expected.to be_invalid }
       end
+
+      context "when the provided file is encoded with incorrect character set" do
+        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_iso8859-1.csv")) }
+
+        it { is_expected.to be_invalid }
+
+        it "adds the correct error" do
+          subject.valid?
+          expect(subject.errors[:file].join).to eq("Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.")
+        end
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb b/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb
index 1aea18c934585..96c3fdd7df1a8 100644
--- a/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb
+++ b/decidim-admin/spec/forms/participatory_space_private_user_form_spec.rb
@@ -23,7 +23,7 @@ module Admin
       end
 
       context "when email is missing" do
-        let(:email) {}
+        let(:email) { nil }
 
         it { is_expected.to be_invalid }
       end
diff --git a/decidim-admin/spec/forms/static_page_form_spec.rb b/decidim-admin/spec/forms/static_page_form_spec.rb
index 839f57bf9c6b7..5508f2010f613 100644
--- a/decidim-admin/spec/forms/static_page_form_spec.rb
+++ b/decidim-admin/spec/forms/static_page_form_spec.rb
@@ -152,7 +152,7 @@ module Admin
       describe "#control_public_access?" do
         context "when organization does not require authentication" do
           it "returns false" do
-            expect(subject.control_public_access?).to eq(false)
+            expect(subject.control_public_access?).to be(false)
           end
         end
 
@@ -160,7 +160,7 @@ module Admin
           let(:organization) { create(:organization, force_users_to_authenticate_before_access_organization: true) }
 
           it "returns true" do
-            expect(subject.control_public_access?).to eq(true)
+            expect(subject.control_public_access?).to be(true)
           end
         end
       end
diff --git a/decidim-admin/spec/forms/user_group_csv_verification_form_spec.rb b/decidim-admin/spec/forms/user_group_csv_verification_form_spec.rb
index 6b9144d57962c..a53f63ccea64e 100644
--- a/decidim-admin/spec/forms/user_group_csv_verification_form_spec.rb
+++ b/decidim-admin/spec/forms/user_group_csv_verification_form_spec.rb
@@ -12,7 +12,7 @@ module Admin
           "file" => file
         }
       end
-      let(:file) { File.new Decidim::Dev.asset("verify_user_groups.csv") }
+      let(:file) { upload_test_file(Decidim::Dev.test_file("verify_user_groups.csv", "text/csv"), return_blob: true) }
 
       context "when everything is OK" do
         it { is_expected.to be_valid }
@@ -23,6 +23,17 @@ module Admin
 
         it { is_expected.to be_invalid }
       end
+
+      context "when the provided file is encoded with incorrect character set" do
+        let(:file) { upload_test_file(Decidim::Dev.asset("import_participatory_space_private_users_iso8859-1.csv")) }
+
+        it { is_expected.to be_invalid }
+
+        it "adds the correct error" do
+          subject.valid?
+          expect(subject.errors[:file].join).to eq("Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.")
+        end
+      end
     end
   end
 end
diff --git a/decidim-admin/spec/helpers/aria_selected_link_to_helper_spec.rb b/decidim-admin/spec/helpers/aria_selected_link_to_helper_spec.rb
index d81b27557d74c..0582c96ccbc4a 100644
--- a/decidim-admin/spec/helpers/aria_selected_link_to_helper_spec.rb
+++ b/decidim-admin/spec/helpers/aria_selected_link_to_helper_spec.rb
@@ -21,9 +21,9 @@ module Admin
         end
       end
 
-      context "when it's ponting to the current path" do
+      context "when it's pointing to the current path" do
         before do
-          expect(helper)
+          allow(helper)
             .to receive(:is_active_link?)
             .and_return true
         end
@@ -33,9 +33,9 @@ module Admin
         end
       end
 
-      context "when it's ponting to the current path" do
+      context "when it isn't pointing to the current path" do
         before do
-          expect(helper)
+          allow(helper)
             .to receive(:is_active_link?)
             .and_return false
         end
diff --git a/decidim-admin/spec/helpers/moderations/reports_helper_spec.rb b/decidim-admin/spec/helpers/moderations/reports_helper_spec.rb
new file mode 100644
index 0000000000000..ca79a347d20d8
--- /dev/null
+++ b/decidim-admin/spec/helpers/moderations/reports_helper_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "decidim/proposals/test/factories"
+
+module Decidim
+  module Admin
+    module Moderations
+      describe ReportsHelper do
+        subject do
+          Nokogiri::HTML(
+            helper.reportable_author_name(reportable)
+          )
+        end
+
+        before do
+          allow(helper).to receive(:current_or_new_conversation_path_with).and_return("/conversations/1")
+        end
+
+        context "with different reportable authors types" do
+          describe "when it's a dummy resource author" do
+            let(:reportable) { create(:dummy_resource, title: { "en" => "<p>Dummy<br> Title</p>" }) }
+
+            it "returns the author's name" do
+              expect(helper.reportable_author_name(reportable)).to include("reportable-authors")
+              expect(helper.reportable_author_name(reportable)).to include(reportable.author.name)
+            end
+          end
+
+          describe "when it's a user author" do
+            let!(:proposal) { create(:proposal) }
+            let(:reportable) { proposal }
+
+            it "returns the user's name" do
+              expect(helper.reportable_author_name(reportable)).to include("reportable-authors")
+              expect(helper.reportable_author_name(reportable)).to include(reportable.authors.first.name)
+            end
+          end
+
+          describe "when it's a meeting author" do
+            let!(:proposal) { create(:proposal, :official_meeting) }
+            let(:reportable) { proposal }
+
+            it "returns the meeting's title" do
+              expect(helper.reportable_author_name(reportable)).to include("reportable-authors")
+              expect(helper.reportable_author_name(reportable)).to include(translated_attribute(reportable.authors.first.title))
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index df1f51f89bbb7..f6ab35eaf803b 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -148,7 +148,7 @@ def render_input
         let(:type) { :scope }
 
         it "is supported" do
-          expect(form).to receive(:scopes_picker).with(:test, checkboxes_on_top: true)
+          expect(form).to receive(:scopes_picker).with(:test, { checkboxes_on_top: true })
           render_input
         end
       end
diff --git a/decidim-admin/spec/lib/admin/form_builder_spec.rb b/decidim-admin/spec/lib/admin/form_builder_spec.rb
index f577eba4ea820..4b647b42627f2 100644
--- a/decidim-admin/spec/lib/admin/form_builder_spec.rb
+++ b/decidim-admin/spec/lib/admin/form_builder_spec.rb
@@ -5,9 +5,9 @@
 
 module Decidim
   describe Admin::FormBuilder do
-    let(:subject) { Nokogiri::HTML(output) }
+    subject { Nokogiri::HTML(output) }
 
-    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(nil)) }
+    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
     let(:available_locales) { %w(ca en de-CH) }
 
     let(:resource) do
@@ -17,7 +17,7 @@ def self.model_name
         end
 
         include ActiveModel::Model
-        include Virtus.model
+        include Decidim::AttributeObject::Model
 
         attribute :category_id, Integer
       end.new
diff --git a/decidim-admin/spec/lib/decidim/admin/import/creator_spec.rb b/decidim-admin/spec/lib/decidim/admin/import/creator_spec.rb
index 4008d6f7b43fb..0bdb43761a3d9 100644
--- a/decidim-admin/spec/lib/decidim/admin/import/creator_spec.rb
+++ b/decidim-admin/spec/lib/decidim/admin/import/creator_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim::Admin::Import
   describe Creator do
-    let(:subject) { described_class.new(unknown_resource) }
+    subject { described_class.new(unknown_resource) }
     let(:unknown_resource) { { field: "foo" } }
 
     it "cant finish without implementation for a resource" do
diff --git a/decidim-admin/spec/lib/decidim/admin/import/readers/base_spec.rb b/decidim-admin/spec/lib/decidim/admin/import/readers/base_spec.rb
index c7e6dff8643f2..89cae037bf71c 100644
--- a/decidim-admin/spec/lib/decidim/admin/import/readers/base_spec.rb
+++ b/decidim-admin/spec/lib/decidim/admin/import/readers/base_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim::Admin::Import::Readers
   describe Base do
-    let(:subject) { described_class.new(file) }
+    subject { described_class.new(file) }
     let(:file) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
 
     describe "#read_rows" do
diff --git a/decidim-admin/spec/lib/decidim/admin/import/readers/csv_spec.rb b/decidim-admin/spec/lib/decidim/admin/import/readers/csv_spec.rb
index 29162e4fee039..a8b0c08655564 100644
--- a/decidim-admin/spec/lib/decidim/admin/import/readers/csv_spec.rb
+++ b/decidim-admin/spec/lib/decidim/admin/import/readers/csv_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim::Admin::Import::Readers
   describe CSV do
-    let(:subject) { described_class.new(file) }
+    subject { described_class.new(file) }
     let(:csv_data) do
       <<~CSV
         id;title;detail
@@ -18,9 +18,7 @@ module Decidim::Admin::Import::Readers
     end
     let(:file) do
       path = Rails.application.root.join("tmp/test_csv.csv")
-      File.open(path, "w") do |f|
-        f.write(csv_data)
-      end
+      File.write(path, csv_data)
       path
     end
 
diff --git a/decidim-admin/spec/lib/decidim/admin/import/readers/json_spec.rb b/decidim-admin/spec/lib/decidim/admin/import/readers/json_spec.rb
index bcc851cad4579..76a3bb80114c5 100644
--- a/decidim-admin/spec/lib/decidim/admin/import/readers/json_spec.rb
+++ b/decidim-admin/spec/lib/decidim/admin/import/readers/json_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim::Admin::Import::Readers
   describe JSON do
-    let(:subject) { described_class.new(file) }
+    subject { described_class.new(file) }
     let(:json_data) do
       <<~JSON
         [
@@ -31,9 +31,7 @@ module Decidim::Admin::Import::Readers
     end
     let(:file) do
       path = Rails.application.root.join("tmp/test_json.json")
-      File.open(path, "w") do |f|
-        f.write(json_data)
-      end
+      File.write(path, json_data)
       path
     end
 
diff --git a/decidim-admin/spec/lib/decidim/admin/import/readers/xlsx_spec.rb b/decidim-admin/spec/lib/decidim/admin/import/readers/xlsx_spec.rb
index cd2b8c385b50b..192a0e7849394 100644
--- a/decidim-admin/spec/lib/decidim/admin/import/readers/xlsx_spec.rb
+++ b/decidim-admin/spec/lib/decidim/admin/import/readers/xlsx_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim::Admin::Import::Readers
   describe XLSX do
-    let(:subject) { described_class.new(file) }
+    subject { described_class.new(file) }
     let(:file) { Decidim::Dev.test_file("test_excel.xlsx", Decidim::Admin::Import::Readers::XLSX::MIME_TYPE) }
 
     describe "#read_rows" do
diff --git a/decidim-admin/spec/models/decidim/admin/fake_newsletter_spec.rb b/decidim-admin/spec/models/decidim/admin/fake_newsletter_spec.rb
index e99d6ab6f4e22..5796f0c9fb492 100644
--- a/decidim-admin/spec/models/decidim/admin/fake_newsletter_spec.rb
+++ b/decidim-admin/spec/models/decidim/admin/fake_newsletter_spec.rb
@@ -3,8 +3,9 @@
 require "spec_helper"
 
 describe Decidim::Admin::FakeNewsletter do
-  subject { described_class.new(organization, manifest) }
+  subject { newsletter }
 
+  let(:newsletter) { described_class.new(organization, manifest) }
   let(:organization) { create :organization }
   let(:manifest) do
     Decidim
@@ -32,4 +33,28 @@
       expect(subject.template.settings.body).to include("Dummy text for body")
     end
   end
+
+  describe "#url" do
+    subject { newsletter.url }
+
+    it { is_expected.to eq("#") }
+  end
+
+  describe "#notifications_settings_url" do
+    subject { newsletter.notifications_settings_url }
+
+    it { is_expected.to eq("#") }
+  end
+
+  describe "#unsubscribe_newsletters_url" do
+    subject { newsletter.unsubscribe_newsletters_url }
+
+    it { is_expected.to eq("#") }
+  end
+
+  describe "#organization_official_url" do
+    subject { newsletter.organization_official_url }
+
+    it { is_expected.to eq("#") }
+  end
 end
diff --git a/decidim-admin/spec/permissions/decidim/admin/permissions_spec.rb b/decidim-admin/spec/permissions/decidim/admin/permissions_spec.rb
index b28910e37bdfe..1c1e2a5b61ca2 100644
--- a/decidim-admin/spec/permissions/decidim/admin/permissions_spec.rb
+++ b/decidim-admin/spec/permissions/decidim/admin/permissions_spec.rb
@@ -8,7 +8,7 @@
   let(:user) { build :user, :admin, organization: organization }
   let(:organization) { build :organization }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:registrations_enabled) { true }
   let(:action) do
     { scope: :admin, action: action_name, subject: action_subject }
@@ -43,12 +43,12 @@
         { scope: :public, action: :read, subject: :admin_dashboard }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       context "when user is a user manager" do
         let(:user) { build :user, :user_manager }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -58,7 +58,7 @@
   context "when user is not present" do
     let(:user) { nil }
 
-    it { is_expected.to eq false }
+    it { is_expected.to be false }
   end
 
   context "when user is a user manager" do
@@ -90,7 +90,7 @@
     let(:action_name) { :read }
     let(:action_subject) { :admin_dashboard }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "admin logs" do
@@ -101,7 +101,7 @@
     context "when reading" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -125,7 +125,7 @@
     context "when reading" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -137,7 +137,7 @@
     context "when updating" do
       let(:action_name) { :update }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       context "when page is not present" do
         let(:page) { nil }
@@ -162,12 +162,12 @@
       context "when page is not default" do
         let(:page) { build :static_page }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
     context "when any other action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -179,7 +179,7 @@
     let(:action_subject) { :share_token }
 
     context "when any action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -191,7 +191,7 @@
       let(:action_name) { :update }
 
       context "when user belongs to organization" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user does not belong to organization" do
@@ -222,7 +222,7 @@
       context "when organization available authorizations are empty" do
         let(:authorizations) { [] }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when organization available authorizations are not empty" do
@@ -235,7 +235,7 @@
     end
 
     context "when any other action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -248,7 +248,7 @@
       let(:action_name) { :destroy }
 
       context "when destroying another user" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when destroying itself" do
@@ -277,7 +277,7 @@
         end
 
         context "when there are no active impersonation logs" do
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -315,14 +315,14 @@
       end
 
       context "when there are no active impersonation logs" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
     context "when show their email" do
       let(:action_name) { :show_email }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       context "when user is not an admin" do
         let(:user) { build :user, organization: organization }
@@ -332,14 +332,14 @@
     end
 
     context "when any other action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
   shared_examples "can perform any action for" do |action_subject_name|
     let(:action_subject) { action_subject_name }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   it_behaves_like "can perform any action for", :category
diff --git a/decidim-admin/spec/permissions/decidim/admin/user_manager_permissions_spec.rb b/decidim-admin/spec/permissions/decidim/admin/user_manager_permissions_spec.rb
index b5e8ee007e4d4..773234b137d36 100644
--- a/decidim-admin/spec/permissions/decidim/admin/user_manager_permissions_spec.rb
+++ b/decidim-admin/spec/permissions/decidim/admin/user_manager_permissions_spec.rb
@@ -8,7 +8,7 @@
   let(:user) { build :user, :user_manager, organization: organization }
   let(:organization) { build :organization }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:space_permissions) { instance_double(Decidim::ParticipatoryProcesses::Permissions, allowed?: space_allows) }
   let(:registrations_enabled) { true }
   let(:action) do
@@ -25,7 +25,7 @@
     let(:action_name) { :read }
     let(:action_subject) { :admin_dashboard }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "managed users" do
@@ -50,12 +50,12 @@
       context "when organization available authorizations are not empty" do
         let(:authorizations) { [:foo] }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
     context "when any other action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -68,7 +68,7 @@
       let(:action_name) { :destroy }
 
       context "when destroying another user" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when destroying itself" do
@@ -97,7 +97,7 @@
         end
 
         context "when there are no active impersonation logs" do
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -135,12 +135,12 @@
       end
 
       context "when there are no active impersonation logs" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
     context "when any other action" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 end
diff --git a/decidim-admin/spec/presenters/decidim/admin/dashboard_metric_charts_presenter_spec.rb b/decidim-admin/spec/presenters/decidim/admin/dashboard_metric_charts_presenter_spec.rb
index 1f8b96c3eb309..d11adddd792f6 100644
--- a/decidim-admin/spec/presenters/decidim/admin/dashboard_metric_charts_presenter_spec.rb
+++ b/decidim-admin/spec/presenters/decidim/admin/dashboard_metric_charts_presenter_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe Decidim::Admin::DashboardMetricChartsPresenter do
-  subject { described_class.new(organization: organization, summary: summary) }
+  subject { described_class.new(organization: organization, summary: summary, view_context: ActionController::Base.new.view_context) }
 
   let(:organization) { create :organization }
   let(:summary) { false }
diff --git a/decidim-admin/spec/queries/active_users_counter_spec.rb b/decidim-admin/spec/queries/active_users_counter_spec.rb
index d43e2a0e88865..4e790170b2a6a 100644
--- a/decidim-admin/spec/queries/active_users_counter_spec.rb
+++ b/decidim-admin/spec/queries/active_users_counter_spec.rb
@@ -30,7 +30,7 @@ module Decidim::Admin
         end
 
         it "returns 0 matches" do
-          query = described_class.new(parameters)
+          query = described_class.new(**parameters)
 
           expect(query.count).to eq(0)
         end
@@ -60,12 +60,12 @@ module Decidim::Admin
 
         let(:result) do
           {
-            total_admins_last_24: described_class.new(parameters_last_day_admin).query.count,
-            total_admins_last_week: described_class.new(parameters_last_week_admin).query.count,
-            total_admins_last_month: described_class.new(parameters_last_month_admin).query.count,
-            total_participants_last_24: described_class.new(parameters_last_day_participants).query.count,
-            total_participants_last_week: described_class.new(parameters_last_week_participants).query.count,
-            total_participants_last_month: described_class.new(parameters_last_month_participants).query.count
+            total_admins_last_day: described_class.new(**parameters_last_day_admin).query.count,
+            total_admins_last_week: described_class.new(**parameters_last_week_admin).query.count,
+            total_admins_last_month: described_class.new(**parameters_last_month_admin).query.count,
+            total_participants_last_day: described_class.new(**parameters_last_day_participants).query.count,
+            total_participants_last_week: described_class.new(**parameters_last_week_participants).query.count,
+            total_participants_last_month: described_class.new(**parameters_last_month_participants).query.count
           }
         end
 
@@ -74,7 +74,7 @@ module Decidim::Admin
         end
 
         it "counts total admins logged last 24 hours - 10" do
-          expect(result[:total_admins_last_24]).to eq(10)
+          expect(result[:total_admins_last_day]).to eq(10)
         end
 
         it "counts total admins logged last week - 14" do
@@ -86,7 +86,7 @@ module Decidim::Admin
         end
 
         it "counts total participants logged last 24 hours - 7" do
-          expect(result[:total_participants_last_24]).to eq(7)
+          expect(result[:total_participants_last_day]).to eq(7)
         end
 
         it "counts total participants logged last week - 12" do
diff --git a/decidim-admin/spec/shared/manage_impersonations_examples.rb b/decidim-admin/spec/shared/manage_impersonations_examples.rb
index 27c0230dc2263..d82d322ea2d66 100644
--- a/decidim-admin/spec/shared/manage_impersonations_examples.rb
+++ b/decidim-admin/spec/shared/manage_impersonations_examples.rb
@@ -125,7 +125,7 @@
       expect(Decidim::Admin::ExpireImpersonationJob).to have_been_enqueued.with(impersonated_user, user)
       travel Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes / 2
       visit current_path
-      travel Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes / 2 + 1.second
+      travel (Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes / 2) + 1.second
       visit current_path
       expect(page).to have_content("expired")
       expect(page).to have_link("Impersonate")
@@ -255,8 +255,8 @@
       visit last_email_link
 
       within "form.new_user" do
-        fill_in :invitation_user_password, with: "decidim123456"
-        fill_in :invitation_user_password_confirmation, with: "decidim123456"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        fill_in :invitation_user_password_confirmation, with: "decidim123456789"
         check :invitation_user_tos_agreement
         find("*[type=submit]").click
       end
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index 7ac45f63e04dc..848f272e13108 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -42,8 +42,8 @@
 
       within "form.new_user" do
         fill_in :invitation_user_nickname, with: "caballo_loco"
-        fill_in :invitation_user_password, with: "decidim123456"
-        fill_in :invitation_user_password_confirmation, with: "decidim123456"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        fill_in :invitation_user_password_confirmation, with: "decidim123456789"
         check :invitation_user_tos_agreement
         find("*[type=submit]").click
       end
diff --git a/decidim-admin/spec/system/admin_manage_moderated_users_spec.rb b/decidim-admin/spec/system/admin_manage_moderated_users_spec.rb
index 790186fd85c59..73c070d192202 100644
--- a/decidim-admin/spec/system/admin_manage_moderated_users_spec.rb
+++ b/decidim-admin/spec/system/admin_manage_moderated_users_spec.rb
@@ -110,6 +110,10 @@
       visit decidim_admin.moderated_users_path(blocked: true)
     end
 
+    it "user can't unreport them" do
+      expect(page).not_to have_css(".action-icon--unreport")
+    end
+
     context "when filtering by report reason" do
       it_behaves_like "a filtered collection", options: "Report reason", filter: "Spam" do
         let(:in_filter) { first_user.nickname }
diff --git a/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb b/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb
index a9e00d2306577..5d6698316051e 100644
--- a/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb
@@ -26,4 +26,9 @@
   it_behaves_like "manage moderations" do
     let(:moderations_link_text) { "Global moderations" }
   end
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+    let(:moderations_link_text) { "Global moderations" }
+  end
 end
diff --git a/decidim-admin/spec/system/admin_manages_newsletter_templates_spec.rb b/decidim-admin/spec/system/admin_manages_newsletter_templates_spec.rb
index a90b4b1306880..e4e58cc8f92f1 100644
--- a/decidim-admin/spec/system/admin_manages_newsletter_templates_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_newsletter_templates_spec.rb
@@ -59,4 +59,18 @@
       expect(page).to have_content("New newsletter")
     end
   end
+
+  describe "previewing a newsletter template iframe" do
+    shared_examples "working newsletter template iframe" do |template_id|
+      it "changes the footer links correctly" do
+        visit decidim_admin.preview_newsletter_template_path(template_id)
+        expect(page).to have_link("notifications page", href: "#")
+        expect(page).to have_link("Unsubscribe", href: "#")
+        expect(page).to have_link(organization.name, href: "#", count: 2)
+      end
+    end
+
+    it_behaves_like "working newsletter template iframe", :basic_only_text
+    it_behaves_like "working newsletter template iframe", :image_text_cta
+  end
 end
diff --git a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
index e012e73871d52..7c6812b2ca86c 100644
--- a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
@@ -75,12 +75,11 @@
           es: "Hola, %{name}! Contenido relevante.",
           ca: "Hola, %{name}! Contingut rellevant."
         )
+      end
 
-        attach_file(
-          "Main image",
-          Decidim::Dev.asset("city2.jpeg")
-        )
+      dynamically_attach_file(:newsletter_images_main_image, Decidim::Dev.asset("city2.jpeg"))
 
+      within ".new_newsletter" do
         find("*[type=submit]").click
       end
 
diff --git a/decidim-admin/spec/system/admin_manages_organization_appearance_spec.rb b/decidim-admin/spec/system/admin_manages_organization_appearance_spec.rb
index b163053d7f8a9..3e47d1c2f6b7d 100644
--- a/decidim-admin/spec/system/admin_manages_organization_appearance_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_appearance_spec.rb
@@ -47,10 +47,12 @@
 
       fill_in "Official organization URL", with: "http://www.example.com"
 
-      attach_file "Logo", Decidim::Dev.asset("city2.jpeg")
-      attach_file "Icon", Decidim::Dev.asset("city3.jpeg")
-      attach_file "Official logo header", Decidim::Dev.asset("city2.jpeg")
-      attach_file "Official logo footer", Decidim::Dev.asset("city3.jpeg")
+      dynamically_attach_file(:organization_logo, Decidim::Dev.asset("city2.jpeg"))
+      dynamically_attach_file(:organization_favicon, Decidim::Dev.asset("logo.png"), remove_before: true) do
+        expect(page).to have_content("Has to be a square image")
+      end
+      dynamically_attach_file(:organization_official_img_header, Decidim::Dev.asset("city2.jpeg"), remove_before: true)
+      dynamically_attach_file(:organization_official_img_footer, Decidim::Dev.asset("city3.jpeg"), remove_before: true)
 
       fill_in :organization_theme_color, with: "#a0a0a0"
 
diff --git a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
index 12441f2c9692d..1c2b9bcf49a00 100644
--- a/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_homepage_spec.rb
@@ -46,10 +46,7 @@
     it "updates the images of the content block" do
       visit decidim_admin.edit_organization_homepage_content_block_path(:hero)
 
-      attach_file(
-        :content_block_images_background_image,
-        Decidim::Dev.asset("city2.jpeg")
-      )
+      dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
 
       click_button "Update"
       visit decidim.root_path
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index fa6d22104b99b..715e7fe7b21d2 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -62,21 +62,21 @@
         end
 
         it "deletes paragraph changes pressing backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys "ef", [:enter], "gh", [:backspace], [:backspace], [:backspace], [:backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys "ef", [:enter], "gh", [:backspace], [:backspace], [:backspace], [:backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>e</p>".gsub("\n", ""))
         end
 
         it "deletes linebreaks when pressing backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys "a", [:left], [:enter], [:shift, :enter], [:backspace], [:backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys "a", [:left], [:enter], [:shift, :enter], [:backspace], [:backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>a</p>".gsub("\n", ""))
         end
 
         it "creates and deletes linebreaks with enter, shift+enter and backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys "acd", [:left], [:left], [:enter], [:shift, :enter], [:shift, :enter], "b", [:left], [:backspace], [:backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys "acd", [:left], [:left], [:enter], [:shift, :enter], [:shift, :enter], "b", [:left], [:backspace], [:backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>abcd</p>".gsub("\n", ""))
@@ -169,14 +169,14 @@
         end
 
         it "creates single br tag" do
-          find('div[contenteditable="true"].ql-editor').send_keys([:left, :left, :left, :left, :left], [:shift, :enter])
+          find('div[contenteditable="true"].ql-editor').native.send_keys([:left, :left, :left, :left, :left], [:shift, :enter])
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq('<p>foo<br><br><a href="https://www.decidim.org" rel="noopener noreferrer" target="_blank">link</a></p>')
         end
 
         it "doesnt create br tag inside a tag" do
-          find('div[contenteditable="true"].ql-editor').send_keys([:left, :left, :left, :left], [:shift, :enter])
+          find('div[contenteditable="true"].ql-editor').native.send_keys([:left, :left, :left, :left], [:shift, :enter])
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq('<p>foo<br><br><a href="https://www.decidim.org" rel="noopener noreferrer" target="_blank">link</a></p>')
@@ -202,7 +202,7 @@
         end
 
         it "is still editable" do
-          find('div[contenteditable="true"].ql-editor').send_keys(Array.new(15) { :backspace }, "bar baz")
+          find('div[contenteditable="true"].ql-editor').native.send_keys(Array.new(15) { :backspace }, "bar baz")
           click_button "Update"
           expect(page).to have_content("Organization updated successfully")
           expect(find(
@@ -229,16 +229,16 @@
         end
 
         it "renders new br tags inside the editor" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter], "Here shift+enter makes line change:", [:shift, :enter], "instead of new paragraph!"
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter], "Here shift+enter makes line change:", [:shift, :enter], "instead of new paragraph!"
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("#{terms_content}<p>Here shift+enter makes line change:<br>instead of new paragraph!</p>".gsub("\n", ""))
         end
 
         it "makes smartbreak (<br>) when pressing � button" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter], "foo"
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter], "foo"
           click_button("�")
-          find('div[contenteditable="true"].ql-editor').send_keys "bar"
+          find('div[contenteditable="true"].ql-editor').native.send_keys "bar"
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("#{terms_content}<p>foo<br>bar</p>".gsub("\n", ""))
@@ -246,16 +246,25 @@
 
         describe "editor history" do
           it "has undo" do
-            find('div[contenteditable="true"].ql-editor').send_keys("foo", [:shift, :enter], "bar", [:control, "z"], [:control, "z"],
-                                                                    [:control, "z"], [:control, "z"], [:control, "z"], [:control, "z"],
-                                                                    [:control, "z"])
+            find('div[contenteditable="true"].ql-editor').native.send_keys(
+              "foo",
+              [:shift, :enter],
+              "bar",
+              [:control, "z"],
+              [:control, "z"],
+              [:control, "z"],
+              [:control, "z"],
+              [:control, "z"],
+              [:control, "z"],
+              [:control, "z"]
+            )
             expect(find(
               "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
             )["innerHTML"]).to eq(terms_content.gsub("\n", ""))
           end
 
           it "has redo" do
-            find('div[contenteditable="true"].ql-editor').send_keys [:shift, :enter], "X", [:control, "z"], [:control, :shift, "z"]
+            find('div[contenteditable="true"].ql-editor').native.send_keys [:shift, :enter], "X", [:control, "z"], [:control, :shift, "z"]
             expect(find(
               "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
             )["innerHTML"]).to eq("<p>Paragraph</p><p>Some<br>text<br>here</p><p>Another paragraph<br>X</p>".gsub("\n", ""))
@@ -282,63 +291,63 @@
         end
 
         it "renders new list item" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter], "List item 4"
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter], "List item 4"
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>Paragraph</p><ul><li>List item 1</li><li>List item 2</li><li>List item 3</li><li>List item 4</li></ul>".gsub("\n", ""))
         end
 
         it "ends the list when pressing enter twice and starts new paragraph" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, :enter], "Another paragraph"
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, :enter], "Another paragraph"
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("#{terms_content}<p>Another paragraph</p>".gsub("\n", ""))
         end
 
         it "deletes empty list item when pressing backspace and starts new paragraph" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, :backspace], "Another paragraph"
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, :backspace], "Another paragraph"
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("#{terms_content}<p>Another paragraph</p>".gsub("\n", ""))
         end
 
         it "deletes linebreaks (and smartbreaks) using the backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, :enter, :enter, :backspace, :backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, :enter, :enter, :backspace, :backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq(terms_content.to_s.gsub("\n", ""))
         end
 
         it "keeps right curson position when using the backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, "bc", :left, :left, :enter, :backspace, :backspace, "a"]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, "bc", :left, :left, :enter, :backspace, :backspace, "a"]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>Paragraph</p><ul><li>List item 1</li><li>List item 2</li><li>List item 3</li><li>abc</li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right format when using the backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, :backspace, "abc", :left, :left, :left, :backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, :backspace, "abc", :left, :left, :left, :backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>Paragraph</p><ul><li>List item 1</li><li>List item 2</li><li>List item 3abc</li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right cursor position when using backspace after empty list item" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, "bcd", :left, :left, :left, :enter, :backspace, :enter, :enter, :backspace, :backspace, :backspace, "a"]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, "bcd", :left, :left, :left, :enter, :backspace, :enter, :enter, :backspace, :backspace, :backspace, "a"]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>Paragraph</p><ul><li>List item 1</li><li>List item 2</li><li>List item 3</li><li>abcd</li></ul>".to_s.gsub("\n", ""))
         end
 
         it "keeps right cursor position when using backspace after list item with text" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:enter, "acd", :left, :left, :enter, :backspace, :enter, :enter, :backspace, :backspace, :backspace, "b"]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:enter, "acd", :left, :left, :enter, :backspace, :enter, :enter, :backspace, :backspace, :backspace, "b"]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq("<p>Paragraph</p><ul><li>List item 1</li><li>List item 2</li><li>List item 3</li><li>abcd</li></ul>".to_s.gsub("\n", ""))
         end
 
         it "doesnt delete characters below when pressing backspace" do
-          find('div[contenteditable="true"].ql-editor').send_keys [:up, :up, :up, :home, :enter, :enter, :enter, :backspace, :backspace, :backspace]
+          find('div[contenteditable="true"].ql-editor').native.send_keys [:up, :up, :up, :home, :enter, :enter, :enter, :backspace, :backspace, :backspace]
           expect(find(
             "#organization-admin_terms_of_use_body-tabs-admin_terms_of_use_body-panel-0 .editor .ql-editor"
           )["innerHTML"]).to eq(terms_content.to_s.gsub("\n", ""))
diff --git a/decidim-admin/spec/system/admin_passwords_spec.rb b/decidim-admin/spec/system/admin_passwords_spec.rb
new file mode 100644
index 0000000000000..ae30015001e13
--- /dev/null
+++ b/decidim-admin/spec/system/admin_passwords_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin passwords", type: :system do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :confirmed, :admin, password: password, password_updated_at: password_updated_at, organization: organization) }
+  let(:password) { "decidim123456789" }
+  let(:new_password) { "decidim987654321" }
+  let(:password_updated_at) { nil }
+
+  before do
+    switch_to_host(organization.host)
+    visit decidim.root_path
+  end
+
+  context "when admin has not updated their password" do
+    let(:password_updated_at) { nil }
+
+    it "can update password successfully" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Admin users need to change their password every 90 days")
+      expect(page).to have_content("Password change")
+      fill_in :password_user_password, with: new_password
+      fill_in :password_user_password_confirmation, with: new_password
+      click_button "Change my password"
+      expect(page).to have_css(".callout.success")
+      expect(page).to have_content("Password successfully updated")
+      expect(user.reload.password_updated_at).to be_between(2.seconds.ago, Time.current)
+    end
+
+    it "cannot dismiss password change" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Password change")
+      click_link "user-menu-control"
+      click_link "Admin dashboard"
+      expect(page).to have_content("You need to change your password in order to proceed further")
+      expect(page).to have_content("Password change")
+      expect(page).to have_current_path(decidim.change_password_path)
+    end
+
+    context "when user is in different path" do
+      before do
+        visit decidim_admin.root_path
+      end
+
+      it "redirects to original path after password update" do
+        manual_login(user.email, password)
+        expect(page).to have_content("Password change")
+        fill_in :password_user_password, with: new_password
+        fill_in :password_user_password_confirmation, with: new_password
+        click_button "Change my password"
+        expect(page).to have_css(".callout.success")
+        expect(page).to have_current_path(decidim_admin.root_path)
+      end
+    end
+  end
+
+  context "when users password is expired" do
+    let(:password_updated_at) { 91.days.ago }
+
+    it "redirects to edit password view" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Password change")
+    end
+  end
+
+  def manual_login(email, password)
+    click_link "Sign In"
+    fill_in :session_user_email, with: email
+    fill_in :session_user_password, with: password
+    click_button "Log in"
+  end
+end
diff --git a/decidim-admin/spec/system/admin_verifies_user_groups_via_csv_spec.rb b/decidim-admin/spec/system/admin_verifies_user_groups_via_csv_spec.rb
index af5adb4fb68b5..ccb3b5b323dda 100644
--- a/decidim-admin/spec/system/admin_verifies_user_groups_via_csv_spec.rb
+++ b/decidim-admin/spec/system/admin_verifies_user_groups_via_csv_spec.rb
@@ -32,7 +32,7 @@
     # The CSV has headers, we're testing we ignore them
     expect(Decidim::Admin::VerifyUserGroupFromCsvJob).to receive(:perform_later).once.ordered.with("Email", user, organization)
     expect(Decidim::Admin::VerifyUserGroupFromCsvJob).to receive(:perform_later).once.ordered.with(user_group.email, user, organization)
-    attach_file "File", Decidim::Dev.asset("verify_user_groups.csv")
+    dynamically_attach_file(:user_group_csv_verification_file, Decidim::Dev.asset("verify_user_groups.csv"))
     perform_enqueued_jobs { click_button "Upload" }
 
     expect(page).to have_content("CSV file uploaded successfully")
diff --git a/decidim-admin/spec/system/autocomplete/multiselect_spec.rb b/decidim-admin/spec/system/autocomplete/multiselect_spec.rb
new file mode 100644
index 0000000000000..16957bb73ccca
--- /dev/null
+++ b/decidim-admin/spec/system/autocomplete/multiselect_spec.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Autocomplete multiselect", type: :system do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization: organization) }
+  let(:path) { URI.parse(decidim_admin.user_entities_organization_url).path }
+  let(:url) { "http://#{organization.host}:#{Capybara.current_session.server.port}#{path}" }
+  let(:selected) { '""' }
+
+  before do
+    final_html = html_document
+    Rails.application.routes.draw do
+      mount Decidim::Core::Engine => "/"
+      get "test_multiselect", to: ->(_) { [200, {}, [final_html]] }
+    end
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+  end
+
+  after do
+    expect_no_js_errors
+
+    Rails.application.reload_routes!
+  end
+
+  context "when view has div that defines autocomplete multiselect" do
+    let(:autocomplete_multifield_select) do
+      %(
+        <div data-autocomplete='
+          {
+            "name":"foo[user_id]",
+            "mode": "multi",
+            "options":[],
+            "placeholder":"Select user",
+            "searchURL":"#{url}",
+            "selected":#{selected}
+          }'
+          data-autocomplete-for="user_id" data-plugin="autocomplete">
+        </div>
+      )
+    end
+
+    let(:html_head) { "" }
+    let(:html_document) do
+      head_extra = html_head
+      body_extra = autocomplete_multifield_select
+      template.instance_eval do
+        <<~HTML.strip
+          <!doctype html>
+          <html lang="en">
+          <head>
+            <title>Autocomplete multiselect Test</title>
+            #{stylesheet_pack_tag "decidim_admin"}
+            #{javascript_pack_tag "decidim_admin"}
+            #{head_extra}
+          </head>
+          <body>
+            <h1>Hello world</h1>
+            <label for="trustees_participatory_space_user_id">
+            User
+            <span title="Required field" data-tooltip="true" data-disable-hover="false" data-keep-on-hover="true" class="label-required">
+            <span aria-hidden="true">*</span><span class="show-for-sr">Required field</span></span></label>
+            #{body_extra}
+            <div class="foo"></div>
+          </body>
+          </html>
+        HTML
+      end
+    end
+    let(:template_class) do
+      Class.new(ActionView::Base) do
+        # empty class
+      end
+    end
+    let(:template) { template_class.new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
+
+    before do
+      visit "/test_multiselect"
+    end
+
+    describe "render autocomplete wrapper with text input" do
+      it "shows multiselect" do
+        within ".autoComplete_wrapper" do
+          expect(page).to have_selector("input[type='text']", wait: 2)
+        end
+      end
+    end
+
+    context "when there is participants" do
+      let!(:participant) { create(:user, :confirmed, organization: organization, name: "Andrea Kuhlman") }
+      let!(:participant2) { create(:user, :confirmed, organization: organization, name: "Jenae Walsh") }
+      let!(:participant3) { create(:user, :confirmed, organization: organization, name: "John Connor") }
+
+      describe "select one participant" do
+        it "shows selected participant and creates hidden input" do
+          find("input[type='text']").fill_in with: participant.name.slice(0..2)
+          find(".autoComplete_wrapper ul#autoComplete_list_1 li", match: :first, wait: 2).click
+          expect(page).to have_content(participant.name)
+          hidden_input = find("input[type='hidden']", visible: false)
+          expect(hidden_input.value).to eq(participant.id.to_s)
+          text_input = find("input[type='text']")
+          expect(text_input.value).to eq("")
+        end
+
+        context "when the URL has extra parameters in it" do
+          let(:url) { "http://#{organization.host}:#{Capybara.current_session.server.port}#{path}?locale=ca" }
+
+          it "shows selected participant" do
+            find("input[type='text']").fill_in with: participant.name.slice(0..2)
+            find(".autoComplete_wrapper ul#autoComplete_list_1 li", match: :first, wait: 2).click
+            expect(page).to have_content(participant.name)
+          end
+        end
+      end
+
+      describe "remove selected item" do
+        it "selects and removes item" do
+          autocomplete_select participant.name, from: :user_id
+          expect(page).to have_content(participant.name)
+          expect(page).to have_selector(%(input[value="#{participant.id}"]), visible: :hidden)
+          find(".clear-multi-selection").click
+          expect(page).not_to have_content(participant.name)
+          expect(page).not_to have_selector(%(input[value="#{participant.id}"]), visible: :hidden)
+        end
+      end
+
+      describe "select multiple participants" do
+        it "shows selected participants and creates hidden inputs" do
+          autocomplete_select participant.name, from: :user_id
+          autocomplete_select participant2.name, from: :user_id
+          expect(page).to have_content(participant.name)
+          expect(page).to have_content(participant2.name)
+          expect(page).not_to have_content(participant3.name)
+          expect(page).to have_selector(%(input[value="#{participant.id}"]), visible: :hidden)
+          expect(page).to have_selector(%(input[value="#{participant2.id}"]), visible: :hidden)
+          expect(page).not_to have_selector(%(input[value="#{participant3.id}"]), visible: :hidden)
+        end
+      end
+
+      describe "preselected values" do
+        let(:selected) { %([{"value": "#{participant2.id}", "label": "#{participant2.name}"}, {"value": "#{participant3.id}", "label": "#{participant3.name}"}]) }
+
+        it "shows preselected value" do
+          expect(page).not_to have_content(participant.name)
+          expect(page).to have_content(participant2.name)
+          expect(page).to have_content(participant3.name)
+          expect(page).not_to have_selector(%(input[value="#{participant.id}"]), visible: :hidden)
+          expect(page).to have_selector(%(input[value="#{participant2.id}"]), visible: :hidden)
+          expect(page).to have_selector(%(input[value="#{participant3.id}"]), visible: :hidden)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb b/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb
new file mode 100644
index 0000000000000..ff9f4a6a9ca42
--- /dev/null
+++ b/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages participatory space private users via csv import", type: :system do
+  let(:organization) { create(:organization) }
+
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
+  let(:assembly) { create(:assembly, organization: organization) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin_assemblies.edit_assembly_path(assembly)
+    find("a[href*='participatory_space_private_users']").click
+    find("a[href*='csv_import'").click
+  end
+
+  it "show the form to add some private users via csv" do
+    expect(page).to have_content("Upload your CSV file")
+  end
+
+  context "when there are no existing users" do
+    it "doesn't propose to delete" do
+      expect(page).to have_content("You have no private participants.")
+    end
+  end
+
+  context "when there are existing users" do
+    before do
+      create_list :assembly_private_user, 3, privatable_to: assembly, user: create(:user, organization: assembly.organization)
+      visit current_path
+    end
+
+    it "propose to delete" do
+      expect(page).to have_selector(".alert")
+    end
+
+    it "ask you for confirmation and delete existing users" do
+      find(".alert").click
+
+      expect(page).to have_content("Are you sure you want to delete all private participants?")
+
+      find("a.button[data-confirm-ok]").click
+
+      expect(page).to have_content("You have no private participants")
+    end
+  end
+end
diff --git a/decidim-admin/spec/system/space_admin_manages_global_moderations_spec.rb b/decidim-admin/spec/system/space_admin_manages_global_moderations_spec.rb
index ae649d11cf31b..86e61519a5edc 100644
--- a/decidim-admin/spec/system/space_admin_manages_global_moderations_spec.rb
+++ b/decidim-admin/spec/system/space_admin_manages_global_moderations_spec.rb
@@ -83,6 +83,11 @@
     it_behaves_like "manage moderations" do
       let(:moderations_link_text) { "Global moderations" }
     end
+
+    it_behaves_like "sorted moderations" do
+      let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+      let(:moderations_link_text) { "Global moderations" }
+    end
   end
 
   context "when the user can manage a space without moderations" do
diff --git a/decidim-admin/spec/system/space_moderator_manages_global_moderations_spec.rb b/decidim-admin/spec/system/space_moderator_manages_global_moderations_spec.rb
index d0f5d440af3a2..8350bb1d65fd8 100644
--- a/decidim-admin/spec/system/space_moderator_manages_global_moderations_spec.rb
+++ b/decidim-admin/spec/system/space_moderator_manages_global_moderations_spec.rb
@@ -51,6 +51,11 @@
     it_behaves_like "manage moderations" do
       let(:moderations_link_text) { "Global moderations" }
     end
+
+    it_behaves_like "sorted moderations" do
+      let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+      let(:moderations_link_text) { "Global moderations" }
+    end
   end
 
   context "when the user can manage a space without moderations" do
diff --git a/decidim-api/app/controllers/decidim/api/documentation_controller.rb b/decidim-api/app/controllers/decidim/api/documentation_controller.rb
index c30f47a8d87f6..13c62141f0d8d 100644
--- a/decidim-api/app/controllers/decidim/api/documentation_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/documentation_controller.rb
@@ -6,6 +6,27 @@ module Api
     # the Schema to be executed, later returning the response as JSON.
     class DocumentationController < Api::ApplicationController
       layout "decidim/api/documentation"
+
+      helper_method :static_api_docs_content
+      before_action :set_cache_headers
+
+      private
+
+      def static_api_docs_content
+        render_to_string(File.join("static", "api", "docs", *safe_content_path, "index"), layout: false)
+      end
+
+      def safe_content_path
+        return "" unless params[:path]
+
+        params[:path].split("/").excluding("..", ".")
+      end
+
+      def set_cache_headers
+        response.headers["Cache-Control"] = "no-cache, no-store"
+        response.headers["Pragma"] = "no-cache"
+        response.headers["Expires"] = "Mon, 01 Jan 1990 00:00:00 GMT"
+      end
     end
   end
 end
diff --git a/decidim-api/app/helpers/decidim/api/application_helper.rb b/decidim-api/app/helpers/decidim/api/application_helper.rb
deleted file mode 100644
index 9665d38871331..0000000000000
--- a/decidim-api/app/helpers/decidim/api/application_helper.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "redcarpet"
-
-module Decidim
-  module Api
-    # Custom helpers, scoped to the api engine.
-    #
-    module ApplicationHelper
-      def render_doc(file)
-        md_render File.read(File.join(File.dirname(__FILE__), "../../../../docs", "#{file}.md"))
-      end
-
-      def md_render(text)
-        text = Redcarpet::Markdown.new(markdown, autolink: true, tables: true, fenced_code_blocks: true).render(text)
-        text.html_safe
-      end
-
-      def markdown
-        @markdown ||= Redcarpet::Render::HTML.new
-      end
-    end
-  end
-end
diff --git a/decidim-api/app/packs/entrypoints/decidim_api_docs.js b/decidim-api/app/packs/entrypoints/decidim_api_docs.js
index 30d7cc3d2857d..b3672b91c6524 100644
--- a/decidim-api/app/packs/entrypoints/decidim_api_docs.js
+++ b/decidim-api/app/packs/entrypoints/decidim_api_docs.js
@@ -1,26 +1 @@
-/* eslint-disable react/jsx-no-undef */
-
-import jQuery from "jquery"
-import { render } from "react-dom"
-import { GraphQLDocs } from "graphql-docs"
-import "stylesheets/decidim/api/docs.scss"
-
-const fetcherFactory = (path) => {
-  return (query) => {
-    return jQuery.ajax({
-      url: path,
-      data: JSON.stringify({ query }),
-      method: "POST",
-      contentType: "application/json",
-      dataType: "json"
-    });
-  };
-}
-
-window.renderDocumentation = (path) => {
-  render(
-    <GraphQLDocs fetcher={fetcherFactory(path)} />,
-    document.getElementById("documentation"),
-  );
-};
-
+import "entrypoints/decidim_api_docs.scss";
diff --git a/decidim-api/app/packs/entrypoints/decidim_api_docs.scss b/decidim-api/app/packs/entrypoints/decidim_api_docs.scss
new file mode 100644
index 0000000000000..b049a87bea612
--- /dev/null
+++ b/decidim-api/app/packs/entrypoints/decidim_api_docs.scss
@@ -0,0 +1,1318 @@
+body{
+  max-width: 1200px;
+}
+
+.version{
+  display: inline-block;
+  font-size: .8rem;
+  margin-right: 1rem;
+  padding: 3px 7px;
+  background: #f33;
+  border-radius: 10px;
+  margin-top: 5px;
+  color: white;
+}
+
+ol,
+ul{
+  list-style: none;
+  padding-left: 15px;
+}
+
+blockquote,
+q{
+  quotes: none;
+}
+
+blockquote::before,
+blockquote::after,
+q::before,
+q::after{
+  content: '';
+  content: none;
+}
+
+table{
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+body{
+  font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
+  font-weight: 400;
+  color: #444;
+}
+
+em{
+  font-style: italic;
+}
+
+#sidebar{
+  background-color: #fff;
+  position: fixed;
+  z-index: 2;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 250px;
+  padding: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  -ms-overflow-style: none;
+  border-right: 1px solid #eee;
+  font-size: 16px;
+  line-height: 1.1em;
+}
+
+#sidebar::-webkit-scrollbar{
+  width: 0 !important;
+}
+
+#sidebar li{
+  margin-bottom: .6em;
+}
+
+#sidebar a{
+  color: #444;
+  text-decoration: none;
+}
+
+#sidebar a:hover{
+  color: #de4f4f;
+}
+
+#sidebar a.current{
+  color: #de4f4f;
+}
+
+#sidebar a.H2{
+  font-weight: bold;
+}
+
+#sidebar .categories > li > p{
+  margin-top: 1.5em;
+  border-top: 1px solid #eee;
+  text-transform: uppercase;
+  padding-top: 1.2em;
+  margin-bottom: 1em;
+  color: #999;
+  font-size: .8em;
+}
+
+#sidebar .sub-menu{
+  padding-left: 20px;
+  margin: .6em 0;
+  font-size: 14px;
+}
+
+#sidebar .sub-menu .active{
+  position: relative;
+  color: #de4f4f;
+}
+
+#sidebar .sub-menu .active::before{
+  content: "";
+  position: absolute;
+  top: 2px;
+  left: -15px;
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-top: 4px solid transparent;
+  border-bottom: 4px solid transparent;
+  border-left: 6px solid #de4f4f;
+}
+
+#sidebar-mobile{
+  display: none;
+  margin-bottom: 20px;
+}
+
+#sidebar-mobile .search-box{
+  width: 200px;
+  margin-bottom: 20px;
+}
+
+.content{
+  padding: 20px 30px;
+  max-width: 760px;
+  margin-left: 300px;
+  -webkit-text-size-adjust: 100%;
+}
+
+.content em{
+  font-style: italic;
+}
+
+.content h1{
+  margin: 15px 0;
+  line-height: 1.4em;
+  font-size: 2em;
+  margin-top: 0;
+  margin-bottom: 30px;
+}
+
+.content h2{
+  margin: 15px 0;
+  line-height: 1.4em;
+  font-size: 1.5em;
+  margin-top: 30px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  position: relative;
+}
+
+.content h2 .anchor{
+  opacity: 0;
+  position: absolute;
+  font-size: 16px;
+  top: 2px;
+  left: -21px;
+}
+
+.content h2:hover .anchor{
+  opacity: 1;
+}
+
+.content h3{
+  margin: 15px 0;
+  line-height: 1.4em;
+  font-size: 1.2em;
+  margin-top: 30px;
+  position: relative;
+}
+
+.content h3 .anchor{
+  opacity: 0;
+  position: absolute;
+  font-size: 16px;
+  top: 2px;
+  left: -21px;
+}
+
+.content h3:hover .anchor{
+  opacity: 1;
+}
+
+.content h4{
+  margin: 15px 0;
+  line-height: 1.4em;
+}
+
+.content h5{
+  margin: 15px 0;
+  line-height: 1.4em;
+}
+
+.content h6{
+  margin: 15px 0;
+  line-height: 1.4em;
+}
+
+.content p{
+  margin: 15px 0;
+  line-height: 1.4em;
+}
+
+.content ul{
+  margin: 15px 0;
+  line-height: 1.4em;
+  padding-left: 1.5em;
+  list-style-type: disc;
+}
+
+.content ul li{
+  margin-bottom: 5px;
+}
+
+.content ol{
+  margin: 15px 0;
+  line-height: 1.4em;
+  padding-left: 1.5em;
+  list-style-type: decimal;
+}
+
+.content ol li{
+  margin-bottom: 5px;
+}
+
+.content figure{
+  margin: 15px 0;
+  line-height: 1.4em;
+}
+
+.content a{
+  color: #de4f4f;
+}
+
+.content img{
+  max-width: 100%;
+}
+
+.content code{
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: .8em;
+  line-height: 1.6em;
+  padding: 1px 4px;
+  background-color: #eee;
+  margin: 0 2px;
+}
+
+.content blockquote{
+  padding-left: 1.3em;
+  border-left: #eee solid .2em;
+  font-style: italic;
+}
+
+.content blockquote.warning{
+  border-color: #f00;
+  color: #f00;
+}
+
+.content dl{
+  margin-left: 1.5em;
+}
+
+.content dl dt .name{
+  font-family: monospace;
+}
+
+.content dl dt .type{
+  margin-left: .5em;
+}
+
+.content dl dd{
+  margin-left: 1.5em;
+}
+
+.content .edit-discuss-links{
+  margin-top: -25px;
+  margin-bottom: 40px;
+}
+
+.content table{
+  margin-top: 10px;
+}
+
+.content table th{
+  text-align: left;
+  padding: 0 25px;
+}
+
+.content table thead th:first-child{
+  padding: 0;
+}
+
+.content table td p{
+  padding: 0 25px;
+}
+
+.content pre{
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  line-height: 1.6em;
+  margin: 20px 0;
+  overflow-x: auto;
+  position: relative;
+  padding: 20px 30px;
+}
+
+.content pre table{
+  width: 100%;
+  border-collapse: collapse;
+  padding: 0;
+  margin: 0;
+}
+
+.content pre tr{
+  width: 100%;
+  border-collapse: collapse;
+  padding: 0;
+  margin: 0;
+}
+
+.content pre td{
+  width: 100%;
+  border-collapse: collapse;
+  padding: 0;
+  margin: 0;
+}
+
+.content pre code{
+  background-color: #272822;
+  padding: 0;
+  margin: 0;
+}
+
+.content pre .gutter{
+  user-select: none;
+  width: 1.5em;
+  padding-right: 30px;
+}
+
+.content .highlight.html .code::after{
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #ccc;
+  text-align: right;
+  font-size: .75em;
+  padding: 5px 10px 0;
+  letter-spacing: 1.5px;
+  line-height: 15px;
+  height: 15px;
+  font-weight: 600;
+}
+
+.content .highlight.js .code::after{
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #ccc;
+  text-align: right;
+  font-size: .75em;
+  padding: 5px 10px 0;
+  letter-spacing: 1.5px;
+  line-height: 15px;
+  height: 15px;
+  font-weight: 600;
+}
+
+.content .highlight.bash .code::after{
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #ccc;
+  text-align: right;
+  font-size: .75em;
+  padding: 5px 10px 0;
+  letter-spacing: 1.5px;
+  line-height: 15px;
+  height: 15px;
+  font-weight: 600;
+}
+
+.content .highlight.css .code::after{
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #ccc;
+  text-align: right;
+  font-size: .75em;
+  padding: 5px 10px 0;
+  letter-spacing: 1.5px;
+  line-height: 15px;
+  height: 15px;
+  font-weight: 600;
+}
+
+.content .highlight.jsx .code::after{
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #ccc;
+  text-align: right;
+  font-size: .75em;
+  padding: 5px 10px 0;
+  letter-spacing: 1.5px;
+  line-height: 15px;
+  height: 15px;
+  font-weight: 600;
+}
+
+.content .highlight.html.html .code::after{
+  content: 'HTML';
+}
+
+.content .highlight.js.html .code::after{
+  content: 'HTML';
+}
+
+.content .highlight.bash.html .code::after{
+  content: 'HTML';
+}
+
+.content .highlight.css.html .code::after{
+  content: 'HTML';
+}
+
+.content .highlight.jsx.html .code::after{
+  content: 'HTML';
+}
+
+.content .highlight.html.js .code::after{
+  content: 'JS';
+}
+
+.content .highlight.js.js .code::after{
+  content: 'JS';
+}
+
+.content .highlight.bash.js .code::after{
+  content: 'JS';
+}
+
+.content .highlight.css.js .code::after{
+  content: 'JS';
+}
+
+.content .highlight.jsx.js .code::after{
+  content: 'JS';
+}
+
+.content .highlight.html.bash .code::after{
+  content: 'Shell';
+}
+
+.content .highlight.js.bash .code::after{
+  content: 'Shell';
+}
+
+.content .highlight.bash.bash .code::after{
+  content: 'Shell';
+}
+
+.content .highlight.css.bash .code::after{
+  content: 'Shell';
+}
+
+.content .highlight.jsx.bash .code::after{
+  content: 'Shell';
+}
+
+.content .highlight.html.css .code::after{
+  content: 'CSS';
+}
+
+.content .highlight.js.css .code::after{
+  content: 'CSS';
+}
+
+.content .highlight.bash.css .code::after{
+  content: 'CSS';
+}
+
+.content .highlight.css.css .code::after{
+  content: 'CSS';
+}
+
+.content .highlight.jsx.css .code::after{
+  content: 'CSS';
+}
+
+.content .highlight.html.jsx .code::after{
+  content: 'JSX';
+}
+
+.content .highlight.js.jsx .code::after{
+  content: 'JSX';
+}
+
+.content .highlight.bash.jsx .code::after{
+  content: 'JSX';
+}
+
+.content .highlight.css.jsx .code::after{
+  content: 'JSX';
+}
+
+.content .highlight.jsx.jsx .code::after{
+  content: 'JSX';
+}
+
+.content > table{
+  width: 100%;
+  margin: 20px 0;
+}
+
+.content > table tr{
+  border-top: 1px solid #eee;
+}
+
+.content > table tr:nth-child(2n){
+  background-color: #f8f8f8;
+}
+
+.content > table th{
+  padding: 12px 13px;
+  border: 1px solid #eee;
+  vertical-align: middle;
+  text-align: left;
+}
+
+.content > table td{
+  border: 1px solid #eee;
+  vertical-align: middle;
+  padding: 6px 13px;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: .8em;
+  line-height: 1.6em;
+}
+
+.content .bottom-nav{
+  height: 44px;
+  margin: 30px 0 25px;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 25px;
+}
+
+.content .bottom-nav a{
+  margin: 0 5px;
+}
+
+.content .edit-link{
+  text-align: center;
+}
+
+.content .edit-link a{
+  color: #aaa;
+}
+
+.content .edit-link a::before{
+  content: '';
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background-size: 16px;
+  opacity: .3;
+  margin-right: 8px;
+  position: relative;
+  top: 2px;
+}
+
+.content .field-name{
+  font-weight: bold;
+}
+
+.content .field-entry{
+  margin-bottom: 4rem;
+}
+
+.content .description-wrapper > p{
+  padding-left: 1rem;
+  margin-bottom: 1rem;
+}
+
+#mobile-header{
+  z-index: 3;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 20px;
+  display: none;
+}
+
+#mobile-header .menu-button{
+  color: #333;
+  position: absolute;
+  top: 0;
+  right: 20px;
+  height: 24px;
+  font-size: 40px;
+  cursor: pointer;
+  opacity: .4;
+}
+
+@media screen and (max-width: 560px){
+  body{
+    font-size: 14px;
+  }
+
+  body.sidebar-open #sidebar{
+    transform: translate3d(0, 0, 0);
+  }
+
+  body.sidebar-open #mobile-shade{
+    opacity: 1;
+    pointer-events: auto;
+  }
+
+  .content{
+    margin-left: 0;
+  }
+
+  #mobile-header{
+    display: block;
+  }
+
+  #mobile-shade{
+    display: block;
+  }
+
+  #sidebar-mobile{
+    display: block;
+  }
+
+  #wrap{
+    padding-top: 40px;
+    padding-left: 0;
+  }
+
+  #sidebar{
+    top: 0;
+    left: 0;
+    border-right: none;
+    box-shadow: 0 0 4px rgba(0, 0, 0, .25);
+    transition: transform .3s ease;
+    transform: translate3d(-120%, 0, 0);
+    display: block;
+  }
+}
+
+.api{
+  background: #fafafa;
+}
+
+.api h3{
+  padding: 5px 10px;
+}
+
+.api h3.api-title{
+  margin: 0;
+  overflow: auto;
+}
+
+.api h4{
+  font-weight: normal;
+  font-style: italic;
+  margin-bottom: .25em;
+  text-decoration: underline;
+  margin-left: 20px;
+}
+
+.api dl{
+  margin-top: .25em;
+}
+
+.api dl.args{
+  margin-left: 40px;
+}
+
+.api dl.constants{
+  margin-left: 20px;
+}
+
+.api dt{
+  margin-top: 1em;
+}
+
+.api dt .name{
+  font-weight: bold;
+}
+
+.api dt .type{
+  margin-left: 15px;
+  font-size: .9em;
+  font-weight: 200;
+  color: #000;
+}
+
+.api dd{
+  margin-bottom: 1em;
+  margin-left: 0;
+}
+
+.api .desc{
+  margin: 1em;
+}
+
+.api pre{
+  margin-right: 10px;
+}
+
+h3.api-title{
+  padding: 5px 10px;
+  margin-top: 2em;
+}
+
+.api-title .locus{
+  float: right;
+  font-weight: normal;
+  padding-right: 5px;
+  font-style: italic;
+}
+
+.api-title .subtext{
+  font-size: 11px;
+  text-align: left;
+  clear: both;
+  display: block;
+  font-weight: normal;
+}
+
+.api-title .subtext > code{
+  font-size: 11px;
+  margin-right: 12px;
+}
+
+.api-title .src-code{
+  color: #20338a !important;
+  border-bottom: none !important;
+}
+
+.gutter pre{
+  color: #999;
+}
+
+pre{
+  color: #525252;
+}
+
+pre .function .keyword{
+  color: #0092db;
+}
+
+pre .constant{
+  color: #0092db;
+}
+
+pre .keyword{
+  color: #e96900;
+}
+
+pre .attribute{
+  color: #e96900;
+}
+
+pre .number{
+  color: #ae81ff;
+}
+
+pre .literal{
+  color: #ae81ff;
+}
+
+pre .tag{
+  color: #2973b7;
+}
+
+pre .tag .title{
+  color: #2973b7;
+}
+
+pre .tag .value{
+  color: #90a959;
+}
+
+pre .change{
+  color: #2973b7;
+}
+
+pre .winutils{
+  color: #2973b7;
+}
+
+pre .flow{
+  color: #2973b7;
+}
+
+pre .lisp .title{
+  color: #2973b7;
+}
+
+pre .clojure .built_in{
+  color: #2973b7;
+}
+
+pre .nginx .title{
+  color: #2973b7;
+}
+
+pre .tex .special{
+  color: #2973b7;
+}
+
+pre .tex .command{
+  color: #90a959;
+}
+
+pre .tex .formula{
+  color: #b3b3b3;
+  opacity: .5;
+}
+
+pre .class .title{
+  color: #4077bf;
+}
+
+pre .symbol{
+  color: #90a959;
+}
+
+pre .symbol .string{
+  color: #90a959;
+}
+
+pre .value{
+  color: #90a959;
+}
+
+pre .regexp{
+  color: #90a959;
+}
+
+pre .title{
+  color: #a6e22e;
+}
+
+pre .string{
+  color: #90a959;
+}
+
+pre .subst{
+  color: #90a959;
+}
+
+pre .haskell .type{
+  color: #90a959;
+}
+
+pre .preprocessor{
+  color: #90a959;
+}
+
+pre .ruby .class .parent{
+  color: #90a959;
+}
+
+pre .built_in{
+  color: #90a959;
+}
+
+pre .sql .aggregate{
+  color: #90a959;
+}
+
+pre .django .template_tag{
+  color: #90a959;
+}
+
+pre .django .variable{
+  color: #90a959;
+}
+
+pre .django .filter .argument{
+  color: #90a959;
+}
+
+pre .smalltalk .class{
+  color: #90a959;
+}
+
+pre .smalltalk .localvars{
+  color: #90a959;
+}
+
+pre .smalltalk .array{
+  color: #90a959;
+}
+
+pre .javadoc{
+  color: #90a959;
+}
+
+pre .attr_selector{
+  color: #90a959;
+}
+
+pre .pseudo{
+  color: #90a959;
+}
+
+pre .addition{
+  color: #90a959;
+}
+
+pre .stream{
+  color: #90a959;
+}
+
+pre .envvar{
+  color: #90a959;
+}
+
+pre .apache .tag{
+  color: #90a959;
+}
+
+pre .apache .cbracket{
+  color: #90a959;
+}
+
+pre .apache .sqbracket{
+  color: #b3b3b3;
+}
+
+pre .prompt{
+  color: #90a959;
+}
+
+pre .comment{
+  color: #b3b3b3;
+}
+
+pre .java .annotation{
+  color: #b3b3b3;
+}
+
+pre .python .decorator{
+  color: #b3b3b3;
+}
+
+pre .template_comment{
+  color: #b3b3b3;
+}
+
+pre .pi{
+  color: #b3b3b3;
+}
+
+pre .doctype{
+  color: #b3b3b3;
+}
+
+pre .deletion{
+  color: #b3b3b3;
+}
+
+pre .shebang{
+  color: #b3b3b3;
+}
+
+pre .coffeescript .javascript{
+  opacity: .5;
+}
+
+pre .javascript .xml{
+  opacity: .5;
+}
+
+pre .xml .javascript{
+  opacity: .5;
+}
+
+pre .xml .vbscript{
+  opacity: .5;
+}
+
+pre .xml .css{
+  opacity: .5;
+}
+
+pre .xml .cdata{
+  opacity: .5;
+}
+
+.highlight .hll{
+  background-color: #49483e;
+}
+
+pre{
+  background: #272822;
+  color: #f8f8f2;
+}
+
+.highlight .c{
+  color: #75715e;
+}
+
+/* Comment */
+.highlight .err{
+  color: #960050;
+  background-color: #1e0010;
+}
+
+/* Error */
+.highlight .k{
+  color: #66d9ef;
+}
+
+/* Keyword */
+.highlight .l{
+  color: #ae81ff;
+}
+
+/* Literal */
+.highlight .n{
+  color: #f8f8f2;
+}
+
+/* Name */
+.highlight .o{
+  color: #f92672;
+}
+
+/* Operator */
+.highlight .p{
+  color: #f8f8f2;
+}
+
+/* Punctuation */
+.highlight .cm{
+  color: #75715e;
+}
+
+/* Comment.Multiline */
+.highlight .cp{
+  color: #75715e;
+}
+
+/* Comment.Preproc */
+.highlight .c1{
+  color: #75715e;
+}
+
+/* Comment.Single */
+.highlight .cs{
+  color: #75715e;
+}
+
+/* Comment.Special */
+.highlight .ge{
+  font-style: italic;
+}
+
+/* Generic.Emph */
+.highlight .gs{
+  font-weight: bold;
+}
+
+/* Generic.Strong */
+.highlight .kc{
+  color: #66d9ef;
+}
+
+/* Keyword.Constant */
+.highlight .kd{
+  color: #66d9ef;
+}
+
+/* Keyword.Declaration */
+.highlight .kn{
+  color: #f92672;
+}
+
+/* Keyword.Namespace */
+.highlight .kp{
+  color: #66d9ef;
+}
+
+/* Keyword.Pseudo */
+.highlight .kr{
+  color: #66d9ef;
+}
+
+/* Keyword.Reserved */
+.highlight .kt{
+  color: #66d9ef;
+}
+
+/* Keyword.Type */
+.highlight .ld{
+  color: #e6db74;
+}
+
+/* Literal.Date */
+.highlight .m{
+  color: #ae81ff;
+}
+
+/* Literal.Number */
+.highlight .s{
+  color: #e6db74;
+}
+
+/* Literal.String */
+.highlight .na{
+  color: #a6e22e;
+}
+
+/* Name.Attribute */
+.highlight .nb{
+  color: #f8f8f2;
+}
+
+/* Name.Builtin */
+.highlight .nc{
+  color: #a6e22e;
+}
+
+/* Name.Class */
+.highlight .no{
+  color: #66d9ef;
+}
+
+/* Name.Constant */
+.highlight .nd{
+  color: #a6e22e;
+}
+
+/* Name.Decorator */
+.highlight .ni{
+  color: #f8f8f2;
+}
+
+/* Name.Entity */
+.highlight .ne{
+  color: #a6e22e;
+}
+
+/* Name.Exception */
+.highlight .nf{
+  color: #a6e22e;
+}
+
+/* Name.Function */
+.highlight .nl{
+  color: #f8f8f2;
+}
+
+/* Name.Label */
+.highlight .nn{
+  color: #f8f8f2;
+}
+
+/* Name.Namespace */
+.highlight .nx{
+  color: #a6e22e;
+}
+
+/* Name.Other */
+.highlight .py{
+  color: #f8f8f2;
+}
+
+/* Name.Property */
+.highlight .nt{
+  color: #f92672;
+}
+
+/* Name.Tag */
+.highlight .nv{
+  color: #f8f8f2;
+}
+
+/* Name.Variable */
+.highlight .ow{
+  color: #f92672;
+}
+
+/* Operator.Word */
+.highlight .w{
+  color: #f8f8f2;
+}
+
+/* Text.Whitespace */
+.highlight .mf{
+  color: #ae81ff;
+}
+
+/* Literal.Number.Float */
+.highlight .mh{
+  color: #ae81ff;
+}
+
+/* Literal.Number.Hex */
+.highlight .mi{
+  color: #ae81ff;
+}
+
+/* Literal.Number.Integer */
+.highlight .mo{
+  color: #ae81ff;
+}
+
+/* Literal.Number.Oct */
+.highlight .sb{
+  color: #e6db74;
+}
+
+/* Literal.String.Backtick */
+.highlight .sc{
+  color: #e6db74;
+}
+
+/* Literal.String.Char */
+.highlight .sd{
+  color: #e6db74;
+}
+
+/* Literal.String.Doc */
+.highlight .s2{
+  color: #e6db74;
+}
+
+/* Literal.String.Double */
+.highlight .se{
+  color: #ae81ff;
+}
+
+/* Literal.String.Escape */
+.highlight .sh{
+  color: #e6db74;
+}
+
+/* Literal.String.Heredoc */
+.highlight .si{
+  color: #e6db74;
+}
+
+/* Literal.String.Interpol */
+.highlight .sx{
+  color: #e6db74;
+}
+
+/* Literal.String.Other */
+.highlight .sr{
+  color: #e6db74;
+}
+
+/* Literal.String.Regex */
+.highlight .s1{
+  color: #e6db74;
+}
+
+/* Literal.String.Single */
+.highlight .ss{
+  color: #e6db74;
+}
+
+/* Literal.String.Symbol */
+.highlight .bp{
+  color: #f8f8f2;
+}
+
+/* Name.Builtin.Pseudo */
+.highlight .vc{
+  color: #f8f8f2;
+}
+
+/* Name.Variable.Class */
+.highlight .vg{
+  color: #f8f8f2;
+}
+
+/* Name.Variable.Global */
+.highlight .vi{
+  color: #f8f8f2;
+}
+
+/* Name.Variable.Instance */
+.highlight .il{
+  color: #ae81ff;
+}
+
+/* Literal.Number.Integer.Long */
+.deprecation-notice{
+  padding-left: 5px;
+  border-left: 2px solid #e8400d;
+  background: #fdf2ec;
+}
+
+.deprecation-notice span{
+  font-weight: bold;
+}
diff --git a/decidim-api/app/packs/stylesheets/decidim/api/docs.scss b/decidim-api/app/packs/stylesheets/decidim/api/docs.scss
deleted file mode 100644
index 4909010a04f52..0000000000000
--- a/decidim-api/app/packs/stylesheets/decidim/api/docs.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-body{
-  max-width: 1200px;
-}
-
-.intro,
-.info{
-  margin-left: 270px;
-  color: #333;
-}
-
-.info{
-  li{
-    margin-bottom: 1rem;
-  }
-
-  h3{
-    margin-top: 2em;
-  }
-}
-
-.version{
-  display: inline-block;
-  font-size: .8rem;
-  margin-right: 1rem;
-  padding: 3px 7px;
-  background: #f33;
-  border-radius: 10px;
-  margin-top: 5px;
-  color: white;
-}
-
-@media only screen and (max-width: 767px){
-  .intro,
-  .info{
-    margin: 10px;
-  }
-}
-
-code{
-  font-size: .8em;
-  background: #ddd;
-  padding: .1em;
-}
-
-pre{
-  padding: .5rem;
-  background: #f0f0f0;
-  border: 1px solid #e8e8e8;
-
-  code{
-    background: none;
-  }
-}
-
-blockquote{
-  border-left: 3px solid burlywood;
-  padding: .1em 0 .1em 1rem;
-  margin: 1rem 0;
-  background: #f9f7f5;
-  width: 100%;
-}
diff --git a/decidim-api/app/views/decidim/api/documentation/graphql_docs_template.html.erb b/decidim-api/app/views/decidim/api/documentation/graphql_docs_template.html.erb
new file mode 100644
index 0000000000000..2c59ad0724d6a
--- /dev/null
+++ b/decidim-api/app/views/decidim/api/documentation/graphql_docs_template.html.erb
@@ -0,0 +1,7 @@
+<div class="content"><%= contents %></div>
+<div id="sidebar"><%= include.("sidebar.html") %></div>
+
+<!-- mobile only -->
+<div id="mobile-header">
+  <a class="menu-button" onclick="document.body.classList.toggle('sidebar-open')">☰</a>
+</div>
diff --git a/decidim-api/app/views/decidim/api/documentation/show.html.erb b/decidim-api/app/views/decidim/api/documentation/show.html.erb
index c4d36d9e4de6f..a6367c1a8fbaf 100644
--- a/decidim-api/app/views/decidim/api/documentation/show.html.erb
+++ b/decidim-api/app/views/decidim/api/documentation/show.html.erb
@@ -1,5 +1,4 @@
-
-<div class="intro">
+<div class="content">
   <div class="version">Decidim <%= Decidim.version %></div>
 
   <h1><%= current_organization.name %> API documentation</h1>
@@ -8,12 +7,4 @@
   <% end %>
 </div>
 
-<div class="info">
-  <%= render_doc("usage") %>
-</div>
-
-<div id="documentation"></div>
-
-<script>
- window.renderDocumentation("<%= root_path %>");
-</script>
+<%= static_api_docs_content %>
diff --git a/decidim-api/app/views/decidim/api/graphiql/show.html.erb b/decidim-api/app/views/decidim/api/graphiql/show.html.erb
index a03cd0f42f3dc..1d22d745cd930 100644
--- a/decidim-api/app/views/decidim/api/graphiql/show.html.erb
+++ b/decidim-api/app/views/decidim/api/graphiql/show.html.erb
@@ -3,13 +3,14 @@
   <head>
     <title><%= Decidim::GraphiQL::Rails.config.title || "Decidim API" %></title>
     <%= stylesheet_pack_tag("decidim_api_graphiql") %>
-    <%= javascript_pack_tag("decidim_api_graphiql", defer: false) %>
   </head>
   <body>
     <div id="graphiql-container">
       Loading...
     </div>
 
+    <%= javascript_pack_tag "decidim_api_graphiql", defer: false %>
+
     <%
       js_configs = {
         graphql_endpoint: graphql_endpoint_path,
@@ -17,6 +18,7 @@
         request_headers: JSON.pretty_generate(Decidim::GraphiQL::Rails.config.resolve_headers(self))
       }
     %>
+
     <script>
       window.Decidim.config.set(<%== js_configs.to_json %>);
     </script>
diff --git a/decidim-api/app/views/layouts/decidim/api/documentation.html.erb b/decidim-api/app/views/layouts/decidim/api/documentation.html.erb
index ab3e2a42dacd4..29eba32fa7fd8 100644
--- a/decidim-api/app/views/layouts/decidim/api/documentation.html.erb
+++ b/decidim-api/app/views/layouts/decidim/api/documentation.html.erb
@@ -1,10 +1,7 @@
 <html>
   <head>
     <title><%= current_organization.name %> - API Documentation</title>
-    <%= javascript_pack_tag "decidim_api_docs", defer: false %>
-    <%= stylesheet_pack_tag "decidim_api_docs" %>
-    <style>
-    </style>
+    <%= stylesheet_pack_tag("decidim_api_docs") %>
   </head>
   <body>
     <%= yield %>
diff --git a/decidim-api/config/routes.rb b/decidim-api/config/routes.rb
index 1fb6e0abf77f6..af5227afa2d76 100644
--- a/decidim-api/config/routes.rb
+++ b/decidim-api/config/routes.rb
@@ -3,6 +3,7 @@
 Decidim::Api::Engine.routes.draw do
   get "/graphiql", to: "graphiql#show", graphql_path: "/api", as: :graphiql
   get "/docs", to: "documentation#show", as: :documentation
+  get "/docs/*path", to: "documentation#show"
   get "/", to: redirect("/api/docs")
   post "/" => "queries#create", as: :root
 end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 05bc16f44bb7b..b195937bfd0c0 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-api"
   s.summary = "Decidim API module"
@@ -21,9 +21,8 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor,docs}/**/*", "Rakefile", "README.md"]
 
   s.add_dependency "graphql", "~> 1.12", "< 1.13"
+  s.add_dependency "graphql-docs", "~> 2.1.0"
   s.add_dependency "rack-cors", "~> 1.0"
-  s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
-
   s.add_development_dependency "decidim-comments", Decidim::Api.version
   s.add_development_dependency "decidim-core", Decidim::Api.version
   s.add_development_dependency "decidim-dev", Decidim::Api.version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index f2dd160b6be2b..455c8759a6289 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -7,6 +7,23 @@ module Decidim
   # This module holds all business logic related to exposing a Public API for
   # decidim.
   module Api
+    include ActiveSupport::Configurable
+
+    # defines the schema max_per_page to configure GraphQL pagination
+    config_accessor :schema_max_per_page do
+      50
+    end
+
+    # defines the schema max_complexity to configure GraphQL query complexity
+    config_accessor :schema_max_complexity do
+      5000
+    end
+
+    # defines the schema max_depth to configure GraphQL query max_depth
+    config_accessor :schema_max_depth do
+      15
+    end
+
     # This declares all the types an interface or union can resolve to. This needs
     # to be done in order to be able to have them found. This is a shortcoming of
     # graphql-ruby and the way it deals with loading types, in combination with
diff --git a/decidim-api/lib/decidim/api/schema.rb b/decidim-api/lib/decidim/api/schema.rb
index b1d0a4d09d211..8a0905419bece 100644
--- a/decidim-api/lib/decidim/api/schema.rb
+++ b/decidim-api/lib/decidim/api/schema.rb
@@ -7,9 +7,9 @@ class Schema < GraphQL::Schema
       mutation(MutationType)
       query(QueryType)
 
-      default_max_page_size 50
-      max_depth 15
-      max_complexity 300
+      default_max_page_size Decidim::Api.schema_max_per_page
+      max_depth Decidim::Api.schema_max_depth
+      max_complexity Decidim::Api.schema_max_complexity
 
       orphan_types(Api.orphan_types)
     end
diff --git a/decidim-api/lib/decidim/api/test/component_context.rb b/decidim-api/lib/decidim/api/test/component_context.rb
index 7be4f3ab470d4..836e436d8b327 100644
--- a/decidim-api/lib/decidim/api/test/component_context.rb
+++ b/decidim-api/lib/decidim/api/test/component_context.rb
@@ -12,8 +12,8 @@
   let(:participatory_process) { create :participatory_process, organization: current_organization }
   let(:category) { create(:category, participatory_space: participatory_process) }
 
-  let(:component_type) {}
-  let(:component_fragment) {}
+  let(:component_type) { nil }
+  let(:component_fragment) { nil }
 
   let(:participatory_process_query) do
     %(
diff --git a/decidim-api/lib/decidim/api/version.rb b/decidim-api/lib/decidim/api/version.rb
index 166afaf06f8bf..851b590300393 100644
--- a/decidim-api/lib/decidim/api/version.rb
+++ b/decidim-api/lib/decidim/api/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-api/lib/tasks/decidim_api_docs.rake b/decidim-api/lib/tasks/decidim_api_docs.rake
new file mode 100644
index 0000000000000..c588a406885c1
--- /dev/null
+++ b/decidim-api/lib/tasks/decidim_api_docs.rake
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "graphql-docs"
+
+namespace :decidim_api do
+  desc "Generates the API docs files"
+  task generate_docs: :environment do
+    output_dir = clear_previous_docs
+
+    GraphQLDocs.build(
+      schema: Decidim::Api::Schema,
+      output_dir: output_dir,
+      base_url: "/api/docs",
+      landing_pages: {
+        index: File.expand_path("../../docs/usage.md", __dir__)
+      },
+      templates: {
+        default: File.expand_path("../../app/views/decidim/api/documentation/graphql_docs_template.html.erb", __dir__)
+      }
+    )
+
+    clear_cache_folder
+  end
+
+  def clear_previous_docs
+    output_dir = Rails.application.root.join("app", "views", "static", "api", "docs")
+    FileUtils.rm_rf(output_dir)
+    output_dir
+  end
+
+  def clear_cache_folder
+    FileUtils.rm_rf(Rails.application.root.join(".sass-cache"))
+  end
+end
diff --git a/decidim-api/spec/system/documentation_spec.rb b/decidim-api/spec/system/documentation_spec.rb
index 34044349a3687..24b998f9abad0 100644
--- a/decidim-api/spec/system/documentation_spec.rb
+++ b/decidim-api/spec/system/documentation_spec.rb
@@ -16,10 +16,7 @@
       within "h1" do
         expect(page).to have_content(organization.name)
       end
-
-      within ".info" do
-        expect(page).to have_content("ABOUT THE GRAPHQL API")
-      end
+      expect(page).to have_content("About the GraphQL API")
     end
   end
 end
diff --git a/decidim-api/spec/tasks/decidim_api_generate_docs_spec.rb b/decidim-api/spec/tasks/decidim_api_generate_docs_spec.rb
new file mode 100644
index 0000000000000..66d02470eadd8
--- /dev/null
+++ b/decidim-api/spec/tasks/decidim_api_generate_docs_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "rake decidim_api:generate_docs", type: :task do
+  it "creates the static docs files" do
+    static = Rails.root.join("app/views/static/api/docs")
+    FileUtils.rm_rf(static)
+
+    task.execute
+
+    index = File.read("#{static}/index.html")
+    expect(index).to include("About the GraphQL API")
+    expect(index).to include("GraphQL Reference")
+  end
+end
diff --git a/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb b/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
index 1b3245c1082a0..5a9c581055cf4 100644
--- a/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
+++ b/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section" xmlns="http://www.w3.org/1999/xhtml">
+<section id="highlighted_assemblies" class="wrapper-home home-section" xmlns="http://www.w3.org/1999/xhtml">
   <div class="row" id="highlighted-assemblies">
     <h3 class="section-heading"><%= t("active_assemblies", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb b/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
index b315b4af02dfa..58648dd2f50e1 100644
--- a/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
+++ b/decidim-assemblies/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
@@ -6,10 +6,6 @@ module ContentBlocks
       class HighlightedAssembliesCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_assemblies.any?
         end
@@ -22,6 +18,7 @@ def highlighted_assemblies
           @highlighted_assemblies ||= OrganizationPrioritizedAssemblies
                                       .new(current_organization, current_user)
                                       .query
+                                      .with_attached_hero_image
                                       .includes([:organization])
                                       .limit(max_results)
         end
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/copy_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/copy_assembly.rb
index 5a2be22ba6d97..ccd96e1b7a7e4 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/copy_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/copy_assembly.rb
@@ -5,14 +5,15 @@ module Assemblies
     module Admin
       # A command with all the business logic when copying a new participatory
       # assembly in the system.
-      class CopyAssembly < Rectify::Command
+      class CopyAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # assembly - An assembly we want to duplicate
-        def initialize(form, assembly)
+        def initialize(form, assembly, user)
           @form = form
           @assembly = assembly
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,11 +25,13 @@ def initialize(form, assembly)
         def call
           return broadcast(:invalid) if form.invalid?
 
-          Assembly.transaction do
-            copy_assembly
-            copy_assembly_attachments
-            copy_assembly_categories if @form.copy_categories?
-            copy_assembly_components if @form.copy_components?
+          Decidim.traceability.perform_action!("duplicate", @assembly, @user) do
+            Assembly.transaction do
+              copy_assembly
+              copy_assembly_attachments
+              copy_assembly_categories if @form.copy_categories?
+              copy_assembly_components if @form.copy_components?
+            end
           end
 
           broadcast(:ok, @copied_assembly)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assemblies_type.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assemblies_type.rb
index 0cecb70b6e689..a9cc966d4a549 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assemblies_type.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assemblies_type.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when creating a new assembly
       # type in the system.
-      class CreateAssembliesType < Rectify::Command
+      class CreateAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index a1425fc13c62b..4e918840d4a69 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when creating a new participatory
       # assembly in the system.
-      class CreateAssembly < Rectify::Command
+      class CreateAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly_member.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly_member.rb
index 9f440cfba8e74..c51416b2b9eba 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly_member.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly_member.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when creating a new assembly
       # member in the system.
-      class CreateAssemblyMember < Rectify::Command
+      class CreateAssemblyMember < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -53,16 +53,16 @@ def assembly_member_with_attributes
 
         def assembly_member_attributes
           form.attributes.slice(
-            :full_name,
-            :gender,
-            :birthday,
-            :birthplace,
-            :ceased_date,
-            :designation_date,
-            :position,
-            :position_other,
-            :weight
-          ).merge(
+            "full_name",
+            "gender",
+            "birthday",
+            "birthplace",
+            "ceased_date",
+            "designation_date",
+            "position",
+            "position_other",
+            "weight"
+          ).symbolize_keys.merge(
             assembly: assembly,
             user: form.user
           ).merge(
@@ -99,7 +99,7 @@ def notify_assembly_member_about_new_membership
             resource: assembly,
             followers: followers
           }
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
index c85aa4a5df42d..5b6a2b3020a86 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when destroying an assembly
       # type in the system.
-      class DestroyAssembliesType < Rectify::Command
+      class DestroyAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_type - the AssemblyMember to destroy
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
index 256ca47ba9892..a0edcb6296aaf 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when destroying an assembly
       # admin in the system.
-      class DestroyAssemblyAdmin < Rectify::Command
+      class DestroyAssemblyAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the AssemblyUserRole to destroy
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
index 1381e54acd61f..e7291d4edc832 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when destroying an assembly
       # member in the system.
-      class DestroyAssemblyMember < Rectify::Command
+      class DestroyAssemblyMember < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly_member - the AssemblyMember to destroy
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/import_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/import_assembly.rb
index f62e72b8736c9..ff83f3668738e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/import_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/import_assembly.rb
@@ -5,13 +5,14 @@ module Assemblies
     module Admin
       # A command with all the business logic to import a new assembly
       # in the system.
-      class ImportAssembly < Rectify::Command
+      class ImportAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # assembly - An assembly we want to duplicate
-        def initialize(form)
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -38,11 +39,14 @@ def call
         def import_assembly
           importer = Decidim::Assemblies::AssemblyImporter.new(form.current_organization, form.current_user)
           assemblies.each do |original_assembly|
-            @imported_assembly = importer.import(original_assembly, form.current_user, title: form.title, slug: form.slug)
-            importer.import_assemblies_type(original_assembly["decidim_assemblies_type_id"])
-            importer.import_categories(original_assembly["assembly_categories"]) if form.import_categories?
-            importer.import_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
-            importer.import_components(original_assembly["components"]) if form.import_components?
+            Decidim.traceability.perform_action!("import", Assembly, @user) do
+              @imported_assembly = importer.import(original_assembly, form.current_user, title: form.title, slug: form.slug)
+              importer.import_assemblies_type(original_assembly["decidim_assemblies_type_id"])
+              importer.import_categories(original_assembly["assembly_categories"]) if form.import_categories?
+              importer.import_folders_and_attachments(original_assembly["attachments"]) if form.import_attachments?
+              importer.import_components(original_assembly["components"]) if form.import_components?
+              @imported_assembly
+            end
           end
         end
 
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
index 79920fe6d4395..67b5e57f8da59 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command to notify users when a role is assigned for an assembly
-      class NotifyRoleAssignedToAssembly < Rectify::Command
+      class NotifyRoleAssignedToAssembly < Decidim::Command
         def send_notification(user)
           Decidim::EventsManager.publish(
             event: "decidim.events.assembly.role_assigned",
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/publish_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/publish_assembly.rb
index 19bef137b6f06..958cac1fb25c4 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/publish_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/publish_assembly.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command that sets an assembly as published.
-      class PublishAssembly < Rectify::Command
+      class PublishAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly - A Assembly that will be published
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/unpublish_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/unpublish_assembly.rb
index 39a82e832ed55..a16348d4ae227 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/unpublish_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/unpublish_assembly.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A command that sets an assembly as unpublished.
-      class UnpublishAssembly < Rectify::Command
+      class UnpublishAssembly < Decidim::Command
         # Public: Initializes the command.
         #
         # assembly - A Assembly that will be published
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
index c4de83c575635..6946d2ba526c1 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when updating assemblies
       # settings in admin area.
-      class UpdateAssembliesSetting < Rectify::Command
+      class UpdateAssembliesSetting < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_setting - A assemblies_setting object to update.
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_type.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_type.rb
index 235155fed53aa..99a0b82700932 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_type.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assemblies_type.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when updating a new assembly
       # type in the system.
-      class UpdateAssembliesType < Rectify::Command
+      class UpdateAssembliesType < Decidim::Command
         # Public: Initializes the command.
         #
         # assemblies_type - A assemblies_type object to update.
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index edf72b961458e..efded9588411f 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when creating a new participatory
       # assembly in the system.
-      class UpdateAssembly < Rectify::Command
+      class UpdateAssembly < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly_member.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly_member.rb
index ee590e0665906..e7769aba69a25 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly_member.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly_member.rb
@@ -5,7 +5,7 @@ module Assemblies
     module Admin
       # A command with all the business logic when updating an assembly
       # member in the system.
-      class UpdateAssemblyMember < Rectify::Command
+      class UpdateAssemblyMember < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -51,16 +51,16 @@ def call
 
         def attributes
           form.attributes.slice(
-            :full_name,
-            :gender,
-            :birthday,
-            :birthplace,
-            :ceased_date,
-            :designation_date,
-            :position,
-            :position_other,
-            :weight
-          ).merge(
+            "full_name",
+            "gender",
+            "birthday",
+            "birthplace",
+            "ceased_date",
+            "designation_date",
+            "position",
+            "position_other",
+            "weight"
+          ).symbolize_keys.merge(
             user: form.user
           ).merge(
             attachment_attributes(:non_user_avatar)
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
index 06975e1259ac2..7e93c4aefb749 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
@@ -17,7 +17,7 @@ def create
           enforce_permission_to :create, :assembly
           @form = form(AssemblyCopyForm).from_params(params)
 
-          CopyAssembly.call(@form, current_assembly) do
+          CopyAssembly.call(@form, current_assembly, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_copies.create.success", scope: "decidim.admin")
               redirect_to assemblies_path(parent_id: current_assembly.parent_id)
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index 88d24de88ebac..3e62738e92cef 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -13,7 +13,7 @@ def create
           enforce_permission_to :import, :assembly
           @form = form(AssemblyImportForm).from_params(params)
 
-          ImportAssembly.call(@form) do
+          ImportAssembly.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_imports.create.success", scope: "decidim.admin")
               redirect_to assemblies_path
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/reminders_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/reminders_controller.rb
new file mode 100644
index 0000000000000..4c28446e1d7d1
--- /dev/null
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/reminders_controller.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # an assembly.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::AssemblyAdmin
+      end
+    end
+  end
+end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
index 610f81317da33..9461b986f548f 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
@@ -48,15 +48,15 @@ def show
 
       private
 
-      def search_klass
-        AssemblySearch
+      def search_collection
+        Assembly.where(organization: current_organization).published.visible_for(current_user)
       end
 
       def default_filter_params
         {
-          scope_id: nil,
-          area_id: nil,
-          type_id: nil
+          with_scope: nil,
+          with_area: nil,
+          type_id_eq: nil
         }
       end
 
@@ -77,7 +77,7 @@ def promoted_assemblies
       end
 
       def parent_assemblies
-        search.results.parent_assemblies.order(weight: :asc, promoted: :desc)
+        search.result.parent_assemblies.order(weight: :asc, promoted: :desc)
       end
 
       def stats
diff --git a/decidim-assemblies/app/events/decidim/role_assigned_to_assembly_event.rb b/decidim-assemblies/app/events/decidim/role_assigned_to_assembly_event.rb
index ecbed338b6565..065b2e705f3d3 100644
--- a/decidim-assemblies/app/events/decidim/role_assigned_to_assembly_event.rb
+++ b/decidim-assemblies/app/events/decidim/role_assigned_to_assembly_event.rb
@@ -6,7 +6,7 @@ class RoleAssignedToAssemblyEvent < Decidim::Events::SimpleEvent
     include Decidim::Events::AuthorEvent
 
     def notification_title
-      I18n.t("notification_title", i18n_options).html_safe
+      I18n.t("notification_title", **i18n_options).html_safe
     end
 
     def i18n_role
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
index 6787d8d959874..df546bc03a33b 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_import_form.rb
@@ -30,10 +30,9 @@ class AssemblyImportForm < Form
         attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
-        attribute :document
-
-        validates :document, presence: true
+        attribute :document, Decidim::Attributes::Blob
 
+        validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
         validate :slug_uniqueness
@@ -41,7 +40,7 @@ class AssemblyImportForm < Form
         validate :document_type_must_be_valid, if: :document
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
 
         def document_type_must_be_valid
@@ -60,9 +59,9 @@ def document_type
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.assembly.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text
diff --git a/decidim-assemblies/app/helpers/decidim/assemblies/filter_assemblies_helper.rb b/decidim-assemblies/app/helpers/decidim/assemblies/filter_assemblies_helper.rb
index ee7e655bf8bad..d5fbe6d883ddc 100644
--- a/decidim-assemblies/app/helpers/decidim/assemblies/filter_assemblies_helper.rb
+++ b/decidim-assemblies/app/helpers/decidim/assemblies/filter_assemblies_helper.rb
@@ -7,7 +7,9 @@ module Assemblies
     # `filter` returns a Filter object from Decidim::FilterResource
     module FilterAssembliesHelper
       def available_filters
-        @available_filters ||= [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
+        return if organization_assembly_types.blank?
+
+        [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
       end
 
       def filter_link(type_id)
@@ -16,9 +18,9 @@ def filter_link(type_id)
           .url_helpers
           .assemblies_path(
             filter: {
-              scope_id: filter.scope_id,
-              area_id: filter.area_id,
-              type_id: type_id
+              with_scope: filter.with_scope,
+              with_area: filter.with_area,
+              type_id_eq: type_id
             }
           )
       end
@@ -28,14 +30,16 @@ def help_text
       end
 
       def current_filter_name
-        type = AssembliesType.find_by(id: filter.type_id)
+        type = AssembliesType.find_by(id: filter_params[:type_id_eq])
         return translated_attribute type.title if type
 
         t("all", scope: "decidim.assemblies.filter")
       end
 
       def organization_assembly_types
-        AssembliesType.where(organization: current_organization)&.map { |type| [translated_attribute(type.title), type.id] }
+        @organization_assembly_types ||= AssembliesType.where(organization: current_organization).joins(:assemblies).where(
+          decidim_assemblies: { id: search.result.unscope(where: :decidim_assemblies_type_id).parent_assemblies }
+        ).distinct&.map { |type| [translated_attribute(type.title), type.id] }
       end
     end
   end
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index abd90d9b8e03c..1c261d4d4b13e 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -34,6 +34,8 @@ class Assembly < ApplicationRecord
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     CREATED_BY = %w(city_council public others).freeze
@@ -146,7 +148,7 @@ def closed?
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::AssemblyUserRole.where(assembly: self)
+      roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
       return roles if role_name.blank?
 
       roles.where(role: role_name)
@@ -156,6 +158,10 @@ def attachment_context
       :admin
     end
 
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_area, :with_scope]
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute
@@ -208,8 +214,8 @@ def update_children_paths
     # rubocop:enable Rails/SkipsModelValidations
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-    end
+    ransacker_i18n :title
+
+    ransack_alias :type_id, :decidim_assemblies_type_id
   end
 end
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/orgchart.js b/decidim-assemblies/app/packs/src/decidim/assemblies/orgchart.js
index 4d0b7259d85cc..6f7e6d67a81cc 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/orgchart.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/orgchart.js
@@ -2,10 +2,13 @@
 /* eslint dot-location: ["error", "property"], no-negated-condition: "error" */
 /* eslint no-unused-expressions: ["error", { "allowTernary": true }] */
 /* eslint no-unused-vars: 0 */
-/* global d3 */
 
-import * as d3 from "d3"
-import renderChart from "src/decidim/vizzs/renders"
+import { select, selectAll, event } from "d3-selection";
+import { max } from "d3-array";
+import { hierarchy } from "d3-hierarchy";
+import { forceManyBody, forceCollide, forceCenter, forceX, forceY, forceSimulation, forceLink } from "d3-force";
+import { drag } from "d3-drag";
+import { json } from "d3-fetch";
 
 // lib
 const renderOrgCharts = () => {
@@ -54,11 +57,11 @@ const renderOrgCharts = () => {
     let updateData
     let collapse, expand
     let filter
-    let hierarchy = {}
+    let _hierarchy = {}
 
     // main chart object
-    let main = function (selection) {
-      selection.each(function scope() {
+    let main = function (_selection) {
+      _selection.each(function scope() {
 
         // calculated properties
         let calc = {}
@@ -68,12 +71,12 @@ const renderOrgCharts = () => {
         calc.chartHeight = attrs.svgHeight - attrs.marginBottom - calc.chartTopMargin
 
         // ########################## HIERARCHY STUFF  #########################
-        hierarchy.root = d3.hierarchy(attrs.data.root)
+        _hierarchy.root = hierarchy(attrs.data.root)
 
         // ###########################   BEHAVIORS #########################
         let behaviors = {}
-        // behaviors.zoom = d3.zoom().scaleExtent([0.75, 100, 8]).on("zoom", zoomed)
-        behaviors.drag = d3.drag().on("start", dragstarted).on("drag", dragged).on("end", dragended)
+        // behaviors.zoom = zoom().scaleExtent([0.75, 100, 8]).on("zoom", zoomed)
+        behaviors.drag = drag().on("start", dragstarted).on("drag", dragged).on("end", dragended)
 
         // ###########################   LAYOUTS #########################
         let layouts = {}
@@ -83,24 +86,24 @@ const renderOrgCharts = () => {
 
         // ###########################   FORCE STUFF #########################
         let force = {}
-        force.link = d3.forceLink().id((d) => d.id)
-        force.charge = d3.forceManyBody().strength(-240)
-        force.center = d3.forceCenter(calc.chartWidth / 2, calc.chartHeight / 2)
+        force.link = forceLink().id((d) => d.id)
+        force.charge = forceManyBody().strength(-240)
+        force.center = forceCenter(calc.chartWidth / 2, calc.chartHeight / 2)
 
         // prevent collide
-        force.collide = d3.forceCollide().radius((d) => {
+        force.collide = forceCollide().radius((d) => {
           // Creates an invented radius based on element measures: diagonal = 2 * radius = sqrt(width^2, height^2)
           let base = (d.bbox || {}).width + (attrs.nodeGutter.x * 2)
           let height = (d.bbox || {}).height + (attrs.nodeGutter.y * 2)
           let diagonal = Math.sqrt(Math.pow(base, 2) + Math.pow(height, 2))
           let fakeRadius = (diagonal / 2)
 
-          // return d3.max([attrs.nodeDistance * 3, fakeRadius])
+          // return max([attrs.nodeDistance * 3, fakeRadius])
           return fakeRadius * 1.5
         })
 
         // manually set x positions (which is calculated using custom radial layout)
-        force.x = d3.forceX()
+        force.x = forceX()
           .strength(0.5)
           .x(function (d) {
 
@@ -115,8 +118,8 @@ const renderOrgCharts = () => {
             return projectCircle(d.proportion, (d.depth - 1) * attrs.distance)[0]
           })
 
-        // manually set y positions (which is calculated using d3.cluster)
-        force.y = d3.forceY()
+        // manually set y positions (which is calculated using cluster)
+        force.y = forceY()
           .strength(0.5)
           .y(function (d) {
 
@@ -134,7 +137,7 @@ const renderOrgCharts = () => {
         // ---------------------------------  INITIALISE FORCE SIMULATION ----------------------------
 
         // get based on top parameter simulation
-        force.simulation = d3.forceSimulation()
+        force.simulation = forceSimulation()
           .force("link", force.link)
           .force("charge", force.charge)
           .force("center", force.center)
@@ -145,7 +148,7 @@ const renderOrgCharts = () => {
         // ###########################   HIERARCHY STUFF #########################
 
         // flatten root
-        let arr = flatten(hierarchy.root)
+        let arr = flatten(_hierarchy.root)
 
         // hide members based on their depth
         arr.forEach((d) => {
@@ -163,25 +166,25 @@ const renderOrgCharts = () => {
         // ####################################  DRAWINGS #######################
 
         // drawing containers
-        let container = d3.select(this)
+        let container = select(this)
 
         // add svg
-        let svg = container.patternify({ tag: "svg", selector: "svg-chart-container" })
+        let svg = patternify(container, { tag: "svg", selector: "svg-chart-container" })
           .attr("width", attrs.svgWidth)
           .attr("height", attrs.svgHeight)
           // .call(behaviors.zoom)
 
         // add container g element
-        let chart = svg.patternify({ tag: "g", selector: "chart" })
+        let chart = patternify(svg, { tag: "g", selector: "chart" })
           .attr("transform", `translate(${calc.chartLeftMargin},${calc.chartTopMargin})`)
 
         // ################################   Chart Content Drawing ##################################
 
         // link wrapper
-        let linksWrapper = chart.patternify({ tag: "g", selector: "links-wrapper" })
+        let linksWrapper = patternify(chart, { tag: "g", selector: "links-wrapper" })
 
         // node wrapper
-        let nodesWrapper = chart.patternify({ tag: "g", selector: "nodes-wrapper" })
+        let nodesWrapper = patternify(chart, { tag: "g", selector: "nodes-wrapper" })
         let links, nodes
 
         // reusable function which updates visual based on data change
@@ -194,14 +197,14 @@ const renderOrgCharts = () => {
           (clickedNode) ? $btnReset.removeClass("invisible") : $btnReset.addClass("invisible")
 
           // set xy and proportion properties with custom radial layout
-          layouts.radial(hierarchy.root)
+          layouts.radial(_hierarchy.root)
 
           // nodes and links array
-          let nodesArr = flatten(hierarchy.root, true)
+          let nodesArr = flatten(_hierarchy.root, true)
             .orderBy((d) => d.depth)
             .filter((d) => !d.hidden)
 
-          let linksArr = hierarchy.root.links()
+          let linksArr = _hierarchy.root.links()
             .filter((d) => !d.source.hidden)
             .filter((d) => !d.target.hidden)
 
@@ -274,7 +277,7 @@ const renderOrgCharts = () => {
             .attr("class", "as-text")
             .attr("dx", (d) => d.bbox.x + d.bbox.width + attrs.nodeGutter.x)
             .attr("dy", attrs.childrenIndicatorRadius + 3)
-            .text((d) => d3.max([(d.children || {}).length, (d._children || {}).length]))
+            .text((d) => max([(d.children || {}).length, (d._children || {}).length]))
 
           // merge  node groups and style it
           nodes = enteredNodes.merge(nodes)
@@ -291,7 +294,7 @@ const renderOrgCharts = () => {
         // zoom handler
         // function zoomed() {
         //   // get transform event
-        //   let transform = d3.event.transform
+        //   let transform = event.transform
         //   attrs.lastTransform = transform
         //
         //   // apply transform event props to the wrapper
@@ -330,8 +333,8 @@ const renderOrgCharts = () => {
         // handle dragging event
         function dragged(d) {
           // make dragged node fixed
-          d.fx = d3.event.x
-          d.fy = d3.event.y
+          d.fx = event.x
+          d.fy = event.y
         }
 
         // -------------------- handle drag end event ---------------
@@ -342,7 +345,7 @@ const renderOrgCharts = () => {
         // -------------------------- node mouse hover handler ---------------
         function nodeMouseEnter(d) {
           // get links
-          let _links = hierarchy.root.links()
+          let _links = _hierarchy.root.links()
 
           // get hovered node connected links
           let connectedLinks = _links.filter((l) => l.source.id === d.id || l.target.id === d.id)
@@ -438,7 +441,7 @@ const renderOrgCharts = () => {
         // }
 
         function freeNodes() {
-          d3.selectAll(".node").each((n) => {
+          selectAll(".node").each((n) => {
             n.fx = null
             n.fy = null
           })
@@ -507,18 +510,18 @@ const renderOrgCharts = () => {
     }
 
     // ----------- PROTOTYEPE FUNCTIONS  ----------------------
-    d3.selection.prototype.patternify = function (_params) {
+    function patternify(node, _params) {
       let selector = _params.selector
       let elementTag = _params.tag
       let _data = _params.data || [selector]
 
       // pattern in action
-      let selection = this.selectAll(`.${selector}`).data(_data)
-      selection.exit().remove()
-      selection = selection.enter().append(elementTag).merge(selection)
-      selection.attr("class", selector)
+      let _selection = node.selectAll(`.${selector}`).data(_data)
+      _selection.exit().remove()
+      _selection = _selection.enter().append(elementTag).merge(_selection)
+      _selection.attr("class", selector)
 
-      return selection
+      return _selection
     }
 
     // custom radial layout
@@ -527,8 +530,8 @@ const renderOrgCharts = () => {
 
         recurse(root, 0, 1)
 
-        function recurse(node, min, max) {
-          node.proportion = (max + min) / 2
+        function recurse(node, min, _max) {
+          node.proportion = (_max + min) / 2
           if (!node.x) {
 
             // if node has parent, match entered node positions to it's parent
@@ -550,7 +553,7 @@ const renderOrgCharts = () => {
 
           // recursively do the same for children
           if (node.children) {
-            let offset = (max - min) / node.children.length
+            let offset = (_max - min) / node.children.length
             node.children.forEach(function (child, i) {
               let newMin = min + (offset * i)
               let newMax = newMin + offset
@@ -624,7 +627,7 @@ const renderOrgCharts = () => {
 
     // run  visual
     main.run = function () {
-      d3.selectAll(attrs.container)
+      selectAll(attrs.container)
         .call(main)
       return main
     }
@@ -643,7 +646,7 @@ const renderOrgCharts = () => {
 
     main.reset = function () {
 
-      hierarchy.root.children.forEach((e) => collapse(e, true))
+      _hierarchy.root.children.forEach((e) => collapse(e, true))
       main.run()
 
       return main
@@ -659,7 +662,7 @@ const renderOrgCharts = () => {
     let width = $container.width()
     let height = width / (16 / 9)
 
-    d3.json($container.data("url")).then((data) => {
+    json($container.data("url")).then((data) => {
       // Make a fake previous node if the data entry is not hierarchical
       if (data instanceof Array) {
         fake = true
@@ -691,5 +694,8 @@ const renderOrgCharts = () => {
 }
 
 $(() => {
-  renderChart(renderOrgCharts);
+  renderOrgCharts()
+  $(document).on("change.zf.tabs", () => {
+    renderOrgCharts()
+  });
 })
diff --git a/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb b/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
index 24e6d9a4efee2..c74cb0dab5655 100644
--- a/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
+++ b/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
@@ -32,6 +32,8 @@ def permissions
         user_can_list_assembly_list?
         user_can_read_current_assembly?
         user_can_create_assembly?
+        user_can_export_assembly?
+        user_can_copy_assembly?
         user_can_read_assemblies_setting?
 
         # org admins and space admins can do everything in the admin section
@@ -71,6 +73,12 @@ def admin_user?
         user.admin? || (assembly ? can_manage_assembly?(role: :admin) : has_manageable_assemblies?)
       end
 
+      # It's an admin assembly when assembly exists and the user is allowed to
+      # manage the current assembly.
+      def admin_assembly?
+        assembly.present? && assembly_admin_allowed_assemblies.include?(assembly)
+      end
+
       # Checks if it has any manageable assembly, with any possible role.
       def has_manageable_assemblies?(role: :any)
         return unless user
@@ -88,7 +96,11 @@ def can_manage_assembly?(role: :any)
       # Returns a collection of assemblies where the given user has the
       # specific role privilege.
       def assemblies_with_role_privileges(role)
-        Decidim::Assemblies::AssembliesWithUserRole.for(user, role)
+        if role == :admin
+          assembly_admin_allowed_assemblies
+        else
+          Decidim::Assemblies::AssembliesWithUserRole.for(user, role)
+        end
       end
 
       def public_list_assemblies_action?
@@ -151,12 +163,26 @@ def user_can_read_admin_dashboard?
         allow! if user.admin? || has_manageable_assemblies?
       end
 
-      # Only organization admins can create a assembly
+      # Only organization admins and assemblies admins can create a assembly
       def user_can_create_assembly?
         return unless permission_action.action == :create &&
                       permission_action.subject == :assembly
 
-        toggle_allow(user.admin?)
+        toggle_allow(user.admin? || admin_assembly? || user_role == "admin")
+      end
+
+      def user_can_export_assembly?
+        return unless permission_action.action == :export &&
+                      permission_action.subject == :assembly
+
+        toggle_allow(user.admin? || admin_assembly?)
+      end
+
+      def user_can_copy_assembly?
+        return unless permission_action.action == :copy &&
+                      permission_action.subject == :assembly
+
+        toggle_allow(user.admin? || admin_assembly?)
       end
 
       def user_can_read_assemblies_setting?
@@ -185,10 +211,9 @@ def user_can_list_assembly_list?
       end
 
       def allowed_list_of_assemblies?
-        assemblies = AssembliesWithUserRole.for(user)
-        parent_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.ancestors.pluck(:id) }
+        parent_assemblies = assembly_admin_allowed_assemblies.flat_map { |assembly| [assembly.id] + assembly.ancestors.pluck(:id) }
 
-        allowed_list_of_assemblies = Decidim::Assembly.where(id: assemblies + parent_assemblies)
+        allowed_list_of_assemblies = Decidim::Assembly.where(id: assembly_admin_allowed_assemblies + parent_assemblies)
         allowed_list_of_assemblies.uniq.member?(assembly)
       end
 
@@ -196,7 +221,7 @@ def user_can_read_current_assembly?
         return unless read_assembly_list_permission_action?
         return if permission_action.subject == :assembly_list
 
-        toggle_allow(user.admin? || can_manage_assembly?)
+        toggle_allow(user.admin? || can_manage_assembly? || admin_assembly?)
       end
 
       # A moderator needs to be able to read the assembly they are assigned to,
@@ -223,13 +248,10 @@ def valuator_action?
       end
 
       # Process admins can perform everything *inside* that assembly. They cannot
-      # create a assembly or perform actions on assembly groups or other
-      # assemblies.
+      # perform actions on assembly groups or other assemblies.
       def assembly_admin_action?
         return unless can_manage_assembly?(role: :admin)
         return if user.admin?
-        return disallow! if permission_action.action == :create &&
-                            permission_action.subject == :assembly
 
         is_allowed = [
           :attachment,
@@ -279,6 +301,18 @@ def read_assembly_list_permission_action?
       def assembly
         @assembly ||= context.fetch(:current_participatory_space, nil) || context.fetch(:assembly, nil)
       end
+
+      def user_role
+        assembly_user_role = Decidim::AssemblyUserRole.find_by(decidim_user_id: user.id)
+        assembly_user_role.present? ? assembly_user_role.role : :any
+      end
+
+      def assembly_admin_allowed_assemblies
+        assemblies = AssembliesWithUserRole.for(user, :admin)
+        child_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.children.pluck(:id) }
+
+        Decidim::Assembly.where(id: assemblies + child_assemblies)
+      end
     end
   end
 end
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
index e7b3a1c07440a..aa648f4e8f7df 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
@@ -63,7 +63,7 @@ def i18n_labels_scope
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update"
+          when "create", "publish", "unpublish", "update", "duplicate", "export", "import"
             "decidim.admin_log.assembly.#{action}"
           else
             super
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_stats_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_stats_presenter.rb
index 69c7f33ff5bda..dec3a45a36223 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_stats_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_stats_presenter.rb
@@ -4,9 +4,12 @@ module Decidim
   module Assemblies
     # A presenter to render statistics in an Assembly.
     class AssemblyStatsPresenter < Decidim::StatsPresenter
-      attribute :assembly, Decidim::Assembly
       include Decidim::IconHelper
 
+      def assembly
+        __getobj__.fetch(:assembly)
+      end
+
       # Public: returns a collection of stats (Hash) for the Assembly Home.
       def collection
         highlighted_stats = assembly_participants_stats
diff --git a/decidim-assemblies/app/presenters/decidim/assembly_member_presenter.rb b/decidim-assemblies/app/presenters/decidim/assembly_member_presenter.rb
index 5abe7bc32674d..e5f3a50c1f0ad 100644
--- a/decidim-assemblies/app/presenters/decidim/assembly_member_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assembly_member_presenter.rb
@@ -46,11 +46,9 @@ def non_user_avatar
     private
 
     def user
-      @user ||= begin
-        if (user = __getobj__.user.presence)
-          Decidim::UserPresenter.new(user)
-        end
-      end
+      @user ||= if (user = __getobj__.user.presence)
+                  Decidim::UserPresenter.new(user)
+                end
     end
   end
 end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 09f39b3b8cd11..db82cc1a21b34 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A class used to find the admins for an assembly or an organization assemblies.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # assembly - an assembly that needs to find its assembly admins
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/assembly_members.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/assembly_members.rb
index 556e844abc484..ec7ddf89ec9b2 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/assembly_members.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/assembly_members.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # A class used to find the AssemblyMembers's by their status status.
-      class AssemblyMembers < Rectify::Query
+      class AssemblyMembers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # assembly_members - the initial AssemblyMember relation that needs to be filtered.
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/assemblies_with_user_role.rb b/decidim-assemblies/app/queries/decidim/assemblies/assemblies_with_user_role.rb
index fdbe060b0f5d9..2a5fda2470751 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/assemblies_with_user_role.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/assemblies_with_user_role.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     # A class used to find the Assemblies that the given user has
     # the specific role privilege.
-    class AssembliesWithUserRole < Rectify::Query
+    class AssembliesWithUserRole < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which assemblies can manage
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/filtered_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/filtered_assemblies.rb
index b1f28fc5e7a70..efbc8082e9cb1 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/filtered_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/filtered_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query filters assemblies by type.
-    class FilteredAssemblies < Rectify::Query
+    class FilteredAssemblies < Decidim::Query
       def initialize(filter)
         @filter = filter
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/organization_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/organization_assemblies.rb
index 0253c78df09a0..10710cd3c5aea 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/organization_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/organization_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query class filters all assemblies given an organization.
-    class OrganizationAssemblies < Rectify::Query
+    class OrganizationAssemblies < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/organization_prioritized_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
index 2b2d8e61f1460..e4e593d7d535b 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
@@ -4,14 +4,14 @@ module Decidim
   module Assemblies
     # This query class filters public assemblies given an organization in a
     # meaningful prioritized order.
-    class OrganizationPrioritizedAssemblies < Rectify::Query
+    class OrganizationPrioritizedAssemblies < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedAssemblies.new(@organization, @user),
           PrioritizedAssemblies.new
         ).query
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/organization_published_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/organization_published_assemblies.rb
index 7298aab81b8c1..c2fcc02996bfb 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/organization_published_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/organization_published_assemblies.rb
@@ -3,14 +3,14 @@
 module Decidim
   module Assemblies
     # This query class filters published assemblies given an organization.
-    class OrganizationPublishedAssemblies < Rectify::Query
+    class OrganizationPublishedAssemblies < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationAssemblies.new(@organization),
           PublishedAssemblies.new,
           VisibleAssemblies.new(@user)
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies.rb
index 93701b6ffa421..56c5e5b998b86 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query filters assemblies so only parent assemblies are returned.
-    class ParentAssemblies < Rectify::Query
+    class ParentAssemblies < Decidim::Query
       def query
         Decidim::Assembly.where(parent: nil)
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies_for_select.rb b/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies_for_select.rb
index 9aeec63116cc2..185ab87e14dc7 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies_for_select.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/parent_assemblies_for_select.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query filters assemblies that can be assigned as parents for an assembly.
-    class ParentAssembliesForSelect < Rectify::Query
+    class ParentAssembliesForSelect < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for(organization, assembly)
         new(organization, assembly).query
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/prioritized_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/prioritized_assemblies.rb
index 43f6e21e32c38..cb2c868066b53 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/prioritized_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/prioritized_assemblies.rb
@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     # This query orders assemblies by importance, prioritizing promoted
     # assemblies.
-    class PrioritizedAssemblies < Rectify::Query
+    class PrioritizedAssemblies < Decidim::Query
       def query
         Decidim::Assembly.order(promoted: :desc)
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/promoted_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/promoted_assemblies.rb
index 46422276eedb3..8e82a0fc2e4d6 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/promoted_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/promoted_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query filters assemblies so only promoted ones are returned.
-    class PromotedAssemblies < Rectify::Query
+    class PromotedAssemblies < Decidim::Query
       def query
         Decidim::Assembly.promoted
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/published_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/published_assemblies.rb
index fc59590a8c587..30b27b58b0a52 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/published_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/published_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query filters published assemblies only.
-    class PublishedAssemblies < Rectify::Query
+    class PublishedAssemblies < Decidim::Query
       def query
         Decidim::Assembly.published
       end
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/visible_assemblies.rb b/decidim-assemblies/app/queries/decidim/assemblies/visible_assemblies.rb
index b96bfacb8015d..b158466d58482 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/visible_assemblies.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/visible_assemblies.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This query class filters assemblies given a current_user.
-    class VisibleAssemblies < Rectify::Query
+    class VisibleAssemblies < Decidim::Query
       def initialize(user)
         @user = user
       end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index 9888e72a7fe1c..d91e21b0eeee3 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -108,7 +108,7 @@ def import_folders_and_attachments(attachments)
         attachments["files"].map do |file|
           next unless remote_file_exists?(file["remote_file_url"])
 
-          file_tmp = URI.open(file["remote_file_url"])
+          file_tmp = URI.parse(file["remote_file_url"]).open
 
           Decidim.traceability.perform_action!("create", Attachment, @user) do
             attachment = Attachment.new(
diff --git a/decidim-assemblies/app/services/decidim/assemblies/assembly_search.rb b/decidim-assemblies/app/services/decidim/assemblies/assembly_search.rb
deleted file mode 100644
index 514fefa6a5cdd..0000000000000
--- a/decidim-assemblies/app/services/decidim/assemblies/assembly_search.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # Service that encapsulates all logic related to filtering assemblies.
-    class AssemblySearch < ParticipatorySpaceSearch
-      def initialize(options = {})
-        super(Assembly.all, options)
-      end
-
-      def search_type_id
-        return query if type_id.blank?
-
-        query.where(decidim_assemblies_type_id: type_id)
-      end
-    end
-  end
-end
diff --git a/decidim-assemblies/app/views/decidim/assemblies/_filter_by_type.html.erb b/decidim-assemblies/app/views/decidim/assemblies/_filter_by_type.html.erb
index 7047c06299738..2c11820ca79b1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/_filter_by_type.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/_filter_by_type.html.erb
@@ -1,5 +1,5 @@
 <div id="assemblies-filter" class="inline-filters">
-  <% if available_filters.any? %>
+  <% if available_filters.present? %>
     <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
       <ul class="list-reset">
         <% available_filters.each do |title, id| %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index 6d04262cee75d..253a290039df0 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -82,13 +82,13 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
-                <% if allowed_to? :create, :assembly, assembly: assembly %>
+                <% if allowed_to? :export, :assembly, assembly: assembly %>
                   <%= icon_link_to "data-transfer-download", assembly_export_path(assembly), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
                 <% else %>
                   <span class="action-space icon"></span>
                 <% end %>
 
-                <% if allowed_to? :create, :assembly, assembly: assembly %>
+                <% if allowed_to? :copy, :assembly, assembly: assembly %>
                   <%= icon_link_to "clipboard", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
                 <% else %>
                   <span class="action-space icon"></span>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/index.html.erb
index bcc555beec28e..4a96239b64f62 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/index.html.erb
@@ -30,4 +30,6 @@ edit_link(
   <% end %>
 <% end %>
 
-<%= javascript_pack_tag "decidim_assemblies" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_assemblies" %>
+<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
index 04c3009ab89cd..5bef8f269688b 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
@@ -39,7 +39,7 @@ edit_link(
         <div class="lead">
           <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
         </div>
-        <%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
+        <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
 
         <% if current_participatory_space.private_space? %>
           <%= assembly_features(current_participatory_space) %>
@@ -221,4 +221,6 @@ edit_link(
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_assemblies" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_assemblies" %>
+<% end %>
diff --git a/decidim-assemblies/config/locales/ar.yml b/decidim-assemblies/config/locales/ar.yml
index abc21eea8fb43..e730c6f429fbb 100644
--- a/decidim-assemblies/config/locales/ar.yml
+++ b/decidim-assemblies/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ ar:
             duration_help: إذا كانت مدة هذه الجمعية محدودة ، �حدد تاريخ الانتهاء. خلا� ذلك ، سو� يظهر على أنه غير مسمى.
             filters: مرشحات
             images: الصور
-            included_at_help: حدد التاريخ الذي تمت �يه إضا�ة هذه الجمعية إلى Decidim. ليس بالضرورة أن يكون هو ن�سه تاريخ الإنشاء.
             metadata: البيانات الوص�ية
             other: آخر
             select_a_created_by: حدد تم إنشاؤها بواسطة
diff --git a/decidim-assemblies/config/locales/bg.yml b/decidim-assemblies/config/locales/bg.yml
index f9a37bd8c4203..6958f690a4b80 100644
--- a/decidim-assemblies/config/locales/bg.yml
+++ b/decidim-assemblies/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-assemblies/config/locales/ca.yml b/decidim-assemblies/config/locales/ca.yml
index 76bf43086277b..f988e5452eeb2 100644
--- a/decidim-assemblies/config/locales/ca.yml
+++ b/decidim-assemblies/config/locales/ca.yml
@@ -1,9 +1,13 @@
+---
 ca:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Habilitar organigrama
+      assemblies_type:
+        title: Títol
       assembly:
+        announcement: Avís
         area_id: Àrea
         assembly_type: Tipus d'assemblea
         assembly_type_other: Altre tipus d'assemblea
@@ -22,12 +26,16 @@ ca:
         decidim_scope_id: Àmbit
         description: Descripció
         developer_group: Grup promotor
+        document: Document
         domain: Domini
         duration: Durada
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Imatge de portada
+        import_attachments: Importar arxius adjunts
+        import_categories: Importar categories
+        import_components: Importar components
         included_at: Inclòs a
         instagram: Instagram
         internal_organisation: Organització interna
@@ -64,6 +72,7 @@ ca:
         non_user_avatar: Avatar
         position: Posició
         user_id: Participant o grup
+        weight: Ordre de posició
       assembly_user_role:
         email: Correu electrònic
         name: Nom
@@ -73,7 +82,7 @@ ca:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Tipus de document invàlid. Els formats que s''accepten són: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipus de document no vàlid. Només s''accepten arxius amb les següents extensions: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ ca:
     admin_log:
       assembly:
         create: "%{user_name} ha creat l'assemblea %{resource_name}"
+        duplicate: "%{user_name} ha duplicat la assemblea %{resource_name}"
+        export: "%{user_name} ha exportat l'assemblea %{resource_name}"
+        import: "%{user_name} ha importat l'assemblea %{resource_name}"
         publish: "%{user_name} ha publicat l'assemblea %{resource_name}"
         unpublish: "%{user_name} ha despublicat l'assemblea %{resource_name}"
         update: "%{user_name} ha actualitzat l'assemblea %{resource_name}"
@@ -270,7 +282,7 @@ ca:
             duration_help: Si la durada d'aquesta assemblea és limitada, selecciona la data de finalització. En cas contrari, apareixerà com a indefinida.
             filters: Filtres
             images: Imatges
-            included_at_help: Selecciona la data en què es va afegir aquest assemblea a Decidim. No necessàriament ha de ser la mateixa que la data de creació.
+            included_at_help: Selecciona la data en què es va afegir aquesta assemblea a la plataforma. No necessàriament ha de ser la mateixa que la data de creació.
             metadata: Metadades
             other: Altre
             select_a_created_by: Selecciona una creadora
diff --git a/decidim-assemblies/config/locales/cs.yml b/decidim-assemblies/config/locales/cs.yml
index 22b8a62185956..f92908813e1d1 100644
--- a/decidim-assemblies/config/locales/cs.yml
+++ b/decidim-assemblies/config/locales/cs.yml
@@ -1,9 +1,13 @@
+---
 cs:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Povolit schéma organizace
+      assemblies_type:
+        title: Název
       assembly:
+        announcement: Oznámení
         area_id: Oblast
         assembly_type: Typ shromáždění
         assembly_type_other: Typ shromáždění ostatní
@@ -22,12 +26,16 @@ cs:
         decidim_scope_id: Oblast působnosti
         description: Popis
         developer_group: Skupina promotérů
+        document: Dokument
         domain: Doména
         duration: Doba trvání
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Obrázek na hlavní stránce
+        import_attachments: Importovat přílohy
+        import_categories: Importovat kategorie
+        import_components: Importovat komponenty
         included_at: Zahrnuty v
         instagram: Instagram
         internal_organisation: Vnitřní organizace
@@ -64,6 +72,7 @@ cs:
         non_user_avatar: Avatar
         position: Pozice
         user_id: Uživatel
+        weight: Pozice v řazení
       assembly_user_role:
         email: E-mail
         name: Název
@@ -73,7 +82,7 @@ cs:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Neplatný typ dokumentu. Přijatelné formáty jsou: %{valid_mime_types}'
+              allowed_file_content_types: 'Neplatný typ dokumentu. Jsou povoleny pouze soubory s následujícími příponami: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -248,6 +257,9 @@ cs:
     admin_log:
       assembly:
         create: "%{user_name} vytvořil %{resource_name} shromáždění"
+        duplicate: "%{user_name} zkopíroval shromáždění %{resource_name}"
+        export: "%{user_name} exportoval shromáždění %{resource_name}"
+        import: "%{user_name} importoval shromáždění %{resource_name}"
         publish: "%{user_name} publikoval %{resource_name} shromáždění"
         unpublish: "%{user_name} odebral %{resource_name} shromáždění"
         update: "%{user_name} aktualizoval shromáždění %{resource_name}"
@@ -276,7 +288,7 @@ cs:
             duration_help: Pokud je doba trvání tohoto shromáždění omezená, zvolte kone�né datum, jinak se objeví jako neur�itá.
             filters: Filtry
             images: Obrázky
-            included_at_help: Vyberte datum, kdy bylo toto shromáždění přidáno do aplikace Decidim. Nemusí to být nutně stejné jako datum vytvoření.
+            included_at_help: Vyberte datum, kdy byla tato sestava přidána na platformu. Nemusí být nutně stejné jako datum vytvoření.
             metadata: Metadata
             other: Ostatní
             select_a_created_by: Vybrat vytvořeno od
diff --git a/decidim-assemblies/config/locales/de.yml b/decidim-assemblies/config/locales/de.yml
index fa185dc1b119e..a3293a297ee3f 100644
--- a/decidim-assemblies/config/locales/de.yml
+++ b/decidim-assemblies/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -52,7 +53,7 @@ de:
         target: Wer nimmt teil?
         title: Titel
         twitter: Twitter
-        weight: Bestellposition
+        weight: Reihenfolge
         youtube: Youtube
       assembly_member:
         birthday: Geburtstag
@@ -64,6 +65,7 @@ de:
         non_user_avatar: Profilbild
         position: Position
         user_id: User
+        weight: Reihenfolge
       assembly_user_role:
         email: Email
         name: Name
@@ -73,7 +75,7 @@ de:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Ungültiger Dokumenttyp. Zulässige Formate sind: %{valid_mime_types}'
+              allowed_file_content_types: 'Ungültiger Dokumententyp. Nur Dateien mit folgenden Erweiterungen sind erlaubt: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +244,9 @@ de:
     admin_log:
       assembly:
         create: "%{user_name} hat das Gremium %{resource_name} erstellt"
+        duplicate: "%{user_name} hat das Gremium %{resource_name} aktualisiert"
+        export: "%{user_name} hat das Gremium %{resource_name} exportiert"
+        import: "%{user_name} hat das Gremium %{resource_name} importiert"
         publish: "%{user_name} hat das Gremium %{resource_name} veröffentlicht"
         unpublish: "%{user_name} hat das Gremium %{resource_name} auf \"unveröffentlicht\" gesetzt"
         update: "%{user_name} hat das Gremium %{resource_name} aktualisiert"
@@ -270,7 +275,7 @@ de:
             duration_help: Wenn die Dauer dieser Assembly begrenzt ist, wählen Sie das Enddatum aus. Andernfalls wird es als unbestimmt angezeigt.
             filters: Filter
             images: Bilder
-            included_at_help: Wählen Sie das Datum aus, an dem diese Baugruppe zu Decidim hinzugefügt wurde. Es muss nicht unbedingt mit dem Erstellungsdatum identisch sein.
+            included_at_help: Wählen Sie das Datum aus, an dem dieses Gremium zu Decidim hinzugefügt wurde. Es muss nicht unbedingt mit dem Erstellungsdatum identisch sein.
             metadata: Metadaten
             other: Andere
             select_a_created_by: Wählen Sie eine erstellt von aus
diff --git a/decidim-assemblies/config/locales/el.yml b/decidim-assemblies/config/locales/el.yml
index 82b85c820f051..59514d115040b 100644
--- a/decidim-assemblies/config/locales/el.yml
+++ b/decidim-assemblies/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -67,12 +68,6 @@ el:
         email: Email
         name: Όνομα
         role: Ρόλος
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Μη έγκυ�ος τ�πος εγγ�άφου. Οι αποδεκτές μο�φές είναι: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -266,7 +261,6 @@ el:
             duration_help: Εάν η διά�κεια αυτής της συνέλευσης είναι πε�ιο�ισμένη, επιλέξτε την ημε�ομηνία λήξης. Διαφο�ετικά, θα εμφανίζεται ως απε�ιό�ιστη.
             filters: Φίλτ�α
             images: Εικόνες
-            included_at_help: Επιλέξτε την ημε�ομηνία π�οσθήκης αυτής της συνέλευσης στο Decidim. Δεν χ�ειάζεται απα�αίτητα να είναι ίδια με την ημε�ομηνία δημιου�γίας.
             metadata: Μεταδεδομένα
             other: Άλλο
             select_a_created_by: Επιλέξτε «Δημιου�γήθηκε από»
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index b425f6d76c31b..4409e78b27a4e 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -4,7 +4,10 @@ en:
     attributes:
       assemblies_setting:
         enable_organization_chart: Enable organization chart
+      assemblies_type:
+        title: Title
       assembly:
+        announcement: Announcement
         area_id: Area
         assembly_type: Assembly type
         assembly_type_other: Assembly type other
@@ -23,12 +26,16 @@ en:
         decidim_scope_id: Scope
         description: Description
         developer_group: Promoter group
+        document: Document
         domain: Domain
         duration: Duration
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Home image
+        import_attachments: Import attachments
+        import_categories: Import categories
+        import_components: Import components
         included_at: Included at
         instagram: Instagram
         internal_organisation: Internal organisation
@@ -65,6 +72,7 @@ en:
         non_user_avatar: Avatar
         position: Position
         user_id: User or group
+        weight: Order position
       assembly_user_role:
         email: Email
         name: Name
@@ -74,7 +82,7 @@ en:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Invalid document type. Accepted formats are: %{valid_mime_types}'
+              allowed_file_content_types: 'Invalid document type. Only files with the following extensions are allowed: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -243,6 +251,9 @@ en:
     admin_log:
       assembly:
         create: "%{user_name} created the %{resource_name} assembly"
+        duplicate: "%{user_name} duplicated the %{resource_name} assembly"
+        export: "%{user_name} exported the %{resource_name} assembly"
+        import: "%{user_name} imported the %{resource_name} assembly"
         publish: "%{user_name} published the %{resource_name} assembly"
         unpublish: "%{user_name} unpublished the %{resource_name} assembly"
         update: "%{user_name} updated the %{resource_name} assembly"
@@ -271,7 +282,7 @@ en:
             duration_help: If the duration of this assembly is limited, select the end date. Otherwise, it will appear as indefinite.
             filters: Filters
             images: Images
-            included_at_help: Select the date when this assembly was added to Decidim. It does not necessarily have to be the same as the creation date.
+            included_at_help: Select the date when this assembly was added to the platform. It does not necessarily have to be the same as the creation date.
             metadata: Metadata
             other: Other
             select_a_created_by: Select a created by
diff --git a/decidim-assemblies/config/locales/es-MX.yml b/decidim-assemblies/config/locales/es-MX.yml
index dd85c3865f6b8..dfb5f4cf68fb9 100644
--- a/decidim-assemblies/config/locales/es-MX.yml
+++ b/decidim-assemblies/config/locales/es-MX.yml
@@ -1,9 +1,13 @@
+---
 es-MX:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Habilitar organigrama
+      assemblies_type:
+        title: Título
       assembly:
+        announcement: Aviso
         area_id: �rea
         assembly_type: Tipo de montaje
         assembly_type_other: Tipo de montaje otro
@@ -22,12 +26,16 @@ es-MX:
         decidim_scope_id: �mbito
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         duration: Duración
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
         included_at: Incluido en
         instagram: Instagram
         internal_organisation: Organización interna
@@ -64,6 +72,7 @@ es-MX:
         non_user_avatar: Avatar
         position: Posición
         user_id: Usuaria
+        weight: Orden de posición
       assembly_user_role:
         email: Correo electrónico
         name: Nombre
@@ -73,7 +82,7 @@ es-MX:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento invalido. Los formatos que se aceptan son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ es-MX:
     admin_log:
       assembly:
         create: "%{user_name} creó la asamblea %{resource_name}"
+        duplicate: "%{user_name} duplicó la asamblea %{resource_name}"
+        export: "%{user_name} exportó la asamblea %{resource_name}"
+        import: "%{user_name} importó la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
@@ -270,7 +282,7 @@ es-MX:
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
             filters: Filtros
             images: Imágenes
-            included_at_help: Selecciona la fecha en que se agregó este ensamblaje a Decidim. No necesariamente tiene que ser la misma que la fecha de creación.
+            included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No es necesario que sea la misma que la fecha de creación.
             metadata: Metadatos
             other: Otro
             select_a_created_by: Selecciona creada por
diff --git a/decidim-assemblies/config/locales/es-PY.yml b/decidim-assemblies/config/locales/es-PY.yml
index 7956cb840c527..83b00be5e457f 100644
--- a/decidim-assemblies/config/locales/es-PY.yml
+++ b/decidim-assemblies/config/locales/es-PY.yml
@@ -1,9 +1,13 @@
+---
 es-PY:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Habilitar organigrama
+      assemblies_type:
+        title: Título
       assembly:
+        announcement: Aviso
         area_id: �rea
         assembly_type: Tipo de montaje
         assembly_type_other: Tipo de montaje otro
@@ -22,12 +26,16 @@ es-PY:
         decidim_scope_id: �mbito
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         duration: Duración
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
         included_at: Incluido en
         instagram: Instagram
         internal_organisation: Organización interna
@@ -64,6 +72,7 @@ es-PY:
         non_user_avatar: Avatar
         position: Posición
         user_id: Usuaria
+        weight: Orden de posición
       assembly_user_role:
         email: Correo electrónico
         name: Nombre
@@ -73,7 +82,7 @@ es-PY:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento invalido. Los formatos que se aceptan son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ es-PY:
     admin_log:
       assembly:
         create: "%{user_name} creó la asamblea %{resource_name}"
+        duplicate: "%{user_name} ha duplicado la asamblea %{resource_name}"
+        export: "%{user_name} ha exportado la asamblea %{resource_name}"
+        import: "%{user_name} ha importado la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
@@ -270,7 +282,7 @@ es-PY:
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
             filters: Filtros
             images: Imágenes
-            included_at_help: Selecciona la fecha en que se agregó este ensamblaje a Decidim. No necesariamente tiene que ser la misma que la fecha de creación.
+            included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No necesariamente tiene que ser la misma que la fecha de creación.
             metadata: Metadatos
             other: Otro
             select_a_created_by: Selecciona creada por
diff --git a/decidim-assemblies/config/locales/es.yml b/decidim-assemblies/config/locales/es.yml
index 0c60b05c9e2a7..eed5a58fbe5e8 100644
--- a/decidim-assemblies/config/locales/es.yml
+++ b/decidim-assemblies/config/locales/es.yml
@@ -1,9 +1,13 @@
+---
 es:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Habilitar organigrama
+      assemblies_type:
+        title: Título
       assembly:
+        announcement: Aviso
         area_id: �rea
         assembly_type: Tipo de asamblea
         assembly_type_other: Otro tipo de asamblea
@@ -22,12 +26,16 @@ es:
         decidim_scope_id: �mbito
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         duration: Duración
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
         included_at: Incluido en
         instagram: Instagram
         internal_organisation: Organización interna
@@ -64,6 +72,7 @@ es:
         non_user_avatar: Avatar
         position: Posición
         user_id: Participante o grupo
+        weight: Orden de posición
       assembly_user_role:
         email: Correo electrónico
         name: Nombre
@@ -73,7 +82,7 @@ es:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento inválido. Los formatos que se aceptan son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ es:
     admin_log:
       assembly:
         create: "%{user_name} creó la asamblea %{resource_name}"
+        duplicate: "%{user_name} ha duplicado la asamblea %{resource_name}"
+        export: "%{user_name} ha exportado la asamblea %{resource_name}"
+        import: "%{user_name} ha importado la asamblea %{resource_name}"
         publish: "%{user_name} publicó la asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
         update: "%{user_name} actualizó la asamblea %{resource_name}"
@@ -270,7 +282,7 @@ es:
             duration_help: Si la duración de esta asamblea es limitada, selecciona la fecha de finalización. De lo contrario, aparecerá como indefinida.
             filters: Filtros
             images: Imágenes
-            included_at_help: Selecciona la fecha en que se agregó esta asamblea a Decidim. No necesariamente tiene que ser la misma que la fecha de creación.
+            included_at_help: Selecciona la fecha en la que se añadió esta asamblea a la plataforma. No necesariamente tiene que ser la misma que la fecha de creación.
             metadata: Metadatos
             other: Otro
             select_a_created_by: Selecciona una creadora
diff --git a/decidim-assemblies/config/locales/eu.yml b/decidim-assemblies/config/locales/eu.yml
index 4cbaaea08fdf6..4388199537d3f 100644
--- a/decidim-assemblies/config/locales/eu.yml
+++ b/decidim-assemblies/config/locales/eu.yml
@@ -1,11 +1,12 @@
+---
 eu:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Gaitu organigrama
       assembly:
-        area_id: Area
-        assembly_type: Muntatze-mota
+        area_id: Arloa
+        assembly_type: Batzar mota
         assembly_type_other: Batzar mota beste
         banner_image: Bannerra
         closing_date: Amaiera data
@@ -22,6 +23,7 @@ eu:
         decidim_scope_id: esparrua
         description: Deskribapena
         developer_group: Sustatzailearen taldea
+        document: Dokumentua
         domain: Domeinua
         duration: Iraupena
         facebook: Facebook
@@ -66,18 +68,18 @@ eu:
         user_id: Parte-hartzailea edo taldea
       assembly_user_role:
         email: Emaila
-        name: izena
+        name: Izena
         role: Role
     errors:
       models:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Dokumentu-mota baliogabea da. Formatu hauek onartzen dira: %{valid_mime_types}'
+              allowed_file_content_types: 'Dokumentu mota hau ez da onartzen. Honako hauek onartzen dira: %{types}'
   activerecord:
     models:
       decidim/assembly:
-        one: Batzar
+        one: Batzarra
         other: Batzar
       decidim/assembly_member:
         one: Batzar kidea
@@ -149,12 +151,12 @@ eu:
           success: Kidea muntaia honekin batera ezabatu da.
         edit:
           title: Eguneratu muntaia kidea.
-          update: eguneratzearen
+          update: Eguneratu
         index:
-          assembly_members_title: Batzar kideak
+          assembly_members_title: Batzarraen kideak
         new:
           create: Sortu
-          title: Batzar berria kide.
+          title: Batzarkide berria.
         update:
           error: Errore bat gertatu da kidea bistaratzeko muntaia honetarako.
           success: Batzar hau behar bezala eguneratu da.
@@ -173,7 +175,7 @@ eu:
           success: Erabiltzailea behar bezala kendu da muntaia honetatik.
         edit:
           title: Eguneratu muntaia erabiltzailea.
-          update: eguneratzearen
+          update: Eguneratu
         index:
           assembly_admins_title: Batzar erabiltzaileak
         new:
@@ -217,22 +219,22 @@ eu:
           fields:
             ceased_date: Data amaitua
             designation_date: Deuseztapen data
-            full_name: izena
+            full_name: Izena
             position: Kargua
           name: kidea
           positions:
             other: Beste
             president: Lehendakaria
-            secretary: idazkari
+            secretary: Idazkaritza
             vice_president: Lehendakariordea
         assembly_user_role:
           fields:
-            email: Emaila
-            name: izena
-            role: Role
+            email: Helbide elektronikoa
+            name: Izena
+            role: Rola
           name: Batzar Erabiltzailea
           roles:
-            admin: Administrator
+            admin: Administratzailea
             collaborator: Kolaboratzaile
             moderator: Moderatzaile
             valuator: Ebaluatzailea
@@ -270,7 +272,6 @@ eu:
             duration_help: Muntaia honen iraupena mugatua bada, hautatu amaiera-data. Bestela, mugagabea izango da.
             filters: iragazkiak
             images: Irudiak
-            included_at_help: Hautatu muntaia hau Decidim-era gehitu denean. Ez du derrigorrez sorkuntzako data izan behar.
             metadata: Metadata
             other: Beste
             select_a_created_by: Aukeratu egilea by egilea
diff --git a/decidim-assemblies/config/locales/fi-plain.yml b/decidim-assemblies/config/locales/fi-plain.yml
index 0b3ec44020de0..8f49e02d1e552 100644
--- a/decidim-assemblies/config/locales/fi-plain.yml
+++ b/decidim-assemblies/config/locales/fi-plain.yml
@@ -1,9 +1,13 @@
+---
 fi-pl:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Ota organisaatiokaavio käyttöön
+      assemblies_type:
+        title: Otsikko
       assembly:
+        announcement: Ilmoitus
         area_id: Alue
         assembly_type: Ryhmän tyyppi
         assembly_type_other: Muu ryhmän tyyppi
@@ -22,12 +26,16 @@ fi-pl:
         decidim_scope_id: Teema
         description: Kuvaus
         developer_group: Perustajaryhmä
+        document: Asiakirja
         domain: Toimintaympäristö
         duration: Kesto
         facebook: Facebook
         github: GitHub
         hashtag: Aihetunniste (hashtag)
         hero_image: Etusivun kuva
+        import_attachments: Tuo liitteitä
+        import_categories: Tuo aihepiirejä
+        import_components: Tuo komponentteja
         included_at: Mukana osoitteessa
         instagram: Instagram
         internal_organisation: Sisäinen organisaatio
@@ -64,6 +72,7 @@ fi-pl:
         non_user_avatar: Avatar
         position: Asema
         user_id: Käyttäjä tai ryhmä
+        weight: Järjestysnumero
       assembly_user_role:
         email: Sähköposti
         name: Nimi
@@ -73,7 +82,7 @@ fi-pl:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan muoto. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ fi-pl:
     admin_log:
       assembly:
         create: "%{user_name} loi %{resource_name} ryhmän"
+        duplicate: "%{user_name} kopioi ryhmän %{resource_name}"
+        export: "%{user_name} vei ryhmän %{resource_name}"
+        import: "%{user_name} toi ryhmän %{resource_name}"
         publish: "%{user_name} julkaisi %{resource_name} ryhmän"
         unpublish: "%{user_name} lopetti %{resource_name} ryhmän julkaisemisen"
         update: "%{user_name} päivitti %{resource_name} ryhmän"
@@ -270,7 +282,7 @@ fi-pl:
             duration_help: Jos ryhmän kesto on rajoitettu, valitse päättymispäivä. Muussa tapauksessa se näkyy määrittelemättömänä.
             filters: Suodattimet
             images: kuvat
-            included_at_help: Valitse päivämäärä, jolloin ryhmä lisättiin Decidimiin. Sen ei välttämättä tarvitse olla sama kuin luomispäivä.
+            included_at_help: Valitse päivämäärä, jolloin tämä ryhmä lisättiin alustalle. Sen ei välttämättä tarvitse olla sama kuin luontipäivä.
             metadata: metadata
             other: muut
             select_a_created_by: Valitse luoja
diff --git a/decidim-assemblies/config/locales/fi.yml b/decidim-assemblies/config/locales/fi.yml
index 1a91c87c6517c..eba267336c278 100644
--- a/decidim-assemblies/config/locales/fi.yml
+++ b/decidim-assemblies/config/locales/fi.yml
@@ -1,9 +1,13 @@
+---
 fi:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Ota organisaatiokaavio käyttöön
+      assemblies_type:
+        title: Otsikko
       assembly:
+        announcement: Ilmoitus
         area_id: Alue
         assembly_type: Ryhmän tyyppi
         assembly_type_other: Muu ryhmän tyyppi
@@ -22,12 +26,16 @@ fi:
         decidim_scope_id: Teema
         description: Kuvaus
         developer_group: Edistäjäryhmä
+        document: Asiakirja
         domain: Toimintaympäristö
         duration: Kesto
         facebook: Facebook
         github: GitHub
         hashtag: Aihetunniste (hashtag)
         hero_image: Etusivun kuva
+        import_attachments: Tuo liitteitä
+        import_categories: Tuo aihepiirejä
+        import_components: Tuo komponentteja
         included_at: Lisäysaika
         instagram: Instagram
         internal_organisation: Sisäinen organisaatio
@@ -64,6 +72,7 @@ fi:
         non_user_avatar: Avatar
         position: Asema
         user_id: Käyttäjä tai ryhmä
+        weight: Järjestysnumero
       assembly_user_role:
         email: Sähköposti
         name: Nimi
@@ -73,7 +82,7 @@ fi:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan muoto. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ fi:
     admin_log:
       assembly:
         create: "%{user_name} loi %{resource_name} ryhmän"
+        duplicate: "%{user_name} kopioi ryhmän %{resource_name}"
+        export: "%{user_name} vei ryhmän %{resource_name}"
+        import: "%{user_name} toi ryhmän %{resource_name}"
         publish: "%{user_name} julkaisi %{resource_name} ryhmän"
         unpublish: "%{user_name} lopetti ryhmän %{resource_name} julkaisun"
         update: "%{user_name} päivitti %{resource_name} ryhmän"
@@ -270,7 +282,7 @@ fi:
             duration_help: Jos ryhmän kesto on rajoitettu, valitse päättymispäivä. Muussa tapauksessa se näkyy määrittelemättömänä.
             filters: Suodattimet
             images: Kuvat
-            included_at_help: Valitse päivämäärä, jolloin ryhmä lisättiin Decidimiin. Sen ei välttämättä tarvitse olla sama kuin luomispäivä.
+            included_at_help: Valitse päivämäärä, jolloin tämä ryhmä lisättiin alustalle. Sen ei välttämättä tarvitse olla sama kuin luontipäivä.
             metadata: Metatiedot
             other: Muut
             select_a_created_by: Valitse luoja
diff --git a/decidim-assemblies/config/locales/fr-CA.yml b/decidim-assemblies/config/locales/fr-CA.yml
index 8fc9f31a618dc..01330f7b8073c 100644
--- a/decidim-assemblies/config/locales/fr-CA.yml
+++ b/decidim-assemblies/config/locales/fr-CA.yml
@@ -1,9 +1,13 @@
+---
 fr-CA:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Activer le schéma d'assemblée
+      assemblies_type:
+        title: Titre
       assembly:
+        announcement: Message d'annonce
         area_id: Zone d'application
         assembly_type: Type d'assemblée
         assembly_type_other: Autre type d'assemblée
@@ -22,12 +26,16 @@ fr-CA:
         decidim_scope_id: Périmètre d'application
         description: Description
         developer_group: Organisateur
+        document: Document
         domain: Domaine
         duration: Durée
         facebook: Facebook
         github: GitHub
         hashtag: Mot-clic
         hero_image: Image de la page d'accueil
+        import_attachments: Importer les pièces jointes
+        import_categories: Importer les catégories
+        import_components: Importer les fonctionnalités
         included_at: Intégrée à cette plateforme le
         instagram: Instagram
         internal_organisation: Organisation interne
@@ -64,6 +72,7 @@ fr-CA:
         non_user_avatar: Avatar
         position: Statut
         user_id: Utilisateur
+        weight: Rang d'affichage
       assembly_user_role:
         email: E-mail
         name: "Nom\n"
@@ -73,7 +82,7 @@ fr-CA:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont : %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ fr-CA:
     admin_log:
       assembly:
         create: "%{user_name} a créé l'assemblée %{resource_name}"
+        duplicate: "%{user_name} a dupliqué l'assemblée %{resource_name}"
+        export: "%{user_name} a exporté l'assemblée %{resource_name}"
+        import: "%{user_name} a importé l'assemblée %{resource_name}"
         publish: "%{user_name} a publié l'assemblée %{resource_name}"
         unpublish: "%{user_name} a dépublié l'assemblée %{resource_name}"
         update: "%{user_name} a mis à jour l'assemblée %{resource_name}"
@@ -270,7 +282,7 @@ fr-CA:
             duration_help: Si la durée de cette assemblée est limitée, sélectionnez la date de fin. Sinon sa durée ne sera pas limitée.
             filters: Filtres
             images: Images
-            included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à Decidim. Elle ne doit pas nécessairement être identique à la date de création.
+            included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à la plateforme. Elle ne doit pas nécessairement être identique à la date de création.
             metadata: Métadonnées
             other: Autre
             select_a_created_by: Sélectionnez un créateur
diff --git a/decidim-assemblies/config/locales/fr.yml b/decidim-assemblies/config/locales/fr.yml
index 29a8040041dd0..a89d350ecf079 100644
--- a/decidim-assemblies/config/locales/fr.yml
+++ b/decidim-assemblies/config/locales/fr.yml
@@ -1,9 +1,13 @@
+---
 fr:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Activer le schéma d'assemblée
+      assemblies_type:
+        title: Titre
       assembly:
+        announcement: Message d'annonce
         area_id: Périmètre d'assemblée
         assembly_type: Type d'assemblée
         assembly_type_other: Autre type d'assemblée
@@ -22,12 +26,16 @@ fr:
         decidim_scope_id: Périmètre d'application
         description: Description
         developer_group: Organisateur
+        document: Document
         domain: Domaine
         duration: Durée
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Image de la page d'accueil
+        import_attachments: Importer les pièces jointes
+        import_categories: Importer les catégories
+        import_components: Importer les fonctionnalités
         included_at: Intégrée à cette plateforme le
         instagram: Instagram
         internal_organisation: Organisation interne
@@ -64,6 +72,7 @@ fr:
         non_user_avatar: Avatar
         position: Statut
         user_id: Utilisateur ou groupe
+        weight: Rang d'affichage
       assembly_user_role:
         email: E-mail
         name: "Nom\n"
@@ -73,7 +82,7 @@ fr:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont : %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +251,9 @@ fr:
     admin_log:
       assembly:
         create: "%{user_name} a créé l'assemblée %{resource_name}"
+        duplicate: "%{user_name} a dupliqué l'assemblée %{resource_name}"
+        export: "%{user_name} a exporté l'assemblée %{resource_name}"
+        import: "%{user_name} a importé l'assemblée %{resource_name}"
         publish: "%{user_name} a publié l'assemblée %{resource_name}"
         unpublish: "%{user_name} a dépublié l'assemblée %{resource_name}"
         update: "%{user_name} a mis à jour l'assemblée %{resource_name}"
@@ -270,7 +282,7 @@ fr:
             duration_help: Si la durée de cette assemblée est limitée, sélectionnez la date de fin. Sinon sa durée ne sera pas limitée.
             filters: Filtres
             images: Images
-            included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à Decidim. Elle ne doit pas nécessairement être identique à la date de création.
+            included_at_help: Sélectionnez la date à laquelle cet assemblée a été ajoutée à la plateforme. Elle ne doit pas nécessairement être identique à la date de création.
             metadata: Métadonnées
             other: Autre
             select_a_created_by: Sélectionnez un créateur
diff --git a/decidim-assemblies/config/locales/ga-IE.yml b/decidim-assemblies/config/locales/ga-IE.yml
index 30e641f9e2e44..cc406a8bcf827 100644
--- a/decidim-assemblies/config/locales/ga-IE.yml
+++ b/decidim-assemblies/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-assemblies/config/locales/gl.yml b/decidim-assemblies/config/locales/gl.yml
index aa3a0c276138b..dce0f67eac78f 100644
--- a/decidim-assemblies/config/locales/gl.yml
+++ b/decidim-assemblies/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ gl:
         email: Correo electrónico
         name: Nome
         role: Rol
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento non válido. Formatos aceptados: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -270,7 +265,7 @@ gl:
             duration_help: Se a duración deste conxunto é limitada, seleccione a data de finalización. Se non, aparecerá como indefinido.
             filters: Filtros
             images: Imaxes
-            included_at_help: Seleccione a data en que se engadiu este conxunto a Decidim. Non ten que ser necesariamente o mesmo que a data de creación.
+            included_at_help: Selecciona a data na que engadiches esta xuntanza á plataforma. Non ten por que ser a mesma que a data de creación.
             metadata: Metadatos
             other: Outra
             select_a_created_by: Seleccione un creado por
diff --git a/decidim-assemblies/config/locales/hu.yml b/decidim-assemblies/config/locales/hu.yml
index fef28e86bacfc..152b952baf693 100644
--- a/decidim-assemblies/config/locales/hu.yml
+++ b/decidim-assemblies/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ hu:
         email: Email
         name: Név
         role: Szerep
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Nem megfelelő dokument típus. Az elfogadott formátumok: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +237,9 @@ hu:
     admin_log:
       assembly:
         create: "%{user_name} létrehozta a(z) %{resource_name} gyűlést"
+        duplicate: "%{user_name} duplikálta a(z) %{resource_name} gyűlést"
+        export: "%{user_name} exportálta a(z) %{resource_name} gyűlést"
+        import: "%{user_name} importálta a(z) %{resource_name} gyűlést"
         publish: "%{user_name} közzétette a(z) %{resource_name} gyűlést"
         unpublish: "%{user_name} visszavonta a(z) %{resource_name} gyűlés közzétételét"
         update: "%{user_name} frissítette a(z) %{resource_name} gyűlést"
@@ -270,7 +268,7 @@ hu:
             duration_help: Ha a gyűlés időtartama korlátozott, válassz befejező dátumot. Ellenkező esetben határozatlan idejű lesz.
             filters: Szűrők
             images: képek
-            included_at_help: Válaszd ki a dátumot, amikor a gyűlést hozzáadtad a Decidimhez. Nem feltétlenül kell megegyeznie a létrehozás időpontjával.
+            included_at_help: Válassza ki a dátumot, amikor ezt a gyűlést hozzáadták a platformhoz. Nem feltétlenül kell megegyeznie a létrehozás dátumával.
             metadata: Metaadatok
             other: Egyéb
             select_a_created_by: Válassz alapítót
diff --git a/decidim-assemblies/config/locales/id-ID.yml b/decidim-assemblies/config/locales/id-ID.yml
index 57effaaadc116..43712c8facdc7 100644
--- a/decidim-assemblies/config/locales/id-ID.yml
+++ b/decidim-assemblies/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -217,7 +218,6 @@ id:
             duration_help: Jika durasi rakitan ini terbatas, pilih tanggal akhir. Jika tidak, itu akan muncul sebagai tidak terbatas.
             filters: Filter
             images: Gambar
-            included_at_help: Pilih tanggal saat perakitan ini ditambahkan ke Decidim. Tidak harus sama dengan tanggal pembuatan.
             metadata: Metadata
             other: Lain
             select_a_created_by: Pilih yang dibuat oleh
diff --git a/decidim-assemblies/config/locales/is-IS.yml b/decidim-assemblies/config/locales/is-IS.yml
index b722738cb8ca5..9dca6285d14b7 100644
--- a/decidim-assemblies/config/locales/is-IS.yml
+++ b/decidim-assemblies/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       assembly:
diff --git a/decidim-assemblies/config/locales/it.yml b/decidim-assemblies/config/locales/it.yml
index afcd4d06464a5..2fd7d5494cf54 100644
--- a/decidim-assemblies/config/locales/it.yml
+++ b/decidim-assemblies/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ it:
         email: E-mail
         name: Nome
         role: Ruolo
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo di documento non valido. I formati accettati sono: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -270,7 +265,6 @@ it:
             duration_help: Se la durata di questa assemblea è limitata, selezionare la data di fine. Altrimenti, apparirà come indefinita.
             filters: Filtri
             images: Immagini
-            included_at_help: Seleziona la data in cui questa assemblea è stata aggiunto a Decidim. Non deve necessariamente essere uguale alla data di creazione.
             metadata: Metadati
             other: Altro
             select_a_created_by: Seleziona un creatore
diff --git a/decidim-assemblies/config/locales/ja.yml b/decidim-assemblies/config/locales/ja.yml
index f5555d0a12730..5040f961bb91b 100644
--- a/decidim-assemblies/config/locales/ja.yml
+++ b/decidim-assemblies/config/locales/ja.yml
@@ -1,9 +1,13 @@
+---
 ja:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: 組織図を有効化
+      assemblies_type:
+        title: タイトル
       assembly:
+        announcement: �知ら�
         area_id: エリア
         assembly_type: �加スペース種別
         assembly_type_other: ��他（�加スペース）
@@ -22,12 +26,16 @@ ja:
         decidim_scope_id: スコープ
         description: 説明
         developer_group: プロモーターグループ
+        document: ドキュメント
         domain: ドメイン
         duration: �続期間
         facebook: Facebook
         github: GitHub
         hashtag: �ッシュタグ
         hero_image: ホーム画�
+        import_attachments: 添付ファイルをイン�ート
+        import_categories: カテゴリをイン�ート
+        import_components: コン�ー�ントをイン�ート
         included_at: ��れ�日
         instagram: Instagram
         internal_organisation: 内部組織
@@ -64,6 +72,7 @@ ja:
         non_user_avatar: ア�ター
         position: �ジション
         user_id: ユーザー
+        weight: 並�順��置
       assembly_user_role:
         email: Eメールアドレス
         name: ��
@@ -73,7 +82,7 @@ ja:
         assembly:
           attributes:
             document:
-              invalid_document_type: '無効�ドキュメント�種類��。承��れ�フォーマット�次���り��: %{valid_mime_types}'
+              allowed_file_content_types: '無効�ドキュメントタイプ��。次�拡張�を��ファイル��許��れ��: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -239,6 +248,9 @@ ja:
     admin_log:
       assembly:
         create: "%{user_name} � %{resource_name} �加スペースを作�����"
+        duplicate: "%{user_name} � %{resource_name} �加スペースを複製����"
+        export: "%{user_name} � %{resource_name} �加スペースをエクス�ート����"
+        import: "%{user_name} � %{resource_name} �加スペースをイン�ート����"
         publish: "%{user_name} � %{resource_name} �加スペースを公開����"
         unpublish: "%{user_name} � %{resource_name} �加スペースを�公開�����"
         update: "%{user_name} � %{resource_name} �加スペースを更新����"
@@ -267,7 +279,7 @@ ja:
             duration_help: ���加スペース��続時間��られ��る場���終了日を�択���。�れ以外�場����定義���表示�れ��。
             filters: フィルタ
             images: 画�
-            included_at_help: ���加スペース�Decidim�追加�れ�日付を�択���。必��も作�日�����る必���り��ん。
+            included_at_help: ���加スペース�プラットフォーム�追加�れ�日付を�択���。必��も作�日�����る必���り��ん。
             metadata: メタデータ
             other: ��他
             select_a_created_by: 作�者を�択������
diff --git a/decidim-assemblies/config/locales/ka-GE.yml b/decidim-assemblies/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-assemblies/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-assemblies/config/locales/lb.yml b/decidim-assemblies/config/locales/lb.yml
index 7a4acce00badb..35f1f81bd6a24 100644
--- a/decidim-assemblies/config/locales/lb.yml
+++ b/decidim-assemblies/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ lb:
         email: Email
         name: Name
         role: Rolle
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Ungültiger Dokumenttyp. Zulässige Formate sind: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
diff --git a/decidim-assemblies/config/locales/lt.yml b/decidim-assemblies/config/locales/lt.yml
index c4381fce95fbb..ed3d90cd49199 100644
--- a/decidim-assemblies/config/locales/lt.yml
+++ b/decidim-assemblies/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ lt:
         email: El. paštas
         name: Vardas
         role: RolÄ—
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Netinkamas dokumento tipas. Priimtini formatai: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -248,6 +243,9 @@ lt:
     admin_log:
       assembly:
         create: "%{user_name} sukūrė %{resource_name} asamblėją"
+        duplicate: "%{user_name} dublikavo %{resource_name} asamblÄ—jÄ…"
+        export: "%{user_name} eksportavo %{resource_name} asamblÄ—jÄ…"
+        import: "%{user_name} importavo %{resource_name} asamblÄ—jÄ…"
         publish: "%{user_name} publikavo %{resource_name} asamblÄ—jÄ…"
         unpublish: "%{user_name} depublikavo %{resource_name} asamblÄ—jÄ…"
         update: "%{user_name} atnaujino %{resource_name} asamblÄ—jÄ…"
@@ -276,7 +274,7 @@ lt:
             duration_help: Jei šios asamblėjos veiklos trukmė ribota, pasirinkite pabaigos datą. Priešingu atveju bus rodoma, kad ji neterminuota.
             filters: Filtrai
             images: Vaizdai
-            included_at_help: Pasirinkite datą, kada ši asamblėja buvo įtraukta į „Decidim“. Ši data nebūtinai turi sutapti su sukūrimo data.
+            included_at_help: Pasirinkite datą, kada ši asamblėja buvo įtraukta į „Decidim“ platformą. Ši data nebūtinai turi sutapti su sukūrimo data.
             metadata: Metaduomenys
             other: Kita
             select_a_created_by: Pasirinkti pagal kūrėją
diff --git a/decidim-assemblies/config/locales/lv.yml b/decidim-assemblies/config/locales/lv.yml
index d5d4407c2ac0b..c0b1048c6b5f9 100644
--- a/decidim-assemblies/config/locales/lv.yml
+++ b/decidim-assemblies/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -243,7 +244,6 @@ lv:
             duration_help: Ja šīs asamblejas ilgums ir ierobežots, izvēlieties beigu datumu. Pretēj� gadījum� tas par�dīsies k� nenoteikts
             filters: Filtri
             images: Attēli
-            included_at_help: Izvēlieties datumu, kad šī asambleja tika pievienota Decidim. Tam nav noteikti j�būt t�dam pašam k� izveides datumam.
             metadata: Metadati
             other: Cits
             select_a_created_by: Izvēlieties izveidot�ju
diff --git a/decidim-assemblies/config/locales/nl.yml b/decidim-assemblies/config/locales/nl.yml
index f6d4dc02be292..f3265e133d35a 100644
--- a/decidim-assemblies/config/locales/nl.yml
+++ b/decidim-assemblies/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ nl:
         email: E-mail
         name: Naam
         role: Rol
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Ongeldig documenttype. Geaccepteerde formaten zijn: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -242,6 +237,9 @@ nl:
     admin_log:
       assembly:
         create: "%{user_name} heeft de groep %{resource_name} gemaakt"
+        duplicate: "%{user_name} heeft de groep %{resource_name} gedupliceerd"
+        export: "%{user_name} heeft de groep %{resource_name} geëxporteerd"
+        import: "%{user_name} heeft de groep %{resource_name} geïmporteerd"
         publish: "%{user_name} heeft de %{resource_name} groep gepubliceerd"
         unpublish: "%{user_name} heeft de groep %{resource_name} gedepubliceerd"
         update: "%{user_name} heeft de groep %{resource_name} bijgewerkt"
diff --git a/decidim-assemblies/config/locales/no.yml b/decidim-assemblies/config/locales/no.yml
index ab6838498df9d..7bc4b79fd7127 100644
--- a/decidim-assemblies/config/locales/no.yml
+++ b/decidim-assemblies/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -68,12 +69,6 @@
         email: Epost
         name: Navn
         role: Rolle
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Ugyldig dokumenttype. Godkjente formater er: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -270,7 +265,6 @@
             duration_help: Hvis varigheten av denne forsamlingen er limitert, velg en sluttdato. Hvis ikke, vil den vises som ubestemt.
             filters: Filter
             images: Bilder
-            included_at_help: Velg datoen da denne forsamling ble lagt til Decidim. Dette trenger ikke nødvendigvis å være det samme som opprettelsesdatoen.
             metadata: Metadata
             other: Annet
             select_a_created_by: Velg en opprettet av
diff --git a/decidim-assemblies/config/locales/pl.yml b/decidim-assemblies/config/locales/pl.yml
index 3dcf49ec9e8d1..2e8ca7e1b0549 100644
--- a/decidim-assemblies/config/locales/pl.yml
+++ b/decidim-assemblies/config/locales/pl.yml
@@ -1,9 +1,11 @@
+---
 pl:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: WÅ‚Ä…cz wykres dla organizacji
       assembly:
+        announcement: Powiadomienie
         area_id: Kategoria
         assembly_type: Typ zespołu
         assembly_type_other: Typ zespołu inny
@@ -73,7 +75,7 @@ pl:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Nieprawidłowy typ dokumentu. Akceptowane formaty to: %{valid_mime_types}'
+              allowed_file_content_types: 'Nieprawidłowy typ dokumentu. Dozwolone są tylko pliki z następującymi rozszerzeniami: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -248,6 +250,9 @@ pl:
     admin_log:
       assembly:
         create: "%{user_name} utworzył(a) zespół %{resource_name}"
+        duplicate: "%{user_name} zduplikował(a) zespół %{resource_name}"
+        export: "%{user_name} wyeksportował(a) zespół %{resource_name}"
+        import: "%{user_name} zaimportował(a) zespół %{resource_name}"
         publish: "%{user_name} upublicznił(a) zespół %{resource_name}"
         unpublish: "%{user_name} anulował(a) publikację zespołu %{resource_name}"
         update: "%{user_name} zaktualizował(a) zespół %{resource_name}"
@@ -276,7 +281,6 @@ pl:
             duration_help: Jeśli czas trwania tego zespołu jest ograniczony, wybierz datę końcową. W przeciwnym razie pojawi się jako nieokreślony.
             filters: Filtry
             images: Obrazy
-            included_at_help: Wybierz datę dodania tego zespołu do Decidim. To niekoniecznie musi być ta sama data co data utworzenia.
             metadata: Metadane
             other: Inny
             select_a_created_by: Wybierz utworzony przez
diff --git a/decidim-assemblies/config/locales/pt-BR.yml b/decidim-assemblies/config/locales/pt-BR.yml
index 8d3e6012c303f..966d023624d64 100644
--- a/decidim-assemblies/config/locales/pt-BR.yml
+++ b/decidim-assemblies/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -67,12 +68,6 @@ pt-BR:
         email: E-mail
         name: Nome
         role: Cargo
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceitos são: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -266,7 +261,6 @@ pt-BR:
             duration_help: Se a duração desse assembly for limitada, selecione a data final. Caso contrário, aparecerá como indefinido.
             filters: Filtros
             images: Imagens
-            included_at_help: Selecione a data em que esta montagem foi adicionada ao Decidim. Não precisa necessariamente ser o mesmo que a data de criação.
             metadata: Metadados
             other: De outros
             select_a_created_by: Selecione um criado por
diff --git a/decidim-assemblies/config/locales/pt.yml b/decidim-assemblies/config/locales/pt.yml
index 9ea910f8b3d24..9870f842a73ec 100644
--- a/decidim-assemblies/config/locales/pt.yml
+++ b/decidim-assemblies/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -68,12 +69,6 @@ pt:
         email: E-mail
         name: Nome
         role: Função
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Os formatos aceites são: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -270,7 +265,6 @@ pt:
             duration_help: Se a duração desta reunião for limitada, selecione a data final. Caso contrário, aparecerá como indefinida.
             filters: Filtros
             images: Imagens
-            included_at_help: Selecione a data em que esta reunião foi adicionada ao Decidim. Não necessita necessariamente de ser a mesma que a data de criação.
             metadata: Metadados
             other: Outros
             select_a_created_by: Selecione um criado por
diff --git a/decidim-assemblies/config/locales/ro-RO.yml b/decidim-assemblies/config/locales/ro-RO.yml
index 292a3627a8917..0118fc855099e 100644
--- a/decidim-assemblies/config/locales/ro-RO.yml
+++ b/decidim-assemblies/config/locales/ro-RO.yml
@@ -1,9 +1,13 @@
+---
 ro:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Activează graficul organizatiei
+      assemblies_type:
+        title: Titlu
       assembly:
+        announcement: Anunţ
         area_id: Zonă
         assembly_type: Tipul grupului de lucru
         assembly_type_other: Alt tip de grup de lucru
@@ -22,12 +26,16 @@ ro:
         decidim_scope_id: Domeniu
         description: Descriere
         developer_group: Grup promotor
+        document: Document
         domain: Domeniu
         duration: Durată
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Imagine pentru pagina principală
+        import_attachments: Importă atașamente
+        import_categories: Importă categorii
+        import_components: Importă componente
         included_at: Inclus la
         instagram: Instagram
         internal_organisation: Organizare internă
@@ -52,7 +60,7 @@ ro:
         target: Cine participă
         title: Titlu
         twitter: Twitter
-        weight: Ordinea în poziționare
+        weight: Poziție
         youtube: YouTube
       assembly_member:
         birthday: Data nașterii
@@ -64,6 +72,7 @@ ro:
         non_user_avatar: Avatar
         position: Poziție
         user_id: Utilizator sau grup
+        weight: Poziție
       assembly_user_role:
         email: E-mail
         name: Nume
@@ -73,7 +82,7 @@ ro:
         assembly:
           attributes:
             document:
-              invalid_document_type: 'Tip de document invalid. Formatele acceptate sunt: %{valid_mime_types}'
+              allowed_file_content_types: 'Tip de document invalid. Sunt permise numai fișiere cu următoarele extensii: %{types}'
   activerecord:
     models:
       decidim/assembly:
@@ -245,6 +254,9 @@ ro:
     admin_log:
       assembly:
         create: "%{user_name} a creat grupul de lucru %{resource_name}"
+        duplicate: "%{user_name} a actualizat adunarea %{resource_name}"
+        export: "%{user_name} a actualizat adunarea %{resource_name}"
+        import: "%{user_name} a actualizat adunarea %{resource_name}"
         publish: "%{user_name} a publicat grupul de lucru %{resource_name}"
         unpublish: "%{user_name} a anulat publicarea grupului de lucru %{resource_name}"
         update: "%{user_name} a actualizat grupul de lucru %{resource_name}"
@@ -273,7 +285,6 @@ ro:
             duration_help: În cazul în care durata acestui grup de lucru este limitată, selectaţi data de încheiere. În caz contrar, va apărea ca nelimitată.
             filters: Filtre
             images: Imagini
-            included_at_help: Selectați data la care aceast grup de lucru a fost adăugat în Decidem. Nu trebuie să fie neapărat aceeași dată cu data creării.
             metadata: Metadate
             other: Altul
             select_a_created_by: Selectați după persoana care a creat
diff --git a/decidim-assemblies/config/locales/ru.yml b/decidim-assemblies/config/locales/ru.yml
index 49998a1cf24ce..e5dc55d5c44a9 100644
--- a/decidim-assemblies/config/locales/ru.yml
+++ b/decidim-assemblies/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ ru:
         assemblies:
           form:
             duration_help: Е�ли длительно�ть �того �обрани� ограничена, выберите дату окончани�. В противном �лучае оно будет отображать�� как бе��рочное.
-            included_at_help: Выберите дату, когда �то �обрание было добавлено ​​в Де�идим. Она не об�зательно должна �овпадать � датой �оздани�.
             select_a_created_by: Укажите, кем �оздано
             select_an_area: Выберите уча�ток
             select_an_assembly_type: Выберите вид �обрани�
diff --git a/decidim-assemblies/config/locales/sk.yml b/decidim-assemblies/config/locales/sk.yml
index beef21bcc966a..e99ed98ba3b01 100644
--- a/decidim-assemblies/config/locales/sk.yml
+++ b/decidim-assemblies/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
diff --git a/decidim-assemblies/config/locales/sl.yml b/decidim-assemblies/config/locales/sl.yml
index 68adb9b536dc9..0ca54eb745a40 100644
--- a/decidim-assemblies/config/locales/sl.yml
+++ b/decidim-assemblies/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
@@ -59,12 +60,6 @@ sl:
         email: Email
         name: Ime
         role: Vloga
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Neveljavna vrsta dokumenta. Sprejemljive oblike so: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
diff --git a/decidim-assemblies/config/locales/sr-CS.yml b/decidim-assemblies/config/locales/sr-CS.yml
index a033cd2e6a03a..7f88a891e912c 100644
--- a/decidim-assemblies/config/locales/sr-CS.yml
+++ b/decidim-assemblies/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     admin:
diff --git a/decidim-assemblies/config/locales/sv.yml b/decidim-assemblies/config/locales/sv.yml
index 41c90419ca037..c924d2fd02a28 100644
--- a/decidim-assemblies/config/locales/sv.yml
+++ b/decidim-assemblies/config/locales/sv.yml
@@ -1,9 +1,13 @@
+---
 sv:
   activemodel:
     attributes:
       assemblies_setting:
         enable_organization_chart: Aktivera organisationskarta
+      assemblies_type:
+        title: Titel
       assembly:
+        announcement: Meddelande
         area_id: Område
         assembly_type: Typ av grupp
         assembly_type_other: Annan typ av grupp
@@ -22,12 +26,14 @@ sv:
         decidim_scope_id: Omfång
         description: Beskrivning
         developer_group: Kampanjgrupp
+        document: Dokument
         domain: Domän
         duration: Varaktighet
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
         hero_image: Hembild
+        import_attachments: Importera bilagor
         included_at: Inkluderad vid
         instagram: Instagram
         internal_organisation: Intern organisation
@@ -52,7 +58,7 @@ sv:
         target: Vem deltar
         title: Titel
         twitter: Twitter
-        weight: Vikt
+        weight: Ordning
         youtube: YouTube
       assembly_member:
         birthday: Födelsedag
@@ -64,16 +70,11 @@ sv:
         non_user_avatar: Profilbild
         position: Befattning
         user_id: Användare
+        weight: Ordning
       assembly_user_role:
         email: E-post
         name: Namn
         role: Roll
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Ogiltig dokumenttyp. Godkända format är: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -270,7 +271,7 @@ sv:
             duration_help: Om varaktigheten för gruppen är begränsad, välj ett slutdatum. Annars kommer den att visas som permanent.
             filters: Filter
             images: Bilder
-            included_at_help: Markera det datum då gruppen lades till i Decidim. Det behöver inte nödvändigtvis vara detsamma som datumet det skapades.
+            included_at_help: Markera det datum då gruppen lades till på plattformen. Det behöver inte nödvändigtvis vara detsamma som datumet det skapades.
             metadata: Metadata
             other: Annan
             select_a_created_by: Välj en skapad av
diff --git a/decidim-assemblies/config/locales/tr-TR.yml b/decidim-assemblies/config/locales/tr-TR.yml
index dc4cd2bc33da4..e8947d31d02ed 100644
--- a/decidim-assemblies/config/locales/tr-TR.yml
+++ b/decidim-assemblies/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -66,12 +67,6 @@ tr:
         email: E-posta
         name: Adı
         role: Rol
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz belge türü. Kabul edilen biçimler şunlardır: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -263,7 +258,6 @@ tr:
             duration_help: Bu kurulun süresi sınırlıysa, bitiş tarihini seçin. Aksi takdirde belirsiz görünecektir.
             filters: Filtreler
             images: Resimler
-            included_at_help: Bu kurulun Decidim'e eklendiği tarihi seçin. Yaratılış tarihi ile aynı olmak zorunda değildir.
             metadata: Meta veri
             other: DiÄŸer
             select_a_created_by: tarafından oluşturulanı seçin
diff --git a/decidim-assemblies/config/locales/uk.yml b/decidim-assemblies/config/locales/uk.yml
index af861445c3c2c..466d9278d32ac 100644
--- a/decidim-assemblies/config/locales/uk.yml
+++ b/decidim-assemblies/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ uk:
         assemblies:
           form:
             duration_help: Якщо тривалі�ть цих зборів обмежена, оберіть дату завершенн�. В іншому випадку вони будуть показувати�� �к без�трокові.
-            included_at_help: Оберіть дату, коли ці збори були додані до Де�ідім. Вона не обов'�зково має бути тою �амою ж, що і дата �творенн�.
             select_a_created_by: Вкажіть, ким �творені
             select_an_area: Оберіть дільницю
             select_an_assembly_type: Оберіть різновид зборів
diff --git a/decidim-assemblies/config/locales/zh-CN.yml b/decidim-assemblies/config/locales/zh-CN.yml
index 07ca0b4338f44..100739abf0b1a 100644
--- a/decidim-assemblies/config/locales/zh-CN.yml
+++ b/decidim-assemblies/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -63,12 +64,6 @@ zh-CN:
         email: 电�邮件地�
         name: �称
         role: 作用
-    errors:
-      models:
-        assembly:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接�的格�为： %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -257,7 +252,6 @@ zh-CN:
             duration_help: 如果这个程�集的�续时间有�，请选择结�日期。�则，它将显示为无�期。
             filters: 筛选器
             images: 图�
-            included_at_help: 选择程�集添加到 Decidim 的日期。它�一定与创建日期相�。
             metadata: 元数�
             other: 其他
             select_a_created_by: 选择创建者：
diff --git a/decidim-assemblies/decidim-assemblies.gemspec b/decidim-assemblies/decidim-assemblies.gemspec
index 48465524e2b60..5edbc38c488cf 100644
--- a/decidim-assemblies/decidim-assemblies.gemspec
+++ b/decidim-assemblies/decidim-assemblies.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-assemblies"
   s.summary = "Decidim assemblies module"
@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "decidim-admin", Decidim::Assemblies.version
   s.add_development_dependency "decidim-dev", Decidim::Assemblies.version
+  s.add_development_dependency "decidim-meetings", Decidim::Assemblies.version
+  s.add_development_dependency "decidim-proposals", Decidim::Assemblies.version
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
index df93295e46c0e..763aeb2342758 100644
--- a/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/admin_engine.rb
@@ -53,6 +53,7 @@ class AdminEngine < ::Rails::Engine
             resources :imports, only: [:new, :create] do
               get :example, on: :collection
             end
+            resources :reminders, only: [:new, :create]
           end
 
           resources :moderations do
@@ -69,7 +70,9 @@ class AdminEngine < ::Rails::Engine
               post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
             end
             collection do
-              resource :participatory_space_private_users_csv_import, only: [:new, :create], path: "csv_import"
+              resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                delete :destroy_all
+              end
             end
           end
         end
diff --git a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
index 7c705ea3d2de2..4893721d753f0 100644
--- a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb
@@ -66,13 +66,13 @@
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
           metadata: nil
         ), # Keep after organization
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -132,8 +132,8 @@
         user.update!(
           name: Faker::Name.name,
           nickname: Faker::Twitter.unique.screen_name,
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           organization: organization,
           confirmed_at: Time.current,
           locale: I18n.default_locale,
@@ -159,13 +159,13 @@
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
           metadata: nil
         ), # Keep after organization
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -197,7 +197,7 @@
           attachment_collection: attachment_collection,
           attached_to: current_assembly,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
@@ -210,7 +210,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: current_assembly,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -223,7 +223,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: current_assembly,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index e71909aa5a435..81ccb2eefd28b 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -105,6 +105,7 @@
     end
 
     organization { assembly.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :assembly_user_role,
@@ -120,6 +121,7 @@
     end
 
     organization { assembly.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :assembly_user_role,
@@ -135,6 +137,7 @@
     end
 
     organization { assembly.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :assembly_user_role,
@@ -150,6 +153,7 @@
     end
 
     organization { assembly.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :assembly_user_role,
diff --git a/decidim-assemblies/lib/decidim/assemblies/version.rb b/decidim-assemblies/lib/decidim/assemblies/version.rb
index d8e1bc97ed4f2..2766de9fa9b9f 100644
--- a/decidim-assemblies/lib/decidim/assemblies/version.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-assemblies/spec/commands/copy_assembly_spec.rb b/decidim-assemblies/spec/commands/copy_assembly_spec.rb
index 75c4299f83582..c76ea8346fc6f 100644
--- a/decidim-assemblies/spec/commands/copy_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/copy_assembly_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::Assemblies
   describe Admin::CopyAssembly do
-    subject { described_class.new(form, assembly) }
+    subject { described_class.new(form, assembly, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create :user, organization: organization }
     let(:scope) { create :scope, organization: organization }
     let(:errors) { double.as_null_object }
     let!(:assembly) { create :assembly }
@@ -42,7 +43,7 @@ module Decidim::Assemblies
 
     context "when everything is ok" do
       it "duplicates an assembly" do
-        expect { subject.call }.to change { Decidim::Assembly.count }.by(1)
+        expect { subject.call }.to change(Decidim::Assembly, :count).by(1)
 
         old_assembly = Decidim::Assembly.first
         new_assembly = Decidim::Assembly.last
@@ -67,13 +68,25 @@ module Decidim::Assemblies
       it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("duplicate", Decidim::Assembly, user)
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("duplicate")
+        expect(action_log.version).to be_present
+      end
     end
 
     context "when copy_categories exists" do
       let(:copy_categories) { true }
 
       it "duplicates a assembly and the categories" do
-        expect { subject.call }.to change { Decidim::Category.count }.by(1)
+        expect { subject.call }.to change(Decidim::Category, :count).by(1)
         expect(Decidim::Category.unscoped.distinct.pluck(:decidim_participatory_space_id).count).to eq 2
 
         old_assembly_category = Decidim::Category.unscoped.first
@@ -91,17 +104,17 @@ module Decidim::Assemblies
       it "duplicates an assembly and the components" do
         dummy_hook = proc {}
         component.manifest.on :copy, &dummy_hook
-        expect(dummy_hook).to receive(:call).with(new_component: an_instance_of(Decidim::Component), old_component: component)
+        expect(dummy_hook).to receive(:call).with({ new_component: an_instance_of(Decidim::Component), old_component: component })
 
-        expect { subject.call }.to change { Decidim::Component.count }.by(1)
+        expect { subject.call }.to change(Decidim::Component, :count).by(1)
 
         last_assembly = Decidim::Assembly.last
         last_component = Decidim::Component.all.reorder(:id).last
 
         expect(last_component.participatory_space).to eq(last_assembly)
         expect(last_component.name).to eq(component.name)
-        expect(last_component.settings.attributes.except(:dummy_global_translatable_text)).to eq(component.settings.attributes.except(:dummy_global_translatable_text))
-        expect(last_component.settings.attributes[:dummy_global_translatable_text]).to include(component.settings.attributes[:dummy_global_translatable_text])
+        expect(last_component.settings.attributes.except("dummy_global_translatable_text")).to eq(component.settings.attributes.except("dummy_global_translatable_text"))
+        expect(last_component.settings.attributes["dummy_global_translatable_text"]).to include(component.settings.attributes["dummy_global_translatable_text"])
         expect(last_component.step_settings.keys).to eq(component.step_settings.keys)
         expect(last_component.step_settings.values).to eq(component.step_settings.values)
       end
@@ -121,7 +134,7 @@ module Decidim::Assemblies
         let!(:assembly) { create :assembly, parent: assembly_parent, organization: organization }
 
         it "duplicates an assembly" do
-          expect { subject.call }.to change { Decidim::Assembly.count }.by(1)
+          expect { subject.call }.to change(Decidim::Assembly, :count).by(1)
 
           old_assembly = Decidim::Assembly.find_by(id: assembly.id)
           new_assembly = Decidim::Assembly.last
diff --git a/decidim-assemblies/spec/commands/create_assemblies_type_spec.rb b/decidim-assemblies/spec/commands/create_assemblies_type_spec.rb
index 07741d4d27dbe..818ff735698c9 100644
--- a/decidim-assemblies/spec/commands/create_assemblies_type_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assemblies_type_spec.rb
@@ -34,7 +34,7 @@ module Decidim::Assemblies
       end
 
       it "creates a new assembly type for the organization" do
-        expect { subject.call }.to change { Decidim::AssembliesType.count }.by(1)
+        expect { subject.call }.to change(Decidim::AssembliesType, :count).by(1)
       end
 
       it "traces the action", versioning: true do
diff --git a/decidim-assemblies/spec/commands/create_assembly_member_spec.rb b/decidim-assemblies/spec/commands/create_assembly_member_spec.rb
index ff38c86b69763..a4aaf3feb9bc4 100644
--- a/decidim-assemblies/spec/commands/create_assembly_member_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_member_spec.rb
@@ -11,7 +11,7 @@ module Decidim::Assemblies
     let!(:current_user) { create :user, :confirmed, organization: assembly.organization }
     let(:existing_user) { false }
     let(:non_user_avatar) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("avatar.jpg")),
         filename: "avatar.jpeg",
         content_type: "image/jpeg"
@@ -55,7 +55,7 @@ module Decidim::Assemblies
       context "when image is invalid" do
         let(:existing_user) { false }
         let(:non_user_avatar) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("invalid.jpeg")),
             filename: "avatar.jpeg",
             content_type: "image/jpeg"
@@ -73,7 +73,7 @@ module Decidim::Assemblies
       let(:assembly_member) { Decidim::AssemblyMember.last }
 
       it "creates an assembly" do
-        expect { subject.call }.to change { Decidim::AssemblyMember.count }.by(1)
+        expect { subject.call }.to change(Decidim::AssemblyMember, :count).by(1)
       end
 
       it "broadcasts ok" do
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index db46249157e8d..693373d693fa8 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -19,6 +19,8 @@ module Decidim::Assemblies
         organization: organization
       )
     end
+    let(:related_process_ids) { [participatory_processes.map(&:id)] }
+
     let(:form) do
       instance_double(
         Admin::AssemblyForm,
@@ -47,7 +49,7 @@ module Decidim::Assemblies
         parent: nil,
         private_space: false,
         errors: errors,
-        participatory_processes_ids: participatory_processes.map(&:id),
+        participatory_processes_ids: related_process_ids,
         show_statistics: false,
         purpose_of_action: { en: "purpose of action" },
         composition: { en: "composition of internal working groups" },
@@ -87,15 +89,15 @@ module Decidim::Assemblies
           persisted?: false,
           valid?: false,
           errors: {
-            hero_image: "Image too big",
-            banner_image: "Image too big"
+            hero_image: "File resolution is too large",
+            banner_image: "File resolution is too large"
           }
         ).as_null_object
       end
 
       before do
         allow(Decidim::ActionLogger).to receive(:log).and_return(true)
-        expect(Decidim::Assembly).to receive(:create).and_return(invalid_assembly)
+        allow(Decidim::Assembly).to receive(:create).and_return(invalid_assembly)
       end
 
       it "broadcasts invalid" do
@@ -103,15 +105,15 @@ module Decidim::Assemblies
       end
 
       it "adds errors to the form" do
-        expect(errors).to receive(:add).with(:hero_image, "Image too big")
-        expect(errors).to receive(:add).with(:banner_image, "Image too big")
+        expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
+        expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
         subject.call
       end
     end
 
     context "when the uploaded hero image has too large dimensions" do
       let(:hero_image) do
-        ActiveStorage::Blob.create_after_upload!(
+        ActiveStorage::Blob.create_and_upload!(
           io: File.open(Decidim::Dev.asset("5000x5000.png")),
           filename: "5000x5000.png",
           content_type: "image/png"
@@ -137,7 +139,7 @@ module Decidim::Assemblies
 
       it "broadcasts invalid" do
         expect { subject.call }.to broadcast(:invalid)
-        expect(form.errors.messages[:hero_image]).to contain_exactly(["The image is too big"])
+        expect(form.errors.messages[:hero_image]).to contain_exactly("File resolution is too large")
       end
     end
 
@@ -145,7 +147,7 @@ module Decidim::Assemblies
       let(:assembly) { Decidim::Assembly.last }
 
       it "creates an assembly" do
-        expect { subject.call }.to change { Decidim::Assembly.count }.by(1)
+        expect { subject.call }.to change(Decidim::Assembly, :count).by(1)
       end
 
       it "broadcasts ok" do
@@ -180,7 +182,7 @@ module Decidim::Assemblies
         it "assembly type is null" do
           subject.call
 
-          expect(assembly.assembly_type).to eq(nil)
+          expect(assembly.assembly_type).to be_nil
         end
       end
 
@@ -189,6 +191,33 @@ module Decidim::Assemblies
         linked_participatory_processes = assembly.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
         expect(linked_participatory_processes).to match_array(participatory_processes)
       end
+
+      context "when sorting by weight" do
+        let!(:process_one) { create :participatory_process, organization: organization, weight: 2 }
+        let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
+        let(:related_process_ids) { [process_one.id, process_two.id] }
+
+        it "links processes in right way" do
+          subject.call
+
+          linked_processes = assembly.linked_participatory_space_resources(:participatory_process, "included_participatory_processes")
+          expect(linked_processes.first).to eq(process_two)
+        end
+      end
+
+      context "when linking draft processes" do
+        let!(:process_one) { create :participatory_process, :unpublished, organization: organization, weight: 2 }
+        let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
+        let(:related_process_ids) { [process_one.id, process_two.id] }
+
+        it "links processes in right way" do
+          subject.call
+
+          linked_processes = assembly.linked_participatory_space_resources(:participatory_process, "included_participatory_processes")
+          expect(linked_processes.size).to eq(1)
+          expect(linked_processes.first).to eq(process_two)
+        end
+      end
     end
   end
 end
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index 3463942d6dc5e..c37b74ae8b961 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -6,10 +6,11 @@ module Decidim::Assemblies::Admin
   describe ImportAssembly do
     include Decidim::ComponentTestHelpers
 
-    subject { described_class.new(form) }
+    subject { described_class.new(form, user) }
 
     let(:organization) { create :organization }
-    let!(:document_file) { IO.read(Decidim::Dev.asset(document_name)) }
+    let(:user) { create :user, organization: organization }
+    let!(:document_file) { File.read(Decidim::Dev.asset(document_name)) }
     let(:form_doc) do
       instance_double(File,
                       blank?: false)
@@ -75,6 +76,17 @@ def stub_calls_to_external_files
         expect(imported_assembly).not_to be_published
         expect(imported_assembly.organization).to eq(organization)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!).twice
+                                       .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("import")
+        expect(action_log.version).to be_present
+      end
     end
 
     describe "when the form is not valid" do
@@ -87,7 +99,7 @@ def stub_calls_to_external_files
       it "doesn't create any assembly" do
         expect do
           subject.call
-        end.to change(::Decidim::Assembly, :count).by(0)
+        end.not_to change(::Decidim::Assembly, :count)
       end
     end
 
@@ -105,7 +117,7 @@ def stub_calls_to_external_files
       it "imports an assembly and the categories" do
         stub_calls_to_external_files
 
-        expect { subject.call }.to change { Decidim::Category.count }.by(8)
+        expect { subject.call }.to change(Decidim::Category, :count).by(8)
         expect(Decidim::Category.distinct.select(:decidim_participatory_space_id).count).to eq 1
 
         imported_assembly_category = Decidim::Category.first
@@ -125,7 +137,7 @@ def stub_calls_to_external_files
         it "imports a assembly and the collections" do
           stub_calls_to_external_files
 
-          expect { subject.call }.to change { Decidim::AttachmentCollection.count }.by(1)
+          expect { subject.call }.to change(Decidim::AttachmentCollection, :count).by(1)
           imported_assembly_collection = Decidim::AttachmentCollection.first
           expect(imported_assembly_collection.name).to eq("ca" => "deleniti", "en" => "laboriosam", "es" => "quia")
           expect(imported_assembly_collection.collection_for).to eq(Decidim::Assembly.last)
diff --git a/decidim-assemblies/spec/commands/update_assemblies_setting_spec.rb b/decidim-assemblies/spec/commands/update_assemblies_setting_spec.rb
index 3f7f87015c76a..58fc1ef8c480b 100644
--- a/decidim-assemblies/spec/commands/update_assemblies_setting_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assemblies_setting_spec.rb
@@ -28,7 +28,7 @@ module Decidim::Assemblies
     end
 
     context "when the form is valid" do
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
diff --git a/decidim-assemblies/spec/commands/update_assembly_admin_spec.rb b/decidim-assemblies/spec/commands/update_assembly_admin_spec.rb
index 98f0b24844aae..a682dbdda6268 100644
--- a/decidim-assemblies/spec/commands/update_assembly_admin_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_admin_spec.rb
@@ -68,7 +68,7 @@ module Decidim::Assemblies
       it "traces the action", versioning: true do
         expect(Decidim.traceability)
           .to receive(:update!)
-          .with(user_role, current_user, { role: new_role }, resource: hash_including(:title))
+          .with(user_role, current_user, { role: new_role }, { resource: hash_including(:title) })
           .and_call_original
 
         expect { subject.call }.to change(Decidim::ActionLog, :count)
diff --git a/decidim-assemblies/spec/commands/update_assembly_member_spec.rb b/decidim-assemblies/spec/commands/update_assembly_member_spec.rb
index c7f17d12ccda1..8b5c49755705a 100644
--- a/decidim-assemblies/spec/commands/update_assembly_member_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_member_spec.rb
@@ -11,13 +11,7 @@ module Decidim::Assemblies
     let!(:current_user) { create :user, :confirmed, organization: assembly.organization }
     let(:user) { nil }
     let(:existing_user) { false }
-    let(:non_user_avatar) do
-      ActiveStorage::Blob.create_after_upload!(
-        io: File.open(Decidim::Dev.asset("avatar.jpg")),
-        filename: "avatar.jpeg",
-        content_type: "image/jpeg"
-      )
-    end
+    let(:non_user_avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
     let(:form_klass) { Admin::AssemblyMemberForm }
     let(:form_params) do
       {
@@ -55,13 +49,7 @@ module Decidim::Assemblies
 
       context "when image is invalid" do
         let(:existing_user) { false }
-        let(:non_user_avatar) do
-          ActiveStorage::Blob.create_after_upload!(
-            io: File.open(Decidim::Dev.asset("invalid.jpeg")),
-            filename: "avatar.jpeg",
-            content_type: "image/jpeg"
-          )
-        end
+        let(:non_user_avatar) { upload_test_file(Decidim::Dev.asset("invalid.jpeg")) }
 
         it "prevents uploading" do
           expect { subject.call }.not_to raise_error
@@ -77,7 +65,7 @@ module Decidim::Assemblies
         end.to change { assembly_member.reload && assembly_member.full_name }.from(assembly_member.full_name).to("New name")
       end
 
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 07bf550162c38..079113ac7616a 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -91,7 +91,7 @@ module Decidim::Assemblies
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -110,7 +110,7 @@ module Decidim::Assemblies
         let(:attachment_params) do
           {
             banner_image: banner_image.blob,
-            hero_image: ActiveStorage::Blob.create_after_upload!(
+            hero_image: ActiveStorage::Blob.create_and_upload!(
               io: File.open(Decidim::Dev.asset("5000x5000.png")),
               filename: "5000x5000.png",
               content_type: "image/png"
@@ -120,16 +120,16 @@ module Decidim::Assemblies
 
         it "broadcasts invalid" do
           expect { command.call }.to broadcast(:invalid)
-          expect(form.errors.messages[:hero_image]).to contain_exactly(["The image is too big"])
+          expect(form.errors.messages[:hero_image]).to contain_exactly("File resolution is too large")
         end
       end
 
       describe "when the assembly is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(false)
+          allow(form).to receive(:invalid?).and_return(false)
           expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
-          my_assembly.errors.add(:hero_image, "Image too big")
-          my_assembly.errors.add(:banner_image, "Image too big")
+          my_assembly.errors.add(:hero_image, "File resolution is too large")
+          my_assembly.errors.add(:banner_image, "File resolution is too large")
         end
 
         it "broadcasts invalid" do
@@ -186,7 +186,7 @@ module Decidim::Assemblies
           it "assembly type is null" do
             command.call
 
-            expect(my_assembly.assembly_type).to eq(nil)
+            expect(my_assembly.assembly_type).to be_nil
           end
         end
 
@@ -243,7 +243,7 @@ module Decidim::Assemblies
             my_assembly.reload
             parent_assembly.reload
 
-            expect(my_assembly.parent).to be(nil)
+            expect(my_assembly.parent).to be_nil
             expect(parent_assembly.children_count).to eq(parent_assembly.children.count)
           end
         end
diff --git a/decidim-assemblies/spec/controllers/admin/assembly_exports_controller_spec.rb b/decidim-assemblies/spec/controllers/admin/assembly_exports_controller_spec.rb
index a5a130d255a28..9a0d2f683f36f 100644
--- a/decidim-assemblies/spec/controllers/admin/assembly_exports_controller_spec.rb
+++ b/decidim-assemblies/spec/controllers/admin/assembly_exports_controller_spec.rb
@@ -31,6 +31,18 @@ module Admin
 
             post(:create, params: params)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with("export", assembly, user)
+              .and_call_original
+
+            expect { post(:create, params: params) }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("export")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-assemblies/spec/controllers/exports_controller_spec.rb b/decidim-assemblies/spec/controllers/admin/exports_controller_spec.rb
similarity index 75%
rename from decidim-assemblies/spec/controllers/exports_controller_spec.rb
rename to decidim-assemblies/spec/controllers/admin/exports_controller_spec.rb
index d4b60a0a2cce4..d730360c3a3a1 100644
--- a/decidim-assemblies/spec/controllers/exports_controller_spec.rb
+++ b/decidim-assemblies/spec/controllers/admin/exports_controller_spec.rb
@@ -47,6 +47,18 @@ module Admin
             end
           end
         end
+
+        it "traces the action", versioning: true do
+          expect(Decidim.traceability)
+            .to receive(:perform_action!)
+            .with("export_component", component, user, { name: "dummies", format: "json" })
+            .and_call_original
+
+          expect { post(:create, params: params) }.to change(Decidim::ActionLog, :count)
+          action_log = Decidim::ActionLog.last
+          expect(action_log.action).to eq("export_component")
+          expect(action_log.version).to be_present
+        end
       end
     end
   end
diff --git a/decidim-assemblies/spec/controllers/admin/imports_controller_spec.rb b/decidim-assemblies/spec/controllers/admin/imports_controller_spec.rb
index 448cc7a9ce0d3..acee679f61bbf 100644
--- a/decidim-assemblies/spec/controllers/admin/imports_controller_spec.rb
+++ b/decidim-assemblies/spec/controllers/admin/imports_controller_spec.rb
@@ -11,13 +11,7 @@ module Admin
         it_behaves_like "admin imports controller" do
           let!(:participatory_space) { create :assembly, organization: organization }
           let(:extra_params) { { assembly_slug: participatory_space.slug } }
-
-          let(:file) do
-            Rack::Test::UploadedFile.new(
-              Decidim::Dev.test_file("import_proposals.csv", "text/csv"),
-              "text/csv"
-            )
-          end
+          let(:file) { upload_test_file(Decidim::Dev.test_file("import_proposals.csv", "text/csv")) }
         end
       end
     end
diff --git a/decidim-assemblies/spec/controllers/assembly_members_controller_spec.rb b/decidim-assemblies/spec/controllers/assembly_members_controller_spec.rb
index 12457c1213fc1..c2c5518fb5633 100644
--- a/decidim-assemblies/spec/controllers/assembly_members_controller_spec.rb
+++ b/decidim-assemblies/spec/controllers/assembly_members_controller_spec.rb
@@ -30,15 +30,15 @@ module Assemblies
         end
 
         context "when assembly has members" do
-          let!(:member_1) { create(:assembly_member, assembly: assembly) }
-          let!(:member_2) { create(:assembly_member, assembly: assembly) }
+          let!(:member1) { create(:assembly_member, assembly: assembly) }
+          let!(:member2) { create(:assembly_member, assembly: assembly) }
           let!(:non_member) { create(:assembly_member) }
 
           context "when user has permissions" do
             it "displays list of members" do
               get :index, params: { assembly_slug: assembly.slug }
 
-              expect(controller.helpers.collection).to match_array([member_1, member_2])
+              expect(controller.helpers.collection).to match_array([member1, member2])
             end
           end
 
diff --git a/decidim-assemblies/spec/factories.rb b/decidim-assemblies/spec/factories.rb
index e793a3cbeef74..13db5e8b4a4b4 100644
--- a/decidim-assemblies/spec/factories.rb
+++ b/decidim-assemblies/spec/factories.rb
@@ -2,5 +2,6 @@
 
 require "decidim/core/test/factories"
 require "decidim/proposals/test/factories"
+require "decidim/meetings/test/factories"
 
 require "decidim/assemblies/test/factories"
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index ae278a410f488..d94093a065540 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -41,7 +41,7 @@ module Admin
           }
         end
         let(:slug) { "slug" }
-        let(:attachment) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:show_statistics) { true }
         let(:private_space) { true }
         let(:purpose_of_action) do
@@ -166,30 +166,19 @@ module Admin
           it { is_expected.to be_valid }
         end
 
-        context "when hero_image is too big" do
+        context "when attachment (hero_image or banner_image) is too big" do
           before do
             organization.settings.tap do |settings|
               settings.upload.maximum_file_size.default = 5
             end
-            expect(subject.hero_image).to receive(:size).twice.and_return(6.megabytes)
-          end
-
-          it { is_expected.not_to be_valid }
-        end
-
-        context "when banner_image is too big" do
-          before do
-            organization.settings.tap do |settings|
-              settings.upload.maximum_file_size.default = 5
-            end
-            expect(subject.banner_image).to receive(:size).twice.and_return(6.megabytes)
+            ActiveStorage::Blob.find_signed(attachment).update(byte_size: 6.megabytes)
           end
 
           it { is_expected.not_to be_valid }
         end
 
         context "when images are not the expected type" do
-          let(:attachment) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
+          let(:attachment) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")) }
 
           it { is_expected.not_to be_valid }
         end
diff --git a/decidim-assemblies/spec/forms/assembly_member_form_spec.rb b/decidim-assemblies/spec/forms/assembly_member_form_spec.rb
index dfe88496587d5..f83f46e41d46a 100644
--- a/decidim-assemblies/spec/forms/assembly_member_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_member_form_spec.rb
@@ -20,7 +20,7 @@ module Admin
         let(:gender) { ::Faker::Lorem.word }
         let(:position) { Decidim::AssemblyMember::POSITIONS.first }
         let(:existing_user) { false }
-        let(:non_user_avatar) { fixture_file_upload(File.open(Decidim::Dev.asset("city.jpeg")), "image/jpeg") }
+        let(:non_user_avatar) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:user_id) { nil }
 
         let(:attributes) do
@@ -130,13 +130,13 @@ module Admin
           context "when the user does not exist" do
             let(:user_id) { 999_999 }
 
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
 
           context "when the user is from another organization" do
             let(:user_id) { create(:user).id }
 
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
         end
       end
diff --git a/decidim-assemblies/spec/forms/assembly_user_role_form_spec.rb b/decidim-assemblies/spec/forms/assembly_user_role_form_spec.rb
index 3a4835976dffe..d5e305c7802e6 100644
--- a/decidim-assemblies/spec/forms/assembly_user_role_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_user_role_form_spec.rb
@@ -36,7 +36,7 @@ module Admin
         end
 
         context "when email is missing" do
-          let(:email) {}
+          let(:email) { nil }
 
           it { is_expected.to be_invalid }
         end
diff --git a/decidim-assemblies/spec/lib/components/assemblies/current_component_spec.rb b/decidim-assemblies/spec/lib/components/assemblies/current_component_spec.rb
index 9318cb5047b53..b72d012b5c0e2 100644
--- a/decidim-assemblies/spec/lib/components/assemblies/current_component_spec.rb
+++ b/decidim-assemblies/spec/lib/components/assemblies/current_component_spec.rb
@@ -6,21 +6,19 @@ module Decidim
   module Assemblies
     describe CurrentComponent do
       let(:request) { double(params: params, env: env) }
-      let(:subject) { described_class.new(manifest) }
       let(:params) { {} }
       let(:manifest) { Decidim.find_component_manifest("dummy") }
-
       let(:organization) do
         create(:organization)
       end
-
       let(:current_assembly) { create(:assembly, organization: organization) }
       let(:other_assembly) { create(:assembly, organization: organization) }
-
       let(:env) do
         { "decidim.current_organization" => organization }
       end
 
+      subject { described_class.new(manifest) }
+
       context "when the params contain an assembly id" do
         before do
           params["assembly_slug"] = current_assembly.id.to_s
@@ -28,7 +26,7 @@ module Assemblies
 
         context "when the params don't contain a component id" do
           it "doesn't match" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -41,7 +39,7 @@ module Assemblies
             let(:component) { create(:component, participatory_space: other_assembly) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(false)
+              expect(subject.matches?(request)).to be(false)
             end
           end
 
@@ -49,7 +47,7 @@ module Assemblies
             let(:component) { create(:component, participatory_space: current_assembly) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(true)
+              expect(subject.matches?(request)).to be(true)
             end
           end
         end
diff --git a/decidim-assemblies/spec/lib/query_extensions_spec.rb b/decidim-assemblies/spec/lib/query_extensions_spec.rb
index 21e2bb572d58f..03dcf1f7e2bc0 100644
--- a/decidim-assemblies/spec/lib/query_extensions_spec.rb
+++ b/decidim-assemblies/spec/lib/query_extensions_spec.rb
@@ -9,16 +9,16 @@ module Core
       include_context "with a graphql class type"
 
       describe "assembliesTypes" do
-        let!(:assemblies_type_1) { create(:assemblies_type, organization: current_organization) }
-        let!(:assemblies_type_2) { create(:assemblies_type, organization: current_organization) }
-        let!(:assemblies_type_3) { create(:assemblies_type) }
+        let!(:assemblies_type1) { create(:assemblies_type, organization: current_organization) }
+        let!(:assemblies_type2) { create(:assemblies_type, organization: current_organization) }
+        let!(:assemblies_type3) { create(:assemblies_type) }
 
         let(:query) { %({ assembliesTypes { id }}) }
 
         it "returns all the assembliesType" do
-          expect(response["assembliesTypes"]).to include("id" => assemblies_type_1.id.to_s)
-          expect(response["assembliesTypes"]).to include("id" => assemblies_type_2.id.to_s)
-          expect(response["assembliesTypes"]).not_to include("id" => assemblies_type_3.id.to_s)
+          expect(response["assembliesTypes"]).to include("id" => assemblies_type1.id.to_s)
+          expect(response["assembliesTypes"]).to include("id" => assemblies_type2.id.to_s)
+          expect(response["assembliesTypes"]).not_to include("id" => assemblies_type3.id.to_s)
         end
       end
 
diff --git a/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb b/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
index f14464a86f1bd..19b66fd7e7be4 100644
--- a/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
+++ b/decidim-assemblies/spec/permissions/decidim/assemblies/permissions_spec.rb
@@ -11,7 +11,7 @@
   let(:assemblies_setting) { create :assemblies_setting, organization: organization }
   let(:assembly) { create :assembly, organization: organization, assembly_type: assembly_type }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:assembly_admin) { create :assembly_admin, assembly: assembly }
   let(:assembly_collaborator) { create :assembly_collaborator, assembly: assembly }
   let(:assembly_moderator) { create :assembly_moderator, assembly: assembly }
@@ -20,11 +20,11 @@
   shared_examples "access for role" do |access|
     case access
     when true
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     when :not_set
       it_behaves_like "permission is not set"
     else
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -74,6 +74,23 @@
       )
     end
 
+    context "when accessing global moderation" do
+      subject { Decidim::Admin::Permissions.new(user, permission_action, context).permissions.allowed? }
+
+      let(:action) do
+        { scope: :admin, action: :read, subject: :global_moderation }
+      end
+
+      it_behaves_like(
+        "access for roles",
+        org_admin: true,
+        admin: true,
+        collaborator: false,
+        moderator: true,
+        valuator: false
+      )
+    end
+
     context "when reading a assembly" do
       let(:action) do
         { scope: :public, action: :read, subject: :assembly }
@@ -83,13 +100,13 @@
       context "when the user is an admin" do
         let(:user) { create :user, :admin }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the assembly is published" do
         let(:user) { create :user, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the assembly is not published" do
@@ -97,7 +114,7 @@
         let(:assembly) { create :assembly, :unpublished, organization: organization }
 
         context "when the user doesn't have access to it" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user has access to it" do
@@ -105,7 +122,7 @@
             create :assembly_user_role, user: user, assembly: assembly
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -115,7 +132,7 @@
         { scope: :public, action: :list, subject: :assembly }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when listing assembly members" do
@@ -123,7 +140,7 @@
         { scope: :public, action: :list, subject: :members }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when any other action" do
@@ -269,6 +286,36 @@
       { scope: :admin, action: :create, subject: :assembly }
     end
 
+    it_behaves_like(
+      "access for roles",
+      org_admin: true,
+      admin: true,
+      collaborator: false,
+      moderator: false,
+      valuator: false
+    )
+  end
+
+  context "when exporting an assembly" do
+    let(:action) do
+      { scope: :admin, action: :export, subject: :assembly }
+    end
+
+    it_behaves_like(
+      "access for roles",
+      org_admin: true,
+      admin: false,
+      collaborator: false,
+      moderator: false,
+      valuator: false
+    )
+  end
+
+  context "when copying an assembly" do
+    let(:action) do
+      { scope: :admin, action: :copy, subject: :assembly }
+    end
+
     it_behaves_like(
       "access for roles",
       org_admin: true,
@@ -335,7 +382,7 @@
           { scope: :admin, action: :read, subject: :dummy }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is :preview" do
@@ -343,7 +390,7 @@
           { scope: :admin, action: :preview, subject: :dummy }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is a random one" do
@@ -363,7 +410,7 @@
           { scope: :admin, action: :create, subject: :assembly }
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be true }
       end
 
       shared_examples "allows any action on subject" do |action_subject|
@@ -372,7 +419,7 @@
             { scope: :admin, action: :foo, subject: action_subject }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -393,7 +440,7 @@
           { scope: :admin, action: :create, subject: :assembly }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       shared_examples "allows any action on subject" do |action_subject|
@@ -402,7 +449,7 @@
             { scope: :admin, action: :foo, subject: action_subject }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -425,7 +472,7 @@
         { scope: :admin, action: :index, subject: :assembly_type }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when action is :create" do
@@ -433,7 +480,7 @@
         { scope: :admin, action: :create, subject: :assembly_type }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when action is :edit" do
@@ -441,7 +488,7 @@
         { scope: :admin, action: :edit, subject: :assembly_type }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when action is :destroy" do
@@ -453,13 +500,13 @@
       context "and assembly type has children" do
         let!(:assembly) { create :assembly, organization: organization, assembly_type: assembly_type }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "and assembly type has no children" do
         let(:assembly) { create :assembly, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -470,7 +517,7 @@
         { scope: :admin, action: :create, subject: :assembly_type }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when listing assemblies list" do
@@ -486,7 +533,7 @@
           { scope: :admin, action: :list, subject: :assembly }
         end
 
-        it { is_expected.to eq(true) }
+        it { is_expected.to be(true) }
       end
 
       context "when the assembly has one ancestor" do
@@ -499,7 +546,7 @@
           { scope: :admin, action: :list, subject: :assembly }
         end
 
-        it { is_expected.to eq(true) }
+        it { is_expected.to be(true) }
       end
 
       context "when the assembly has more than one ancestor" do
@@ -513,10 +560,10 @@
           { scope: :admin, action: :list, subject: :assembly }
         end
 
-        it { is_expected.to eq(true) }
+        it { is_expected.to be(true) }
       end
 
-      context "when the assembly has one ancestor" do
+      context "when the assembly has one sucessor" do
         before do
           create :assembly_user_role, user: user, assembly: assembly.parent
         end
@@ -526,7 +573,105 @@
           { scope: :admin, action: :list, subject: :assembly }
         end
 
-        it { is_expected.to eq(false) }
+        it { is_expected.to be(true) }
+      end
+    end
+  end
+
+  describe "when acting with assemblies admins and children assemblies" do
+    let!(:user) { create :assembly_admin, assembly: mother_assembly }
+    let(:mother_assembly) { create :assembly, parent: assembly, organization: organization, hashtag: "mother" }
+    let(:child_assembly) { create :assembly, parent: mother_assembly, organization: organization, hashtag: "child" }
+
+    context "when assembly is a grandmother assembly" do
+      let(:context) { { assembly: assembly } }
+
+      context "and action is :list" do
+        let(:action) do
+          { scope: :admin, action: :list, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :export" do
+        let(:action) do
+          { scope: :admin, action: :export, subject: :assembly }
+        end
+
+        it { is_expected.to be(false) }
+      end
+
+      context "and action is :copy" do
+        let(:action) do
+          { scope: :admin, action: :copy, subject: :assembly }
+        end
+
+        it { is_expected.to be(false) }
+      end
+    end
+
+    context "when assembly is a mother assembly" do
+      let(:context) { { assembly: mother_assembly } }
+
+      context "and action is :list" do
+        let(:action) do
+          { scope: :admin, action: :list, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :export" do
+        let(:action) do
+          { scope: :admin, action: :export, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :copy" do
+        let(:action) do
+          { scope: :admin, action: :copy, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+    end
+
+    context "when assembly is a child assembly" do
+      let(:context) { { assembly: child_assembly } }
+
+      context "and action is :list" do
+        let(:action) do
+          { scope: :admin, action: :list, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :export" do
+        let(:action) do
+          { scope: :admin, action: :export, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :copy" do
+        let(:action) do
+          { scope: :admin, action: :copy, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and action is :read the current assembly" do
+        let(:action) do
+          { scope: :admin, action: :read, subject: :assembly }
+        end
+
+        it { is_expected.to be(true) }
       end
     end
   end
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index c384b5d7870b7..0004a7807393d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -26,11 +26,11 @@ module Decidim
 
     describe "when images are attached" do
       it "resolves hero_image_url" do
-        expect(subject.hero_image_url).to eq("http://#{organization_host}#{assembly.attached_uploader(:hero_image).path}")
+        expect(subject.hero_image_url).to eq("http://#{organization_host}:#{Capybara.server_port}#{assembly.attached_uploader(:hero_image).path}")
       end
 
       it "resolves banner_image_url" do
-        expect(subject.banner_image_url).to eq("http://#{organization_host}#{assembly.attached_uploader(:banner_image).path}")
+        expect(subject.banner_image_url).to eq("http://#{organization_host}:#{Capybara.server_port}#{assembly.attached_uploader(:banner_image).path}")
       end
     end
   end
diff --git a/decidim-assemblies/spec/presenters/decidim/assembly_member_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assembly_member_presenter_spec.rb
index 322cce4e86b88..752aa95708fc8 100644
--- a/decidim-assemblies/spec/presenters/decidim/assembly_member_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assembly_member_presenter_spec.rb
@@ -121,7 +121,7 @@ module Decidim
 
       context "when a image is attached" do
         let(:non_user_avatar) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("avatar.jpg")),
             filename: "avatar.jpeg",
             content_type: "image/jpeg"
diff --git a/decidim-assemblies/spec/requests/assembly_search_spec.rb b/decidim-assemblies/spec/requests/assembly_search_spec.rb
new file mode 100644
index 0000000000000..8d78fee74b3f0
--- /dev/null
+++ b/decidim-assemblies/spec/requests/assembly_search_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Assembly search", type: :request do
+  subject { response.body }
+
+  let(:organization) { create(:organization) }
+  let!(:assembly1) do
+    create(
+      :assembly,
+      organization: organization,
+      assembly_type: create(:assemblies_type, organization: organization),
+      area: create(:area, organization: organization),
+      scope: create(:scope, organization: organization)
+    )
+  end
+  let!(:assembly2) do
+    create(
+      :assembly,
+      organization: organization,
+      assembly_type: create(:assemblies_type, organization: organization),
+      area: create(:area, organization: organization),
+      scope: create(:scope, organization: organization)
+    )
+  end
+
+  let(:filter_params) { {} }
+  let(:request_path) { decidim_assemblies.assemblies_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all assemblies by default" do
+    expect(subject).to include(translated(assembly1.title))
+    expect(subject).to include(translated(assembly2.title))
+  end
+
+  context "when filtering by assembly type" do
+    let(:filter_params) { { type_id_eq: assembly1.assembly_type.id } }
+
+    it "displays matching assemblies" do
+      expect(subject).to include(translated(assembly1.title))
+      expect(subject).not_to include(translated(assembly2.title))
+    end
+  end
+
+  context "when filtering by area" do
+    let(:filter_params) { { with_area: assembly1.area.id } }
+
+    it "displays matching assemblies" do
+      expect(subject).to include(translated(assembly1.title))
+      expect(subject).not_to include(translated(assembly2.title))
+    end
+  end
+
+  context "when filtering by scope" do
+    let(:filter_params) { { with_scope: assembly1.scope.id } }
+
+    it "displays matching assemblies" do
+      expect(subject).to include(translated(assembly1.title))
+      expect(subject).not_to include(translated(assembly2.title))
+    end
+  end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 81fe80fd5653e..e1363f2a21feb 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -5,7 +5,8 @@
 module Decidim::Assemblies
   describe AssemblySerializer do
     let(:resource) { create(:assembly) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the assembly data" do
diff --git a/decidim-assemblies/spec/services/decidim/assemblies/searchable_assembly_resource_spec.rb b/decidim-assemblies/spec/services/decidim/assemblies/searchable_assembly_resource_spec.rb
index bf4cb11e805ae..819afb6b00bdf 100644
--- a/decidim-assemblies/spec/services/decidim/assemblies/searchable_assembly_resource_spec.rb
+++ b/decidim-assemblies/spec/services/decidim/assemblies/searchable_assembly_resource_spec.rb
@@ -14,7 +14,7 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
-          description: description_1,
+          description: description1,
           users: [author]
         )
       end
@@ -27,7 +27,7 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
-          description: description_2,
+          description: description2,
           users: [author]
         )
       end
diff --git a/decidim-assemblies/spec/shared/assembly_admin_manage_assembly_components_examples.rb b/decidim-assemblies/spec/shared/assembly_admin_manage_assembly_components_examples.rb
new file mode 100644
index 0000000000000..6fe823375b1d7
--- /dev/null
+++ b/decidim-assemblies/spec/shared/assembly_admin_manage_assembly_components_examples.rb
@@ -0,0 +1,221 @@
+# frozen_string_literal: true
+
+shared_examples "assembly admin manage assembly components" do
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+  end
+
+  describe "add a component" do
+    before do
+      visit decidim_admin_assemblies.components_path(assembly)
+
+      find("button[data-toggle=add-component-dropdown]").click
+
+      within "#add-component-dropdown" do
+        find(".dummy").click
+      end
+
+      within ".new_component" do
+        fill_in_i18n(
+          :component_name,
+          "#component-name-tabs",
+          en: "My component",
+          ca: "La meva funcionalitat",
+          es: "Mi funcionalitat"
+        )
+
+        within ".global-settings" do
+          fill_in_i18n_editor(
+            :component_settings_dummy_global_translatable_text,
+            "#global-settings-dummy_global_translatable_text-tabs",
+            en: "Dummy Text"
+          )
+          all("input[type=checkbox]").last.click
+        end
+
+        within ".default-step-settings" do
+          fill_in_i18n_editor(
+            :component_default_step_settings_dummy_step_translatable_text,
+            "#default-step-settings-dummy_step_translatable_text-tabs",
+            en: "Dummy Text for Step"
+          )
+          all("input[type=checkbox]").first.click
+        end
+
+        click_button "Add component"
+      end
+    end
+
+    it "is successfully created" do
+      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_content("My component")
+    end
+
+    context "and then edit it" do
+      before do
+        within find("tr", text: "My component") do
+          click_link "Configure"
+        end
+      end
+
+      it "successfully displays initial values in the form" do
+        within ".global-settings" do
+          expect(all("input[type=checkbox]").last).to be_checked
+        end
+
+        within ".default-step-settings" do
+          expect(all("input[type=checkbox]").first).to be_checked
+        end
+      end
+
+      it "successfully edits it" do
+        click_button "Update"
+
+        expect(page).to have_admin_callout("successfully")
+      end
+    end
+  end
+
+  describe "edit a component" do
+    let(:component_name) do
+      {
+        en: "My component",
+        ca: "La meva funcionalitat",
+        es: "Mi funcionalitat"
+      }
+    end
+
+    let!(:component) do
+      create(:component, name: component_name, participatory_space: assembly)
+    end
+
+    before do
+      visit decidim_admin_assemblies.components_path(assembly)
+    end
+
+    it "updates the component" do
+      within ".component-#{component.id}" do
+        click_link "Configure"
+      end
+
+      within ".edit_component" do
+        fill_in_i18n(
+          :component_name,
+          "#component-name-tabs",
+          en: "My updated component",
+          ca: "La meva funcionalitat actualitzada",
+          es: "Mi funcionalidad actualizada"
+        )
+
+        within ".global-settings" do
+          all("input[type=checkbox]").last.click
+        end
+
+        within ".default-step-settings" do
+          all("input[type=checkbox]").first.click
+        end
+
+        click_button "Update"
+      end
+
+      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_content("My updated component")
+
+      within find("tr", text: "My updated component") do
+        click_link "Configure"
+      end
+
+      within ".global-settings" do
+        expect(all("input[type=checkbox]").last).to be_checked
+      end
+
+      within ".default-step-settings" do
+        expect(all("input[type=checkbox]").first).to be_checked
+      end
+    end
+  end
+
+  describe "remove a component" do
+    let(:component_name) do
+      {
+        en: "My component",
+        ca: "La meva funcionalitat",
+        es: "Mi funcionalitat"
+      }
+    end
+
+    let!(:component) do
+      create(:component, name: component_name, participatory_space: assembly)
+    end
+
+    before do
+      visit decidim_admin_assemblies.components_path(assembly)
+    end
+
+    it "removes the component" do
+      within ".component-#{component.id}" do
+        click_link "Delete"
+      end
+
+      expect(page).to have_no_content("My component")
+    end
+  end
+
+  describe "publish and unpublish a component" do
+    let!(:component) do
+      create(:component, participatory_space: assembly, published_at: published_at)
+    end
+
+    let(:published_at) { nil }
+
+    before do
+      visit decidim_admin_assemblies.components_path(assembly)
+    end
+
+    context "when the component is unpublished" do
+      it "publishes the component" do
+        within ".component-#{component.id}" do
+          click_link "Publish"
+        end
+
+        within ".component-#{component.id}" do
+          expect(page).to have_css(".action-icon--unpublish")
+        end
+      end
+
+      it "notifies its followers" do
+        follower = create(:user, organization: assembly.organization)
+        create(:follow, followable: assembly, user: follower)
+
+        within ".component-#{component.id}" do
+          click_link "Publish"
+        end
+
+        expect(enqueued_jobs.last[:args]).to include("decidim.events.components.component_published")
+      end
+    end
+
+    context "when the component is published" do
+      let(:published_at) { Time.current }
+
+      it "unpublishes the component" do
+        within ".component-#{component.id}" do
+          click_link "Unpublish"
+        end
+
+        within ".component-#{component.id}" do
+          expect(page).to have_css(".action-icon--publish")
+        end
+      end
+    end
+  end
+
+  def participatory_space
+    assembly
+  end
+
+  def participatory_space_components_path(participatory_space)
+    decidim_admin_assemblies.components_path(participatory_space)
+  end
+end
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index d678fdf7f193f..d5830b517e005 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -20,7 +20,7 @@
         ca: "El meu nou títol"
       )
 
-      attach_file :assembly_banner_image, image3_path
+      dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
 
       within ".edit_assembly" do
         expect(assembly_parent_id_options).not_to include(assembly.id)
diff --git a/decidim-assemblies/spec/shared/manage_assembly_members_examples.rb b/decidim-assemblies/spec/shared/manage_assembly_members_examples.rb
index 6e3c572751eb5..400def2c49796 100644
--- a/decidim-assemblies/spec/shared/manage_assembly_members_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assembly_members_examples.rb
@@ -18,15 +18,17 @@
       find(".datepicker-days .active").click
 
       within ".new_assembly_member" do
-        expect(page).to have_content("You should get the consent of the persons before publishing them as a member")
-
         fill_in(
           :assembly_member_full_name,
           with: "Daisy O'connor"
         )
+      end
 
-        attach_file "Avatar", Decidim::Dev.asset("avatar.jpg")
+      dynamically_attach_file(:assembly_member_non_user_avatar, Decidim::Dev.asset("avatar.jpg")) do
+        expect(page).to have_content("You should get the consent of the persons before publishing them as a member")
+      end
 
+      within ".new_assembly_member" do
         select "President", from: :assembly_member_position
 
         find("*[type=submit]").click
diff --git a/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb b/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb
index d5f714b38f966..756a7b4a14910 100644
--- a/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assembly_private_users_examples.rb
@@ -42,7 +42,7 @@
       # The CSV has no headers
       expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("my_user@example.org", "My User Name", assembly, user)
       expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("my_private_user@example.org", "My Private User Name", assembly, user)
-      attach_file "File", Decidim::Dev.asset("import_participatory_space_private_users.csv")
+      dynamically_attach_file(:participatory_space_private_user_csv_import_file, Decidim::Dev.asset("import_participatory_space_private_users.csv"))
       perform_enqueued_jobs { click_button "Upload" }
 
       expect(page).to have_content("CSV file uploaded successfully")
diff --git a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb
index 4eb6845c8a48b..e33f4167c049c 100644
--- a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_private_space_users_spec.rb
@@ -9,10 +9,10 @@
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
   let(:assembly) { create(:assembly, organization: organization) }
 
-  let!(:invited_user_1) { create(:user, name: name, organization: organization) }
-  let!(:invited_private_user_1) { create :assembly_private_user, user: invited_user_1, privatable_to: assembly }
-  let!(:invited_user_2) { create(:user, email: email, organization: organization) }
-  let!(:invited_private_user_2) { create :assembly_private_user, user: invited_user_2, privatable_to: assembly }
+  let!(:invited_user1) { create(:user, name: name, organization: organization) }
+  let!(:invited_private_user1) { create :assembly_private_user, user: invited_user1, privatable_to: assembly }
+  let!(:invited_user2) { create(:user, email: email, organization: organization) }
+  let!(:invited_private_user2) { create :assembly_private_user, user: invited_user2, privatable_to: assembly }
 
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
@@ -20,7 +20,7 @@
   let(:resource_controller) { Decidim::Assemblies::Admin::ParticipatorySpacePrivateUsersController }
 
   before do
-    invited_user_1.update!(invitation_sent_at: Time.current - 1.day, invitation_accepted_at: Time.current)
+    invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
 
     switch_to_host(organization.host)
     login_as user, scope: :user
diff --git a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_user_roles_spec.rb b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_user_roles_spec.rb
index 62a921bd43c25..9a53d609ddd27 100644
--- a/decidim-assemblies/spec/system/admin/admin_filters_assemblies_user_roles_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_filters_assemblies_user_roles_spec.rb
@@ -11,11 +11,11 @@
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
 
-  let!(:invited_user_1) { create(:assembly_valuator, name: name, assembly: assembly) }
-  let!(:invited_user_2) { create(:assembly_valuator, email: email, assembly: assembly) }
+  let!(:invited_user1) { create(:assembly_valuator, name: name, assembly: assembly) }
+  let!(:invited_user2) { create(:assembly_valuator, email: email, assembly: assembly) }
 
   before do
-    invited_user_2.update!(invitation_sent_at: Time.current - 1.day, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
+    invited_user2.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
 
     switch_to_host(organization.host)
     login_as admin, scope: :user
@@ -36,6 +36,7 @@
       let!(:user) do
         create(:assembly_valuator,
                name: "ZZZupper user",
+               email: "zzz@example.org",
                assembly: assembly,
                last_sign_in_at: 30.seconds.ago,
                invitation_accepted_at: Time.current)
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index af31d427790d0..13c395b142267 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -41,9 +41,9 @@
           ca: "Importació de l'asamblea"
         )
         fill_in :assembly_slug, with: "as-import"
-        attach_file :assembly_document, Decidim::Dev.asset("assemblies.json")
       end
 
+      dynamically_attach_file(:assembly_document, Decidim::Dev.asset("assemblies.json"))
       click_button "Import"
     end
 
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index e9c269267145e..6fc293f713518 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -53,9 +53,12 @@
         fill_in :assembly_slug, with: "slug"
         fill_in :assembly_hashtag, with: "#hashtag"
         fill_in :assembly_weight, with: 1
-        attach_file :assembly_hero_image, image1_path
-        attach_file :assembly_banner_image, image2_path
+      end
+
+      dynamically_attach_file(:assembly_hero_image, image1_path)
+      dynamically_attach_file(:assembly_banner_image, image2_path)
 
+      within ".new_assembly" do
         find("*[type=submit]").click
       end
 
@@ -89,15 +92,15 @@
       context "when filtering by assemblies type" do
         include_context "with filterable context"
 
-        let!(:assemblies_type_1) { create(:assemblies_type) }
-        let!(:assemblies_type_2) { create(:assemblies_type) }
+        let!(:assemblies_type1) { create(:assemblies_type) }
+        let!(:assemblies_type2) { create(:assemblies_type) }
 
         Decidim::AssembliesType.all.each do |assemblies_type|
           i18n_assemblies_type = assemblies_type.name[I18n.locale.to_s]
 
           context "filtering collection by assemblies_type: #{i18n_assemblies_type}" do
-            let!(:assembly_1) { create(:assembly, organization: organization, assemblies_type: assemblies_type_1) }
-            let!(:assembly_2) { create(:assembly, organization: organization, assemblies_type: assemblies_type_2) }
+            let!(:assembly1) { create(:assembly, organization: organization, assemblies_type: assemblies_type1) }
+            let!(:assembly2) { create(:assembly, organization: organization, assemblies_type: assemblies_type2) }
 
             it_behaves_like "a filtered collection", options: "Assembly type", filter: i18n_assemblies_type do
               let(:in_filter) { translated(assembly_with_type(type).title) }
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_with_parent_selector_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_with_parent_selector_spec.rb
index 1aa869fc5c850..4fecdfc735be8 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_with_parent_selector_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_with_parent_selector_spec.rb
@@ -57,9 +57,12 @@
         fill_in :assembly_slug, with: "slug"
         fill_in :assembly_hashtag, with: "#hashtag"
         fill_in :assembly_weight, with: 1
-        attach_file :assembly_hero_image, image1_path
-        attach_file :assembly_banner_image, image2_path
+      end
+
+      dynamically_attach_file(:assembly_hero_image, image1_path)
+      dynamically_attach_file(:assembly_banner_image, image2_path)
 
+      within ".new_assembly" do
         find("*[type=submit]").click
       end
 
@@ -116,9 +119,12 @@
         fill_in :assembly_slug, with: "slug"
         fill_in :assembly_hashtag, with: "#hashtag"
         fill_in :assembly_weight, with: 1
-        attach_file :assembly_hero_image, image1_path
-        attach_file :assembly_banner_image, image2_path
+      end
+
+      dynamically_attach_file(:assembly_hero_image, image1_path)
+      dynamically_attach_file(:assembly_banner_image, image2_path)
 
+      within ".new_assembly" do
         find("*[type=submit]").click
       end
 
diff --git a/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb b/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
index 9f17d789840c0..b81b2b9ab82ae 100644
--- a/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
+++ b/decidim-assemblies/spec/system/admin/assembly_admin_accesses_admin_sections_spec.rb
@@ -8,23 +8,55 @@
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin_assemblies.assemblies_path
+  end
+
+  context "when is a mother assembly" do
+    it "can access all sections" do
+      visit decidim_admin_assemblies.assemblies_path
+      click_link translated(assembly.title)
 
-    click_link translated(assembly.title)
+      within ".secondary-nav" do
+        expect(page).to have_content("Info")
+        expect(page).to have_content("Components")
+        expect(page).to have_content("Categories")
+        expect(page).to have_content("Attachments")
+        expect(page).to have_content("Folders")
+        expect(page).to have_content("Files")
+        expect(page).to have_content("Members")
+        expect(page).to have_content("Assembly admins")
+        expect(page).to have_content("Private users")
+        expect(page).to have_content("Moderations")
+      end
+    end
   end
 
-  it "can access all sections" do
-    within ".secondary-nav" do
-      expect(page).to have_content("Info")
-      expect(page).to have_content("Components")
-      expect(page).to have_content("Categories")
-      expect(page).to have_content("Attachments")
-      expect(page).to have_content("Folders")
-      expect(page).to have_content("Files")
-      expect(page).to have_content("Members")
-      expect(page).to have_content("Assembly admins")
-      expect(page).to have_content("Private users")
-      expect(page).to have_content("Moderations")
+  context "when is a child assembly" do
+    let!(:child_assembly) { create :assembly, parent: assembly, organization: organization, hashtag: "child" }
+
+    before do
+      visit decidim_admin_assemblies.assemblies_path
+      within find("tr", text: translated(assembly.title)) do
+        click_link "Assemblies"
+      end
+
+      click_link translated(child_assembly.title)
+    end
+
+    it "can access all sections" do
+      within ".secondary-nav" do
+        expect(page).to have_content("Info")
+        expect(page).to have_content("Components")
+        expect(page).to have_content("Categories")
+        expect(page).to have_content("Attachments")
+        expect(page).to have_content("Folders")
+        expect(page).to have_content("Files")
+        expect(page).to have_content("Members")
+        expect(page).to have_content("Assembly admins")
+        expect(page).to have_content("Private users")
+        expect(page).to have_content("Moderations")
+      end
     end
+
+    it_behaves_like "assembly admin manage assembly components"
   end
 end
diff --git a/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb b/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
index e95f864e9ffa8..909f7247d3683 100644
--- a/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
+++ b/decidim-assemblies/spec/system/admin/assembly_moderator_manages_assembly_moderations_spec.rb
@@ -17,4 +17,8 @@
   end
 
   it_behaves_like "manage moderations"
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+  end
 end
diff --git a/decidim-assemblies/spec/system/assemblies_spec.rb b/decidim-assemblies/spec/system/assemblies_spec.rb
index 18b31e2005146..955b7ae0a26d2 100644
--- a/decidim-assemblies/spec/system/assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_spec.rb
@@ -6,12 +6,13 @@
 describe "Assemblies", type: :system do
   let(:organization) { create(:organization) }
   let(:show_statistics) { true }
+  let(:base_description) { { en: "Description", ca: "Descripció", es: "Descripción" } }
   let(:base_assembly) do
     create(
       :assembly,
       :with_type,
       organization: organization,
-      description: { en: "Description", ca: "Descripció", es: "Descripción" },
+      description: base_description,
       short_description: { en: "Short description", ca: "Descripció curta", es: "Descripción corta" },
       show_statistics: show_statistics
     )
@@ -156,7 +157,7 @@
       let(:target_path) { decidim_assemblies.assembly_path(assembly) }
     end
 
-    context "and requesting the assebly path" do
+    context "and requesting the assembly path" do
       before do
         visit decidim_assemblies.assembly_path(assembly)
       end
@@ -181,6 +182,8 @@
         let(:attached_to) { assembly }
       end
 
+      it_behaves_like "has embedded video in description", :base_description
+
       context "when the assembly has some components" do
         it "shows the components" do
           within ".process-nav" do
@@ -234,6 +237,34 @@
           expect(page).to have_selector("#assemblies-grid .row .column:first-child", text: child_assembly.title[:en])
           expect(page).to have_selector("#assemblies-grid .row .column:last-child", text: second_child_assembly.title[:en])
         end
+
+        context "when child assembly has a meeting" do
+          let(:meetings_component) { create(:meeting_component, :published, participatory_space: child_assembly) }
+
+          context "with unpublished meeting" do
+            let!(:meeting) { create(:meeting, :upcoming, component: meetings_component) }
+
+            it "is not displaying the widget" do
+              visit decidim_assemblies.assembly_path(assembly)
+
+              within("#assemblies-grid") do
+                expect(page).not_to have_content("Upcoming meeting")
+              end
+            end
+          end
+
+          context "with published meeting" do
+            let!(:meeting) { create(:meeting, :upcoming, :published, component: meetings_component) }
+
+            it "is displaying the widget" do
+              visit decidim_assemblies.assembly_path(assembly)
+
+              within("#assemblies-grid") do
+                expect(page).to have_content("Upcoming meeting")
+              end
+            end
+          end
+        end
       end
 
       context "when the assembly has children private and transparent assemblies" do
diff --git a/decidim-assemblies/spec/system/filter_assemblies_spec.rb b/decidim-assemblies/spec/system/filter_assemblies_spec.rb
index fc4cd4371c23d..6f36ec476c8d7 100644
--- a/decidim-assemblies/spec/system/filter_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/filter_assemblies_spec.rb
@@ -33,6 +33,20 @@
     end
   end
 
+  context "when no assemblies types present" do
+    let!(:assemblies) { create_list(:assembly, 3, organization: organization) }
+
+    before do
+      visit decidim_assemblies.assemblies_path
+    end
+
+    it "doesn't show the assemblies types filter" do
+      within("#assemblies-filter") do
+        expect(page).to have_no_content("All types")
+      end
+    end
+  end
+
   context "when filtering parent assemblies by scope" do
     let!(:scope) { create :scope, organization: organization }
     let!(:assembly_with_scope) { create(:assembly, scope: scope, organization: organization) }
@@ -40,7 +54,7 @@
 
     context "and choosing a scope" do
       before do
-        visit decidim_assemblies.assemblies_path(filter: { scope_id: scope.id })
+        visit decidim_assemblies.assemblies_path(filter: { with_scope: scope.id })
       end
 
       it "lists all processes belonging to that scope" do
@@ -63,7 +77,7 @@
 
     context "and choosing an area" do
       before do
-        select translated(area.name), from: "filter[area_id]"
+        select translated(area.name), from: "filter[with_area]"
       end
 
       it "lists all processes belonging to that area" do
diff --git a/decidim-assemblies/spec/system/private_assemblies_spec.rb b/decidim-assemblies/spec/system/private_assemblies_spec.rb
index 04e2b4eee09ab..7db4e698f0914 100644
--- a/decidim-assemblies/spec/system/private_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/private_assemblies_spec.rb
@@ -8,15 +8,15 @@
   let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
   let!(:user) { create :user, :confirmed, organization: organization }
   let!(:other_user) { create :user, :confirmed, organization: organization }
-  let!(:other_user_2) { create :user, :confirmed, organization: organization }
+  let!(:other_user2) { create :user, :confirmed, organization: organization }
   let!(:assembly_private_user) { create :assembly_private_user, user: other_user, privatable_to: private_assembly }
-  let!(:assembly_private_user_2) { create :assembly_private_user, user: other_user_2, privatable_to: private_assembly }
+  let!(:assembly_private_user2) { create :assembly_private_user, user: other_user2, privatable_to: private_assembly }
 
   context "when there are private assemblies" do
     context "and the assembly is transparent" do
       let!(:private_assembly) { create :assembly, :published, organization: organization, private_space: true, is_transparent: true }
 
-      context "and no user is loged in" do
+      context "and no user is logged in" do
         before do
           switch_to_host(organization.host)
           visit decidim_assemblies.assemblies_path
@@ -36,23 +36,40 @@
         end
       end
 
-      context "when user is loged in and is not a assembly private user" do
-        before do
-          switch_to_host(organization.host)
-          login_as user, scope: :user
-          visit decidim_assemblies.assemblies_path
-        end
+      context "when user is logged in" do
+        context "when is not an assembly private user" do
+          before do
+            switch_to_host(organization.host)
+            login_as user, scope: :user
+            visit decidim_assemblies.assemblies_path
+          end
 
-        it "lists all the assemblies" do
-          within "#parent-assemblies" do
-            within "#parent-assemblies h3" do
-              expect(page).to have_content("2")
+          it "lists all the assemblies" do
+            within "#parent-assemblies" do
+              within "#parent-assemblies h3" do
+                expect(page).to have_content("2")
+              end
+
+              expect(page).to have_content(translated(assembly.title, locale: :en))
+              expect(page).to have_selector(".card--assembly", count: 2)
+
+              expect(page).to have_content(translated(private_assembly.title, locale: :en))
             end
+          end
+        end
 
-            expect(page).to have_content(translated(assembly.title, locale: :en))
-            expect(page).to have_selector(".card--assembly", count: 2)
+        context "when the user is admin" do
+          before do
+            switch_to_host(organization.host)
+            login_as admin, scope: :user
+            visit decidim_assemblies.assemblies_path
+          end
 
-            expect(page).to have_content(translated(private_assembly.title, locale: :en))
+          it "doesn't show the privacy warning in attachments admin" do
+            visit decidim_admin_assemblies.assembly_attachments_path(private_assembly)
+            within "#attachments" do
+              expect(page).to have_no_content("Any participant could share this document to others")
+            end
           end
         end
       end
@@ -61,13 +78,13 @@
     context "when the assembly is not transparent" do
       let!(:private_assembly) { create :assembly, :published, organization: organization, private_space: true, is_transparent: false }
 
-      context "and no user is loged in" do
+      context "and no user is logged in" do
         before do
           switch_to_host(organization.host)
           visit decidim_assemblies.assemblies_path
         end
 
-        it "lists only the not private assembly" do
+        it "doesn't list the private assembly" do
           within "#parent-assemblies" do
             within "#parent-assemblies h3" do
               expect(page).to have_content("1")
@@ -81,17 +98,15 @@
         end
       end
 
-      context "when user is loged in and is not a assembly private user" do
-        before do
-          switch_to_host(organization.host)
-          login_as logged_in_user, scope: :user
-          visit decidim_assemblies.assemblies_path
-        end
-
-        context "when the user is admin" do
-          let(:logged_in_user) { user }
+      context "when user is logged in and is not an assembly private user" do
+        context "when the user isn't admin" do
+          before do
+            switch_to_host(organization.host)
+            login_as user, scope: :user
+            visit decidim_assemblies.assemblies_path
+          end
 
-          it "lists only the not private assembly" do
+          it "doesn't list the private assembly" do
             within "#parent-assemblies" do
               within "#parent-assemblies h3" do
                 expect(page).to have_content("1")
@@ -106,7 +121,11 @@
         end
 
         context "when the user is admin" do
-          let(:logged_in_user) { admin }
+          before do
+            switch_to_host(organization.host)
+            login_as admin, scope: :user
+            visit decidim_assemblies.assemblies_path
+          end
 
           it "lists private assemblies" do
             within "#parent-assemblies" do
@@ -126,10 +145,17 @@
             expect(page).to have_current_path decidim_assemblies.assembly_path(private_assembly)
             expect(page).to have_content "This is a private assembly"
           end
+
+          it "shows the privacy warning in attachments admin" do
+            visit decidim_admin_assemblies.assembly_attachments_path(private_assembly)
+            within "#attachments" do
+              expect(page).to have_content("Any participant could share this document to others")
+            end
+          end
         end
       end
 
-      context "when user is loged in and is assembly private user" do
+      context "when user is logged in and is an assembly private user" do
         before do
           switch_to_host(organization.host)
           login_as other_user, scope: :user
diff --git a/decidim-assemblies/spec/types/assembly_member_type_spec.rb b/decidim-assemblies/spec/types/assembly_member_type_spec.rb
index 68c9dcaeaea90..1de20f36c12e9 100644
--- a/decidim-assemblies/spec/types/assembly_member_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_member_type_spec.rb
@@ -38,7 +38,7 @@ module Assemblies
         let(:query) { "{ user { name } }" }
 
         it "returns the user field" do
-          expect(response["user"]).to be nil
+          expect(response["user"]).to be_nil
         end
       end
 
@@ -102,7 +102,7 @@ module Assemblies
         let(:query) { "{ ceasedDate }" }
 
         it "returns the assembly member ceasedDate" do
-          expect(response["ceasedDate"]).to be nil
+          expect(response["ceasedDate"]).to be_nil
         end
       end
     end
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index 5509b6e72c70b..c76a86311d078 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -189,7 +189,7 @@ module Assemblies
         let(:query) { "{ area { id } }" }
 
         it "returns the area field" do
-          expect(response["area"]).to be nil
+          expect(response["area"]).to be_nil
         end
       end
 
@@ -198,7 +198,7 @@ module Assemblies
 
         context "when has no parent" do
           it "returns the parent" do
-            expect(response["parent"]).to be nil
+            expect(response["parent"]).to be_nil
           end
         end
 
@@ -258,7 +258,7 @@ module Assemblies
         let(:query) { "{ assemblyType { id } }" }
 
         it "returns the assemblyType field" do
-          expect(response["assemblyType"]).to be nil
+          expect(response["assemblyType"]).to be_nil
         end
       end
 
diff --git a/decidim-blogs/app/commands/decidim/blogs/admin/create_post.rb b/decidim-blogs/app/commands/decidim/blogs/admin/create_post.rb
index 125febfab1aac..9964c3ceb2d14 100644
--- a/decidim-blogs/app/commands/decidim/blogs/admin/create_post.rb
+++ b/decidim-blogs/app/commands/decidim/blogs/admin/create_post.rb
@@ -5,7 +5,7 @@ module Blogs
     module Admin
       # This command is executed when the user creates a Post from the admin
       # panel.
-      class CreatePost < Rectify::Command
+      class CreatePost < Decidim::Command
         def initialize(form, current_user)
           @form = form
           @current_user = current_user
diff --git a/decidim-blogs/app/commands/decidim/blogs/admin/update_post.rb b/decidim-blogs/app/commands/decidim/blogs/admin/update_post.rb
index 6903f69485717..b7d6bd7c43e27 100644
--- a/decidim-blogs/app/commands/decidim/blogs/admin/update_post.rb
+++ b/decidim-blogs/app/commands/decidim/blogs/admin/update_post.rb
@@ -5,14 +5,15 @@ module Blogs
     module Admin
       # This command is executed when the user changes a Blog from the admin
       # panel.
-      class UpdatePost < Rectify::Command
+      class UpdatePost < Decidim::Command
         # Initializes a UpdateBlog Command.
         #
         # form - The form from which to get the data.
         # blog - The current instance of the page to be updated.
-        def initialize(form, post)
+        def initialize(form, post, user)
           @form = form
           @post = post
+          @user = user
         end
 
         # Updates the blog if valid.
@@ -33,7 +34,9 @@ def call
         attr_reader :form, :post
 
         def update_post!
-          post.update!(
+          Decidim.traceability.update!(
+            post,
+            @user,
             title: form.title,
             body: form.body,
             author: form.author
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index d8c687e46a10f..ff2e2246e3e66 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -6,6 +6,7 @@ module Admin
       # This controller allows the create or update a blog.
       class PostsController < Admin::ApplicationController
         helper UserGroupHelper
+        helper PostsHelper
 
         def new
           enforce_permission_to :create, :blogpost
@@ -38,7 +39,7 @@ def update
           enforce_permission_to :update, :blogpost, blogpost: post
           @form = form(PostForm).from_params(params, current_component: current_component)
 
-          UpdatePost.call(@form, post) do
+          UpdatePost.call(@form, post, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("posts.update.success", scope: "decidim.blogs.admin")
               redirect_to posts_path
@@ -53,7 +54,10 @@ def update
 
         def destroy
           enforce_permission_to :destroy, :blogpost, blogpost: post
-          post.destroy!
+
+          Decidim.traceability.perform_action!("delete", post, current_user) do
+            post.destroy!
+          end
 
           flash[:notice] = I18n.t("posts.destroy.success", scope: "decidim.blogs.admin")
 
diff --git a/decidim-blogs/app/forms/decidim/blogs/admin/post_form.rb b/decidim-blogs/app/forms/decidim/blogs/admin/post_form.rb
index ba5e98f864e18..b410a046ac6b3 100644
--- a/decidim-blogs/app/forms/decidim/blogs/admin/post_form.rb
+++ b/decidim-blogs/app/forms/decidim/blogs/admin/post_form.rb
@@ -10,24 +10,44 @@ class PostForm < Decidim::Form
         translatable_attribute :title, String
         translatable_attribute :body, String
 
-        attribute :user_group_id, Integer
+        attribute :decidim_author_id, Integer
 
         validates :title, translatable_presence: true
         validates :body, translatable_presence: true
+        validate :can_set_author
 
-        def map_model(post)
-          self.user_group_id = post.author.id if post.author.is_a?(Decidim::UserGroup)
+        def map_model(model)
+          self.decidim_author_id = nil if model.author.is_a? Decidim::Organization
         end
 
-        def user_group
-          @user_group ||= Decidim::UserGroup.find_by(
+        def user_or_group
+          @user_or_group ||= Decidim::UserBaseEntity.find_by(
             organization: current_organization,
-            id: user_group_id.to_i
+            id: decidim_author_id
           )
         end
 
         def author
-          user_group || current_user
+          user_or_group || current_organization
+        end
+
+        private
+
+        def can_set_author
+          return if author == current_user.organization
+          return if author == current_user
+          return if user_groups.include? author
+          return if author == post&.author
+
+          errors.add(:decidim_author_id, :invalid)
+        end
+
+        def post
+          @post ||= Post.find_by(id: id)
+        end
+
+        def user_groups
+          @user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
         end
       end
     end
diff --git a/decidim-blogs/app/helpers/decidim/blogs/admin/posts_helper.rb b/decidim-blogs/app/helpers/decidim/blogs/admin/posts_helper.rb
index 8b56347cc8e1e..7648b63b6a62a 100644
--- a/decidim-blogs/app/helpers/decidim/blogs/admin/posts_helper.rb
+++ b/decidim-blogs/app/helpers/decidim/blogs/admin/posts_helper.rb
@@ -18,6 +18,21 @@ def post_description_admin(post, max_length = 100)
           body = translated_attribute(post.body)
           CGI.unescapeHTML html_truncate(body, max_length: max_length)
         end
+
+        def post_author_select_field(form, name, _options = {})
+          select_options = [
+            [current_organization.name, ""],
+            [current_user.name, current_user.id]
+          ]
+          current_user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+
+          select_options += current_user_groups.map { |g| [g.name, g.id] } if current_organization.user_groups_enabled? && current_user_groups.any?
+          unless form.object.author.is_a?(Organization) || select_options.pluck(1).include?(form.object.author.id)
+            select_options << [form.object.author.name, form.object.author.id]
+          end
+
+          form.select(name, select_options)
+        end
       end
     end
   end
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 2967998c54986..c8d89c36e6e5b 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -39,6 +39,10 @@ def visible?
         participatory_space.try(:visible?) && component.try(:published?)
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Blogs::AdminLog::PostPresenter
+      end
+
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
       def comments_have_alignment?
         true
@@ -55,7 +59,11 @@ def allow_resource_permissions?
       end
 
       def official?
-        author.nil?
+        author.is_a?(Decidim::Organization)
+      end
+
+      def user_group?
+        author.is_a?(Decidim::UserGroup)
       end
 
       def users_to_notify_on_comment_created
diff --git a/decidim-blogs/app/presenters/decidim/blogs/admin_log/post_presenter.rb b/decidim-blogs/app/presenters/decidim/blogs/admin_log/post_presenter.rb
new file mode 100644
index 0000000000000..a4706efbbf96f
--- /dev/null
+++ b/decidim-blogs/app/presenters/decidim/blogs/admin_log/post_presenter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Blogs::Post`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    PostPresenter.new(action_log, view_helpers).present
+      class PostPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.blogs.admin_log.post.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            title: :i18n,
+            body: :i18n
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/app/presenters/decidim/blogs/official_author_presenter.rb b/decidim-blogs/app/presenters/decidim/blogs/official_author_presenter.rb
new file mode 100644
index 0000000000000..d54ca370a1822
--- /dev/null
+++ b/decidim-blogs/app/presenters/decidim/blogs/official_author_presenter.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    #
+    # A dummy presenter to abstract out the author of an official post.
+    #
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
+      def name
+        I18n.t("decidim.blogs.models.post.fields.official_blog_post")
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/app/presenters/decidim/blogs/post_presenter.rb b/decidim-blogs/app/presenters/decidim/blogs/post_presenter.rb
index cf9d8e5ad7245..39c9cf3b1833d 100644
--- a/decidim-blogs/app/presenters/decidim/blogs/post_presenter.rb
+++ b/decidim-blogs/app/presenters/decidim/blogs/post_presenter.rb
@@ -7,7 +7,13 @@ module Blogs
     #
     class PostPresenter < SimpleDelegator
       def author
-        @author ||= Decidim::UserPresenter.new(super)
+        @author ||= if official?
+                      Decidim::Blogs::OfficialAuthorPresenter.new
+                    elsif user_group?
+                      Decidim::UserGroupPresenter.new(super)
+                    else
+                      Decidim::UserPresenter.new(super)
+                    end
       end
     end
   end
diff --git a/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb b/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb
index 22d1978db3af0..f40f9db116f45 100644
--- a/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb
@@ -3,16 +3,16 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
-    <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+
       <div class="field">
-        <%= user_group_select_field form, :user_group_id, label: t("decidim.blogs.actions.user_group_id") %>
+        <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
       </div>
-    <% end %>
+
     <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
     <div class="row column">
-      <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.blogs.admin") %>
+      <%= form.translated :editor, :body, toolbar: :full, lines: 30 %>
     </div>
   </div>
 </div>
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
index b29ef1ae3a6ba..7747fa34b0429 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/_posts.html.erb
@@ -12,7 +12,8 @@
           </h2>
           <% end %>
           <div class="card__author">
-            <%= cell "decidim/author", present(post.author), from: post, has_actions: true %>
+            <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
+            <%= cell "decidim/author", post_presenter.author, from: post, has_actions: true %>
           </div>
         </div>
         <%= decidim_sanitize_editor post_description(post) %>
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
index f4074e131d476..44fe3ed8fa580 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
@@ -23,7 +23,9 @@
     <% end %>
   </div>
   <h2 class="heading2"><%= translated_attribute post.title %></h2>
-  <%= cell "decidim/author", present(post.author), from: post %>
+
+  <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
+  <%= cell "decidim/author", post_presenter.author, from: post %>
 </div>
 <div class="row">
   <% if show_endorsements_card? %>
diff --git a/decidim-blogs/config/locales/ar.yml b/decidim-blogs/config/locales/ar.yml
index e6ef3efc24c97..df4f409827646 100644
--- a/decidim-blogs/config/locales/ar.yml
+++ b/decidim-blogs/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     models:
@@ -14,16 +15,14 @@ ar:
   decidim:
     blogs:
       actions:
+        author_id: إنشاء مشاركة كـ
         confirm_destroy: هل أنت متأكد أنك تريد حذ� هذه المشاركة؟
         destroy: حذ�
         edit: تعديل
         new: منشور جديد
         title: أ�عال
-        user_group_id: إنشاء مشاركة كـ
       admin:
         models:
-          components:
-            body: الجسم
           post:
             name: بريد
         posts:
@@ -51,7 +50,6 @@ ar:
             author: مؤل�
             body: الجسم
             created_at: أنشئت �ي
-            title: عنوان
       posts:
         show:
           back: العودة إلى القائمة
diff --git a/decidim-blogs/config/locales/bg.yml b/decidim-blogs/config/locales/bg.yml
index e7ed14e885d1a..3b89e84a44541 100644
--- a/decidim-blogs/config/locales/bg.yml
+++ b/decidim-blogs/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     models:
diff --git a/decidim-blogs/config/locales/ca.yml b/decidim-blogs/config/locales/ca.yml
index 43863a6ecf3a5..db437dcb7d78c 100644
--- a/decidim-blogs/config/locales/ca.yml
+++ b/decidim-blogs/config/locales/ca.yml
@@ -1,5 +1,12 @@
+---
 ca:
   activemodel:
+    attributes:
+      post:
+        body: Cos del text
+        decidim_author_id: Autoria
+        published_at: Hora de publicació
+        title: Títol
     models:
       decidim/blogs/create_post_event: Nova publicació al blog
   activerecord:
@@ -10,16 +17,14 @@ ca:
   decidim:
     blogs:
       actions:
-        confirm_destroy: Estàs segura que vols eliminar aquesta publicació?
+        author_id: Crear publicació com
+        confirm_destroy: Segur que vols eliminar aquesta publicació?
         destroy: Suprimeix
         edit: Edita
         new: Nova publicació
         title: Accions
-        user_group_id: Crear publicació com
       admin:
         models:
-          components:
-            body: Cos
           post:
             name: Publicar
         posts:
@@ -39,6 +44,11 @@ ca:
           update:
             invalid: S'ha produït un error en guardar la publicació.
             success: S'ha desat la publicació correctament
+      admin_log:
+        post:
+          create: "%{user_name} ha creat el post %{resource_name} al blog de %{space_name}"
+          delete: "%{user_name} ha eliminat el post %{resource_name} del blog de %{space_name}"
+          update: "%{user_name} ha actualitzat el post %{resource_name} en el blog de %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nova publicació a %{link}</span>"
       models:
@@ -47,7 +57,8 @@ ca:
             author: Autora
             body: Cos
             created_at: Creat el
-            title: títol
+            official_blog_post: Post oficial
+            title: Títol
       posts:
         show:
           back: Tornar al llistat
@@ -60,8 +71,10 @@ ca:
     components:
       blogs:
         actions:
+          comment: Comentar
           create: Crear
           destroy: Esborrar
+          endorse: Adherir-se
           update: Actualitzar
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/cs.yml b/decidim-blogs/config/locales/cs.yml
index 2b6c4648c2300..2dfdd3d874661 100644
--- a/decidim-blogs/config/locales/cs.yml
+++ b/decidim-blogs/config/locales/cs.yml
@@ -1,5 +1,12 @@
+---
 cs:
   activemodel:
+    attributes:
+      post:
+        body: Tělo zprávy
+        decidim_author_id: Autor
+        published_at: Čas zveřejnění
+        title: Název
     models:
       decidim/blogs/create_post_event: Nový blogový příspěvek
   activerecord:
@@ -12,16 +19,14 @@ cs:
   decidim:
     blogs:
       actions:
+        author_id: Vytvořit příspěvek jako
         confirm_destroy: Opravdu chcete tento příspěvek smazat?
         destroy: Smazat
         edit: Upravit
         new: Nový příspěvek
         title: Akce
-        user_group_id: Vytvořit příspěvek jako
       admin:
         models:
-          components:
-            body: Tělo
           post:
             name: Příspěvek
         posts:
@@ -41,6 +46,11 @@ cs:
           update:
             invalid: Při ukládání příspěvku došlo k chybám.
             success: Příspěvek byl úspěšně uložen
+      admin_log:
+        post:
+          create: "%{user_name} vytvořil příspěvek %{resource_name} v %{space_name}"
+          delete: "%{user_name} odstranil příspěvek %{resource_name} z %{space_name}"
+          update: "%{user_name} aktualizoval příspěvek %{resource_name} v %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nový příspěvek v %{link}</span>"
       models:
@@ -49,7 +59,8 @@ cs:
             author: Autor
             body: Tělo
             created_at: Vytvořeno v
-            title: titulek
+            official_blog_post: Oficiální příspěvek
+            title: Název
       posts:
         show:
           back: Zpět na seznam
@@ -62,8 +73,10 @@ cs:
     components:
       blogs:
         actions:
+          comment: Komentář
           create: Vytvořit
           destroy: Smazat
+          endorse: Schválit
           update: Aktualizovat
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/de.yml b/decidim-blogs/config/locales/de.yml
index 7a8ab31eabfeb..ca6848f97a155 100644
--- a/decidim-blogs/config/locales/de.yml
+++ b/decidim-blogs/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     models:
@@ -10,16 +11,14 @@ de:
   decidim:
     blogs:
       actions:
+        author_id: Beitrag erstellen als
         confirm_destroy: Möchten Sie diesen Beitrag wirklich löschen?
         destroy: Löschen
         edit: Bearbeiten
         new: Neuer Beitrag
         title: Aktionen
-        user_group_id: Beitrag erstellen als
       admin:
         models:
-          components:
-            body: Haupttext
           post:
             name: Post
         posts:
@@ -39,6 +38,11 @@ de:
           update:
             invalid: Beim Speichern des Posts sind Fehler aufgetreten.
             success: Beitrag wurde erfolgreich gespeichert
+      admin_log:
+        post:
+          create: "%{user_name} hat den Blogpost %{resource_name} in %{space_name} erstellt"
+          delete: "%{user_name} hat den Blogpost %{resource_name} in %{space_name} gelöscht"
+          update: "%{user_name} hat den Blogpost %{resource_name} in %{space_name} aktualisiert"
       last_activity:
         new_post_at_html: "<span>Neuer Beitrag bei %{link}</span>"
       models:
@@ -47,7 +51,7 @@ de:
             author: Autor
             body: Haupttext
             created_at: Hergestellt in
-            title: Titel
+            official_blog_post: Offizieller Post
       posts:
         show:
           back: Zurück zur Liste
diff --git a/decidim-blogs/config/locales/el.yml b/decidim-blogs/config/locales/el.yml
index 6b9da01312b36..0e8872f9a21c5 100644
--- a/decidim-blogs/config/locales/el.yml
+++ b/decidim-blogs/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     models:
@@ -10,16 +11,14 @@ el:
   decidim:
     blogs:
       actions:
+        author_id: Δημιου�γία ανά�τησης ως
         confirm_destroy: Είστε βέβαιοι ότι θέλετε να διαγ�άψετε αυτήν τη δημοσίευση;
         destroy: Διαγ�αφή
         edit: Επεξε�γασία
         new: �έα δημοσίευση
         title: Ενέ�γειες
-        user_group_id: Δημιου�γία ανά�τησης ως
       admin:
         models:
-          components:
-            body: Σώμα
           post:
             name: Δημοσίευση
         posts:
@@ -47,7 +46,6 @@ el:
             author: Συντάκτης
             body: Σώμα
             created_at: Δημιου�γήθηκε στις
-            title: τίτλος
       posts:
         show:
           back: Επιστ�οφή στη λίστα
diff --git a/decidim-blogs/config/locales/en.yml b/decidim-blogs/config/locales/en.yml
index 297b1debad7b7..37b2105ed540a 100644
--- a/decidim-blogs/config/locales/en.yml
+++ b/decidim-blogs/config/locales/en.yml
@@ -1,6 +1,12 @@
 ---
 en:
   activemodel:
+    attributes:
+      post:
+        body: Body
+        decidim_author_id: Author
+        published_at: Publish time
+        title: Title
     models:
       decidim/blogs/create_post_event: New blog post
   activerecord:
@@ -11,16 +17,14 @@ en:
   decidim:
     blogs:
       actions:
+        author_id: Create post as
         confirm_destroy: Are you sure you want to delete this post?
         destroy: Delete
         edit: Edit
         new: New post
         title: Actions
-        user_group_id: Create post as
       admin:
         models:
-          components:
-            body: Body
           post:
             name: Post
         posts:
@@ -40,6 +44,11 @@ en:
           update:
             invalid: There was a problem saving the post.
             success: Post successfully saved
+      admin_log:
+        post:
+          create: "%{user_name} created the %{resource_name} blog post in %{space_name}"
+          delete: "%{user_name} deleted the %{resource_name} blog post from %{space_name}"
+          update: "%{user_name} updated the %{resource_name} blog post in %{space_name}"
       last_activity:
         new_post_at_html: "<span>New post at %{link}</span>"
       models:
@@ -48,7 +57,8 @@ en:
             author: Author
             body: Body
             created_at: Created at
-            title: title
+            official_blog_post: Official post
+            title: Title
       posts:
         show:
           back: Back to list
@@ -61,8 +71,10 @@ en:
     components:
       blogs:
         actions:
+          comment: Comment
           create: Create
           destroy: Delete
+          endorse: Endorse
           update: Update
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/es-MX.yml b/decidim-blogs/config/locales/es-MX.yml
index cd155a6e03c76..0c4bf97f275e5 100644
--- a/decidim-blogs/config/locales/es-MX.yml
+++ b/decidim-blogs/config/locales/es-MX.yml
@@ -1,5 +1,12 @@
+---
 es-MX:
   activemodel:
+    attributes:
+      post:
+        body: Cuerpo del texto
+        decidim_author_id: Autoria
+        published_at: Hora de publicación
+        title: Título
     models:
       decidim/blogs/create_post_event: Nueva publicación del blog
   activerecord:
@@ -10,16 +17,14 @@ es-MX:
   decidim:
     blogs:
       actions:
+        author_id: Crear publicación como
         confirm_destroy: '¿Seguro que quieres eliminar esta publicación?'
         destroy: Borrar
         edit: Editar
         new: Nueva publicación
         title: Comportamiento
-        user_group_id: Crear publicación como
       admin:
         models:
-          components:
-            body: Cuerpo
           post:
             name: Enviar
         posts:
@@ -39,6 +44,11 @@ es-MX:
           update:
             invalid: Ha habido errores al guardar la publicación.
             success: Publicación guardada con éxito
+      admin_log:
+        post:
+          create: "%{user_name} creó el post %{resource_name} en el blog de %{space_name}"
+          delete: "%{user_name} ha eliminado el post %{resource_name} en el blog de %{space_name}"
+          update: "%{user_name} ha actualizado el post %{resource_name} en el blog de %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nueva publicación en %{link}</span>"
       models:
@@ -47,7 +57,8 @@ es-MX:
             author: Autoría
             body: Cuerpo
             created_at: Creado en
-            title: título
+            official_blog_post: Post oficial
+            title: Título
       posts:
         show:
           back: Volver al listado
@@ -60,8 +71,10 @@ es-MX:
     components:
       blogs:
         actions:
+          comment: Comentar
           create: Crear
           destroy: Borrar
+          endorse: Adherirse
           update: Actualizar
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/es-PY.yml b/decidim-blogs/config/locales/es-PY.yml
index 8a4c7a7fa2749..6b8cbf94a75fb 100644
--- a/decidim-blogs/config/locales/es-PY.yml
+++ b/decidim-blogs/config/locales/es-PY.yml
@@ -1,5 +1,12 @@
+---
 es-PY:
   activemodel:
+    attributes:
+      post:
+        body: Cuerpo del texto
+        decidim_author_id: Autoria
+        published_at: Hora de publicación
+        title: Título
     models:
       decidim/blogs/create_post_event: Nueva publicación del blog
   activerecord:
@@ -10,16 +17,14 @@ es-PY:
   decidim:
     blogs:
       actions:
+        author_id: Crear publicación como
         confirm_destroy: '¿Seguro que quieres eliminar esta publicación?'
         destroy: Borrar
         edit: Editar
         new: Nueva publicación
         title: Comportamiento
-        user_group_id: Crear publicación como
       admin:
         models:
-          components:
-            body: Cuerpo
           post:
             name: Enviar
         posts:
@@ -39,6 +44,11 @@ es-PY:
           update:
             invalid: Ha habido errores al guardar la publicación.
             success: Publicación guardada con éxito
+      admin_log:
+        post:
+          create: "%{user_name} creó el post %{resource_name} en el blog de %{space_name}"
+          delete: "%{user_name} ha eliminado el post %{resource_name} en el blog de %{space_name}"
+          update: "%{user_name} ha actualizado el post %{resource_name} en el blog de %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nueva publicación en %{link}</span>"
       models:
@@ -47,7 +57,8 @@ es-PY:
             author: Autoría
             body: Cuerpo
             created_at: Creado en
-            title: título
+            official_blog_post: Post oficial
+            title: Título
       posts:
         show:
           back: Volver al listado
@@ -60,8 +71,10 @@ es-PY:
     components:
       blogs:
         actions:
+          comment: Comentar
           create: Crear
           destroy: Borrar
+          endorse: Adherirse
           update: Actualizar
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/es.yml b/decidim-blogs/config/locales/es.yml
index 74510d730da38..254cf4b4026a7 100644
--- a/decidim-blogs/config/locales/es.yml
+++ b/decidim-blogs/config/locales/es.yml
@@ -1,5 +1,12 @@
+---
 es:
   activemodel:
+    attributes:
+      post:
+        body: Cuerpo del texto
+        decidim_author_id: Autoria
+        published_at: Hora de publicación
+        title: Título
     models:
       decidim/blogs/create_post_event: Nueva publicación en el blog
   activerecord:
@@ -10,16 +17,14 @@ es:
   decidim:
     blogs:
       actions:
-        confirm_destroy: '¿Estás segura que quieres eliminar esta publicación?'
+        author_id: Crear publicación como
+        confirm_destroy: '¿Seguro que quieres eliminar esta publicación?'
         destroy: Borrar
         edit: Editar
         new: Nueva publicación
         title: Acciones
-        user_group_id: Crear publicación como
       admin:
         models:
-          components:
-            body: Cuerpo
           post:
             name: Publicar
         posts:
@@ -39,6 +44,11 @@ es:
           update:
             invalid: Se ha producido un error al guardar la publicación.
             success: Se ha guardado la publicación correctamente
+      admin_log:
+        post:
+          create: "%{user_name} creó el post %{resource_name} en el blog de %{space_name}"
+          delete: "%{user_name} ha eliminado el post %{resource_name} en el blog de %{space_name}"
+          update: "%{user_name} ha actualizado el post %{resource_name} en el blog de %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nueva publicación en %{link}</span>"
       models:
@@ -47,7 +57,8 @@ es:
             author: Autora
             body: Cuerpo
             created_at: Creado en
-            title: título
+            official_blog_post: Post oficial
+            title: Título
       posts:
         show:
           back: Volver al listado
@@ -60,8 +71,10 @@ es:
     components:
       blogs:
         actions:
+          comment: Comentar
           create: Crear
           destroy: Borrar
+          endorse: Adherirse
           update: Actualizar
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/eu.yml b/decidim-blogs/config/locales/eu.yml
index 8e5714d118b86..5fdd9da501944 100644
--- a/decidim-blogs/config/locales/eu.yml
+++ b/decidim-blogs/config/locales/eu.yml
@@ -1,85 +1,98 @@
+---
 eu:
   activemodel:
+    attributes:
+      post:
+        body: Testua
+        decidim_author_id: Egilea
+        published_at: Argitaratze data
+        title: Izena
     models:
       decidim/blogs/create_post_event: Blogeko post berria
   activerecord:
     models:
       decidim/blogs/post:
-        one: Post
-        other: Mezuak
+        one: Argitalpena
+        other: Argitalpenak
   decidim:
     blogs:
       actions:
-        confirm_destroy: Ziur mezua ezabatu nahi duzula?
+        author_id: Sortu argitalpena hau bezala
+        confirm_destroy: Ziur zaude post hau argitalpen ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
         new: Post berria
         title: Ekintzak
-        user_group_id: Sortu argitalpena hau bezala
       admin:
         models:
-          components:
-            body: Gorputzeko
           post:
-            name: Post
+            name: Argitalpena
         posts:
           create:
-            invalid: Arazo bat izan da post hau sortzeko
-            success: Mezua ondo sortu da
+            invalid: Arazo bat izan da sarrera hau sortzeko
+            success: Argitalpena ondo sortu da
           destroy:
             success: Mezua ondo ezabatu da
           edit:
-            save: eguneratzearen
+            save: Eguneratu
             title: Editatu argitalpena
           index:
-            title: Mezuak
+            title: Argitalpenak
           new:
             create: Sortu
-            title: Sortu mezua
+            title: Sortu argitalpena
           update:
-            invalid: Erroreak gertatu dira mezua gordetzean.
-            success: Mezua ondo gorde da
+            invalid: Akatsen bat gertatu da mezua gordetzean.
+            success: Sarrera ondo gorde da
+      admin_log:
+        post:
+          create: "%{user_name} k %{resource_name} blogeko argitalpena sortu du %{space_name} espazioan"
+          delete: "%{user_name} k %{resource_name} blogeko argitalpena ezabatu du %{space_name} espazioan"
+          update: "%{user_name} k %{resource_name} blogeko argitalpena eguneratu egin da %{space_name} espazioan"
       last_activity:
-        new_post_at_html: "<span>Post berria %{link}</span>"
+        new_post_at_html: "<span>Post berria %{link}-ean</span>"
       models:
         post:
           fields:
             author: Egilea
-            body: Gorputzeko
-            created_at: Sortutako at
+            body: Testua
+            created_at: Sortze-data
+            official_blog_post: Blogeko argitalpen ofiziala
             title: Izenburua
       posts:
         show:
           back: Itzuli zerrendara
           comments: Iruzkinak
-          view: ikusi
+          view: Ikusi
         sidebar_blog:
           comments: iruzkinak
           most_commented_posts: Gehien iruzkinatutako mezu
-      read_more: Irakurri gehiago
+      read_more: Geihago irakurri
     components:
       blogs:
         actions:
+          comment: Iruzkindu
           create: Sortu
           destroy: Ezabatu
+          endorse: Atxiki
           update: Eguneratu
         name: Bloga
         settings:
           global:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 defektuz konfigurazioa mantendu nahi baduzu)
+            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eutsi nahi badiozu)
           step:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_blocked: Iruzkinak blokeatuta
             endorsements_blocked: Atxikimenduak blokeatuta
             endorsements_enabled: Atxikimenduak gaituta
     events:
       blogs:
         post_created:
-          email_intro: '"%{resource_title}" mezua "%{participatory_space_title}" argitaratzen ari zarela jarraitzen ari zara.'
+          email_intro: '"%{resource_title}" argitalpena jarraitzen ari zaren "%{participatory_space_title}" espazioan argitaratu da.'
           email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Aurreko estekan utzi ahal diozu jarraitzeari.
-          email_subject: '%{participatory_space_title} argitaratutako mezu berria'
+          email_subject: Argitalpen berria %{participatory_space_title} espazioan
           notification_title: <a href="%{resource_path}">%{resource_title}</a> posta %{participatory_space_title} argitaratu da
     statistics:
       posts_count: Argitalpenak
diff --git a/decidim-blogs/config/locales/fi-plain.yml b/decidim-blogs/config/locales/fi-plain.yml
index 44d40704da52e..3d6b27f8bb8a3 100644
--- a/decidim-blogs/config/locales/fi-plain.yml
+++ b/decidim-blogs/config/locales/fi-plain.yml
@@ -1,5 +1,12 @@
+---
 fi-pl:
   activemodel:
+    attributes:
+      post:
+        body: Sisältöteksti
+        decidim_author_id: Laatija
+        published_at: Julkaisuaika
+        title: Otsikko
     models:
       decidim/blogs/create_post_event: Uusi blogiartikkeli
   activerecord:
@@ -10,16 +17,14 @@ fi-pl:
   decidim:
     blogs:
       actions:
+        author_id: Luo artikkeli käyttäjänä
         confirm_destroy: Haluatko varmasti poistaa tämän artikkelin?
         destroy: Poista
         edit: Muokkaa
         new: Uusi artikkeli
         title: Toiminnot
-        user_group_id: Luo artikkeli käyttäjänä
       admin:
         models:
-          components:
-            body: Leipäteksti
           post:
             name: Artikkeli
         posts:
@@ -39,6 +44,11 @@ fi-pl:
           update:
             invalid: Artikkelin tallennuksessa tapahtui virheitä.
             success: Artikkeli tallennettu onnistuneesti
+      admin_log:
+        post:
+          create: "%{user_name} loi blogikirjoituksen %{resource_name} tilassa %{space_name}"
+          delete: "%{user_name} poisti blogikirjoituksen %{resource_name} tilasta %{space_name}"
+          update: "%{user_name} päivitti blogikirjoitusta %{resource_name} tilassa %{space_name}"
       last_activity:
         new_post_at_html: "<span>Uusi artikkeli osoitteessa %{link}</span>"
       models:
@@ -47,7 +57,8 @@ fi-pl:
             author: Kirjoittaja
             body: Leipäteksti
             created_at: Luotu
-            title: otsikko
+            official_blog_post: Virallinen artikkeli
+            title: Otsikko
       posts:
         show:
           back: Takaisin listaan
@@ -60,8 +71,10 @@ fi-pl:
     components:
       blogs:
         actions:
+          comment: Kommentointi
           create: Luo
           destroy: Poista
+          endorse: Suosittelu
           update: Päivitä
         name: Blogi
         settings:
diff --git a/decidim-blogs/config/locales/fi.yml b/decidim-blogs/config/locales/fi.yml
index 673bf62924101..72b3cd5087dea 100644
--- a/decidim-blogs/config/locales/fi.yml
+++ b/decidim-blogs/config/locales/fi.yml
@@ -1,5 +1,12 @@
+---
 fi:
   activemodel:
+    attributes:
+      post:
+        body: Sisältöteksti
+        decidim_author_id: Laatija
+        published_at: Julkaisuaika
+        title: Otsikko
     models:
       decidim/blogs/create_post_event: Uusi blogiartikkeli
   activerecord:
@@ -10,16 +17,14 @@ fi:
   decidim:
     blogs:
       actions:
+        author_id: Luo artikkeli käyttäjänä
         confirm_destroy: Haluatko varmasti poistaa tämän artikkelin?
         destroy: Poista
         edit: Muokkaa
         new: Uusi artikkeli
         title: Toiminnot
-        user_group_id: Luo artikkeli käyttäjänä
       admin:
         models:
-          components:
-            body: Leipäteksti
           post:
             name: Artikkeli
         posts:
@@ -39,6 +44,11 @@ fi:
           update:
             invalid: Artikkelin tallennus epäonnistui.
             success: Artikkeli tallennus onnistui
+      admin_log:
+        post:
+          create: "%{user_name} loi blogikirjoituksen %{resource_name} tilassa %{space_name}"
+          delete: "%{user_name} poisti blogikirjoituksen %{resource_name} tilasta %{space_name}"
+          update: "%{user_name} päivitti blogikirjoitusta %{resource_name} tilassa %{space_name}"
       last_activity:
         new_post_at_html: "<span>Uusi artikkeli osoitteessa %{link}</span>"
       models:
@@ -47,7 +57,8 @@ fi:
             author: Laatija
             body: Leipäteksti
             created_at: Luotu
-            title: otsikko
+            official_blog_post: Virallinen artikkeli
+            title: Otsikko
       posts:
         show:
           back: Takaisin listaan
@@ -60,8 +71,10 @@ fi:
     components:
       blogs:
         actions:
+          comment: Kommentointi
           create: Luo
           destroy: Poista
+          endorse: Suosittelu
           update: Päivitä
         name: Blogi
         settings:
diff --git a/decidim-blogs/config/locales/fr-CA.yml b/decidim-blogs/config/locales/fr-CA.yml
index 60dfce02eb653..9ba9ee84e6e62 100644
--- a/decidim-blogs/config/locales/fr-CA.yml
+++ b/decidim-blogs/config/locales/fr-CA.yml
@@ -1,5 +1,12 @@
+---
 fr-CA:
   activemodel:
+    attributes:
+      post:
+        body: Corps du texte
+        decidim_author_id: Auteur
+        published_at: Date de publication
+        title: Titre
     models:
       decidim/blogs/create_post_event: Nouvel article
   activerecord:
@@ -10,16 +17,14 @@ fr-CA:
   decidim:
     blogs:
       actions:
+        author_id: Créer un article comme
         confirm_destroy: Êtes-vous certain de vouloir supprimer cet article ?
         destroy: Supprimer
         edit: Modifier
         new: Nouvel article
         title: Actions
-        user_group_id: Créer un article comme
       admin:
         models:
-          components:
-            body: Corps du texte
           post:
             name: Publier
         posts:
@@ -39,6 +44,11 @@ fr-CA:
           update:
             invalid: Il y a eu des erreurs lors de l'enregistrement de l'article.
             success: Article enregistré avec succès
+      admin_log:
+        post:
+          create: "%{user_name} a créé l'article de blog %{resource_name} dans %{space_name}"
+          delete: "%{user_name} a supprimé l'article de blog %{resource_name} dans %{space_name}"
+          update: "%{user_name} a mis à jour l'article de blog %{resource_name} dans %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nouvel article à %{link}</span>"
       models:
@@ -47,7 +57,8 @@ fr-CA:
             author: Auteur
             body: Corps du texte
             created_at: Créé à
-            title: titre
+            official_blog_post: Article officiel
+            title: Titre
       posts:
         show:
           back: Retour à la liste
@@ -60,8 +71,10 @@ fr-CA:
     components:
       blogs:
         actions:
+          comment: Commenter
           create: Créer
           destroy: Supprimer
+          endorse: Soutenir
           update: Mettre à jour
         name: Actualités
         settings:
diff --git a/decidim-blogs/config/locales/fr.yml b/decidim-blogs/config/locales/fr.yml
index 7afc3749be257..ca3b765fc0c57 100644
--- a/decidim-blogs/config/locales/fr.yml
+++ b/decidim-blogs/config/locales/fr.yml
@@ -1,5 +1,12 @@
+---
 fr:
   activemodel:
+    attributes:
+      post:
+        body: Corps du texte
+        decidim_author_id: Auteur
+        published_at: Date de publication
+        title: Titre
     models:
       decidim/blogs/create_post_event: Nouvel article
   activerecord:
@@ -10,16 +17,14 @@ fr:
   decidim:
     blogs:
       actions:
+        author_id: Créer un article en tant que
         confirm_destroy: Êtes-vous certain de vouloir supprimer cet article ?
         destroy: Supprimer
         edit: Modifier
         new: Nouvel article
         title: Actions
-        user_group_id: Créer un article en tant que
       admin:
         models:
-          components:
-            body: Corps du texte
           post:
             name: Publier
         posts:
@@ -39,6 +44,11 @@ fr:
           update:
             invalid: Il y a eu des erreurs lors de l'enregistrement de l'article.
             success: Article enregistré avec succès
+      admin_log:
+        post:
+          create: "%{user_name} a créé l'article de blog %{resource_name} dans %{space_name}"
+          delete: "%{user_name} a supprimé l'article de blog %{resource_name} dans %{space_name}"
+          update: "%{user_name} a mis à jour l'article de blog %{resource_name} dans %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nouvel article à %{link}</span>"
       models:
@@ -47,7 +57,8 @@ fr:
             author: Auteur
             body: Corps du texte
             created_at: Créé à
-            title: titre
+            official_blog_post: Article officiel
+            title: Titre
       posts:
         show:
           back: Retour à la liste
@@ -60,8 +71,10 @@ fr:
     components:
       blogs:
         actions:
+          comment: Commenter
           create: Créer
           destroy: Supprimer
+          endorse: Soutenir
           update: Mettre à jour
         name: Actualités
         settings:
diff --git a/decidim-blogs/config/locales/ga-IE.yml b/decidim-blogs/config/locales/ga-IE.yml
index 61e3be9df885b..d5a20266867b8 100644
--- a/decidim-blogs/config/locales/ga-IE.yml
+++ b/decidim-blogs/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activerecord:
     models:
@@ -16,8 +17,6 @@ ga:
         title: Gníomhartha
       admin:
         models:
-          components:
-            body: Corp
           post:
             name: Postáil
         posts:
@@ -34,7 +33,6 @@ ga:
           fields:
             author: Údar
             body: Corp
-            title: teideal
       posts:
         show:
           comments: Tráchtanna
diff --git a/decidim-blogs/config/locales/gl.yml b/decidim-blogs/config/locales/gl.yml
index 9b607520d0889..146e7d03cf6cc 100644
--- a/decidim-blogs/config/locales/gl.yml
+++ b/decidim-blogs/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     models:
@@ -10,16 +11,14 @@ gl:
   decidim:
     blogs:
       actions:
+        author_id: Crear publicación como
         confirm_destroy: Tes a certeza de querer eliminar esta publicación?
         destroy: Eliminar
         edit: Editar
         new: Nova publicación
         title: Accións
-        user_group_id: Crear publicación como
       admin:
         models:
-          components:
-            body: Corpo
           post:
             name: Publicación
         posts:
@@ -47,7 +46,6 @@ gl:
             author: Autor
             body: Corpo
             created_at: Creado o
-            title: título
       posts:
         show:
           back: Volver á listaxe
diff --git a/decidim-blogs/config/locales/hu.yml b/decidim-blogs/config/locales/hu.yml
index ced3c553f7eab..530fa7d16565b 100644
--- a/decidim-blogs/config/locales/hu.yml
+++ b/decidim-blogs/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     models:
@@ -10,16 +11,14 @@ hu:
   decidim:
     blogs:
       actions:
+        author_id: Bejegyzés létrehozása
         confirm_destroy: Biztos, hogy törlöd ezt a bejegyzést?
         destroy: Törlés
         edit: Szerkesztés
         new: Új bejegyzés
         title: Műveletek
-        user_group_id: Bejegyzés létrehozása
       admin:
         models:
-          components:
-            body: Szöveg
           post:
             name: Bejegyzés
         posts:
@@ -39,6 +38,11 @@ hu:
           update:
             invalid: Hiba történt a bejegyzés mentése során.
             success: Bejegyzés mentése sikeres
+      admin_log:
+        post:
+          create: "%{user_name} létrehozta a(z) %{resource_name} blogposztot itt: %{space_name}"
+          delete: "%{user_name} törölte a(z) %{resource_name} blogposztot itt: %{space_name}"
+          update: "%{user_name} frissítette a(z) %{resource_name} blogposztot itt: %{space_name}"
       last_activity:
         new_post_at_html: "<span>Új hozzászólás %{link}</span>kor"
       models:
@@ -47,7 +51,7 @@ hu:
             author: Szerző
             body: Szöveg
             created_at: 'Létrehozva:'
-            title: cím
+            official_blog_post: Hivatalos bejegyzés
       posts:
         show:
           back: Vissza a listához
diff --git a/decidim-blogs/config/locales/id-ID.yml b/decidim-blogs/config/locales/id-ID.yml
index fbc03d4fb5afa..886f728af35d7 100644
--- a/decidim-blogs/config/locales/id-ID.yml
+++ b/decidim-blogs/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     models:
@@ -16,8 +17,6 @@ id:
         title: Tindakan
       admin:
         models:
-          components:
-            body: Tubuh
           post:
             name: Pos
         posts:
@@ -44,7 +43,6 @@ id:
             author: Penulis
             body: Tubuh
             created_at: Dibuat di
-            title: judul
       posts:
         show:
           view: Melihat
diff --git a/decidim-blogs/config/locales/is-IS.yml b/decidim-blogs/config/locales/is-IS.yml
index 90148beff76ed..eac143ab540fa 100644
--- a/decidim-blogs/config/locales/is-IS.yml
+++ b/decidim-blogs/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     blogs:
       actions:
@@ -8,8 +9,6 @@ is-IS:
         title: Aðgerðir
       admin:
         models:
-          components:
-            body: Líkami
           post:
             name: Post
         posts:
@@ -30,7 +29,6 @@ is-IS:
             author: Höfundur
             body: Líkami
             created_at: Búið til á
-            title: titill
       posts:
         sidebar_blog:
           comments: athugasemdir
diff --git a/decidim-blogs/config/locales/it.yml b/decidim-blogs/config/locales/it.yml
index 3ec1c80954eb3..9a9593c763bdd 100644
--- a/decidim-blogs/config/locales/it.yml
+++ b/decidim-blogs/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     models:
@@ -10,16 +11,14 @@ it:
   decidim:
     blogs:
       actions:
+        author_id: Crea post come
         confirm_destroy: Sei sicuro di voler eliminare questo post?
         destroy: Elimina
         edit: Modifica
         new: Nuovo post
         title: Azioni
-        user_group_id: Crea post come
       admin:
         models:
-          components:
-            body: Corpo
           post:
             name: Inviare
         posts:
@@ -47,7 +46,6 @@ it:
             author: Autore
             body: Corpo
             created_at: Creato a
-            title: titolo
       posts:
         show:
           back: Torna alla lista
diff --git a/decidim-blogs/config/locales/ja.yml b/decidim-blogs/config/locales/ja.yml
index e011264704f42..1429ac0b2a808 100644
--- a/decidim-blogs/config/locales/ja.yml
+++ b/decidim-blogs/config/locales/ja.yml
@@ -1,5 +1,12 @@
+---
 ja:
   activemodel:
+    attributes:
+      post:
+        body: 本文
+        decidim_author_id: 作�者
+        published_at: 公開時刻
+        title: タイトル
     models:
       decidim/blogs/create_post_event: 新��ブログ投稿
   activerecord:
@@ -9,16 +16,14 @@ ja:
   decidim:
     blogs:
       actions:
+        author_id: 次�よ��投稿を作�
         confirm_destroy: ��投稿を削除��もよ������？
         destroy: 削除
         edit: 編集
         new: 新�投稿
         title: アクション
-        user_group_id: 次�よ��投稿を作�
       admin:
         models:
-          components:
-            body: 本文
           post:
             name: 投稿
         posts:
@@ -38,6 +43,11 @@ ja:
           update:
             invalid: 投稿��存中��題�発生����。
             success: 投稿を�存����
+      admin_log:
+        post:
+          create: "%{user_name} � %{space_name} �ブログ投稿 %{resource_name} を作�����"
+          delete: "%{user_name} �ブログ投稿 %{resource_name} を %{space_name} �ら削除����"
+          update: "%{user_name} � %{space_name} �ブログ投稿 %{resource_name} を更新����"
       last_activity:
         new_post_at_html: "<span> %{link}�新��投稿</span>"
       models:
@@ -46,6 +56,7 @@ ja:
             author: 作�者
             body: 本文
             created_at: 作�日時
+            official_blog_post: 公��スト
             title: タイトル
       posts:
         show:
@@ -59,8 +70,10 @@ ja:
     components:
       blogs:
         actions:
+          comment: コメント
           create: 作�
           destroy: 削除
+          endorse: オススメ
           update: æ›´æ–°
         name: ブログ
         settings:
diff --git a/decidim-blogs/config/locales/ka-GE.yml b/decidim-blogs/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-blogs/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-blogs/config/locales/lb.yml b/decidim-blogs/config/locales/lb.yml
index 42d5337c21e2c..5a65b967973e6 100644
--- a/decidim-blogs/config/locales/lb.yml
+++ b/decidim-blogs/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     models:
@@ -10,16 +11,14 @@ lb:
   decidim:
     blogs:
       actions:
+        author_id: Beitrag erstellen als
         confirm_destroy: Möchten Sie diesen Beitrag wirklich löschen?
         destroy: Löschen
         edit: Bearbeiten
         new: Neuer Beitrag
         title: Aktionen
-        user_group_id: Beitrag erstellen als
       admin:
         models:
-          components:
-            body: Haupttext
           post:
             name: Post
         posts:
@@ -47,7 +46,6 @@ lb:
             author: Autor
             body: Haupttext
             created_at: Hergestellt in
-            title: Titel
       posts:
         show:
           back: Zurück zur Liste
diff --git a/decidim-blogs/config/locales/lt.yml b/decidim-blogs/config/locales/lt.yml
index cb5afcbc04b6c..2379ece5b475e 100644
--- a/decidim-blogs/config/locales/lt.yml
+++ b/decidim-blogs/config/locales/lt.yml
@@ -1,5 +1,9 @@
+---
 lt:
   activemodel:
+    attributes:
+      post:
+        published_at: Paskelbimo laikas
     models:
       decidim/blogs/create_post_event: Naujas tinklaraš�io įrašas
   activerecord:
@@ -12,16 +16,14 @@ lt:
   decidim:
     blogs:
       actions:
+        author_id: Sukurti įrašą kaip
         confirm_destroy: Ar tikrai norite ištrinti šį įrašą?
         destroy: IÅ¡trinti
         edit: Redaguoti
         new: Naujas įrašas
         title: Veiksmai
-        user_group_id: Sukurti įrašą kaip
       admin:
         models:
-          components:
-            body: PagrindinÄ— dalis
           post:
             name: Publikacija
         posts:
@@ -41,6 +43,11 @@ lt:
           update:
             invalid: Išsaugant šį įrašą iškilo problema.
             success: Įrašas išsaugotas
+      admin_log:
+        post:
+          create: "%{user_name} sukūrė %{resource_name} tinklaraš�io įrašą %{space_name}"
+          delete: "%{user_name} ištrynė %{resource_name} tinklaraš�io įrašą iš %{space_name}"
+          update: "%{user_name} atnaujino %{resource_name} tinklaraš�io įrašą %{space_name}"
       last_activity:
         new_post_at_html: "<span> Naujas įrašas %{link}</span>"
       models:
@@ -49,7 +56,7 @@ lt:
             author: AutorÄ—(-ius)
             body: PagrindinÄ— dalis
             created_at: Sukurta
-            title: pavadinimas
+            official_blog_post: Oficiali publikacija
       posts:
         show:
           back: Grįžti į sąrašą
diff --git a/decidim-blogs/config/locales/lv.yml b/decidim-blogs/config/locales/lv.yml
index a487b8729c886..cf1267c54d54f 100644
--- a/decidim-blogs/config/locales/lv.yml
+++ b/decidim-blogs/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     models:
@@ -18,8 +19,6 @@ lv:
         title: Darbības
       admin:
         models:
-          components:
-            body: Pamatteksts
           post:
             name: Ziņa
         posts:
@@ -46,7 +45,6 @@ lv:
             author: Autors
             body: Pamatteksts
             created_at: Izveidots plkst.
-            title: nosaukums
       posts:
         show:
           back: Atpakaļ uz sarakstu
diff --git a/decidim-blogs/config/locales/nl.yml b/decidim-blogs/config/locales/nl.yml
index df2c7e6006617..ae5a38d64adbc 100644
--- a/decidim-blogs/config/locales/nl.yml
+++ b/decidim-blogs/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     models:
@@ -10,16 +11,14 @@ nl:
   decidim:
     blogs:
       actions:
+        author_id: Bericht aanmaken als
         confirm_destroy: Weet je zeker dat je dit bericht wilt verwijderen?
         destroy: Verwijder
         edit: Bewerk
         new: Nieuwe blogpost
         title: acties
-        user_group_id: Bericht aanmaken als
       admin:
         models:
-          components:
-            body: Tekstgedeelte
           post:
             name: Post
         posts:
@@ -39,6 +38,11 @@ nl:
           update:
             invalid: Er zijn fouten opgetreden bij het opslaan van deze blogpost.
             success: Post succesvol opgeslagen
+      admin_log:
+        post:
+          create: "%{user_name} heeft de %{resource_name} blog gemaakt in %{space_name}"
+          delete: "%{user_name} heeft de %{resource_name} blog verwijderd in %{space_name}"
+          update: "%{user_name} heeft de %{resource_name} blog bijgewerkt in %{space_name}"
       last_activity:
         new_post_at_html: "<span>Nieuw bericht op %{link}</span>"
       models:
@@ -47,7 +51,7 @@ nl:
             author: Auteur
             body: Tekstgedeelte
             created_at: Aangemaakt op
-            title: titel
+            official_blog_post: Officiële blogpost
       posts:
         show:
           back: Terug naar het overzicht
diff --git a/decidim-blogs/config/locales/no.yml b/decidim-blogs/config/locales/no.yml
index c77ff4daec5e1..9018e4b9f749b 100644
--- a/decidim-blogs/config/locales/no.yml
+++ b/decidim-blogs/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     models:
@@ -10,16 +11,14 @@
   decidim:
     blogs:
       actions:
+        author_id: Opprett innlegg som
         confirm_destroy: Er du sikker på at du vil slette dette innlegget?
         destroy: Slett
         edit: Editar
         new: Nytt innlegg
         title: Handlinger
-        user_group_id: Opprett innlegg som
       admin:
         models:
-          components:
-            body: Tekst
           post:
             name: Innlegg
         posts:
@@ -47,7 +46,6 @@
             author: Forfatter
             body: Tekst
             created_at: Opprettet på
-            title: tittel
       posts:
         show:
           back: Tilbake til listen
diff --git a/decidim-blogs/config/locales/pl.yml b/decidim-blogs/config/locales/pl.yml
index bbb966fd64c58..ede2cf7725e25 100644
--- a/decidim-blogs/config/locales/pl.yml
+++ b/decidim-blogs/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     models:
@@ -12,16 +13,14 @@ pl:
   decidim:
     blogs:
       actions:
+        author_id: Utwórz wpis jako
         confirm_destroy: Czy na pewno chcesz usunąć ten wpis?
         destroy: Usuń
         edit: Edytuj
         new: Nowy wpis
         title: Działania
-        user_group_id: Utwórz wpis jako
       admin:
         models:
-          components:
-            body: Treść
           post:
             name: Wpis
         posts:
@@ -49,7 +48,6 @@ pl:
             author: Autor
             body: Treść
             created_at: Utworzono
-            title: Tytuł
       posts:
         show:
           back: Powrót do listy
diff --git a/decidim-blogs/config/locales/pt-BR.yml b/decidim-blogs/config/locales/pt-BR.yml
index a00ff10230c9c..1ec52c59b0cf5 100644
--- a/decidim-blogs/config/locales/pt-BR.yml
+++ b/decidim-blogs/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     models:
@@ -10,16 +11,14 @@ pt-BR:
   decidim:
     blogs:
       actions:
+        author_id: Criar publicação como
         confirm_destroy: Deseja mesmo excluir este post?
         destroy: Excluir
         edit: Editar
         new: Nova postagem
         title: Ações
-        user_group_id: Criar publicação como
       admin:
         models:
-          components:
-            body: Corpo
           post:
             name: Postar
         posts:
@@ -47,7 +46,6 @@ pt-BR:
             author: Autor
             body: Corpo
             created_at: Criado em
-            title: título
       posts:
         show:
           back: Voltar para a lista
diff --git a/decidim-blogs/config/locales/pt.yml b/decidim-blogs/config/locales/pt.yml
index 3ca46431f5831..7cfc7c690b0e6 100644
--- a/decidim-blogs/config/locales/pt.yml
+++ b/decidim-blogs/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     models:
@@ -10,16 +11,14 @@ pt:
   decidim:
     blogs:
       actions:
+        author_id: Criar publicação como
         confirm_destroy: Tem a certeza de que deseja eliminar esta publicação?
         destroy: Eliminar
         edit: Editar
         new: Nova publicação
         title: Ações
-        user_group_id: Criar publicação como
       admin:
         models:
-          components:
-            body: Corpo
           post:
             name: Publicação
         posts:
@@ -47,7 +46,6 @@ pt:
             author: Autor
             body: Corpo
             created_at: Criado em
-            title: título
       posts:
         show:
           back: Retroceder à lista
diff --git a/decidim-blogs/config/locales/ro-RO.yml b/decidim-blogs/config/locales/ro-RO.yml
index 3ddd7d7ce667f..fead84118295d 100644
--- a/decidim-blogs/config/locales/ro-RO.yml
+++ b/decidim-blogs/config/locales/ro-RO.yml
@@ -1,5 +1,12 @@
+---
 ro:
   activemodel:
+    attributes:
+      post:
+        body: Conținut
+        decidim_author_id: Autor
+        published_at: Publicat la
+        title: Titlu
     models:
       decidim/blogs/create_post_event: Postare nouă pe blog
   activerecord:
@@ -11,16 +18,14 @@ ro:
   decidim:
     blogs:
       actions:
+        author_id: Creează postare ca
         confirm_destroy: Sigur dorești să ştergi această postare?
         destroy: Șterge
         edit: Editează
         new: Postare nouă
         title: Acțiuni
-        user_group_id: Creează postare ca
       admin:
         models:
-          components:
-            body: Conținut
           post:
             name: Postează
         posts:
@@ -40,6 +45,11 @@ ro:
           update:
             invalid: A apărut o eroare la salvarea postării.
             success: Postarea a fost salvată cu succes
+      admin_log:
+        post:
+          create: "%{user_name} a creat postarea de blog %{resource_name} în %{space_name}"
+          delete: "%{user_name} a șters postarea de blog %{resource_name} din %{space_name}"
+          update: "%{user_name} a actualizat postarea de blog %{resource_name} în %{space_name}"
       last_activity:
         new_post_at_html: "<span>Postare nouă la %{link}</span>"
       models:
@@ -48,7 +58,8 @@ ro:
             author: Autor
             body: Conținut
             created_at: Creat la
-            title: titlu
+            official_blog_post: Postare oficială
+            title: Titlu
       posts:
         show:
           back: Înapoi la listă
@@ -61,8 +72,10 @@ ro:
     components:
       blogs:
         actions:
+          comment: Comentariu
           create: Creează
           destroy: Șterge
+          endorse: Susține
           update: Actualizează
         name: Blog
         settings:
diff --git a/decidim-blogs/config/locales/ru.yml b/decidim-blogs/config/locales/ru.yml
index a241b036160e3..522c54d7d87f2 100644
--- a/decidim-blogs/config/locales/ru.yml
+++ b/decidim-blogs/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     models:
@@ -19,8 +20,6 @@ ru:
         title: Дей�тви�
       admin:
         models:
-          components:
-            body: О�новной тек�т
           post:
             name: По�т
         posts:
@@ -47,7 +46,6 @@ ru:
             author: �втор
             body: О�новной тек�т
             created_at: 'Создано:'
-            title: заголовок
       posts:
         show:
           view: По�мотреть
diff --git a/decidim-blogs/config/locales/sk.yml b/decidim-blogs/config/locales/sk.yml
index f4767670da8c8..33020fc0377da 100644
--- a/decidim-blogs/config/locales/sk.yml
+++ b/decidim-blogs/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     models:
@@ -19,8 +20,6 @@ sk:
         title: Akcie
       admin:
         models:
-          components:
-            body: Telo textu
           post:
             name: Príspevok
         posts:
@@ -47,7 +46,6 @@ sk:
             author: Autor
             body: Telo textu
             created_at: Vytvorené
-            title: názov
       posts:
         show:
           back: Späť na zoznam
diff --git a/decidim-blogs/config/locales/sl.yml b/decidim-blogs/config/locales/sl.yml
index a7ab48022455f..add144188ee05 100644
--- a/decidim-blogs/config/locales/sl.yml
+++ b/decidim-blogs/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   decidim:
     blogs:
diff --git a/decidim-blogs/config/locales/sr-CS.yml b/decidim-blogs/config/locales/sr-CS.yml
index 7b352b7438174..1da853ddb71fd 100644
--- a/decidim-blogs/config/locales/sr-CS.yml
+++ b/decidim-blogs/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     blogs:
diff --git a/decidim-blogs/config/locales/sv.yml b/decidim-blogs/config/locales/sv.yml
index 58a2a0867bef2..be92e33e98eeb 100644
--- a/decidim-blogs/config/locales/sv.yml
+++ b/decidim-blogs/config/locales/sv.yml
@@ -1,5 +1,10 @@
+---
 sv:
   activemodel:
+    attributes:
+      post:
+        decidim_author_id: Författare
+        title: Titel
     models:
       decidim/blogs/create_post_event: Nytt blogginlägg
   activerecord:
@@ -10,16 +15,14 @@ sv:
   decidim:
     blogs:
       actions:
+        author_id: Skapa inlägg som
         confirm_destroy: Vill du radera inlägget?
         destroy: Radera
         edit: Redigera
         new: Nytt inlägg
         title: Åtgärder
-        user_group_id: Skapa inlägg som
       admin:
         models:
-          components:
-            body: Innehåll
           post:
             name: Publicera
         posts:
@@ -47,7 +50,8 @@ sv:
             author: Författare
             body: Innehåll
             created_at: Skapad
-            title: titel
+            official_blog_post: Officiellt inlägg
+            title: Titel
       posts:
         show:
           back: Tillbaka till listan
diff --git a/decidim-blogs/config/locales/tr-TR.yml b/decidim-blogs/config/locales/tr-TR.yml
index 9841ab0c43cb0..e07bee4854125 100644
--- a/decidim-blogs/config/locales/tr-TR.yml
+++ b/decidim-blogs/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     models:
@@ -17,8 +18,6 @@ tr:
         title: Eylemler
       admin:
         models:
-          components:
-            body: Vücut
           post:
             name: posta
         posts:
@@ -46,7 +45,6 @@ tr:
             author: Yazar
             body: Vücut
             created_at: Adresinde düzenlendi
-            title: Başlık
       posts:
         show:
           back: Listeye geri dön
diff --git a/decidim-blogs/config/locales/uk.yml b/decidim-blogs/config/locales/uk.yml
index d2402a0a39fc9..620d5ffa6d222 100644
--- a/decidim-blogs/config/locales/uk.yml
+++ b/decidim-blogs/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     models:
@@ -19,8 +20,6 @@ uk:
         title: Дії
       admin:
         models:
-          components:
-            body: О�новний тек�т
           post:
             name: Допи�
         posts:
@@ -45,7 +44,6 @@ uk:
             author: �втор
             body: О�новний тек�т
             created_at: 'Створено:'
-            title: заголовок
       posts:
         show:
           view: Перегл�нути
diff --git a/decidim-blogs/config/locales/zh-CN.yml b/decidim-blogs/config/locales/zh-CN.yml
index 3b419067968d3..f77bed17d6fb7 100644
--- a/decidim-blogs/config/locales/zh-CN.yml
+++ b/decidim-blogs/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     models:
@@ -16,8 +17,6 @@ zh-CN:
         title: 行动
       admin:
         models:
-          components:
-            body: 正文内容
           post:
             name: 帖�
         posts:
@@ -44,7 +43,6 @@ zh-CN:
             author: 作者
             body: 正文内容
             created_at: 创建于
-            title: 标题
       posts:
         show:
           back: 返回列表
diff --git a/decidim-blogs/decidim-blogs.gemspec b/decidim-blogs/decidim-blogs.gemspec
index e2308afbe3654..8a78f812e7026 100644
--- a/decidim-blogs/decidim-blogs.gemspec
+++ b/decidim-blogs/decidim-blogs.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["isaac.mg@coditramuntana.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-blogs"
   s.summary = "Decidim blogs module"
diff --git a/decidim-blogs/lib/decidim/blogs/component.rb b/decidim-blogs/lib/decidim/blogs/component.rb
index 74270732199cb..9c249c112be8c 100644
--- a/decidim-blogs/lib/decidim/blogs/component.rb
+++ b/decidim-blogs/lib/decidim/blogs/component.rb
@@ -36,7 +36,7 @@
   component.register_resource(:blogpost) do |resource|
     resource.model_class_name = "Decidim::Blogs::Post"
     resource.card = "decidim/blogs/post"
-    resource.actions = %w(endorse vote amend comment)
+    resource.actions = %w(endorse comment)
     resource.searchable = true
   end
 
@@ -72,8 +72,14 @@
       Decidim::Component.create!(params)
     end
 
-    5.times do
-      author = Decidim::User.where(organization: component.organization).all.first
+    6.times do |n|
+      author = if n >= 3
+                 Decidim::User.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
+               elsif n <= 1
+                 Decidim::UserGroup.where(organization: component.organization).order(Arel.sql("RANDOM()")).first
+               else
+                 component.organization
+               end
 
       params = {
         component: component,
diff --git a/decidim-blogs/lib/decidim/blogs/version.rb b/decidim-blogs/lib/decidim/blogs/version.rb
index 1593e669e8efa..1726d18b70a20 100644
--- a/decidim-blogs/lib/decidim/blogs/version.rb
+++ b/decidim-blogs/lib/decidim/blogs/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-blogs/spec/commands/decidim/blogs/admin/update_post_spec.rb b/decidim-blogs/spec/commands/decidim/blogs/admin/update_post_spec.rb
index 9744d9ccb8c41..b492306dc00c4 100644
--- a/decidim-blogs/spec/commands/decidim/blogs/admin/update_post_spec.rb
+++ b/decidim-blogs/spec/commands/decidim/blogs/admin/update_post_spec.rb
@@ -6,7 +6,7 @@ module Decidim
   module Blogs
     module Admin
       describe UpdatePost do
-        subject { described_class.new(form, post) }
+        subject { described_class.new(form, post, current_user) }
 
         let(:organization) { create(:organization) }
         let(:participatory_process) { create :participatory_process, organization: organization }
@@ -34,7 +34,7 @@ module Admin
           end
 
           it "doesn't update the post" do
-            expect(post).not_to receive(:update_attributes!)
+            expect(post).not_to receive(:update!)
             subject.call
           end
         end
@@ -61,6 +61,23 @@ module Admin
             expect { subject.call }.to change(Decidim::SearchableResource, :count).by_at_least(1)
           end
 
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:update!)
+              .with(post, current_user, {
+                      title: { en: title },
+                      body: { en: body },
+                      author: current_user
+                    })
+              .and_call_original
+
+            expect { subject.call }.to change(Decidim::ActionLog, :count)
+
+            action_log = Decidim::ActionLog.last
+            expect(action_log.version).to be_present
+            expect(action_log.version.event).to eq "update"
+          end
+
           context "with a group author" do
             let(:group) { create(:user_group, :verified, organization: organization) }
             let(:form) do
diff --git a/decidim-blogs/spec/forms/decidim/blogs/admin/post_form_spec.rb b/decidim-blogs/spec/forms/decidim/blogs/admin/post_form_spec.rb
index ace889a61e1cf..0e98e42b8364f 100644
--- a/decidim-blogs/spec/forms/decidim/blogs/admin/post_form_spec.rb
+++ b/decidim-blogs/spec/forms/decidim/blogs/admin/post_form_spec.rb
@@ -8,11 +8,20 @@ module Admin
       describe PostForm do
         subject do
           described_class.from_params(attributes).with_context(
-            current_organization: current_organization
+            current_organization: current_organization,
+            current_user: current_user
           )
         end
 
         let(:current_organization) { create(:organization) }
+        let(:current_user) { create :user, organization: current_organization }
+        let(:another_user) { create(:user, organization: current_organization) }
+        let(:user_group) { create(:user_group, :verified, organization: current_organization) }
+        let(:decidim_author_id) { "" }
+        let(:component) { create(:post_component, organization: current_organization) }
+        let(:post) { create(:post, component: component, author: author) }
+        let(:user_from_another_org) { create(:user) }
+        let(:post_id) { nil }
 
         let(:title) do
           {
@@ -34,7 +43,9 @@ module Admin
           {
             "post" => {
               "title" => title,
-              "body" => body
+              "body" => body,
+              "decidim_author_id" => decidim_author_id,
+              "id" => post_id
             }
           }
         end
@@ -43,24 +54,121 @@ module Admin
           it { is_expected.to be_valid }
         end
 
-        describe "map_model" do
-          let(:component) { create(:post_component, organization: current_organization) }
-          let(:post) { create(:post, component: component, author: author) }
-          let(:author) { create(:user, organization: current_organization) }
+        context "when title is missing" do
+          let(:title) do
+            { "en" => "" }
+          end
+
+          it { is_expected.to be_invalid }
+        end
 
-          before do
-            subject.map_model(post)
+        context "when body is missing" do
+          let(:body) do
+            { "en" => "" }
           end
 
-          it "does not assign the user group for normal users" do
-            expect(subject.user_group_id).to be_nil
+          it { is_expected.to be_invalid }
+        end
+
+        context "when organization is specified" do
+          let(:decidim_author_id) { current_organization.id }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when author is a current_user" do
+          let(:decidim_author_id) { current_user.id }
+
+          it { is_expected.to be_valid }
+
+          it "assigns current_user as author" do
+            expect(subject.author).to eq(current_user)
+          end
+        end
+
+        context "when the author belongs to different organization" do
+          let(:decidim_author_id) { user_from_another_org.id }
+
+          it "sets the author to the current_organization" do
+            expect(subject.author).to eq(current_organization)
+          end
+        end
+
+        context "when decidim_author_id is empty" do
+          it "assigns current_organization as author" do
+            expect(subject.author).to eq(current_organization)
+          end
+        end
+
+        context "when decidim_author_id is user_group" do
+          let(:decidim_author_id) { user_group.id }
+
+          it "assigns user_group as author" do
+            expect(subject.author).to eq(user_group)
+          end
+        end
+
+        context "when decidim_author_id is another_user from the same organization" do
+          let(:post_id) { post.id }
+          let(:author) { current_user }
+          let(:decidim_author_id) { another_user.id }
+
+          it { is_expected.to be_invalid }
+        end
+
+        describe "when assigns a model" do
+          subject do
+            described_class.from_model(post).with_context(
+              current_organization: current_organization,
+              current_user: current_user
+            )
+          end
+
+          let(:author) { current_organization }
+
+          context "when author is an organization" do
+            it "assigns current_organization.id as decidim_author_id" do
+              expect(subject.decidim_author_id).to be_nil
+            end
+
+            it "assigns current_organization as author" do
+              expect(subject.author).to eq(current_organization)
+            end
           end
 
           context "when the author is a group" do
-            let(:author) { create(:user_group, :verified, organization: current_organization) }
+            let(:author) { user_group }
+
+            it "assigns user_group.id as decidim_author_id" do
+              expect(subject.decidim_author_id).to eq(user_group.id)
+            end
+
+            it "assigns user_group as author" do
+              expect(subject.author).to eq(user_group)
+            end
+          end
+
+          context "when the author is the current_user" do
+            let(:author) { current_user }
+
+            it "assigns current_user.id as decidim_author_id" do
+              expect(subject.decidim_author_id).to eq(current_user.id)
+            end
+
+            it "assigns current_user object as author" do
+              expect(subject.author).to eq(current_user)
+            end
+          end
+
+          context "when the author is another user" do
+            let(:author) { another_user }
+
+            it "assigns another_user.id as decidim_author_id" do
+              expect(subject.decidim_author_id).to eq(another_user.id)
+            end
 
-            it "assigns the user group ID to the form" do
-              expect(subject.user_group_id).to eq(author.id)
+            it "assigns another_user object as author" do
+              expect(subject.author).to eq(another_user)
             end
           end
         end
diff --git a/decidim-blogs/spec/helpers/decidim/blogs/admin/post_helper_spec.rb b/decidim-blogs/spec/helpers/decidim/blogs/admin/post_helper_spec.rb
new file mode 100644
index 0000000000000..f3e6b18fcce93
--- /dev/null
+++ b/decidim-blogs/spec/helpers/decidim/blogs/admin/post_helper_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Blogs::Admin
+  describe PostsHelper, type: :helper do
+    describe "#post_author_select_field" do
+      let(:organization) { create :organization }
+      let(:user) { create :user, :admin, :confirmed, organization: organization }
+      let!(:another_user) { create :user, :admin, :confirmed, organization: organization }
+      let!(:user_group) { create :user_group, :verified, decidim_organization_id: organization.id, users: [user] }
+      let!(:another_user_group) { create :user_group, :verified, decidim_organization_id: organization.id, users: [another_user] }
+      let(:name) { "a-select-form-name" }
+      let(:author) { user }
+      let(:form) do
+        double(
+          object: double(author: author)
+        )
+      end
+
+      let(:all_fields) do
+        [
+          [organization.name, ""],
+          [user.name, user.id],
+          [user_group.name, user_group.id]
+        ]
+      end
+
+      let(:extra_user_fields) do
+        [
+          [organization.name, ""],
+          [user.name, user.id],
+          [user_group.name, user_group.id],
+          [another_user.name, another_user.id]
+        ]
+      end
+
+      let(:extra_group_fields) do
+        [
+          [organization.name, ""],
+          [user.name, user.id],
+          [user_group.name, user_group.id],
+          [another_user_group.name, another_user_group.id]
+        ]
+      end
+
+      let(:basic_fields) do
+        [
+          [organization.name, ""],
+          [user.name, user.id]
+        ]
+      end
+
+      let(:groups_enabled) { true }
+
+      before do
+        allow(helper).to receive(:current_organization).and_return(organization)
+        allow(helper).to receive(:current_user).and_return(user)
+        allow(organization).to receive(:user_groups_enabled?).and_return(groups_enabled)
+        allow(form).to receive(:select) { |_, array| array }
+      end
+
+      context "when all actors are present" do
+        it "Returns all types of authors" do
+          expect(helper.post_author_select_field(form, name)).to eq(all_fields)
+        end
+      end
+
+      context "when author is a user's user_group" do
+        let(:author) { user_group }
+
+        it "Returns all types of authors" do
+          expect(helper.post_author_select_field(form, name)).to eq(all_fields)
+        end
+      end
+
+      context "when organization has no groups_enabled" do
+        let(:groups_enabled) { false }
+
+        it "Returns organization and user" do
+          expect(helper.post_author_select_field(form, name)).to eq(basic_fields)
+        end
+
+        context "when author is a user's user_group" do
+          let(:author) { user_group }
+
+          it "Returns organization, user and user group" do
+            expect(helper.post_author_select_field(form, name)).to eq(all_fields)
+          end
+        end
+      end
+
+      context "when author is another user" do
+        let(:author) { another_user }
+
+        it "Returns all types of authors plus the original author" do
+          expect(helper.post_author_select_field(form, name)).to eq(extra_user_fields)
+        end
+      end
+
+      context "when author is the organization" do
+        let(:author) { organization }
+
+        it "Returns all types of authors" do
+          expect(helper.post_author_select_field(form, name)).to eq(all_fields)
+        end
+      end
+
+      context "when author is another user_group" do
+        let(:author) { another_user_group }
+
+        it "Returns all types of authors" do
+          expect(helper.post_author_select_field(form, name)).to eq(extra_group_fields)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/spec/permissions/decidim/blog/permissions_spec.rb b/decidim-blogs/spec/permissions/decidim/blog/permissions_spec.rb
index 3752dde71d5b1..abf48cd124a70 100644
--- a/decidim-blogs/spec/permissions/decidim/blog/permissions_spec.rb
+++ b/decidim-blogs/spec/permissions/decidim/blog/permissions_spec.rb
@@ -12,14 +12,14 @@
     }
   end
   let(:blog_component) { create :post_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is public" do
     let(:action) do
       { scope: :public, action: :foo, subject: :blogpost }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when scope is admin" do
@@ -27,7 +27,7 @@
       { scope: :admin, action: :foo, subject: :blogpost }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when scope is a random one" do
diff --git a/decidim-blogs/spec/services/decidim/blogs/searchable_blogpost_resource_spec.rb b/decidim-blogs/spec/services/decidim/blogs/searchable_blogpost_resource_spec.rb
index 82d50239affe6..811f59fbdd562 100644
--- a/decidim-blogs/spec/services/decidim/blogs/searchable_blogpost_resource_spec.rb
+++ b/decidim-blogs/spec/services/decidim/blogs/searchable_blogpost_resource_spec.rb
@@ -15,7 +15,7 @@ module Decidim
         :post,
         component: current_component,
         title: Decidim::Faker::Localized.name,
-        body: description_1
+        body: description1
       )
     end
 
@@ -68,7 +68,7 @@ module Decidim
 
     describe "Search" do
       context "when searching by resource resource_type" do
-        let!(:resource_2) do
+        let!(:resource2) do
           create(
             :post,
             component: current_component,
@@ -82,7 +82,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[resource.class.name]
               expect(results[:count]).to eq 2
-              expect(results[:results]).to match_array [resource, resource_2]
+              expect(results[:results]).to match_array [resource, resource2]
             end
             on(:invalid) { raise("Should not happen") }
           end
@@ -93,7 +93,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[resource.class.name]
               expect(results[:count]).to eq 1
-              expect(results[:results]).to eq [resource_2]
+              expect(results[:results]).to eq [resource2]
             end
             on(:invalid) { raise("Should not happen") }
           end
diff --git a/decidim-blogs/spec/shared/manage_posts_examples.rb b/decidim-blogs/spec/shared/manage_posts_examples.rb
index c2bdefc7b649a..64c25252dcc2e 100644
--- a/decidim-blogs/spec/shared/manage_posts_examples.rb
+++ b/decidim-blogs/spec/shared/manage_posts_examples.rb
@@ -7,6 +7,8 @@
     end
 
     within ".edit_post" do
+      expect(page).to have_select("post_decidim_author_id", selected: author.name)
+
       fill_in_i18n(
         :post_title,
         "#post-title-tabs",
@@ -30,6 +32,7 @@
     within "table" do
       expect(page).to have_content("My new title")
       expect(page).to have_content("Post title 2")
+      expect(page).to have_content(author.name)
     end
   end
 
@@ -91,7 +94,7 @@
     it "can set user group as posts author", :slow do
       find(".card-title a.button").click
 
-      select user_group.name, from: "post_user_group_id"
+      select user_group.name, from: "post_decidim_author_id"
 
       fill_in_i18n(
         :post_title,
@@ -129,7 +132,7 @@
       end
 
       within ".edit_post" do
-        select user_group.name, from: "post_user_group_id"
+        select user_group.name, from: "post_decidim_author_id"
         find("*[type=submit]").click
       end
 
@@ -140,4 +143,116 @@
       end
     end
   end
+
+  context "when user is the organization" do
+    let(:author) { organization }
+
+    it "can set organization as posts author", :slow do
+      find(".card-title a.button").click
+
+      select organization.name, from: "post_decidim_author_id"
+
+      fill_in_i18n(
+        :post_title,
+        "#post-title-tabs",
+        en: "My post",
+        es: "Mi post",
+        ca: "El meu post"
+      )
+
+      fill_in_i18n_editor(
+        :post_body,
+        "#post-body-tabs",
+        en: "A description",
+        es: "Descripción",
+        ca: "Descripció"
+      )
+
+      within ".new_post" do
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "table" do
+        expect(page).to have_content(author.name)
+        expect(page).to have_content("My post")
+        expect(page).to have_content("Post title 1")
+        expect(page).to have_content("Post title 2")
+      end
+    end
+
+    it "can update the blog as the organization" do
+      within find("tr", text: translated(post1.title)) do
+        click_link "Edit"
+      end
+
+      within ".edit_post" do
+        select organization.name, from: "post_decidim_author_id"
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within find("tr", text: translated(post1.title)) do
+        expect(page).to have_content(author.name)
+      end
+    end
+  end
+
+  context "when user is current_user" do
+    let(:author) { user }
+
+    it "can set current_user as posts author", :slow do
+      find(".card-title a.button").click
+
+      select user.name, from: "post_decidim_author_id"
+
+      fill_in_i18n(
+        :post_title,
+        "#post-title-tabs",
+        en: "My post",
+        es: "Mi post",
+        ca: "El meu post"
+      )
+
+      fill_in_i18n_editor(
+        :post_body,
+        "#post-body-tabs",
+        en: "A description",
+        es: "Descripción",
+        ca: "Descripció"
+      )
+
+      within ".new_post" do
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "table" do
+        expect(page).to have_content(author.name)
+        expect(page).to have_content("My post")
+        expect(page).to have_content("Post title 1")
+        expect(page).to have_content("Post title 2")
+      end
+    end
+
+    it "can update the blog as the user" do
+      within find("tr", text: translated(post1.title)) do
+        click_link "Edit"
+      end
+
+      within ".edit_post" do
+        select user.name, from: "post_decidim_author_id"
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within find("tr", text: translated(post1.title)) do
+        expect(page).to have_content(author.name)
+      end
+    end
+  end
 end
diff --git a/decidim-blogs/spec/system/admin_manages_posts_spec.rb b/decidim-blogs/spec/system/admin_manages_posts_spec.rb
index 2d8087a233f71..e0f62fa95acca 100644
--- a/decidim-blogs/spec/system/admin_manages_posts_spec.rb
+++ b/decidim-blogs/spec/system/admin_manages_posts_spec.rb
@@ -4,10 +4,21 @@
 
 describe "Admin manages posts", type: :system do
   let(:manifest_name) { "blogs" }
-  let!(:post1) { create :post, component: current_component, title: { en: "Post title 1" } }
+  let!(:post1) { create :post, component: current_component, author: author, title: { en: "Post title 1" } }
   let!(:post2) { create :post, component: current_component, title: { en: "Post title 2" } }
+  let(:author) { create :user, organization: organization }
 
   include_context "when managing a component as an admin"
 
-  it_behaves_like "manage posts"
+  context "when author is the organization" do
+    let(:author) { organization }
+
+    it_behaves_like "manage posts"
+  end
+
+  context "when author is a user" do
+    let(:author) { create :user, organization: organization }
+
+    it_behaves_like "manage posts"
+  end
 end
diff --git a/decidim-blogs/spec/system/endorse_posts_spec.rb b/decidim-blogs/spec/system/endorse_posts_spec.rb
new file mode 100644
index 0000000000000..cb0a7a18cdcfa
--- /dev/null
+++ b/decidim-blogs/spec/system/endorse_posts_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "endorse posts", type: :system do
+  include_context "with a component"
+  let(:manifest_name) { "blogs" }
+  let(:organization) { create(:organization) }
+  let(:author) { create(:user, :confirmed, name: "Tester", organization: organization) }
+  let!(:post) { create(:post, component: component, title: { en: "Blog post title" }) }
+
+  before do
+    sign_in author
+    visit_component
+    click_link "Blog post title"
+  end
+
+  context "when liking the post without belonging to a user group" do
+    it "likes the post" do
+      click_button("Endorse")
+      expect(page).to have_content("ENDORSED")
+    end
+  end
+
+  context "when liking the post while being a part of a group" do
+    let!(:user_group) do
+      create(
+        :user_group,
+        :verified,
+        name: "Tester's Organization",
+        nickname: "test_org",
+        email: "t.mail.org@example.org",
+        users: [author],
+        organization: organization
+      )
+    end
+
+    it "opens a modal where you select identity as a user or a group" do
+      visit page.current_path
+      click_button("Endorse")
+      expect(page).to have_content("SELECT IDENTITY")
+      expect(page).to have_content("Tester's Organization")
+      expect(page).to have_content("Tester")
+    end
+
+    def add_likes
+      click_button "Endorse"
+      within "#user-identities" do
+        find("li", text: /\ATester's Organization\z/).click
+        find("li", text: /\ATester\z/).click
+        click_button "Done"
+      end
+      visit current_path
+      click_button "Endorse"
+    end
+
+    context "when both identities picked" do
+      it "likes the post as a group and a user" do
+        visit page.current_path
+
+        add_likes
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 2)
+        end
+      end
+    end
+
+    context "when like cancelled as a user" do
+      it "doesn't cancel group like" do
+        visit page.current_path
+
+        add_likes
+        find(".selected", match: :first).click
+        click_button "Done"
+        visit current_path
+        click_button "Endorse"
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 1)
+          within ".selected" do
+            expect(page).to have_content("Tester's Organization")
+          end
+        end
+      end
+    end
+
+    context "when like cancelled as a group" do
+      it "doesn't cancel user like" do
+        visit page.current_path
+
+        add_likes
+        page.all(".selected")[1].click
+        click_button "Done"
+        visit current_path
+        click_button "Endorse"
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 1)
+          within ".selected" do
+            expect(page).to have_text("Tester", exact: true)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-blogs/spec/system/explore_posts_spec.rb b/decidim-blogs/spec/system/explore_posts_spec.rb
index 0c1667fb0fbfc..6035034e431ed 100644
--- a/decidim-blogs/spec/system/explore_posts_spec.rb
+++ b/decidim-blogs/spec/system/explore_posts_spec.rb
@@ -6,7 +6,7 @@
   include_context "with a component"
   let(:manifest_name) { "blogs" }
 
-  let!(:old_post) { create(:post, component: component, created_at: Time.current - 2.days) }
+  let!(:old_post) { create(:post, component: component, created_at: 2.days.ago) }
   let!(:new_post) { create(:post, component: component, created_at: Time.current) }
 
   let!(:image) { create(:attachment, attached_to: old_post) }
@@ -54,12 +54,41 @@
 
   describe "show" do
     let(:posts_count) { 1 }
-    let!(:post) { create(:post, component: component) }
+    let(:author) { organization }
+    let!(:post) { create(:post, component: component, author: author) }
 
     before do
       visit resource_locator(post).path
     end
 
+    context "when author is an organization" do
+      it "shows 'Official' as the author" do
+        within ".author__name" do
+          expect(page).to have_content("Official")
+        end
+      end
+    end
+
+    context "when author is a user_group" do
+      let(:author) { create(:user_group, :verified, organization: organization) }
+
+      it "shows user group as the author" do
+        within ".author__name" do
+          expect(page).to have_content(author.name)
+        end
+      end
+    end
+
+    context "when author is a user" do
+      let(:author) { user }
+
+      it "shows user as the author" do
+        within ".author__name" do
+          expect(page).to have_content(user.name)
+        end
+      end
+    end
+
     it "show post info" do
       expect(page).to have_i18n_content(post.title)
       expect(page).to have_i18n_content(post.body)
diff --git a/decidim-blogs/spec/system/process_admin_manages_post_spec.rb b/decidim-blogs/spec/system/process_admin_manages_post_spec.rb
index 3b8dbf9b598f8..d01c4f09dd475 100644
--- a/decidim-blogs/spec/system/process_admin_manages_post_spec.rb
+++ b/decidim-blogs/spec/system/process_admin_manages_post_spec.rb
@@ -4,8 +4,9 @@
 
 describe "Process admin manages post", type: :system do
   let(:manifest_name) { "blogs" }
-  let!(:post1) { create :post, component: current_component, title: { en: "Post title 1" } }
+  let!(:post1) { create :post, component: current_component, author: author, title: { en: "Post title 1" } }
   let!(:post2) { create :post, component: current_component, title: { en: "Post title 2" } }
+  let(:author) { create :user, organization: organization }
 
   include_context "when managing a component as a process admin"
 
diff --git a/decidim-blogs/spec/types/integration_schema_spec.rb b/decidim-blogs/spec/types/integration_schema_spec.rb
index 6d4a5ed9e72c0..8291173c90b35 100644
--- a/decidim-blogs/spec/types/integration_schema_spec.rb
+++ b/decidim-blogs/spec/types/integration_schema_spec.rb
@@ -160,7 +160,7 @@
       let!(:other_post) { create(:post, created_at: 2.weeks.ago, updated_at: 1.week.ago, component: current_component) }
       let(:edges) { response["participatoryProcess"]["components"].first["posts"]["edges"] }
 
-      context "when ordered by " do
+      context "when ordered by" do
         context "with createdAt" do
           let(:criteria) { "order: { createdAt: \"asc\" }" }
 
@@ -219,12 +219,6 @@
 
           it { expect(edges).to eq([{ "node" => { "id" => other_post.id.to_s } }]) }
         end
-
-        context "with updatedBefore" do
-          let(:criteria) { "filter: { updatedBefore: \"#{post.created_at.to_date}\" } " }
-
-          it { expect(edges).to eq([{ "node" => { "id" => other_post.id.to_s } }]) }
-        end
       end
     end
   end
diff --git a/decidim-budgets/app/cells/decidim/budgets/order_activity_cell.rb b/decidim-budgets/app/cells/decidim/budgets/order_activity_cell.rb
new file mode 100644
index 0000000000000..6c196e173ce4b
--- /dev/null
+++ b/decidim-budgets/app/cells/decidim/budgets/order_activity_cell.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # A cell to display when actions happen on an order.
+    class OrderActivityCell < ActivityCell
+      def title
+        I18n.t(
+          "decidim.budgets.last_activity.new_vote_at_html",
+          link: participatory_space_link
+        )
+      end
+
+      def resource_link_path
+        resource_locator(budget).path
+      end
+
+      def resource_link_text
+        decidim_html_escape(translated_attribute(budget.title))
+      end
+
+      private
+
+      def budget
+        @budget ||= resource.budget
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb b/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb
index 388fc87a78f8f..ee4e78aa7f71e 100644
--- a/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to add new line items to orders
-    class AddLineItem < Rectify::Command
+    class AddLineItem < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user or nil if it is not created yet.
@@ -23,11 +23,13 @@ def initialize(current_order, project, current_user)
       # Returns nothing.
       def call
         transaction do
-          return broadcast(:invalid) if voting_not_enabled? || order.checked_out? || exceeds_budget?
+          raise ActiveRecord::RecordInvalid if voting_not_enabled? || order.checked_out? || exceeds_budget?
 
           add_line_item
           broadcast(:ok, order)
         end
+      rescue ActiveRecord::RecordInvalid
+        broadcast(:invalid)
       end
 
       private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_budget.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_budget.rb
index fb65ffabfdfac..e344c8dcb3559 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_budget.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_budget.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user creates an Budget
       # from the admin panel.
-      class CreateBudget < Rectify::Command
+      class CreateBudget < Decidim::Command
         def initialize(form)
           @form = form
         end
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_order_reminders.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_order_reminders.rb
new file mode 100644
index 0000000000000..e60e94cefb67d
--- /dev/null
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_order_reminders.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This command is executed when admin sends vote reminders.
+      class CreateOrderReminders < Decidim::Command
+        def initialize(form)
+          @form = form
+        end
+
+        def call
+          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) unless voting_enabled?
+          return broadcast(:invalid) if voting_ends_soon?
+
+          generator.generate_for(current_component, &alternative_refresh_state)
+
+          broadcast(:ok, generator.reminder_jobs_queued)
+        end
+
+        private
+
+        attr_reader :form
+
+        def alternative_refresh_state
+          proc do |reminder|
+            reminder.records.each do |record|
+              next if %w(active pending).exclude? record.state
+
+              record.state = begin
+                if record.remindable.created_at > minimum_time_between_reminders ||
+                   (reminder.deliveries.present? && reminder.deliveries.last.created_at > minimum_time_between_reminders)
+                  "pending"
+                else
+                  "active"
+                end
+              end
+              record.save if record.changed?
+            end
+          end
+        end
+
+        def minimum_time_between_reminders
+          form.minimum_interval_between_reminders.ago
+        end
+
+        def generator
+          @generator ||= Decidim::Budgets::OrderReminderGenerator.new
+        end
+
+        def current_component
+          form.current_component
+        end
+
+        def voting_enabled?
+          form.voting_enabled?
+        end
+
+        def voting_ends_soon?
+          form.voting_ends_soon?
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index ff3c2e8b9c7a8..e8a4696af77cb 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user creates a Project from the admin
       # panel.
-      class CreateProject < Rectify::Command
+      class CreateProject < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -44,7 +44,10 @@ def create_project!
             category: form.category,
             title: form.title,
             description: form.description,
-            budget_amount: form.budget_amount
+            budget_amount: form.budget_amount,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
           }
 
           @project = Decidim.traceability.create!(
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/destroy_budget.rb b/decidim-budgets/app/commands/decidim/budgets/admin/destroy_budget.rb
index 8efda0d6b9d4e..6289de3c2c311 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/destroy_budget.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/destroy_budget.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user destroys a Budget
       # from the admin panel.
-      class DestroyBudget < Rectify::Command
+      class DestroyBudget < Decidim::Command
         def initialize(budget, current_user)
           @budget = budget
           @current_user = current_user
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/destroy_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/destroy_project.rb
index 75b322d1cee81..f0eaeac0fc0d9 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/destroy_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/destroy_project.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user deletes a Project from the admin
       # panel.
-      class DestroyProject < Rectify::Command
+      class DestroyProject < Decidim::Command
         # Initializes an UpdateProject Command.
         #
         # project - The current instance of the project to be destroyed.
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb b/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
index 97addf67f1c75..350f4923c5b93 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # one component to projects of a budget.
-      class ImportProposalsToBudgets < Rectify::Command
+      class ImportProposalsToBudgets < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -48,7 +48,10 @@ def create_project_from_proposal!(original_proposal)
             description: original_proposal.body,
             budget_amount: budget_for(original_proposal),
             category: original_proposal.category,
-            scope: original_proposal.scope
+            scope: original_proposal.scope,
+            address: original_proposal.address,
+            latitude: original_proposal.latitude,
+            longitude: original_proposal.longitude
           }
 
           @project = Decidim.traceability.create!(
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_budget.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_budget.rb
index ceb060c04802d..316d68753ce50 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_budget.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_budget.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user updates a Budget
       # from the admin panel.
-      class UpdateBudget < Rectify::Command
+      class UpdateBudget < Decidim::Command
         def initialize(form, budget)
           @form = form
           @budget = budget
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index b0dbc5c4750b2..0a6122dff94c7 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -5,7 +5,7 @@ module Budgets
     module Admin
       # This command is executed when the user changes a Project from the admin
       # panel.
-      class UpdateProject < Rectify::Command
+      class UpdateProject < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -53,7 +53,10 @@ def update_project
             title: form.title,
             description: form.description,
             budget_amount: form.budget_amount,
-            selected_at: selected_at
+            selected_at: selected_at,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
           )
         end
 
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project_category.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_category.rb
new file mode 100644
index 0000000000000..99474a64c9714
--- /dev/null
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_category.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectCategory < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # category_id - the category id to update
+        # project_ids - the project ids to update.
+        def initialize(category_id, project_ids)
+          @category = Decidim::Category.find_by id: category_id
+          @project_ids = project_ids
+          @response = { category_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_category) if @category.blank?
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          @response[:category_name] = @category.translated_name
+          Project.where(id: @project_ids).find_each do |project|
+            if @category == project.category
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_category project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+
+          broadcast(:update_projects_category, @response)
+        end
+
+        private
+
+        def update_project_category(project)
+          project.update!(
+            category: @category
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project_scope.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_scope.rb
new file mode 100644
index 0000000000000..ae32ad5f8bbc7
--- /dev/null
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_scope.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectScope < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # scope_id - the scope id to update
+        # project_ids - the project ids to update.
+        def initialize(scope_id, project_ids)
+          @scope = ::Decidim::Scope.find_by id: scope_id
+          @project_ids = project_ids
+          @response = { scope_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_scope) if @scope.blank?
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          update_projects_scope
+
+          broadcast(:update_projects_scope, @response)
+        end
+
+        private
+
+        attr_reader :scope, :project_ids
+
+        def update_projects_scope
+          @response[:scope_name] = translated_attribute(scope.name, scope.organization)
+          ::Decidim::Budgets::Project.where(id: project_ids).find_each do |project|
+            if scope == project.scope
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_scope project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+        end
+
+        def update_project_scope(project)
+          project.update!(
+            scope: scope
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project_selection.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_selection.rb
new file mode 100644
index 0000000000000..57da744d6c98d
--- /dev/null
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project_selection.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectSelection < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # selection - Defines if projects are selected (for implementation)
+        # project_ids - the project ids to update.
+        def initialize(selection, project_ids)
+          @selection = selection
+          @project_ids = project_ids
+          @response = { selection_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_selection) if @selection.blank? || [true, false, "true", "false"].exclude?(@selection)
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          @selection = ActiveModel::Type::Boolean.new.cast(@selection)
+
+          update_projects_selection
+
+          broadcast(:update_projects_selection, @response)
+        end
+
+        private
+
+        attr_reader :selection, :project_ids
+
+        def update_projects_selection
+          ::Decidim::Budgets::Project.where(id: project_ids).find_each do |project|
+            if (selection == false && !project.selected?) || (selection && project.selected?)
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_selection project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+        end
+
+        def update_project_selection(project)
+          selected_at = selection ? Time.current : nil
+          project.update!(
+            selected_at: selected_at
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/commands/decidim/budgets/cancel_order.rb b/decidim-budgets/app/commands/decidim/budgets/cancel_order.rb
index f78a18793fa0e..7251cc5ad4034 100644
--- a/decidim-budgets/app/commands/decidim/budgets/cancel_order.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/cancel_order.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to cancel an order.
-    class CancelOrder < Rectify::Command
+    class CancelOrder < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user.
diff --git a/decidim-budgets/app/commands/decidim/budgets/checkout.rb b/decidim-budgets/app/commands/decidim/budgets/checkout.rb
index 73ef6a3c30674..ef47b366c55d9 100644
--- a/decidim-budgets/app/commands/decidim/budgets/checkout.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/checkout.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to checkout.
-    class Checkout < Rectify::Command
+    class Checkout < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user.
@@ -32,8 +32,15 @@ def checkout!
 
         @order.with_lock do
           SendOrderSummaryJob.perform_later(@order)
-          @order.checked_out_at = Time.current
-          @order.save
+
+          Decidim.traceability.update!(
+            @order,
+            @order.user,
+            { checked_out_at: Time.current },
+            visibility: "private-only"
+          )
+        rescue ActiveRecord::RecordInvalid
+          false
         end
       end
     end
diff --git a/decidim-budgets/app/commands/decidim/budgets/remove_line_item.rb b/decidim-budgets/app/commands/decidim/budgets/remove_line_item.rb
index 0a41cc946e31e..015b47edc53df 100644
--- a/decidim-budgets/app/commands/decidim/budgets/remove_line_item.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/remove_line_item.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to add remove line items from orders
-    class RemoveLineItem < Rectify::Command
+    class RemoveLineItem < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 6c75ad6ed2e9e..72aecc28793f0 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -8,8 +8,9 @@ class ProjectsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
         include Decidim::Proposals::Admin::Picker if Decidim::Budgets.enable_proposal_linking
         include Decidim::Budgets::Admin::Filterable
+        helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
 
-        helper_method :projects, :finished_orders, :pending_orders, :present
+        helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
         def collection
           @collection ||= budget.projects.page(params[:page]).per(15)
@@ -74,6 +75,93 @@ def destroy
           end
         end
 
+        def update_category
+          enforce_permission_to :update, :project_category
+
+          ::Decidim::Budgets::Admin::UpdateProjectCategory.call(params[:category][:id], project_ids) do
+            on(:invalid_category) do
+              flash.now[:error] = I18n.t(
+                "projects.update_category.select_a_category",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = I18n.t(
+                "projects.update_category.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_category) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :category)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :category)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
+          end
+        end
+
+        def update_scope
+          enforce_permission_to :update, :project_scope
+
+          ::Decidim::Budgets::Admin::UpdateProjectScope.call(params[:scope_id], project_ids) do
+            on(:invalid_scope) do
+              flash.now[:error] = t(
+                "projects.update_scope.select_a_scope",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_scope.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_scope) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :scope)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :scope)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
+          end
+        end
+
+        def update_selected
+          enforce_permission_to :update, :project_selected
+
+          ::Decidim::Budgets::Admin::UpdateProjectSelection.call(params.dig(:selected, "value"), project_ids) do
+            on(:invalid_selection) do
+              flash.now[:error] = t(
+                "projects.update_selected.select_a_selection",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_selected.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_selection) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :selected, selection: @selection)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :selected, selection: @selection)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-change-selected-projects", attribute_selector: "#selected_value" } }
+          end
+        end
+
         private
 
         def projects
@@ -84,6 +172,10 @@ def orders
           @orders ||= Order.where(budget: budget)
         end
 
+        def project_ids
+          @project_ids ||= params[:project_ids]
+        end
+
         def pending_orders
           orders.pending
         end
@@ -95,6 +187,50 @@ def finished_orders
         def project
           @project ||= projects.find(params[:id])
         end
+
+        def update_projects_bulk_response_successful(response, subject, extra = {})
+          return if response[:successful].blank?
+
+          interpolations = {
+            subject_name: response[:subject_name],
+            projects: response[:successful].to_sentence
+          }
+
+          case subject
+          when :category
+            t("projects.update_category.success", scope: "decidim.budgets.admin", **interpolations)
+          when :scope
+            t("projects.update_scope.success", scope: "decidim.budgets.admin", **interpolations)
+          when :selected
+            if extra[:selection]
+              t("projects.update_selected.success.selected", scope: "decidim.budgets.admin", **interpolations)
+            else
+              t("projects.update_selected.success.unselected", scope: "decidim.budgets.admin", **interpolations)
+            end
+          end
+        end
+
+        def update_projects_bulk_response_errored(response, subject, extra = {})
+          return if response[:errored].blank?
+
+          interpolations = {
+            subject_name: response[:subject_name],
+            projects: response[:errored].to_sentence
+          }
+
+          case subject
+          when :category
+            t("projects.update_category.invalid", scope: "decidim.budgets.admin", **interpolations)
+          when :scope
+            t("projects.update_scope.invalid", scope: "decidim.budgets.admin", **interpolations)
+          when :selected
+            if extra[:selection]
+              t("projects.update_selected.invalid.selected", scope: "decidim.budgets.admin", **interpolations)
+            else
+              t("projects.update_selected.invalid.unselected", scope: "decidim.budgets.admin", **interpolations)
+            end
+          end
+        end
       end
     end
   end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
index 7a6ed8283c8f4..6602fc2ec026b 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb
@@ -8,7 +8,7 @@ class ProjectsController < Decidim::Budgets::ApplicationController
       include NeedsCurrentOrder
       include Decidim::Budgets::Orderable
 
-      helper_method :projects, :project, :budget
+      helper_method :projects, :project, :budget, :all_geocoded_projects
 
       def index
         raise ActionController::RoutingError, "Not Found" unless budget
@@ -28,34 +28,34 @@ def budget
       def projects
         return @projects if @projects
 
-        @projects = reorder(search.results)
+        @projects = reorder(search.result)
         @projects = @projects.page(params[:page]).per(current_component.settings.projects_per_page)
       end
 
+      def all_geocoded_projects
+        @all_geocoded_projects ||= projects.geocoded
+      end
+
       def project
         @project ||= Project.find_by(id: params[:id])
       end
 
-      def search_klass
-        ProjectSearch
+      def search_collection
+        Project.where(budget: budget).includes([:scope, :component, :attachments, :category])
       end
 
       def default_filter_params
         {
-          search_text: "",
-          status: default_filter_status_params,
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params
+          search_text_cont: "",
+          with_any_status: default_filter_status_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params
         }
       end
 
       def default_filter_status_params
         voting_finished? ? %w(selected) : %w(all)
       end
-
-      def context_params
-        { budget: budget, component: current_component, organization: current_organization }
-      end
     end
   end
 end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 16a2892dd7842..57086b4436a91 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -24,14 +24,14 @@ class BudgetForm < Decidim::Form
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
       end
     end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/order_reminder_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/order_reminder_form.rb
new file mode 100644
index 0000000000000..c4340dd75eaea
--- /dev/null
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/order_reminder_form.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class OrderReminderForm < Decidim::Form
+        def reminder_amount
+          @reminder_amount ||= if !voting_enabled? || voting_ends_soon?
+                                 0
+                               else
+                                 user_ids = []
+                                 unfinished_orders.each do |order|
+                                   reminder = Decidim::Reminder.find_by(component: current_component, user: order.user)
+                                   if !reminder || (reminder.deliveries.present? && reminder.deliveries.last.created_at < minimum_interval_between_reminders.ago)
+                                     user_ids << order.user.id
+                                   end
+                                 end
+                                 user_ids.uniq.count
+                               end
+        end
+
+        def voting_enabled?
+          current_component.current_settings.votes == "enabled"
+        end
+
+        def voting_ends_soon?
+          return false unless participatory_space.respond_to? :active_step
+          return false if participatory_space.active_step.blank?
+
+          time_zone = current_organization.time_zone
+          return false if time_zone.blank?
+
+          end_time = current_component.participatory_space.active_step[:end_date].in_time_zone(time_zone).end_of_day
+
+          6.hours.from_now >= end_time
+        end
+
+        def minimum_interval_between_reminders
+          24.hours
+        end
+
+        private
+
+        def minimum_time_before_first_reminder
+          @minimum_time_before_first_reminder ||= begin
+            reminder_manifest = Decidim.reminders_registry.for(:orders)
+            if reminder_manifest.blank?
+              minimum_interval_between_reminders
+            else
+              Array(reminder_manifest.settings.attributes[:reminder_times].default).first
+            end
+          end
+        end
+
+        def participatory_space
+          @participatory_space ||= current_component.participatory_space
+        end
+
+        def unfinished_orders
+          @unfinished_orders ||= Decidim::Budgets::Order.where(
+            budget: budgets,
+            checked_out_at: nil,
+            created_at: Time.zone.at(0)..minimum_time_before_first_reminder.ago
+          ).select do |order|
+            order.user.email.present?
+          end
+        end
+
+        def budgets
+          @budgets ||= Decidim::Budgets::Budget.where(component: current_component)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index ec140e27261b4..6050865cf7589 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -13,6 +13,9 @@ class ProjectForm < Decidim::Form
         translatable_attribute :title, String
         translatable_attribute :description, String
 
+        attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
         attribute :budget_amount, Integer
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
@@ -25,7 +28,7 @@ class ProjectForm < Decidim::Form
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :budget_amount, presence: true, numericality: { greater_than: 0 }
-
+        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
@@ -33,6 +36,7 @@ class ProjectForm < Decidim::Form
         validate :notify_missing_attachment_if_errored
 
         delegate :categories, to: :current_component
+        alias component current_component
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
@@ -49,6 +53,18 @@ def proposals
                          &.order(title: :asc)
         end
 
+        def geocoding_enabled?
+          Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
+        end
+
+        def has_address?
+          geocoding_enabled? && address.present?
+        end
+
+        def geocoded?
+          latitude.present? && longitude.present?
+        end
+
         # Finds the Budget from the decidim_budgets_budget_id.
         #
         # Returns a Decidim::Budgets:Budget
@@ -67,14 +83,14 @@ def category
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the project
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         private
diff --git a/decidim-budgets/app/helpers/decidim/budgets/admin/project_bulk_actions_helper.rb b/decidim-budgets/app/helpers/decidim/budgets/admin/project_bulk_actions_helper.rb
new file mode 100644
index 0000000000000..be3a0ab564c35
--- /dev/null
+++ b/decidim-budgets/app/helpers/decidim/budgets/admin/project_bulk_actions_helper.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      module ProjectBulkActionsHelper
+        def bulk_selections
+          select(
+            :selected,
+            :value,
+            [
+              [t("projects.index.select_for_implementation", scope: "decidim.budgets.admin"), true],
+              [t("projects.index.deselect_implementation", scope: "decidim.budgets.admin"), false]
+            ]
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb b/decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb
index a41affeff9aa9..b82153d03b8c7 100644
--- a/decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb
+++ b/decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb
@@ -5,6 +5,8 @@ module Budgets
     # A helper to render order and budgets actions
     module ProjectsHelper
       include ActiveSupport::NumberHelper
+      include Decidim::ApplicationHelper
+      include Decidim::MapHelper
 
       # Render a budget as a currency
       #
@@ -82,6 +84,32 @@ def current_rule_description
           t(".vote_threshold_percent_rule.description", minimum_budget: budget_to_currency(current_order.minimum_budget))
         end
       end
+
+      # Serialize a collection of geocoded projects to be used by the dynamic map component
+      #
+      # geocoded_projects - A collection of geocoded projects
+      def projects_data_for_map(geocoded_projects)
+        geocoded_projects.map do |project|
+          project_data_for_map(project)
+        end
+      end
+
+      def project_data_for_map(project)
+        project
+          .slice(:latitude, :longitude, :address)
+          .merge(
+            title: decidim_html_escape(translated_attribute(project.title)),
+            description: html_truncate(decidim_sanitize_editor(translated_attribute(project.description)), length: 100),
+            icon: icon("project", width: 40, height: 70, remove_icon_class: true),
+            link: ::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path
+          )
+      end
+
+      def has_position?(project)
+        return if project.address.blank?
+
+        project.latitude.present? && project.longitude.present?
+      end
     end
   end
 end
diff --git a/decidim-budgets/app/jobs/decidim/budgets/send_vote_reminder_job.rb b/decidim-budgets/app/jobs/decidim/budgets/send_vote_reminder_job.rb
new file mode 100644
index 0000000000000..6b33e2f87f180
--- /dev/null
+++ b/decidim-budgets/app/jobs/decidim/budgets/send_vote_reminder_job.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class SendVoteReminderJob < ApplicationJob
+      queue_as :vote_reminder
+
+      def perform(reminder)
+        return if reminder.records.active.blank?
+
+        ::Decidim::ReminderDelivery.create(reminder: reminder)
+        ::Decidim::Budgets::VoteReminderMailer.vote_reminder(reminder).deliver_now
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/mailers/decidim/budgets/vote_reminder_mailer.rb b/decidim-budgets/app/mailers/decidim/budgets/vote_reminder_mailer.rb
new file mode 100644
index 0000000000000..25be9680fb9a8
--- /dev/null
+++ b/decidim-budgets/app/mailers/decidim/budgets/vote_reminder_mailer.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class VoteReminderMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+
+      helper Decidim::TranslationsHelper
+
+      helper_method :routes
+
+      # Send the user an email reminder to finish voting
+      #
+      # reminder - the reminder to send.
+      def vote_reminder(reminder)
+        @reminder = reminder
+        @user = reminder.user
+        with_user(@user) do
+          @orders = reminder.records.active.map(&:remindable)
+          @organization = @user.organization
+
+          subject = I18n.t(
+            "decidim.budgets.vote_reminder_mailer.vote_reminder.email_subject",
+            count: @orders.count
+          )
+
+          mail(to: @user.email, subject: subject)
+        end
+      end
+
+      private
+
+      def routes
+        @routes ||= Decidim::EngineRouter.main_proxy(@reminder.component)
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/models/decidim/budgets/order.rb b/decidim-budgets/app/models/decidim/budgets/order.rb
index b7fe7c3601f86..f269bfd01d58b 100644
--- a/decidim-budgets/app/models/decidim/budgets/order.rb
+++ b/decidim-budgets/app/models/decidim/budgets/order.rb
@@ -5,7 +5,7 @@ module Budgets
     # The data store for a Order in the Decidim::Budgets component. It is unique for each
     # user and component and contains a collection of projects
     class Order < Budgets::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id"
@@ -15,7 +15,6 @@ class Order < Budgets::ApplicationRecord
       has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
       validates :user, uniqueness: { scope: :budget }
-      validates :budget, presence: true
       validate :user_belongs_to_organization
 
       # Rules active for the budget threshold and minimum budgets rules.
@@ -171,7 +170,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::Budgets::DataPortabilityBudgetsOrderSerializer
+        Decidim::Budgets::DownloadYourDataBudgetsOrderSerializer
       end
 
       def self.newsletter_participant_ids(component)
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 913fbd85a4dce..ea98312c4d6c2 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -18,6 +18,7 @@ class Project < Budgets::ApplicationRecord
       include Decidim::Randomable
       include Decidim::Searchable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       translatable_fields :title, :description
 
@@ -33,6 +34,10 @@ class Project < Budgets::ApplicationRecord
       scope :selected, -> { where.not(selected_at: nil) }
       scope :not_selected, -> { where(selected_at: nil) }
 
+      geocoded_by :address
+
+      scope_search_multi :with_any_status, [:selected, :not_selected]
+
       searchable_fields(
         scope_id: :decidim_scope_id,
         participatory_space: { component: :participatory_space },
@@ -98,10 +103,9 @@ def attachment_context
         Arel.sql(%{cast("decidim_budgets_projects"."id" as text)})
       end
 
-      # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       ransacker :selected do
         Arel.sql(%{("decidim_budgets_projects"."selected_at")::text})
@@ -119,6 +123,10 @@ def attachment_context
         SQL
         Arel.sql(query)
       end
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_status, :with_any_scope, :with_any_category]
+      end
     end
   end
 end
diff --git a/decidim-budgets/app/packs/entrypoints/decidim_budgets_admin.js b/decidim-budgets/app/packs/entrypoints/decidim_budgets_admin.js
new file mode 100644
index 0000000000000..a11f4f9a803cd
--- /dev/null
+++ b/decidim-budgets/app/packs/entrypoints/decidim_budgets_admin.js
@@ -0,0 +1 @@
+import "src/decidim/budgets/admin/projects"
diff --git a/decidim-budgets/app/packs/src/decidim/budgets/admin/projects.js b/decidim-budgets/app/packs/src/decidim/budgets/admin/projects.js
new file mode 100644
index 0000000000000..f76e4dab40a37
--- /dev/null
+++ b/decidim-budgets/app/packs/src/decidim/budgets/admin/projects.js
@@ -0,0 +1,143 @@
+/* eslint-disable no-invalid-this */
+$(() => {
+  const selectedResourcesCount = () => {
+    return $(".table-list .js-check-all-resources:checked").length
+  }
+
+  const selectedResourcesNotPublishedAnswerCount = () => {
+    return $(".table-list [data-published-state=false] .js-check-all-resources:checked").length
+  }
+
+  const selectedResourcesCountUpdate = () => {
+    const selectedResources = selectedResourcesCount();
+    const selectedResourcesNotPublishedAnswer = selectedResourcesNotPublishedAnswerCount();
+
+    if (selectedResources === 0) {
+      $("#js-selected-resources-count").text("")
+    } else {
+      $("#js-selected-resources-count").text(selectedResources);
+    }
+
+    if (selectedResources >= 2) {
+      $('button[data-action="merge-resources"]').parent().show();
+    } else {
+      $('button[data-action="merge-resources"]').parent().hide();
+    }
+
+    if (selectedResourcesNotPublishedAnswer > 0) {
+      $('button[data-action="publish-answers"]').parent().show();
+      $("#js-form-publish-answers-number").text(selectedResourcesNotPublishedAnswer);
+    } else {
+      $('button[data-action="publish-answers"]').parent().hide();
+    }
+  }
+
+  const showBulkActionsButton = () => {
+    if (selectedResourcesCount() > 0) {
+      $("#js-bulk-actions-button").removeClass("hide");
+    }
+  }
+
+  const hideBulkActionsButton = (force = false) => {
+    if (selectedResourcesCount() === 0 || force === true) {
+      $("#js-bulk-actions-button").addClass("hide");
+      $("#js-bulk-actions-dropdown").removeClass("is-open");
+    }
+  }
+
+  const showOtherActionsButtons = () => {
+    $("#js-other-actions-wrapper").removeClass("hide");
+  }
+
+  const hideOtherActionsButtons = () => {
+    $("#js-other-actions-wrapper").addClass("hide");
+  }
+
+  const hideBulkActionForms = () => {
+    $(".js-bulk-action-form").addClass("hide");
+  }
+
+  if ($("#js-bulk-actions-wrapper").length === 0) {
+    return;
+  }
+
+  // Expose functions to make them available in .js.erb templates
+  window.hideBulkActionForms = hideBulkActionForms;
+  window.hideBulkActionsButton = hideBulkActionsButton;
+  window.showOtherActionsButtons = showOtherActionsButtons;
+  window.selectedResourcesCountUpdate = selectedResourcesCountUpdate;
+
+
+  if ($(".js-bulk-action-form").length) {
+    hideBulkActionForms();
+    $("#js-bulk-actions-button").addClass("hide");
+
+    $("#js-bulk-actions-dropdown ul li button").on("click", (event) => {
+      event.preventDefault();
+      let action = $(event.target).data("action");
+
+      if (action) {
+        $(`#js-form-${action}`).on("submit", () => {
+          $(".layout-content > .callout-wrapper").html("");
+        })
+
+        $(`#js-${action}-actions`).removeClass("hide");
+        hideBulkActionsButton(true);
+        hideOtherActionsButtons();
+      }
+    })
+
+    // select all checkboxes
+    $(".js-check-all").on("change", function() {
+      $(".js-check-all-resources").prop("checked", $(this).prop("checked"));
+
+      if ($(this).prop("checked")) {
+        $(".js-check-all-resources").closest("tr").addClass("selected");
+        showBulkActionsButton();
+      } else {
+        $(".js-check-all-resources").closest("tr").removeClass("selected");
+        hideBulkActionsButton();
+      }
+
+      selectedResourcesCountUpdate();
+    });
+
+    // resource checkbox change
+    $(".table-list").on("change", ".js-check-all-resources", function() {
+      let resourceId = $(this).val()
+      let checked = $(this).prop("checked")
+
+      // uncheck "select all", if one of the listed checkbox item is unchecked
+      if ($(this).prop("checked") === false) {
+        $(".js-check-all").prop("checked", false);
+      }
+      // check "select all" if all checkbox resources are checked
+      if ($(".js-check-all-resources:checked").length === $(".js-check-all-resources").length) {
+        $(".js-check-all").prop("checked", true);
+        showBulkActionsButton();
+      }
+
+      if ($(this).prop("checked")) {
+        showBulkActionsButton();
+        $(this).closest("tr").addClass("selected");
+      } else {
+        hideBulkActionsButton();
+        $(this).closest("tr").removeClass("selected");
+      }
+
+      if ($(".js-check-all-resources:checked").length === 0) {
+        hideBulkActionsButton();
+      }
+
+      $(".js-bulk-action-form").find(`.js-resource-id-${resourceId}`).prop("checked", checked);
+      selectedResourcesCountUpdate();
+    });
+
+    $(".js-cancel-bulk-action").on("click", () => {
+      hideBulkActionForms()
+      showBulkActionsButton();
+      showOtherActionsButtons();
+    });
+  }
+});
+/* eslint-enable no-invalid-this */
diff --git a/decidim-budgets/app/permissions/decidim/budgets/admin/permissions.rb b/decidim-budgets/app/permissions/decidim/budgets/admin/permissions.rb
index 9b1b3423ae6d9..22a92920d9e8c 100644
--- a/decidim-budgets/app/permissions/decidim/budgets/admin/permissions.rb
+++ b/decidim-budgets/app/permissions/decidim/budgets/admin/permissions.rb
@@ -19,13 +19,18 @@ def permissions
             end
           when :project, :projects
             case permission_action.action
-            when :create
-              permission_action.allow!
-            when :import_proposals
+            when :create, :import_proposals, :project_category
               permission_action.allow!
             when :update, :destroy
               permission_action.allow! if project.present?
             end
+          when :order
+            case permission_action.action
+            when :remind
+              permission_action.allow!
+            end
+          when :project_category, :project_scope, :project_selected
+            permission_action.allow!
           end
 
           permission_action
diff --git a/decidim-budgets/app/queries/decidim/budgets/filtered_projects.rb b/decidim-budgets/app/queries/decidim/budgets/filtered_projects.rb
index 9caac3178758a..e5b3739fa9e07 100644
--- a/decidim-budgets/app/queries/decidim/budgets/filtered_projects.rb
+++ b/decidim-budgets/app/queries/decidim/budgets/filtered_projects.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A class used to find projects filtered by components and a date range
-    class FilteredProjects < Rectify::Query
+    class FilteredProjects < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component
diff --git a/decidim-budgets/app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb b/decidim-budgets/app/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb
similarity index 88%
rename from decidim-budgets/app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb
rename to decidim-budgets/app/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb
index b6c452c01e6ba..49e5e44b6f4e1 100644
--- a/decidim-budgets/app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb
+++ b/decidim-budgets/app/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb
@@ -2,13 +2,13 @@
 
 module Decidim
   module Budgets
-    class DataPortabilityBudgetsOrderSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataBudgetsOrderSerializer < Decidim::Exporters::Serializer
       # Public: Initializes the serializer with a conversation.
       def initialize(order)
         @order = order
       end
 
-      # Serializes a Debate for data portability
+      # Serializes a Debate for download your data
       def serialize
         {
           id: order.id,
diff --git a/decidim-budgets/app/services/decidim/budgets/order_reminder_generator.rb b/decidim-budgets/app/services/decidim/budgets/order_reminder_generator.rb
new file mode 100644
index 0000000000000..96deeec39175d
--- /dev/null
+++ b/decidim-budgets/app/services/decidim/budgets/order_reminder_generator.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This class is the generator class which creates and updates order related reminders,
+    # after reminder is generated it is send to user who have not checked out his/her/their vote.
+    class OrderReminderGenerator
+      attr_reader :reminder_jobs_queued
+
+      def initialize
+        @reminder_manifest = Decidim.reminders_registry.for(:orders)
+        @reminder_jobs_queued = 0
+      end
+
+      # Creates reminders and updates them if they already exists.
+      def generate
+        Decidim::Component.where(manifest_name: "budgets").each do |component|
+          next if component.current_settings.votes != "enabled"
+
+          send_reminders(component)
+        end
+      end
+
+      def generate_for(component, &block)
+        @alternative_refresh_state = block
+        send_reminders(component)
+      end
+
+      private
+
+      attr_reader :reminder_manifest
+
+      def send_reminders(component)
+        budgets = Decidim::Budgets::Budget.where(component: component)
+        pending_orders = Decidim::Budgets::Order.where(budget: budgets, checked_out_at: nil)
+        users = Decidim::User.where(id: pending_orders.pluck(:decidim_user_id).uniq)
+        users.each do |user|
+          reminder = Decidim::Reminder.find_or_create_by(user: user, component: component)
+          users_pending_orders = pending_orders.where(user: user)
+          update_reminder_records(reminder, users_pending_orders)
+          if reminder.records.active.any?
+            Decidim::Budgets::SendVoteReminderJob.perform_later(reminder)
+            @reminder_jobs_queued += 1
+          end
+        end
+      end
+
+      def update_reminder_records(reminder, users_pending_orders)
+        clean_checked_out_and_deleted_orders(reminder)
+        add_pending_orders(reminder, users_pending_orders)
+      end
+
+      def clean_checked_out_and_deleted_orders(reminder)
+        reminder.records.each do |record|
+          if record.remindable.nil?
+            record.update(state: "deleted")
+          elsif record.remindable.checked_out_at.present?
+            record.update(state: "completed")
+          end
+        end
+      end
+
+      def add_pending_orders(reminder, users_pending_orders)
+        reminder.records << users_pending_orders.map { |order| Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: order) }
+        return @alternative_refresh_state.call(reminder) if @alternative_refresh_state.present?
+
+        reminder.records.each do |record|
+          refresh_state(record, reminder.deliveries.length) if %w(active pending).include? record.state
+        end
+      end
+
+      def refresh_state(record, delivered_count)
+        intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
+        return record.update(state: "pending") if delivered_count >= intervals.length
+
+        record.state = intervals[delivered_count].ago > record.remindable.created_at ? "active" : "pending"
+        record.save if record.changed?
+      end
+
+      def voting_enabled?(component)
+        component.current_settings.votes == "enabled"
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/app/services/decidim/budgets/project_search.rb b/decidim-budgets/app/services/decidim/budgets/project_search.rb
deleted file mode 100644
index 3c1d68ec40e12..0000000000000
--- a/decidim-budgets/app/services/decidim/budgets/project_search.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    # This class handles search and filtering of projects. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the projects.
-    class ProjectSearch < ResourceSearch
-      text_search_fields :title, :description
-
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the projects from.
-      def initialize(options = {})
-        super(Project.all, options)
-      end
-
-      # Creates the SearchLight base query.
-      def base_query
-        raise "Missing budget" unless budget
-        raise "Missing component" unless component
-
-        @scope.where(budget: budget)
-      end
-
-      # Returns the random projects for the current page.
-      def results
-        Project.where(id: super.pluck(:id)).includes([:scope, :component, :attachments, :category])
-      end
-
-      def search_status
-        return query if status.member?("all")
-
-        apply_scopes(%w(selected not_selected), status)
-      end
-
-      private
-
-      # Private: Since budget is not used by a search method we need
-      # to define the method manually.
-      def budget
-        options[:budget]
-      end
-    end
-  end
-end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/budgets/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/budgets/index.html.erb
index 3ea474a6a75ef..e251c51136834 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/budgets/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/budgets/index.html.erb
@@ -5,6 +5,9 @@
         <%= t(".title") %>
       </div>
       <div class="flex--cc flex-gap--1">
+        <% if allowed_to? :remind, :order %>
+          <%= link_to t("actions.send_voting_reminders", scope: "decidim.budgets"), admin_reminders_path(current_component, name: "orders"), class: "button tiny button--title" %>
+        <% end %>
         <% if allowed_to? :export, :budget %>
           <%= export_dropdown %>
         <% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb
new file mode 100644
index 0000000000000..65f325038d0fa
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb
@@ -0,0 +1,13 @@
+<div class="flex--cc flex-gap--1">
+  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/dropdown" %>
+
+  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/recategorize" %>
+  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/scope-change" %>
+  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/change-selected" %>
+
+  <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget), class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
+  <% if allowed_to? :export, :budget %>
+    <%= export_dropdown(current_component, budget.id) %>
+  <% end %>
+  <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
+</div>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
index aca30797b3d89..868f9dff443ea 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb
@@ -18,6 +18,12 @@
       <%= form.number_field :budget_amount %>
     </div>
 
+    <% if @form.geocoding_enabled? %>
+      <div class="row column">
+        <%= form.geocoding_field :address %>
+      </div>
+    <% end %>
+
     <% if current_component.has_subscopes? %>
       <div class="row column">
         <%= scopes_picker_field form, :decidim_scope_id, root: budget.scope %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb
new file mode 100644
index 0000000000000..4001430507570
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb
@@ -0,0 +1,50 @@
+<tr data-id="<%= project.id %>">
+  <td>
+    <%= check_box_tag "project_ids_s[]", project.id, false, class: "js-check-all-resources js-project-list-check js-resource-id-#{project.id}" %><br>
+  </td>
+  <td>
+    <%= project.id %><br>
+  </td>
+  <td>
+    <%= translated_attribute(project.title) %><br>
+  </td>
+  <td>
+    <% if project.category %>
+      <%= translated_attribute project.category.name %>
+    <% end %>
+  </td>
+  <%= td_resource_scope_for(project.scope) %>
+  <td>
+    <%= project.confirmed_orders_count %>
+  </td>
+  <td>
+    <% if project.selected? %>
+      <%= content_tag :strong, t("projects.index.selected", scope: "decidim.budgets.admin"), class: "text-success" %>
+    <% else %>
+      <%= content_tag :span, "x", class: "text-muted" %>
+    <% end %>
+  </td>
+  <td class="table-list__actions">
+    <%= icon_link_to "eye", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
+
+    <% if allowed_to? :update, :project, project: project %>
+      <%= icon_link_to "pencil", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+    <% end %>
+
+    <% if allowed_to? :update, :project, project: project %>
+        <%= icon_link_to "folder", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
+    <% end %>
+
+    <% if allowed_to? :update, :project, project: project %>
+      <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
+    <% end %>
+
+    <%= resource_permissions_link(project) %>
+
+    <% if allowed_to? :destroy, :project, project: project %>
+      <%= icon_link_to "circle-x", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+    <% else %>
+      <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
+    <% end %>
+  </td>
+</tr>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb
new file mode 100644
index 0000000000000..805a498aa9a23
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb
@@ -0,0 +1,15 @@
+<div id="js-change-selected-projects-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_selected_budget_projects_path, method: :post, remote: true, id: "js-form-change-selected-projects", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% projects.each do |project| %>
+        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
+      <% end %>
+    </div>
+
+    <%= bulk_selections %>
+
+    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-selected", class: "button small button--simple float-left") %>
+
+    <button id="js-cancel-edit-selected" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
+  <% end %>
+</div>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb
new file mode 100644
index 0000000000000..788458e269575
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb
@@ -0,0 +1,36 @@
+<div id="js-bulk-actions-wrapper">
+  <button
+    id="js-bulk-actions-button"
+    class="button button--nomargin tiny success light dropdown hide"
+    type="button"
+    data-toggle="js-bulk-actions-dropdown">
+    <%= t("decidim.budgets.admin.projects.index.actions") %>
+  </button>
+
+  <div
+    id="js-bulk-actions-dropdown"
+    class="dropdown-pane"
+    data-position="bottom"
+    data-alignment="right"
+    data-dropdown="dropdown"
+    data-auto-focus="false"
+    data-events="resize">
+    <ul class="list-reset">
+      <li>
+        <button type="button" data-action="recategorize-projects">
+          <%= t("decidim.budgets.admin.projects.index.change_category") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="scope-change-projects">
+          <%= t("decidim.budgets.admin.projects.index.change_scope") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="change-selected-projects">
+          <%= t("decidim.budgets.admin.projects.index.change_selected") %>
+        </button>
+      </li>
+    </ul>
+  </div>
+</div>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb
new file mode 100644
index 0000000000000..f6397fdf82871
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb
@@ -0,0 +1,15 @@
+<div id="js-recategorize-projects-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_category_budget_projects_path, method: :post, remote: true, id: "js-form-recategorize-projects", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% projects.each do |project| %>
+        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
+      <% end %>
+    </div>
+
+    <%= bulk_categories_select current_component.categories %>
+
+    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-category", class: "button small button--simple float-left") %>
+
+    <button id="js-cancel-edit-category" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
+  <% end %>
+</div>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb
new file mode 100644
index 0000000000000..44efc6a795831
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb
@@ -0,0 +1,25 @@
+<div id="js-scope-change-projects-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_scope_budget_projects_path, method: :post, remote: true, id: "js-form-scope-change-projects", class: "flex--cc flex-gap--1") do %>
+    <div class="checkboxes hide">
+      <% projects.each do |project| %>
+        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
+      <% end %>
+    </div>
+
+    <%= scopes_picker_tag(
+          :scope_id,
+          try(:current_participatory_space)&.scope,
+          field: t("models.project.fields.scope", scope: "decidim.budgets")
+        ) %>
+
+    <%= submit_tag(
+          t("decidim.budgets.admin.projects.index.update_scope_button"),
+          id: "js-submit-scope-change-projects",
+          class: "button small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-scope-change-projects" class="button tiny clear compact js-cancel-bulk-action" type="button">
+      <%= t("decidim.budgets.admin.projects.index.cancel") %>
+    </button>
+  <% end %>
+</div>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index 10015c8207324..8acb05032aa12 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -4,14 +4,9 @@
       <div>
         <%= link_to translated_attribute(budget.title), budgets_path %> &gt;
         <%= t(".title") %>
+        <span id="js-selected-resources-count" class="component-counter component-counter--inline" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
       </div>
-      <div class="flex--cc flex-gap--1">
-        <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget), class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
-        <% if allowed_to? :export, :budget %>
-          <%= export_dropdown(current_component, budget.id) %>
-        <% end %>
-        <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
-      </div>
+      <%= render partial: "bulk-actions" %>
     </h2>
   </div>
 
@@ -21,6 +16,7 @@
       <table class="table-list">
         <thead>
           <tr>
+            <th><%= check_box_tag "projects_bulk", "all", false, class: "js-check-all" %></th>
             <th><%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %>
             <th><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
             <th><%= sort_link(query, :category_name, t("models.project.fields.category", scope: "decidim.budgets") ) %></th>
@@ -32,53 +28,7 @@
         </thead>
         <tbody>
           <% projects.each do |project| %>
-            <tr data-id="<%= project.id %>">
-              <td>
-                <%= project.id %><br>
-              </td>
-              <td>
-                <%= translated_attribute(project.title) %><br>
-              </td>
-              <td>
-                <% if project.category %>
-                  <%= translated_attribute project.category.name %>
-                <% end %>
-              </td>
-              <%= td_resource_scope_for(project.scope) %>
-              <td>
-               <%= project.confirmed_orders_count %>
-              </td>
-              <td>
-                <% if project.selected? %>
-                  <%= content_tag :strong, t(".selected"), class: "text-success" %>
-                <% else %>
-                  <%= content_tag :span, "×", class: "text-muted" %>
-                <% end %>
-              </td>
-              <td class="table-list__actions">
-                <%= icon_link_to "eye", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
-
-                <% if allowed_to? :update, :project, project: project %>
-                  <%= icon_link_to "pencil", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
-                <% end %>
-
-                <% if allowed_to? :update, :project, project: project %>
-                    <%= icon_link_to "folder", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
-                <% end %>
-
-                <% if allowed_to? :update, :project, project: project %>
-                  <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
-                <% end %>
-
-                <%= resource_permissions_link(project) %>
-
-                <% if allowed_to? :destroy, :project, project: project %>
-                  <%= icon_link_to "circle-x", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
-                <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
-                <% end %>
-              </td>
-            </tr>
+            <%= render partial: "project-tr", locals: { project: project } %>
           <% end %>
         </tbody>
       </table>
@@ -91,3 +41,5 @@
     <strong><%= t ".pending_orders" %>:&nbsp;</strong><span><%= pending_orders.count %></span>
   </div>
 </div>
+
+<%= javascript_pack_tag "decidim_budgets_admin" %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/update_attribute.js.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/update_attribute.js.erb
new file mode 100644
index 0000000000000..66a833877961a
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/update_attribute.js.erb
@@ -0,0 +1,26 @@
+<% if flash.now[:error].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:alert].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:notice].present? %>
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+  <% project_ids.each do |id| %>
+    $(".table-list [data-id='<%= id %>']")
+      .replaceWith("<%= escape_javascript(render partial: %q{project-tr}, locals: { project: Decidim::Budgets::Project.find(id) }) %>");
+  <% end %>
+
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $(".js-check-all").prop('checked', false);
+  $(".js-check-all-resources").prop('checked', false);
+  window.hideBulkActionsButton();
+  window.hideBulkActionForms();
+  window.showOtherActionsButtons();
+  window.selectedResourcesCountUpdate();
+<% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb
index bc6dea175d27c..b2c3fe1ac9973 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="projects">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -15,15 +15,15 @@
   </div>
 
   <% if voting_finished? %>
-    <%= form.check_boxes_tree :status, filter_status_values, legend_title: t(".status"), "aria-controls": "projects" %>
+    <%= form.check_boxes_tree :with_any_status, filter_status_values, legend_title: t(".status"), "aria-controls": "projects" %>
   <% end %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, resource_filter_scope_values(budget.scope), legend_title: t(".scope"), "aria-controls": "projects" %>
+    <%= form.check_boxes_tree :with_any_scope, resource_filter_scope_values(budget.scope), legend_title: t(".scope"), "aria-controls": "projects" %>
   <% end %>
 
   <% if current_participatory_space.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "projects" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "projects" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb
index 0546e9fd9587b..c0491853684e2 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb
@@ -5,6 +5,31 @@
 
 <div class="voting-wrapper">
   <div class="row columns">
+    <% if component_settings.geocoding_enabled? %>
+      <%= dynamic_map_for projects_data_for_map(all_geocoded_projects) do %>
+        <template id="marker-popup">
+          <div class="map-info__content">
+            <h3>${title}</h3>
+            <div id="bodyContent">
+              <p>{{html body}}</p>
+              <div class="map__date-address">
+                <div class="address card__extra">
+                  <div class="address__icon">{{html icon}}</div>
+                  <div class="address__details">
+                    <span>${address}</span><br>
+                  </div>
+                </div>
+              </div>
+              <div class="map-info__button">
+                <a href="${link}" class="button button--sc">
+                  <%= t(".view_project") %>
+                </a>
+              </div>
+            </div>
+          </div>
+        </template>
+      <% end %>
+    <% end %>
     <% if voting_finished? %>
       <h2 class="heading2">
         <%= t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
@@ -33,4 +58,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag("decidim_budgets") %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_budgets" %>
+<% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
index e4044b74bbc0a..2abbd6e215cc8 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
@@ -55,6 +55,9 @@ edit_link(
     </div>
     <div class="columns mediumlarge-8 mediumlarge-pull-4">
       <div class="section">
+        <% if component_settings.geocoding_enabled? && project.geocoded? %>
+          <%= render partial: "decidim/shared/static_map", locals: { icon_name: "projects", geolocalizable: project } %>
+        <% end %>
         <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
         <%= decidim_sanitize_editor translated_attribute project.description %>
         <%= cell "decidim/budgets/project_tags", project, context: { extra_classes: ["tags--project"] } %>
@@ -68,4 +71,6 @@ edit_link(
 
 <%= comments_for project, polymorphic: [project.budget] %>
 
-<%= javascript_pack_tag("decidim_budgets") %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_budgets" %>
+<% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/vote_reminder_mailer/vote_reminder.html.erb b/decidim-budgets/app/views/decidim/budgets/vote_reminder_mailer/vote_reminder.html.erb
new file mode 100644
index 0000000000000..9aa09cf02cb08
--- /dev/null
+++ b/decidim-budgets/app/views/decidim/budgets/vote_reminder_mailer/vote_reminder.html.erb
@@ -0,0 +1,21 @@
+<p><%= t(".email_intro") %></p>
+
+<p><%= t(".email_budgets") %></p>
+
+<ul>
+  <% @orders.each do |order| %>
+  <li>
+    <%= link_to(
+      translated_attribute(order.budget.title),
+      routes.budget_url(order.budget, host: @organization.host)
+    ) %>
+  </li>
+  <% end %>
+</ul>
+
+<p><%= t(".email_outro") %></p>
+
+<%= link_to(
+  t(".email_link"),
+  routes.root_url(host: @organization.host)
+) %>
diff --git a/decidim-budgets/config/assets.rb b/decidim-budgets/config/assets.rb
index 022d0002b0277..41872e56f3d51 100644
--- a/decidim-budgets/config/assets.rb
+++ b/decidim-budgets/config/assets.rb
@@ -4,6 +4,7 @@
 
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
-  decidim_budgets: "#{base_path}/app/packs/entrypoints/decidim_budgets.js"
+  decidim_budgets: "#{base_path}/app/packs/entrypoints/decidim_budgets.js",
+  decidim_budgets_admin: "#{base_path}/app/packs/entrypoints/decidim_budgets_admin.js"
 )
 Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/budgets/budgets")
diff --git a/decidim-budgets/config/locales/ar.yml b/decidim-budgets/config/locales/ar.yml
index 805ca5afb1f04..66d98bafbeba1 100644
--- a/decidim-budgets/config/locales/ar.yml
+++ b/decidim-budgets/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -60,6 +61,9 @@ ar:
             title: تحرير المشروع
             update: تحديث
           index:
+            actions: الإجراءات
+            cancel: إلغاء
+            change_category: تغيير ال�ئة
             finished_orders: الانتهاء من الأصوات
             pending_orders: �ي انتظار الأصوات
             title: مشاريع
diff --git a/decidim-budgets/config/locales/bg.yml b/decidim-budgets/config/locales/bg.yml
index b860b043d3ec0..d97c40353a574 100644
--- a/decidim-budgets/config/locales/bg.yml
+++ b/decidim-budgets/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/ca.yml b/decidim-budgets/config/locales/ca.yml
index a26eeafbba708..c82dae633e78c 100644
--- a/decidim-budgets/config/locales/ca.yml
+++ b/decidim-budgets/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -40,13 +41,14 @@ ca:
       actions:
         attachment_collections: Carpetes
         attachments: Adjunts
-        confirm_destroy: Estàs segura que vols eliminar aquest projecte?
+        confirm_destroy: Segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
         edit_projects: Gestionar projectes
         import: Importa propostes a projectes
         new: Nou %{name}
         preview: Previsualitzar
+        send_voting_reminders: Enviar recordatoris de votació
         title: Accions
       admin:
         budgets:
@@ -88,16 +90,44 @@ ca:
             title: Editar projecte
             update: Actualitzar
           index:
+            actions: Accions
+            cancel: Cancel·lar
+            change_category: Canviar categoria
+            change_scope: Canviar àmbit
+            change_selected: Canviar l'estat seleccionat
+            deselect_implementation: No s'ha seleccionat per implementar
             finished_orders: Vots finalitzats
             pending_orders: Vots en procés
+            select_for_implementation: Seleccionat per implementar
             selected: Seleccionat
             title: Projectes
+            update: Actualitzar
+            update_scope_button: Actualitzar àmbit
           new:
             create: Crear
             title: Nou projecte
           update:
             invalid: S'ha produït un error en actualitzar aquest projecte
             success: Projecte actualitzat correctament
+          update_category:
+            invalid: 'Aquestes propostes ja tenien la categoria %{subject_name}: %{projects}.'
+            select_a_category: Si us plau, selecciona una categoria
+            select_a_project: Si us plau, selecciona un projecte
+            success: 'Els projectes s''han actualitzat correctament a la categoria %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Aquests projectes ja estaven assignats a l''àmbit %{subject_name}: %{projects}.'
+            select_a_project: Si us plau, selecciona un projecte
+            select_a_scope: Si us plau, selecciona un àmbit
+            success: 'Els projectes s''han actualitzat correctament a l''àmbit %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Aquests projectes ja han estat seleccionats per a ser implementats: %{projects}.'
+              unselected: 'Aquests projectes han estat deseleccionats de ser implementats: %{projects}.'
+            select_a_project: Si us plau, selecciona un projecte
+            select_a_selection: Si us plau, selecciona un estat d'implementació
+            success:
+              selected: 'Aquests projectes s''han seleccionat correctament per a ser implementats: %{projects}.'
+              unselected: 'Aquests projectes s''han deseleccionat correctament per a ser implementats: %{projects}.'
         proposals_imports:
           create:
             invalid: S'ha produït un error en importar les propostes en projectes
@@ -110,6 +140,12 @@ ca:
             origin_component_id: Component d'origen
             select_component: Selecciona un component
             title: Importar propostes
+        reminders:
+          orders:
+            description: Les usuàries rebran un correu amb els enllaços als pressupostos on tenen "comandes" pendents.
+            title:
+              one: Estàs a punt d'enviar un correu recordatori a %{count} usuària
+              other: Estàs a punt d'enviar un correu recordatori a les usuàries %{count}
       admin_log:
         budget:
           create: "%{user_name} ha creat el pressupost %{resource_name} a l'espai %{space_name}"
@@ -145,6 +181,8 @@ ca:
         show: Mostra els projectes
         vote: Vota
         voted_on: Has votat a %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nova votació pressupostària a %{link}</span>"
       limit_announcement:
         cant_vote: No pots votar a aquests pressupostos. <a href="%{landing_path}"> Prova amb un altre pressupost </a>.
         limit_reached: Tens vots actius a %{links}. Per votar en aquest pressupot has d' <a href="%{landing_path}">esborrar el teu vot i començar de nou</a>.
@@ -158,6 +196,7 @@ ca:
           fields:
             category: Categoria
             id: ID
+            scope: Àmbit
             title: Títol
       order_summary_mailer:
         order_summary:
@@ -233,6 +272,8 @@ ca:
           filter: Filtra
           filter_by: Filtra per
           unfold: Desplegar
+        index:
+          view_project: Veure projecte
         order_progress:
           vote: Vota
         order_selected_projects:
@@ -266,6 +307,15 @@ ca:
         show:
           budget: Pressupost
           view_all_projects: Veure tots els projectes
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Àrees a les quals no has finalitzat el vot:'
+          email_intro: Has iniciat la votació als pressupostos participatius, però no l'has completat.
+          email_link: Ves-hi i segueix votant
+          email_outro: Si us plau, recorda completar el vot. Per votar, primer has de seleccionar la proposta o propostes que vols votar i a després confirmar el teu vot amb el botó "Votar".
+          email_subject:
+            one: Tens un vot no finalitzat a la votació dels pressupostos participatius
+            other: Tens alguns vots no finalitzats a la votació dels pressupostos participatius
     components:
       budgets:
         actions:
@@ -281,6 +331,7 @@ ca:
               errors:
                 budget_voting_rule_only_one: Cal activar com a mínim una norma per a la votació
                 budget_voting_rule_required: Es requereix una norma per a la votació
+            geocoding_enabled: Geolocalització habilitada
             landing_page_content: Pàgina d'inici de pressupostos
             landing_page_instructions: Instruccions per la pàgina d'inici de pressupostos
             more_information_modal: Finestra de "Més informació"
diff --git a/decidim-budgets/config/locales/cs.yml b/decidim-budgets/config/locales/cs.yml
index 28d0ccce638dd..676d43c97da31 100644
--- a/decidim-budgets/config/locales/cs.yml
+++ b/decidim-budgets/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -49,6 +50,7 @@ cs:
         import: Importovat návrhy do projektů
         new: Nový %{name}
         preview: Náhled
+        send_voting_reminders: Odeslat připomenutí hlasování
         title: Akce
       admin:
         budgets:
@@ -90,16 +92,44 @@ cs:
             title: Upravit projekt
             update: Aktualizace
           index:
+            actions: Akce
+            cancel: Zrušit
+            change_category: Změnit kategorii
+            change_scope: Změnit rozsah
+            change_selected: Změnit vybraný stav
+            deselect_implementation: Zrušit výběr z implementace
             finished_orders: Dokon�ené hlasy
             pending_orders: Čeká na hlasování
+            select_for_implementation: Vybrat pro implementaci
             selected: Vybrané
             title: Projekty
+            update: Aktualizovat
+            update_scope_button: Aktualizovat rozsah
           new:
             create: Vytvořit
             title: Nový projekt
           update:
             invalid: Při aktualizaci tohoto projektu došlo k problému
             success: Projekt byl úspěšně aktualizován
+          update_category:
+            invalid: 'Tyto projekty již mají kategorii %{subject_name}: %{projects}.'
+            select_a_category: Vyberte prosím kategorii
+            select_a_project: Vyberte projekt
+            success: 'Projekty byly úspěšně aktualizovány do kategorie %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Tyto projekty již mají rozsah %{subject_name}: %{projects}.'
+            select_a_project: Vyberte projekt
+            select_a_scope: Vyberte prosím rozsah
+            success: 'Projekty byly úspěšně aktualizovány na rozsah %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Tyto projekty již byly vybrány pro implementaci: %{projects}.'
+              unselected: 'Tyto projekty již byly odebrány z implementace: %{projects}.'
+            select_a_project: Vyberte projekt
+            select_a_selection: Vyberte prosím stav implementace
+            success:
+              selected: 'Tyto projekty byly úspěšně vybrány pro implementaci: %{projects}.'
+              unselected: 'Tyto projekty byly úspěšně odebrány z implementace: %{projects}.'
         proposals_imports:
           create:
             invalid: Při importu návrhů do projektů došlo k problému
@@ -112,6 +142,14 @@ cs:
             origin_component_id: Původ komponenty
             select_component: Vyberte sou�ást
             title: Importovat návrhy
+        reminders:
+          orders:
+            description: Uživatelé obdrží e-mail s odkazy na rozpo�ty, kde se �eká na vyjádření.
+            title:
+              one: Chystáte se odeslat připomenutí e-mailu %{count} uživateli
+              few: Chystáte se odeslat připomenutí e-mailu %{count} uživatelům
+              many: Chystáte se odeslat připomenutí e-mailu %{count} uživatelům
+              other: Chystáte se odeslat připomenutí e-mailu %{count} uživatelům
       admin_log:
         budget:
           create: "%{user_name} vytvořil %{resource_name} rozpo�et ve skupině %{space_name}"
@@ -143,6 +181,8 @@ cs:
         show: Zobrazit projekty
         vote: Hlasovat
         voted_on: Hlasovali jste pro %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nové hlasování o rozpo�tu v %{link}</span>"
       limit_announcement:
         cant_vote: O tomto rozpo�tu nelze hlasovat. <a href="%{landing_path}">Zkuste jiný rozpo�et</a>.
         limit_reached: Máte aktivní hlasy v %{links}. Chcete-li hlasovat o tomto rozpo�tu, musíte <a href="%{landing_path}">smazat svůj hlas a za�ít znovu</a>.
@@ -156,6 +196,7 @@ cs:
           fields:
             category: Kategorie
             id: ID
+            scope: Rozsah
             title: Titul
       order_summary_mailer:
         order_summary:
@@ -230,6 +271,8 @@ cs:
           filter: Filtr
           filter_by: Filtrovat podle
           unfold: Rozbalit
+        index:
+          view_project: Zobrazit projekt
         order_progress:
           vote: Hlasovat
         order_selected_projects:
@@ -257,7 +300,7 @@ cs:
             few: hlasy
             many: hlasů
             other: hlasů
-          you_voted: Hlasovali jste
+          you_voted: Hlasoval jste pro toto
         project_budget_button:
           add: Přidat do vašeho hlasování
           add_descriptive: Přidat k hlasování projekt %{resource_name}
@@ -267,6 +310,17 @@ cs:
         show:
           budget: Rozpo�et
           view_all_projects: Zobrazit všechny projekty
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Oblasti, kde máte nedokon�ené hlasování:'
+          email_intro: Zahájili jste hlasování o participa�ním rozpo�tu, ale nedokon�ili jste ho.
+          email_link: Pokra�ovat v hlasování
+          email_outro: Nezapomeňte prosím dokon�it hlasování. Chcete-li hlasovat, musíte nejprve vybrat návrh nebo návrhy, o kterých chcete hlasovat, a potvrdit svůj hlas pomocí tla�ítka "Hlasování".
+          email_subject:
+            one: Máte nedokon�ené hlasování v participativním rozpo�tovém hlasování
+            few: Máte nedokon�ené hlasování v participativním rozpo�tovém hlasování
+            many: Máte nedokon�ená hlasování v participativním rozpo�tovém hlasování
+            other: Máte nedokon�ené hlasování v participativním rozpo�tovém hlasování
     components:
       budgets:
         actions:
@@ -282,6 +336,7 @@ cs:
               errors:
                 budget_voting_rule_only_one: Pouze jedno hlasovací pravidlo musí být povoleno
                 budget_voting_rule_required: Je vyžadováno jedno pravidlo hlasování
+            geocoding_enabled: Geokódování aktivováno
             landing_page_content: Úvodní stránka rozpo�tů
             more_information_modal: Více informací
             projects_per_page: Po�et projektů na stránku
diff --git a/decidim-budgets/config/locales/de.yml b/decidim-budgets/config/locales/de.yml
index 0f1919840ad4b..d58efeb23c099 100644
--- a/decidim-budgets/config/locales/de.yml
+++ b/decidim-budgets/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -6,7 +7,7 @@ de:
         description: Beschreibung
         title: Titel
         total_budget: Gesamtbudget
-        weight: Bestellposition
+        weight: Reihenfolge
       project:
         budget_amount: Höhe des Budgets
         decidim_category_id: Kategorie
@@ -86,16 +87,35 @@ de:
             title: Projekt bearbeiten
             update: Aktualisieren
           index:
+            actions: Aktionen
+            cancel: Abbrechen
+            change_category: Kategorie ändern
+            change_scope: Themenbereich ändern
+            change_selected: Ausgewählten Status ändern
             finished_orders: Abgeschlossene Stimmen
             pending_orders: Ausstehende Stimmen
             selected: Ausgewählt
             title: Projekte
+            update: Aktualisieren
+            update_scope_button: Themenbereich aktualisieren
           new:
             create: Erstellen
             title: Neues Projekt
           update:
             invalid: Beim Aktualisieren dieses Projekts ist ein Problem aufgetreten
             success: Projekt erfolgreich aktualisiert
+          update_category:
+            invalid: 'Diese Projekte gehörten bereits zur Kategorie %{subject_name}: %{projects}.'
+            select_a_category: Bitte wählen Sie eine Kategorie aus
+            select_a_project: Bitte wählen Sie ein Projekt
+            success: 'Die folgenden Projekte wurden erfolgreich zur Kategorie %{subject_name} hinzugefügt: %{projects}.'
+          update_scope:
+            invalid: 'Diese Projekte gehörten bereits zum Themenbereich %{subject_name}: %{projects}.'
+            select_a_project: Bitte wählen Sie ein Projekt
+            select_a_scope: Bitte wählen Sie einen Themenbereich
+            success: 'Die folgenden Projekte wurden erfolgreich zum Themenbereich %{subject_name} hinzugefügt: %{projects}.'
+          update_selected:
+            select_a_project: Bitte wählen Sie ein Projekt
         proposals_imports:
           create:
             invalid: Beim Importieren der Vorschläge in Projekte ist ein Problem aufgetreten
@@ -106,6 +126,12 @@ de:
             no_components: Es gibt keine weiteren Vorschlagskomponenten in diesem partizipativen Raum, um die Vorschläge in Projekte zu importieren.
             select_component: Bitte wählen Sie eine Komponente aus
             title: Vorschläge importieren
+        reminders:
+          orders:
+            description: Benutzer erhalten eine E-Mail mit Links zu den Budgets, in denen sie ausstehende Stimmen haben.
+            title:
+              one: Sie werden eine Erinnerungs-E-Mail an %{count} Benutzer zu senden
+              other: Sie werden eine Erinnerungs-E-Mail an %{count} Benutzer zu senden
       admin_log:
         budget:
           create: "%{user_name} hat das Budget %{resource_name} in %{space_name} erstellt"
@@ -137,6 +163,8 @@ de:
         show: Projekte ansehen
         vote: Abstimmen
         voted_on: Sie haben über %{links} abgestimmt
+      last_activity:
+        new_vote_at_html: "<span>Neue Budgetverteilung unter %{link}</span>"
       limit_announcement:
         cant_vote: Sie können nicht über dieses Budget abstimmen. <a href="%{landing_path}">Versuchen Sie es mit einem anderen Budget</a>.
         limit_reached: Sie haben aktive Stimmen in %{links}. Um über dieses Budget abstimmen zu können, müssen Sie <a href="%{landing_path}">Ihre Stimme löschen und neu </a> beginnen.
@@ -150,6 +178,7 @@ de:
           fields:
             category: Kategorie
             id: ID
+            scope: Themenbereich
             title: Titel
       order_summary_mailer:
         order_summary:
@@ -222,6 +251,8 @@ de:
           filter: Filter
           filter_by: Filtern nach
           unfold: Aufklappen
+        index:
+          view_project: Projekt anzeigen
         order_progress:
           vote: Abstimmung
         order_selected_projects:
@@ -245,7 +276,6 @@ de:
           votes:
             one: Abstimmung
             other: Abstimmungen
-          you_voted: Du hast für dieses gestimmt
         project_budget_button:
           add: Zur Abstimmung hinzufügen
           add_descriptive: Projekt %{resource_name} Ihrer Stimme hinzufügen
@@ -255,6 +285,15 @@ de:
         show:
           budget: Budget
           view_all_projects: Alle Projekte anzeigen
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Bereiche, in denen Sie eine unvollendete Abstimmung haben:'
+          email_intro: Sie haben Ihre begonnene Abstimmung zur Verteilung des partizipativen Budgets noch nicht abgeschlossen.
+          email_link: Mit der Abstimmung fortfahren
+          email_outro: Denken Sie daran, die Abstimmung vollständig abzuschließen. Wählen Sie dazu den gewünschten Vorschlag oder die gewünschten Vorschläge aus, denen Sie Ihre Stimme geben möchten. Bestätigen Sie anschliessend Ihre Auswahl, indem Sie auf "Abstimmen" klicken.
+          email_subject:
+            one: Sie haben Ihre Abstimmung bei der Verteilung des partizipativen Budgets noch nicht abgeschlossen
+            other: Sie haben Ihre Abstimmung bei der Verteilung des partizipativen Budgets noch nicht abgeschlossen
     components:
       budgets:
         actions:
@@ -270,6 +309,7 @@ de:
               errors:
                 budget_voting_rule_only_one: Nur eine Abstimmungsregel kann aktiviert sein
                 budget_voting_rule_required: Es ist eine Abstimmungsregel notwendig
+            geocoding_enabled: Geocoding aktiviert
             landing_page_content: Budgets Landingpage
             more_information_modal: Weitere Informationen
             projects_per_page: Projekte pro Seite
diff --git a/decidim-budgets/config/locales/el.yml b/decidim-budgets/config/locales/el.yml
index 42c4e10819453..21cf7b2872695 100644
--- a/decidim-budgets/config/locales/el.yml
+++ b/decidim-budgets/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -217,7 +218,6 @@ el:
           votes:
             one: ψήφος
             other: ψήφοι
-          you_voted: Το ψηφίσατε
         project_budget_button:
           add: Π�οσθέστε στην ψήφο σας
           add_descriptive: Π�οσθήκη του έ�γου %{resource_name} στην ψήφο σας
diff --git a/decidim-budgets/config/locales/en.yml b/decidim-budgets/config/locales/en.yml
index cf340122b45dc..499d722401089 100644
--- a/decidim-budgets/config/locales/en.yml
+++ b/decidim-budgets/config/locales/en.yml
@@ -48,6 +48,7 @@ en:
         import: Import proposals to projects
         new: New %{name}
         preview: Preview
+        send_voting_reminders: Send voting reminders
         title: Actions
       admin:
         budgets:
@@ -89,16 +90,44 @@ en:
             title: Edit project
             update: Update
           index:
+            actions: Actions
+            cancel: Cancel
+            change_category: Change category
+            change_scope: Change scope
+            change_selected: Change selected state
+            deselect_implementation: Unselect from implementation
             finished_orders: Finished votes
             pending_orders: Pending votes
+            select_for_implementation: Select for implementation
             selected: Selected
             title: Projects
+            update: Update
+            update_scope_button: Update scope
           new:
             create: Create
             title: New project
           update:
             invalid: There was a problem updating this project
             success: Project successfully updated
+          update_category:
+            invalid: 'These projects already had the %{subject_name} category: %{projects}.'
+            select_a_category: Please select a category
+            select_a_project: Please select a project
+            success: 'Projects successfully updated to the %{subject_name} category: %{projects}.'
+          update_scope:
+            invalid: 'These projects already had the %{subject_name} scope: %{projects}.'
+            select_a_project: Please select a project
+            select_a_scope: Please select a scope
+            success: 'Projects successfully updated to the %{subject_name} scope: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'These projects were already selected for implementation: %{projects}.'
+              unselected: 'These projects were already unselected from implementation: %{projects}.'
+            select_a_project: Please select a project
+            select_a_selection: Please select an implementation state
+            success:
+              selected: 'These projects were successfully selected for implementation: %{projects}.'
+              unselected: 'These projects were successfully unselected from implementation: %{projects}.'
         proposals_imports:
           create:
             invalid: There was a problem importing the proposals into projects
@@ -111,6 +140,12 @@ en:
             origin_component_id: Origin component
             select_component: Please select a component
             title: Import proposals
+        reminders:
+          orders:
+            description: Users will receive an email with links to the budgets where they have pending order.
+            title:
+              one: You are about to send an email reminder to %{count} user
+              other: You are about to send an email reminder to %{count} users
       admin_log:
         budget:
           create: "%{user_name} created the %{resource_name} budget in the %{space_name} space"
@@ -146,6 +181,8 @@ en:
         show: See projects
         vote: Vote
         voted_on: You've voted on %{links}
+      last_activity:
+        new_vote_at_html: "<span>New budgeting vote at %{link}</span>"
       limit_announcement:
         cant_vote: You can't vote on this budget. <a href="%{landing_path}">Try on another budget</a>.
         limit_reached: You have active votes in %{links}. To vote on this budget you must <a href="%{landing_path}">delete your vote and start over</a>.
@@ -159,6 +196,7 @@ en:
           fields:
             category: Category
             id: ID
+            scope: Scope
             title: Title
       order_summary_mailer:
         order_summary:
@@ -234,6 +272,8 @@ en:
           filter: Filter
           filter_by: Filter by
           unfold: Unfold
+        index:
+          view_project: View project
         order_progress:
           vote: Vote
         order_selected_projects:
@@ -257,7 +297,7 @@ en:
           votes:
             one: vote
             other: votes
-          you_voted: You voted this
+          you_voted: You voted for this
         project_budget_button:
           add: Add to your vote
           add_descriptive: Add project %{resource_name} to your vote
@@ -267,6 +307,15 @@ en:
         show:
           budget: Budget
           view_all_projects: View all projects
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Areas where you have an unfinished vote:'
+          email_intro: You have started the participatory budgeting vote, but have not completed it.
+          email_link: Go to continue voting
+          email_outro: Please remember to complete the vote. To vote, you must first select the proposal or proposals you want to vote on and then confirm your vote with the "Vote" button.
+          email_subject:
+            one: You have an unfinished vote in the participatory budgeting vote
+            other: You have unfinished votes in the participatory budgeting vote
     components:
       budgets:
         actions:
@@ -282,6 +331,7 @@ en:
               errors:
                 budget_voting_rule_only_one: Only one voting rule must be enabled
                 budget_voting_rule_required: One voting rule is required
+            geocoding_enabled: Geocoding enabled
             landing_page_content: Budgets landing page
             landing_page_instructions: Budgets landing page instructions
             more_information_modal: More information modal
diff --git a/decidim-budgets/config/locales/es-MX.yml b/decidim-budgets/config/locales/es-MX.yml
index 06b975080428e..d33a61124ad8c 100644
--- a/decidim-budgets/config/locales/es-MX.yml
+++ b/decidim-budgets/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ es-MX:
         import: Importar propuestas a proyectos
         new: Nuevo %{name}
         preview: Previsualizar
+        send_voting_reminders: Enviar recordatorios de votación
         title: Acciones
       admin:
         budgets:
@@ -88,16 +90,44 @@ es-MX:
             title: Editar proyecto
             update: Actualizar
           index:
+            actions: Acciones
+            cancel: Cancelar
+            change_category: Cambiar categoría
+            change_scope: Cambiar ámbito
+            change_selected: Cambiar estado seleccionado
+            deselect_implementation: No seleccionado para implementar
             finished_orders: Votos terminados
             pending_orders: Votos pendientes
+            select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
             title: Proyectos
+            update: Actualizar
+            update_scope_button: Actualizar ámbito
           new:
             create: Crear
             title: Nuevo proyecto
           update:
             invalid: Ha habido un problema al actualizar este proyecto
             success: Proyecto actualizado correctamente
+          update_category:
+            invalid: 'Estas propuestas ya tenían la categoría %{subject_name}: %{projects}.'
+            select_a_category: Por favor, selecciona una categoría
+            select_a_project: Por favor, selecciona un proyecto
+            success: 'Los siguientes proyectos se han actualizado correctamente a la categoría %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Estos proyectos ya tenían el ámbito %{subject_name}: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_scope: Por favor, selecciona un ámbito
+            success: 'Los siguientes proyectos se han actualizado correctamente al ámbito %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Estos proyectos ya han sido seleccionados para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos ya han sido deseleccionados de ser implementados: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_selection: Por favor, seleccione un estado de implementación
+            success:
+              selected: 'Estos proyectos fueron seleccionados con éxito para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos fueron deseleccionados con éxito para ser implementados: %{projects}.'
         proposals_imports:
           create:
             invalid: Ha habido un problema al importar las propuestas en proyectos
@@ -110,6 +140,9 @@ es-MX:
             origin_component_id: Componente de origen
             select_component: Por favor seleccione un componente
             title: Importar propuestas
+        reminders:
+          orders:
+            description: Las usuarias recibirán un correo electrónico con enlaces a los presupuestos en los que tienen un pedido pendiente.
       admin_log:
         budget:
           create: "%{user_name} creó el presupuesto %{resource_name} en el espacio %{space_name}"
@@ -141,6 +174,8 @@ es-MX:
         show: Ver proyectos
         vote: Votar
         voted_on: Has votado en %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nueva votación presupiestaria en %{link}</span>"
       limit_announcement:
         cant_vote: No puedes votar en este presupuesto. <a href="%{landing_path}"> Prueba con otro presupuesto</a>.
         limit_reached: Tienes votos activos en %{links}. Para votar en este presupuesto debes <a href="%{landing_path}">borrar tu voto y empezar de nuevo</a>.
@@ -154,6 +189,7 @@ es-MX:
           fields:
             category: Categoría
             id: ID
+            scope: �mbito
             title: Título
       order_summary_mailer:
         order_summary:
@@ -226,6 +262,8 @@ es-MX:
           filter: Filtrar
           filter_by: Filtrar por
           unfold: Desplegar
+        index:
+          view_project: Ver proyecto
         order_progress:
           vote: Dar apoyo
         order_selected_projects:
@@ -259,6 +297,15 @@ es-MX:
         show:
           budget: Presupuesto
           view_all_projects: Ver todos los proyectos
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: '�reas donde tienes una votación inacabada:'
+          email_intro: Has iniciado la votación de los presupuestos, pero no la has completado.
+          email_link: Ir a la votación
+          email_outro: Por favor, recuerda completar la votación. Para votar, primero debes seleccionar el proyecto o proyectos sobre las que deseas votar y luego confirmar tu voto con el botón "Votar".
+          email_subject:
+            one: Tienes un voto sin finalizar en la votación de los presupuestos
+            other: Tienes votos sin finalizar en la votación de los presupuestos
     components:
       budgets:
         actions:
@@ -274,6 +321,7 @@ es-MX:
               errors:
                 budget_voting_rule_only_one: Hay que activar por lo menos una norma para la votación
                 budget_voting_rule_required: Se requiere una norma para la votación
+            geocoding_enabled: Geolocalización habilitada
             landing_page_content: Página de inicio de presupuestos
             more_information_modal: Modal de "Más información"
             projects_per_page: Proyectos por página
diff --git a/decidim-budgets/config/locales/es-PY.yml b/decidim-budgets/config/locales/es-PY.yml
index ce68211e1bb91..6dc1450cb9f05 100644
--- a/decidim-budgets/config/locales/es-PY.yml
+++ b/decidim-budgets/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ es-PY:
         import: Importar propuestas a proyectos
         new: Nuevo %{name}
         preview: Previsualizar
+        send_voting_reminders: Enviar recordatorios de votación
         title: Acciones
       admin:
         budgets:
@@ -88,16 +90,44 @@ es-PY:
             title: Editar proyecto
             update: Actualizar
           index:
+            actions: Acciones
+            cancel: Cancelar
+            change_category: Cambiar categoría
+            change_scope: Cambiar ámbito
+            change_selected: Cambiar estado seleccionado
+            deselect_implementation: No seleccionado para implementar
             finished_orders: Votos terminados
             pending_orders: Votos pendientes
+            select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
             title: Proyectos
+            update: Actualizar
+            update_scope_button: Actualizar ámbito
           new:
             create: Crear
             title: Nuevo proyecto
           update:
             invalid: Ha habido un problema al actualizar este proyecto
             success: Proyecto actualizado correctamente
+          update_category:
+            invalid: 'Estas propuestas ya tenían la categoría %{subject_name}: %{projects}.'
+            select_a_category: Por favor, selecciona una categoría
+            select_a_project: Selecciona un proyecto
+            success: 'Los proyectos se han actualizado correctamente a la categoría %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Estos proyectos ya pertenecían al ámbito %{subject_name}: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_scope: Por favor, selecciona un ámbito
+            success: 'Los proyectos se han actualizado correctamente al ámbito %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Estos proyectos ya han sido seleccionados para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos ya han sido deseleccionados de ser implementados: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_selection: Por favor, seleccione un estado de implementación
+            success:
+              selected: 'Estos proyectos fueron seleccionados con éxito para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos fueron deseleccionados con éxito para ser implementados: %{projects}.'
         proposals_imports:
           create:
             invalid: Ha habido un problema al importar las propuestas en proyectos
@@ -110,6 +140,12 @@ es-PY:
             origin_component_id: Componente de origen
             select_component: Por favor seleccione un componente
             title: Importar propuestas
+        reminders:
+          orders:
+            description: Las usuarias recibirán un correo electrónico con enlaces a los presupuestos en los que tienen un pedido pendiente.
+            title:
+              one: Estás a punto de enviar un recordatorio por correo electrónico a %{count} usuaria
+              other: Estás a punto de enviar un recordatorio por correo electrónico a %{count} usuarias
       admin_log:
         budget:
           create: "%{user_name} creó el presupuesto %{resource_name} en el espacio %{space_name}"
@@ -141,6 +177,8 @@ es-PY:
         show: Ver proyectos
         vote: Votar
         voted_on: Has votado en %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nueva votación presupiestaria en %{link}</span>"
       limit_announcement:
         cant_vote: No puedes votar en este presupuesto. <a href="%{landing_path}"> Prueba con otro presupuesto</a>.
         limit_reached: Tienes votos activos en %{links}. Para votar en este presupuesto debes <a href="%{landing_path}">borrar tu voto y empezar de nuevo</a>.
@@ -154,6 +192,7 @@ es-PY:
           fields:
             category: Categoría
             id: ID
+            scope: �mbito
             title: Título
       order_summary_mailer:
         order_summary:
@@ -226,6 +265,8 @@ es-PY:
           filter: Filtrar
           filter_by: Filtrar por
           unfold: Desplegar
+        index:
+          view_project: Ver proyecto
         order_progress:
           vote: Dar apoyo
         order_selected_projects:
@@ -259,6 +300,15 @@ es-PY:
         show:
           budget: Presupuesto
           view_all_projects: Ver todos los proyectos
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: '�reas donde tienes una votación inacabada:'
+          email_intro: Has iniciado la votación de los presupuestos, pero no la has completado.
+          email_link: Ir a la votación
+          email_outro: Por favor, recuerda completar la votación. Para votar, primero debes seleccionar el proyecto o proyectos sobre las que deseas votar y luego confirmar tu voto con el botón "Votar".
+          email_subject:
+            one: Tienes un voto sin finalizar en la votación de los presupuestos
+            other: Tienes votos sin finalizar en la votación de los presupuestos
     components:
       budgets:
         actions:
@@ -274,6 +324,7 @@ es-PY:
               errors:
                 budget_voting_rule_only_one: Hay que activar por lo menos una norma para la votación
                 budget_voting_rule_required: Se requiere una norma para la votación
+            geocoding_enabled: Geolocalización habilitada
             landing_page_content: Página de inicio de presupuestos
             more_information_modal: Modal de "Más información"
             projects_per_page: Proyectos por página
diff --git a/decidim-budgets/config/locales/es.yml b/decidim-budgets/config/locales/es.yml
index 68510d3111fc2..207147ef3267c 100644
--- a/decidim-budgets/config/locales/es.yml
+++ b/decidim-budgets/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -40,13 +41,14 @@ es:
       actions:
         attachment_collections: Carpetas
         attachments: Adjuntos
-        confirm_destroy: '¿Estás segura de que deseas eliminar este proyecto?'
+        confirm_destroy: '¿Seguro que deseas eliminar este proyecto?'
         destroy: Borrar
         edit: Editar
         edit_projects: Gestionar proyectos
         import: Importar propuestas a proyectos
         new: Nuevo %{name}
         preview: Previsualizar
+        send_voting_reminders: Enviar recordatorios de votación
         title: Acciones
       admin:
         budgets:
@@ -88,16 +90,44 @@ es:
             title: Editar proyecto
             update: Actualizar
           index:
+            actions: Acciones
+            cancel: Cancelar
+            change_category: Cambiar categoría
+            change_scope: Cambiar ámbito
+            change_selected: Cambiar estado seleccionado
+            deselect_implementation: No seleccionado para implementar
             finished_orders: Votos terminados
             pending_orders: Votos pendientes
+            select_for_implementation: Seleccionado para implementar
             selected: Seleccionado
             title: Proyectos
+            update: Actualizar
+            update_scope_button: Actualizar ámbito
           new:
             create: Crear
             title: Nuevo proyecto
           update:
             invalid: Se ha producido un error al actualizar este proyecto
             success: Proyecto actualizado correctamente
+          update_category:
+            invalid: 'Estas propuestas ya tenían la categoría %{subject_name}: %{projects}.'
+            select_a_category: Por favor, selecciona una categoría
+            select_a_project: Selecciona un proyecto
+            success: 'Los proyectos se han actualizado correctamente a la categoría %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Estos proyectos ya pertenecían al ámbito %{subject_name}: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_scope: Por favor, selecciona un ámbito
+            success: 'Los proyectos se han actualizado correctamente al ámbito %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Estos proyectos ya han sido seleccionados para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos ya han sido deseleccionados de ser implementados: %{projects}.'
+            select_a_project: Por favor, selecciona un proyecto
+            select_a_selection: Por favor, seleccione un estado de implementación
+            success:
+              selected: 'Estos proyectos fueron seleccionados con éxito para ser implementados: %{projects}.'
+              unselected: 'Estos proyectos fueron deseleccionados con éxito para ser implementados: %{projects}.'
         proposals_imports:
           create:
             invalid: Se ha producido un error al importar las propuestas a proyectos
@@ -110,6 +140,12 @@ es:
             origin_component_id: Componente de origen
             select_component: Por favor seleccione un componente
             title: Importar propuestas
+        reminders:
+          orders:
+            description: Las usuarias recibirán un correo electrónico con enlaces a los presupuestos en los que tienen un pedido pendiente.
+            title:
+              one: Estás a punto de enviar un recordatorio por correo electrónico a %{count} usuaria
+              other: Estás a punto de enviar un recordatorio por correo electrónico a %{count} usuarias
       admin_log:
         budget:
           create: "%{user_name} creó el presupuesto %{resource_name} en el espacio %{space_name}"
@@ -145,6 +181,8 @@ es:
         show: Ver proyectos
         vote: Votar
         voted_on: Has votado en %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nueva votación presupiestaria en %{link}</span>"
       limit_announcement:
         cant_vote: No puedes votar en este presupuesto. <a href="%{landing_path}"> Prueba con otro presupuesto</a>.
         limit_reached: Tienes votos activos en %{links}. Para votar en este presupuesto debes <a href="%{landing_path}">borrar tu voto y empezar de nuevo</a>.
@@ -158,6 +196,7 @@ es:
           fields:
             category: Categoría
             id: ID
+            scope: �mbito
             title: Título
       order_summary_mailer:
         order_summary:
@@ -183,7 +222,7 @@ es:
             description: Este proyecto sobrepasa el presupuesto máximo y no se puede añadir. Si lo deseas, puedes eliminar un proyecto que ya hayas seleccionado, o votar de acuerdo a tus preferencias.
             title: Se ha superado el número máximo de proyectos
         budget_summary:
-          are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
+          are_you_sure: '¿Seguro que deseas cancelar tu voto?'
           assigned: 'Asignado:'
           back_to_budgets: Volver a %{component_name}
           back_to_projects: Volver a %{budget_name}
@@ -233,6 +272,8 @@ es:
           filter: Filtrar
           filter_by: Filtrar por
           unfold: Desplegar
+        index:
+          view_project: Ver proyecto
         order_progress:
           vote: Vota
         order_selected_projects:
@@ -266,6 +307,15 @@ es:
         show:
           budget: Presupuesto
           view_all_projects: Ver todos los proyectos
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: '�reas donde tienes una votación inacabada:'
+          email_intro: Has iniciado la votación de los presupuestos, pero no la has completado.
+          email_link: Ir a la votación
+          email_outro: Por favor, recuerda completar la votación. Para votar, primero debes seleccionar el proyecto o proyectos sobre las que deseas votar y luego confirmar tu voto con el botón "Votar".
+          email_subject:
+            one: Tienes un voto sin finalizar en la votación de los presupuestos
+            other: Tienes votos sin finalizar en la votación de los presupuestos
     components:
       budgets:
         actions:
@@ -281,6 +331,7 @@ es:
               errors:
                 budget_voting_rule_only_one: Hay que activar por lo menos una norma para la votación
                 budget_voting_rule_required: Se requiere una norma para la votación
+            geocoding_enabled: Geolocalización habilitada
             landing_page_content: Página de inicio de presupuestos
             landing_page_instructions: Instrucciones para la página de inicio de presupuestos
             more_information_modal: Modal de "Más información"
diff --git a/decidim-budgets/config/locales/eu.yml b/decidim-budgets/config/locales/eu.yml
index 2f378a664771a..d39f960e21eb2 100644
--- a/decidim-budgets/config/locales/eu.yml
+++ b/decidim-budgets/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -13,8 +14,11 @@ eu:
         decidim_scope_id: Esparrua
         description: Descripción
         proposal_ids: Honekin lotutako proposamenak
-        selected: Hautatua inplementatzeko
+        proposals: Proposamenak
+        selected: Ezarpenerako hautatuak
         title: Titulua
+      proposals_import:
+        scope_id: Eremua
   activerecord:
     models:
       decidim/budgets/project:
@@ -26,6 +30,8 @@ eu:
         projects:
           category_id_eq:
             label: Kategoria
+          scope_id_eq:
+            label: Eremua
           selected_at_null:
             label: Hautatua
             values:
@@ -42,6 +48,7 @@ eu:
         import: Inportatu proposamenak proiektuetarako
         new: '%{name} berria'
         preview: Aurreikusi
+        send_voting_reminders: Botoa gogorarazi
         title: Ekintzak
       admin:
         budgets:
@@ -83,16 +90,36 @@ eu:
             title: Editatu proiektua
             update: Eguneratu
           index:
+            actions: Ekintzak
+            cancel: Ezeztatu
+            change_category: Kategoria aldatu
+            change_scope: Aldatu eremua
+            change_selected: Aldatu hautatutako eremua
+            deselect_implementation: Gauzatzekoetatik kendu
             finished_orders: Bukatutako botoak
             pending_orders: Zain dauden botoei
+            select_for_implementation: Gauzatzeko hautatua
             selected: Hautatua
             title: Proiektuak
+            update: Eguneratu
+            update_scope_button: Eguneratu eremua
           new:
             create: Sortu
             title: Proiektu berria
           update:
             invalid: Arazo bat izan da proiektu hau eguneratzean
             success: Proiektua zuzen eguneratu da
+          update_category:
+            select_a_category: Mesedez, hautatu kategoria bat
+            select_a_project: Mesedez, hautatu proiektu bat
+          update_selected:
+            invalid:
+              selected: 'Honako proiektu hauek dagoeneko gauzatzeko hautatu dira: %{projects}.'
+              unselected: 'Honako proiektu hauek dagoeneko gauzatzekoetatik kendu dira: %{projects}.'
+            select_a_selection: Hautatu gauzatzearen egoera
+            success:
+              selected: 'Honako proiektu hauek dagoeneko gauzatzeko hautatu dira: %{projects}.'
+              unselected: 'Honako proiektu hauek dagoeneko gauzatzekoetatik kendu dira: %{projects}.'
         proposals_imports:
           create:
             invalid: Arazo bat izan da proiektuen proposamenak inportatzea
@@ -236,7 +263,7 @@ eu:
           votes:
             one: Botoa
             other: botoak
-          you_voted: Hau bozkatu duzu
+          you_voted: Honen aldeko botoa eman duzu
         project_budget_button:
           add: Gehitu zure botoari
           add_descriptive: Gehitu %{resource_name} proiektua zure botoari
diff --git a/decidim-budgets/config/locales/fi-plain.yml b/decidim-budgets/config/locales/fi-plain.yml
index 594f9988e865d..259c98be1e015 100644
--- a/decidim-budgets/config/locales/fi-plain.yml
+++ b/decidim-budgets/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ fi-pl:
         import: Tuo ehdotuksia suunnitelmiin
         new: Uusi %{name}
         preview: Esikatsele
+        send_voting_reminders: Lähetä äänestysmuistutukset
         title: Toiminnot
       admin:
         budgets:
@@ -88,16 +90,44 @@ fi-pl:
             title: Muokkaa suunnitelmaa
             update: Päivitä
           index:
+            actions: Toiminnot
+            cancel: Peruuta
+            change_category: Vaihda aihepiiri
+            change_scope: Vaihda teema
+            change_selected: Muuta tilaa
+            deselect_implementation: Ei valittu toteutukseen
             finished_orders: Valmiit äänet
             pending_orders: Odottavat äänet
+            select_for_implementation: Valittu toteutukseen
             selected: Valittu
             title: Suunnitelmat
+            update: Päivitä
+            update_scope_button: Muuta teema
           new:
             create: Luo
             title: Uusi suunnitelma
           update:
             invalid: Tämän suunnitelman päivityksessä tapahtui virhe
             success: Suunnitelma päivitetty onnistuneesti
+          update_category:
+            invalid: 'Näillä projekteilla oli jo aihepiiri %{subject_name}: %{projects}.'
+            select_a_category: Valitse aihepiiri
+            select_a_project: Valitse projekti
+            success: 'Seuraavien projektien aihepiirin päivitys onnistui %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Näillä projekteilla oli jo teema %{subject_name}: %{projects}.'
+            select_a_project: Valitse projekti
+            select_a_scope: Valitse teema
+            success: 'Seuraavien projektien teeman päivitys onnistui %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Nämä projektit oli jo valittu toteutukseen: %{projects}.'
+              unselected: 'Näitä projekteja ei oltu valittu toteutukseen: %{projects}.'
+            select_a_project: Valitse projekti
+            select_a_selection: Valitse tila
+            success:
+              selected: 'Näiden projektien valinta toteutukseen onnistui: %{projects}.'
+              unselected: 'Näiden projektien toteutukseen valinnan poistaminen onnistui: %{projects}.'
         proposals_imports:
           create:
             invalid: Ehdotusten tuomisessa suunnitelmiin esiintyi ongelmia
@@ -110,6 +140,12 @@ fi-pl:
             origin_component_id: Lähdekomponentti
             select_component: Valitse komponentti
             title: Tuo ehdotuksia
+        reminders:
+          orders:
+            description: Käyttäjät saavat sähköpostiviestin, jossa on linkit budjetteihin, joissa heillä on odottavia ääniä.
+            title:
+              one: Olet lähettämässä muistutuksen sähköpostiin %{count} käyttäjälle
+              other: Olet lähettämässä muistutuksen sähköpostiin %{count} käyttäjälle
       admin_log:
         budget:
           create: "%{user_name} loi budjetin %{resource_name} osallistumistilassa %{space_name}"
@@ -141,6 +177,8 @@ fi-pl:
         show: Näytä projektit
         vote: Äänestä
         voted_on: Olet äänestänyt budjeteissa %{links}
+      last_activity:
+        new_vote_at_html: "<span>Uusi budjetointiääni %{link}</span>"
       limit_announcement:
         cant_vote: Et voi äänestää tästä budjetista. <a href="%{landing_path}">Kokeile toista budjettia</a>.
         limit_reached: Sinulla on ääniä kohteessa %{links}. Äänestääksesi tästä budjetista <a href="%{landing_path}">poista äänesi ja aloita alusta</a>.
@@ -154,6 +192,7 @@ fi-pl:
           fields:
             category: Aihepiiri
             id: ID
+            scope: Teema
             title: Otsikko
       order_summary_mailer:
         order_summary:
@@ -226,6 +265,8 @@ fi-pl:
           filter: Suodata
           filter_by: Suodata
           unfold: Avaa
+        index:
+          view_project: Näytä projekti
         order_progress:
           vote: Äänestä
         order_selected_projects:
@@ -259,6 +300,15 @@ fi-pl:
         show:
           budget: Budjetti
           view_all_projects: Näytä kaikki suunnitelmat
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Alueet, joissa sinulla on keskeneräinen ääni:'
+          email_intro: Olet aloittanut osallistuvan budjetoinnin äänestyksen, mutta et suorittanut sitä loppuun.
+          email_link: Siirry jatkamaan äänestystä
+          email_outro: Muistathan saattaa äänesi loppuun saakka. Äänestääksesi, sinun on valittava se ehdotus tai ne ehdotukset, joita haluat äänestää ja tämän jälkeen vahvistettava äänesti "Äänestä" -painikkeella.
+          email_subject:
+            one: Sinulla on keskeneräinen ääni osallistavan budjetoinnin äänestyksessä
+            other: Sinulla on keskeneräisiä ääniä osallistavan budjetoinnin äänestyksessä
     components:
       budgets:
         actions:
@@ -274,6 +324,7 @@ fi-pl:
               errors:
                 budget_voting_rule_only_one: Voit valita ainoastaan yhden äänestyssäännön
                 budget_voting_rule_required: Yksi äänestyssääntö vaaditaan
+            geocoding_enabled: Geokoodaus käytössä
             landing_page_content: Budjetoinnin aloitussivun teksti
             more_information_modal: Lisätietoikkunan teksti
             projects_per_page: Suunnitelmat sivua kohden
diff --git a/decidim-budgets/config/locales/fi.yml b/decidim-budgets/config/locales/fi.yml
index ab1bfbaa14b7e..df9e4d252e14d 100644
--- a/decidim-budgets/config/locales/fi.yml
+++ b/decidim-budgets/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ fi:
         import: Tuo ehdotuksia suunnitelmiksi
         new: Uusi %{name}
         preview: Esikatsele
+        send_voting_reminders: Lähetä äänestysmuistutukset
         title: Toiminnot
       admin:
         budgets:
@@ -88,16 +90,44 @@ fi:
             title: Muokkaa suunnitelmaa
             update: Päivitä
           index:
+            actions: Toiminnot
+            cancel: Peruuta
+            change_category: Vaihda aihepiiri
+            change_scope: Vaihda teema
+            change_selected: Muuta tilaa
+            deselect_implementation: Ei valittu toteutukseen
             finished_orders: Valmiit äänet
             pending_orders: Odottavat äänet
+            select_for_implementation: Valittu toteutukseen
             selected: Valittu
             title: Suunnitelmat
+            update: Päivitä
+            update_scope_button: Muuta teema
           new:
             create: Luo
             title: Uusi suunnitelma
           update:
             invalid: Suunnitelman päivitys epäonnistui
             success: Suunnitelman päivitys onnistui
+          update_category:
+            invalid: 'Näillä projekteilla oli jo aihepiiri %{subject_name}: %{projects}.'
+            select_a_category: Valitse aihepiiri
+            select_a_project: Valitse projekti
+            success: 'Seuraavien projektien aihepiirin päivitys onnistui %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Näillä projekteilla oli jo teema %{subject_name}: %{projects}.'
+            select_a_project: Valitse projekti
+            select_a_scope: Valitse teema
+            success: 'Seuraavien projektien teeman päivitys onnistui %{subject_name}: %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Nämä projektit oli jo valittu toteutukseen: %{projects}.'
+              unselected: 'Näitä projekteja ei oltu valittu toteutukseen: %{projects}.'
+            select_a_project: Valitse projekti
+            select_a_selection: Valitse tila
+            success:
+              selected: 'Näiden projektien valinta toteutukseen onnistui: %{projects}.'
+              unselected: 'Näiden projektien toteutukseen valinnan poistaminen onnistui: %{projects}.'
         proposals_imports:
           create:
             invalid: Ehdotusten tuonti suunnitelmiksi epäonnistui
@@ -110,6 +140,12 @@ fi:
             origin_component_id: Lähdekomponentti
             select_component: Valitse komponentti
             title: Tuo ehdotuksia
+        reminders:
+          orders:
+            description: Käyttäjät saavat sähköpostiviestin, jossa on linkit budjetteihin, joissa heillä on odottavia ääniä.
+            title:
+              one: Olet lähettämässä muistutuksen sähköpostiin %{count} käyttäjälle
+              other: Olet lähettämässä muistutuksen sähköpostiin %{count} käyttäjälle
       admin_log:
         budget:
           create: "%{user_name} loi budjetin %{resource_name} osallistumistilassa %{space_name}"
@@ -141,6 +177,8 @@ fi:
         show: Näytä projektit
         vote: Äänestä
         voted_on: Olet äänestänyt budjeteissa %{links}
+      last_activity:
+        new_vote_at_html: "<span>Uusi budjetointiääni %{link}</span>"
       limit_announcement:
         cant_vote: Et voi äänestää tästä budjetista. <a href="%{landing_path}">Kokeile toista budjettia</a>.
         limit_reached: Sinulla on ääniä kohteessa %{links}. Äänestääksesi tästä budjetista <a href="%{landing_path}">poista äänesi ja aloita alusta</a>.
@@ -154,6 +192,7 @@ fi:
           fields:
             category: Aihepiiri
             id: ID
+            scope: Teema
             title: Otsikko
       order_summary_mailer:
         order_summary:
@@ -226,6 +265,8 @@ fi:
           filter: Suodata
           filter_by: Suodata
           unfold: Avaa
+        index:
+          view_project: Näytä projekti
         order_progress:
           vote: Äänestä
         order_selected_projects:
@@ -259,6 +300,15 @@ fi:
         show:
           budget: Budjetti
           view_all_projects: Näytä kaikki suunnitelmat
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Alueet, joissa sinulla on keskeneräinen ääni:'
+          email_intro: Olet aloittanut osallistuvan budjetoinnin äänestyksen, mutta et suorittanut sitä loppuun.
+          email_link: Siirry jatkamaan äänestystä
+          email_outro: Muistathan saattaa äänesi loppuun saakka. Äänestääksesi, sinun on valittava se ehdotus tai ne ehdotukset, joita haluat äänestää ja tämän jälkeen vahvistettava äänesti "Äänestä" -painikkeella.
+          email_subject:
+            one: Sinulla on keskeneräinen ääni osallistavan budjetoinnin äänestyksessä
+            other: Sinulla on keskeneräisiä ääniä osallistavan budjetoinnin äänestyksessä
     components:
       budgets:
         actions:
@@ -274,6 +324,7 @@ fi:
               errors:
                 budget_voting_rule_only_one: Voit valita ainoastaan yhden äänestyssäännön
                 budget_voting_rule_required: Yksi äänestyssääntö vaaditaan
+            geocoding_enabled: Geokoodaus käytössä
             landing_page_content: Budjetoinnin aloitussivun teksti
             more_information_modal: Lisätietoikkunan teksti
             projects_per_page: Suunnitelmat sivua kohden
diff --git a/decidim-budgets/config/locales/fr-CA.yml b/decidim-budgets/config/locales/fr-CA.yml
index 61e57ce2ec158..1360dc8e84850 100644
--- a/decidim-budgets/config/locales/fr-CA.yml
+++ b/decidim-budgets/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ fr-CA:
         import: Importer des propositions dans des projets
         new: Nouveau %{name}
         preview: Aperçu
+        send_voting_reminders: Envoyer des rappels de vote
         title: Actions
       admin:
         budgets:
@@ -88,16 +90,44 @@ fr-CA:
             title: Éditer un projet
             update: Mettre à jour
           index:
+            actions: Actions
+            cancel: Annuler
+            change_category: Modifier la catégorie
+            change_scope: Changer le secteur
+            change_selected: Changer l'état sélectionné
+            deselect_implementation: Retirer de la sélection pour implémentation
             finished_orders: Votes terminés
             pending_orders: Votes en cours
+            select_for_implementation: Sélectionné pour implémentation
             selected: Sélectionné
             title: Projets
+            update: Mettre à jour
+            update_scope_button: Mettre à jour le secteur
           new:
             create: Créer
             title: Nouveau projet
           update:
             invalid: Il y a eu un problème lors de la mise à jour de ce projet
             success: Projet mis à jour avec succès
+          update_category:
+            invalid: 'Ces projets avaient déjà la catégorie %{subject_name} : %{projects}.'
+            select_a_category: Veuillez sélectionner une catégorie
+            select_a_project: Veuillez selectionner un projet
+            success: 'Les projets ont été mis à jour avec succès avec la catégorie %{subject_name} : %{projects}.'
+          update_scope:
+            invalid: 'Ces projets avaient déjà le secteur %{subject_name} : %{projects}.'
+            select_a_project: Veuillez selectionner un projet
+            select_a_scope: Veuillez sélectionner un secteur
+            success: 'Les projets ont été mis à jour avec succès avec le secteur %{subject_name} : %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Ces projets ont déjà été sélectionnés pour une implémentation : %{projects}.'
+              unselected: 'Ces projets ont déjà été retirés de la sélection pour une implémentation : %{projects}.'
+            select_a_project: Veuillez selectionner un projet
+            select_a_selection: Veuillez sélectionner un état d'implémentation
+            success:
+              selected: 'Ces projets ont été bien été sélectionnés pour une implémentation : %{projects}.'
+              unselected: 'Ces projets ont été retirés de la sélection pour une implémentation : %{projects}.'
         proposals_imports:
           create:
             invalid: Un problème est survenu lors de l'importation des propositions dans des projets
@@ -110,6 +140,12 @@ fr-CA:
             origin_component_id: Composant d'origine
             select_component: Veuillez sélectionner un module
             title: Importer des propositions
+        reminders:
+          orders:
+            description: Les utilisateurs recevront un e-mail avec des liens vers les budgets où ils ont un vote en attente.
+            title:
+              one: Vous êtes sur le point d'envoyer un rappel par e-mail à %{count} utilisateur
+              other: Vous êtes sur le point d'envoyer un rappel par e-mail à %{count} utilisateurs
       admin_log:
         budget:
           create: "%{user_name} a créé le budget %{resource_name} dans l'espace %{space_name}"
@@ -141,6 +177,8 @@ fr-CA:
         show: Voir les projets
         vote: Voter
         voted_on: Vous avez voté sur %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nouveau vote du budget sur ce lien %{link}</span>"
       limit_announcement:
         cant_vote: Vous ne pouvez pas voter sur ce budget. <a href="%{landing_path}">Essayez sur un autre budget</a>.
         limit_reached: Vous avez des votes actifs dans %{links}. Pour voter sur ce budget, vous devez <a href="%{landing_path}">supprimer votre vote et recommencer</a>.
@@ -154,6 +192,7 @@ fr-CA:
           fields:
             category: Catégorie
             id: ID
+            scope: Secteur
             title: Titre
       order_summary_mailer:
         order_summary:
@@ -226,6 +265,8 @@ fr-CA:
           filter: Filtrer
           filter_by: Filtrer par
           unfold: Voir la suite
+        index:
+          view_project: Voir le projet
         order_progress:
           vote: Voter
         order_selected_projects:
@@ -249,7 +290,7 @@ fr-CA:
           votes:
             one: vote
             other: votes
-          you_voted: Vous avez voté pour
+          you_voted: Vous avez voté pour ceci
         project_budget_button:
           add: Ajouter à votre vote
           add_descriptive: Ajouter le projet %{resource_name} à votre vote
@@ -259,6 +300,15 @@ fr-CA:
         show:
           budget: Budget
           view_all_projects: Voir tous les projets
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Budgets où vous avez un vote encore en cours :'
+          email_intro: Vous avez commencé un vote sur le budget, mais vous ne l'avez pas finalisé.
+          email_link: Cliquez ici pour finaliser votre vote
+          email_outro: N'oubliez pas de finaliser votre vote. Pour voter, vous devez d'abord sélectionner le projet ou les projets sur lesquelles vous souhaitez voter, puis confirmer votre vote avec le bouton "Voter".
+          email_subject:
+            one: Vous avez un vote inachevé sur un budget
+            other: Vous avez des votes inachevés sur des budgets
     components:
       budgets:
         actions:
@@ -274,6 +324,7 @@ fr-CA:
               errors:
                 budget_voting_rule_only_one: Une seule règle de vote doit être activée
                 budget_voting_rule_required: Une règle de vote est requise
+            geocoding_enabled: Géocodage activé
             landing_page_content: Page d'accueil des budgets
             more_information_modal: Plus d’informations
             projects_per_page: Projets par page
diff --git a/decidim-budgets/config/locales/fr.yml b/decidim-budgets/config/locales/fr.yml
index be8b002261008..ce60ba765a720 100644
--- a/decidim-budgets/config/locales/fr.yml
+++ b/decidim-budgets/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -47,6 +48,7 @@ fr:
         import: Importer des propositions dans des projets
         new: Nouveau %{name}
         preview: Aperçu
+        send_voting_reminders: Envoyer des rappels de vote
         title: Actions
       admin:
         budgets:
@@ -88,16 +90,44 @@ fr:
             title: Éditer un projet
             update: Mettre à jour
           index:
+            actions: Actions
+            cancel: Annuler
+            change_category: Modifier la catégorie
+            change_scope: Changer le secteur
+            change_selected: Changer l'état sélectionné
+            deselect_implementation: Retirer de la sélection pour implémentation
             finished_orders: Votes terminés
             pending_orders: Votes en cours
+            select_for_implementation: Sélectionné pour implémentation
             selected: Sélectionné
             title: Projets
+            update: Mettre à jour
+            update_scope_button: Mettre à jour le secteur
           new:
             create: Créer
             title: Nouveau projet
           update:
             invalid: Il y a eu un problème lors de la mise à jour de ce projet
             success: Projet mis à jour avec succès
+          update_category:
+            invalid: 'Ces projets avaient déjà la catégorie %{subject_name} : %{projects}.'
+            select_a_category: Veuillez sélectionner une catégorie
+            select_a_project: Veuillez selectionner un projet
+            success: 'Les projets ont été mis à jour avec succès avec la catégorie %{subject_name} : %{projects}.'
+          update_scope:
+            invalid: 'Ces projets avaient déjà le secteur %{subject_name} : %{projects}.'
+            select_a_project: Veuillez selectionner un projet
+            select_a_scope: Veuillez sélectionner un secteur
+            success: 'Les projets ont été mis à jour avec succès avec le secteur %{subject_name} : %{projects}.'
+          update_selected:
+            invalid:
+              selected: 'Ces projets ont déjà été sélectionnés pour une implémentation : %{projects}.'
+              unselected: 'Ces projets ont déjà été retirés de la sélection pour une implémentation : %{projects}.'
+            select_a_project: Veuillez selectionner un projet
+            select_a_selection: Veuillez sélectionner un état d'implémentation
+            success:
+              selected: 'Ces projets ont été bien été sélectionnés pour une implémentation : %{projects}.'
+              unselected: 'Ces projets ont été retirés de la sélection pour une implémentation : %{projects}.'
         proposals_imports:
           create:
             invalid: Un problème est survenu lors de l'importation des propositions dans des projets
@@ -110,6 +140,12 @@ fr:
             origin_component_id: Composant d'origine
             select_component: Veuillez sélectionner un module
             title: Importer des propositions
+        reminders:
+          orders:
+            description: Les utilisateurs recevront un e-mail avec des liens vers les budgets où ils ont un vote en attente.
+            title:
+              one: Vous êtes sur le point d'envoyer un rappel par e-mail à %{count} utilisateur
+              other: Vous êtes sur le point d'envoyer un rappel par e-mail à %{count} utilisateurs
       admin_log:
         budget:
           create: "%{user_name} a créé le budget %{resource_name} dans l'espace %{space_name}"
@@ -141,6 +177,8 @@ fr:
         show: Voir les projets
         vote: Voter
         voted_on: Vous avez voté sur %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nouveau vote du budget sur ce lien %{link}</span>"
       limit_announcement:
         cant_vote: Vous ne pouvez pas voter sur ce budget. <a href="%{landing_path}">Essayez sur un autre budget</a>.
         limit_reached: Vous avez des votes actifs dans %{links}. Pour voter sur ce budget, vous devez <a href="%{landing_path}">supprimer votre vote et recommencer</a>.
@@ -154,6 +192,7 @@ fr:
           fields:
             category: Catégorie
             id: ID
+            scope: Secteur
             title: Titre
       order_summary_mailer:
         order_summary:
@@ -226,6 +265,8 @@ fr:
           filter: Filtrer
           filter_by: Filtrer par
           unfold: Voir la suite
+        index:
+          view_project: Voir le projet
         order_progress:
           vote: Voter
         order_selected_projects:
@@ -249,7 +290,7 @@ fr:
           votes:
             one: vote
             other: votes
-          you_voted: Vous avez voté pour
+          you_voted: Vous avez voté pour ceci
         project_budget_button:
           add: Ajouter à votre vote
           add_descriptive: Ajouter le projet %{resource_name} à votre vote
@@ -259,6 +300,15 @@ fr:
         show:
           budget: Budget
           view_all_projects: Voir tous les projets
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Budgets où vous avez un vote encore en cours :'
+          email_intro: Vous avez commencé un vote sur le budget, mais vous ne l'avez pas finalisé.
+          email_link: Cliquez ici pour finaliser votre vote
+          email_outro: N'oubliez pas de finaliser votre vote. Pour voter, vous devez d'abord sélectionner le projet ou les projets sur lesquelles vous souhaitez voter, puis confirmer votre vote avec le bouton "Voter".
+          email_subject:
+            one: Vous avez un vote inachevé sur un budget
+            other: Vous avez des votes inachevés sur des budgets
     components:
       budgets:
         actions:
@@ -274,6 +324,7 @@ fr:
               errors:
                 budget_voting_rule_only_one: Une seule règle de vote doit être activée
                 budget_voting_rule_required: Une règle de vote est requise
+            geocoding_enabled: Géocodage activé
             landing_page_content: Page d'accueil des budgets
             more_information_modal: Plus d’informations
             projects_per_page: Projets par page
diff --git a/decidim-budgets/config/locales/ga-IE.yml b/decidim-budgets/config/locales/ga-IE.yml
index bd90a5b748785..757f28adfa928 100644
--- a/decidim-budgets/config/locales/ga-IE.yml
+++ b/decidim-budgets/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/gl.yml b/decidim-budgets/config/locales/gl.yml
index 7edc81b999874..4fad9e1c67e13 100644
--- a/decidim-budgets/config/locales/gl.yml
+++ b/decidim-budgets/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -97,6 +98,12 @@ gl:
             create: Importa propostas a proxectos
             no_components: Non existen outros compoñentes de proposta neste espazo participativo para importar as propostas en proxectos.
             select_component: Selecciona un compoñente
+        reminders:
+          orders:
+            description: Os usuarios recibirán un correo coas ligazóns aos orzamentos onde teñen ordes pendentes.
+            title:
+              one: Estás a punto de enviar un correo recordatorio a %{count} usuario
+              other: Estás a punto de enviar un correo recordatorio a %{count} usuarios
       admin_log:
         project:
           create: "%{user_name} creou o proxecto %{resource_name} no espazo %{space_name}"
@@ -203,7 +210,6 @@ gl:
           votes:
             one: voto
             other: votos
-          you_voted: Votaches isto
         project_budget_button:
           add: Engadir ao teu voto
           add_descriptive: Engadir o proxecto %{resource_name} ao teu voto
@@ -213,6 +219,9 @@ gl:
         show:
           budget: Orzamento
           view_all_projects: Ver todos os proxectos
+      vote_reminder_mailer:
+        vote_reminder:
+          email_outro: Por favor, lembra completar a voto. Para votar, tes que seleccionar a proposta ou propostas para as que desexas votar e despois confirmar o teu voto premendo o botón "Votat".
     components:
       budgets:
         actions:
diff --git a/decidim-budgets/config/locales/hu.yml b/decidim-budgets/config/locales/hu.yml
index 559fdfc70bc39..dba968f6af02b 100644
--- a/decidim-budgets/config/locales/hu.yml
+++ b/decidim-budgets/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -37,15 +38,24 @@ hu:
             title: Projekt szerkesztése
             update: Frissítés
           index:
+            actions: Műveletek
+            cancel: Mégsem
+            change_category: Kategória módosítása
+            change_scope: Hatáskör megváltoztatása
             finished_orders: Befejezett szavazások
             pending_orders: Függőben lévő szavazások
             title: Projektek
+            update: Frissítés
+            update_scope_button: Hatáskör frissítése
           new:
             create: Létrehozás
             title: Új projekt
           update:
             invalid: Probléma történt a projekt frissítése során
             success: Projekt frissítése sikeres
+          update_category:
+            select_a_category: Kérjük, válasszon egy kategóriát
+            select_a_project: Kérem, válasszon projektet
         proposals_imports:
           create:
             invalid: Probléma merült fel a javaslatok projektekbe történő importálásakor
@@ -125,6 +135,12 @@ hu:
         show:
           budget: Költségvetés
           view_all_projects: Összes projekt megtekintése
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Nem fejezte be a szavazat leadását itt:'
+          email_intro: Elkezdte a részvételi költségvetési szavazat leadását, de nem fejezte be.
+          email_link: Szavazás folytatása
+          email_outro: Kérjük, fejezze be a szavazat leadását. A szavazáshoz előbb ki kell jelölnie azt a javaslatot vagy javaslatokat, amiket támogatni szeretne, majd a "Szavazok" gombra kattintással adhatja le szavazatát.
     components:
       budgets:
         actions:
diff --git a/decidim-budgets/config/locales/id-ID.yml b/decidim-budgets/config/locales/id-ID.yml
index 008d7d2ae33f8..c9070012ae4c9 100644
--- a/decidim-budgets/config/locales/id-ID.yml
+++ b/decidim-budgets/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/is-IS.yml b/decidim-budgets/config/locales/is-IS.yml
index cb233d89d84c9..777727aca049e 100644
--- a/decidim-budgets/config/locales/is-IS.yml
+++ b/decidim-budgets/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       project:
diff --git a/decidim-budgets/config/locales/it.yml b/decidim-budgets/config/locales/it.yml
index 6ccf20c666cf0..15777184c0dc2 100644
--- a/decidim-budgets/config/locales/it.yml
+++ b/decidim-budgets/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -226,7 +227,6 @@ it:
           votes:
             one: voto
             other: voti
-          you_voted: Hai votato
         project_budget_button:
           add: Aggiungi al tuo voto
           add_descriptive: Aggiungi progetto %{resource_name} al tuo voto
diff --git a/decidim-budgets/config/locales/ja.yml b/decidim-budgets/config/locales/ja.yml
index 9cd0bb92f77c4..c175778db28f5 100644
--- a/decidim-budgets/config/locales/ja.yml
+++ b/decidim-budgets/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -46,6 +47,7 @@ ja:
         import: プロジェクト���案をイン�ート
         new: 新�� %{name}
         preview: プレビュー
+        send_voting_reminders: 投票リマインダーを�信
         title: アクション
       admin:
         budgets:
@@ -87,16 +89,44 @@ ja:
             title: プロジェクトを編集
             update: æ›´æ–°
           index:
+            actions: アクション
+            cancel: キャンセル
+            change_category: カテゴリ�変更
+            change_scope: スコープ�変更
+            change_selected: �択��状態を変更
+            deselect_implementation: 実装�ら�択解除
             finished_orders: 完了��投票
             pending_orders: �留中�投票
+            select_for_implementation: 実装�����択
             selected: �択済
             title: プロジェクト
+            update: æ›´æ–°
+            update_scope_button: スコープを更新
           new:
             create: 作�
             title: 新�プロジェクト
           update:
             invalid: ��プロジェクト�更新中��題�発生����
             success: プロジェクトを更新����
+          update_category:
+            invalid: '�れら�プロジェクト�既� %{subject_name} カテゴリを������: %{projects}'
+            select_a_category: カテゴリを�択������
+            select_a_project: プロジェクトを�択������
+            success: 'プロジェクト� %{subject_name} カテゴリ�更新�れ���: %{projects}'
+          update_scope:
+            invalid: '�れら�プロジェクト�既� %{subject_name} スコープを������: %{projects}'
+            select_a_project: プロジェクトを�択������
+            select_a_scope: スコープを�択������
+            success: 'プロジェクト� %{subject_name} スコープ�正常�更新�れ���: %{projects}'
+          update_selected:
+            invalid:
+              selected: '�れら�プロジェクト����実装�����択�れ����: %{projects}。'
+              unselected: '�れら�プロジェクト�既�実装�ら�択解除�れ����: %{projects}。'
+            select_a_project: プロジェクトを�択������
+            select_a_selection: 実装�状態を�択������
+            success:
+              selected: '�れら�プロジェクト��実装����正常��択�れ���: %{projects}。'
+              unselected: '�れら�プロジェクト��実装�ら正常��択解除�れ���: %{projects}。'
         proposals_imports:
           create:
             invalid: �案をプロジェクト�イン�ート�る際��題�発生����
@@ -109,6 +139,11 @@ ja:
             origin_component_id: 元�コン�ー�ント
             select_component: コン�ー�ントを�択������
             title: �案�イン�ート
+        reminders:
+          orders:
+            description: ユーザー���留中�指定��る予算��リンクを�む電�メールを���り��。
+            title:
+              other: '%{count} ユーザー�メール通知を�信�よ�������'
       admin_log:
         budget:
           create: "%{user_name} �予算 %{resource_name} を %{space_name} �作�����。"
@@ -140,6 +175,8 @@ ja:
         show: プロジェクトを表示
         vote: 投票
         voted_on: '%{links} �投票����'
+      last_activity:
+        new_vote_at_html: "<span> %{link} ��新��予算投票</span>"
       limit_announcement:
         cant_vote: ��予算�投票�る�������ん。 <a href="%{landing_path}">別�予算を試��������</a>。
         limit_reached: '%{links} �有効�投票��り��。��予算�投票�る��� <a href="%{landing_path}">投票を削除��</a> やり直�必���り��。'
@@ -153,6 +190,7 @@ ja:
           fields:
             category: カテゴリ
             id: ID
+            scope: スコープ
             title: タイトル
       order_summary_mailer:
         order_summary:
@@ -224,6 +262,8 @@ ja:
           filter: フィルター
           filter_by: フィルター
           unfold: 展開�る
+        index:
+          view_project: プロジェクトを表示
         order_progress:
           vote: 投票
         order_selected_projects:
@@ -245,7 +285,7 @@ ja:
           view: 表示
           votes:
             other: 投票
-          you_voted: 投票済
+          you_voted: ����投票
         project_budget_button:
           add: 投票�追加
           add_descriptive: プロジェクト %{resource_name} を����投票�追加
@@ -255,6 +295,14 @@ ja:
         show:
           budget: 予算
           view_all_projects: ����プロジェクトを表示
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: '未完了�投票場所:'
+          email_intro: �加型予算�投票を開始������完了�����ん。
+          email_link: 投票を続行�る
+          email_outro: 投票を完了�る��を忘れ�������。 投票�る�����投票�る�案を�択��「投票�ボタン�投票を確��る必���り��。
+          email_subject:
+            other: �加型予算投票�未完了�投票��り��
     components:
       budgets:
         actions:
@@ -270,6 +318,7 @@ ja:
               errors:
                 budget_voting_rule_only_one: 1��投票ルールを有効��る必���り��
                 budget_voting_rule_required: 1��投票ルール�必���
+            geocoding_enabled: ジオコーディングを有効��る
             landing_page_content: 予算ランディングページ
             more_information_modal: 詳��情報
             projects_per_page: ページ��り�プロジェクト数
diff --git a/decidim-budgets/config/locales/ka-GE.yml b/decidim-budgets/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-budgets/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-budgets/config/locales/lb.yml b/decidim-budgets/config/locales/lb.yml
index 2f556d88a7db0..8803fcabce31b 100644
--- a/decidim-budgets/config/locales/lb.yml
+++ b/decidim-budgets/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -209,7 +210,6 @@ lb:
           votes:
             one: Abstimmung
             other: Abstimmungen
-          you_voted: Du hast für dieses gestimmt
         project_budget_button:
           add: Zur Abstimmung hinzufügen
           add_descriptive: Projekt %{resource_name} Ihrer Stimme hinzufügen
diff --git a/decidim-budgets/config/locales/lt.yml b/decidim-budgets/config/locales/lt.yml
index a23c5562d3f70..4fe71aeb497b0 100644
--- a/decidim-budgets/config/locales/lt.yml
+++ b/decidim-budgets/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -90,16 +91,34 @@ lt:
             title: Redaguoti projektÄ…
             update: Atnaujinti
           index:
+            actions: Veiksmai
+            cancel: Atšaukti
+            change_category: Keisti kategorijÄ…
+            change_scope: Keisti sritį
             finished_orders: Baigti balsavimai
             pending_orders: Balsai laukiantys patvirtinimo
             selected: Pasirinkta
             title: Projektai
+            update: Atnaujinimas
+            update_scope_button: Atnaujinti sritį
           new:
             create: Sukurti
             title: Naujas projektas
           update:
             invalid: Atnaujinant šį projektą iškilo problema
             success: Projektas atnaujintas
+          update_category:
+            invalid: 'Å ie projektai turi %{subject_name} kategorijÄ…: %{projects}.'
+            select_a_category: Pasirinkite kategorijÄ…
+            select_a_project: Pasirinkite projektÄ…
+            success: 'Projektai sÄ—kmingai atnaujinti %{subject_name} kategorijoje: %{projects}.'
+          update_scope:
+            invalid: 'Šie projektai jau turi %{subject_name} sritį: %{projects}.'
+            select_a_project: Pasirinkite projektÄ…
+            select_a_scope: Pasirinkite sritį
+            success: 'Projektai sÄ—kmingai atnaujinti %{subject_name} srityje: %{projects}.'
+          update_selected:
+            select_a_project: Pasirinkite projektÄ…
         proposals_imports:
           create:
             invalid: Importuojant pasiūlymus į projektus kilo problema
@@ -112,6 +131,14 @@ lt:
             origin_component_id: Originalusis komponentas
             select_component: Pasirinkite komponentÄ…
             title: Importuoti pasiūlymus
+        reminders:
+          orders:
+            description: Naudotojai gaus el. laišką su nuorodomis į biudžetus, kuriuose laukiami jų balsai.
+            title:
+              one: Ar tikrai norite išsiųsti priminimą laišku %{count} naudotojui?
+              few: Ar tikrai norite išsiųsti priminimą laišku %{count} naudotojams?
+              many: Ar tikrai norite išsiųsti priminimą laišku %{count} naudotojams?
+              other: Ar tikrai norite išsiųsti priminimą laišku %{count} naudotojams?
       admin_log:
         budget:
           create: "%{user_name} sukūrė %{resource_name} biudžetą %{space_name} erdvėje"
@@ -143,6 +170,8 @@ lt:
         show: Peržiūrėti projektus
         vote: Balsuoti
         voted_on: JÅ«s balsavote dÄ—l %{links}
+      last_activity:
+        new_vote_at_html: "<span>Naujas biudžeto balsavimas nuorodoje %{link}</span>"
       limit_announcement:
         cant_vote: Negalite balsuoti šito biudžeto. <a href="%{landing_path}"> Pabandykite kitą biudžetą.</a>
         limit_reached: Turite aktyvių balsų %{links}. Tam, kad balsuoti šiame biudžete turite <a href="%{landing_path}"> ištrinti balsus ir pradėti iš naujo</a>.
@@ -156,6 +185,7 @@ lt:
           fields:
             category: Kategorija
             id: ID
+            scope: Apimtis
             title: Pavadinimas
       order_summary_mailer:
         order_summary:
@@ -230,6 +260,8 @@ lt:
           filter: Filtras
           filter_by: Filtruoti pagal
           unfold: IÅ¡skleisti
+        index:
+          view_project: Peržiūrėti projektą
         order_progress:
           vote: Balsuoti
         order_selected_projects:
@@ -257,7 +289,6 @@ lt:
             few: balsai
             many: balsai
             other: balsai
-          you_voted: Balsavote už
         project_budget_button:
           add: Pridėti prie balsų
           add_descriptive: Pridėti projektą %{resource_name} prie balsų
@@ -267,6 +298,17 @@ lt:
         show:
           budget: Biudžetas
           view_all_projects: Peržiūrėti visus projektus
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Aplinkos kuriose nebaigÄ—te balsuoti:'
+          email_intro: Pradėjote balsuoti dalyvaujamajame biudžete, ta�iau nebaigėte.
+          email_link: Tęsti balsavimą
+          email_outro: Nepamirškite baigti balsavimo. Tam, kad balsuoti, pasirinkite pasiūlymą ar pasiūlymus už kuriuos norite balsuoti ir paspauskite mygtuką "Balsuoti".
+          email_subject:
+            one: Nebaigėte balsuoti dėl dalyvaujamojo biudžeto
+            few: Nebaigėte balsuoti dėl dalyvaujamojo biudžeto
+            many: Nebaigėte balsuoti dėl dalyvaujamojo biudžeto
+            other: Nebaigėte balsuoti dėl dalyvaujamojo biudžeto
     components:
       budgets:
         actions:
@@ -282,6 +324,7 @@ lt:
               errors:
                 budget_voting_rule_only_one: Turi būti įjungta tik viena balsavimo taisyklė
                 budget_voting_rule_required: BÅ«tina viena balsavimo taisyklÄ—
+            geocoding_enabled: Geokodavimas įjungtas
             landing_page_content: Biudžetų numatytasis puslapis
             more_information_modal: IÅ¡samesnÄ—s informacijos modalinis langas
             projects_per_page: Projektų skai�ius puslapyje
diff --git a/decidim-budgets/config/locales/lv.yml b/decidim-budgets/config/locales/lv.yml
index 0990dae4599f3..269fb8d3880cd 100644
--- a/decidim-budgets/config/locales/lv.yml
+++ b/decidim-budgets/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/nl.yml b/decidim-budgets/config/locales/nl.yml
index 459d09add6e76..120c875d2a953 100644
--- a/decidim-budgets/config/locales/nl.yml
+++ b/decidim-budgets/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -88,16 +89,34 @@ nl:
             title: Bewerk project
             update: Bijwerken
           index:
+            actions: Acties
+            cancel: Annuleren
+            change_category: Categorie wijzigen
+            change_scope: Scope wijzigen
             finished_orders: Voltooide stemmen
             pending_orders: Afwachtende stemmen
             selected: Geselecteerd
             title: Projecten
+            update: Bijwerken
+            update_scope_button: Scope bijwerken
           new:
             create: Creëren
             title: Nieuw project
           update:
             invalid: Er is een probleem opgetreden bij het bijwerken van dit project
             success: Project succesvol bijgewerkt
+          update_category:
+            invalid: 'Deze voorstellen hadden al categorie %{subject_name}: %{projects}.'
+            select_a_category: Selecteer een categorie
+            select_a_project: Selecteer een project
+            success: 'Voorstellen succesvol bijgewerkt naar categorie %{subject_name}: %{projects}.'
+          update_scope:
+            invalid: 'Deze voorstellen hadden al scope %{subject_name}: %{projects}.'
+            select_a_project: Selecteer een project
+            select_a_scope: Selecteer een scope
+            success: 'Voorstellen succesvol bijgewerkt naar categorie %{subject_name}: %{projects}.'
+          update_selected:
+            select_a_project: Selecteer een project
         proposals_imports:
           create:
             invalid: Er is een probleem opgetreden bij het importeren van de voorstellen in projecten
@@ -110,6 +129,12 @@ nl:
             origin_component_id: Oorsprong component
             select_component: Selecteer een component
             title: Voorstellen importeren
+        reminders:
+          orders:
+            description: Gebruikers ontvangen een e-mail met links naar de budgetten die ze nog moeten behandelen.
+            title:
+              one: Je staat op het punt om een e-mailherinnering te sturen naar %{count} gebruiker
+              other: Je staat op het punt om een e-mailherinnering te sturen naar %{count} gebruikers
       admin_log:
         budget:
           create: "%{user_name} heeft het %{resource_name} budget aangemaakt in de %{space_name} ruimte"
@@ -141,6 +166,8 @@ nl:
         show: Bekijk projecten
         vote: Stem
         voted_on: Je hebt gestemd op %{links}
+      last_activity:
+        new_vote_at_html: "<span>Nieuwe budgetsstem bij %{link}</span>"
       limit_announcement:
         cant_vote: Je kunt niet stemmen op dit budget. <a href="%{landing_path}">Probeer een ander budget</a>.
         limit_reached: Je hebt actieve stemmen in %{links}. Om op deze begroting te stemmen, moet je <a href="%{landing_path}">je stem verwijderen en opnieuw beginnen</a>.
@@ -154,6 +181,7 @@ nl:
           fields:
             category: Categorie
             id: ID
+            scope: Scope
             title: Titel
       order_summary_mailer:
         order_summary:
@@ -226,6 +254,8 @@ nl:
           filter: Filter
           filter_by: Filteren op
           unfold: Uitvouwen
+        index:
+          view_project: Bekijk project
         order_progress:
           vote: Stem
         order_selected_projects:
@@ -249,7 +279,6 @@ nl:
           votes:
             one: stem
             other: stemmen
-          you_voted: Je stemde hiervoor
         project_budget_button:
           add: Voeg toe aan je stem
           add_descriptive: Voeg project %{resource_name} toe aan je stem
@@ -259,6 +288,15 @@ nl:
         show:
           budget: Begroting
           view_all_projects: Bekijk alle projecten
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Onderdelen waar je een onvoltooide stemming hebt:'
+          email_intro: Je bent begonnen met budgetstemmen, maar hebt dit nog niet afgewerkt.
+          email_link: Ga verder met stemmen
+          email_outro: Denk eraan om de stemming af te werken. Om te stemmen selecteer je eerst het voorstel of de voorstellen waarvoor je wil stemmen en vervolgens bevestig je met de knop "Stem".
+          email_subject:
+            one: Je hebt een onafgewerkte stem in het onderdeel budgetstemmen
+            other: Je hebt onafgewerkte stemmen in het onderdeel budgetstemmen
     components:
       budgets:
         actions:
@@ -274,6 +312,7 @@ nl:
               errors:
                 budget_voting_rule_only_one: Slechts één stemregel kan ingesteld zijn
                 budget_voting_rule_required: Eén stemregel is vereist
+            geocoding_enabled: Geocoding ingeschakeld
             landing_page_content: Budgetten landingspagina
             more_information_modal: Meer informatie
             projects_per_page: Projecten per pagina
diff --git a/decidim-budgets/config/locales/no.yml b/decidim-budgets/config/locales/no.yml
index 62532a921dd70..1c93ae6a95288 100644
--- a/decidim-budgets/config/locales/no.yml
+++ b/decidim-budgets/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -104,6 +105,12 @@
             no_components: Det er ingen andre forslag komponenter i dette deltaker området å importere forslagene inn i prosjekter.
             select_component: Velg en komponent
             title: Importer forslag
+        reminders:
+          orders:
+            description: Brukere vil motta en e-post med lenker til de budsjettene som de har ventende.
+            title:
+              one: Du er i ferd med å sende en e-postpåminnelse til %{count} bruker
+              other: Du er i ferd med å sende en e-postpåminnelse til %{count} brukere
       admin_log:
         budget:
           create: "%{user_name} opprettet %{resource_name} budsjettet i rommet %{space_name}"
@@ -240,7 +247,6 @@
           votes:
             one: stem
             other: stemmer
-          you_voted: Du stemte dette
         project_budget_button:
           add: Legg til i stemmen din
           add_descriptive: Legg til prosjektet %{resource_name} til din stemme
@@ -250,6 +256,15 @@
         show:
           budget: Budsjett
           view_all_projects: Vis alle prosjekter
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Områder hvor du har en uferdig stemme:'
+          email_intro: Du har startet på det deltakende budsjettet, men er ikke ferdig.
+          email_link: Fortsett for å fortsatt stemme
+          email_outro: Husk å fullføre stemmingen. For å stemme, må du først velge forslaget eller forslagene du ønsker å stemme på, og deretter bekrefte stemmen din med "Stemme"-knappen.
+          email_subject:
+            one: Du har en uferdig stemme i deltakende budsjettavstemming
+            other: Du har uferdige stemmer i deltakende budsjettavstemming
     components:
       budgets:
         actions:
diff --git a/decidim-budgets/config/locales/pl.yml b/decidim-budgets/config/locales/pl.yml
index b50d01e2288db..b01e3c1951b3f 100644
--- a/decidim-budgets/config/locales/pl.yml
+++ b/decidim-budgets/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -75,6 +76,7 @@ pl:
             title: Edytuj projekt
             update: Aktualizuj
           index:
+            change_selected: Zmień wybrany status
             finished_orders: Ukończone głosowania
             pending_orders: GÅ‚osowania oczekujÄ…ce
             selected: Wybrano
@@ -85,6 +87,8 @@ pl:
           update:
             invalid: Wystąpił błąd podczas aktualizowania tego projektu
             success: Zaktualizowano projekt
+          update_selected:
+            select_a_selection: Wybierz status implementacji
         proposals_imports:
           create:
             invalid: Wystąpił błąd podczas importowania propozycji do projektów
@@ -226,7 +230,6 @@ pl:
             few: głosów
             many: głosów
             other: głosów
-          you_voted: Zagłosowałeś na
         project_budget_button:
           add: Dodaj do swojego głosu
           add_descriptive: Dodaj projekt %{resource_name} do swojego głosu
diff --git a/decidim-budgets/config/locales/pt-BR.yml b/decidim-budgets/config/locales/pt-BR.yml
index 6c32c92412c94..f7852cebc9619 100644
--- a/decidim-budgets/config/locales/pt-BR.yml
+++ b/decidim-budgets/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -217,7 +218,6 @@ pt-BR:
           votes:
             one: voto
             other: votos
-          you_voted: Você votou nisto
         project_budget_button:
           add: Adicione ao seu voto
           add_descriptive: Adicione o projeto %{resource_name} ao seu voto
diff --git a/decidim-budgets/config/locales/pt.yml b/decidim-budgets/config/locales/pt.yml
index d1f62665af7e7..28a4e0f95c0ef 100644
--- a/decidim-budgets/config/locales/pt.yml
+++ b/decidim-budgets/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -220,7 +221,6 @@ pt:
           votes:
             one: Votações
             other: Votações
-          you_voted: Votou isto
         project_budget_button:
           add: Adicionar à sua votação
           add_descriptive: Adicionar projeto %{resource_name} à sua votação
diff --git a/decidim-budgets/config/locales/ro-RO.yml b/decidim-budgets/config/locales/ro-RO.yml
index e8d63bf5b38dc..e0bf628a409c5 100644
--- a/decidim-budgets/config/locales/ro-RO.yml
+++ b/decidim-budgets/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -16,6 +17,8 @@ ro:
         proposals: Propuneri
         selected: Selectate pentru implementare
         title: Titlu
+      proposals_import:
+        scope_id: Domeniu de interes
   activerecord:
     models:
       decidim/budgets/project:
@@ -46,6 +49,7 @@ ro:
         import: Importă propuneri în proiecte
         new: Nou %{name}
         preview: Previzualizare
+        send_voting_reminders: Trimite memento-uri de votare
         title: Acțiuni
       admin:
         budgets:
@@ -87,16 +91,32 @@ ro:
             title: Editare proiect
             update: Actualizare
           index:
+            actions: Acțiuni
+            cancel: Anulează
+            change_category: Schimbă categoria
+            change_scope: Schimbă domeniul
+            change_selected: Schimbă starea selectată
             finished_orders: Voturi terminate
             pending_orders: Voturi în așteptare
+            select_for_implementation: Ales pentru implementare
             selected: Selectate
             title: Proiecte
+            update: Actualizare
+            update_scope_button: Actualizează domeniu
           new:
             create: Creează
             title: Proiect nou
           update:
             invalid: A apărut o eroare la actualizarea acestui proiect
             success: Proiectul a fost actualizat cu succes
+          update_category:
+            select_a_category: Te rugăm să selectezi o categorie
+            select_a_project: Vă rugăm să selectaţi un proiect
+          update_scope:
+            select_a_project: Te rugăm să selectezi un proiect
+            select_a_scope: Te rugăm selectează un domeniu
+          update_selected:
+            select_a_project: Te rugăm să selectezi un proiect
         proposals_imports:
           create:
             invalid: A apărut o problemă la importul propunerilor în proiecte
@@ -150,6 +170,7 @@ ro:
           fields:
             category: Categorie
             id: ID
+            scope: Domeniu de interes
             title: Titlu
       order_summary_mailer:
         order_summary:
@@ -220,6 +241,8 @@ ro:
           filter: Filtrare
           filter_by: Filtrează după
           unfold: Extinde
+        index:
+          view_project: Vizualizare proiect
         order_progress:
           vote: Votează
         order_selected_projects:
@@ -245,7 +268,6 @@ ro:
             one: vot
             few: voturi
             other: voturi
-          you_voted: Ai votat pentru
         project_budget_button:
           add: Adaugă la votul tău
           add_descriptive: Adaugă proiectul %{resource_name} la votul tău
diff --git a/decidim-budgets/config/locales/ru.yml b/decidim-budgets/config/locales/ru.yml
index 287455a483111..a552c1fe6dfd5 100644
--- a/decidim-budgets/config/locales/ru.yml
+++ b/decidim-budgets/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/sk.yml b/decidim-budgets/config/locales/sk.yml
index 2a59030fc68b4..6ec82b6e49484 100644
--- a/decidim-budgets/config/locales/sk.yml
+++ b/decidim-budgets/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/sr-CS.yml b/decidim-budgets/config/locales/sr-CS.yml
index 0dc8255cb2b05..a271b02a5bfc8 100644
--- a/decidim-budgets/config/locales/sr-CS.yml
+++ b/decidim-budgets/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     budgets:
diff --git a/decidim-budgets/config/locales/sv.yml b/decidim-budgets/config/locales/sv.yml
index 836117c85137f..4aa5cba8f53c9 100644
--- a/decidim-budgets/config/locales/sv.yml
+++ b/decidim-budgets/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -6,7 +7,7 @@ sv:
         description: Beskrivning
         title: Titel
         total_budget: Total budget
-        weight: Vikt
+        weight: Ordning
       project:
         budget_amount: Belopp
         decidim_category_id: Kategori
@@ -87,10 +88,15 @@ sv:
             title: Redigera projekt
             update: Uppdatera
           index:
+            actions: Åtgärder
+            cancel: Avbryt
+            change_category: Ändra kategori
             finished_orders: Avslutade omröstningar
             pending_orders: Pågående omröstningar
             selected: Valda
             title: Projekt
+            update: Uppdatera
+            update_scope_button: Uppdatera omfång
           new:
             create: Skapa
             title: Nytt projekt
@@ -107,6 +113,12 @@ sv:
             no_components: Det finns inga andra förslagskomponenter med förslag i deltagarutrymmet som kan importeras till projekt.
             select_component: Välj en komponent
             title: Importera förslag
+        reminders:
+          orders:
+            description: Användarna kommer få ett e-post med länkar till budgetar de har börjat rösta i.
+            title:
+              one: Du är på väg att skicka ett e-postpåminnelse till %{count} användare
+              other: Du är på väg att skicka ett e-postpåminnelse till %{count} användare
       admin_log:
         budget:
           create: "%{user_name} skapade budgeten %{resource_name} i utrymmet %{space_name}"
@@ -138,6 +150,8 @@ sv:
         show: Visa projekt
         vote: Rösta
         voted_on: Du har röstat på %{links}
+      last_activity:
+        new_vote_at_html: "<span>Ny omröstning på %{link}</span>"
       limit_announcement:
         cant_vote: Du kan inte rösta på denna budget. <a href="%{landing_path}">Pröva en annan budget</a>.
         limit_reached: Du har aktiva röster i %{links}. För att rösta måste du <a href="%{landing_path}">ta bort din röst och börja om</a>.
@@ -151,6 +165,7 @@ sv:
           fields:
             category: Kategori
             id: ID
+            scope: Omfång
             title: Titel
       order_summary_mailer:
         order_summary:
@@ -167,10 +182,13 @@ sv:
           title: Bekräfta röst
         budget_excess:
           budget_excess:
+            description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximal budget överskriden
           close: Stäng
+          description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
           ok: OK
           projects_excess:
+            description: Du har valt för många projekt. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximalt antal projekt överskridet
         budget_summary:
           are_you_sure: Vill du dra tillbaka din röst?
@@ -220,6 +238,8 @@ sv:
           filter: Filtrera
           filter_by: Filtrera efter
           unfold: Veckla ut
+        index:
+          view_project: Visa projektet
         order_progress:
           vote: Rösta
         order_selected_projects:
@@ -243,7 +263,6 @@ sv:
           votes:
             one: röst
             other: röster
-          you_voted: Det här är din röst
         project_budget_button:
           add: Lägg till i din röst
           add_descriptive: Lägg till projekt %{resource_name} till din röst
@@ -253,6 +272,15 @@ sv:
         show:
           budget: Budget
           view_all_projects: Visa alla projekt
+      vote_reminder_mailer:
+        vote_reminder:
+          email_budgets: 'Områden där du inte har skickat din röst:'
+          email_intro: Du har börjat rösta i medborgarbudgeten men inte skickat den.
+          email_link: Rösta klart
+          email_outro: Kom ihåg att slutföra omröstningen. För att rösta måste du först välja ett eller flera förslag som du vill rösta för och bekräfta din röst med knappen "Rösta".
+          email_subject:
+            one: Du har börjat rösta i medborgarbudgeten men glömt skicka din röst
+            other: Du har börjat rösta i medborgarbudgeten men glömt skicka dina röster
     components:
       budgets:
         actions:
diff --git a/decidim-budgets/config/locales/tr-TR.yml b/decidim-budgets/config/locales/tr-TR.yml
index 007be2f65e2ad..234e955996b9e 100644
--- a/decidim-budgets/config/locales/tr-TR.yml
+++ b/decidim-budgets/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -209,7 +210,6 @@ tr:
           votes:
             one: oy
             other: oylar
-          you_voted: Buna oy verdin
         project_budget_button:
           add: Oyunuza ekleyin
           add_descriptive: Oyunuza %{resource_name} projesini ekleyin
diff --git a/decidim-budgets/config/locales/uk.yml b/decidim-budgets/config/locales/uk.yml
index 098cd1d85f3a1..1fb50f1f61ee3 100644
--- a/decidim-budgets/config/locales/uk.yml
+++ b/decidim-budgets/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
diff --git a/decidim-budgets/config/locales/zh-CN.yml b/decidim-budgets/config/locales/zh-CN.yml
index 6b6e631034185..2bb0fc936817d 100644
--- a/decidim-budgets/config/locales/zh-CN.yml
+++ b/decidim-budgets/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
diff --git a/decidim-budgets/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb b/decidim-budgets/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
index e54dab394f278..782f536f8fe66 100644
--- a/decidim-budgets/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
+++ b/decidim-budgets/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
@@ -14,7 +14,7 @@ def up
         new_steps_settings = component["settings"]["steps"].each_with_object({}) do |(step, config), new_config|
           votes_value = config["votes_enabled"] ? "enabled" : "disabled"
 
-          new_config[step] = config.merge("votes": votes_value).except("votes_enabled")
+          new_config[step] = config.merge(votes: votes_value).except("votes_enabled")
           new_config
         end
         component["settings"]["steps"] = new_steps_settings
@@ -22,7 +22,7 @@ def up
       elsif default_step.present?
         votes_value = component["settings"]["default_step"]["votes_enabled"] ? "enabled" : "disabled"
 
-        new_default_step_settings = component["settings"]["default_step"].merge("votes": votes_value).except("votes_enabled")
+        new_default_step_settings = component["settings"]["default_step"].merge(votes: votes_value).except("votes_enabled")
         component["settings"]["default_step"] = new_default_step_settings
         component.save!
       end
diff --git a/decidim-budgets/db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb b/decidim-budgets/db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb
new file mode 100644
index 0000000000000..79904eb453beb
--- /dev/null
+++ b/decidim-budgets/db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddGeolocalizationFieldsToProjects < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_budgets_projects, :address, :text
+    add_column :decidim_budgets_projects, :latitude, :float
+    add_column :decidim_budgets_projects, :longitude, :float
+  end
+end
diff --git a/decidim-budgets/decidim-budgets.gemspec b/decidim-budgets/decidim-budgets.gemspec
index 45c5269486545..1abb47a1f9580 100644
--- a/decidim-budgets/decidim-budgets.gemspec
+++ b/decidim-budgets/decidim-budgets.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-budgets"
   s.summary = "Decidim budgets module"
diff --git a/decidim-budgets/lib/decidim/budgets/admin_engine.rb b/decidim-budgets/lib/decidim/budgets/admin_engine.rb
index f63a9d89b5bc4..a70f72259e42e 100644
--- a/decidim-budgets/lib/decidim/budgets/admin_engine.rb
+++ b/decidim-budgets/lib/decidim/budgets/admin_engine.rb
@@ -15,6 +15,9 @@ class AdminEngine < ::Rails::Engine
         resources :budgets do
           resources :projects do
             collection do
+              post :update_category
+              post :update_scope
+              post :update_selected
               resource :proposals_import, only: [:new, :create]
             end
           end
diff --git a/decidim-budgets/lib/decidim/budgets/component.rb b/decidim-budgets/lib/decidim/budgets/component.rb
index 747662ad09125..429e26bdb395d 100644
--- a/decidim-budgets/lib/decidim/budgets/component.rb
+++ b/decidim-budgets/lib/decidim/budgets/component.rb
@@ -46,7 +46,7 @@
 
   component.register_stat :orders_count do |components, start_at, end_at|
     budgets = Decidim::Budgets::Budget.where(component: components)
-    orders = Decidim::Budgets::Order.where(component: budgets)
+    orders = Decidim::Budgets::Order.where(budget: budgets)
     orders = orders.where("created_at >= ?", start_at) if start_at.present?
     orders = orders.where("created_at <= ?", end_at) if end_at.present?
     orders.count
@@ -90,6 +90,7 @@
     settings.attribute :vote_selected_projects_maximum, type: :integer, default: 1
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
 
@@ -150,7 +151,7 @@
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
-          budget_amount: Faker::Number.number(digits: 8)
+          budget_amount: Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
         )
 
         attachment_collection = Decidim::AttachmentCollection.create!(
@@ -165,7 +166,7 @@
           attachment_collection: attachment_collection,
           attached_to: project,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
@@ -177,7 +178,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -189,7 +190,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
diff --git a/decidim-budgets/lib/decidim/budgets/engine.rb b/decidim-budgets/lib/decidim/budgets/engine.rb
index 1754f590c5dba..3d24cc4ed311b 100644
--- a/decidim-budgets/lib/decidim/budgets/engine.rb
+++ b/decidim-budgets/lib/decidim/budgets/engine.rb
@@ -42,6 +42,23 @@ class Engine < ::Rails::Engine
       initializer "decidim_budgets.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_budgets.register_reminders" do
+        Decidim.reminders_registry.register(:orders) do |reminder_registry|
+          reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
+          reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
+          reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+
+          reminder_registry.settings do |settings|
+            settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+          end
+
+          reminder_registry.messages do |msg|
+            msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
+            msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-budgets/lib/decidim/budgets/test/factories.rb b/decidim-budgets/lib/decidim/budgets/test/factories.rb
index 419ae4e2d15c2..0d6ec4ec9fd32 100644
--- a/decidim-budgets/lib/decidim/budgets/test/factories.rb
+++ b/decidim-budgets/lib/decidim/budgets/test/factories.rb
@@ -12,6 +12,14 @@
     manifest_name { :budgets }
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
 
+    trait :with_geocoding_enabled do
+      settings do
+        {
+          geocoding_enabled: true
+        }
+      end
+    end
+
     trait :with_vote_threshold_percent do
       transient do
         vote_rule_threshold_percent_enabled { true }
@@ -136,6 +144,9 @@
   factory :project, class: "Decidim::Budgets::Project" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
+    latitude { Faker::Address.latitude }
+    longitude { Faker::Address.longitude }
     budget_amount { Faker::Number.number(digits: 8) }
     budget { create(:budget) }
 
diff --git a/decidim-budgets/lib/decidim/budgets/version.rb b/decidim-budgets/lib/decidim/budgets/version.rb
index acffdc6adc42e..da40a9149250c 100644
--- a/decidim-budgets/lib/decidim/budgets/version.rb
+++ b/decidim-budgets/lib/decidim/budgets/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-budgets/spec/commands/checkout_spec.rb b/decidim-budgets/spec/commands/checkout_spec.rb
index 8994a387cb953..d3844c1c12a97 100644
--- a/decidim-budgets/spec/commands/checkout_spec.rb
+++ b/decidim-budgets/spec/commands/checkout_spec.rb
@@ -44,6 +44,15 @@ module Decidim::Budgets
 
         subject.call
       end
+
+      it "creates activelog entry" do
+        expect(Decidim.traceability)
+          .to receive(:update!)
+          .with(order, order.user, { checked_out_at: be_within(10.seconds).of(Time.current) }, visibility: "private-only")
+          .and_call_original
+
+        subject.call
+      end
     end
 
     context "when the order is not present" do
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/create_budget_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/create_budget_spec.rb
index 22f26a7fdf0de..8d872e7d36a78 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/create_budget_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/create_budget_spec.rb
@@ -30,7 +30,7 @@
   let(:budget) { Decidim::Budgets::Budget.last }
 
   it "creates the budget" do
-    expect { subject.call }.to change { Decidim::Budgets::Budget.count }.by(1)
+    expect { subject.call }.to change(Decidim::Budgets::Budget, :count).by(1)
   end
 
   it "stores the given data" do
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/create_order_reminders_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/create_order_reminders_spec.rb
new file mode 100644
index 0000000000000..490ca796d2978
--- /dev/null
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/create_order_reminders_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Budgets::Admin::CreateOrderReminders do
+  let(:command) { described_class.new(form).call }
+
+  let(:form) do
+    instance_double(
+      Decidim::Budgets::Admin::OrderReminderForm,
+      invalid?: false,
+      voting_enabled?: voting_enabled,
+      voting_ends_soon?: voting_ends_soon,
+      current_component: component,
+      minimum_interval_between_reminders: minimum_interval
+    )
+  end
+  let(:voting_enabled) { true }
+  let(:voting_ends_soon) { false }
+  let(:minimum_interval) { 24.hours }
+  let(:organization) { create(:organization) }
+  let(:component) { create(:component, organization: organization, manifest_name: "budgets") }
+  let(:budget) { create(:budget, component: component) }
+
+  context "when there is a new order" do
+    let!(:new_order) { create(:order, budget: budget, created_at: 10.minutes.ago) }
+
+    it "generates reminder and broadcasts ok with count of reminded people" do
+      expect { command }.to change(Decidim::Reminder, :count).by(1).and broadcast(:ok, 0)
+    end
+  end
+
+  context "when there is a pending order" do
+    let!(:order) { create(:order, budget: budget, created_at: 3.days.ago) }
+
+    it "user will be reminded" do
+      expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+      expect { command }.to broadcast(:ok, 1)
+    end
+
+    context "with reminder" do
+      let(:reminder) { create(:reminder, user: order.user, component: component) }
+
+      context "with recent delivery" do
+        let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder) }
+
+        it "user will not be reminded" do
+          expect(Decidim::Budgets::SendVoteReminderJob).not_to receive(:perform_later)
+
+          expect { command }.to broadcast(:ok, 0)
+        end
+      end
+
+      context "with old delivery" do
+        let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder, created_at: 2.days.ago) }
+
+        it "user will be reminded" do
+          expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+          expect { command }.to broadcast(:ok, 1)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
index e7e3b747110bb..064235feded3a 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/create_project_spec.rb
@@ -15,6 +15,9 @@ module Decidim::Budgets
     let(:category) { create :category, participatory_space: participatory_process }
     let(:uploaded_photos) { [] }
     let(:photos) { [] }
+    let(:address) { nil }
+    let(:latitude) { 40.1234 }
+    let(:longitude) { 2.1234 }
     let(:proposal_component) do
       create(:component, manifest_name: :proposals, participatory_space: participatory_process)
     end
@@ -33,6 +36,9 @@ module Decidim::Budgets
         title: { en: "title" },
         description: { en: "description" },
         budget_amount: 10_000_000,
+        address: address,
+        latitude: latitude,
+        longitude: longitude,
         proposal_ids: proposals.map(&:id),
         scope: scope,
         category: category,
@@ -89,6 +95,26 @@ module Decidim::Budgets
         expect(action_log.version).to be_present
       end
 
+      context "when geocoding is enabled" do
+        let(:current_component) { create :budgets_component, :with_geocoding_enabled, participatory_space: participatory_process }
+
+        context "when the address is present" do
+          let(:address) { "Some address" }
+
+          before do
+            stub_geocoding(address, [latitude, longitude])
+          end
+
+          it "sets the latitude and longitude" do
+            subject.call
+            project = Decidim::Budgets::Project.last
+
+            expect(project.latitude).to eq(latitude)
+            expect(project.longitude).to eq(longitude)
+          end
+        end
+      end
+
       it "links proposals" do
         subject.call
         linked_proposals = project.linked_resources(:proposals, "included_proposals")
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/destroy_budget_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/destroy_budget_spec.rb
index 4eb659a63b717..9789a521f617b 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/destroy_budget_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/destroy_budget_spec.rb
@@ -10,7 +10,7 @@
   let(:user) { create :user, :admin, :confirmed, organization: organization }
 
   it "destroys the budget" do
-    expect { subject.call }.to change { Decidim::Budgets::Budget.count }.by(-1)
+    expect { subject.call }.to change(Decidim::Budgets::Budget, :count).by(-1)
   end
 
   it "traces the action", versioning: true do
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
index 3e52e0941a9c7..220b3753f60a7 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/import_proposals_to_budgets_spec.rb
@@ -50,7 +50,7 @@ module Admin
             it "doesn't create the project" do
               expect do
                 command.call
-              end.to change(Project, :count).by(0)
+              end.not_to change(Project, :count)
             end
           end
 
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_category_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_category_spec.rb
new file mode 100644
index 0000000000000..51e3b484c7fbb
--- /dev/null
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_category_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Budgets
+  describe Admin::UpdateProjectCategory do
+    subject { described_class.new(category_id, Array(project)) }
+
+    let(:budget) { create(:budget) }
+    let(:project) { create(:project, budget: budget) }
+    let(:category) { create(:category, participatory_space: budget.component.participatory_space) }
+    let(:category_id) { category.id }
+
+    context "when everything is ok" do
+      it "updates the project" do
+        expect { subject.call }.to broadcast(:update_projects_category)
+        expect(::Decidim::Budgets::Project.find(project.id).category).to eq(category)
+      end
+    end
+
+    context "when category is blank" do
+      let(:category_id) { nil }
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid_category)
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_scope_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_scope_spec.rb
new file mode 100644
index 0000000000000..3549838fc4762
--- /dev/null
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_scope_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Budgets
+  describe Admin::UpdateProjectScope do
+    subject { described_class.new(scope_id, Array(project)) }
+
+    let(:budget) { create(:budget) }
+    let(:project) { create(:project, budget: budget) }
+    let(:scope) { create(:scope, organization: budget.component.organization) }
+    let(:scope_id) { scope.id }
+
+    context "when everything is ok" do
+      it "updates the project" do
+        expect { subject.call }.to broadcast(:update_projects_scope)
+        expect(::Decidim::Budgets::Project.find(project.id).scope).to eq(scope)
+      end
+    end
+
+    context "when scope is blank" do
+      let(:scope_id) { nil }
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid_scope)
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_selection_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_selection_spec.rb
new file mode 100644
index 0000000000000..a3a6d3533053f
--- /dev/null
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_selection_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Budgets
+  describe Admin::UpdateProjectSelection do
+    subject { described_class.new(selection_to_s, Array(project)) }
+
+    let(:budget) { create(:budget) }
+    let(:project) { create(:project, budget: budget) }
+    let(:selection) { true }
+    let(:selection_to_s) { selection.to_s }
+
+    context "when everything is ok" do
+      it "updates the project" do
+        expect { subject.call }.to broadcast(:update_projects_selection)
+        expect(::Decidim::Budgets::Project.find(project.id).selected?).to eq(selection)
+      end
+    end
+
+    context "when selection is blank" do
+      let(:selection) { nil }
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid_selection)
+      end
+    end
+
+    context "when project is already selected for implementation" do
+      let(:project) { create(:project, :selected, budget: budget) }
+      let(:selection) { false }
+
+      it "deselects the project" do
+        expect { subject.call }.to broadcast(:update_projects_selection)
+        expect(::Decidim::Budgets::Project.find(project.id).selected?).to eq(selection)
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
index 934e16bbdeb15..8b077c5cce699 100644
--- a/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
+++ b/decidim-budgets/spec/commands/decidim/budgets/admin/update_project_spec.rb
@@ -15,6 +15,9 @@ module Decidim::Budgets
     let(:current_user) { create :user, :admin, :confirmed, organization: organization }
     let(:uploaded_photos) { [] }
     let(:selected) { nil }
+    let(:address) { "something" }
+    let(:latitude) { 40.1234 }
+    let(:longitude) { 2.1234 }
     let(:current_photos) { [] }
     let(:proposal_component) do
       create(:component, manifest_name: :proposals, participatory_space: participatory_process)
@@ -38,7 +41,10 @@ module Decidim::Budgets
         category: category,
         selected: selected,
         photos: current_photos,
-        add_photos: uploaded_photos
+        add_photos: uploaded_photos,
+        address: address,
+        latitude: latitude,
+        longitude: longitude
       )
     end
     let(:invalid) { false }
@@ -82,6 +88,26 @@ module Decidim::Budgets
         expect(action_log.version).to be_present
       end
 
+      context "when geocoding is enabled" do
+        let(:current_component) { create :budgets_component, :with_geocoding_enabled, participatory_space: participatory_process }
+
+        context "when the address is present" do
+          let(:address) { "Some address" }
+
+          before do
+            stub_geocoding(address, [latitude, longitude])
+          end
+
+          it "sets the latitude and longitude" do
+            subject.call
+            project = Decidim::Budgets::Project.last
+
+            expect(project.latitude).to eq(latitude)
+            expect(project.longitude).to eq(longitude)
+          end
+        end
+      end
+
       it "links proposals" do
         subject.call
         linked_proposals = project.linked_resources(:proposals, "included_proposals")
diff --git a/decidim-budgets/spec/commands/remove_line_item_spec.rb b/decidim-budgets/spec/commands/remove_line_item_spec.rb
index 9d02c01529b1a..7ced98bdc1044 100644
--- a/decidim-budgets/spec/commands/remove_line_item_spec.rb
+++ b/decidim-budgets/spec/commands/remove_line_item_spec.rb
@@ -11,7 +11,7 @@ module Decidim::Budgets
     let(:component) do
       create(:budgets_component,
              organization: user.organization,
-             settings: { "vote_threshold_percent": 50 })
+             settings: { vote_threshold_percent: 50 })
     end
 
     let(:budget) { create(:budget, component: component, total_budget: 100_000) }
diff --git a/decidim-budgets/spec/controller/decidim/budgets/admin/projects_controller_spec.rb b/decidim-budgets/spec/controller/decidim/budgets/admin/projects_controller_spec.rb
index a19c6082e61ed..7ada4d5a06d85 100644
--- a/decidim-budgets/spec/controller/decidim/budgets/admin/projects_controller_spec.rb
+++ b/decidim-budgets/spec/controller/decidim/budgets/admin/projects_controller_spec.rb
@@ -55,13 +55,10 @@ module Admin
               let(:project_title) { { en: "" } }
               let(:project) { create(:project, :with_photos, component: component) }
 
-              before do
-                controller.class_eval do
-                  helper_method :proposals_picker_projects_path
-
-                  def proposals_picker_projects_path
-                    "/"
-                  end
+              controller(ProjectsController) do
+                helper_method :proposals_picker_projects_path
+                def proposals_picker_projects_path
+                  "/"
                 end
               end
 
diff --git a/decidim-budgets/spec/controller/decidim/budgets/projects_controller_spec.rb b/decidim-budgets/spec/controller/decidim/budgets/projects_controller_spec.rb
new file mode 100644
index 0000000000000..f542df2db7f4d
--- /dev/null
+++ b/decidim-budgets/spec/controller/decidim/budgets/projects_controller_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Budgets
+    describe ProjectsController, type: :controller do
+      routes { Decidim::Budgets::Engine.routes }
+
+      let(:user) { create(:user, :confirmed, organization: component.organization) }
+      let!(:budget) { create(:budget, component: component) }
+
+      before do
+        request.env["decidim.current_organization"] = component.organization
+        request.env["decidim.current_participatory_space"] = component.participatory_space
+        request.env["decidim.current_component"] = component
+        sign_in user
+      end
+
+      describe "GET index" do
+        let(:component) { create(:budgets_component, :with_geocoding_enabled) }
+
+        it "sets two different collections" do
+          geocoded_projects = create_list :project, 10, budget: budget, latitude: 1.1, longitude: 2.2
+          _non_geocoded_projects = create_list :project, 2, budget: budget, latitude: nil, longitude: nil
+
+          get :index, params: { budget_id: budget.id }
+          expect(response).to have_http_status(:ok)
+          expect(subject).to render_template(:index)
+
+          expect(subject.send(:projects).count).to eq 12
+          expect(subject.send(:all_geocoded_projects)).to match_array(geocoded_projects)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/forms/decidim/budgets/admin/order_reminder_form_spec.rb b/decidim-budgets/spec/forms/decidim/budgets/admin/order_reminder_form_spec.rb
new file mode 100644
index 0000000000000..b7b50cf3c53b7
--- /dev/null
+++ b/decidim-budgets/spec/forms/decidim/budgets/admin/order_reminder_form_spec.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Budgets::Admin::OrderReminderForm do
+  subject { described_class.from_params(attributes).with_context(context) }
+
+  let(:attributes) { {} }
+  let(:context) do
+    {
+      current_organization: organization,
+      current_component: component
+    }
+  end
+  let(:organization) { create(:organization) }
+  let(:participatory_space) { create(:participatory_process, organization: organization) }
+  let(:component) { create(:component, participatory_space: participatory_space, manifest_name: "budgets") }
+  let(:budget) { create(:budget, component: component) }
+
+  context "when voting is ending today" do
+    let!(:step1) do
+      create(:participatory_process_step,
+             active: true,
+             end_date: Time.zone.now.to_date,
+             participatory_process: participatory_space)
+    end
+    let!(:step2) do
+      create(:participatory_process_step,
+             active: false,
+             end_date: 1.month.from_now.to_date,
+             participatory_process: participatory_space)
+    end
+
+    before do
+      participatory_space.reload
+      participatory_space.steps.reload
+    end
+
+    context "and there are 5 hours left in the day" do
+      before { allow(Time.zone).to receive(:now).and_return(Time.zone.now.end_of_day - 5.hours) }
+
+      it "voting_ends_soon? returns true" do
+        expect(subject.voting_ends_soon?).to be(true)
+      end
+    end
+
+    context "and there are 10 hours left in the day" do
+      before { allow(Time.zone).to receive(:now).and_return(Time.zone.now.end_of_day - 10.hours) }
+
+      it "voting_ends_soon? returns false" do
+        expect(subject.voting_ends_soon?).to be(false)
+      end
+    end
+  end
+
+  context "when participatory spac doesnt have steps" do
+    let(:participatory_space) { create(:assembly) }
+
+    context "and there are 2 hours left in the day" do
+      before { allow(Time.zone).to receive(:now).and_return(Time.zone.now.end_of_day - 2.hours) }
+
+      it "we dont know that ending is ending soon" do
+        expect(subject.voting_ends_soon?).to be(false)
+      end
+    end
+  end
+
+  describe "#reminder_amount" do
+    context "when there is new order" do
+      let!(:new_order) { create(:order, budget: budget, created_at: 10.minutes.ago) }
+
+      it "does not count it" do
+        expect(subject.reminder_amount).to eq(0)
+      end
+    end
+
+    context "when there is a pending order" do
+      let!(:order) { create(:order, budget: budget, created_at: 3.days.ago) }
+
+      it "counts that user will be reminded" do
+        expect(subject.reminder_amount).to eq(1)
+      end
+
+      context "with reminder" do
+        let(:reminder) { create(:reminder, user: order.user, component: component) }
+
+        context "with recent delivery" do
+          let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder) }
+
+          it "calculates that the user will not be reminded" do
+            expect(subject.reminder_amount).to eq(0)
+          end
+        end
+
+        context "with old delivery" do
+          let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder, created_at: 2.days.ago) }
+
+          it "calculates that the user will be reminded" do
+            expect(subject.reminder_amount).to eq(1)
+          end
+        end
+      end
+    end
+
+    context "when there are multiple pending orders and one new order" do
+      let(:pending_order_amount) { rand(2..7) }
+      let!(:orders) { create_list(:order, pending_order_amount, budget: budget, created_at: 2.days.ago) }
+      let!(:new_order) { create(:order, budget: budget, created_at: 10.minutes.ago) }
+
+      it "counts pending order" do
+        expect(subject.reminder_amount).to eq(pending_order_amount)
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/forms/decidim/budgets/admin/project_form_spec.rb b/decidim-budgets/spec/forms/decidim/budgets/admin/project_form_spec.rb
index 1443f5390e6c2..6a544178d6a88 100644
--- a/decidim-budgets/spec/forms/decidim/budgets/admin/project_form_spec.rb
+++ b/decidim-budgets/spec/forms/decidim/budgets/admin/project_form_spec.rb
@@ -30,6 +30,9 @@ module Decidim::Budgets
     let(:category) { create :category, participatory_space: participatory_process }
     let(:category_id) { category.id }
     let(:selected) { nil }
+    let(:latitude) { 40.1234 }
+    let(:longitude) { 2.1234 }
+    let(:address) { nil }
     let(:attributes) do
       {
         decidim_scope_id: scope_id,
@@ -37,7 +40,8 @@ module Decidim::Budgets
         title_en: title[:en],
         description_en: description[:en],
         budget_amount: budget_amount,
-        selected: selected
+        selected: selected,
+        address: address
       }
     end
 
@@ -45,6 +49,33 @@ module Decidim::Budgets
 
     it { is_expected.to be_valid }
 
+    context "when geocoding is enabled" do
+      let(:current_component) { create :budgets_component, :with_geocoding_enabled, participatory_space: participatory_process }
+
+      context "when the address is not present" do
+        it "does not store the coordinates" do
+          expect(subject).to be_valid
+          expect(subject.address).to be_nil
+          expect(subject.latitude).to be_nil
+          expect(subject.longitude).to be_nil
+        end
+      end
+
+      context "when the address is present" do
+        let(:address) { "Some address" }
+
+        before do
+          stub_geocoding(address, [latitude, longitude])
+        end
+
+        it "validates the address and store its coordinates" do
+          expect(subject).to be_valid
+          expect(subject.latitude).to eq(latitude)
+          expect(subject.longitude).to eq(longitude)
+        end
+      end
+    end
+
     describe "when title is missing" do
       let(:title) { { en: nil } }
 
@@ -160,13 +191,13 @@ module Decidim::Budgets
       context "when the scope does not exist" do
         let(:scope_id) { 3456 }
 
-        it { is_expected.to eq(nil) }
+        it { is_expected.to be_nil }
       end
 
       context "when the scope is from another organization" do
         let(:scope_id) { create(:scope).id }
 
-        it { is_expected.to eq(nil) }
+        it { is_expected.to be_nil }
       end
 
       context "when the participatory space has a scope" do
diff --git a/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb b/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb
new file mode 100644
index 0000000000000..de7a5e7d4b151
--- /dev/null
+++ b/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Budgets
+    describe ProjectsHelper do
+      include Decidim::LayoutHelper
+
+      let!(:organization) { create(:organization) }
+      let!(:budgets_component) { create(:budgets_component, :with_geocoding_enabled, organization: organization) }
+      let(:budget) { create(:budget, component: budgets_component) }
+      let!(:user) { create(:user, organization: organization) }
+      let!(:projects) { create_list(:project, 5, budget: budget, address: address, latitude: latitude, longitude: longitude, component: budgets_component) }
+      let!(:project) { projects.first }
+      let(:address) { "Carrer Pic de Peguera 15, 17003 Girona" }
+      let(:latitude) { 40.1234 }
+      let(:longitude) { 2.1234 }
+
+      describe "#has_position?" do
+        subject { helper.has_position?(project) }
+
+        it { is_expected.to be_truthy }
+
+        context "when project is not geocoded" do
+          let!(:projects) { create_list(:project, 5, budget: budget, address: address, latitude: nil, longitude: nil, component: budgets_component) }
+
+          it { is_expected.to be_falsey }
+        end
+      end
+
+      describe "#project_data_for_map" do
+        subject { helper.project_data_for_map(project) }
+
+        let(:fake_description) { "<script>alert(\"HEY\")</script> This is my long, but still super interesting, description of my also long, but also super interesting, project. Check it out!" }
+        let(:fake_title) { "<script>alert(\"HEY\")</script> This is my title" }
+
+        it "returns preview data" do
+          allow(project).to receive(:description).and_return(en: fake_description)
+          allow(project).to receive(:title).and_return(en: fake_title)
+
+          expect(subject["latitude"]).to eq(latitude)
+          expect(subject["longitude"]).to eq(longitude)
+          expect(subject["address"]).to eq(address)
+          expect(subject["title"]).to eq("&lt;script&gt;alert(&quot;HEY&quot;)&lt;/script&gt; This is my title")
+          expect(subject["description"]).to eq("<div class=\"ql-editor-display\">alert(&quot;HEY&quot;) This is my long, but still super interesting, description of my also long, but also sup...</div>")
+          expect(subject["link"]).to eq(::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path)
+          expect(subject["icon"]).to match(/<svg.+/)
+        end
+      end
+
+      describe "#projects_data_for_map" do
+        subject { helper.projects_data_for_map(projects) }
+
+        it "returns preview data" do
+          expect(subject.length).to eq(5)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/jobs/decidim/budgets/send_order_summary_job_spec.rb b/decidim-budgets/spec/jobs/decidim/budgets/send_order_summary_job_spec.rb
index 9fbff25262c68..ba4c113f020c6 100644
--- a/decidim-budgets/spec/jobs/decidim/budgets/send_order_summary_job_spec.rb
+++ b/decidim-budgets/spec/jobs/decidim/budgets/send_order_summary_job_spec.rb
@@ -18,7 +18,7 @@
     let(:mailer) { double :mailer }
 
     it "sends an email" do
-      expect(Decidim::Budgets::OrderSummaryMailer)
+      allow(Decidim::Budgets::OrderSummaryMailer)
         .to receive(:order_summary)
         .with(order)
         .and_return(mailer)
@@ -32,7 +32,7 @@
   describe "when no order" do
     let(:order) { nil }
 
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       expect(Decidim::Budgets::OrderSummaryMailer)
         .not_to receive(:order_summary)
 
@@ -41,7 +41,7 @@
   end
 
   describe "when no user" do
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       user.destroy
       order.reload
 
@@ -53,7 +53,7 @@
   end
 
   describe "when user as no email" do
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       user.update(email: "")
 
       expect(Decidim::Budgets::OrderSummaryMailer)
diff --git a/decidim-budgets/spec/jobs/decidim/budgets/send_vote_reminder_job_spec.rb b/decidim-budgets/spec/jobs/decidim/budgets/send_vote_reminder_job_spec.rb
new file mode 100644
index 0000000000000..c569305937d5a
--- /dev/null
+++ b/decidim-budgets/spec/jobs/decidim/budgets/send_vote_reminder_job_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Budgets::SendVoteReminderJob do
+  subject { described_class }
+
+  let(:organization) { user.organization }
+  let(:user) { create(:user, :confirmed) }
+  let(:component) { create(:budgets_component, organization: organization) }
+  let(:budget) { create(:budget, component: component) }
+  let(:reminder) { create(:reminder, user: user, component: component) }
+  let(:mailer) { double :mailer }
+  let(:mailer_class) { Decidim::Budgets::VoteReminderMailer }
+
+  context "when everything is OK" do
+    let(:order) { create(:order, user: user, budget: budget) }
+    let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: order) }
+
+    it "sends an email and creates reminder delivery" do
+      allow(mailer_class)
+        .to receive(:vote_reminder)
+        .with(reminder)
+        .and_return(mailer)
+      expect(mailer)
+        .to receive(:deliver_now)
+
+      expect { subject.perform_now(reminder) }.to change(Decidim::ReminderDelivery, :count).to(1)
+    end
+  end
+
+  context "when no orders" do
+    it "doesn't send the email" do
+      expect(mailer_class)
+        .not_to receive(:vote_reminder)
+
+      subject.perform_now(reminder)
+    end
+  end
+end
diff --git a/decidim-budgets/spec/lib/decidim/budgets/admin/component_spec.rb b/decidim-budgets/spec/lib/decidim/budgets/admin/component_spec.rb
index dc1992811b77b..a5afd95affe27 100644
--- a/decidim-budgets/spec/lib/decidim/budgets/admin/component_spec.rb
+++ b/decidim-budgets/spec/lib/decidim/budgets/admin/component_spec.rb
@@ -27,6 +27,7 @@
     let(:percent) { 70 }
     let(:minimum_enabled) { false }
     let(:projects_enabled) { false }
+    let(:geocoding_enabled) { false }
     let(:minimum_number) { 3 }
     let(:maximum_number) { 6 }
 
@@ -39,7 +40,8 @@
         vote_minimum_budget_projects_number: minimum_number,
         vote_rule_selected_projects_enabled: projects_enabled,
         vote_selected_projects_minimum: minimum_number,
-        vote_selected_projects_maximum: maximum_number
+        vote_selected_projects_maximum: maximum_number,
+        geocoding_enabled: geocoding_enabled
       }
     end
 
@@ -47,13 +49,25 @@ def new_settings(name, data)
       Decidim::Component.build_settings(manifest, name, data, organization)
     end
 
+    describe "with geocoding enabled" do
+      let(:geocoding_enabled) { true }
+      # One budget rule must me activated
+      let(:percent_enabled) { true }
+
+      it "updates the component" do
+        expect do
+          Decidim::Admin::UpdateComponent.call(form, component, current_user)
+        end.to broadcast(:ok)
+      end
+    end
+
     describe "with minimum projects number to vote" do
       let(:minimum_enabled) { true }
 
       context "when the minimum projects number is valid" do
         it "updates the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:ok)
         end
       end
@@ -63,7 +77,7 @@ def new_settings(name, data)
 
         it "does NOT update the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:invalid)
         end
       end
@@ -75,7 +89,7 @@ def new_settings(name, data)
       context "when the projects rule is valid" do
         it "updates the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:ok)
         end
       end
@@ -85,7 +99,7 @@ def new_settings(name, data)
 
         it "does NOT update the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:invalid)
         end
       end
@@ -95,7 +109,7 @@ def new_settings(name, data)
 
         it "updates the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:ok)
         end
       end
@@ -105,7 +119,7 @@ def new_settings(name, data)
 
         it "does NOT update the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:invalid)
         end
       end
@@ -117,7 +131,7 @@ def new_settings(name, data)
       context "when the threshold percent number is valid" do
         it "updates the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:ok)
         end
       end
@@ -127,7 +141,7 @@ def new_settings(name, data)
 
         it "does NOT update the component" do
           expect do
-            Decidim::Admin::UpdateComponent.call(form, component)
+            Decidim::Admin::UpdateComponent.call(form, component, current_user)
           end.to broadcast(:invalid)
         end
       end
@@ -140,7 +154,7 @@ def new_settings(name, data)
 
       it "does NOT update the component" do
         expect do
-          Decidim::Admin::UpdateComponent.call(form, component)
+          Decidim::Admin::UpdateComponent.call(form, component, current_user)
         end.to broadcast(:invalid)
       end
     end
@@ -152,7 +166,7 @@ def new_settings(name, data)
 
       it "does NOT update the component" do
         expect do
-          Decidim::Admin::UpdateComponent.call(form, component)
+          Decidim::Admin::UpdateComponent.call(form, component, current_user)
         end.to broadcast(:invalid)
       end
     end
diff --git a/decidim-budgets/spec/mailers/decidim/budgets/vote_reminder_mailer_spec.rb b/decidim-budgets/spec/mailers/decidim/budgets/vote_reminder_mailer_spec.rb
new file mode 100644
index 0000000000000..70c7b5e50cf35
--- /dev/null
+++ b/decidim-budgets/spec/mailers/decidim/budgets/vote_reminder_mailer_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Budgets
+  describe VoteReminderMailer, type: :mailer do
+    let(:mail) { described_class.vote_reminder(reminder) }
+    let(:router) { Decidim::EngineRouter.main_proxy(component) }
+    let(:organization) { create(:organization) }
+    let(:user) { create(:user, organization: organization) }
+    let(:component) { create(:budgets_component, organization: organization) }
+    let(:budget) { create(:budget, component: component) }
+    let(:order) { create(:order, budget: budget, user: user) }
+
+    context "when reminder and reminder record exists" do
+      let(:reminder) { create(:reminder, component: component, user: user) }
+      let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: order) }
+
+      describe "#vote_reminder" do
+        it "delivers the email to the user" do
+          expect(mail.to).to eq(Array(user.email))
+        end
+
+        it "sets a subject" do
+          expect(mail.subject).to eq("You have an unfinished vote in the participatory budgeting vote")
+        end
+
+        it "includes link to the budget" do
+          expect(mail).to have_link(budget.title["en"], href: router.budget_url(budget))
+        end
+
+        it "includes link to the component" do
+          expect(mail).to have_link("Go to continue voting", href: router.root_url)
+        end
+      end
+    end
+
+    context "when reminder with multiple reminder records exists" do
+      let(:reminder) { create(:reminder, component: component, user: user) }
+      let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: order) }
+      let!(:reminder_record2) { create(:reminder_record, reminder: reminder, remindable: order2) }
+      let!(:reminder_record3) { create(:reminder_record, reminder: reminder, remindable: order3) }
+      let(:budgets) { create_list(:budget, 2, component: component) }
+      let(:order2) { create(:order, budget: budgets.first, user: user) }
+      let(:order3) { create(:order, budget: budgets.last, user: user) }
+
+      it "includes links to the budgets" do
+        expect(mail).to have_link(budget.title["en"], href: router.budget_url(budget))
+        expect(mail).to have_link(budgets[0].title["en"], href: router.budget_url(budgets[0]))
+        expect(mail).to have_link(budgets[1].title["en"], href: router.budget_url(budgets[1]))
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/models/decidim/budgets/project_spec.rb b/decidim-budgets/spec/models/decidim/budgets/project_spec.rb
index cf5bba8991e22..e180afef0c92f 100644
--- a/decidim-budgets/spec/models/decidim/budgets/project_spec.rb
+++ b/decidim-budgets/spec/models/decidim/budgets/project_spec.rb
@@ -68,7 +68,7 @@ module Decidim::Budgets
       let(:order) { create :order, budget: project.budget }
       let(:unfinished_order) { create :order, budget: project.budget }
       let!(:line_item) { create :line_item, project: project, order: order }
-      let!(:line_item_1) { create :line_item, project: project, order: unfinished_order }
+      let!(:line_item1) { create :line_item, project: project, order: unfinished_order }
 
       it "return number of finished orders for this project" do
         order.reload.update!(checked_out_at: Time.current)
diff --git a/decidim-budgets/spec/permissions/decidim/budgets/admin/permissions_spec.rb b/decidim-budgets/spec/permissions/decidim/budgets/admin/permissions_spec.rb
index 5942ed574dad3..4b86e9e3c37a9 100644
--- a/decidim-budgets/spec/permissions/decidim/budgets/admin/permissions_spec.rb
+++ b/decidim-budgets/spec/permissions/decidim/budgets/admin/permissions_spec.rb
@@ -16,9 +16,9 @@
   let(:budgets_component) { create :budgets_component }
   let(:budget) { create :budget, component: budgets_component }
   let(:project) { create :project, component: budgets_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
-  context "when scope is not admin" do
+  context "when scope and action are both random" do
     let(:action) do
       { scope: :foo, action: :bar, subject: :budget }
     end
@@ -48,7 +48,7 @@
     end
     let(:budget) { nil }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "budget update" do
@@ -56,7 +56,7 @@
       { scope: :admin, action: :update, subject: :budget }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when deleting a budget" do
@@ -65,7 +65,7 @@
         { scope: :admin, action: :delete, subject: :budget }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     describe "with projects" do
@@ -74,7 +74,7 @@
         { scope: :admin, action: :delete, subject: :budget }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -91,7 +91,7 @@
       { scope: :admin, action: :create, subject: :project }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "project update" do
@@ -99,7 +99,7 @@
       { scope: :admin, action: :update, subject: :project }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     context "when project is not present" do
       let(:project) { nil }
@@ -113,7 +113,7 @@
       { scope: :admin, action: :destroy, subject: :project }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     context "when project is not present" do
       let(:project) { nil }
diff --git a/decidim-budgets/spec/permissions/decidim/budgets/permissions_spec.rb b/decidim-budgets/spec/permissions/decidim/budgets/permissions_spec.rb
index 00dcc7f12e6b4..12e068cfedd3c 100644
--- a/decidim-budgets/spec/permissions/decidim/budgets/permissions_spec.rb
+++ b/decidim-budgets/spec/permissions/decidim/budgets/permissions_spec.rb
@@ -14,7 +14,7 @@
   end
   let(:budgets_component) { create :budgets_component }
   let(:project) { create :project, component: budgets_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
@@ -53,6 +53,6 @@
       { scope: :public, action: :report, subject: :project }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 end
diff --git a/decidim-budgets/spec/requests/project_search_spec.rb b/decidim-budgets/spec/requests/project_search_spec.rb
new file mode 100644
index 0000000000000..6e290efed9f1b
--- /dev/null
+++ b/decidim-budgets/spec/requests/project_search_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Project search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :budgets_component }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+  let(:resource_params) { { budget: budget } }
+
+  let(:budget) { create(:budget, component: component) }
+  let(:budget2) { create(:budget, component: component) }
+  let!(:project1) do
+    create(
+      :project,
+      :selected,
+      budget: budget,
+      scope: create(:scope, organization: organization),
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:project2) do
+    create(
+      :project,
+      :selected,
+      budget: budget,
+      scope: create(:scope, organization: organization),
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:project3) do
+    create(
+      :project,
+      budget: budget,
+      scope: create(:scope, organization: organization),
+      category: create(:category, participatory_space: participatory_space)
+    )
+  end
+  let!(:project4) { create(:project, budget: budget2) }
+  let!(:project5) { create(:project, budget: budget2) }
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).budget_projects_path(budget) }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :project
+  it_behaves_like "a resource search with scopes", :project
+  it_behaves_like "a resource search with categories", :project
+
+  it "displays all projects within the budget without any filters" do
+    expect(subject).to include(translated(project1.title))
+    expect(subject).to include(translated(project2.title))
+    expect(subject).to include(translated(project3.title))
+    expect(subject).not_to include(translated(project4.title))
+    expect(subject).not_to include(translated(project5.title))
+  end
+
+  context "when searching by status" do
+    let(:filter_params) { { with_any_status: status } }
+
+    context "with the all scope" do
+      let(:status) { ["all"] }
+
+      it "displays all projects" do
+        expect(subject).to include(translated(project1.title))
+        expect(subject).to include(translated(project2.title))
+        expect(subject).to include(translated(project3.title))
+      end
+    end
+
+    context "and the status is selected" do
+      let(:status) { ["selected"] }
+
+      it "displays the selected projects" do
+        expect(subject).to include(translated(project1.title))
+        expect(subject).to include(translated(project2.title))
+        expect(subject).not_to include(translated(project3.title))
+      end
+    end
+
+    context "and the status is not selected" do
+      let(:status) { ["not_selected"] }
+
+      it "displays the selected projects" do
+        expect(subject).not_to include(translated(project1.title))
+        expect(subject).not_to include(translated(project2.title))
+        expect(subject).to include(translated(project3.title))
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/serializers/data_portability_budgets_order_serializer_spec.rb b/decidim-budgets/spec/serializers/download_your_data_budgets_order_serializer_spec.rb
similarity index 96%
rename from decidim-budgets/spec/serializers/data_portability_budgets_order_serializer_spec.rb
rename to decidim-budgets/spec/serializers/download_your_data_budgets_order_serializer_spec.rb
index 525ea99a2c7f4..2e08a4af6307f 100644
--- a/decidim-budgets/spec/serializers/data_portability_budgets_order_serializer_spec.rb
+++ b/decidim-budgets/spec/serializers/download_your_data_budgets_order_serializer_spec.rb
@@ -3,12 +3,12 @@
 require "spec_helper"
 
 module Decidim::Budgets
-  describe DataPortabilityBudgetsOrderSerializer do
+  describe DownloadYourDataBudgetsOrderSerializer do
     let(:resource) { create(:order) }
+    let(:serialized) { subject.serialize }
     let!(:projects) { create_list(:project, 2, budget: resource.budget, budget_amount: 25_000_000) }
 
-    let(:subject) { described_class.new(resource) }
-    let(:serialized) { subject.serialize }
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the id" do
diff --git a/decidim-budgets/spec/serializers/project_serializer_spec.rb b/decidim-budgets/spec/serializers/project_serializer_spec.rb
index ec530b426b112..6048ec92da84f 100644
--- a/decidim-budgets/spec/serializers/project_serializer_spec.rb
+++ b/decidim-budgets/spec/serializers/project_serializer_spec.rb
@@ -5,14 +5,15 @@
 module Decidim::Budgets
   describe ProjectSerializer do
     let(:budget) { create(:budget) }
-    let(:category) { create(:category, participatory_space: budget.component.participatory_space) }
-    let(:scope) { create(:scope, organization: category.participatory_space.organization) }
-    let(:project) { create(:project, budget: budget, category: category, scope: scope) }
-    let(:subject) { described_class.new(project) }
     let(:serialized) { subject.run }
     let(:attachment) { create :attachment, attached_to: project }
     let(:proposals_component) { create(:component, manifest_name: "proposals", participatory_space: project.participatory_space) }
     let(:proposals) { create_list(:proposal, 3, component: proposals_component) }
+    let(:category) { create(:category, participatory_space: budget.component.participatory_space) }
+    let(:scope) { create(:scope, organization: category.participatory_space.organization) }
+    let(:project) { create(:project, budget: budget, category: category, scope: scope) }
+
+    subject { described_class.new(project) }
 
     describe "#serializer" do
       before { project.link_resources(proposals, "included_proposals") }
diff --git a/decidim-budgets/spec/services/decidim/budgets/order_reminder_generator_spec.rb b/decidim-budgets/spec/services/decidim/budgets/order_reminder_generator_spec.rb
new file mode 100644
index 0000000000000..3f4833518a4da
--- /dev/null
+++ b/decidim-budgets/spec/services/decidim/budgets/order_reminder_generator_spec.rb
@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Budgets
+  describe OrderReminderGenerator do
+    subject { described_class.new }
+
+    let(:manifest) do
+      double(
+        settings: double(
+          attributes: {
+            reminder_times: double(default: intervals)
+          }
+        )
+      )
+    end
+    let(:intervals) { [2.hours, 1.week, 2.weeks] }
+    let(:organization) { create(:organization) }
+    let(:component) { create(:component, organization: organization, manifest_name: "budgets") }
+    let(:budget) { create(:budget, component: component, total_budget: 100_000) }
+    let(:project) { create(:project, budget: budget, budget_amount: 90_000) }
+    let(:user) { create(:user, organization: organization) }
+
+    before do
+      allow(Decidim.reminders_registry).to receive(:for).with(:orders).and_return(manifest)
+    end
+
+    describe "#generate" do
+      context "when there is an order created yesterday" do
+        let!(:order) { create(:order, :with_projects, user: user, budget: budget, created_at: 1.day.ago) }
+
+        it "sends reminder" do
+          expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+          expect { subject.generate }.to change(Decidim::Reminder, :count).by(1)
+        end
+
+        context "and another order in different budget" do
+          let(:another_budget) { create(:budget, component: component, total_budget: 100_000) }
+          let!(:another_order) { create(:order, :with_projects, user: user, budget: another_budget, created_at: 1.day.ago) }
+
+          it "sends reminder with two records" do
+            expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+            expect { subject.generate }.to change(Decidim::Reminder, :count).by(1)
+            expect(Decidim::Reminder.first.records.count).to eq(2)
+          end
+        end
+
+        context "and order is checked out" do
+          before do
+            order.update(checked_out_at: Time.current)
+          end
+
+          it "does not send reminder" do
+            expect(Decidim::Budgets::SendVoteReminderJob).not_to receive(:perform_later)
+
+            expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+          end
+        end
+
+        context "and reminder exists" do
+          let!(:reminder) { create(:reminder, user: user, component: component) }
+
+          it "sends existing reminder" do
+            expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+            expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+          end
+
+          context "and record has been already added to the reminder" do
+            let(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: order) }
+
+            before { reminder.records << reminder_record }
+
+            it "sends existing reminder but does not re-add record to the reminder" do
+              expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later).twice
+
+              expect { subject.generate }.not_to change(reminder.records, :count)
+              expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+            end
+
+            context "with confirmed order" do
+              before { order.update!(checked_out_at: 1.minute.ago) }
+
+              it "does not send reminder" do
+                expect(Decidim::Budgets::SendVoteReminderJob).not_to receive(:perform_later)
+
+                subject.generate
+              end
+            end
+          end
+
+          context "and user has been already reminded" do
+            let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder, created_at: 1.hour.ago) }
+
+            it "does not send reminder" do
+              expect(Decidim::Budgets::SendVoteReminderJob).not_to receive(:perform_later)
+              expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+            end
+          end
+        end
+      end
+
+      context "when there is an order created more than week ago" do
+        let!(:order) { create(:order, :with_projects, user: user, budget: budget, created_at: 8.days.ago) }
+        let(:reminder) { create(:reminder, user: user, component: component) }
+
+        context "and user has been reminded once" do
+          let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder, created_at: order.created_at + intervals[0]) }
+
+          it "sends reminder again" do
+            expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+            subject.generate
+          end
+        end
+      end
+
+      context "when user has two orders" do
+        let(:another_budget) { create(:budget, component: component, total_budget: 100_000) }
+        let(:first_order) { create(:order, :with_projects, user: user, budget: budget, created_at: 9.days.ago) }
+        let(:recent_order) { create(:order, :with_projects, user: user, budget: another_budget, created_at: 8.days.ago) }
+
+        context "and user has been reminded once" do
+          let(:reminder) { create(:reminder, user: user, component: component) }
+          let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: first_order) }
+          let!(:another_reminder_record) { create(:reminder_record, reminder: reminder, remindable: recent_order) }
+          let!(:reminder_delivery) { create(:reminder_delivery, reminder: reminder, created_at: first_order.created_at + intervals[0]) }
+
+          context "when recent order is checked out" do
+            before { recent_order.update!(checked_out_at: 1.minute.ago) }
+
+            it "marks recent record as completed and sends reminder about first order" do
+              expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+              expect { subject.generate }.to change(reminder.records.active, :count)
+                .to(1)
+                .and change(reminder.records.completed, :count).to(1)
+              expect(reminder.records.active.first.remindable).to eq(first_order)
+            end
+          end
+
+          context "when first order is checked out" do
+            before { first_order.update!(checked_out_at: 1.minute.ago) }
+
+            it "marks first record as completed and sends reminder about recent order" do
+              expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+              expect { subject.generate }.to change(reminder.records.active, :count)
+                .to(1)
+                .and change(reminder.records.completed, :count).to(1)
+              expect(reminder.records.active.first.remindable).to eq(recent_order)
+            end
+          end
+
+          context "when first order is deleted" do
+            before { first_order.destroy! }
+
+            it "marks first record as deleted and sends reminder about recent order" do
+              expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+              expect { subject.generate }.to change(reminder.records.active, :count)
+                .to(1)
+                .and change(reminder.records.deleted, :count).to(1)
+              expect(reminder.records.active.first.remindable).to eq(recent_order)
+            end
+          end
+
+          context "when recent order is deleted" do
+            before { recent_order.destroy! }
+
+            it "marks recent record as deleted and sends reminder about first order" do
+              expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later)
+
+              expect { subject.generate }.to change(reminder.records.deleted, :count)
+                .to(1)
+                .and change(reminder.records.deleted, :count).to(1)
+              expect(reminder.records.active.first.remindable).to eq(first_order)
+            end
+          end
+        end
+      end
+
+      context "when there is multiple orders created day ago and one order is checked out" do
+        let(:users) { create_list(:user, 6, organization: organization) }
+        let!(:orders) { users.map { |u| create(:order, :with_projects, user: u, budget: budget, created_at: 1.day.ago) } }
+
+        before do
+          orders[0].update!(checked_out_at: Time.current)
+        end
+
+        it "sends reminders" do
+          expect(Decidim::Budgets::SendVoteReminderJob).to receive(:perform_later).exactly(5).times
+          subject.generate
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-budgets/spec/services/decidim/budgets/searchable_project_resource_spec.rb b/decidim-budgets/spec/services/decidim/budgets/searchable_project_resource_spec.rb
index 455824f0bf227..0173084773405 100644
--- a/decidim-budgets/spec/services/decidim/budgets/searchable_project_resource_spec.rb
+++ b/decidim-budgets/spec/services/decidim/budgets/searchable_project_resource_spec.rb
@@ -17,7 +17,7 @@ module Decidim
         budget: budget,
         scope: scope1,
         title: Decidim::Faker::Localized.name,
-        description: description_1
+        description: description1
       )
     end
 
@@ -66,7 +66,7 @@ module Decidim
 
     describe "Search" do
       context "when searching by resource resource_type" do
-        let!(:resource_2) do
+        let!(:resource2) do
           create(
             :project,
             budget: budget,
@@ -81,7 +81,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[resource.class.name]
               expect(results[:count]).to eq 2
-              expect(results[:results]).to match_array [resource, resource_2]
+              expect(results[:results]).to match_array [resource, resource2]
             end
             on(:invalid) { raise("Should not happen") }
           end
@@ -92,7 +92,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[resource.class.name]
               expect(results[:count]).to eq 1
-              expect(results[:results]).to eq [resource_2]
+              expect(results[:results]).to eq [resource2]
             end
             on(:invalid) { raise("Should not happen") }
           end
diff --git a/decidim-budgets/spec/services/project_search_spec.rb b/decidim-budgets/spec/services/project_search_spec.rb
deleted file mode 100644
index 447b47ae638db..0000000000000
--- a/decidim-budgets/spec/services/project_search_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Budgets
-  describe ProjectSearch do
-    subject { described_class.new(params).results }
-
-    let(:component) { create :component, manifest_name: "budgets" }
-    let(:default_params) { { budget: budget, component: component } }
-    let(:params) { default_params }
-    let!(:budget) { create :budget, component: component }
-    let(:resource_params) { { budget: budget } }
-
-    it_behaves_like "a resource search", :project
-    it_behaves_like "a resource search with scopes", :project
-    it_behaves_like "a resource search with categories", :project
-
-    describe "base query" do
-      context "when no budget is passed" do
-        let(:default_params) { { budget: nil, component: component } }
-
-        it "raises an error" do
-          expect { subject }.to raise_error(StandardError, "Missing budget")
-        end
-      end
-    end
-
-    describe "filters" do
-      context "when `global` is being sent" do
-        let!(:resource_without_scope) { create(:project, budget: budget, scope: nil) }
-        let(:params) { default_params.merge(scope_id: ["global"]) }
-
-        it "returns resources without a scope" do
-          expect(subject).to eq [resource_without_scope]
-        end
-      end
-
-      context "when votes are finished" do
-        let(:component) { create(:budgets_component, :with_voting_finished) }
-        let!(:resource_selected) { create(:project, :selected, budget: budget) }
-        let!(:resource_not_selected) { create(:project, budget: budget) }
-
-        context "and the user doesn't filter by status" do
-          it { expect(subject).to match_array([resource_selected, resource_not_selected]) }
-        end
-
-        context "and the user filters selected projects" do
-          let(:params) { default_params.merge(status: ["selected"]) }
-
-          it { expect(subject).to eq [resource_selected] }
-        end
-
-        context "and the user filters not selected projects" do
-          let(:params) { default_params.merge(status: ["not_selected"]) }
-
-          it { expect(subject).to eq [resource_not_selected] }
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-budgets/spec/shared/manage_projects_examples.rb b/decidim-budgets/spec/shared/manage_projects_examples.rb
index cdd8f76f38610..86523dddce4f1 100644
--- a/decidim-budgets/spec/shared/manage_projects_examples.rb
+++ b/decidim-budgets/spec/shared/manage_projects_examples.rb
@@ -14,6 +14,56 @@
       expect(page).to have_content("Choose proposals")
     end
 
+    context "when geocoding is enabled", :serves_geocoding_autocomplete do
+      let(:address) { "Some address" }
+      let(:latitude) { 40.1234 }
+      let(:longitude) { 2.1234 }
+
+      before do
+        stub_geocoding(address, [latitude, longitude])
+        current_component.update!(settings: { geocoding_enabled: true })
+        visit current_path
+      end
+
+      it "creates a new project" do
+        within ".new_project" do
+          fill_in_i18n :project_title, "#project-title-tabs", en: "Make decidim great again"
+          fill_in_i18n_editor :project_description, "#project-description-tabs", en: "Decidim is great but it can be better"
+          fill_in :project_address, with: address
+          fill_in :project_budget_amount, with: 1234
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_admin_callout("successfully")
+
+        within "table" do
+          project = Decidim::Budgets::Project.last
+
+          expect(page).to have_content("Make decidim great again")
+          expect(translated(project.description)).to eq("<p>Decidim is great but it can be better</p>")
+        end
+      end
+
+      it_behaves_like(
+        "a record with front-end geocoding address field",
+        Decidim::Budgets::Project,
+        within_selector: ".new_project",
+        address_field: :project_address
+      ) do
+        let(:geocoded_address_value) { address }
+        let(:geocoded_address_coordinates) { [latitude, longitude] }
+
+        before do
+          stub_geocoding(address, [latitude, longitude])
+          within ".new_project" do
+            fill_in_i18n :project_title, "#project-title-tabs", en: "Make decidim great again"
+            fill_in_i18n_editor :project_description, "#project-description-tabs", en: "Decidim is great but it can be better"
+            fill_in :project_budget_amount, with: 1234
+          end
+        end
+      end
+    end
+
     context "when proposal linking is disabled" do
       before do
         allow(Decidim::Budgets).to receive(:enable_proposal_linking).and_return(false)
diff --git a/decidim-budgets/spec/system/admin_manages_budgets.rb b/decidim-budgets/spec/system/admin_manages_budgets_spec.rb
similarity index 99%
rename from decidim-budgets/spec/system/admin_manages_budgets.rb
rename to decidim-budgets/spec/system/admin_manages_budgets_spec.rb
index bd05842b079c6..08d33811f97f1 100644
--- a/decidim-budgets/spec/system/admin_manages_budgets.rb
+++ b/decidim-budgets/spec/system/admin_manages_budgets_spec.rb
@@ -22,7 +22,7 @@
 
   it "creates a new budget" do
     within ".card-title" do
-      page.find(".button.button--title").click
+      click_link "New Budget"
     end
 
     within ".new_budget" do
diff --git a/decidim-budgets/spec/system/admin_manages_projects_spec.rb b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
index bb997d03bf35d..b76aabe8bc561 100644
--- a/decidim-budgets/spec/system/admin_manages_projects_spec.rb
+++ b/decidim-budgets/spec/system/admin_manages_projects_spec.rb
@@ -23,4 +23,59 @@
 
   it_behaves_like "manage projects"
   it_behaves_like "import proposals to projects"
+
+  describe "bulk actions" do
+    let!(:project2) { create(:project, budget: budget) }
+    let!(:category) { create(:category, participatory_space: current_component.participatory_space) }
+    let!(:scope) { create(:scope, organization: current_component.organization) }
+
+    before do
+      visit current_path
+    end
+
+    it "changes projects category" do
+      find(".js-resource-id-#{project.id}").set(true)
+      find("#js-bulk-actions-button").click
+      click_button "Change category"
+      select translated(category.name), from: "category_id"
+      click_button "Update"
+      expect(page).to have_css(".callout.success")
+      within "tr[data-id='#{project.id}']" do
+        expect(page).to have_content(translated(category.name))
+      end
+      expect(::Decidim::Budgets::Project.find(project.id).category).to eq(category)
+      expect(::Decidim::Budgets::Project.find(project2.id).category).to be_nil
+    end
+
+    it "changes projects scope" do
+      find(".js-resource-id-#{project.id}").set(true)
+      find("#js-bulk-actions-button").click
+      click_button "Change scope"
+      scope_pick select_data_picker(:scope_id), scope
+      click_button "Update"
+      expect(page).to have_css(".callout.success")
+      within "tr[data-id='#{project.id}']" do
+        expect(page).to have_content(translated(scope.name))
+      end
+      expect(::Decidim::Budgets::Project.find(project.id).scope).to eq(scope)
+      expect(::Decidim::Budgets::Project.find(project2.id).scope).to be_nil
+    end
+
+    it "selects projects to implementation" do
+      find("#projects_bulk").set(true)
+      find("#js-bulk-actions-button").click
+      click_button "Change selected"
+      select "Select", from: "selected_value"
+      click_button "Update"
+      expect(page).to have_css(".callout.success")
+      within "tr[data-id='#{project.id}']" do
+        expect(page).to have_content("Selected")
+      end
+      within "tr[data-id='#{project2.id}']" do
+        expect(page).to have_content("Selected")
+      end
+      expect(::Decidim::Budgets::Project.find(project.id).selected_at).to eq(Time.zone.today)
+      expect(::Decidim::Budgets::Project.find(project2.id).selected_at).to eq(Time.zone.today)
+    end
+  end
 end
diff --git a/decidim-budgets/spec/system/admin_orders_projects_spec.rb b/decidim-budgets/spec/system/admin_orders_projects_spec.rb
index 9b06576e0794c..cc043ed19e85d 100644
--- a/decidim-budgets/spec/system/admin_orders_projects_spec.rb
+++ b/decidim-budgets/spec/system/admin_orders_projects_spec.rb
@@ -12,13 +12,13 @@
              scope: create(:scope, organization: component.organization, name: { "ca" => "Scope2", "en" => "Scope3" }),
              budget: budget,
              category: create(:category, participatory_space: participatory_space),
-             created_at: Time.current - 2.days,
+             created_at: 2.days.ago,
              budget_amount: 10_000),
       create(:project,
              scope: create(:scope, organization: component.organization, name: { "ca" => "Scope3", "en" => "Scope1" }),
              budget: budget,
              category: create(:category, participatory_space: participatory_space),
-             created_at: Time.current - 1.day,
+             created_at: 1.day.ago,
              budget_amount: 75_000),
       create(:project,
              scope: create(:scope, organization: component.organization, name: { "ca" => "Scope1", "en" => "Scope2" }),
diff --git a/decidim-budgets/spec/system/admin_reminds_users_with_pending_orders_spec.rb b/decidim-budgets/spec/system/admin_reminds_users_with_pending_orders_spec.rb
new file mode 100644
index 0000000000000..fbb89fee73b71
--- /dev/null
+++ b/decidim-budgets/spec/system/admin_reminds_users_with_pending_orders_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin reminds users with pending orders", type: :system do
+  include_context "when managing a component as an admin"
+
+  let(:organization) { create(:organization) }
+  let(:component) { create(:component, organization: organization, manifest_name: "budgets") }
+  let(:budget) { create(:budget, component: component) }
+  let(:user) { create(:user, :admin, :confirmed, organization: organization, locale: "en") }
+  let(:user2) { create(:user, :admin, :confirmed, organization: organization, locale: "en") }
+  let!(:order) { create(:order, budget: budget, user: user, created_at: 3.days.ago) }
+  let!(:order2) { create(:order, budget: budget, user: user2, created_at: 3.days.ago) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit_component_admin
+    click_link "Send voting reminders"
+  end
+
+  describe "new vote reminder" do
+    it "shows how many people are being reminded" do
+      expect(page).to have_content("You are about to send an email reminder to 2 users")
+    end
+  end
+
+  describe "create vote reminders" do
+    include ActiveJob::TestHelper
+
+    after do
+      clear_enqueued_jobs
+    end
+
+    it "sends reminders" do
+      perform_enqueued_jobs { click_button "Send" }
+      expect(page).to have_content("2 users will be reminded")
+
+      expect(emails.count).to eq(2)
+      emails.each do |email|
+        expect(email.subject).to eq("You have an unfinished vote in the participatory budgeting vote")
+      end
+      expect(last_email_first_link).to eq("http://#{organization.host}:#{Capybara.server_port}/processes/#{component.participatory_space.slug}/f/#{component.id}/budgets/#{budget.id}")
+      expect(last_email_link).to eq("http://#{organization.host}:#{Capybara.server_port}/processes/#{component.participatory_space.slug}/f/#{component.id}/")
+    end
+
+    it "doesnt send reminders twice" do
+      perform_enqueued_jobs { click_button "Send" }
+      expect(page).to have_content("2 users will be reminded")
+      click_link "Send voting reminders"
+      perform_enqueued_jobs { click_button "Send" }
+      expect(page).to have_content("0 users will be reminded")
+    end
+  end
+end
diff --git a/decidim-budgets/spec/system/explore_projects_spec.rb b/decidim-budgets/spec/system/explore_projects_spec.rb
index c3ae43d0424ce..c5a9b6e025383 100644
--- a/decidim-budgets/spec/system/explore_projects_spec.rb
+++ b/decidim-budgets/spec/system/explore_projects_spec.rb
@@ -34,7 +34,7 @@
       it "allows searching by text" do
         visit_budget
         within ".filters__search" do
-          fill_in "filter[search_text]", with: translated(project.title)
+          fill_in "filter[search_text_cont]", with: translated(project.title)
 
           find(".button").click
         end
@@ -45,6 +45,23 @@
         end
       end
 
+      it "updates the current URL with the text filter" do
+        create(:project, budget: budget, title: { en: "Foobar project" })
+        create(:project, budget: budget, title: { en: "Another project" })
+        visit_budget
+
+        within "form.new_filter" do
+          fill_in("filter[search_text_cont]", with: "foobar")
+          click_button "Search"
+        end
+
+        expect(page).not_to have_content("Another project")
+        expect(page).to have_content("Foobar project")
+
+        filter_params = CGI.parse(URI.parse(page.current_url).query)
+        expect(filter_params["filter[search_text_cont]"]).to eq(["foobar"])
+      end
+
       it "allows filtering by scope" do
         scope = create(:scope, organization: organization)
         project.scope = scope
@@ -52,7 +69,7 @@
 
         visit_budget
 
-        within ".scope_id_check_boxes_tree_filter" do
+        within ".with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check translated(scope.name)
         end
@@ -70,7 +87,7 @@
 
         visit_budget
 
-        within ".category_id_check_boxes_tree_filter" do
+        within ".with_any_category_check_boxes_tree_filter" do
           uncheck "All"
           check translated(category.name)
         end
@@ -88,7 +105,7 @@
 
         visit_budget
 
-        within ".category_id_check_boxes_tree_filter" do
+        within ".with_any_category_check_boxes_tree_filter" do
           uncheck "All"
           check translated(category.name)
         end
@@ -122,7 +139,7 @@
 
           visit_budget
 
-          within ".status_check_boxes_tree_filter" do
+          within ".with_any_status_check_boxes_tree_filter" do
             uncheck "Selected"
           end
 
diff --git a/decidim-budgets/spec/system/orders_spec.rb b/decidim-budgets/spec/system/orders_spec.rb
index 6e579ccf6ef94..8b789d3e41dee 100644
--- a/decidim-budgets/spec/system/orders_spec.rb
+++ b/decidim-budgets/spec/system/orders_spec.rb
@@ -425,14 +425,40 @@
             order.destroy!
             order_percent.projects << projects
             order_percent.save!
+            visit_budget
           end
 
           it "can vote" do
-            visit_budget
             within "#order-progress" do
               expect(page).to have_button("Vote", disabled: false)
             end
           end
+
+          context "when user has voted" do
+            let(:router) { Decidim::EngineRouter.main_proxy(component) }
+            let(:another_user) { create(:user, :confirmed, organization: organization) }
+
+            before do
+              find("[data-toggle='budget-confirm']").click
+              click_button "Confirm"
+              expect(page).to have_css(".flash.success")
+            end
+
+            it "shows private-only activity log entry" do
+              page.visit decidim.profile_activity_path(nickname: user.nickname)
+              expect(page).to have_content("New budgeting vote at #{translated(budget.participatory_space.title)}")
+              expect(page).to have_link(translated(budget.title), href: router.budget_path(budget))
+            end
+
+            it "does not show activity log entry to another user" do
+              relogin_as another_user, scope: :user
+              page.visit decidim.profile_activity_path(nickname: user.nickname)
+              expect(page).to have_content(user.name)
+              expect(page).to have_current_path "/profiles/#{user.nickname}/activity"
+              expect(page).not_to have_content("New budgeting vote at")
+              expect(page).not_to have_link(translated(budget.title))
+            end
+          end
         end
       end
 
diff --git a/decidim-budgets/spec/types/project_type_spec.rb b/decidim-budgets/spec/types/project_type_spec.rb
index 46ae78566df16..ddd02f32ba78d 100644
--- a/decidim-budgets/spec/types/project_type_spec.rb
+++ b/decidim-budgets/spec/types/project_type_spec.rb
@@ -55,7 +55,7 @@ module Budgets
         context "when the project is selected" do
           let(:model) { create(:project, :selected) }
 
-          it "returns true " do
+          it "returns true" do
             expect(response["selected"]).to be true
           end
         end
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 9a1534c666f49..a782daea7a14d 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -186,11 +186,11 @@ def commentable?
       end
 
       def has_replies?
-        model.comment_threads.includes(:moderation).collect { |c| !c.deleted? && !c.hidden? }.any?
+        model.comment_threads.not_hidden.not_deleted.exists?
       end
 
       def has_replies_in_children?
-        has_replies? || model.comment_threads.includes(:moderation).collect { |t| t.comment_threads.includes(:moderation).collect { |c| !c.deleted? && !c.hidden? }.any? }.any?
+        model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
       end
 
       # action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comments/comments_loading.erb b/decidim-comments/app/cells/decidim/comments/comments/comments_loading.erb
new file mode 100644
index 0000000000000..83dfc079be8f8
--- /dev/null
+++ b/decidim-comments/app/cells/decidim/comments/comments/comments_loading.erb
@@ -0,0 +1,3 @@
+<div class="callout primary loading-comments">
+  <p><%= t("decidim.components.comments.loading") %></p>
+</div>
diff --git a/decidim-comments/app/cells/decidim/comments/comments/show.erb b/decidim-comments/app/cells/decidim/comments/comments/show.erb
index 379f1656e0e9a..65d6a061cdaad 100644
--- a/decidim-comments/app/cells/decidim/comments/comments/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comments/show.erb
@@ -16,6 +16,7 @@
       <%= single_comment_warning %>
       <%= blocked_comments_warning %>
       <div class="comment-threads">
+        <%= comments_loading %>
         <% comments.each do |comment| %>
           <%= cell("decidim/comments/comment_thread", comment, order: order) %>
         <% end %>
diff --git a/decidim-comments/app/cells/decidim/comments/comments_cell.rb b/decidim-comments/app/cells/decidim/comments/comments_cell.rb
index 56354618fb88b..47ed087ccfe7f 100644
--- a/decidim-comments/app/cells/decidim/comments/comments_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comments_cell.rb
@@ -22,6 +22,12 @@ def single_comment_warning
         render :single_comment_warning
       end
 
+      def comments_loading
+        return if single_comment?
+
+        render :comments_loading
+      end
+
       def blocked_comments_warning
         return unless comments_blocked?
         return unless user_comments_blocked?
@@ -43,11 +49,7 @@ def decidim_comments
       end
 
       def comments
-        if single_comment?
-          [single_comment]
-        else
-          SortedComments.for(model, order_by: order)
-        end
+        single_comment? ? [single_comment] : []
       end
 
       def comments_count
@@ -97,17 +99,10 @@ def comments_data
           commentableGid: model.to_signed_global_id.to_s,
           commentsUrl: decidim_comments.comments_path,
           rootDepth: root_depth,
-          lastCommentId: last_comment_id,
           order: order
         }
       end
 
-      def last_comment_id
-        Decidim::Comments::Comment.where(
-          root_commentable: model
-        ).order(:id).pluck(:id).last
-      end
-
       def single_comment?
         single_comment.present?
       end
diff --git a/decidim-comments/app/commands/decidim/comments/create_comment.rb b/decidim-comments/app/commands/decidim/comments/create_comment.rb
index 599e444e99400..532943ff509e5 100644
--- a/decidim-comments/app/commands/decidim/comments/create_comment.rb
+++ b/decidim-comments/app/commands/decidim/comments/create_comment.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to create a new comment
-    class CreateComment < Rectify::Command
+    class CreateComment < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-comments/app/commands/decidim/comments/delete_comment.rb b/decidim-comments/app/commands/decidim/comments/delete_comment.rb
index b79cf9efb78c2..1e1230c653487 100644
--- a/decidim-comments/app/commands/decidim/comments/delete_comment.rb
+++ b/decidim-comments/app/commands/decidim/comments/delete_comment.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to delete a comment
-    class DeleteComment < Rectify::Command
+    class DeleteComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - The comment to delete.
diff --git a/decidim-comments/app/commands/decidim/comments/update_comment.rb b/decidim-comments/app/commands/decidim/comments/update_comment.rb
index 9870e598b07db..1aedb23e6200c 100644
--- a/decidim-comments/app/commands/decidim/comments/update_comment.rb
+++ b/decidim-comments/app/commands/decidim/comments/update_comment.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to update an existing comment
-    class UpdateComment < Rectify::Command
+    class UpdateComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - Decidim::Comments::Comment
diff --git a/decidim-comments/app/commands/decidim/comments/vote_comment.rb b/decidim-comments/app/commands/decidim/comments/vote_comment.rb
index 4b594aea6f8eb..6eae3f62e06c9 100644
--- a/decidim-comments/app/commands/decidim/comments/vote_comment.rb
+++ b/decidim-comments/app/commands/decidim/comments/vote_comment.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to upvote a comment
-    class VoteComment < Rectify::Command
+    class VoteComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - A comment
diff --git a/decidim-comments/app/controllers/decidim/comments/comments_controller.rb b/decidim-comments/app/controllers/decidim/comments/comments_controller.rb
index 405011e696a33..90554bb4d7417 100644
--- a/decidim-comments/app/controllers/decidim/comments/comments_controller.rb
+++ b/decidim-comments/app/controllers/decidim/comments/comments_controller.rb
@@ -23,6 +23,12 @@ def index
           order_by: order,
           after: params.fetch(:after, 0).to_i
         )
+        @comments = @comments.reject do |comment|
+          next if comment.depth < 1
+          next if !comment.deleted? && !comment.hidden?
+
+          comment.commentable.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.blank?
+        end
         @comments_count = commentable.comments_count
 
         respond_to do |format|
@@ -136,14 +142,12 @@ def ensure_commentable!
 
       def handle_success(comment)
         @comment = comment
-        @comments_count = begin
-          case commentable
-          when Decidim::Comments::Comment
-            commentable.root_commentable.comments_count
-          else
-            commentable.comments_count
-          end
-        end
+        @comments_count = case commentable
+                          when Decidim::Comments::Comment
+                            commentable.root_commentable.comments_count
+                          else
+                            commentable.comments_count
+                          end
       end
 
       def commentable_gid
@@ -172,7 +176,7 @@ def root_depth
       end
 
       def commentable_path
-        return commentable.polymorphic_resource_path({}) if commentable&.respond_to?(:polymorphic_resource_path)
+        return commentable.polymorphic_resource_path({}) if commentable.respond_to?(:polymorphic_resource_path)
 
         resource_locator(commentable).path
       end
diff --git a/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb b/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
index 3dd023f24f7ae..bb9ffb606e0c4 100644
--- a/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
+++ b/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
@@ -14,7 +14,7 @@ def resource_link_text
       end
 
       def resource_link_path
-        return root_commentable.polymorphic_resource_path(url_params) if root_commentable&.respond_to?(:polymorphic_resource_path)
+        return root_commentable.polymorphic_resource_path(url_params) if root_commentable.respond_to?(:polymorphic_resource_path)
 
         resource_locator(root_commentable).path(url_params)
       end
diff --git a/decidim-comments/app/models/decidim/comments/comment.rb b/decidim-comments/app/models/decidim/comments/comment.rb
index 995e33a071da3..b3fcf0822ebf0 100644
--- a/decidim-comments/app/models/decidim/comments/comment.rb
+++ b/decidim-comments/app/models/decidim/comments/comment.rb
@@ -10,12 +10,13 @@ class Comment < ApplicationRecord
       include Decidim::Authorable
       include Decidim::Comments::Commentable
       include Decidim::FriendlyDates
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
+      include Decidim::ActsAsTree
 
       # Limit the max depth of a comment tree. If C is a comment and R is a reply:
       # C          (depth 0)
@@ -27,6 +28,8 @@ class Comment < ApplicationRecord
 
       translatable_fields :body
 
+      parent_item_foreign_key :decidim_commentable_id
+
       belongs_to :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", polymorphic: true
       belongs_to :root_commentable, foreign_key: "decidim_root_commentable_id", foreign_type: "decidim_root_commentable_type", polymorphic: true, touch: true
       belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true, optional: true
@@ -134,7 +137,7 @@ def reported_content_url
 
         url_params = { anchor: "comment_#{id}" }
 
-        if root_commentable&.respond_to?(:polymorphic_resource_url)
+        if root_commentable.respond_to?(:polymorphic_resource_url)
           root_commentable.polymorphic_resource_url(url_params)
         else
           ResourceLocatorPresenter.new(root_commentable).url(url_params)
@@ -159,7 +162,7 @@ def self.export_serializer
       # Expects all +resources+ to be of the same "commentable_type".
       # If the result is not `Decidim::Comments::Commentable` returns `nil`.
       def self.user_commentators_ids_in(resources)
-        if resources.first&.kind_of?(Decidim::Comments::Commentable)
+        if resources.first.is_a?(Decidim::Comments::Commentable)
           commentable_type = resources.first.class.name
           Decidim::Comments::Comment.select("DISTINCT decidim_author_id").not_hidden.not_deleted
                                     .where(decidim_commentable_id: resources.pluck(:id))
@@ -171,7 +174,7 @@ def self.user_commentators_ids_in(resources)
       end
 
       def can_participate?(user)
-        return true unless root_commentable&.respond_to?(:can_participate?)
+        return true unless root_commentable.respond_to?(:can_participate?)
 
         root_commentable.can_participate?(user)
       end
diff --git a/decidim-comments/app/models/decidim/comments/comment_vote.rb b/decidim-comments/app/models/decidim/comments/comment_vote.rb
index 42ce83016323c..ae05469bddc21 100644
--- a/decidim-comments/app/models/decidim/comments/comment_vote.rb
+++ b/decidim-comments/app/models/decidim/comments/comment_vote.rb
@@ -5,7 +5,7 @@ module Comments
     # A comment can include user votes. A user should be able to upVote, votes with
     # weight 1 and downVote, votes with weight -1.
     class CommentVote < ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :comment, foreign_key: "decidim_comment_id", class_name: "Comment"
       belongs_to :author, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type", polymorphic: true
diff --git a/decidim-comments/app/packs/src/decidim/comments/comments.component.js b/decidim-comments/app/packs/src/decidim/comments/comments.component.js
index 2c6fdef2ed0b9..7bd48aff6231b 100644
--- a/decidim-comments/app/packs/src/decidim/comments/comments.component.js
+++ b/decidim-comments/app/packs/src/decidim/comments/comments.component.js
@@ -1,4 +1,6 @@
 /* eslint id-length: ["error", { "exceptions": ["$"] }] */
+/* eslint max-lines: ["error", {"max": 350, "skipBlankLines": true}] */
+
 
 /**
  * A plain Javascript component that handles the comments.
@@ -10,6 +12,8 @@
 // This is necessary for testing purposes
 const $ = window.$;
 
+import Rails from "@rails/ujs";
+
 import { createCharacterCounter } from "src/decidim/input_character_counter"
 import ExternalLink from "src/decidim/external_link"
 import updateExternalDomainLinks from "src/decidim/external_domain_warning"
@@ -23,6 +27,8 @@ export default class CommentsComponent {
     this.order = config.order;
     this.lastCommentId = config.lastCommentId;
     this.pollingInterval = config.pollingInterval || 15000;
+    this.singleComment = config.singleComment;
+    this.toggleTranslations = config.toggleTranslations;
     this.id = this.$element.attr("id") || this._getUID();
     this.mounted = false;
   }
@@ -36,6 +42,12 @@ export default class CommentsComponent {
     if (this.$element.length > 0 && !this.mounted) {
       this.mounted = true;
       this._initializeComments(this.$element);
+      if (!this.singleComment) {
+        $(".add-comment textarea", this.$element).prop("disabled", true);
+        this._fetchComments(() => {
+          $(".add-comment textarea", this.$element).prop("disabled", false);
+        });
+      }
 
       $(".order-by__dropdown .is-submenu-item a", this.$element).on("click.decidim-comments", () => this._onInitOrder());
     }
@@ -133,8 +145,6 @@ export default class CommentsComponent {
         $text.get(0).addEventListener("emoji.added", this._onTextInput);
       }
     });
-
-    this._pollComments();
   }
 
   /**
@@ -200,20 +210,39 @@ export default class CommentsComponent {
     this._stopPolling();
 
     this.pollTimeout = setTimeout(() => {
-      Rails.ajax({
-        url: this.commentsUrl,
-        type: "GET",
-        data: new URLSearchParams({
-          "commentable_gid": this.commentableGid,
-          "root_depth": this.rootDepth,
-          "order": this.order,
-          "after": this.lastCommentId
-        }),
-        success: this._pollComments()
-      })
+      this._fetchComments();
     }, this.pollingInterval);
   }
 
+  /**
+   * Sends an ajax request based on current
+   * params to get comments for the component
+   * @private
+   * @param {Function} successCallback A callback that is called after a
+   *   successful fetch
+   * @returns {Void} - Returns nothing
+   */
+  _fetchComments(successCallback = null) {
+    Rails.ajax({
+      url: this.commentsUrl,
+      type: "GET",
+      data: new URLSearchParams({
+        "commentable_gid": this.commentableGid,
+        "root_depth": this.rootDepth,
+        "order": this.order,
+        "after": this.lastCommentId,
+        ...(this.toggleTranslations && { "toggle_translations": this.toggleTranslations }),
+        ...(this.lastCommentId && { "after": this.lastCommentId })
+      }),
+      success: () => {
+        if (successCallback) {
+          successCallback();
+        }
+        this._pollComments();
+      }
+    });
+  }
+
   /**
    * Stops polling for new comments.
    * @private
diff --git a/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js b/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
index a353c36dab259..4aaa56dd7ff26 100644
--- a/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
+++ b/decidim-comments/app/packs/src/decidim/comments/comments.component.test.js
@@ -13,6 +13,10 @@ window.$.ajax = jest.fn().mockImplementation((...args) => $.ajax(...args));
 import Quill from "quill"
 window.Quill = Quill
 
+// Rails.ajax is used by the fetching/polling of the comments
+import Rails from "@rails/ujs";
+jest.mock("@rails/ujs");
+
 // Fake timers for testing polling
 jest.useFakeTimers();
 
@@ -376,26 +380,59 @@ describe("CommentsComponent", () => {
     expect(subject.$element).toEqual($(selector));
   });
 
-  it("starts polling for new comments", () => {
+  it("loads the comments through AJAX", () => {
     subject.mountComponent();
 
-    expect(window.setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 1000);
-
-    jest.advanceTimersByTime(1000);
-
-    expect(window.$.ajax).toHaveBeenCalledWith({
+    expect(Rails.ajax).toHaveBeenCalledWith({
       url: "/comments",
-      method: "GET",
-      contentType: "application/javascript",
-      data: {
+      type: "GET",
+      data: new URLSearchParams({
         "commentable_gid": "commentable-gid",
         "root_depth": 0,
         order: "older",
         after: 456
-      }
+      }),
+      success: expect.any(Function)
     });
   });
 
+  it("disables the comment textarea", () => {
+    subject.mountComponent();
+
+    expect($(`${selector} .add-comment textarea`).prop("disabled")).toBeTruthy();
+  });
+
+  it("re-enables the comment textarea after a successful fetch", () => {
+    Rails.ajax.mockImplementationOnce((options) => options.success());
+
+    subject.mountComponent();
+
+    expect($(`${selector} .add-comment textarea`).prop("disabled")).toBeFalsy();
+  });
+
+  it("starts polling for new comments", () => {
+    Rails.ajax.mockImplementationOnce((options) => options.success());
+
+    subject.mountComponent();
+
+    expect(window.setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 1000);
+  });
+
+  it("does not disable the textarea when polling comments normally", () => {
+    Rails.ajax.mockImplementationOnce((options) => options.success());
+
+    subject.mountComponent();
+
+    // Delay the success call 2s after the polling has happened to test that
+    // the textarea is still enabled when the polling is happening.
+    Rails.ajax.mockImplementationOnce((options) => {
+      setTimeout(options.success(), 2000);
+    });
+    jest.advanceTimersByTime(1500);
+
+    expect($(`${selector} .add-comment textarea`).prop("disabled")).toBeFalsy();
+  });
+
   describe("when mounted", () => {
     beforeEach(() => {
       spyOnAddComment("on");
@@ -450,6 +487,7 @@ describe("CommentsComponent", () => {
   describe("when interacting", () => {
     beforeEach(() => {
       spyOnAddComment();
+      Rails.ajax.mockImplementationOnce((options) => options.success());
       subject.mountComponent();
     });
 
diff --git a/decidim-comments/app/permissions/decidim/comments/permissions.rb b/decidim-comments/app/permissions/decidim/comments/permissions.rb
index ca68ad3c7d1f4..7b4a2e9501757 100644
--- a/decidim-comments/app/permissions/decidim/comments/permissions.rb
+++ b/decidim-comments/app/permissions/decidim/comments/permissions.rb
@@ -51,13 +51,11 @@ def can_vote_comment?
       end
 
       def commentable
-        @commentable ||= begin
-          if comment
-            comment.root_commentable
-          else
-            context.fetch(:commentable, nil)
-          end
-        end
+        @commentable ||= if comment
+                           comment.root_commentable
+                         else
+                           context.fetch(:commentable, nil)
+                         end
       end
 
       def comment
diff --git a/decidim-comments/app/queries/decidim/comments/sorted_comments.rb b/decidim-comments/app/queries/decidim/comments/sorted_comments.rb
index 462b8816a38b1..052e6f0b5ad59 100644
--- a/decidim-comments/app/queries/decidim/comments/sorted_comments.rb
+++ b/decidim-comments/app/queries/decidim/comments/sorted_comments.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A class used to find comments for a commentable resource
-    class SortedComments < Rectify::Query
+    class SortedComments < Decidim::Query
       attr_reader :commentable
 
       # Syntactic sugar to initialize the class and return the queried objects.
@@ -34,8 +34,6 @@ def query
                 .includes(:author, :user_group, :up_votes, :down_votes)
 
         case @options[:order_by]
-        when "older"
-          order_by_older(scope)
         when "recent"
           order_by_recent(scope)
         when "best_rated"
diff --git a/decidim-comments/app/services/decidim/comments/new_comment_notification_creator.rb b/decidim-comments/app/services/decidim/comments/new_comment_notification_creator.rb
index b31f932fff457..37d39806f7c4b 100644
--- a/decidim-comments/app/services/decidim/comments/new_comment_notification_creator.rb
+++ b/decidim-comments/app/services/decidim/comments/new_comment_notification_creator.rb
@@ -117,7 +117,7 @@ def notify(event, users)
           }
         }.deep_merge(users)
 
-        Decidim::EventsManager.publish(data)
+        Decidim::EventsManager.publish(**data)
       end
     end
   end
diff --git a/decidim-comments/app/views/decidim/comments/comments/index.js.erb b/decidim-comments/app/views/decidim/comments/comments/index.js.erb
index fd26005259ed5..5e35cf2ba6abf 100644
--- a/decidim-comments/app/views/decidim/comments/comments/index.js.erb
+++ b/decidim-comments/app/views/decidim/comments/comments/index.js.erb
@@ -4,6 +4,7 @@
   var $comments = $("#" + rootCommentableId);
   var component = $comments.data("comments");
 
+  $(".loading-comments").addClass("hide");
 <% @comments.each do |comment| %>
   var commentId = <%= comment.id.to_json %>;
   var commentHtml = '<%== j(render comment).strip %>';
diff --git a/decidim-comments/app/views/decidim/comments/comments/reload.js.erb b/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
index 43b949ae9b3e8..99a012c121cdf 100644
--- a/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
+++ b/decidim-comments/app/views/decidim/comments/comments/reload.js.erb
@@ -6,6 +6,7 @@
   component.unmountComponent();
 
   var commentsHtml = '<%== j(render partial: "comments").strip %>';
+  $(".loading-comments").addClass("hide");
   $comments.replaceWith(commentsHtml);
 
   $comments = $("#" + rootCommentableId);
diff --git a/decidim-comments/config/locales/ar.yml b/decidim-comments/config/locales/ar.yml
index 8b933964ea582..fcbe09b32a82c 100644
--- a/decidim-comments/config/locales/ar.yml
+++ b/decidim-comments/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/bg.yml b/decidim-comments/config/locales/bg.yml
index cd320a6d37c3c..4b19db46b4ab8 100644
--- a/decidim-comments/config/locales/bg.yml
+++ b/decidim-comments/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ca.yml b/decidim-comments/config/locales/ca.yml
index 2fb1e644c37c2..b06c24f2baee9 100644
--- a/decidim-comments/config/locales/ca.yml
+++ b/decidim-comments/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/cs.yml b/decidim-comments/config/locales/cs.yml
index 354a83c376b6c..129dc20c8a21c 100644
--- a/decidim-comments/config/locales/cs.yml
+++ b/decidim-comments/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/de.yml b/decidim-comments/config/locales/de.yml
index f54cb3de993f6..85f812345bdc4 100644
--- a/decidim-comments/config/locales/de.yml
+++ b/decidim-comments/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/el.yml b/decidim-comments/config/locales/el.yml
index 19c3ccf604956..03bf3710473a0 100644
--- a/decidim-comments/config/locales/el.yml
+++ b/decidim-comments/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/es-MX.yml b/decidim-comments/config/locales/es-MX.yml
index da90247aa6b01..c681b2fc32597 100644
--- a/decidim-comments/config/locales/es-MX.yml
+++ b/decidim-comments/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/es-PY.yml b/decidim-comments/config/locales/es-PY.yml
index 6f5e1b57239b2..6d6b2e287dd81 100644
--- a/decidim-comments/config/locales/es-PY.yml
+++ b/decidim-comments/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/es.yml b/decidim-comments/config/locales/es.yml
index 498a6b42b4cb2..2a45756af709f 100644
--- a/decidim-comments/config/locales/es.yml
+++ b/decidim-comments/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/eu.yml b/decidim-comments/config/locales/eu.yml
index 11356fc1e4d70..9b8c53cbc0d1e 100644
--- a/decidim-comments/config/locales/eu.yml
+++ b/decidim-comments/config/locales/eu.yml
@@ -1,16 +1,18 @@
+---
 eu:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Iruzkina
       decidim/comments/comment_created_event: Iruzkina
+      decidim/comments/comment_upvoted_event: Iruzkina bozkatu da
       decidim/comments/reply_created_event: Iruzkinaren erantzuna
-      decidim/comments/user_group_mentioned_event: Aipatu
-      decidim/comments/user_mentioned_event: Aipatu
+      decidim/comments/user_group_mentioned_event: Aipamena
+      decidim/comments/user_mentioned_event: Aipamena
   activerecord:
     models:
       decidim/comments/comment:
         one: Iruzkina
-        other: Oharrak
+        other: Iruzkinak
       decidim/comments/comment_vote:
         one: Bozkatu
         other: Botoak
@@ -20,7 +22,7 @@ eu:
         shared:
           availability_fields:
             enabled: Iruzkinak gaituta
-            end_time: Iruzkinak noiz arte aktibatuta
+            end_time: Iruzkinak gaituta daude
             start_time: Iruzkinak noiztik aktibatuta
       comments:
         create:
@@ -36,7 +38,7 @@ eu:
       view: Bistaratu
       votes:
         create:
-          error: Erroreak gertatu dira iruzkina bozkatzean.
+          error: Arazo bat dago iruzkina bozkatzeko.
     components:
       add_comment_form:
         account_message: <a href="%{sign_in_url}">Hasi saioa zure kontuarekin</a> o <a href="%{sign_up_url}">erregistratu</a> zure iruzkina txertatzeko.
@@ -66,10 +68,11 @@ eu:
         confirm_destroy: Ziur zaude iruzkin hau ezabatu nahi duzula?
         delete: Ezabatu
         deleted_at: Iruzkina ezabatu da data honetan %{date}
-        deleted_user: Erabiltzaile ezabatua
+        deleted_user: Parte hartzaile ezabatua
         edit: Editatu
         edited: Editatuta
         hide_replies: Ezkutatu erantzunak
+        moderated_at: Iruzkina %{date}-an moderatu egin da
         reply: Erantzuna
         report:
           action: Salatu
@@ -83,7 +86,7 @@ eu:
             spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
           title: Jakinarazi eduki desegokia
         show_replies: Erakutsi %{replies_count} erantzun
-        single_comment_link_title: Lortu lotura
+        single_comment_link_title: Lortu esteka
       comment_order_selector:
         order:
           best_rated: Balorazio hoberenak
@@ -101,6 +104,9 @@ eu:
         loading: Iruzkinak kargatzen...
         single_comment_warning: <a href="%{url}">k erakusten ditu iruzkin guztiak</a>
         single_comment_warning_title: Iruzkin bakar bat ikusten ari zara
+        title:
+          one: "%{count} iruzkin"
+          other: "%{count} iruzkin"
       down_vote_button:
         text: Ez nago ados iruzkin honekin
       edit_comment_modal_form:
@@ -116,15 +122,15 @@ eu:
     events:
       comments:
         comment_by_followed_user:
-          email_intro: "%{author_name} iruzkin bat utzi du %{resource_title}helbidean. Orri honetan irakur dezakezu:"
-          email_outro: Jakinarazpena jaso duzu %{author_name}jarraituz gero. Erabiltzaile hau bere profileko orrialdetik jarrai dezakezu.
+          email_intro: "%{author_name} egileak iruzkin bat utzi du %{resource_title} helbidean. Orri honetan irakur dezakezu:"
+          email_outro: Jakinarazpen hau jaso duzu %{author_name} erabiltzailea jarraitzen duzulako. Erabiltzaile horri profil-orrialdetik ez jarraitu.
           email_subject: '%{author_name} %{resource_title} iruzkin berri bat dago'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <a href="%{resource_path}">%{resource_title}</a> </a> iruzkin berri bat dago.
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>-en iruzkin berri bat dagon <a href="%{resource_path}">%{resource_title}</a>-an.
         comment_by_followed_user_group:
           email_intro: '%{author_name} k iruzkin bat utzi du hemen %{resource_title}. Orrialde honetan irakur dezakezu:'
           email_outro: Jakinarazpena jaso duzu "%{author_name}" jarraitzen ari zarelako. Jarraitzeari utzi ahal diozu bere perfileko orrialdetik.
-          email_subject: '%{author_name} %{resource_title} iruzkin berri bat dago'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <a href="%{resource_path}">%{resource_title}</a> </a> iruzkin berri bat dago.
+          email_subject: '%{author_name} egileak iruzkin berri bat utzi du %{resource_title}-an'
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>egileak iruzkin berri bat utzi du <a href="%{resource_path}">%{resource_title}</a>-an.
         comment_created:
           email_intro: "%{resource_title} iruzkindu da. Orri honetan iruzkina irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" edo bere egilea jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
@@ -134,26 +140,26 @@ eu:
           email_intro: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da. Orain %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu guztira.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
           email_subject: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da.
-          notification_title: Zure iruzkina <a href="%{resource_path}">comentario</a> hemen "%{resource_title}" negatiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
+          notification_title: Zure <a href="%{resource_path}">iruzkina</a> hemen "%{resource_title}" negatiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
         comment_upvoted:
           email_intro: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
           email_subject: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da.
-          notification_title: Zure iruzkina hemen <a href="%{resource_path}">comentario</a> en "%{resource_title}" positiboki bozkatu da. Orain guztira %{upvotes} botos positibo eta %{downvotes} boto negatibo dituzu.
+          notification_title: Zure <a href="%{resource_path}">iruzkina </a> "%{resource_title}"-an positiboki bozkatu da. Orain guztira %{upvotes} botos positibo eta %{downvotes} boto negatibo dituzu.
         reply_created:
           email_intro: "%{author_name} zure iruzkina erantzun du %{resource_title}zenbakian. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu zure iruzkina erantzun delako.
-          email_subject: "%{author_name} zure iruzkina erantzun du %{resource_title} zenbakian"
+          email_subject: "%{author_name}-k zure iruzkina erantzun du %{resource_title} zenbakian"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> -k zure iruzkinari erantzun dio <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
-          email_intro: Zu barne zauden talde bat aipatu da
-          email_outro: Jakinarazpen hau jaso duzu hemen %{resource_title} aipatu den %{group_name} taldearen kidea zarelako.
+          email_intro: Zure talde bat aipatu dute
+          email_outro: '%{resource_title}-an aipatutako %{group_name} taldeko kidea zarelako jaso duzu jakinarazpen hau.'
           email_subject: Hemen %{resource_title} aipatu zaituzte %{group_name} taldearen kide gisa
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> k aipatu zaitu hemen <a href="%{resource_path}">%{resource_title}</a> <a href="%{group_path}">%{group_name} %{group_nickname}</a> taldearen kide gisa
         user_mentioned:
-          email_intro: Esan zaizu
+          email_intro: Aipatu zaituzte
           email_outro: Jakinarazpena jaso duzu %{resource_title} delakoan aipatu duzulako.
-          email_subject: '%{resource_title} aipatu zaituzte'
+          email_subject: '%{resource_title} delakoan aipatu zaituzte'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> <a href="%{author_path}">%{author_name} %{author_nickname}</a> bidez aipatu zaituzte.
     metrics:
       comments:
diff --git a/decidim-comments/config/locales/fi-plain.yml b/decidim-comments/config/locales/fi-plain.yml
index b77a7d3044bab..dcd62ddf67725 100644
--- a/decidim-comments/config/locales/fi-plain.yml
+++ b/decidim-comments/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/fi.yml b/decidim-comments/config/locales/fi.yml
index 3ca5f08836f32..7e3d9d7d13911 100644
--- a/decidim-comments/config/locales/fi.yml
+++ b/decidim-comments/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/fr-CA.yml b/decidim-comments/config/locales/fr-CA.yml
index 3822edbb4b463..2023256bad380 100644
--- a/decidim-comments/config/locales/fr-CA.yml
+++ b/decidim-comments/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/fr.yml b/decidim-comments/config/locales/fr.yml
index c6f5f5843b895..3ac6013944ee2 100644
--- a/decidim-comments/config/locales/fr.yml
+++ b/decidim-comments/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ga-IE.yml b/decidim-comments/config/locales/ga-IE.yml
index 8421f11e5e164..6c36544d5e3b9 100644
--- a/decidim-comments/config/locales/ga-IE.yml
+++ b/decidim-comments/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/gl.yml b/decidim-comments/config/locales/gl.yml
index 3d4915379fe10..69e5545e5babd 100644
--- a/decidim-comments/config/locales/gl.yml
+++ b/decidim-comments/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/hu.yml b/decidim-comments/config/locales/hu.yml
index da4825e716911..ba2c6808699b0 100644
--- a/decidim-comments/config/locales/hu.yml
+++ b/decidim-comments/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/id-ID.yml b/decidim-comments/config/locales/id-ID.yml
index f860ee86c7b4c..a28741b3e243f 100644
--- a/decidim-comments/config/locales/id-ID.yml
+++ b/decidim-comments/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/is-IS.yml b/decidim-comments/config/locales/is-IS.yml
index 40bf81b61ca20..56c76cce19553 100644
--- a/decidim-comments/config/locales/is-IS.yml
+++ b/decidim-comments/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     components:
       add_comment_form:
diff --git a/decidim-comments/config/locales/it.yml b/decidim-comments/config/locales/it.yml
index eb0571f6a3f49..6df0204b8e426 100644
--- a/decidim-comments/config/locales/it.yml
+++ b/decidim-comments/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ja.yml b/decidim-comments/config/locales/ja.yml
index 96e7ba1d2cf1f..ce50f65037b24 100644
--- a/decidim-comments/config/locales/ja.yml
+++ b/decidim-comments/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ka-GE.yml b/decidim-comments/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-comments/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-comments/config/locales/lb.yml b/decidim-comments/config/locales/lb.yml
index 3a5a996a3cfdb..b155ed9e54e51 100644
--- a/decidim-comments/config/locales/lb.yml
+++ b/decidim-comments/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/lt.yml b/decidim-comments/config/locales/lt.yml
index f98466cf9e57c..dbe90ee5a8a32 100644
--- a/decidim-comments/config/locales/lt.yml
+++ b/decidim-comments/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/lv.yml b/decidim-comments/config/locales/lv.yml
index 812df4d05e3b2..69bacaf546c2e 100644
--- a/decidim-comments/config/locales/lv.yml
+++ b/decidim-comments/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/nl.yml b/decidim-comments/config/locales/nl.yml
index 52a8e95c3579b..ab3843a317ea8 100644
--- a/decidim-comments/config/locales/nl.yml
+++ b/decidim-comments/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/no.yml b/decidim-comments/config/locales/no.yml
index f341e215dd978..d84109a95551d 100644
--- a/decidim-comments/config/locales/no.yml
+++ b/decidim-comments/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/pl.yml b/decidim-comments/config/locales/pl.yml
index b5d78e4936eeb..a7e95e0a24440 100644
--- a/decidim-comments/config/locales/pl.yml
+++ b/decidim-comments/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     models:
@@ -20,6 +21,10 @@ pl:
         other: GÅ‚osy
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            start_time: Komentowanie możliwe od
       comments:
         create:
           error: Wystąpił błąd podczas tworzenia komentarza.
diff --git a/decidim-comments/config/locales/pt-BR.yml b/decidim-comments/config/locales/pt-BR.yml
index 1f79fad977c4c..d5964e9a8088f 100644
--- a/decidim-comments/config/locales/pt-BR.yml
+++ b/decidim-comments/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/pt.yml b/decidim-comments/config/locales/pt.yml
index 43c47bfcc7617..be7652c84685c 100644
--- a/decidim-comments/config/locales/pt.yml
+++ b/decidim-comments/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ro-RO.yml b/decidim-comments/config/locales/ro-RO.yml
index a1179717fdc96..38d058bd4b4a6 100644
--- a/decidim-comments/config/locales/ro-RO.yml
+++ b/decidim-comments/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/ru.yml b/decidim-comments/config/locales/ru.yml
index 76ba90a949e98..2b8a9b7c95de9 100644
--- a/decidim-comments/config/locales/ru.yml
+++ b/decidim-comments/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/si-LK.yml b/decidim-comments/config/locales/si-LK.yml
index 4df5f5680e768..2feca4f146a29 100644
--- a/decidim-comments/config/locales/si-LK.yml
+++ b/decidim-comments/config/locales/si-LK.yml
@@ -1,3 +1,4 @@
+---
 si:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/sk.yml b/decidim-comments/config/locales/sk.yml
index 2a31620726c4b..3c1bf925b5bc6 100644
--- a/decidim-comments/config/locales/sk.yml
+++ b/decidim-comments/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/sl.yml b/decidim-comments/config/locales/sl.yml
index 07b88d5b9ce69..393805107c3c4 100644
--- a/decidim-comments/config/locales/sl.yml
+++ b/decidim-comments/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/sr-CS.yml b/decidim-comments/config/locales/sr-CS.yml
index e5225387148e2..bd5ed385fde59 100644
--- a/decidim-comments/config/locales/sr-CS.yml
+++ b/decidim-comments/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     components:
diff --git a/decidim-comments/config/locales/sv.yml b/decidim-comments/config/locales/sv.yml
index e7807f225a64f..aeeaa4b10e84b 100644
--- a/decidim-comments/config/locales/sv.yml
+++ b/decidim-comments/config/locales/sv.yml
@@ -1,8 +1,10 @@
+---
 sv:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentar
       decidim/comments/comment_created_event: Kommentar
+      decidim/comments/comment_upvoted_event: Kommentar uppröstad
       decidim/comments/reply_created_event: Svar till en kommentar
       decidim/comments/user_group_mentioned_event: Nämn
       decidim/comments/user_mentioned_event: Nämn
@@ -70,6 +72,7 @@ sv:
         edit: Redigera
         edited: Redigerad
         hide_replies: Göm svar
+        moderated_at: Kommentar modererad den %{date}
         reply: Svara
         report:
           action: Rapportera
diff --git a/decidim-comments/config/locales/tr-TR.yml b/decidim-comments/config/locales/tr-TR.yml
index d5f929df40534..44c97ade8df27 100644
--- a/decidim-comments/config/locales/tr-TR.yml
+++ b/decidim-comments/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/uk.yml b/decidim-comments/config/locales/uk.yml
index eaccaff4fe129..40668f7c3de4d 100644
--- a/decidim-comments/config/locales/uk.yml
+++ b/decidim-comments/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     models:
diff --git a/decidim-comments/config/locales/zh-CN.yml b/decidim-comments/config/locales/zh-CN.yml
index 1d329a54df15a..89ada2dc52a7c 100644
--- a/decidim-comments/config/locales/zh-CN.yml
+++ b/decidim-comments/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     models:
diff --git a/decidim-comments/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb b/decidim-comments/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
index 248fa8b8237b1..ed9660acc437e 100644
--- a/decidim-comments/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
+++ b/decidim-comments/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
@@ -4,6 +4,7 @@ class MakeAuthorsPolymorphicForComments < ActiveRecord::Migration[5.2]
   class Comment < ApplicationRecord
     self.table_name = :decidim_comments_comments
   end
+
   def change
     add_column :decidim_comments_comments, :decidim_author_type, :string
 
diff --git a/decidim-comments/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb b/decidim-comments/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
index 8142aa822f450..90864635d4de6 100644
--- a/decidim-comments/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
+++ b/decidim-comments/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
@@ -4,6 +4,7 @@ class MakeAuthorPolymorphicForCommentVotes < ActiveRecord::Migration[5.2]
   class CommentVote < ApplicationRecord
     self.table_name = :decidim_comments_comment_votes
   end
+
   def change
     add_column :decidim_comments_comment_votes, :decidim_author_type, :string
 
diff --git a/decidim-comments/decidim-comments.gemspec b/decidim-comments/decidim-comments.gemspec
index 6504dbcec0ee0..e0af3069b71a8 100644
--- a/decidim-comments/decidim-comments.gemspec
+++ b/decidim-comments/decidim-comments.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-comments"
   s.summary = "Decidim comments module"
diff --git a/decidim-comments/lib/decidim/comments/comment_serializer.rb b/decidim-comments/lib/decidim/comments/comment_serializer.rb
index 6a9bbf637e815..9358c48779f85 100644
--- a/decidim-comments/lib/decidim/comments/comment_serializer.rb
+++ b/decidim-comments/lib/decidim/comments/comment_serializer.rb
@@ -32,7 +32,7 @@ def serialize
       private
 
       def root_commentable_url
-        @root_commentable_url ||= if resource.root_commentable&.respond_to?(:polymorphic_resource_url)
+        @root_commentable_url ||= if resource.root_commentable.respond_to?(:polymorphic_resource_url)
                                     resource.root_commentable.polymorphic_resource_url
                                   else
                                     ResourceLocatorPresenter.new(resource.root_commentable).url
diff --git a/decidim-comments/lib/decidim/comments/comment_vote_serializer.rb b/decidim-comments/lib/decidim/comments/comment_vote_serializer.rb
index 93916426f5be3..5c3b0db3f19c8 100644
--- a/decidim-comments/lib/decidim/comments/comment_vote_serializer.rb
+++ b/decidim-comments/lib/decidim/comments/comment_vote_serializer.rb
@@ -37,7 +37,7 @@ def serialize
       private
 
       def root_commentable_url
-        @root_commentable_url ||= if resource.comment.root_commentable&.respond_to?(:polymorphic_resource_url)
+        @root_commentable_url ||= if resource.comment.root_commentable.respond_to?(:polymorphic_resource_url)
                                     resource.comment.root_commentable.polymorphic_resource_url
                                   else
                                     ResourceLocatorPresenter.new(resource.comment.root_commentable).url
diff --git a/decidim-comments/lib/decidim/comments/test/shared_examples/translatable_comment.rb b/decidim-comments/lib/decidim/comments/test/shared_examples/translatable_comment.rb
index 21c1275dc2227..857bbb63bfc43 100644
--- a/decidim-comments/lib/decidim/comments/test/shared_examples/translatable_comment.rb
+++ b/decidim-comments/lib/decidim/comments/test/shared_examples/translatable_comment.rb
@@ -5,7 +5,7 @@
 shared_examples_for "a translated comment event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
-    let(:body) { { "en": en_body, "machine_translations": { "ca": "C'est Sparta!" } } }
+    let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:component) { create(:component, participatory_space: participatory_process) }
     let(:commentable) { create(:dummy_resource, component: component) }
diff --git a/decidim-comments/lib/decidim/comments/version.rb b/decidim-comments/lib/decidim/comments/version.rb
index ba303a2e08ccd..d431e1eadf7ed 100644
--- a/decidim-comments/lib/decidim/comments/version.rb
+++ b/decidim-comments/lib/decidim/comments/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-comments/spec/cells/decidim/comments/comments_cell_spec.rb b/decidim-comments/spec/cells/decidim/comments/comments_cell_spec.rb
index a6642801b173e..65e7cbde84ca3 100644
--- a/decidim-comments/spec/cells/decidim/comments/comments_cell_spec.rb
+++ b/decidim-comments/spec/cells/decidim/comments/comments_cell_spec.rb
@@ -19,7 +19,7 @@ module Decidim::Comments
       it "renders the thread" do
         expect(subject).to have_css(".section-heading", text: "1 comment")
         expect(subject).to have_css(".callout.primary.loading-comments p", text: "Loading comments ...")
-        expect(subject).to have_content(comment.body.values.first)
+        expect(subject).to have_no_content(comment.body.values.first)
         expect(subject).to have_css(".add-comment")
         expect(subject).to have_content("Sign in with your account or sign up to add your comment.")
 
diff --git a/decidim-comments/spec/commands/create_comment_spec.rb b/decidim-comments/spec/commands/create_comment_spec.rb
index ead8d209d06e7..69c75a8ba34c9 100644
--- a/decidim-comments/spec/commands/create_comment_spec.rb
+++ b/decidim-comments/spec/commands/create_comment_spec.rb
@@ -10,7 +10,7 @@ module Comments
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -49,13 +49,13 @@ module Comments
 
           it "creates a new comment" do
             expect(Comment).to receive(:create!).with(
-              author: author,
-              commentable: commentable,
-              root_commentable: commentable,
-              body: { en: body },
-              alignment: alignment,
-              decidim_user_group_id: user_group_id,
-              participatory_space: form.current_component.try(:participatory_space)
+              { author: author,
+                commentable: commentable,
+                root_commentable: commentable,
+                body: { en: body },
+                alignment: alignment,
+                decidim_user_group_id: user_group_id,
+                participatory_space: form.current_component.try(:participatory_space) }
             ).and_call_original
 
             expect do
@@ -74,7 +74,7 @@ module Comments
             user_group_parser = instance_double("kind of UserGroupParser", groups: [])
             parsed_metadata = { user: user_parser, user_group: user_group_parser }
             parser = instance_double("kind of parser", rewrite: "whatever", metadata: parsed_metadata)
-            expect(Decidim::ContentProcessor).to receive(:parse).with(
+            allow(Decidim::ContentProcessor).to receive(:parse).with(
               form.body,
               current_organization: form.current_organization
             ).and_return(parser)
@@ -86,7 +86,7 @@ module Comments
           it "sends the notifications" do
             creator_double = instance_double(NewCommentNotificationCreator, create: true)
 
-            expect(NewCommentNotificationCreator)
+            allow(NewCommentNotificationCreator)
               .to receive(:new)
               .with(kind_of(Comment), [], [])
               .and_return(creator_double)
@@ -121,13 +121,13 @@ module Comments
 
             it "creates a new comment with user mention replaced" do
               expect(Comment).to receive(:create!).with(
-                author: author,
-                commentable: commentable,
-                root_commentable: commentable,
-                body: { en: Decidim::ContentProcessor.parse(body, parser_context).rewrite },
-                alignment: alignment,
-                decidim_user_group_id: user_group_id,
-                participatory_space: form.current_component.try(:participatory_space)
+                { author: author,
+                  commentable: commentable,
+                  root_commentable: commentable,
+                  body: { en: Decidim::ContentProcessor.parse(body, parser_context).rewrite },
+                  alignment: alignment,
+                  decidim_user_group_id: user_group_id,
+                  participatory_space: form.current_component.try(:participatory_space) }
               ).and_call_original
 
               expect do
@@ -138,7 +138,7 @@ module Comments
             it "sends the notifications" do
               creator_double = instance_double(NewCommentNotificationCreator, create: true)
 
-              expect(NewCommentNotificationCreator)
+              allow(NewCommentNotificationCreator)
                 .to receive(:new)
                 .with(kind_of(Comment), [mentioned_user], [])
                 .and_return(creator_double)
@@ -157,13 +157,13 @@ module Comments
 
             it "creates a new comment with user_group mention replaced" do
               expect(Comment).to receive(:create!).with(
-                author: author,
-                commentable: commentable,
-                root_commentable: commentable,
-                body: { en: Decidim::ContentProcessor.parse(body, parser_context).rewrite },
-                alignment: alignment,
-                decidim_user_group_id: user_group_id,
-                participatory_space: form.current_component.try(:participatory_space)
+                { author: author,
+                  commentable: commentable,
+                  root_commentable: commentable,
+                  body: { en: Decidim::ContentProcessor.parse(body, parser_context).rewrite },
+                  alignment: alignment,
+                  decidim_user_group_id: user_group_id,
+                  participatory_space: form.current_component.try(:participatory_space) }
               ).and_call_original
 
               expect do
@@ -174,7 +174,7 @@ module Comments
             it "sends the notifications" do
               creator_double = instance_double(NewCommentNotificationCreator, create: true)
 
-              expect(NewCommentNotificationCreator)
+              allow(NewCommentNotificationCreator)
                 .to receive(:new)
                 .with(kind_of(Comment), [], [mentioned_group])
                 .and_return(creator_double)
diff --git a/decidim-comments/spec/controllers/decidim/comments/comments_controller_spec.rb b/decidim-comments/spec/controllers/decidim/comments/comments_controller_spec.rb
index e431f080723f9..0920d705bd18b 100644
--- a/decidim-comments/spec/controllers/decidim/comments/comments_controller_spec.rb
+++ b/decidim-comments/spec/controllers/decidim/comments/comments_controller_spec.rb
@@ -23,9 +23,9 @@ module Comments
         end
 
         it "tells devise not to reset timeout counter" do
-          expect(request.env["devise.skip_timeoutable"]).to eq(nil)
+          expect(request.env["devise.skip_timeoutable"]).to be_nil
           get :index, xhr: true, params: { commentable_gid: commentable.to_signed_global_id.to_s }
-          expect(request.env["devise.skip_timeoutable"]).to eq(true)
+          expect(request.env["devise.skip_timeoutable"]).to be(true)
         end
 
         context "when requested without an XHR request" do
@@ -81,7 +81,7 @@ module Comments
           it "creates the comment" do
             expect do
               post :create, xhr: true, params: { comment: comment_params }
-            end.to change { Decidim::Comments::Comment.count }.by(1)
+            end.to change(Decidim::Comments::Comment, :count).by(1)
 
             expect(comment.body.values.first).to eq("This is a new comment")
             expect(comment.alignment).to eq(comment_alignment)
@@ -122,7 +122,7 @@ module Comments
             it "creates the comment with the alignment defined as 1" do
               expect do
                 post :create, xhr: true, params: { comment: comment_params }
-              end.to change { Decidim::Comments::Comment.count }.by(1)
+              end.to change(Decidim::Comments::Comment, :count).by(1)
 
               expect(comment.alignment).to eq(comment_alignment)
               expect(subject).to render_template(:create)
@@ -135,7 +135,7 @@ module Comments
             it "creates the comment with the alignment defined as -1" do
               expect do
                 post :create, xhr: true, params: { comment: comment_params }
-              end.to change { Decidim::Comments::Comment.count }.by(1)
+              end.to change(Decidim::Comments::Comment, :count).by(1)
 
               expect(comment.alignment).to eq(comment_alignment)
               expect(subject).to render_template(:create)
diff --git a/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_group_event_spec.rb b/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_group_event_spec.rb
index 2277df897ef76..fc44116ce6f2d 100644
--- a/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_group_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/comment_by_followed_user_group_event_spec.rb
@@ -19,28 +19,28 @@ module Comments
 
       describe "email_subject" do
         it "is correct" do
-          expect(subject.email_subject).to eq("There is a new comment by #{CGI.escapeHTML(user_group.name)} in #{resource_title}")
+          expect(subject.email_subject).to eq("There is a new comment by #{escaped_html(user_group.name)} in #{resource_title}")
         end
       end
 
       describe "email_intro" do
         it "is correct" do
           expect(subject.email_intro)
-            .to eq("The group #{CGI.escapeHTML(user_group.name)} has left a comment in #{resource_title}. You can read it in this page:")
+            .to eq("The group #{escaped_html(user_group.name)} has left a comment in #{resource_title}. You can read it in this page:")
         end
       end
 
       describe "email_outro" do
         it "is correct" do
           expect(subject.email_outro)
-            .to include("You have received this notification because you are following #{CGI.escapeHTML(user_group.name)}")
+            .to include("You have received this notification because you are following #{escaped_html(user_group.name)}")
         end
       end
 
       describe "notification_title" do
         it "is correct" do
           expect(subject.notification_title)
-            .to start_with("There is a new comment by <a href=\"#{user_group_path}\">#{CGI.escapeHTML(user_group.name)} @#{user_group.nickname}</a> in")
+            .to start_with("There is a new comment by <a href=\"#{user_group_path}\">#{escaped_html(user_group.name)} @#{user_group.nickname}</a> in")
           expect(subject.notification_title)
             .to end_with("<a href=\"#{resource_path}?commentId=#{comment.id}#comment_#{comment.id}\">#{resource_title}</a>.")
         end
diff --git a/decidim-comments/spec/events/decidim/comments/user_group_mentioned_event_spec.rb b/decidim-comments/spec/events/decidim/comments/user_group_mentioned_event_spec.rb
index 352b3111e9113..e47d696257164 100644
--- a/decidim-comments/spec/events/decidim/comments/user_group_mentioned_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/user_group_mentioned_event_spec.rb
@@ -8,7 +8,7 @@
   let(:event_name) { "decidim.events.comments.user_group_mentioned" }
   let(:ca_comment_content) { "<div><p>Un commentaire pour #{author_link}</p></div>" }
   let(:en_comment_content) { "<div><p>Comment mentioning some user group, #{author_link}</p></div>" }
-  let(:author_link) { "<a class=\"user-mention\" href=\"http://#{organization.host}/profiles/#{group.nickname}\">@#{group.nickname}</a>" }
+  let(:author_link) { "<a class=\"user-mention\" href=\"http://#{organization.host}:#{Capybara.server_port}/profiles/#{group.nickname}\">@#{group.nickname}</a>" }
 
   let(:extra) do
     {
@@ -23,7 +23,7 @@
 
   let(:parsed_body) { Decidim::ContentProcessor.parse("Comment mentioning some user group, @#{group.nickname}", current_organization: organization) }
   let(:parsed_ca_body) { Decidim::ContentProcessor.parse("Un commentaire pour @#{group.nickname}", current_organization: organization) }
-  let(:body) { { en: parsed_body.rewrite, "machine_translations": { "ca": parsed_ca_body.rewrite } } }
+  let(:body) { { en: parsed_body.rewrite, machine_translations: { ca: parsed_ca_body.rewrite } } }
 
   it_behaves_like "a comment event"
 
@@ -74,7 +74,7 @@
   describe "translated notifications" do
     let(:en_body) { parsed_body.rewrite }
 
-    let(:body) { { en: en_body, "machine_translations": { "ca": parsed_ca_body.rewrite } } }
+    let(:body) { { en: en_body, machine_translations: { ca: parsed_ca_body.rewrite } } }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:component) { create(:component, participatory_space: participatory_process) }
     let(:commentable) { create(:dummy_resource, component: component) }
diff --git a/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb b/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
index bad529c1d1385..56cd0529578c1 100644
--- a/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
+++ b/decidim-comments/spec/events/decidim/comments/user_mentioned_event_spec.rb
@@ -10,10 +10,10 @@
   let(:event_name) { "decidim.events.comments.user_mentioned" }
   let(:ca_comment_content) { "<div><p>Un commentaire pour #{author_link}</p></div>" }
   let(:en_comment_content) { "<div><p>Comment mentioning some user, #{author_link}</p></div>" }
-  let(:author_link) { "<a class=\"user-mention\" href=\"http://#{organization.host}/profiles/#{author.nickname}\">@#{author.nickname}</a>" }
+  let(:author_link) { "<a class=\"user-mention\" href=\"http://#{organization.host}:#{Capybara.server_port}/profiles/#{author.nickname}\">@#{author.nickname}</a>" }
   let(:parsed_body) { Decidim::ContentProcessor.parse("Comment mentioning some user, @#{author.nickname}", current_organization: organization) }
   let(:parsed_ca_body) { Decidim::ContentProcessor.parse("Un commentaire pour @#{author.nickname}", current_organization: organization) }
-  let(:body) { { en: parsed_body.rewrite, "machine_translations": { "ca": parsed_ca_body.rewrite } } }
+  let(:body) { { en: parsed_body.rewrite, machine_translations: { ca: parsed_ca_body.rewrite } } }
 
   let(:participatory_process) { create :participatory_process, organization: organization }
   let(:component) { create(:component, participatory_space: participatory_process) }
@@ -64,7 +64,7 @@
   describe "translated notifications" do
     let(:en_body) { parsed_body.rewrite }
 
-    let(:body) { { en: en_body, "machine_translations": { "ca": parsed_ca_body.rewrite } } }
+    let(:body) { { en: en_body, machine_translations: { ca: parsed_ca_body.rewrite } } }
 
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:component) { create(:component, participatory_space: participatory_process) }
diff --git a/decidim-comments/spec/forms/comment_form_spec.rb b/decidim-comments/spec/forms/comment_form_spec.rb
index c307cc7bf78db..c2bd39e8a8c5e 100644
--- a/decidim-comments/spec/forms/comment_form_spec.rb
+++ b/decidim-comments/spec/forms/comment_form_spec.rb
@@ -50,7 +50,7 @@ module Comments
         it { is_expected.not_to be_valid }
 
         context "with carriage return characters that cause it to exceed" do
-          let(:body) { "#{("c" * 500)}\r\n#{("c" * 499)}" }
+          let(:body) { "#{"c" * 500}\r\n#{"c" * 499}" }
 
           it { is_expected.to be_valid }
         end
@@ -98,7 +98,7 @@ module Comments
           let(:settings) { double }
 
           it "returns the organization comments_max_length" do
-            expect(component).to receive(:settings).and_return(settings)
+            allow(component).to receive(:settings).and_return(settings)
             expect(subject.max_length).to eq(organization.comments_max_length)
           end
         end
diff --git a/decidim-comments/spec/helpers/comments_helper_spec.rb b/decidim-comments/spec/helpers/comments_helper_spec.rb
index d22d4f800a21a..8ab960d437f5c 100644
--- a/decidim-comments/spec/helpers/comments_helper_spec.rb
+++ b/decidim-comments/spec/helpers/comments_helper_spec.rb
@@ -24,7 +24,7 @@ module Comments
 
           expect(cell).to receive(:to_s)
 
-          expect(helper)
+          allow(helper)
             .to receive(:cell)
             .with(
               "decidim/comments/comments",
diff --git a/decidim-comments/spec/lib/decidim/comments/comment_serializer_spec.rb b/decidim-comments/spec/lib/decidim/comments/comment_serializer_spec.rb
index f6b4867b62a81..2138b6a50346e 100644
--- a/decidim-comments/spec/lib/decidim/comments/comment_serializer_spec.rb
+++ b/decidim-comments/spec/lib/decidim/comments/comment_serializer_spec.rb
@@ -6,7 +6,8 @@ module Decidim
   module Comments
     describe CommentSerializer do
       let(:comment) { create(:comment) }
-      let(:subject) { described_class.new(comment) }
+
+      subject { described_class.new(comment) }
 
       describe "#serialize" do
         it "includes the id" do
diff --git a/decidim-comments/spec/lib/decidim/comments/comment_vote_serializer_spec.rb b/decidim-comments/spec/lib/decidim/comments/comment_vote_serializer_spec.rb
index b85d4f3ff2da1..b04253f5dad57 100644
--- a/decidim-comments/spec/lib/decidim/comments/comment_vote_serializer_spec.rb
+++ b/decidim-comments/spec/lib/decidim/comments/comment_vote_serializer_spec.rb
@@ -6,10 +6,10 @@ module Decidim
   module Comments
     describe CommentVoteSerializer do
       let(:comment) { create(:comment) }
+      let(:serialized) { subject.serialize }
       let(:resource) { create(:comment_vote, comment: comment) }
 
-      let(:subject) { described_class.new(resource) }
-      let(:serialized) { subject.serialize }
+      subject { described_class.new(resource) }
 
       describe "#serialize" do
         it "includes the id" do
diff --git a/decidim-comments/spec/lib/decidim/comments/export_spec.rb b/decidim-comments/spec/lib/decidim/comments/export_spec.rb
index 02af11b5f5d5e..2eb4f12ca4971 100644
--- a/decidim-comments/spec/lib/decidim/comments/export_spec.rb
+++ b/decidim-comments/spec/lib/decidim/comments/export_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module Comments
     describe Export do
-      let(:subject) { described_class }
+      subject { described_class }
       let!(:component) { create(:component, manifest_name: "dummy") }
       let!(:dummy_resources) { create_list(:dummy_resource, 2, component: component) }
       let!(:comments) { create_list(:comment, 5, commentable: dummy_resources[1], root_commentable: dummy_resources[1]) }
diff --git a/decidim-comments/spec/models/comment_spec.rb b/decidim-comments/spec/models/comment_spec.rb
index ab600e6206a03..a5bc0e7e14b5a 100644
--- a/decidim-comments/spec/models/comment_spec.rb
+++ b/decidim-comments/spec/models/comment_spec.rb
@@ -58,7 +58,7 @@ module Comments
       end
 
       it "is not valid if its parent is a comment and cannot accept new comments" do
-        expect(comment.root_commentable).to receive(:accepts_new_comments?).and_return false
+        allow(comment.root_commentable).to receive(:accepts_new_comments?).and_return false
         expect(replies[0]).not_to be_valid
       end
 
@@ -135,13 +135,14 @@ module Comments
       describe "#reported_content_url" do
         subject { comment.reported_content_url }
 
-        let(:url_format) { "http://%{host}/processes/%{slug}/f/%{component_id}/dummy_resources/%{resource_id}#comment_%{comment_id}" }
+        let(:url_format) { "http://%{host}:%{port}/processes/%{slug}/f/%{component_id}/dummy_resources/%{resource_id}#comment_%{comment_id}" }
 
         it "returns the resource URL" do
           expect(subject).to eq(
             format(
               url_format,
               host: commentable.organization.host,
+              port: Capybara.server_port,
               slug: commentable.participatory_space.slug,
               component_id: commentable.component.id,
               resource_id: commentable.id,
diff --git a/decidim-comments/spec/models/seed_spec.rb b/decidim-comments/spec/models/seed_spec.rb
index eb174306cf455..5bee9a726ad8e 100644
--- a/decidim-comments/spec/models/seed_spec.rb
+++ b/decidim-comments/spec/models/seed_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module Comments
     describe Seed do
-      let(:subject) { Decidim::Comments::Seed }
+      subject { described_class }
 
       describe "#comments_for(resource)" do
         it "creates comments for a page if one is given" do
diff --git a/decidim-comments/spec/permissions/decidim/comments/permissions_spec.rb b/decidim-comments/spec/permissions/decidim/comments/permissions_spec.rb
index deb3a714394fe..95335ae0b93c4 100644
--- a/decidim-comments/spec/permissions/decidim/comments/permissions_spec.rb
+++ b/decidim-comments/spec/permissions/decidim/comments/permissions_spec.rb
@@ -8,7 +8,7 @@ module Decidim::Comments
 
     let(:user) { nil }
     let(:context) { {} }
-    let(:permission_action) { Decidim::PermissionAction.new(action) }
+    let(:permission_action) { Decidim::PermissionAction.new(**action) }
     let(:action_name) { :foo }
     let(:action_subject) { :bar }
     let(:action) do
@@ -39,17 +39,17 @@ module Decidim::Comments
       let(:context) { { commentable: commentable } }
 
       # Without any user
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
 
       context "with a user who is allowed to comment" do
         let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
 
         context "with comments disabled for the component" do
           let(:component) { create(:component, :with_comments_disabled, participatory_space: participatory_process) }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
@@ -57,7 +57,7 @@ module Decidim::Comments
         let(:participatory_process) { create :participatory_process, :private, organization: organization }
         let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -67,12 +67,12 @@ module Decidim::Comments
       let(:context) { { comment: comment } }
 
       # Without any user
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
 
       context "with a user who is allowed to comment" do
         let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
 
         context "with comments disabled for the component" do
           before do
@@ -83,7 +83,7 @@ module Decidim::Comments
             component.save!
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -91,7 +91,7 @@ module Decidim::Comments
         let(:participatory_process) { create :participatory_process, :private, organization: organization }
         let(:user) { create(:user, :confirmed, locale: "en", organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
diff --git a/decidim-comments/spec/queries/sorted_comments_spec.rb b/decidim-comments/spec/queries/sorted_comments_spec.rb
index 74c9681577cea..508fb31605925 100644
--- a/decidim-comments/spec/queries/sorted_comments_spec.rb
+++ b/decidim-comments/spec/queries/sorted_comments_spec.rb
@@ -21,7 +21,7 @@ module Decidim::Comments
     let!(:author) { create(:user, organization: organization) }
     let!(:commentable) { create(:dummy_resource, component: component) }
     let!(:comment) { create(:comment, commentable: commentable, author: author) }
-    let!(:order_by) {}
+    let!(:order_by) { nil }
 
     it "returns the commentable's comments" do
       expect(subject.query).to eq [comment]
diff --git a/decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb b/decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb
index 811df4dafe91c..11947c33f2bce 100644
--- a/decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb
+++ b/decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb
@@ -26,7 +26,7 @@ module Comments
         let(:block) { proc { |_data| "The block that is expected to be subscribed" } }
 
         it "subscribes to comment created" do
-          expect(ActiveSupport::Notifications)
+          allow(ActiveSupport::Notifications)
             .to receive(:subscribe)
             .with(described_class::EVENT_NAME, &block)
 
diff --git a/decidim-comments/spec/system/admin_manages_comments_spec.rb b/decidim-comments/spec/system/admin_manages_comments_spec.rb
index ee75490442f24..defb31a1bbb64 100644
--- a/decidim-comments/spec/system/admin_manages_comments_spec.rb
+++ b/decidim-comments/spec/system/admin_manages_comments_spec.rb
@@ -5,7 +5,7 @@
 describe "Admin manages comments", type: :system do
   let(:manifest_name) { "dummy" }
   let!(:dummy) { create :dummy_resource, component: current_component }
-  let!(:resources) { create_list(:dummy_resource, 3, component: current_component) }
+  let!(:resources) { create_list(:dummy_resource, 2, component: current_component) }
   let!(:reportables) do
     resources.map do |resource|
       create(:comment, commentable: resource)
@@ -18,4 +18,8 @@
   include_context "when managing a component as an admin"
 
   it_behaves_like "manage moderations"
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+  end
 end
diff --git a/decidim-comments/spec/system/search_comments_spec.rb b/decidim-comments/spec/system/search_comments_spec.rb
index def091f0094ac..7fb7d4bd76672 100644
--- a/decidim-comments/spec/system/search_comments_spec.rb
+++ b/decidim-comments/spec/system/search_comments_spec.rb
@@ -7,7 +7,7 @@
   let(:manifest_name) { "dummy" }
   let!(:commentable) { create(:dummy_resource, component: component) }
   let!(:searchables) { create_list(:comment, 3, commentable: commentable) }
-  let!(:term) { translated(searchables.first.body).split(" ").last }
+  let!(:term) { translated(searchables.first.body).split.last }
   let(:hashtag) { "#decidim" }
 
   before do
diff --git a/decidim-comments/spec/types/comment_mutation_type_spec.rb b/decidim-comments/spec/types/comment_mutation_type_spec.rb
index ff420d497984d..c909de1124b66 100644
--- a/decidim-comments/spec/types/comment_mutation_type_spec.rb
+++ b/decidim-comments/spec/types/comment_mutation_type_spec.rb
@@ -17,7 +17,7 @@ module Comments
         end
 
         it "calls UpVoteComment command" do
-          expect(model).to receive(:up_voted_by?).with(current_user).and_return(true)
+          allow(model).to receive(:up_voted_by?).with(current_user).and_return(true)
           expect(response["upVote"]).to include("upVoted" => true)
         end
       end
@@ -30,7 +30,7 @@ module Comments
         end
 
         it "calls UpVoteComment command" do
-          expect(model).to receive(:down_voted_by?).with(current_user).and_return(true)
+          allow(model).to receive(:down_voted_by?).with(current_user).and_return(true)
           expect(response["downVote"]).to include("downVoted" => true)
         end
       end
diff --git a/decidim-comments/spec/types/comment_type_spec.rb b/decidim-comments/spec/types/comment_type_spec.rb
index 1f2c770696263..060de208de74d 100644
--- a/decidim-comments/spec/types/comment_type_spec.rb
+++ b/decidim-comments/spec/types/comment_type_spec.rb
@@ -133,7 +133,7 @@ module Comments
         let(:query) { "{ upVoted }" }
 
         it "returns the up_voted_by? method evaluation with the current user" do
-          expect(model).to receive(:up_voted_by?).with(current_user).and_return(true)
+          allow(model).to receive(:up_voted_by?).with(current_user).and_return(true)
           expect(response).to include("upVoted" => true)
         end
       end
@@ -142,7 +142,7 @@ module Comments
         let(:query) { "{ downVoted }" }
 
         it "returns the down_voted_by? method evaluation with the current user" do
-          expect(model).to receive(:down_voted_by?).with(current_user).and_return(true)
+          allow(model).to receive(:down_voted_by?).with(current_user).and_return(true)
           expect(response).to include("downVoted" => true)
         end
       end
@@ -151,7 +151,7 @@ module Comments
         let(:query) { "{ alreadyReported }" }
 
         it "returns the reported_by? method evaluation with the current user" do
-          expect(model).to receive(:reported_by?).with(current_user).and_return(true)
+          allow(model).to receive(:reported_by?).with(current_user).and_return(true)
           expect(response).to include("alreadyReported" => true)
         end
       end
diff --git a/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb b/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb
index 7bd3827769cb5..77d9b6534fd78 100644
--- a/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb
+++ b/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_conferences" class="wrapper-home home-section">
   <div class="row" id="highlighted-conferences">
     <h3 class="section-heading"><%= t("active_conferences", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb b/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb
index bbffd4c017dda..fa92b2b8d6b66 100644
--- a/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb
+++ b/decidim-conferences/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb
@@ -6,10 +6,6 @@ module ContentBlocks
       class HighlightedConferencesCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_conferences.any?
         end
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/confirm_conference_registration.rb b/decidim-conferences/app/commands/decidim/conferences/admin/confirm_conference_registration.rb
index 6db0a21fe26ee..1a76b5a876c1d 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/confirm_conference_registration.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/confirm_conference_registration.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command is executed when the user joins a conference.
-      class ConfirmConferenceRegistration < Rectify::Command
+      class ConfirmConferenceRegistration < Decidim::Command
         # Initializes a JoinConference Command.
         #
         # conference_registration - The registration to be confirmed
@@ -18,9 +18,9 @@ def initialize(conference_registration, current_user)
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          @conference_registration.with_lock do
-            return broadcast(:invalid) unless can_join_conference?
+          return broadcast(:invalid) unless can_join_conference?
 
+          @conference_registration.with_lock do
             confirm_registration
             send_email_confirmation
             send_notification_confirmation
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/copy_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/copy_conference.rb
index eed5cd2c77d25..94fa880a8fc99 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/copy_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/copy_conference.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when copying a new participatory
       # conference in the system.
-      class CopyConference < Rectify::Command
+      class CopyConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/create_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/create_conference.rb
index 71b7314000dd3..cda66cd21984e 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/create_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/create_conference.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new
       # conference in the system.
-      class CreateConference < Rectify::Command
+      class CreateConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/create_conference_speaker.rb b/decidim-conferences/app/commands/decidim/conferences/admin/create_conference_speaker.rb
index 565a6a747ed17..3768d4ce77a4c 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/create_conference_speaker.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/create_conference_speaker.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new conference
       # speaker in the system.
-      class CreateConferenceSpeaker < Rectify::Command
+      class CreateConferenceSpeaker < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -52,24 +52,27 @@ def call
 
         attr_reader :form, :conference, :current_user
 
-        def conference_speaker_with_attributes
-          attrs = form.attributes.slice(
-            :full_name,
-            :twitter_handle,
-            :personal_url,
-            :position,
-            :affiliation,
-            :short_bio
-          ).merge(
+        def conference_speaker_attributes
+          @conference_speaker_attributes ||= form.attributes.slice(
+            "full_name",
+            "twitter_handle",
+            "personal_url",
+            "position",
+            "affiliation",
+            "short_bio"
+          ).symbolize_keys.merge(
             decidim_conference_id: conference.id,
             conference: conference,
             user: form.user
           ).merge(
             attachment_attributes(:avatar)
           )
+        end
+
+        def conference_speaker_with_attributes
           conference_speaker = conference.speakers.build
           conference_speaker.conference = conference
-          conference_speaker.assign_attributes(attrs)
+          conference_speaker.assign_attributes(conference_speaker_attributes)
           conference_speaker
         end
 
@@ -86,7 +89,7 @@ def create_conference_speaker!
           @conference_speaker = Decidim.traceability.create!(
             Decidim::ConferenceSpeaker,
             current_user,
-            conference_speaker_with_attributes.attributes,
+            conference_speaker_attributes,
             log_info
           )
         end
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/create_media_link.rb b/decidim-conferences/app/commands/decidim/conferences/admin/create_media_link.rb
index 75847d25add61..5f0eeb8e0f39e 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/create_media_link.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/create_media_link.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new
       # media link for conference in the system.
-      class CreateMediaLink < Rectify::Command
+      class CreateMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -50,11 +50,11 @@ def create_media_link!
             Decidim::Conferences::MediaLink,
             current_user,
             form.attributes.slice(
-              :title,
-              :link,
-              :weight,
-              :date
-            ).merge(
+              "title",
+              "link",
+              "weight",
+              "date"
+            ).symbolize_keys.merge(
               conference: conference
             ),
             log_info
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/create_partner.rb b/decidim-conferences/app/commands/decidim/conferences/admin/create_partner.rb
index 0b9658217dce3..642e2a16a8c26 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/create_partner.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/create_partner.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new partner
       # in the system.
-      class CreatePartner < Rectify::Command
+      class CreatePartner < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -72,13 +72,13 @@ def conference_partner
         def attributes
           { conference: conference }.merge(
             form.attributes.slice(
-              :name,
-              :weight,
-              :link,
-              :partner_type,
-              :logo,
-              :remove_avatar
-            )
+              "name",
+              "weight",
+              "link",
+              "partner_type",
+              "logo",
+              "remove_avatar"
+            ).symbolize_keys
           )
         end
       end
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/create_registration_type.rb b/decidim-conferences/app/commands/decidim/conferences/admin/create_registration_type.rb
index cc737d999cb0a..abb23837dc1f0 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/create_registration_type.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/create_registration_type.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new registration type
       # in the system.
-      class CreateRegistrationType < Rectify::Command
+      class CreateRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -52,11 +52,11 @@ def create_registration_type!
             Decidim::Conferences::RegistrationType,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :description,
-              :price,
-              :weight
-            ).merge(
+              "title",
+              "description",
+              "price",
+              "weight"
+            ).symbolize_keys.merge(
               conference: conference
             ),
             log_info
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_admin.rb b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_admin.rb
index 42d2ed0a244dd..460f45d465d41 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_admin.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_admin.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when destroying an conference
       # admin in the system.
-      class DestroyConferenceAdmin < Rectify::Command
+      class DestroyConferenceAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the ConferenceUserRole to destroy
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb
index de03f0f5edd94..1440e73efe004 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when destroying an conference
       # speaker in the system.
-      class DestroyConferenceSpeaker < Rectify::Command
+      class DestroyConferenceSpeaker < Decidim::Command
         # Public: Initializes the command.
         #
         # conference_speaker - the ConferenceSpeaker to destroy
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_media_link.rb b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_media_link.rb
index 202fd58f108a1..ca97896879a25 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_media_link.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_media_link.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when destroying a media link
       # in the system.
-      class DestroyMediaLink < Rectify::Command
+      class DestroyMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # media_link - the MediaLink to destroy
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_partner.rb b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_partner.rb
index 13168ced2621c..83e9db86e10eb 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_partner.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_partner.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when destroying an conference
       # partner in the system.
-      class DestroyPartner < Rectify::Command
+      class DestroyPartner < Decidim::Command
         # Public: Initializes the command.
         #
         # conference_partner - the Partner to destroy
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_registration_type.rb b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_registration_type.rb
index 2285f11745cf0..e142954148f6a 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/destroy_registration_type.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/destroy_registration_type.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when destroying a conference
       # registration type in the system.
-      class DestroyRegistrationType < Rectify::Command
+      class DestroyRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - the Partner to destroy
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/export_conference_registrations.rb b/decidim-conferences/app/commands/decidim/conferences/admin/export_conference_registrations.rb
index 0fbf96c9b9718..8123a1accacf2 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/export_conference_registrations.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/export_conference_registrations.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # This command is executed when the user exports the registrations of
       # a Conference from the admin panel.
-      class ExportConferenceRegistrations < Rectify::Command
+      class ExportConferenceRegistrations < Decidim::Command
         # conference - The current instance of the page to be closed.
         # format - a string representing the export format
         # current_user - the user performing the action
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
index 26d47d8cfdaf0..a12d526614a76 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic to invite users to join a conference.
       #
-      class InviteUserToJoinConference < Rectify::Command
+      class InviteUserToJoinConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -86,16 +86,14 @@ def invite_user
         end
 
         def user
-          @user ||= begin
-            if form.existing_user
-              form.user
-            else
-              Decidim::User.find_or_initialize_by(
-                organization: form.current_organization,
-                email: form.email.downcase
-              )
-            end
-          end
+          @user ||= if form.existing_user
+                      form.user
+                    else
+                      Decidim::User.find_or_initialize_by(
+                        organization: form.current_organization,
+                        email: form.email.downcase
+                      )
+                    end
         end
 
         def invite_user_to_sign_up
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb
index d5cb1937e8c03..6fda20a727a5a 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command to notify users when a role is assigned for a Conference
-      class NotifyRoleAssignedToConference < Rectify::Command
+      class NotifyRoleAssignedToConference < Decidim::Command
         def send_notification(user)
           Decidim::EventsManager.publish(
             event: "decidim.events.conferences.role_assigned",
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/publish_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/publish_conference.rb
index 792439a96ff04..0966758650d52 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/publish_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/publish_conference.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command that sets an conference as published.
-      class PublishConference < Rectify::Command
+      class PublishConference < Decidim::Command
         # Public: Initializes the command.
         #
         # conference - A Conference that will be published
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/publish_registration_type.rb b/decidim-conferences/app/commands/decidim/conferences/admin/publish_registration_type.rb
index 7ee97314a4b8b..3d5c39ee7f0bf 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/publish_registration_type.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/publish_registration_type.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command gets called when a registration_type is published from the admin panel.
-      class PublishRegistrationType < Rectify::Command
+      class PublishRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - The registration_type to publish.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/send_conference_diplomas.rb b/decidim-conferences/app/commands/decidim/conferences/admin/send_conference_diplomas.rb
index 01d062d39a398..db0eda8127842 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/send_conference_diplomas.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/send_conference_diplomas.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic to send diplomas to registered conference users.
       #
-      class SendConferenceDiplomas < Rectify::Command
+      class SendConferenceDiplomas < Decidim::Command
         # Public: Initializes the command.
         #
         # conference      - The conference which the user is invited to.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_conference.rb
index 0580684c69353..f171fed619b7a 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_conference.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command that sets an conference as unpublished.
-      class UnpublishConference < Rectify::Command
+      class UnpublishConference < Decidim::Command
         # Public: Initializes the command.
         #
         # conference - A Conference that will be published
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_registration_type.rb b/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_registration_type.rb
index 213ba56bad29f..d3ce75cbe962d 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_registration_type.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/unpublish_registration_type.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command gets called when a registration type is unpublished from the admin panel.
-      class UnpublishRegistrationType < Rectify::Command
+      class UnpublishRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - The registration_type to unpublish.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_conference.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_conference.rb
index 8af2e9eac1387..12d5edd046a4f 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_conference.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when creating a new participatory
       # conference in the system.
-      class UpdateConference < Rectify::Command
+      class UpdateConference < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_conference_speaker.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_conference_speaker.rb
index 3ee6de0f37c62..bf93d9e9c90ae 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_conference_speaker.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_conference_speaker.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when updating a conference
       # speaker in the system.
-      class UpdateConferenceSpeaker < Rectify::Command
+      class UpdateConferenceSpeaker < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -55,13 +55,13 @@ def call
 
         def attributes
           form.attributes.slice(
-            :full_name,
-            :twitter_handle,
-            :personal_url,
-            :position,
-            :affiliation,
-            :short_bio
-          ).merge(
+            "full_name",
+            "twitter_handle",
+            "personal_url",
+            "position",
+            "affiliation",
+            "short_bio"
+          ).symbolize_keys.merge(
             user: form.user
           ).merge(
             attachment_attributes(:avatar)
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_diploma.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_diploma.rb
index 650825118a65e..e8b8c4f675adb 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_diploma.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_diploma.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command is executed when the user updates the conference diploma configuration.
-      class UpdateDiploma < Rectify::Command
+      class UpdateDiploma < Decidim::Command
         # Initializes a UpdateDiploma Command.
         #
         # form - The form from which to get the data.
@@ -18,9 +18,9 @@ def initialize(form, conference)
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          @conference.with_lock do
-            return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid?
 
+          @conference.with_lock do
             update_conference_diploma
             Decidim.traceability.perform_action!(:update_diploma, @conference, form.current_user) do
               @conference
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_media_link.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_media_link.rb
index 3b2055b4f9d5b..d25b04e44ed0f 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_media_link.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_media_link.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when updating a conference
       # speaker in the system.
-      class UpdateMediaLink < Rectify::Command
+      class UpdateMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -50,11 +50,11 @@ def update_media_link!
             media_link,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :link,
-              :weight,
-              :date
-            ),
+              "title",
+              "link",
+              "weight",
+              "date"
+            ).symbolize_keys,
             log_info
           )
         end
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_partner.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_partner.rb
index f50734c8e737f..25472519e5b84 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_partner.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_partner.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when updating a conference
       # partner in the system.
-      class UpdatePartner < Rectify::Command
+      class UpdatePartner < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -51,11 +51,11 @@ def call
 
         def attributes
           form.attributes.slice(
-            :name,
-            :weight,
-            :partner_type,
-            :link
-          ).merge(
+            "name",
+            "weight",
+            "partner_type",
+            "link"
+          ).symbolize_keys.merge(
             attachment_attributes(:logo)
           )
         end
diff --git a/decidim-conferences/app/commands/decidim/conferences/admin/update_registration_type.rb b/decidim-conferences/app/commands/decidim/conferences/admin/update_registration_type.rb
index c5fdbe69e6591..936283daf1e18 100644
--- a/decidim-conferences/app/commands/decidim/conferences/admin/update_registration_type.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/admin/update_registration_type.rb
@@ -5,7 +5,7 @@ module Conferences
     module Admin
       # A command with all the business logic when updating a conference
       # registration type in the system.
-      class UpdateRegistrationType < Rectify::Command
+      class UpdateRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -51,11 +51,11 @@ def update_registration_type!
             registration_type,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :description,
-              :price,
-              :weight
-            ),
+              "title",
+              "description",
+              "price",
+              "weight"
+            ).symbolize_keys,
             log_info
           )
         end
diff --git a/decidim-conferences/app/commands/decidim/conferences/decline_invitation.rb b/decidim-conferences/app/commands/decidim/conferences/decline_invitation.rb
index 525a07350cbd7..f472ee6f68217 100644
--- a/decidim-conferences/app/commands/decidim/conferences/decline_invitation.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/decline_invitation.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user declines an invite to the conference.
-    class DeclineInvitation < Rectify::Command
+    class DeclineInvitation < Decidim::Command
       # Initializes a DeclineInvitation Command.
       #
       # conference - The current instance of the conference where user has been invited.
diff --git a/decidim-conferences/app/commands/decidim/conferences/join_conference.rb b/decidim-conferences/app/commands/decidim/conferences/join_conference.rb
index 36fec0c1062a9..f3d3b26dab4bd 100644
--- a/decidim-conferences/app/commands/decidim/conferences/join_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/join_conference.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user joins a conference.
-    class JoinConference < Rectify::Command
+    class JoinConference < Decidim::Command
       # Initializes a JoinConference Command.
       #
       # conference - The current instance of the conference to be joined.
@@ -24,8 +24,6 @@ def call
         return broadcast(:ok) if already_joined_conference?
 
         conference.with_lock do
-          return broadcast(:invalid) unless can_join_conference?
-
           create_registration
           create_meetings_registrations
           accept_invitation
diff --git a/decidim-conferences/app/commands/decidim/conferences/leave_conference.rb b/decidim-conferences/app/commands/decidim/conferences/leave_conference.rb
index c630d13f082b0..523306606de46 100644
--- a/decidim-conferences/app/commands/decidim/conferences/leave_conference.rb
+++ b/decidim-conferences/app/commands/decidim/conferences/leave_conference.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user leaves a conference.
-    class LeaveConference < Rectify::Command
+    class LeaveConference < Decidim::Command
       # Initializes a LeaveConference Command.
       #
       # conference - The current instance of the conference to be left.
@@ -20,10 +20,10 @@ def initialize(conference, registration_type, user)
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        @conference.with_lock do
-          return broadcast(:invalid) unless registration
-          return broadcast(:invalid) unless meetings_registrations
+        return broadcast(:invalid) unless registration
+        return broadcast(:invalid) unless meetings_registrations
 
+        @conference.with_lock do
           destroy_registration
           destroy_meeting_registration
         end
diff --git a/decidim-conferences/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb
index 37456d247b47e..e7d9cb29a21d3 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb
@@ -6,10 +6,11 @@ module Admin
       # Controller that allows managing conference speakers.
       #
       class ConferenceSpeakersController < Decidim::Conferences::Admin::ApplicationController
-        helper Decidim::Conferences::Admin::ConferenceSpeakersHelper
         include Concerns::ConferenceAdmin
         include Decidim::Paginable
 
+        helper_method :conference_speaker, :meetings_selected
+
         def index
           enforce_permission_to :index, :conference_speaker
 
@@ -41,17 +42,15 @@ def create
         end
 
         def edit
-          @item = collection.find(params[:id])
-          enforce_permission_to :update, :conference_speaker, speaker: @item
-          @form = form(ConferenceSpeakerForm).from_model(@item)
+          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
+          @form = form(ConferenceSpeakerForm).from_model(conference_speaker)
         end
 
         def update
-          @conference_speaker = collection.find(params[:id])
-          enforce_permission_to :update, :conference_speaker, speaker: @conference_speaker
+          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
           @form = form(ConferenceSpeakerForm).from_params(params)
 
-          UpdateConferenceSpeaker.call(@form, @conference_speaker) do
+          UpdateConferenceSpeaker.call(@form, conference_speaker) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.update.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -65,10 +64,9 @@ def update
         end
 
         def destroy
-          @conference_speaker = collection.find(params[:id])
-          enforce_permission_to :destroy, :conference_speaker, speaker: @conference_speaker
+          enforce_permission_to :destroy, :conference_speaker, speaker: conference_speaker
 
-          DestroyConferenceSpeaker.call(@conference_speaker, current_user) do
+          DestroyConferenceSpeaker.call(conference_speaker, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.destroy.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -78,6 +76,14 @@ def destroy
 
         private
 
+        def meetings_selected
+          @meetings_selected ||= @conference_speaker.conference_meetings.pluck(:id) if @conference_speaker.present?
+        end
+
+        def conference_speaker
+          @conference_speaker ||= collection.find(params[:id])
+        end
+
         def collection
           @collection ||= Decidim::ConferenceSpeaker.where(conference: current_conference)
         end
diff --git a/decidim-conferences/app/controllers/decidim/conferences/admin/reminders_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/admin/reminders_controller.rb
new file mode 100644
index 0000000000000..c66ed0ab35bc8
--- /dev/null
+++ b/decidim-conferences/app/controllers/decidim/conferences/admin/reminders_controller.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # a conference.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::ConferenceAdmin
+      end
+    end
+  end
+end
diff --git a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
index 088b6b3818e0c..8b4ebc46914c5 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
@@ -28,7 +28,7 @@ def meeting_component
       def meetings
         return unless meeting_component&.published? || !meeting_component.presence
 
-        @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_meeting_for(current_user).order(:start_time)
+        @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_for(current_user).order(:start_time)
       end
 
       def meeting_days
diff --git a/decidim-conferences/app/events/decidim/conferences/conference_registration_notification_event.rb b/decidim-conferences/app/events/decidim/conferences/conference_registration_notification_event.rb
index bf683c7637596..78f645c322752 100644
--- a/decidim-conferences/app/events/decidim/conferences/conference_registration_notification_event.rb
+++ b/decidim-conferences/app/events/decidim/conferences/conference_registration_notification_event.rb
@@ -6,7 +6,7 @@ class ConferenceRegistrationNotificationEvent < Decidim::Events::BaseEvent
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options
diff --git a/decidim-conferences/app/events/decidim/conferences/conference_role_assigned_event.rb b/decidim-conferences/app/events/decidim/conferences/conference_role_assigned_event.rb
index c0ef9c8ba5e50..9af5216a1ab37 100644
--- a/decidim-conferences/app/events/decidim/conferences/conference_role_assigned_event.rb
+++ b/decidim-conferences/app/events/decidim/conferences/conference_role_assigned_event.rb
@@ -7,7 +7,7 @@ class ConferenceRoleAssignedEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::AuthorEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_role
diff --git a/decidim-conferences/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb b/decidim-conferences/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb
index b89ca24a758ca..4d9ebc50b5a76 100644
--- a/decidim-conferences/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb
+++ b/decidim-conferences/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb
@@ -14,7 +14,7 @@ class ConferenceRegistrationInviteForm < Form
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user
diff --git a/decidim-conferences/app/forms/decidim/conferences/admin/conference_speaker_form.rb b/decidim-conferences/app/forms/decidim/conferences/admin/conference_speaker_form.rb
index b30b34e339ca7..09cb2c79facb5 100644
--- a/decidim-conferences/app/forms/decidim/conferences/admin/conference_speaker_form.rb
+++ b/decidim-conferences/app/forms/decidim/conferences/admin/conference_speaker_form.rb
@@ -17,7 +17,7 @@ class ConferenceSpeakerForm < Form
         attribute :full_name, String
         attribute :twitter_handle, String
         attribute :personal_url, String
-        attribute :avatar
+        attribute :avatar, Decidim::Attributes::Blob
         attribute :remove_avatar, Boolean, default: false
         attribute :user_id, Integer
         attribute :existing_user, Boolean, default: false
diff --git a/decidim-conferences/app/helpers/decidim/conferences/admin/conference_speakers_helper.rb b/decidim-conferences/app/helpers/decidim/conferences/admin/conference_speakers_helper.rb
deleted file mode 100644
index 76c827eda0f34..0000000000000
--- a/decidim-conferences/app/helpers/decidim/conferences/admin/conference_speakers_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Conferences
-    module Admin
-      # Helpers related to the Conferences Speakers admin layout.
-      module ConferenceSpeakersHelper
-        def meetings_selected
-          @meetings_selected ||= @conference_speaker.conference_meetings.pluck(:id) if @conference_speaker.present?
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-conferences/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb b/decidim-conferences/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb
index b5a52ced43110..d431c3ad7b44a 100644
--- a/decidim-conferences/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb
+++ b/decidim-conferences/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb
@@ -35,8 +35,8 @@ def diploma(conference, user)
         def add_diploma_attachment
           diploma = WickedPdf.new.pdf_from_string(
             render_to_string(pdf: "conference-diploma",
-                             template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb",
-                             layout: "decidim/diploma.html.erb"),
+                             template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user",
+                             layout: "decidim/diploma"),
             orientation: "Landscape"
           )
 
diff --git a/decidim-conferences/app/models/decidim/conference.rb b/decidim-conferences/app/models/decidim/conference.rb
index 5cb3ffd6bbbba..ff518625ead14 100644
--- a/decidim-conferences/app/models/decidim/conference.rb
+++ b/decidim-conferences/app/models/decidim/conference.rb
@@ -19,6 +19,7 @@ class Conference < ApplicationRecord
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
@@ -140,8 +141,6 @@ def attachment_context
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-    end
+    ransacker_i18n :title
   end
 end
diff --git a/decidim-conferences/app/models/decidim/conferences/conference_invite.rb b/decidim-conferences/app/models/decidim/conferences/conference_invite.rb
index a62bd5366b10a..5f968520ddca0 100644
--- a/decidim-conferences/app/models/decidim/conferences/conference_invite.rb
+++ b/decidim-conferences/app/models/decidim/conferences/conference_invite.rb
@@ -6,7 +6,7 @@ module Conferences
     class ConferenceInvite < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -15,7 +15,7 @@ class ConferenceInvite < ApplicationRecord
       validates :user, uniqueness: { scope: :conference }
 
       def self.export_serializer
-        Decidim::Conferences::DataPortabilityConferenceInviteSerializer
+        Decidim::Conferences::DownloadYourDataConferenceInviteSerializer
       end
 
       def self.log_presenter_class_for(_log)
diff --git a/decidim-conferences/app/models/decidim/conferences/conference_registration.rb b/decidim-conferences/app/models/decidim/conferences/conference_registration.rb
index 6ec3b0ac6bce3..990e9a660f361 100644
--- a/decidim-conferences/app/models/decidim/conferences/conference_registration.rb
+++ b/decidim-conferences/app/models/decidim/conferences/conference_registration.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # The data store for a Registration in the Decidim::Conferences component.
     class ConferenceRegistration < ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -19,7 +19,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::Conferences::DataPortabilityConferenceRegistrationSerializer
+        Decidim::Conferences::DownloadYourDataConferenceRegistrationSerializer
       end
 
       def confirmed?
diff --git a/decidim-conferences/app/presenters/decidim/conference_speaker_presenter.rb b/decidim-conferences/app/presenters/decidim/conference_speaker_presenter.rb
index 516de5ac2dfe3..0575e1ab3dd06 100644
--- a/decidim-conferences/app/presenters/decidim/conference_speaker_presenter.rb
+++ b/decidim-conferences/app/presenters/decidim/conference_speaker_presenter.rb
@@ -46,11 +46,9 @@ def avatar_url(variant = nil)
     private
 
     def user
-      @user ||= begin
-        if (user = __getobj__.user.presence)
-          Decidim::UserPresenter.new(user)
-        end
-      end
+      @user ||= if (user = __getobj__.user.presence)
+                  Decidim::UserPresenter.new(user)
+                end
     end
   end
 end
diff --git a/decidim-conferences/app/presenters/decidim/conferences/conference_stats_presenter.rb b/decidim-conferences/app/presenters/decidim/conferences/conference_stats_presenter.rb
index 1b0055ca4c7ad..18753ac0fe891 100644
--- a/decidim-conferences/app/presenters/decidim/conferences/conference_stats_presenter.rb
+++ b/decidim-conferences/app/presenters/decidim/conferences/conference_stats_presenter.rb
@@ -4,9 +4,12 @@ module Decidim
   module Conferences
     # A presenter to render statistics in the homepage.
     class ConferenceStatsPresenter < Decidim::StatsPresenter
-      attribute :conference, Decidim::Conference
       include IconHelper
 
+      def conference
+        __getobj__.fetch(:conference)
+      end
+
       # Public: Render a collection of primary stats.
       def highlighted
         highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
diff --git a/decidim-conferences/app/queries/decidim/conferences/admin/admin_users.rb b/decidim-conferences/app/queries/decidim/conferences/admin/admin_users.rb
index 508b637f5d5c4..eb9ed521ce4d5 100644
--- a/decidim-conferences/app/queries/decidim/conferences/admin/admin_users.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/admin/admin_users.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the admins for an conference or an organization conferences.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference - an conference that needs to find its conference admins
diff --git a/decidim-conferences/app/queries/decidim/conferences/admin/conference_invites.rb b/decidim-conferences/app/queries/decidim/conferences/admin/conference_invites.rb
index a578a6de1e6a4..9b8eea05f46f0 100644
--- a/decidim-conferences/app/queries/decidim/conferences/admin/conference_invites.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/admin/conference_invites.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the ConferenceInvites by their status status.
-      class ConferenceInvites < Rectify::Query
+      class ConferenceInvites < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference_invites - the initial Invites relation that needs to be filtered.
diff --git a/decidim-conferences/app/queries/decidim/conferences/admin/conference_speakers.rb b/decidim-conferences/app/queries/decidim/conferences/admin/conference_speakers.rb
index e1616e9b00278..73fa2962c1caa 100644
--- a/decidim-conferences/app/queries/decidim/conferences/admin/conference_speakers.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/admin/conference_speakers.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the ConferenceSpeakers's by the search.
-      class ConferenceSpeakers < Rectify::Query
+      class ConferenceSpeakers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference_speakers - the initial ConferenceSpeaker relation that needs to be filtered.
diff --git a/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings.rb b/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings.rb
index 62a904eb35248..ea7c89163ff6e 100644
--- a/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings.rb
@@ -3,14 +3,14 @@
 module Decidim
   module Conferences
     # This query class filters meetings for component and day
-    class ConferenceProgramMeetings < Rectify::Query
+    class ConferenceProgramMeetings < Decidim::Query
       def initialize(component, user = nil)
         @component = component
         @user = user
       end
 
       def query
-        Decidim::Meetings::Meeting.where(component: @component).visible_meeting_for(@user)
+        Decidim::Meetings::Meeting.where(component: @component).visible_for(@user)
       end
     end
   end
diff --git a/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings_by_day.rb b/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings_by_day.rb
index 54c27972dae6d..89a6beb16ee96 100644
--- a/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings_by_day.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/conference_program_meetings_by_day.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters meetings for component and day
-    class ConferenceProgramMeetingsByDay < Rectify::Query
+    class ConferenceProgramMeetingsByDay < Decidim::Query
       def initialize(component, day, user = nil)
         @component = component
         @day = day
@@ -11,9 +11,9 @@ def initialize(component, day, user = nil)
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           ConferenceProgramMeetings.new(@component, @user)
-        ).query.where(start_time: @day.beginning_of_day..@day.end_of_day).order(start_time: :asc)
+        ).query.where(start_time: @day.all_day).order(start_time: :asc)
       end
     end
   end
diff --git a/decidim-conferences/app/queries/decidim/conferences/conferences_with_user_role.rb b/decidim-conferences/app/queries/decidim/conferences/conferences_with_user_role.rb
index 821ebb5eb4ea9..517a108ded667 100644
--- a/decidim-conferences/app/queries/decidim/conferences/conferences_with_user_role.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/conferences_with_user_role.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # A class used to find the Conferences that the given user has
     # the specific role privilege.
-    class ConferencesWithUserRole < Rectify::Query
+    class ConferencesWithUserRole < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which conferences can manage
diff --git a/decidim-conferences/app/queries/decidim/conferences/organization_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/organization_conferences.rb
index 299c3e710a46a..5f6d09cbacc58 100644
--- a/decidim-conferences/app/queries/decidim/conferences/organization_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/organization_conferences.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters all conferences given an organization.
-    class OrganizationConferences < Rectify::Query
+    class OrganizationConferences < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-conferences/app/queries/decidim/conferences/organization_prioritized_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/organization_prioritized_conferences.rb
index f5a6e13122a15..45ce250eb2a12 100644
--- a/decidim-conferences/app/queries/decidim/conferences/organization_prioritized_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/organization_prioritized_conferences.rb
@@ -4,17 +4,17 @@ module Decidim
   module Conferences
     # This query class filters public conferences given an organization in a
     # meaningful prioritized order.
-    class OrganizationPrioritizedConferences < Rectify::Query
+    class OrganizationPrioritizedConferences < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedConferences.new(@organization, @user),
           PrioritizedConferences.new
-        ).query
+        ).query.with_attached_hero_image
       end
     end
   end
diff --git a/decidim-conferences/app/queries/decidim/conferences/organization_published_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/organization_published_conferences.rb
index 8436ef584a736..67b9d368a7cf8 100644
--- a/decidim-conferences/app/queries/decidim/conferences/organization_published_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/organization_published_conferences.rb
@@ -3,14 +3,14 @@
 module Decidim
   module Conferences
     # This query class filters published conferences given an organization.
-    class OrganizationPublishedConferences < Rectify::Query
+    class OrganizationPublishedConferences < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationConferences.new(@organization),
           VisibleConferences.new(@user),
           PublishedConferences.new
diff --git a/decidim-conferences/app/queries/decidim/conferences/prioritized_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/prioritized_conferences.rb
index ce4bd6ab873fc..1149fef0cf3c0 100644
--- a/decidim-conferences/app/queries/decidim/conferences/prioritized_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/prioritized_conferences.rb
@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # This query orders conferences by importance, prioritizing promoted
     # conferences.
-    class PrioritizedConferences < Rectify::Query
+    class PrioritizedConferences < Decidim::Query
       def query
         Decidim::Conference.order(promoted: :desc)
       end
diff --git a/decidim-conferences/app/queries/decidim/conferences/promoted_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/promoted_conferences.rb
index 960fd62595585..6b6cf34e93003 100644
--- a/decidim-conferences/app/queries/decidim/conferences/promoted_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/promoted_conferences.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query filters conferences so only promoted ones are returned.
-    class PromotedConferences < Rectify::Query
+    class PromotedConferences < Decidim::Query
       def query
         Decidim::Conference.promoted
       end
diff --git a/decidim-conferences/app/queries/decidim/conferences/published_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/published_conferences.rb
index 247235ce7356a..88c51eb23dbc7 100644
--- a/decidim-conferences/app/queries/decidim/conferences/published_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/published_conferences.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query filters published conferences only.
-    class PublishedConferences < Rectify::Query
+    class PublishedConferences < Decidim::Query
       def query
         Decidim::Conference.published
       end
diff --git a/decidim-conferences/app/queries/decidim/conferences/visible_conferences.rb b/decidim-conferences/app/queries/decidim/conferences/visible_conferences.rb
index 80377c0b8e2c9..2aa6398272efe 100644
--- a/decidim-conferences/app/queries/decidim/conferences/visible_conferences.rb
+++ b/decidim-conferences/app/queries/decidim/conferences/visible_conferences.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters conferences given a current_user.
-    class VisibleConferences < Rectify::Query
+    class VisibleConferences < Decidim::Query
       def query
         Decidim::Conference.public_spaces
       end
diff --git a/decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb b/decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_invite_serializer.rb
similarity index 87%
rename from decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
rename to decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_invite_serializer.rb
index 8c880d4600667..407b42110a8ed 100644
--- a/decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
+++ b/decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_invite_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   module Conferences
-    class DataPortabilityConferenceInviteSerializer < Decidim::Exporters::Serializer
-      # Serializes a conference invite for data portability
+    class DownloadYourDataConferenceInviteSerializer < Decidim::Exporters::Serializer
+      # Serializes a conference invite for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb b/decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_registration_serializer.rb
similarity index 85%
rename from decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
rename to decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_registration_serializer.rb
index 27882614e630a..fc72a4bbb078f 100644
--- a/decidim-conferences/app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
+++ b/decidim-conferences/app/serializers/decidim/conferences/download_your_data_conference_registration_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   module Conferences
-    class DataPortabilityConferenceRegistrationSerializer < Decidim::Exporters::Serializer
-      # Serializes a registration for data portability
+    class DownloadYourDataConferenceRegistrationSerializer < Decidim::Exporters::Serializer
+      # Serializes a registration for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb
index cc0276204b811..8b5d648fe9d3b 100644
--- a/decidim-conferences/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb
@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: conference_speaker_path(@item.conference, @item), html: { class: "form edit_conference_speaker" }) do |f| %>
+<%= decidim_form_for(@form, url: conference_speaker_path(conference_speaker.conference, conference_speaker), html: { class: "form edit_conference_speaker" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("conference_speakers.edit.title", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
diff --git a/decidim-conferences/app/views/decidim/conferences/admin/partners/index.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/partners/index.html.erb
index 5fc52b1bbea81..3af6dadb36d15 100644
--- a/decidim-conferences/app/views/decidim/conferences/admin/partners/index.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/admin/partners/index.html.erb
@@ -36,7 +36,9 @@
                 <% end %>
               </td>
               <td>
-                <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% if partner.attached_uploader(:logo).path %>
+                  <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% end %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :partner, partner: partner %>
diff --git a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
index 215fc5ac724f8..63defeb74b80b 100644
--- a/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
+++ b/decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
@@ -20,12 +20,12 @@ edit_link(
   <div class="columns mediumlarge-12">
     <section class="section">
       <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
-      <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
+      <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
     </section>
     <hr class="reset mt-none mb-m">
     <section class="section">
       <h3 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h3>
-      <%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
+      <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
       <div class="row mt-l mb-l">
         <div class="column medium-9 medium-centered">
           <% if current_participatory_space.registrations_enabled? %>
diff --git a/decidim-conferences/app/views/layouts/decidim/_conferences_nav.html.erb b/decidim-conferences/app/views/layouts/decidim/_conferences_nav.html.erb
index 141e71b72f72c..d912122135e1e 100644
--- a/decidim-conferences/app/views/layouts/decidim/_conferences_nav.html.erb
+++ b/decidim-conferences/app/views/layouts/decidim/_conferences_nav.html.erb
@@ -16,7 +16,7 @@
       active: is_active_link?(decidim_conferences.conference_conference_speakers_path(current_participatory_space), :inclusive)
     } : nil
   ] + meeting_components.map do |component|
-    Decidim::Meetings::Meeting.visible_meeting_for(current_user).any? ? {
+    Decidim::Meetings::Meeting.visible_for(current_user).any? ? {
       name: translated_attribute(component.name),
       url: decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id),
       active: is_active_link?(decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id), :inclusive)
diff --git a/decidim-conferences/config/locales/ar.yml b/decidim-conferences/config/locales/ar.yml
index fb62844cca4b6..25e32132f4454 100644
--- a/decidim-conferences/config/locales/ar.yml
+++ b/decidim-conferences/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ ar:
         show_statistics: عرض الإحصائيات
         sign_date: تاريخ التوقيع
         signature: التوقيع
-        signature_name: اسم التوقيع
         slogan: شعار
         slug: سبيكة العنوان الشبكي
         start_date: تاريخ البداية
@@ -37,13 +37,11 @@ ar:
         date: التاريخ
         link: الرابط
         title: العنوان
-        weight: وزن
       conference_partner:
         link: الرابط
         logo: الشعار
         name: الإسم
         partner_type: نوع الشريك
-        weight: وزن
       conference_registration_invite:
         email: البريد الإلكتروني
         name: الإسم
@@ -53,7 +51,6 @@ ar:
         description: الوص�
         price: السعر
         title: العنوان
-        weight: وزن
       conference_speaker:
         affiliation: الانتساب
         avatar: الصورة الرمزية
@@ -143,8 +140,6 @@ ar:
         edit:
           title: تحديث مسؤول المؤتمر.
           update: تحديث
-        index:
-          conference_admins_title: مدراء المؤتمر
         new:
           create: إنشاء
           title: مشر� المؤتمر الجديد.
@@ -425,7 +420,7 @@ ar:
       conference_program:
         program_meeting:
           content: المحتوى
-          location: موقعك
+          location: الموقع
           speakers: مكبرات الصوت
           streaming: تد�ق
         show:
diff --git a/decidim-conferences/config/locales/bg.yml b/decidim-conferences/config/locales/bg.yml
index 17f54b1521541..b024f8164a24a 100644
--- a/decidim-conferences/config/locales/bg.yml
+++ b/decidim-conferences/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-conferences/config/locales/ca.yml b/decidim-conferences/config/locales/ca.yml
index 806c5d0913ad7..0d524fcf22446 100644
--- a/decidim-conferences/config/locales/ca.yml
+++ b/decidim-conferences/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ ca:
         show_statistics: Mostrar estadístiques
         sign_date: Data de signatura
         signature: Signatura
-        signature_name: nom de la signatura
+        signature_name: Nom de la signatura
         slogan: Eslògan
         slug: URL amigable
         start_date: Data d'inici
@@ -53,7 +54,7 @@ ca:
         description: Descripció
         price: Cost
         title: Títol
-        weight: Odre de posició
+        weight: Ordre de posició
       conference_speaker:
         affiliation: Afiliació
         avatar: Imatge de perfil
@@ -134,7 +135,7 @@ ca:
           title: Actualitzar administradora de la jornada.
           update: Actualitzar
         index:
-          conference_admins_title: administradores de la jornada
+          conference_admins_title: Administradores de la jornada
         new:
           create: Crear
           title: Nova administradora de jornada.
@@ -312,6 +313,7 @@ ca:
           update: "%{user_name} ha actualitzat la col·laboradora %{resource_name} a la jornada %{space_name}"
         registration_type:
           create: "%{user_name} ha creat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
+          delete: "%{user_name} ha eliminat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           publish: "%{user_name} ha publicat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           unpublish: "%{user_name} ha despublicat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           update: "%{user_name} ha actualitzat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
@@ -431,7 +433,7 @@ ca:
         create:
           invalid: S'ha produït un error en inscriure't a aquesta jornada.
           success: T'has inscrit a la jornada correctament.
-          unauthorized: Cal que iniciïs la teva sessió abans d'inscriure't a la conferència.
+          unauthorized: Cal que iniciïs la teva sessió abans d'inscriure't a la jornada.
         decline_invitation:
           invalid: S'ha produït un error en rebutjar la invitació.
           success: Has rebutjat la invitació correctament.
diff --git a/decidim-conferences/config/locales/cs.yml b/decidim-conferences/config/locales/cs.yml
index 297338eb732fe..6d03cdc5ba4e1 100644
--- a/decidim-conferences/config/locales/cs.yml
+++ b/decidim-conferences/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ cs:
         show_statistics: Zobrazit statistiky
         sign_date: Datum podpisu
         signature: Podpis
-        signature_name: podpisové jméno
+        signature_name: Podpisové jméno
         slogan: Motto
         slug: URL slug
         start_date: Datum zahájení
@@ -37,13 +38,13 @@ cs:
         date: Datum
         link: Odkaz
         title: Název
-        weight: Váha
+        weight: Pozice v řazení
       conference_partner:
         link: Odkaz
         logo: Logo
         name: Název
         partner_type: Typ partnera
-        weight: Váha
+        weight: Pozice v řazení
       conference_registration_invite:
         email: E-mail
         name: Jméno
@@ -53,7 +54,7 @@ cs:
         description: Popis
         price: Cena
         title: Oslovení
-        weight: Váha
+        weight: Pozice v řazení
       conference_speaker:
         affiliation: Příslušnost
         avatar: Avatar
@@ -140,7 +141,7 @@ cs:
           title: Aktualizovat uživatele konference.
           update: Aktualizace
         index:
-          conference_admins_title: administrátoři konference
+          conference_admins_title: Administrátoři konference
         new:
           create: Vytvořit
           title: Nový administrátor konference.
@@ -318,6 +319,7 @@ cs:
           update: "%{user_name} aktualizoval partnera %{resource_name} na konferenci %{space_name}"
         registration_type:
           create: "%{user_name} vytvořil typ registrace %{resource_name} na konferenci %{space_name}"
+          delete: "%{user_name} odstranil typ registrace %{resource_name} z konference %{space_name}"
           publish: "%{user_name} publikoval %{resource_name} typ registrace na %{space_name} konferencích"
           unpublish: "%{user_name} nepublikováno %{resource_name} typ registrace na %{space_name} konferencích"
           update: "%{user_name} aktualizoval typ registrace %{resource_name} na konferenci %{space_name}"
@@ -420,7 +422,7 @@ cs:
       conference_program:
         program_meeting:
           content: Obsah
-          location: Umístění
+          location: Lokalita
           speakers: Ře�níci
           streaming: Streamování
         show:
diff --git a/decidim-conferences/config/locales/de.yml b/decidim-conferences/config/locales/de.yml
index ffb0c4604272f..81a487dae5061 100644
--- a/decidim-conferences/config/locales/de.yml
+++ b/decidim-conferences/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ de:
         show_statistics: Zeige Statistiken
         sign_date: Unterzeichnungsdatum
         signature: Unterschrift
-        signature_name: Signaturname
         slogan: Slogan
         slug: URL-Block
         start_date: Startdatum
@@ -37,13 +37,13 @@ de:
         date: Datum
         link: Link
         title: Titel
-        weight: Gewicht
+        weight: Reihenfolge
       conference_partner:
         link: Link
         logo: Logo
         name: Name
         partner_type: Partnertyp
-        weight: Gewicht
+        weight: Reihenfolge
       conference_registration_invite:
         email: E-Mail
         name: Name
@@ -53,7 +53,7 @@ de:
         description: Beschreibung
         price: Preis
         title: Titel
-        weight: Gewicht
+        weight: Reihenfolge
       conference_speaker:
         affiliation: Zugehörigkeit
         avatar: Profilbild
@@ -133,8 +133,6 @@ de:
         edit:
           title: Aktualisieren Sie den Konferenzbenutzer.
           update: Aktualisieren
-        index:
-          conference_admins_title: Konferenzbenutzer
         new:
           create: Erstellen
           title: Neuer Konferenzbenutzer
@@ -246,7 +244,7 @@ de:
             price: Preis
             registrations_count: Registrierungen zählen
             title: Titel
-            weight: Bestellposition
+            weight: Reihenfolge
           name: Registrierungstyp
       partners:
         create:
diff --git a/decidim-conferences/config/locales/el.yml b/decidim-conferences/config/locales/el.yml
index 001d6ee1af2e8..2a2d6cad9bb72 100644
--- a/decidim-conferences/config/locales/el.yml
+++ b/decidim-conferences/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ el:
         show_statistics: Εμφάνιση στατιστικών
         sign_date: Ημε�ομηνία υπογ�αφής
         signature: Υπογ�αφή
-        signature_name: όνομα υπογ�αφής
         slogan: Σ�νθημα
         slug: Slug διε�θυνσης URL
         start_date: Ημε�ομηνία ένα�ξης
@@ -37,13 +37,11 @@ el:
         date: Ημε�ομηνία
         link: Σ�νδεσμος
         title: Τίτλος
-        weight: Βά�ος
       conference_partner:
         link: Σ�νδεσμος
         logo: Λογότυπο
         name: Όνομα
         partner_type: Τ�πος εταί�ου
-        weight: Βά�ος
       conference_registration_invite:
         name: Όνομα
         registration_type_id: Τ�πος εγγ�αφής
@@ -52,7 +50,6 @@ el:
         description: Πε�ιγ�αφή
         price: Τιμή
         title: Τίτλος
-        weight: Βά�ος
       conference_speaker:
         affiliation: Δεσμός
         avatar: Εικόνα Χ�ήστη
@@ -130,8 +127,6 @@ el:
         edit:
           title: Ενημέ�ωση διαχει�ιστή διάσκεψης.
           update: Ενημέ�ωση
-        index:
-          conference_admins_title: διαχει�ιστές διάσκεψης
         new:
           create: Δημιου�γία
           title: �έος διαχει�ιστής διάσκεψης.
diff --git a/decidim-conferences/config/locales/en.yml b/decidim-conferences/config/locales/en.yml
index 885986e903b29..48378930f4faf 100644
--- a/decidim-conferences/config/locales/en.yml
+++ b/decidim-conferences/config/locales/en.yml
@@ -29,7 +29,7 @@ en:
         show_statistics: Show statistics
         sign_date: Sign date
         signature: Signature
-        signature_name: signature name
+        signature_name: Signature name
         slogan: Slogan
         slug: URL slug
         start_date: Start date
@@ -38,13 +38,13 @@ en:
         date: Date
         link: Link
         title: Title
-        weight: Weight
+        weight: Order position
       conference_partner:
         link: Link
         logo: Logo
         name: Name
         partner_type: Partner type
-        weight: Weight
+        weight: Order position
       conference_registration_invite:
         email: Email
         name: Name
@@ -54,7 +54,7 @@ en:
         description: Description
         price: Price
         title: Title
-        weight: Weight
+        weight: Order position
       conference_speaker:
         affiliation: Affiliation
         avatar: Avatar
@@ -135,7 +135,7 @@ en:
           title: Update conference admin.
           update: Update
         index:
-          conference_admins_title: conference admins
+          conference_admins_title: Conference admins
         new:
           create: Create
           title: New conference admin.
@@ -313,6 +313,7 @@ en:
           update: "%{user_name} updated the partner %{resource_name} in the %{space_name} conference"
         registration_type:
           create: "%{user_name} created the %{resource_name} registration type in the %{space_name} conference"
+          delete: "%{user_name} removed the %{resource_name} registration type from the %{space_name} conference"
           publish: "%{user_name} published the %{resource_name} registration type in the %{space_name} conference"
           unpublish: "%{user_name} unpublished the %{resource_name} registration type in the %{space_name} conference"
           update: "%{user_name} updated the %{resource_name} registration type in the %{space_name} conference"
@@ -352,7 +353,7 @@ en:
             invites: Invites
             search: Search
           new:
-            explanation: The participant will be invited to join a conference. If her email is not registered she will be invited to the organization as well.
+            explanation: The participant will be invited to join a conference. If their email is not registered, they'll be invited to the organization as well.
             invite: Invite
             new_invite: Invite participant
         conference_registrations:
diff --git a/decidim-conferences/config/locales/es-MX.yml b/decidim-conferences/config/locales/es-MX.yml
index 6df45734005fa..ad26722bbe2b9 100644
--- a/decidim-conferences/config/locales/es-MX.yml
+++ b/decidim-conferences/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ es-MX:
         show_statistics: Mostrar estadísticas
         sign_date: Fecha de firma
         signature: Firma
-        signature_name: nombre de firma
+        signature_name: Nombre de la firma
         slogan: Eslogan
         slug: URL amigable
         start_date: Fecha de inicio
@@ -37,13 +38,13 @@ es-MX:
         date: Fecha
         link: Enlace
         title: Título
-        weight: Peso
+        weight: Orden de posición
       conference_partner:
         link: Enlace
         logo: Logo
         name: Nombre
         partner_type: Tipo de colaboración
-        weight: Peso
+        weight: Orden de posición
       conference_registration_invite:
         email: Correo electrónico
         name: Nombre
@@ -53,7 +54,7 @@ es-MX:
         description: Descripción
         price: Coste
         title: Título
-        weight: Peso
+        weight: Orden de posición
       conference_speaker:
         affiliation: Afiliación
         avatar: Avatar
@@ -134,7 +135,7 @@ es-MX:
           title: Actualizar usuario de la conferencia.
           update: Actualizar
         index:
-          conference_admins_title: usuarios de la conferencia
+          conference_admins_title: Administradoras de la jornada
         new:
           create: Crear
           title: Nuevo usuario de la conferencia.
@@ -312,6 +313,7 @@ es-MX:
           update: "%{user_name} actualizó la colaboradora %{resource_name} de la jornada %{space_name}"
         registration_type:
           create: "%{user_name} ha creado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
+          delete: "%{user_name} ha eliminado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
           publish: "%{user_name} ha publicado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
           unpublish: "%{user_name} ha despublicado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
           update: "%{user_name} ha actualizado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
@@ -412,7 +414,7 @@ es-MX:
       conference_program:
         program_meeting:
           content: Contenido
-          location: Ubicación
+          location: Localización
           speakers: Ponentes
           streaming: Retransmisión
         show:
@@ -431,7 +433,7 @@ es-MX:
         create:
           invalid: Ha habido un problema al unirse a esta conferencia.
           success: Te has unido a la conferencia con éxito.
-          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la conferencia.
+          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la jornada.
         decline_invitation:
           invalid: Ha habido un problema al rechazar la invitación.
           success: Has rechazado la invitación con éxito.
diff --git a/decidim-conferences/config/locales/es-PY.yml b/decidim-conferences/config/locales/es-PY.yml
index 5c865da0c76da..92b0a37e9de8f 100644
--- a/decidim-conferences/config/locales/es-PY.yml
+++ b/decidim-conferences/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ es-PY:
         show_statistics: Mostrar estadísticas
         sign_date: Fecha de firma
         signature: Firma
-        signature_name: nombre de firma
+        signature_name: Nombre de la firma
         slogan: Eslogan
         slug: URL amigable
         start_date: Fecha de inicio
@@ -37,13 +38,13 @@ es-PY:
         date: Fecha
         link: Enlace
         title: Título
-        weight: Peso
+        weight: Orden de posición
       conference_partner:
         link: Enlace
         logo: Logo
         name: Nombre
         partner_type: Tipo de colaboración
-        weight: Peso
+        weight: Orden de posición
       conference_registration_invite:
         email: Correo electrónico
         name: Nombre
@@ -53,7 +54,7 @@ es-PY:
         description: Descripción
         price: Coste
         title: Título
-        weight: Peso
+        weight: Orden de posición
       conference_speaker:
         affiliation: Afiliación
         avatar: Avatar
@@ -134,7 +135,7 @@ es-PY:
           title: Actualizar el usuario de la conferencia.
           update: Actualizar
         index:
-          conference_admins_title: usuarios de la conferencia
+          conference_admins_title: Administradoras de la jornada
         new:
           create: Crear
           title: Nuevo usuario de la conferencia.
@@ -312,6 +313,7 @@ es-PY:
           update: "%{user_name} actualizó la colaboradora %{resource_name} de la jornada %{space_name}"
         registration_type:
           create: "%{user_name} ha creado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
+          delete: "%{user_name} ha eliminado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
           publish: "%{user_name} ha publicado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
           unpublish: "%{user_name} ha despublicado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
           update: "%{user_name} ha actualizado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
@@ -412,7 +414,7 @@ es-PY:
       conference_program:
         program_meeting:
           content: Contenido
-          location: Ubicación
+          location: Localización
           speakers: Ponentes
           streaming: Transmisión
         show:
@@ -431,7 +433,7 @@ es-PY:
         create:
           invalid: Ha habido un problema al unirse a esta conferencia.
           success: Te has unido a la conferencia con éxito.
-          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la conferencia.
+          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la jornada.
         decline_invitation:
           invalid: Ha habido un problema al rechazar la invitación.
           success: Has rechazado la invitación con éxito.
@@ -453,7 +455,7 @@ es-PY:
           go_to_twitter: Ir a twitter
       conference_speakers:
         index:
-          speakers: Altavoces
+          speakers: Ponentes
       conferences:
         partners:
           collaborators: Fogonadura
diff --git a/decidim-conferences/config/locales/es.yml b/decidim-conferences/config/locales/es.yml
index 9f23aceed06c5..b15c0a7049890 100644
--- a/decidim-conferences/config/locales/es.yml
+++ b/decidim-conferences/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ es:
         show_statistics: Mostrar estadísticas
         sign_date: Fecha de firma
         signature: Firma
-        signature_name: nombre de firma
+        signature_name: Nombre de la firma
         slogan: Eslogan
         slug: URL amigable
         start_date: Fecha de inicio
@@ -134,7 +135,7 @@ es:
           title: Actualizar administradora de la jornada.
           update: Actualizar
         index:
-          conference_admins_title: administradoras de la jornada
+          conference_admins_title: Administradoras de la jornada
         new:
           create: Crear
           title: Nueva administradora de la jornada.
@@ -312,6 +313,7 @@ es:
           update: "%{user_name} actualizó la colaboradora %{resource_name} de la jornada %{space_name}"
         registration_type:
           create: "%{user_name} ha creado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
+          delete: "%{user_name} ha eliminado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
           publish: "%{user_name} ha publicado el tipo de inscripción %{resource_name} en la conferencia %{space_name}"
           unpublish: "%{user_name} ha despublicado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
           update: "%{user_name} ha actualizado el tipo de inscripción %{resource_name} en la jornada %{space_name}"
@@ -351,7 +353,7 @@ es:
             invites: Invita
             search: Buscar
           new:
-            explanation: La participante será invitada a unirse a una jornada. Si su correo electrónico no está registrado, también será invitada a unirse a la organización.
+            explanation: La participante será invitada a unirse a la jornada. Si su correo electrónico no está registrado, también será invitada a unirse a la organización.
             invite: Invitar
             new_invite: Invitar participante
         conference_registrations:
@@ -412,7 +414,7 @@ es:
       conference_program:
         program_meeting:
           content: Contenido
-          location: Ubicación
+          location: Localización
           speakers: Ponentes
           streaming: Streaming
         show:
@@ -431,7 +433,7 @@ es:
         create:
           invalid: Se ha producido un error al inscribirte a esta jornada.
           success: Te has inscrito a la jornada correctamente.
-          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la conferencia.
+          unauthorized: Necesitas iniciar tu sesión antes de registrarse en la jornada.
         decline_invitation:
           invalid: Se ha producido un error al declinar la invitación.
           success: Has declinado la invitación correctamente.
diff --git a/decidim-conferences/config/locales/eu.yml b/decidim-conferences/config/locales/eu.yml
index 5ce80112be3c4..944cab0b8e608 100644
--- a/decidim-conferences/config/locales/eu.yml
+++ b/decidim-conferences/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ eu:
         show_statistics: Erakutsi estatistikak
         sign_date: Sinatze-data
         signature: Sinadura
-        signature_name: sinaduraren izena
         slogan: Leloa
         slug: URL laburra
         start_date: Hasiera-data
@@ -37,13 +37,11 @@ eu:
         date: Data
         link: Lotura
         title: Izenburua
-        weight: Pisua
       conference_partner:
         link: Lotura
         logo: Logoa
         name: Izena
         partner_type: Lankidetza mota
-        weight: Pisua
       conference_registration_invite:
         email: Helbide elektronikoa
         name: Izena
@@ -53,7 +51,6 @@ eu:
         description: Deskribapena
         price: Prezioa
         title: Izenburua
-        weight: Pisua
       conference_speaker:
         affiliation: Kidetza
         avatar: Avatarra
@@ -131,8 +128,6 @@ eu:
         edit:
           title: Eguneratu konferentzia erabiltzaileak.
           update: eguneratzearen
-        index:
-          conference_admins_title: konferentzia erabiltzaileak
         new:
           create: Sortu
           title: Konferentzia erabiltzaile berria.
@@ -409,7 +404,7 @@ eu:
       conference_program:
         program_meeting:
           content: Edukia
-          location: Kokalekua
+          location: Kokapena
           speakers: Hizlariak
           streaming: Streaming
         show:
diff --git a/decidim-conferences/config/locales/fi-plain.yml b/decidim-conferences/config/locales/fi-plain.yml
index 332d09134aef4..9cf2ebf72a471 100644
--- a/decidim-conferences/config/locales/fi-plain.yml
+++ b/decidim-conferences/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ fi-pl:
         show_statistics: Näytä tilastot
         sign_date: Allekirjoituksen päivämäärä
         signature: Allekirjoitus
-        signature_name: allekirjoituksen nimi
+        signature_name: Allekirjoituksen nimi
         slogan: Iskulause
         slug: URL-tunniste
         start_date: Alkamispäivä
@@ -37,13 +38,13 @@ fi-pl:
         date: Päivämäärä
         link: Linkki
         title: Otsikko
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_partner:
         link: Linkki
         logo: Logo
         name: Nimi
         partner_type: Kumppanin tyyppi
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_registration_invite:
         email: Sähköposti
         name: Nimi
@@ -53,7 +54,7 @@ fi-pl:
         description: Kuvaus
         price: Hinta
         title: Otsikko
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_speaker:
         affiliation: Jäsenyys
         avatar: Avatar
@@ -134,7 +135,7 @@ fi-pl:
           title: Päivitä konferenssin käyttäjä.
           update: Päivitä
         index:
-          conference_admins_title: konferenssin käyttäjät
+          conference_admins_title: Konferenssin ylläpitäjät
         new:
           create: Luo
           title: Uusi konferenssin käyttäjä.
@@ -312,6 +313,7 @@ fi-pl:
           update: "%{user_name} päivitti yhteistyökumppania %{resource_name} konferenssissa %{space_name}"
         registration_type:
           create: "%{user_name} loi ilmoittautumistyypin %{resource_name} konferenssiin %{space_name}"
+          delete: "%{user_name} poisti ilmoittautumistyypin %{resource_name} konferenssista %{space_name}"
           publish: "%{user_name} julkaisi ilmoittautumistyypin %{resource_name} konferenssissa %{space_name}"
           unpublish: "%{user_name} lopetti ilmoittautumistyypin %{resource_name} julkaisun konferenssissa %{space_name}"
           update: "%{user_name} päivitti ilmoittautumistyyppiä %{resource_name} konferenssissa %{space_name}"
diff --git a/decidim-conferences/config/locales/fi.yml b/decidim-conferences/config/locales/fi.yml
index 56265fa8a29b8..a222df565a1bf 100644
--- a/decidim-conferences/config/locales/fi.yml
+++ b/decidim-conferences/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ fi:
         show_statistics: Näytä tilastot
         sign_date: Allekirjoituksen päivämäärä
         signature: Allekirjoitus
-        signature_name: allekirjoituksen nimi
+        signature_name: Allekirjoituksen nimi
         slogan: Iskulause
         slug: URL-tunniste
         start_date: Alkamispäivä
@@ -37,13 +38,13 @@ fi:
         date: Päivämäärä
         link: Linkki
         title: Otsikko
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_partner:
         link: Linkki
         logo: Logo
         name: Nimi
         partner_type: Kumppanin tyyppi
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_registration_invite:
         email: Sähköposti
         name: Nimi
@@ -53,7 +54,7 @@ fi:
         description: Kuvaus
         price: Hinta
         title: Otsikko
-        weight: Painoarvo
+        weight: Järjestysnumero
       conference_speaker:
         affiliation: Jäsenyys
         avatar: Avatar
@@ -134,7 +135,7 @@ fi:
           title: Päivitä konferenssin hallintakäyttäjä.
           update: Päivitä
         index:
-          conference_admins_title: konferenssin hallintakäyttäjät
+          conference_admins_title: Konferenssin ylläpitäjät
         new:
           create: Luo
           title: Uusi konferenssin hallintakäyttäjä.
@@ -312,6 +313,7 @@ fi:
           update: "%{user_name} päivitti yhteistyökumppania %{resource_name} konferenssissa %{space_name}"
         registration_type:
           create: "%{user_name} loi ilmoittautumistyypin %{resource_name} konferenssiin %{space_name}"
+          delete: "%{user_name} poisti ilmoittautumistyypin %{resource_name} konferenssista %{space_name}"
           publish: "%{user_name} julkaisi ilmoittautumistyypin %{resource_name} konferenssissa %{space_name}"
           unpublish: "%{user_name} lopetti ilmoittautumistyypin %{resource_name} julkaisun konferenssissa %{space_name}"
           update: "%{user_name} päivitti ilmoittautumistyyppiä %{resource_name} konferenssissa %{space_name}"
@@ -351,7 +353,7 @@ fi:
             invites: Kutsut
             search: Hae
           new:
-            explanation: Käyttäjä kutsutaan mukaan konferenssiin. Jos sähköposti ei ole rekisteröity, käyttäjä kutsutaan myös organisaatioon.
+            explanation: Käyttäjä kutsutaan mukaan konferenssiin. Jos sähköpostiosoitteella ei ole käyttäjätiliä, käyttäjä kutsutaan myös organisaatioon.
             invite: Kutsu
             new_invite: Kutsu käyttäjä
         conference_registrations:
diff --git a/decidim-conferences/config/locales/fr-CA.yml b/decidim-conferences/config/locales/fr-CA.yml
index 5c155c9ca614c..a6fa6058a5c31 100644
--- a/decidim-conferences/config/locales/fr-CA.yml
+++ b/decidim-conferences/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ fr-CA:
         show_statistics: Montrer les statistiques
         sign_date: Date de signature
         signature: Signature
-        signature_name: nom de la signature
+        signature_name: Nom de la signature
         slogan: Slogan
         slug: Slug URL
         start_date: Date de début
@@ -134,7 +135,7 @@ fr-CA:
           title: Mettre à jour l'administrateur de la conférence.
           update: Mettre à jour
         index:
-          conference_admins_title: administrateurs de la conférence
+          conference_admins_title: Administrateurs de conférence
         new:
           create: Créer
           title: Nouvel administrateur de conférence.
@@ -312,6 +313,7 @@ fr-CA:
           update: "%{user_name} a mis à jour le partenaire %{resource_name} dans la conférence %{space_name}"
         registration_type:
           create: "%{user_name} créé le type d'inscription %{resource_name} dans la conférence %{space_name}"
+          delete: "%{user_name} a supprimé le type d'inscription %{resource_name} de la conférence %{space_name}"
           publish: "%{user_name} publié le %{resource_name} type d'inscription dans la %{space_name} conférence"
           unpublish: "%{user_name} non publié le type d'inscription %{resource_name} dans la conférence %{space_name}"
           update: "%{user_name} mis à jour le type d'inscription %{resource_name} dans la conférence %{space_name}"
diff --git a/decidim-conferences/config/locales/fr.yml b/decidim-conferences/config/locales/fr.yml
index 79f42a8cd6f10..269a85afc595c 100644
--- a/decidim-conferences/config/locales/fr.yml
+++ b/decidim-conferences/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ fr:
         show_statistics: Montrer les statistiques
         sign_date: Date de signature
         signature: Signature
-        signature_name: nom de la signature
+        signature_name: Nom de la signature
         slogan: Slogan
         slug: Slug URL
         start_date: Date de début
@@ -134,7 +135,7 @@ fr:
           title: Mettre à jour l'administrateur de la conférence.
           update: Mettre à jour
         index:
-          conference_admins_title: administrateurs de la conférence
+          conference_admins_title: Administrateurs de conférence
         new:
           create: Créer
           title: Nouvel administrateur de conférence.
@@ -312,6 +313,7 @@ fr:
           update: "%{user_name} a mis à jour le partenaire %{resource_name} dans la conférence %{space_name}"
         registration_type:
           create: "%{user_name} créé le type d'inscription %{resource_name} dans la conférence %{space_name}"
+          delete: "%{user_name} a supprimé le type d'inscription %{resource_name} de la conférence %{space_name}"
           publish: "%{user_name} publié le %{resource_name} type d'inscription dans la %{space_name} conférence"
           unpublish: "%{user_name} non publié le type d'inscription %{resource_name} dans la conférence %{space_name}"
           update: "%{user_name} mis à jour le type d'inscription %{resource_name} dans la conférence %{space_name}"
@@ -351,7 +353,7 @@ fr:
             invites: Invite
             search: Chercher
           new:
-            explanation: L'utilisateur sera invité à participer à une conférence. Si l'e-mail n'est pas enregistré, ils seront également invités à l'organisation.
+            explanation: L'utilisateur sera invité à participer à une conférence. Si l'e-mail n'est pas enregistré, ils seront également invités dans l'organisation.
             invite: Inviter
             new_invite: Inviter un utilisateur
         conference_registrations:
diff --git a/decidim-conferences/config/locales/ga-IE.yml b/decidim-conferences/config/locales/ga-IE.yml
index 0a0bd0b1c7587..8c78c53f456b4 100644
--- a/decidim-conferences/config/locales/ga-IE.yml
+++ b/decidim-conferences/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -16,12 +17,10 @@ ga:
         date: Dáta
         link: Nasc
         title: Teideal
-        weight: Meáchan
       conference_partner:
         link: Nasc
         logo: Lógó
         name: Ainm
-        weight: Meáchan
       conference_registration_invite:
         email: Seoladh ríomhphoist
         name: Ainm
@@ -29,7 +28,6 @@ ga:
       conference_registration_type:
         price: Praghas
         title: Teideal
-        weight: Meáchan
       conference_speaker:
         avatar: Abhatár
         user_id: Úsáideoir
diff --git a/decidim-conferences/config/locales/gl.yml b/decidim-conferences/config/locales/gl.yml
index e485ba469844d..19a5cd2efc6e7 100644
--- a/decidim-conferences/config/locales/gl.yml
+++ b/decidim-conferences/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ gl:
         show_statistics: Amosar estatísticas
         sign_date: Data de sinatura
         signature: Sinatura
-        signature_name: nome da sinatura
         slogan: Eslogan
         slug: URL slug
         start_date: Data de inicio
@@ -37,13 +37,11 @@ gl:
         date: Data
         link: Ligazón
         title: Título
-        weight: Peso
       conference_partner:
         link: Ligazón
         logo: Logotipo
         name: Nome
         partner_type: Tipo de socio
-        weight: Peso
       conference_registration_invite:
         email: Correo electrónico
         name: Nome
@@ -53,7 +51,6 @@ gl:
         description: Descrición
         price: Prezo
         title: Título
-        weight: Peso
       conference_speaker:
         affiliation: Afiliación
         avatar: Avatar
@@ -131,8 +128,6 @@ gl:
         edit:
           title: Actualiza o usuario da conferencia.
           update: Actualización
-        index:
-          conference_admins_title: usuarios de conferencias
         new:
           create: Crear
           title: Novo usuario da conferencia.
diff --git a/decidim-conferences/config/locales/hu.yml b/decidim-conferences/config/locales/hu.yml
index e46c70bede5c7..6c87d4691a381 100644
--- a/decidim-conferences/config/locales/hu.yml
+++ b/decidim-conferences/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ hu:
         slogan: Szlogen
         slug: URL slug
         title: Cím
-      conference_media_link:
-        weight: Súly
-      conference_partner:
-        weight: Súly
-      conference_registration_type:
-        weight: Súly
       conference_speaker:
         full_name: Teljes név
       conference_user_role:
@@ -99,8 +94,6 @@ hu:
         edit:
           title: A konferencia felhasználó frissítése.
           update: frissítés
-        index:
-          conference_admins_title: konferencia felhasználók számára
         new:
           create: Teremt
           title: Új konferencia felhasználó.
@@ -372,7 +365,6 @@ hu:
       conference_program:
         program_meeting:
           content: Tartalom
-          location: Helyszín
           speakers: Előadók
           streaming: Élő közvetítés
         show:
@@ -410,7 +402,7 @@ hu:
           go_to_twitter: Menjen a Twitterre
       conference_speakers:
         index:
-          speakers: Hangszórók
+          speakers: Előadók
       conferences:
         partners:
           collaborators: Partnerek
@@ -475,7 +467,7 @@ hu:
       registration_types:
         index:
           choose_an_option: 'Válassza ki a regisztrációs lehetőséget:'
-          login_as: '%{name} <%{email}> -ként jelentkezett be'
+          login_as: '%{name} <%{email}> -ként jelentkeztél be'
           register: Regisztráció
           title: Regisztrációs típusok
       shared:
diff --git a/decidim-conferences/config/locales/id-ID.yml b/decidim-conferences/config/locales/id-ID.yml
index 47c582bb1e199..8bf0d9d580adb 100644
--- a/decidim-conferences/config/locales/id-ID.yml
+++ b/decidim-conferences/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ id:
         slogan: Slogan
         slug: Siput URL
         title: Judul
-      conference_media_link:
-        weight: Berat
-      conference_partner:
-        weight: Berat
-      conference_registration_type:
-        weight: Berat
       conference_speaker:
         full_name: Nama lengkap
       conference_user_role:
@@ -96,8 +91,6 @@ id:
         edit:
           title: Perbarui pengguna konferensi.
           update: Memperbarui
-        index:
-          conference_admins_title: pengguna konferensi
         new:
           create: Membuat
           title: Pengguna konferensi baru.
@@ -367,7 +360,6 @@ id:
       conference_program:
         program_meeting:
           content: Konten
-          location: Lokasi
           speakers: Pembicara
           streaming: Streaming
         show:
diff --git a/decidim-conferences/config/locales/it.yml b/decidim-conferences/config/locales/it.yml
index 3b704bfd3faf6..6ef842be0d605 100644
--- a/decidim-conferences/config/locales/it.yml
+++ b/decidim-conferences/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ it:
         show_statistics: Mostra statistiche
         sign_date: Firmato il
         signature: Firma
-        signature_name: nome firma
         slogan: Slogan
         slug: Slug URL
         start_date: Data di inizio
@@ -37,13 +37,11 @@ it:
         date: Data
         link: Collegamento
         title: Titolo
-        weight: Peso
       conference_partner:
         link: Collegamento
         logo: Logo
         name: Nome
         partner_type: Tipo di partner
-        weight: Peso
       conference_registration_invite:
         email: Email
         name: Nome
@@ -53,7 +51,6 @@ it:
         description: Descrizione
         price: Prezzo
         title: Titolo
-        weight: Peso
       conference_speaker:
         affiliation: Affiliazione
         avatar: Avatar
@@ -131,8 +128,6 @@ it:
         edit:
           title: Aggiorna l'amministratore della conferenza.
           update: Aggiornare
-        index:
-          conference_admins_title: amministratori della conferenza
         new:
           create: Creare
           title: Nuovo amministratore della conferenza.
@@ -409,7 +404,7 @@ it:
       conference_program:
         program_meeting:
           content: Soddisfare
-          location: Posizione
+          location: Luogo
           speakers: Relatori
           streaming: Streaming
         show:
diff --git a/decidim-conferences/config/locales/ja.yml b/decidim-conferences/config/locales/ja.yml
index 3455385ba8d57..a2386a5aa6377 100644
--- a/decidim-conferences/config/locales/ja.yml
+++ b/decidim-conferences/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -37,13 +38,13 @@ ja:
         date: 日付
         link: リンク
         title: タイトル
-        weight: ����
+        weight: 並�順��置
       conference_partner:
         link: リンク
         logo: ロゴ
         name: ��
         partner_type: パートナータイプ
-        weight: ����
+        weight: 並�順��置
       conference_registration_invite:
         email: Eメールアドレス
         name: ��
@@ -53,7 +54,7 @@ ja:
         description: 説明
         price: 価格
         title: タイトル
-        weight: ����
+        weight: 並�順��置
       conference_speaker:
         affiliation: 所属
         avatar: ア�ター
@@ -309,6 +310,7 @@ ja:
           update: "%{user_name} � %{space_name} カンファレンス�パートナー %{resource_name} を更新����"
         registration_type:
           create: "%{user_name} � %{resource_name} カンファレンス� %{space_name} �登録タイプを作�����"
+          delete: "%{user_name} � %{space_name} カンファレンス�ら %{resource_name} 登録タイプを削除����"
           publish: "%{user_name} � %{resource_name} カンファレンス� %{space_name} 登録タイプを公開����"
           unpublish: "%{user_name} � %{resource_name} カンファレンス内� %{space_name} 登録タイプを�公開�����"
           update: "%{user_name} � %{resource_name} カンファレンス� %{space_name} 登録タイプを更新����"
diff --git a/decidim-conferences/config/locales/ka-GE.yml b/decidim-conferences/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-conferences/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-conferences/config/locales/lb.yml b/decidim-conferences/config/locales/lb.yml
index 70fa29e996562..cc19cf40c01f6 100644
--- a/decidim-conferences/config/locales/lb.yml
+++ b/decidim-conferences/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ lb:
         show_statistics: Zeige Statistiken
         sign_date: Datum der Unterschrift
         signature: Unterschrift
-        signature_name: Signaturname
         slogan: Slogan
         slug: URL-Block
         start_date: Startdatum
@@ -56,8 +56,6 @@ lb:
         edit:
           title: Aktualisieren Sie den Konferenzbenutzer.
           update: Aktualisieren
-        index:
-          conference_admins_title: Konferenzbenutzer
         new:
           create: Erstellen
           title: Neuer Konferenzbenutzer
@@ -329,7 +327,7 @@ lb:
       conference_program:
         program_meeting:
           content: Inhalt
-          location: Ort
+          location: Standort
           speakers: Lautsprecher
           streaming: Streaming
         show:
diff --git a/decidim-conferences/config/locales/lt.yml b/decidim-conferences/config/locales/lt.yml
index 8751e7a1a98b8..6c490f1ba6305 100644
--- a/decidim-conferences/config/locales/lt.yml
+++ b/decidim-conferences/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ lt:
         show_statistics: Rodyti statistikÄ…
         sign_date: Pasirašymo data
         signature: Parašas
-        signature_name: parašo pavadinimas
         slogan: Å Å«kis
         slug: URL priedas
         start_date: Pradžios data
@@ -37,13 +37,11 @@ lt:
         date: Data
         link: Nuoroda
         title: Pavadinimas
-        weight: Svoris
       conference_partner:
         link: Nuoroda
         logo: Logotipas
         name: Vardas
         partner_type: Partnerio tipas
-        weight: Svoris
       conference_registration_invite:
         email: El. paštas
         name: Vardas
@@ -53,7 +51,6 @@ lt:
         description: Aprašymas
         price: Kaina
         title: Pavadinimas
-        weight: Svoris
       conference_speaker:
         affiliation: Organizacija
         avatar: Avataras
@@ -139,8 +136,6 @@ lt:
         edit:
           title: Atnaujinti konferencijos administratorių.
           update: Atnaujinti
-        index:
-          conference_admins_title: konferencijos administratoriai
         new:
           create: Sukurti
           title: Naujas konferencijos administratorius.
@@ -357,7 +352,7 @@ lt:
             invites: Pakvietimai
             search: Ieškoti
           new:
-            explanation: Dalyvis bus pakviestas dalyvauti konferencijoje. Jei e. laiškas nebus užregistruotas, taip pat bus kvietimas dalyvauti organizacijoje.
+            explanation: Dalyvis bus pakviestas dalyvauti konferencijoje. Jei e. laiškas nebus užregistruotas, dalyvis bus taip pat pakviestas būti organizacijos dalimi.
             invite: Pakviesti
             new_invite: Kviesti dalyvį
         conference_registrations:
@@ -420,7 +415,7 @@ lt:
         program_meeting:
           content: Turinys
           location: Vieta
-          speakers: KalbÄ—tojai
+          speakers: Pranešėjai
           streaming: Transliuoti
         show:
           day: Diena
diff --git a/decidim-conferences/config/locales/lv.yml b/decidim-conferences/config/locales/lv.yml
index 416affbe7c526..605251f1748a8 100644
--- a/decidim-conferences/config/locales/lv.yml
+++ b/decidim-conferences/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ lv:
         slogan: Sauklis
         slug: URL sadaļas adrese (slug)
         title: Nosaukums
-      conference_media_link:
-        weight: Svarīgums
-      conference_partner:
-        weight: Svarīgums
-      conference_registration_type:
-        weight: Svarīgums
       conference_speaker:
         full_name: V�rds, uzv�rds
       conference_user_role:
@@ -102,8 +97,6 @@ lv:
         edit:
           title: Atjaunin�t konferences administratoru.
           update: Atjaunin�t
-        index:
-          conference_admins_title: konferences administratori
         new:
           create: Izveidot
           title: Jauns konferences administrators.
@@ -376,7 +369,6 @@ lv:
       conference_program:
         program_meeting:
           content: Saturs
-          location: Atrašan�s vieta
           speakers: Run�t�ji
           streaming: Straumēšana
         show:
diff --git a/decidim-conferences/config/locales/nl.yml b/decidim-conferences/config/locales/nl.yml
index d236e6b43eb19..4599233c39b90 100644
--- a/decidim-conferences/config/locales/nl.yml
+++ b/decidim-conferences/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ nl:
         show_statistics: Toon statistieken
         sign_date: Datum ondertekenen
         signature: Handtekening
-        signature_name: naam van de handtekenaar
         slogan: Slogan
         slug: URL-slug
         start_date: Startdatum
@@ -37,13 +37,11 @@ nl:
         date: Datum
         link: Link
         title: Titel
-        weight: Gewicht
       conference_partner:
         link: Link
         logo: Logo
         name: Naam
         partner_type: Type partner
-        weight: Gewicht
       conference_registration_invite:
         email: E-mail
         name: Naam
@@ -53,7 +51,6 @@ nl:
         description: Omschrijving
         price: Prijs
         title: Titel
-        weight: Gewicht
       conference_speaker:
         affiliation: Aansluiting
         avatar: Profielfoto
@@ -131,8 +128,6 @@ nl:
         edit:
           title: Update conferentiebeheerder.
           update: Bijwerken
-        index:
-          conference_admins_title: conferentiebeheerders
         new:
           create: Creëren
           title: Nieuwe conferentiebeheerder.
@@ -349,7 +344,7 @@ nl:
             invites: Uitnodigingen
             search: Zoeken
           new:
-            explanation: De gebruiker wordt uitgenodigd om deel te nemen aan een conferentie. Als de e-mail niet is geregistreerd, worden ze ook uitgenodigd voor de organisatie.
+            explanation: De gebruiker wordt uitgenodigd om deel te nemen aan een conferentie. Als zijn/haar e-mailadres niet is geregistreerd, worden ze ook uitgenodigd voor de organisatie.
             invite: Nodig uit
             new_invite: Nodig deelnemer uit
         conference_registrations:
@@ -409,7 +404,7 @@ nl:
       conference_program:
         program_meeting:
           content: Inhoud
-          location: Plaats
+          location: Locatie
           speakers: Sprekers
           streaming: Streaming
         show:
@@ -514,7 +509,7 @@ nl:
       registration_types:
         index:
           choose_an_option: 'Kies je registratieoptie:'
-          login_as: Je bent ingelogd als %{name} <%{email}>
+          login_as: U bent ingelogd als %{name} <%{email}>
           no_registrations: Geen inschrijvingen
           register: Registreren
           title: Registratie soorten
diff --git a/decidim-conferences/config/locales/no.yml b/decidim-conferences/config/locales/no.yml
index 339f331b197f5..6df6d9606968a 100644
--- a/decidim-conferences/config/locales/no.yml
+++ b/decidim-conferences/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -28,7 +29,6 @@
         show_statistics: Vis statistikk
         sign_date: Underskriftsdato
         signature: Underskrift
-        signature_name: signaturnavn
         slogan: Slagord
         slug: URL slug
         start_date: Startdato
@@ -37,13 +37,11 @@
         date: Dato
         link: Lenke
         title: Tittel
-        weight: Vekt
       conference_partner:
         link: Lenke
         logo: Logo
         name: Navn
         partner_type: Type partner
-        weight: Vekt
       conference_registration_invite:
         email: E-post
         name: Navn
@@ -53,7 +51,6 @@
         description: Beskrivelse
         price: Pris
         title: Tittel
-        weight: Vekt
       conference_speaker:
         affiliation: Tilknytning
         avatar: Profilbilde
@@ -131,8 +128,6 @@
         edit:
           title: Oppdater konferanse administrator.
           update: Oppdater
-        index:
-          conference_admins_title: konferanse administratorer
         new:
           create: Opprett
           title: Ny konferanse administrator.
@@ -409,7 +404,7 @@
       conference_program:
         program_meeting:
           content: Innhold
-          location: Plassering
+          location: Sted
           speakers: Talere
           streaming: Strømming
         show:
diff --git a/decidim-conferences/config/locales/pl.yml b/decidim-conferences/config/locales/pl.yml
index 216ab31a19054..db758b21eaaae 100644
--- a/decidim-conferences/config/locales/pl.yml
+++ b/decidim-conferences/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -36,13 +37,11 @@ pl:
         date: Data
         link: Link
         title: Tytuł
-        weight: Kolejność na stronie
       conference_partner:
         link: Link
         logo: Logo
         name: ImiÄ™
         partner_type: Typ partnera
-        weight: Kolejność na stronie
       conference_registration_invite:
         email: Adres e-mail
         name: ImiÄ™
@@ -52,7 +51,6 @@ pl:
         description: Opis
         price: Cena
         title: Tytuł
-        weight: Kolejność na stronie
       conference_speaker:
         affiliation: Przynależność
         avatar: Awatar
@@ -135,8 +133,6 @@ pl:
         edit:
           title: Zaktualizuj administratora konferencji.
           update: Aktualizuj
-        index:
-          conference_admins_title: administratorzy konferencji
         new:
           create: Utwórz
           title: Nowy administrator konferencji.
@@ -415,7 +411,7 @@ pl:
       conference_program:
         program_meeting:
           content: Zawartość
-          location: Lokalizacja
+          location: Miejsce
           speakers: Prelegenci
           streaming: Streaming
         show:
diff --git a/decidim-conferences/config/locales/pt-BR.yml b/decidim-conferences/config/locales/pt-BR.yml
index b781f6e872358..ce9bae89cba15 100644
--- a/decidim-conferences/config/locales/pt-BR.yml
+++ b/decidim-conferences/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ pt-BR:
         show_statistics: Mostre estatisticas
         sign_date: Data de assinatura
         signature: Assinatura
-        signature_name: nome da assinatura
         slogan: Slogan
         slug: Lesma de URL
         start_date: Data de início
@@ -37,13 +37,11 @@ pt-BR:
         date: Data
         link: Link
         title: Título
-        weight: Peso
       conference_partner:
         link: Link
         logo: Logo
         name: Nome
         partner_type: Tipo de parceiro
-        weight: Peso
       conference_registration_invite:
         email: E-mail
         name: Nome
@@ -53,7 +51,6 @@ pt-BR:
         description: Descrição
         price: Preço
         title: Título
-        weight: Peso
       conference_speaker:
         affiliation: Afiliação
         avatar: Avatar
@@ -131,8 +128,6 @@ pt-BR:
         edit:
           title: Atualize o usuário da conferência.
           update: Atualizar
-        index:
-          conference_admins_title: usuários da conferência
         new:
           create: Crio
           title: Novo usuário da conferência.
@@ -410,7 +405,7 @@ pt-BR:
         program_meeting:
           content: Conteúdo
           location: Localização
-          speakers: Alto-falantes
+          speakers: caixas de som
           streaming: Transmissão
         show:
           day: Dia
diff --git a/decidim-conferences/config/locales/pt.yml b/decidim-conferences/config/locales/pt.yml
index c06deda2ab8b1..aa573940724b4 100644
--- a/decidim-conferences/config/locales/pt.yml
+++ b/decidim-conferences/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -28,7 +29,6 @@ pt:
         show_statistics: Mostrar estatísticas
         sign_date: Data de assinatura
         signature: Assinatura
-        signature_name: nome da assinatura
         slogan: Slogan
         slug: Campo de dados dinâmicos de URL
         start_date: Data de início
@@ -37,13 +37,11 @@ pt:
         date: Datas
         link: Hiperligação
         title: Título
-        weight: Peso
       conference_partner:
         link: Hiperligação
         logo: Logótipo
         name: Nome
         partner_type: Tipo de parceiro
-        weight: Peso
       conference_registration_invite:
         email: E-Mail
         name: Nome
@@ -53,7 +51,6 @@ pt:
         description: Descrição
         price: Preço
         title: Título
-        weight: Peso
       conference_speaker:
         affiliation: Afiliação
         avatar: Avatar
@@ -131,8 +128,6 @@ pt:
         edit:
           title: Atualizar administrador da conferência.
           update: Atualizar
-        index:
-          conference_admins_title: administradores da conferência
         new:
           create: Criar
           title: Novo administrador da conferência.
diff --git a/decidim-conferences/config/locales/ro-RO.yml b/decidim-conferences/config/locales/ro-RO.yml
index 8e44c3a1287ba..16e7d76646ef4 100644
--- a/decidim-conferences/config/locales/ro-RO.yml
+++ b/decidim-conferences/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ ro:
         show_statistics: Arată statistici
         sign_date: Data semnării
         signature: Semnătură
-        signature_name: numele semnăturii
+        signature_name: Nume semnătură
         slogan: Slogan
         slug: URL slug
         start_date: Data de început
@@ -37,13 +38,13 @@ ro:
         date: Dată
         link: Link
         title: Titlu
-        weight: Ordinea în poziționare
+        weight: Poziție
       conference_partner:
         link: Link
         logo: Logo
         name: Nume
         partner_type: Tipul partenerului
-        weight: Ordinea în poziționare
+        weight: Poziție
       conference_registration_invite:
         email: E-mail
         name: Nume
@@ -53,13 +54,15 @@ ro:
         description: Descriere
         price: PreÈ›
         title: Titlu
-        weight: Ordinea în poziționare
+        weight: Poziție
       conference_speaker:
         affiliation: Afiliere
         avatar: Avatar
         conference_meeting_ids: Întâlniri asociate
         full_name: Numele complet
+        personal_url: URL personal
         position: Poziție
+        short_bio: Biografie scurtă
         twitter_handle: Responsabil Twitter
         user_id: Utilizator
       conference_user_role:
@@ -135,7 +138,7 @@ ro:
           title: Actualizează administratorul conferinţei.
           update: Actualizare
         index:
-          conference_admins_title: administratori ai conferinței
+          conference_admins_title: Administratori ai conferinţei
         new:
           create: Creează
           title: Admin de conferință nouă.
@@ -247,7 +250,7 @@ ro:
             price: PreÈ›
             registrations_count: Numărul de înregistrări
             title: Titlu
-            weight: Ordinea în poziționare
+            weight: Poziție
           name: Tip de înregistrare
       partners:
         create:
@@ -313,6 +316,7 @@ ro:
           update: "%{user_name} a actualizat vorbitorul %{resource_name} în conferința %{space_name}"
         registration_type:
           create: "%{user_name} a creat tipul de înregistrare %{resource_name} în conferința %{space_name}"
+          delete: "%{user_name} a eliminat tipul de înregistrare %{resource_name} din conferința %{space_name}"
           publish: "%{user_name} a publicat tipul de înregistrare %{resource_name} în conferința %{space_name}"
           unpublish: "%{user_name} nu a publicat tipul de înregistrare %{resource_name} în conferința %{space_name}"
           update: "%{user_name} a actualizat tipul de înregistrare %{resource_name} în conferința %{space_name}"
@@ -382,6 +386,7 @@ ro:
           invite:
             decline: Refuzați invitația '%{conference_title}'
             invited_existing_user_to_join_a_conference: "%{invited_by} te-a invitat să participi la o conferință la %{application}. Puteți să o refuzați sau să o acceptați prin intermediul linkurilor de mai jos."
+            invited_user_to_join_a_conference: "%{invited_by} te-a invitat să te alături unei conferințe la %{application}. Poți să o accepți prin link-ul de mai jos."
             registration: ÃŽnregistrare pentru '%{conference_title}'
         partners:
           index:
@@ -413,7 +418,7 @@ ro:
       conference_program:
         program_meeting:
           content: Conținut
-          location: Locaţie
+          location: Locație
           speakers: Vorbitori
           streaming: Streaming
         show:
@@ -432,9 +437,11 @@ ro:
         create:
           invalid: A apărut o problemă la această conferință.
           success: V-aţi alăturat cu succes conferinţei.
+          unauthorized: Trebuie să te autentifici înainte de a te înregistra la conferință.
         decline_invitation:
           invalid: A existat o problemă la refuzarea invitaţiei.
           success: Ați refuzat cu succes invitația.
+          unauthorized: Trebuie să te autentifici înainte de a refuza invitația.
         destroy:
           invalid: A apărut o problemă la ieşirea din această conferinţă.
           success: Aţi părăsit cu succes conferinţa.
diff --git a/decidim-conferences/config/locales/sk.yml b/decidim-conferences/config/locales/sk.yml
index 608a7427c9990..a6a3900680ddf 100644
--- a/decidim-conferences/config/locales/sk.yml
+++ b/decidim-conferences/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ sk:
         slogan: Slogan
         slug: URL krátky odkaz
         title: Názov
-      conference_media_link:
-        weight: Váha
-      conference_partner:
-        weight: Váha
-      conference_registration_type:
-        weight: Váha
       conference_speaker:
         full_name: Meno a priezvisko
       conference_user_role:
@@ -105,8 +100,6 @@ sk:
         edit:
           title: Aktualizovať administrátora konferencie.
           update: Aktualizovať
-        index:
-          conference_admins_title: administrátori konferencie
         new:
           create: Vytvoriť
           title: Nový administrátor konferencie.
@@ -380,7 +373,6 @@ sk:
       conference_program:
         program_meeting:
           content: Obsah
-          location: Miesto
           speakers: Re�níci
           streaming: Streamovanie
         show:
diff --git a/decidim-conferences/config/locales/sl.yml b/decidim-conferences/config/locales/sl.yml
index bdf7cd23eea34..e49b6de6720a7 100644
--- a/decidim-conferences/config/locales/sl.yml
+++ b/decidim-conferences/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-conferences/config/locales/sr-CS.yml b/decidim-conferences/config/locales/sr-CS.yml
index 1a0dbd6ec52b6..649c2339b6b2b 100644
--- a/decidim-conferences/config/locales/sr-CS.yml
+++ b/decidim-conferences/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     admin:
diff --git a/decidim-conferences/config/locales/sv.yml b/decidim-conferences/config/locales/sv.yml
index 4d35586498484..0ac5fb8264db1 100644
--- a/decidim-conferences/config/locales/sv.yml
+++ b/decidim-conferences/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -28,7 +29,7 @@ sv:
         show_statistics: Visa statistik
         sign_date: Underskriftsdatum
         signature: Underskrift
-        signature_name: signaturnamn
+        signature_name: Signaturnamn
         slogan: Slogan
         slug: URL-slug
         start_date: Startdatum
@@ -37,13 +38,13 @@ sv:
         date: Datum
         link: Länk
         title: Titel
-        weight: Vikt
+        weight: Ordning
       conference_partner:
         link: Länk
         logo: Logga
         name: Namn
         partner_type: Typ av partner
-        weight: Vikt
+        weight: Ordning
       conference_registration_invite:
         email: E-post
         name: Namn
@@ -53,12 +54,13 @@ sv:
         description: Beskrivning
         price: Pris
         title: Titel
-        weight: Vikt
+        weight: Ordning
       conference_speaker:
         affiliation: Anknytning
         avatar: Avatar
         conference_meeting_ids: Relaterade möten
         full_name: Fullständigt namn
+        personal_url: Personlig URL
         position: Plats
         twitter_handle: Twitternamn
         user_id: Användare
@@ -131,8 +133,6 @@ sv:
         edit:
           title: Uppdatera konferensadministratör.
           update: Uppdatera
-        index:
-          conference_admins_title: konferensadministratörer
         new:
           create: Skapa
           title: Ny konferensadministratör.
diff --git a/decidim-conferences/config/locales/tr-TR.yml b/decidim-conferences/config/locales/tr-TR.yml
index 831a385fad612..4ee132db74e9f 100644
--- a/decidim-conferences/config/locales/tr-TR.yml
+++ b/decidim-conferences/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ tr:
         slogan: Slogan
         slug: URL özel bilgisi
         title: Başlık
-      conference_media_link:
-        weight: Ağırlık
-      conference_partner:
-        weight: Ağırlık
-      conference_registration_type:
-        weight: Ağırlık
       conference_speaker:
         full_name: Ad Soyad
       conference_user_role:
@@ -99,8 +94,6 @@ tr:
         edit:
           title: Konferans yöneticisi güncelle.
           update: Güncelle
-        index:
-          conference_admins_title: konferans yöneticileri
         new:
           create: OluÅŸtur
           title: Yeni konferans yöneticisi
@@ -372,8 +365,7 @@ tr:
       conference_program:
         program_meeting:
           content: içerik
-          location: yer
-          speakers: Hoparlörler
+          speakers: Konuşmacılar
           streaming: Yayın Akışı
         show:
           day: Gün
@@ -411,7 +403,7 @@ tr:
           go_to_twitter: Twitter'a git
       conference_speakers:
         index:
-          speakers: Hoparlörler
+          speakers: Konuşmacılar
       conferences:
         partners:
           collaborators: Ortaklar
diff --git a/decidim-conferences/config/locales/zh-CN.yml b/decidim-conferences/config/locales/zh-CN.yml
index 50c0311b9d13b..d91fd27823e8b 100644
--- a/decidim-conferences/config/locales/zh-CN.yml
+++ b/decidim-conferences/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -22,12 +23,6 @@ zh-CN:
         slogan: 斯洛根文
         slug: URL �称
         title: 标题
-      conference_media_link:
-        weight: ��
-      conference_partner:
-        weight: ��
-      conference_registration_type:
-        weight: ��
       conference_speaker:
         full_name: 全�
       conference_user_role:
@@ -96,8 +91,6 @@ zh-CN:
         edit:
           title: 更新会议管�员。
           update: æ›´æ–°
-        index:
-          conference_admins_title: 会议管�员
         new:
           create: 创建
           title: 新的会议管�员。
@@ -368,7 +361,6 @@ zh-CN:
       conference_program:
         program_meeting:
           content: 内容
-          location: 地点
           speakers: �言者：
           streaming: ��
         show:
diff --git a/decidim-conferences/decidim-conferences.gemspec b/decidim-conferences/decidim-conferences.gemspec
index f98345dff5817..9a54a2f201739 100644
--- a/decidim-conferences/decidim-conferences.gemspec
+++ b/decidim-conferences/decidim-conferences.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["isaac.mg@coditramuntana.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-conferences"
   s.summary = "Decidim conferences module"
diff --git a/decidim-conferences/lib/decidim/conferences/admin_engine.rb b/decidim-conferences/lib/decidim/conferences/admin_engine.rb
index 5c8549a407401..99239dbbb0542 100644
--- a/decidim-conferences/lib/decidim/conferences/admin_engine.rb
+++ b/decidim-conferences/lib/decidim/conferences/admin_engine.rb
@@ -64,6 +64,7 @@ class AdminEngine < ::Rails::Engine
             resources :imports, only: [:new, :create] do
               get :example, on: :collection
             end
+            resources :reminders, only: [:new, :create]
           end
 
           resources :moderations do
diff --git a/decidim-conferences/lib/decidim/conferences/participatory_space.rb b/decidim-conferences/lib/decidim/conferences/participatory_space.rb
index c04b78b8a55a6..171be3f98ad47 100644
--- a/decidim-conferences/lib/decidim/conferences/participatory_space.rb
+++ b/decidim-conferences/lib/decidim/conferences/participatory_space.rb
@@ -64,13 +64,13 @@
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
           metadata: nil
         ), # Keep after organization
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -99,8 +99,8 @@
         user.update!(
           name: Faker::Name.name,
           nickname: Faker::Twitter.unique.screen_name,
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           organization: organization,
           confirmed_at: Time.current,
           locale: I18n.default_locale,
@@ -126,7 +126,7 @@
         attachment_collection: attachment_collection,
         attached_to: conference,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -139,7 +139,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
@@ -152,7 +152,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -193,7 +193,7 @@
             link: Faker::Internet.url,
             partner_type: type,
             conference: conference,
-            logo: ActiveStorage::Blob.create_after_upload!(
+            logo: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(seeds_root, "logo.png")),
               filename: "logo.png",
               content_type: "image/png",
diff --git a/decidim-conferences/lib/decidim/conferences/test/factories.rb b/decidim-conferences/lib/decidim/conferences/test/factories.rb
index 664d6aefe200f..6af3b7db5a1b6 100644
--- a/decidim-conferences/lib/decidim/conferences/test/factories.rb
+++ b/decidim-conferences/lib/decidim/conferences/test/factories.rb
@@ -58,6 +58,7 @@
     end
 
     organization { conference.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :conference_user_role,
@@ -73,6 +74,7 @@
     end
 
     organization { conference.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :conference_user_role,
@@ -88,6 +90,7 @@
     end
 
     organization { conference.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :conference_user_role,
@@ -103,6 +106,7 @@
     end
 
     organization { conference.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :conference_user_role,
@@ -210,7 +214,7 @@
   factory :conference_invite, class: "Decidim::Conferences::ConferenceInvite" do
     conference
     user
-    sent_at { Time.current - 1.day }
+    sent_at { 1.day.ago }
     accepted_at { nil }
     rejected_at { nil }
     registration_type
diff --git a/decidim-conferences/lib/decidim/conferences/version.rb b/decidim-conferences/lib/decidim/conferences/version.rb
index 14c59ee66df4f..10a082c04376c 100644
--- a/decidim-conferences/lib/decidim/conferences/version.rb
+++ b/decidim-conferences/lib/decidim/conferences/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-conferences/spec/commands/copy_conference_spec.rb b/decidim-conferences/spec/commands/copy_conference_spec.rb
index f7c3229df73b5..27df86bc5ffee 100644
--- a/decidim-conferences/spec/commands/copy_conference_spec.rb
+++ b/decidim-conferences/spec/commands/copy_conference_spec.rb
@@ -42,7 +42,7 @@ module Decidim::Conferences
 
     context "when everything is ok" do
       it "duplicates an conference" do
-        expect { subject.call }.to change { Decidim::Conference.count }.by(1)
+        expect { subject.call }.to change(Decidim::Conference, :count).by(1)
 
         old_conference = Decidim::Conference.first
         new_conference = Decidim::Conference.last
@@ -71,7 +71,7 @@ module Decidim::Conferences
       let(:copy_categories) { true }
 
       it "duplicates a conference and the categories" do
-        expect { subject.call }.to change { Decidim::Category.count }.by(1)
+        expect { subject.call }.to change(Decidim::Category, :count).by(1)
         expect(Decidim::Category.unscoped.distinct.pluck(:decidim_participatory_space_id).count).to eq 2
 
         old_conference_category = Decidim::Category.unscoped.first
@@ -89,9 +89,9 @@ module Decidim::Conferences
       it "duplicates an conference and the components" do
         dummy_hook = proc {}
         component.manifest.on :copy, &dummy_hook
-        expect(dummy_hook).to receive(:call).with(new_component: an_instance_of(Decidim::Component), old_component: component)
+        expect(dummy_hook).to receive(:call).with({ new_component: an_instance_of(Decidim::Component), old_component: component })
 
-        expect { subject.call }.to change { Decidim::Component.count }.by(1)
+        expect { subject.call }.to change(Decidim::Component, :count).by(1)
 
         last_conference = Decidim::Conference.last
         last_component = Decidim::Component.all.reorder(:id).last
diff --git a/decidim-conferences/spec/commands/create_conference_speaker_spec.rb b/decidim-conferences/spec/commands/create_conference_speaker_spec.rb
index 5beb2b9bc2f24..450fbe21e528a 100644
--- a/decidim-conferences/spec/commands/create_conference_speaker_spec.rb
+++ b/decidim-conferences/spec/commands/create_conference_speaker_spec.rb
@@ -22,7 +22,7 @@ module Decidim::Conferences
     end
     let(:meeting_ids) { meetings.map(&:id) }
     let(:avatar) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("avatar.jpg")),
         filename: "avatar.jpeg",
         content_type: "image/jpeg"
@@ -73,7 +73,7 @@ module Decidim::Conferences
 
       context "when image is invalid" do
         let(:avatar) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("invalid.jpeg")),
             filename: "avatar.jpeg",
             content_type: "image/jpeg"
@@ -91,7 +91,7 @@ module Decidim::Conferences
       let(:conference_speaker) { Decidim::ConferenceSpeaker.last }
 
       it "creates an conference" do
-        expect { subject.call }.to change { Decidim::ConferenceSpeaker.count }.by(1)
+        expect { subject.call }.to change(Decidim::ConferenceSpeaker, :count).by(1)
       end
 
       it "broadcasts ok" do
@@ -114,6 +114,11 @@ module Decidim::Conferences
         expect(action_log.version).to be_present
       end
 
+      it "sets the avatar" do
+        subject.call
+        expect(conference_speaker.avatar.blob).to be_a(ActiveStorage::Blob)
+      end
+
       context "with an existing user in the platform" do
         let!(:user) { create(:user, organization: conference.organization) }
         let!(:user_id) { user.id }
diff --git a/decidim-conferences/spec/commands/create_conference_spec.rb b/decidim-conferences/spec/commands/create_conference_spec.rb
index ef5e2bec104b3..e0a67d4b66371 100644
--- a/decidim-conferences/spec/commands/create_conference_spec.rb
+++ b/decidim-conferences/spec/commands/create_conference_spec.rb
@@ -32,6 +32,9 @@ module Decidim::Conferences
         consultation: consultation
       )
     end
+    let(:related_process_ids) { [participatory_processes.map(&:id)] }
+    let(:related_consultation_ids) { questions.collect(&:consultation).uniq }
+
     let(:form) do
       instance_double(
         Admin::ConferenceForm,
@@ -58,9 +61,9 @@ module Decidim::Conferences
         registrations_enabled: false,
         available_slots: 0,
         registration_terms: { en: "registrations terms" },
-        participatory_processes_ids: participatory_processes.map(&:id),
+        participatory_processes_ids: related_process_ids,
         assemblies_ids: assemblies.map(&:id),
-        consultations_ids: questions.collect(&:consultation).uniq
+        consultations_ids: related_consultation_ids
       )
     end
     let(:invalid) { false }
@@ -80,15 +83,15 @@ module Decidim::Conferences
           persisted?: false,
           valid?: false,
           errors: {
-            hero_image: "Image too big",
-            banner_image: "Image too big"
+            hero_image: "File resolution is too large",
+            banner_image: "File resolution is too large"
           }
         ).as_null_object
       end
 
       before do
         allow(Decidim::ActionLogger).to receive(:log).and_return(true)
-        expect(Decidim::Conference).to receive(:create).and_return(invalid_conference)
+        allow(Decidim::Conference).to receive(:create).and_return(invalid_conference)
       end
 
       it "broadcasts invalid" do
@@ -96,8 +99,8 @@ module Decidim::Conferences
       end
 
       it "adds errors to the form" do
-        expect(errors).to receive(:add).with(:hero_image, "Image too big")
-        expect(errors).to receive(:add).with(:banner_image, "Image too big")
+        expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
+        expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
         subject.call
       end
     end
@@ -106,7 +109,7 @@ module Decidim::Conferences
       let(:conference) { Decidim::Conference.last }
 
       it "creates an conference" do
-        expect { subject.call }.to change { Decidim::Conference.count }.by(1)
+        expect { subject.call }.to change(Decidim::Conference, :count).by(1)
       end
 
       it "broadcasts ok" do
@@ -146,6 +149,46 @@ module Decidim::Conferences
         linked_consultations = conference.linked_participatory_space_resources("Consultations", "included_consultations")
         expect(linked_consultations).to match_array(questions.collect(&:consultation).uniq)
       end
+
+      context "when sorting linked_participatory_space_resources" do
+        let!(:process_one) { create :participatory_process, organization: organization, weight: 2 }
+        let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
+        let(:related_process_ids) { [process_one.id, process_two.id] }
+        let!(:consultation_one) { create :consultation, organization: organization }
+        let!(:consultation_two) { create :consultation, organization: organization }
+        let(:related_consultation_ids) { [consultation_one.id, consultation_two.id] }
+
+        it "sorts by created at" do
+          subject.call
+
+          linked_processes = conference.linked_participatory_space_resources("Consultations", "included_consultations")
+          expect(linked_processes.first).to eq(consultation_two)
+        end
+
+        it "sorts by weight" do
+          subject.call
+
+          linked_processes = conference.linked_participatory_space_resources(:participatory_process, "included_participatory_processes")
+          expect(linked_processes.first).to eq(process_two)
+        end
+      end
+
+      context "when linking unpublished linked_participatory_space_resources" do
+        let!(:process_one) { create :participatory_process, :unpublished, organization: organization, weight: 2 }
+        let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
+        let(:related_process_ids) { [process_one.id, process_two.id] }
+        let!(:consultation_one) { create :consultation, :unpublished, organization: organization }
+        let!(:consultation_two) { create :consultation, organization: organization }
+        let(:related_consultation_ids) { [consultation_one.id, consultation_two.id] }
+
+        it "does not include unpublished meetings" do
+          subject.call
+
+          linked_processes = conference.linked_participatory_space_resources("Consultations", "included_consultations")
+          expect(linked_processes.first).to eq(consultation_two)
+          expect(linked_processes.size).to eq(1)
+        end
+      end
     end
   end
 end
diff --git a/decidim-conferences/spec/commands/create_media_link_spec.rb b/decidim-conferences/spec/commands/create_media_link_spec.rb
index f1d5e880f4a81..b54b1e6aa14d1 100644
--- a/decidim-conferences/spec/commands/create_media_link_spec.rb
+++ b/decidim-conferences/spec/commands/create_media_link_spec.rb
@@ -14,10 +14,10 @@ module Decidim::Conferences
         invalid?: invalid,
         title: { en: "title" },
         attributes: {
-          title: { en: "title" },
-          weight: Faker::Number.between(from: 1, to: 10),
-          link: Faker::Internet.url,
-          date: 5.days.from_now
+          "title" => { en: "title" },
+          "weight" => Faker::Number.between(from: 1, to: 10),
+          "link" => Faker::Internet.url,
+          "date" => 5.days.from_now
         }
       )
     end
@@ -36,7 +36,7 @@ module Decidim::Conferences
       let(:media_link) { Decidim::Conferences::MediaLink.last }
 
       it "creates a media link" do
-        expect { subject.call }.to change { Decidim::Conferences::MediaLink.count }.by(1)
+        expect { subject.call }.to change(Decidim::Conferences::MediaLink, :count).by(1)
       end
 
       it "broadcasts ok" do
diff --git a/decidim-conferences/spec/commands/create_partner_spec.rb b/decidim-conferences/spec/commands/create_partner_spec.rb
index e72d79dd20b05..b4f2c6993c905 100644
--- a/decidim-conferences/spec/commands/create_partner_spec.rb
+++ b/decidim-conferences/spec/commands/create_partner_spec.rb
@@ -10,7 +10,7 @@ module Decidim::Conferences
     let(:user) { nil }
     let!(:current_user) { create :user, :confirmed, organization: conference.organization }
     let(:logo) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("avatar.jpg")),
         filename: "avatar.jpeg",
         content_type: "image/jpeg"
@@ -49,7 +49,7 @@ module Decidim::Conferences
 
       context "when image is invalid" do
         let(:logo) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("invalid.jpeg")),
             filename: "avatar.jpeg",
             content_type: "image/jpeg"
@@ -67,7 +67,7 @@ module Decidim::Conferences
       let(:partner) { Decidim::Conferences::Partner.last }
 
       it "creates a partner" do
-        expect { subject.call }.to change { Decidim::Conferences::Partner.count }.by(1)
+        expect { subject.call }.to change(Decidim::Conferences::Partner, :count).by(1)
       end
 
       it "broadcasts ok" do
@@ -82,7 +82,7 @@ module Decidim::Conferences
       it "traces the action", versioning: true do
         expect(Decidim.traceability)
           .to receive(:perform_action!)
-          .with(:create, Decidim::Conferences::Partner, current_user, participatory_space: { title: conference.title }, resource: { title: form.name })
+          .with(:create, Decidim::Conferences::Partner, current_user, { participatory_space: { title: conference.title }, resource: { title: form.name } })
           .and_call_original
 
         expect { subject.call }.to change(Decidim::ActionLog, :count)
diff --git a/decidim-conferences/spec/commands/create_registration_type.rb b/decidim-conferences/spec/commands/create_registration_type_spec.rb
similarity index 86%
rename from decidim-conferences/spec/commands/create_registration_type.rb
rename to decidim-conferences/spec/commands/create_registration_type_spec.rb
index af4673ee360fe..4def7f1374da4 100644
--- a/decidim-conferences/spec/commands/create_registration_type.rb
+++ b/decidim-conferences/spec/commands/create_registration_type_spec.rb
@@ -29,10 +29,10 @@ module Decidim::Conferences
         current_user: current_user,
         title: { en: "title" },
         attributes: {
-          title: { en: "title" },
-          weight: 1,
-          price: 300,
-          description: { en: "registration type description" }
+          "title" => { en: "title" },
+          "weight" => 1,
+          "price" => 300,
+          "description" => { en: "registration type description" }
         }
       )
     end
@@ -51,7 +51,7 @@ module Decidim::Conferences
       let(:registration_type) { Decidim::Conferences::RegistrationType.last }
 
       it "creates a registration type" do
-        expect { subject.call }.to change { Decidim::Conferences::RegistrationType.count }.by(1)
+        expect { subject.call }.to change(Decidim::Conferences::RegistrationType, :count).by(1)
       end
 
       it "broadcasts ok" do
@@ -66,7 +66,7 @@ module Decidim::Conferences
       it "traces the action", versioning: true do
         expect(Decidim.traceability)
           .to receive(:perform_action!)
-          .with(:create, Decidim::Conferences::RegistrationType, current_user, participatory_space: { title: conference.title }, resource: { title: form.title })
+          .with(:create, Decidim::Conferences::RegistrationType, current_user, { participatory_space: { title: conference.title }, resource: { title: form.title } })
           .and_call_original
 
         expect { subject.call }.to change(Decidim::ActionLog, :count)
diff --git a/decidim-conferences/spec/commands/update_conference_admin_spec.rb b/decidim-conferences/spec/commands/update_conference_admin_spec.rb
index 1592a00ceb4cc..cfa0526a5c2cc 100644
--- a/decidim-conferences/spec/commands/update_conference_admin_spec.rb
+++ b/decidim-conferences/spec/commands/update_conference_admin_spec.rb
@@ -68,7 +68,7 @@ module Decidim::Conferences
       it "traces the action", versioning: true do
         expect(Decidim.traceability)
           .to receive(:update!)
-          .with(user_role, current_user, { role: new_role }, resource: hash_including(:title))
+          .with(user_role, current_user, { role: new_role }, { resource: hash_including(:title) })
           .and_call_original
 
         expect { subject.call }.to change(Decidim::ActionLog, :count)
diff --git a/decidim-conferences/spec/commands/update_conference_speaker_spec.rb b/decidim-conferences/spec/commands/update_conference_speaker_spec.rb
index 0ba4cde96bca9..d95f2e9d18617 100644
--- a/decidim-conferences/spec/commands/update_conference_speaker_spec.rb
+++ b/decidim-conferences/spec/commands/update_conference_speaker_spec.rb
@@ -22,7 +22,7 @@ module Decidim::Conferences
     end
     let(:meeting_ids) { meetings.map(&:id) }
     let(:avatar) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("avatar.jpg")),
         filename: "avatar.jpeg",
         content_type: "image/jpeg"
@@ -73,7 +73,7 @@ module Decidim::Conferences
 
       context "when image is invalid" do
         let(:avatar) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("invalid.jpeg")),
             filename: "avatar.jpeg",
             content_type: "image/jpeg"
@@ -94,7 +94,7 @@ module Decidim::Conferences
         end.to change { conference_speaker.reload && conference_speaker.full_name }.from(conference_speaker.full_name).to("New name")
       end
 
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
@@ -109,6 +109,11 @@ module Decidim::Conferences
         expect(action_log.version).to be_present
       end
 
+      it "sets the avatar" do
+        subject.call
+        expect(conference_speaker.avatar.blob).to be_a(ActiveStorage::Blob)
+      end
+
       it "links meetings" do
         subject.call
 
diff --git a/decidim-conferences/spec/commands/update_conference_spec.rb b/decidim-conferences/spec/commands/update_conference_spec.rb
index 836c661fe3d9e..bc1fc1651bce3 100644
--- a/decidim-conferences/spec/commands/update_conference_spec.rb
+++ b/decidim-conferences/spec/commands/update_conference_spec.rb
@@ -87,7 +87,7 @@ module Decidim::Conferences
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -104,10 +104,10 @@ module Decidim::Conferences
 
       describe "when the conference is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(false)
+          allow(form).to receive(:invalid?).and_return(false)
           expect(my_conference).to receive(:valid?).at_least(:once).and_return(false)
-          my_conference.errors.add(:hero_image, "Image too big")
-          my_conference.errors.add(:banner_image, "Image too big")
+          my_conference.errors.add(:hero_image, "File resolution is too large")
+          my_conference.errors.add(:banner_image, "File resolution is too large")
         end
 
         it "broadcasts invalid" do
@@ -284,7 +284,7 @@ module Decidim::Conferences
           end
 
           it "schedules a upcoming conference notification job 48h before start time" do
-            expect(UpcomingConferenceNotificationJob)
+            allow(UpcomingConferenceNotificationJob)
               .to receive(:generate_checksum).and_return "1234"
 
             expect(UpcomingConferenceNotificationJob)
diff --git a/decidim-conferences/spec/commands/update_diploma_spec.rb b/decidim-conferences/spec/commands/update_diploma_spec.rb
index bed47543c873a..4d41fdf4b4784 100644
--- a/decidim-conferences/spec/commands/update_diploma_spec.rb
+++ b/decidim-conferences/spec/commands/update_diploma_spec.rb
@@ -12,8 +12,8 @@ module Decidim::Conferences
         {
           conference: {
             id: my_conference.id,
-            main_logo: fixture_file_upload(Decidim::Dev.asset("avatar.jpg"), "image/jpeg"),
-            signature: fixture_file_upload(Decidim::Dev.asset("avatar.jpg"), "image/jpeg"),
+            main_logo: upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")),
+            signature: upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")),
             sign_date: 5.days.from_now,
             signature_name: "Signature name",
             errors: my_conference.errors
@@ -34,7 +34,7 @@ module Decidim::Conferences
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
diff --git a/decidim-conferences/spec/commands/update_media_link_spec.rb b/decidim-conferences/spec/commands/update_media_link_spec.rb
index e56bf06bbe75c..3da1a1046ad2f 100644
--- a/decidim-conferences/spec/commands/update_media_link_spec.rb
+++ b/decidim-conferences/spec/commands/update_media_link_spec.rb
@@ -17,10 +17,10 @@ module Decidim::Conferences
         current_user: current_user,
         title: { en: "New title" },
         attributes: {
-          title: { en: "New title" },
-          weight: media_link.weight,
-          link: media_link.link,
-          date: 7.days.from_now
+          "title" => { en: "New title" },
+          "weight" => media_link.weight,
+          "link" => media_link.link,
+          "date" => 7.days.from_now
         }
       )
     end
@@ -41,7 +41,7 @@ module Decidim::Conferences
         end.to change { media_link.reload && media_link.title }.from(media_link.title).to("en" => "New title", "machine_translations" => kind_of(Hash))
       end
 
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
diff --git a/decidim-conferences/spec/commands/update_partner_spec.rb b/decidim-conferences/spec/commands/update_partner_spec.rb
index 659471ebfec7b..35506286a4ced 100644
--- a/decidim-conferences/spec/commands/update_partner_spec.rb
+++ b/decidim-conferences/spec/commands/update_partner_spec.rb
@@ -11,7 +11,7 @@ module Decidim::Conferences
     let(:partner) { create :partner, :main_promotor, conference: conference }
     let!(:current_user) { create :user, :confirmed, organization: conference.organization }
     let(:logo) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("avatar.jpg")),
         filename: "avatar.jpeg",
         content_type: "image/jpeg"
@@ -48,7 +48,7 @@ module Decidim::Conferences
 
       context "when image is invalid" do
         let(:logo) do
-          ActiveStorage::Blob.create_after_upload!(
+          ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("invalid.jpeg")),
             filename: "invalid.jpeg",
             content_type: "image/jpeg"
@@ -75,7 +75,7 @@ module Decidim::Conferences
         end.to change { partner.reload && partner.partner_type }.from(partner.partner_type).to("collaborator")
       end
 
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
diff --git a/decidim-conferences/spec/commands/update_registration_type_spec.rb b/decidim-conferences/spec/commands/update_registration_type_spec.rb
index a34a2e1b1b888..d01518b93fd3d 100644
--- a/decidim-conferences/spec/commands/update_registration_type_spec.rb
+++ b/decidim-conferences/spec/commands/update_registration_type_spec.rb
@@ -26,9 +26,9 @@ module Decidim::Conferences
         current_user: current_user,
         title: { en: "New title" },
         attributes: {
-          title: { en: "New title" },
-          weight: 2,
-          description: { en: "New description" }
+          "title" => { en: "New title" },
+          "weight" => 2,
+          "description" => { en: "New description" }
         }
       )
     end
@@ -56,7 +56,7 @@ module Decidim::Conferences
         end.to change { registration_type.reload && registration_type.description }.from(registration_type.description).to("en" => "New description", "machine_translations" => kind_of(Hash))
       end
 
-      it "broadcasts  ok" do
+      it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
 
diff --git a/decidim-conferences/spec/controllers/exports_controller_spec.rb b/decidim-conferences/spec/controllers/admin/exports_controller_spec.rb
similarity index 75%
rename from decidim-conferences/spec/controllers/exports_controller_spec.rb
rename to decidim-conferences/spec/controllers/admin/exports_controller_spec.rb
index f110bed28e939..07f3862417af7 100644
--- a/decidim-conferences/spec/controllers/exports_controller_spec.rb
+++ b/decidim-conferences/spec/controllers/admin/exports_controller_spec.rb
@@ -47,6 +47,18 @@ module Admin
             end
           end
         end
+
+        it "traces the action", versioning: true do
+          expect(Decidim.traceability)
+            .to receive(:perform_action!)
+            .with("export_component", component, user, { name: "dummies", format: "json" })
+            .and_call_original
+
+          expect { post(:create, params: params) }.to change(Decidim::ActionLog, :count)
+          action_log = Decidim::ActionLog.last
+          expect(action_log.action).to eq("export_component")
+          expect(action_log.version).to be_present
+        end
       end
     end
   end
diff --git a/decidim-conferences/spec/controllers/conference_speakers_controller_spec.rb b/decidim-conferences/spec/controllers/conference_speakers_controller_spec.rb
index 436c3c1d6d750..ed74b5d792ff2 100644
--- a/decidim-conferences/spec/controllers/conference_speakers_controller_spec.rb
+++ b/decidim-conferences/spec/controllers/conference_speakers_controller_spec.rb
@@ -30,15 +30,15 @@ module Conferences
         end
 
         context "when conference has speakers" do
-          let!(:speaker_1) { create(:conference_speaker, conference: conference) }
-          let!(:speaker_2) { create(:conference_speaker, conference: conference) }
+          let!(:speaker1) { create(:conference_speaker, conference: conference) }
+          let!(:speaker2) { create(:conference_speaker, conference: conference) }
           let!(:non_speaker) { create(:conference_speaker) }
 
           context "when user has permissions" do
             it "displays list of speakers" do
               get :index, params: { conference_slug: conference.slug }
 
-              expect(controller.helpers.collection).to match_array([speaker_1, speaker_2])
+              expect(controller.helpers.collection).to match_array([speaker1, speaker2])
             end
           end
 
diff --git a/decidim-conferences/spec/forms/conference_form_spec.rb b/decidim-conferences/spec/forms/conference_form_spec.rb
index 653a1bb55a5e5..01b89d2a4485e 100644
--- a/decidim-conferences/spec/forms/conference_form_spec.rb
+++ b/decidim-conferences/spec/forms/conference_form_spec.rb
@@ -38,8 +38,7 @@ module Admin
           }
         end
         let(:slug) { "slug" }
-        let(:fixture_file) { File.open(Decidim::Dev.asset("city.jpeg")) }
-        let(:attachment) { fixture_file_upload(fixture_file, "image/jpeg") }
+        let(:attachment) { upload_test_file(Decidim::Dev.asset("city.jpeg")) }
         let(:show_statistics) { true }
         let(:registrations_enabled) { false }
         let(:available_slots) { 20 }
@@ -88,23 +87,12 @@ module Admin
           it { is_expected.to be_valid }
         end
 
-        context "when hero_image is too big" do
+        context "when attachment (hero_image or banner_image) is too big" do
           before do
             organization.settings.tap do |settings|
               settings.upload.maximum_file_size.default = 5
             end
-            expect(subject.hero_image).to receive(:size).twice.and_return(6.megabytes)
-          end
-
-          it { is_expected.not_to be_valid }
-        end
-
-        context "when banner_image is too big" do
-          before do
-            organization.settings.tap do |settings|
-              settings.upload.maximum_file_size.default = 5
-            end
-            expect(subject.banner_image).to receive(:size).twice.and_return(6.megabytes)
+            ActiveStorage::Blob.find_signed(attachment).update(byte_size: 6.megabytes)
           end
 
           it { is_expected.not_to be_valid }
diff --git a/decidim-conferences/spec/forms/conference_speaker_form_spec.rb b/decidim-conferences/spec/forms/conference_speaker_form_spec.rb
index 382d669a8e5d4..481cb2a6f2ee7 100644
--- a/decidim-conferences/spec/forms/conference_speaker_form_spec.rb
+++ b/decidim-conferences/spec/forms/conference_speaker_form_spec.rb
@@ -44,7 +44,7 @@ module Admin
         let(:short_bio) { Decidim::Faker::Localized.sentence }
         let(:twitter_handle) { "full_name" }
         let(:personal_url) { "http://decidim.org" }
-        let(:avatar) { fixture_file_upload(File.open(Decidim::Dev.asset("city.jpeg")), "image/jpeg") }
+        let(:avatar) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:existing_user) { false }
         let(:user_id) { nil }
         let(:attributes) do
@@ -118,13 +118,13 @@ module Admin
           context "when the user does not exist" do
             let(:user_id) { 999_999 }
 
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
 
           context "when the user is from another organization" do
             let(:user_id) { create(:user).id }
 
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
         end
       end
diff --git a/decidim-conferences/spec/forms/conference_user_role_form_spec.rb b/decidim-conferences/spec/forms/conference_user_role_form_spec.rb
index 033e30c03eb54..06d834b202d63 100644
--- a/decidim-conferences/spec/forms/conference_user_role_form_spec.rb
+++ b/decidim-conferences/spec/forms/conference_user_role_form_spec.rb
@@ -26,7 +26,7 @@ module Admin
         end
 
         context "when email is missing" do
-          let(:email) {}
+          let(:email) { nil }
 
           it { is_expected.to be_invalid }
         end
diff --git a/decidim-conferences/spec/forms/partner_form_spec.rb b/decidim-conferences/spec/forms/partner_form_spec.rb
index 367823dadbe5f..6ad275a857f96 100644
--- a/decidim-conferences/spec/forms/partner_form_spec.rb
+++ b/decidim-conferences/spec/forms/partner_form_spec.rb
@@ -18,7 +18,7 @@ module Admin
         let(:name) { "Name" }
         let(:weight) { 1 }
         let(:link) { "http://decidim.org" }
-        let(:logo) { fixture_file_upload(File.open(Decidim::Dev.asset("avatar.jpg")), "image/jpeg") }
+        let(:logo) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
         let(:partner_type) { "main_promotor" }
         let(:attributes) do
           {
diff --git a/decidim-conferences/spec/forms/registration_type_form_spec.rb b/decidim-conferences/spec/forms/registration_type_form_spec.rb
index 676323292a798..9525e40f4ddce 100644
--- a/decidim-conferences/spec/forms/registration_type_form_spec.rb
+++ b/decidim-conferences/spec/forms/registration_type_form_spec.rb
@@ -91,7 +91,9 @@ module Admin
         context "when price is not number" do
           let(:price) { "blabla" }
 
-          it { is_expected.to be_invalid }
+          # The value is cast to the correct type so "blabla" becomes 0.0 which
+          # is valid.
+          it { is_expected.to be_valid }
         end
       end
     end
diff --git a/decidim-conferences/spec/jobs/decidim/conferences/admin/send_conference_diploma_job_spec.rb b/decidim-conferences/spec/jobs/decidim/conferences/admin/send_conference_diploma_job_spec.rb
index 83aafd0ea12f5..5549a2b5491c9 100644
--- a/decidim-conferences/spec/jobs/decidim/conferences/admin/send_conference_diploma_job_spec.rb
+++ b/decidim-conferences/spec/jobs/decidim/conferences/admin/send_conference_diploma_job_spec.rb
@@ -18,7 +18,7 @@
     let(:mailer) { double :mailer }
 
     it "send an email to user" do
-      expect(Decidim::Conferences::Admin::SendConferenceDiplomaMailer)
+      allow(Decidim::Conferences::Admin::SendConferenceDiplomaMailer)
         .to receive(:diploma)
         .with(conference, conference_registration.user)
         .and_return(mailer)
diff --git a/decidim-conferences/spec/lib/components/conferences/current_component_spec.rb b/decidim-conferences/spec/lib/components/conferences/current_component_spec.rb
index 2ea253b8b0d20..5687dd2cc1051 100644
--- a/decidim-conferences/spec/lib/components/conferences/current_component_spec.rb
+++ b/decidim-conferences/spec/lib/components/conferences/current_component_spec.rb
@@ -6,21 +6,19 @@ module Decidim
   module Conferences
     describe CurrentComponent do
       let(:request) { double(params: params, env: env) }
-      let(:subject) { described_class.new(manifest) }
       let(:params) { {} }
       let(:manifest) { Decidim.find_component_manifest("dummy") }
-
       let(:organization) do
         create(:organization)
       end
-
       let(:current_conference) { create(:conference, organization: organization) }
       let(:other_conference) { create(:conference, organization: organization) }
-
       let(:env) do
         { "decidim.current_organization" => organization }
       end
 
+      subject { described_class.new(manifest) }
+
       context "when the params contain an conference id" do
         before do
           params["conference_slug"] = current_conference.id.to_s
@@ -28,7 +26,7 @@ module Conferences
 
         context "when the params don't contain a component id" do
           it "doesn't match" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -41,7 +39,7 @@ module Conferences
             let(:component) { create(:component, participatory_space: other_conference) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(false)
+              expect(subject.matches?(request)).to be(false)
             end
           end
 
@@ -49,7 +47,7 @@ module Conferences
             let(:component) { create(:component, participatory_space: current_conference) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(true)
+              expect(subject.matches?(request)).to be(true)
             end
           end
         end
diff --git a/decidim-conferences/spec/mailers/decidim/conferences/admin/send_conference_diploma_mailer_spec.rb b/decidim-conferences/spec/mailers/decidim/conferences/admin/send_conference_diploma_mailer_spec.rb
index edefd8a372cfa..fb9bfa9f32d77 100644
--- a/decidim-conferences/spec/mailers/decidim/conferences/admin/send_conference_diploma_mailer_spec.rb
+++ b/decidim-conferences/spec/mailers/decidim/conferences/admin/send_conference_diploma_mailer_spec.rb
@@ -14,11 +14,11 @@ module Decidim::Conferences
     let(:mail) { described_class.diploma(conference, user) }
 
     describe "diploma" do
-      let(:subject) { "has been sent" }
+      let(:mail_subject) { "has been sent" }
       let(:body) { "in the attachment" }
 
       it "expect subject and body" do
-        expect(mail.subject).to include(subject)
+        expect(mail.subject).to include(mail_subject)
         expect(mail.body.encoded).to match(body)
       end
     end
diff --git a/decidim-conferences/spec/permissions/decidim/conferences/permissions_spec.rb b/decidim-conferences/spec/permissions/decidim/conferences/permissions_spec.rb
index e999b4ef98bb6..7e3f7ba4ef73e 100644
--- a/decidim-conferences/spec/permissions/decidim/conferences/permissions_spec.rb
+++ b/decidim-conferences/spec/permissions/decidim/conferences/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:organization) { create :organization }
   let(:conference) { create :conference, organization: organization }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:conference_admin) { create :conference_admin, conference: conference }
   let(:conference_collaborator) { create :conference_collaborator, conference: conference }
   let(:conference_moderator) { create :conference_moderator, conference: conference }
@@ -18,11 +18,11 @@
   shared_examples "access for role" do |access|
     case access
     when true
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     when :not_set
       it_behaves_like "permission is not set"
     else
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -72,6 +72,23 @@
       )
     end
 
+    context "when accessing global moderation" do
+      subject { Decidim::Admin::Permissions.new(user, permission_action, context).permissions.allowed? }
+
+      let(:action) do
+        { scope: :admin, action: :read, subject: :global_moderation }
+      end
+
+      it_behaves_like(
+        "access for roles",
+        org_admin: true,
+        admin: true,
+        collaborator: false,
+        moderator: true,
+        valuator: false
+      )
+    end
+
     context "when reading a conference" do
       let(:action) do
         { scope: :public, action: :read, subject: :conference }
@@ -81,13 +98,13 @@
       context "when the user is an admin" do
         let(:user) { create :user, :admin }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the conference is published" do
         let(:user) { create :user, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the conference is not published" do
@@ -95,7 +112,7 @@
         let(:conference) { create :conference, :unpublished, organization: organization }
 
         context "when the user doesn't have access to it" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user has access to it" do
@@ -103,7 +120,7 @@
             create :conference_user_role, user: user, conference: conference
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -113,7 +130,7 @@
         { scope: :public, action: :list, subject: :conference }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when listing conference speakers" do
@@ -121,7 +138,7 @@
         { scope: :public, action: :list, subject: :speakers }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when conference program" do
@@ -129,7 +146,7 @@
         { scope: :public, action: :list, subject: :program }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when listing media links" do
@@ -137,7 +154,7 @@
         { scope: :public, action: :list, subject: :media_links }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when any other action" do
@@ -334,7 +351,7 @@
           { scope: :admin, action: :read, subject: :dummy }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is :preview" do
@@ -342,7 +359,7 @@
           { scope: :admin, action: :preview, subject: :dummy }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is a random one" do
@@ -362,7 +379,7 @@
           { scope: :admin, action: :create, subject: :conference }
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       shared_examples "allows any action on subject" do |action_subject|
@@ -371,7 +388,7 @@
             { scope: :admin, action: :foo, subject: action_subject }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -393,7 +410,7 @@
           { scope: :admin, action: :create, subject: :conference }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       shared_examples "allows any action on subject" do |action_subject|
@@ -402,7 +419,7 @@
             { scope: :admin, action: :foo, subject: action_subject }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
diff --git a/decidim-conferences/spec/queries/conference_program_meetings_by_day_spec.rb b/decidim-conferences/spec/queries/conference_program_meetings_by_day_spec.rb
index 0afd833113b8b..07f065339d9f6 100644
--- a/decidim-conferences/spec/queries/conference_program_meetings_by_day_spec.rb
+++ b/decidim-conferences/spec/queries/conference_program_meetings_by_day_spec.rb
@@ -12,10 +12,10 @@ module Decidim::Conferences
       create(:component, manifest_name: :meetings, participatory_space: conference)
     end
 
-    let!(:meeting_1) { create(:meeting, :published, component: component, start_time: 1.day.from_now.midday + 90.minutes, end_time: 1.day.from_now.midday + 180.minutes) }
-    let!(:meeting_2) { create(:meeting, :published, component: component, start_time: 1.day.from_now.midday, end_time: 1.day.from_now.midday + 60.minutes) }
-    let!(:meeting_3) { create(:meeting, :published, component: component, start_time: 3.days.from_now.midday, end_time: 3.days.from_now.midday + 60.minutes) }
-    let!(:day) { meeting_1.start_time.to_date }
+    let!(:meeting1) { create(:meeting, :published, component: component, start_time: 1.day.from_now.midday + 90.minutes, end_time: 1.day.from_now.midday + 180.minutes) }
+    let!(:meeting2) { create(:meeting, :published, component: component, start_time: 1.day.from_now.midday, end_time: 1.day.from_now.midday + 60.minutes) }
+    let!(:meeting3) { create(:meeting, :published, component: component, start_time: 3.days.from_now.midday, end_time: 3.days.from_now.midday + 60.minutes) }
+    let!(:day) { meeting1.start_time.to_date }
 
     describe "query" do
       context "when user is not present" do
@@ -23,13 +23,13 @@ module Decidim::Conferences
 
         it "includes the meetings component" do
           expect(subject.to_a).to eq [
-            meeting_2,
-            meeting_1
+            meeting2,
+            meeting1
           ]
         end
 
         it "excludes the external meetings" do
-          expect(subject).not_to include(*meeting_3)
+          expect(subject).not_to include(*meeting3)
         end
       end
     end
diff --git a/decidim-conferences/spec/serializers/conference_registration_serializer_spec.rb b/decidim-conferences/spec/serializers/conference_registration_serializer_spec.rb
index 096cd068cb30c..43690835eff5e 100644
--- a/decidim-conferences/spec/serializers/conference_registration_serializer_spec.rb
+++ b/decidim-conferences/spec/serializers/conference_registration_serializer_spec.rb
@@ -5,7 +5,8 @@
 module Decidim::Conferences
   describe ConferenceRegistrationSerializer do
     let(:conference_registration) { create(:conference_registration) }
-    let(:subject) { described_class.new(conference_registration) }
+
+    subject { described_class.new(conference_registration) }
 
     describe "#serialize" do
       it "includes the id" do
diff --git a/decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_invite_serializer_spec.rb b/decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_invite_serializer_spec.rb
similarity index 95%
rename from decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_invite_serializer_spec.rb
rename to decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_invite_serializer_spec.rb
index 85f5dab15a4ee..c0c72aae38717 100644
--- a/decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_invite_serializer_spec.rb
+++ b/decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_invite_serializer_spec.rb
@@ -3,9 +3,10 @@
 require "spec_helper"
 
 module Decidim::Conferences
-  describe DataPortabilityConferenceInviteSerializer do
+  describe DownloadYourDataConferenceInviteSerializer do
     let(:resource) { build_stubbed(:conference_invite) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the invite data" do
diff --git a/decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_registration_serializer_spec.rb b/decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_registration_serializer_spec.rb
similarity index 93%
rename from decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_registration_serializer_spec.rb
rename to decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_registration_serializer_spec.rb
index 5b5dd293f13bb..30caba47d2110 100644
--- a/decidim-conferences/spec/serializers/decidim/conferences/data_portability_conference_registration_serializer_spec.rb
+++ b/decidim-conferences/spec/serializers/decidim/conferences/download_your_data_conference_registration_serializer_spec.rb
@@ -3,9 +3,10 @@
 require "spec_helper"
 
 module Decidim::Conferences
-  describe DataPortabilityConferenceRegistrationSerializer do
+  describe DownloadYourDataConferenceRegistrationSerializer do
     let(:resource) { create(:conference_registration) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the id" do
diff --git a/decidim-conferences/spec/services/decidim/conferences/searchable_conferences_resource_spec.rb b/decidim-conferences/spec/services/decidim/conferences/searchable_conferences_resource_spec.rb
index 5c018c6dca616..b7e6412c892f0 100644
--- a/decidim-conferences/spec/services/decidim/conferences/searchable_conferences_resource_spec.rb
+++ b/decidim-conferences/spec/services/decidim/conferences/searchable_conferences_resource_spec.rb
@@ -14,11 +14,11 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
           objectives: Decidim::Faker::Localized.sentence,
-          description: description_1
+          description: description1
         )
       end
       let(:participatory_space) { conference }
-      let(:conference_2) do
+      let(:conference2) do
         create(
           :conference,
           organization: organization,
@@ -26,10 +26,10 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
           objectives: Decidim::Faker::Localized.sentence,
-          description: description_2
+          description: description2
         )
       end
-      let(:participatory_space2) { conference_2 }
+      let(:participatory_space2) { conference2 }
       let(:searchable_resource_attrs_mapper) do
         lambda { |space, locale|
           d = I18n.transliterate(translated(space.description, locale: locale))
diff --git a/decidim-conferences/spec/shared/manage_conferences_examples.rb b/decidim-conferences/spec/shared/manage_conferences_examples.rb
index ba12d40bbfe42..0d2e757829199 100644
--- a/decidim-conferences/spec/shared/manage_conferences_examples.rb
+++ b/decidim-conferences/spec/shared/manage_conferences_examples.rb
@@ -45,9 +45,12 @@
 
         fill_in :conference_slug, with: "slug"
         fill_in :conference_hashtag, with: "#hashtag"
-        attach_file :conference_hero_image, image1_path
-        attach_file :conference_banner_image, image2_path
+      end
+
+      dynamically_attach_file(:conference_hero_image, image1_path)
+      dynamically_attach_file(:conference_banner_image, image2_path)
 
+      within ".new_conference" do
         fill_in :conference_start_date, with: 1.month.ago
         fill_in :conference_end_date, with: 1.month.ago + 3.days
 
@@ -79,7 +82,7 @@
         es: "Mi nuevo título",
         ca: "El meu nou títol"
       )
-      attach_file :conference_banner_image, image3_path
+      dynamically_attach_file(:conference_banner_image, image3_path, remove_before: true)
 
       within ".edit_conference" do
         find("*[type=submit]").click
diff --git a/decidim-conferences/spec/shared/manage_diplomas_examples.rb b/decidim-conferences/spec/shared/manage_diplomas_examples.rb
index aafca26f204f7..59b9e381bcb9c 100644
--- a/decidim-conferences/spec/shared/manage_diplomas_examples.rb
+++ b/decidim-conferences/spec/shared/manage_diplomas_examples.rb
@@ -18,9 +18,10 @@ def visit_edit_diplomas_page
       click_link translated(conference.title)
       visit_edit_diplomas_page
 
+      dynamically_attach_file(:conference_main_logo, main_logo_path)
+      dynamically_attach_file(:conference_signature, signature_path)
+
       within ".edit_conference_diploma" do
-        attach_file :conference_main_logo, main_logo_path
-        attach_file :conference_signature, signature_path
         fill_in :conference_sign_date, with: 5.days.from_now
         fill_in :conference_signature_name, with: "Signature name"
 
diff --git a/decidim-conferences/spec/shared/manage_registration_types_examples.rb b/decidim-conferences/spec/shared/manage_registration_types_examples.rb
index 5ba60f0512a77..2a8cc878d97df 100644
--- a/decidim-conferences/spec/shared/manage_registration_types_examples.rb
+++ b/decidim-conferences/spec/shared/manage_registration_types_examples.rb
@@ -46,7 +46,7 @@
       end
     end
 
-    it "deletes the conference registration type " do
+    it "deletes the conference registration type" do
       within find("#registration_types tr", text: translated(registration_type.title)) do
         accept_confirm { find("a.action-icon--remove").click }
       end
diff --git a/decidim-conferences/spec/system/admin/admin_filters_conference_user_roles_spec.rb b/decidim-conferences/spec/system/admin/admin_filters_conference_user_roles_spec.rb
index 4e6909f72b461..e70a60a5db634 100644
--- a/decidim-conferences/spec/system/admin/admin_filters_conference_user_roles_spec.rb
+++ b/decidim-conferences/spec/system/admin/admin_filters_conference_user_roles_spec.rb
@@ -11,11 +11,11 @@
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
 
-  let!(:invited_user_1) { create(:conference_valuator, name: name, conference: conference) }
-  let!(:invited_user_2) { create(:conference_valuator, email: email, conference: conference) }
+  let!(:invited_user1) { create(:conference_valuator, name: name, conference: conference) }
+  let!(:invited_user2) { create(:conference_valuator, email: email, conference: conference) }
 
   before do
-    invited_user_2.update!(invitation_sent_at: Time.current - 1.day, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
+    invited_user2.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
 
     switch_to_host(organization.host)
     login_as admin, scope: :user
diff --git a/decidim-conferences/spec/system/admin/conference_moderator_manages_conference_moderations_spec.rb b/decidim-conferences/spec/system/admin/conference_moderator_manages_conference_moderations_spec.rb
index 285cd758e7a2f..6cb7748a7e2c6 100644
--- a/decidim-conferences/spec/system/admin/conference_moderator_manages_conference_moderations_spec.rb
+++ b/decidim-conferences/spec/system/admin/conference_moderator_manages_conference_moderations_spec.rb
@@ -17,4 +17,8 @@
   end
 
   it_behaves_like "manage moderations"
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+  end
 end
diff --git a/decidim-conferences/spec/system/conferences_spec.rb b/decidim-conferences/spec/system/conferences_spec.rb
index e3ac16c797eff..74b2c3feb6620 100644
--- a/decidim-conferences/spec/system/conferences_spec.rb
+++ b/decidim-conferences/spec/system/conferences_spec.rb
@@ -6,12 +6,14 @@
 describe "Conferences", type: :system do
   let(:organization) { create(:organization) }
   let(:show_statistics) { true }
+  let(:description) { { en: "Description", ca: "Descripció", es: "Descripción" } }
+  let(:short_description) { { en: "Short description", ca: "Descripció curta", es: "Descripción corta" } }
   let(:base_conference) do
     create(
       :conference,
       organization: organization,
-      description: { en: "Description", ca: "Descripció", es: "Descripción" },
-      short_description: { en: "Short description", ca: "Descripció curta", es: "Descripción corta" },
+      description: description,
+      short_description: short_description,
       show_statistics: show_statistics
     )
   end
@@ -145,6 +147,9 @@
       end
     end
 
+    it_behaves_like "has embedded video in description", :description
+    it_behaves_like "has embedded video in description", :short_description
+
     context "when the conference has some components" do
       it "shows the components" do
         within ".process-nav" do
diff --git a/decidim-conferences/spec/types/conference_speaker_type_spec.rb b/decidim-conferences/spec/types/conference_speaker_type_spec.rb
index fcccb65faf8e0..ffeeb976fef0f 100644
--- a/decidim-conferences/spec/types/conference_speaker_type_spec.rb
+++ b/decidim-conferences/spec/types/conference_speaker_type_spec.rb
@@ -78,7 +78,7 @@ module Conferences
         let(:query) { "{ user { name } }" }
 
         it "returns the decidim user for this speaker" do
-          expect(response["user"]).to be nil
+          expect(response["user"]).to be_nil
         end
       end
 
diff --git a/decidim-conferences/spec/types/conference_type_spec.rb b/decidim-conferences/spec/types/conference_type_spec.rb
index f811ff6aa839c..61ae43ec9a490 100644
--- a/decidim-conferences/spec/types/conference_type_spec.rb
+++ b/decidim-conferences/spec/types/conference_type_spec.rb
@@ -154,7 +154,7 @@ module Conferences
       describe "startDate" do
         let(:query) { "{ startDate }" }
 
-        it "returns the start date of the conference " do
+        it "returns the start date of the conference" do
           expect(response["startDate"]).to eq(model.start_date.to_date.iso8601)
         end
       end
diff --git a/decidim-consultations/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb b/decidim-consultations/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb
index 999d15f11ad4b..5aee7fc06125d 100644
--- a/decidim-consultations/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb
+++ b/decidim-consultations/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_consultations" class="wrapper-home home-section">
   <div class="row" id="highlighted-consultations">
     <h3 class="section-heading"><%= t("active_consultations", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/create_consultation.rb b/decidim-consultations/app/commands/decidim/consultations/admin/create_consultation.rb
index 97676a6f5ebdf..a35f10c6d38cc 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/create_consultation.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/create_consultation.rb
@@ -5,7 +5,7 @@ module Consultations
     module Admin
       # A command with all the business logic when creating a new participatory
       # consultation in the system.
-      class CreateConsultation < Rectify::Command
+      class CreateConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/create_question.rb b/decidim-consultations/app/commands/decidim/consultations/admin/create_question.rb
index e07f4216fa1cd..ecb67bb77787e 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/create_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/create_question.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new question
-      class CreateQuestion < Rectify::Command
+      class CreateQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/create_response.rb b/decidim-consultations/app/commands/decidim/consultations/admin/create_response.rb
index f148803878411..2a1f9c0cdfdc5 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/create_response.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/create_response.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new response
-      class CreateResponse < Rectify::Command
+      class CreateResponse < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/create_response_group.rb b/decidim-consultations/app/commands/decidim/consultations/admin/create_response_group.rb
index 89082038e8f83..876d92e13870d 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/create_response_group.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/create_response_group.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new response group
-      class CreateResponseGroup < Rectify::Command
+      class CreateResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/destroy_response_group.rb b/decidim-consultations/app/commands/decidim/consultations/admin/destroy_response_group.rb
index c7b7a7d4bba97..8e0abd7836dc6 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/destroy_response_group.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/destroy_response_group.rb
@@ -5,7 +5,7 @@ module Consultations
     module Admin
       # A command with all the business logic to destroy a response group in the
       # system.
-      class DestroyResponseGroup < Rectify::Command
+      class DestroyResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # response_group - A ResponseGroup that will be destroyed
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation.rb b/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation.rb
index 529cc8fb94511..a03a486da674d 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation as published.
-      class PublishConsultation < Rectify::Command
+      class PublishConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will be published
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation_results.rb b/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation_results.rb
index 401a189e0fce8..78680e7c8acd1 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation_results.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/publish_consultation_results.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation results as published.
-      class PublishConsultationResults < Rectify::Command
+      class PublishConsultationResults < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will get its results published
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/publish_question.rb b/decidim-consultations/app/commands/decidim/consultations/admin/publish_question.rb
index e017f653ed401..efaa0bfeaa6e7 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/publish_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/publish_question.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a question as published.
-      class PublishQuestion < Rectify::Command
+      class PublishQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # question - A Question that will be published
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation.rb b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation.rb
index c6da530253211..a6b01d40b8ff5 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation as unpublished.
-      class UnpublishConsultation < Rectify::Command
+      class UnpublishConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will be unpublished
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation_results.rb b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation_results.rb
index c76bc42675d83..3d6ce0a75ab56 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation_results.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_consultation_results.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation results as unpublished.
-      class UnpublishConsultationResults < Rectify::Command
+      class UnpublishConsultationResults < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will get its results unpublished
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_question.rb b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_question.rb
index e68c70495285b..213a370dc3300 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/unpublish_question.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a question as unpublished.
-      class UnpublishQuestion < Rectify::Command
+      class UnpublishQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # question - A Question that will be unpublished
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/update_consultation.rb b/decidim-consultations/app/commands/decidim/consultations/admin/update_consultation.rb
index 861101453af92..0214d2f72b38c 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/update_consultation.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/update_consultation.rb
@@ -5,7 +5,7 @@ module Consultations
     module Admin
       # A command with all the business logic when updating an existing participatory
       # consultation in the system.
-      class UpdateConsultation < Rectify::Command
+      class UpdateConsultation < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/update_question.rb b/decidim-consultations/app/commands/decidim/consultations/admin/update_question.rb
index 4209c4cd13a1f..498959183f148 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/update_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/update_question.rb
@@ -5,7 +5,7 @@ module Consultations
     module Admin
       # A command with all the business logic when updating an existing participatory
       # question in the system.
-      class UpdateQuestion < Rectify::Command
+      class UpdateQuestion < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/update_question_configuration.rb b/decidim-consultations/app/commands/decidim/consultations/admin/update_question_configuration.rb
index 0fd5a03329050..4dfeb09a0ba04 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/update_question_configuration.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/update_question_configuration.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that configures how many and how much questions can be voted.
-      class UpdateQuestionConfiguration < Rectify::Command
+      class UpdateQuestionConfiguration < Decidim::Command
         # Public: Initializes the command.
         #
         # question - the Question to update
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/update_response.rb b/decidim-consultations/app/commands/decidim/consultations/admin/update_response.rb
index 1dcba5bb34414..07fe103ef6460 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/update_response.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/update_response.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when updating an response in the system.
-      class UpdateResponse < Rectify::Command
+      class UpdateResponse < Decidim::Command
         # Public: Initializes the command.
         #
         # response - the response to update
diff --git a/decidim-consultations/app/commands/decidim/consultations/admin/update_response_group.rb b/decidim-consultations/app/commands/decidim/consultations/admin/update_response_group.rb
index 8e0d20d8bc83b..d59b9ecd61440 100644
--- a/decidim-consultations/app/commands/decidim/consultations/admin/update_response_group.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/admin/update_response_group.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when updating a new response group
-      class UpdateResponseGroup < Rectify::Command
+      class UpdateResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # response_group - the response group to update
diff --git a/decidim-consultations/app/commands/decidim/consultations/multiple_vote_question.rb b/decidim-consultations/app/commands/decidim/consultations/multiple_vote_question.rb
index 090e39683c701..58507e4b14fa7 100644
--- a/decidim-consultations/app/commands/decidim/consultations/multiple_vote_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/multiple_vote_question.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user votes a multivote question.
-    class MultipleVoteQuestion < Rectify::Command
+    class MultipleVoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # form   - A Decidim::Consultations::MultiVoteForm object.
diff --git a/decidim-consultations/app/commands/decidim/consultations/unvote_question.rb b/decidim-consultations/app/commands/decidim/consultations/unvote_question.rb
index 7512a1e69c315..ed7f1a086e499 100644
--- a/decidim-consultations/app/commands/decidim/consultations/unvote_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/unvote_question.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user unvotes a question.
-    class UnvoteQuestion < Rectify::Command
+    class UnvoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # question   - A Decidim::Consultations::Question object.
diff --git a/decidim-consultations/app/commands/decidim/consultations/vote_question.rb b/decidim-consultations/app/commands/decidim/consultations/vote_question.rb
index 0b63a3dbf13e4..df79d2ccaef69 100644
--- a/decidim-consultations/app/commands/decidim/consultations/vote_question.rb
+++ b/decidim-consultations/app/commands/decidim/consultations/vote_question.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user votes a question.
-    class VoteQuestion < Rectify::Command
+    class VoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # form   - A Decidim::Consultations::VoteForm object.
diff --git a/decidim-consultations/app/controllers/decidim/consultations/consultations_controller.rb b/decidim-consultations/app/controllers/decidim/consultations/consultations_controller.rb
index 25fa2ec347cb0..67d9ac2651428 100644
--- a/decidim-consultations/app/controllers/decidim/consultations/consultations_controller.rb
+++ b/decidim-consultations/app/controllers/decidim/consultations/consultations_controller.rb
@@ -38,28 +38,21 @@ def current_participatory_space_manifest
       end
 
       def consultations
-        @consultations = search.results
+        @consultations = search.result
         @consultations = reorder(@consultations)
         @consultations = paginate(@consultations)
       end
 
       alias collection consultations
 
-      def search_klass
-        ConsultationSearch
+      def search_collection
+        Consultation.where(organization: current_organization).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: "all"
-        }
-      end
-
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
+          search_text_cont: "",
+          with_any_date: "all"
         }
       end
     end
diff --git a/decidim-consultations/app/forms/decidim/consultations/admin/consultation_form.rb b/decidim-consultations/app/forms/decidim/consultations/admin/consultation_form.rb
index 5745e179e3125..21e6d0a4ef1ee 100644
--- a/decidim-consultations/app/forms/decidim/consultations/admin/consultation_form.rb
+++ b/decidim-consultations/app/forms/decidim/consultations/admin/consultation_form.rb
@@ -17,7 +17,7 @@ class ConsultationForm < Form
         attribute :banner_image
         attribute :remove_banner_image, Boolean, default: false
         attribute :introductory_video_url, String
-        attribute :introductory_image, String
+        attribute :introductory_image
         attribute :remove_introductory_image, Boolean, default: false
         attribute :decidim_highlighted_scope_id, Integer
         attribute :start_voting_date, Decidim::Attributes::LocalizedDate
diff --git a/decidim-consultations/app/helpers/decidim/consultations/consultations_helper.rb b/decidim-consultations/app/helpers/decidim/consultations/consultations_helper.rb
index 3f328f9c45a64..416499c2b492c 100644
--- a/decidim-consultations/app/helpers/decidim/consultations/consultations_helper.rb
+++ b/decidim-consultations/app/helpers/decidim/consultations/consultations_helper.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module ConsultationsHelper
       # Returns  options for state filter selector.
-      def options_for_state_filter
+      def options_for_date_filter
         [
           ["all", t("consultations.filters.all", scope: "decidim")],
           ["active", t("consultations.filters.active", scope: "decidim")],
diff --git a/decidim-consultations/app/helpers/decidim/consultations/questions_helper.rb b/decidim-consultations/app/helpers/decidim/consultations/questions_helper.rb
index 25c9775e45eb7..90219caec5b74 100644
--- a/decidim-consultations/app/helpers/decidim/consultations/questions_helper.rb
+++ b/decidim-consultations/app/helpers/decidim/consultations/questions_helper.rb
@@ -34,11 +34,11 @@ def authorized_vote_modal_button(question, html_options, &block)
         tag = "button"
         html_options ||= {}
 
-        if !current_user
-          html_options["data-open"] = "loginModal"
-        else
+        if current_user
           html_options["data-open"] = "authorizationModal"
           html_options["data-open-url"] = decidim_consultations.authorization_vote_modal_question_path(question)
+        else
+          html_options["data-open"] = "loginModal"
         end
 
         html_options["onclick"] = "event.preventDefault();"
diff --git a/decidim-consultations/app/models/decidim/consultation.rb b/decidim-consultations/app/models/decidim/consultation.rb
index 00bd3ac2506ec..14a6f2acb2379 100644
--- a/decidim-consultations/app/models/decidim/consultation.rb
+++ b/decidim-consultations/app/models/decidim/consultation.rb
@@ -14,6 +14,7 @@ class Consultation < ApplicationRecord
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :title, :subtitle, :description
 
@@ -51,6 +52,8 @@ class Consultation < ApplicationRecord
     scope :finished, -> { published.where("end_voting_date < ?", Time.now.utc) }
     scope :order_by_most_recent, -> { order(created_at: :desc) }
 
+    scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
     searchable_fields({
                         participatory_space: :itself,
                         A: :title,
@@ -106,9 +109,12 @@ def closed?
       !active?
     end
 
-    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    # Create i18n ransackers for :title, :subtitle and :description.
+    # Create the :search_text ransacker alias for searching from all of these.
+    ransacker_i18n_multi :search_text, [:title, :subtitle, :description]
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_any_date]
     end
   end
 end
diff --git a/decidim-consultations/app/permissions/decidim/consultations/permissions.rb b/decidim-consultations/app/permissions/decidim/consultations/permissions.rb
index dca5e311984c0..fb197858c07f3 100644
--- a/decidim-consultations/app/permissions/decidim/consultations/permissions.rb
+++ b/decidim-consultations/app/permissions/decidim/consultations/permissions.rb
@@ -36,14 +36,12 @@ def allowed_public_anonymous_action?
         return unless permission_action.scope == :public
 
         case permission_action.subject
-        when :consultation_list
+        when :consultation_list, :participatory_space
           allow!
         when :consultation
           toggle_allow(consultation.published? || user&.admin?)
         when :question
           toggle_allow(question.published? || user&.admin?)
-        when :participatory_space
-          allow!
         end
       end
 
diff --git a/decidim-consultations/app/presenters/decidim/consultations/question_stats_presenter.rb b/decidim-consultations/app/presenters/decidim/consultations/question_stats_presenter.rb
index d3448db8a55ef..62c190cf4256a 100644
--- a/decidim-consultations/app/presenters/decidim/consultations/question_stats_presenter.rb
+++ b/decidim-consultations/app/presenters/decidim/consultations/question_stats_presenter.rb
@@ -3,8 +3,10 @@
 module Decidim
   module Consultations
     # A presenter to render statistics in the homepage.
-    class QuestionStatsPresenter < Rectify::Presenter
-      attribute :question, Decidim::Consultations::Question
+    class QuestionStatsPresenter < SimpleDelegator
+      def question
+        __getobj__.fetch(:question)
+      end
 
       def supports_count
         question.votes_count
diff --git a/decidim-consultations/app/queries/decidim/consultations/admin/admin_users.rb b/decidim-consultations/app/queries/decidim/consultations/admin/admin_users.rb
index 3eb46e4b1e092..744fab0fcc759 100644
--- a/decidim-consultations/app/queries/decidim/consultations/admin/admin_users.rb
+++ b/decidim-consultations/app/queries/decidim/consultations/admin/admin_users.rb
@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A class used to find the admins for a consultation or an organization consultations.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # consultation - a consultation that needs to find its consultation admins
diff --git a/decidim-consultations/app/queries/decidim/consultations/organization_active_consultations.rb b/decidim-consultations/app/queries/decidim/consultations/organization_active_consultations.rb
index 680fc169e11ac..6b2b909c01f91 100644
--- a/decidim-consultations/app/queries/decidim/consultations/organization_active_consultations.rb
+++ b/decidim-consultations/app/queries/decidim/consultations/organization_active_consultations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all consultations given an organization.
-    class OrganizationActiveConsultations < Rectify::Query
+    class OrganizationActiveConsultations < Decidim::Query
       def self.for(organization)
         new(organization).query
       end
diff --git a/decidim-consultations/app/queries/decidim/consultations/organization_consultations.rb b/decidim-consultations/app/queries/decidim/consultations/organization_consultations.rb
index fc8fe04716a46..cb0b180bbe6f2 100644
--- a/decidim-consultations/app/queries/decidim/consultations/organization_consultations.rb
+++ b/decidim-consultations/app/queries/decidim/consultations/organization_consultations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all consultations given an organization.
-    class OrganizationConsultations < Rectify::Query
+    class OrganizationConsultations < Decidim::Query
       def self.for(organization)
         new(organization).query
       end
diff --git a/decidim-consultations/app/queries/decidim/consultations/organization_questions.rb b/decidim-consultations/app/queries/decidim/consultations/organization_questions.rb
index 4f6cee64008af..dd996e154438d 100644
--- a/decidim-consultations/app/queries/decidim/consultations/organization_questions.rb
+++ b/decidim-consultations/app/queries/decidim/consultations/organization_questions.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all questions given an organization.
-    class OrganizationQuestions < Rectify::Query
+    class OrganizationQuestions < Decidim::Query
       def self.for(organization)
         new(organization).query
       end
diff --git a/decidim-consultations/app/services/decidim/consultations/consultation_search.rb b/decidim-consultations/app/services/decidim/consultations/consultation_search.rb
deleted file mode 100644
index 8ddeded483395..0000000000000
--- a/decidim-consultations/app/services/decidim/consultations/consultation_search.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Consultations
-    # Service that encapsulates all logic related to filtering consultations.
-    class ConsultationSearch < Searchlight::Search
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Consultation.where(organization: options[:organization]).published
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-          .or(
-            query.where(Arel.sql("subtitle->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        case state
-        when "active"
-          query.active
-        when "upcoming"
-          query.upcoming
-        when "finished"
-          query.finished
-        else # Assume all
-          query
-        end
-      end
-
-      private
-
-      def current_locale
-        I18n.locale.to_s
-      end
-    end
-  end
-end
diff --git a/decidim-consultations/app/views/decidim/consultations/consultations/_filters.html.erb b/decidim-consultations/app/views/decidim/consultations/consultations/_filters.html.erb
index c73be2beeff4e..675b64a667066 100644
--- a/decidim-consultations/app/views/decidim/consultations/consultations/_filters.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/consultations/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t("consultations.filters.search", scope: "decidim"),
@@ -20,11 +20,11 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :state,
-                                    options_for_state_filter,
+  <%= form.collection_radio_buttons :with_any_date,
+                                    options_for_date_filter,
                                     :first,
                                     :last,
-                                    { legend_title: t("consultations.filters.state", scope: "decidim") },
+                                    { legend_title: t("consultations.filters.date", scope: "decidim") },
                                     "aria-controls": "consultations" %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
diff --git a/decidim-consultations/app/views/decidim/consultations/consultations/index.html.erb b/decidim-consultations/app/views/decidim/consultations/consultations/index.html.erb
index 9b8e6bccaaec8..c182e27b50606 100644
--- a/decidim-consultations/app/views/decidim/consultations/consultations/index.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/consultations/index.html.erb
@@ -31,4 +31,6 @@ edit_link(
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>
diff --git a/decidim-consultations/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb b/decidim-consultations/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb
index 32dc244bb46f8..6d748fe3b7f17 100644
--- a/decidim-consultations/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb
@@ -26,4 +26,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>
diff --git a/decidim-consultations/app/views/decidim/consultations/questions/_vote_button.html.erb b/decidim-consultations/app/views/decidim/consultations/questions/_vote_button.html.erb
index 81f725600622d..60be5db144ccb 100644
--- a/decidim-consultations/app/views/decidim/consultations/questions/_vote_button.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/questions/_vote_button.html.erb
@@ -96,4 +96,6 @@
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>
diff --git a/decidim-consultations/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb b/decidim-consultations/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb
index 18fe57a80c98a..a051a88a74fc7 100644
--- a/decidim-consultations/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb
@@ -17,6 +17,7 @@
   <div class="row">
     <div class="columns medium-8 medium-offset-2">
       <%= form_with url: decidim_consultations.question_question_votes_path(question),
+                    local: false,
                     id: "confirm-vote-form" do |form| %>
         <%= form.hidden_field :decidim_consultations_response_id, id: "decidim_consultations_response_id" %>
         <%= form.submit t("questions.vote_modal_confirm.confirm", scope: "decidim"),
diff --git a/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb b/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb
index de615788c5e58..fe55100f4848f 100644
--- a/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb
+++ b/decidim-consultations/app/views/decidim/consultations/questions/show.html.erb
@@ -56,4 +56,6 @@
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>
diff --git a/decidim-consultations/config/locales/ar.yml b/decidim-consultations/config/locales/ar.yml
index d1a091accc401..0976ee94ef1d5 100644
--- a/decidim-consultations/config/locales/ar.yml
+++ b/decidim-consultations/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -270,9 +271,9 @@ ar:
       filters:
         active: نشيط
         all: الكل
+        date: التاريخ
         finished: تم الانتهاء من
         search: بحث
-        state: الحالة
         upcoming: القادمة
       filters_small_view:
         close_modal: أغلق النا�ذة
diff --git a/decidim-consultations/config/locales/ca.yml b/decidim-consultations/config/locales/ca.yml
index 8f8f6fa781949..0d8897654c707 100644
--- a/decidim-consultations/config/locales/ca.yml
+++ b/decidim-consultations/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ ca:
       filters:
         active: Actiu
         all: Totes
+        date: Data
         finished: Acabat
         search: Cerca
-        state: Estat
         upcoming: Proper
       filters_small_view:
         close_modal: Tanca la finestra
diff --git a/decidim-consultations/config/locales/cs.yml b/decidim-consultations/config/locales/cs.yml
index f63b8ad09cdec..c01a9f2221db4 100644
--- a/decidim-consultations/config/locales/cs.yml
+++ b/decidim-consultations/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -267,9 +268,9 @@ cs:
       filters:
         active: Aktivní
         all: VÅ¡e
+        date: Datum
         finished: Dokon�eno
         search: Vyhledávání
-        state: Stav
         upcoming: Nadcházející
       filters_small_view:
         close_modal: Zavřete okno
diff --git a/decidim-consultations/config/locales/de.yml b/decidim-consultations/config/locales/de.yml
index 3a14568b97d9d..89a74585cd732 100644
--- a/decidim-consultations/config/locales/de.yml
+++ b/decidim-consultations/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ de:
       filters:
         active: Aktiv
         all: Alle
+        date: Datum
         finished: Fertig
         search: Suche
-        state: Zustand
         upcoming: Bevorstehende
       filters_small_view:
         close_modal: Fenster schließen
diff --git a/decidim-consultations/config/locales/el.yml b/decidim-consultations/config/locales/el.yml
index 6debf820857fd..600a1feb8db27 100644
--- a/decidim-consultations/config/locales/el.yml
+++ b/decidim-consultations/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ el:
         all: Όλα
         finished: Ολοκλη�ωμένες
         search: Αναζήτηση
-        state: Κατάσταση
         upcoming: Π�οσεχείς
       filters_small_view:
         close_modal: Κλείσιμο πα�αθ��ου
diff --git a/decidim-consultations/config/locales/en.yml b/decidim-consultations/config/locales/en.yml
index 7d4f53bd5f645..00e9dd6a34025 100644
--- a/decidim-consultations/config/locales/en.yml
+++ b/decidim-consultations/config/locales/en.yml
@@ -252,9 +252,9 @@ en:
       filters:
         active: Active
         all: All
+        date: Date
         finished: Finished
         search: Search
-        state: Status
         upcoming: Upcoming
       filters_small_view:
         close_modal: Close window
diff --git a/decidim-consultations/config/locales/es-MX.yml b/decidim-consultations/config/locales/es-MX.yml
index 111abfa1bea40..2008bcde3ca74 100644
--- a/decidim-consultations/config/locales/es-MX.yml
+++ b/decidim-consultations/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ es-MX:
       filters:
         active: Activo
         all: Todas
+        date: Fecha
         finished: Completada
         search: Buscar
-        state: Estado
         upcoming: Próximo
       filters_small_view:
         close_modal: Cerrar ventana
diff --git a/decidim-consultations/config/locales/es-PY.yml b/decidim-consultations/config/locales/es-PY.yml
index 54d623974fbad..67a846585a695 100644
--- a/decidim-consultations/config/locales/es-PY.yml
+++ b/decidim-consultations/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ es-PY:
       filters:
         active: Activo
         all: Todas
+        date: Fecha
         finished: Completada
         search: Buscar
-        state: Estado
         upcoming: Próximo
       filters_small_view:
         close_modal: Cerrar ventana
diff --git a/decidim-consultations/config/locales/es.yml b/decidim-consultations/config/locales/es.yml
index 5be313bb269cc..fdb0886ec1179 100644
--- a/decidim-consultations/config/locales/es.yml
+++ b/decidim-consultations/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ es:
       filters:
         active: Activo
         all: Todas
+        date: Fecha
         finished: Acabada
         search: Buscar
-        state: Estado
         upcoming: Próximo
       filters_small_view:
         close_modal: Cierra la ventana
diff --git a/decidim-consultations/config/locales/eu.yml b/decidim-consultations/config/locales/eu.yml
index edf8fa77abf38..bc69d8ef3a358 100644
--- a/decidim-consultations/config/locales/eu.yml
+++ b/decidim-consultations/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ eu:
         all: guztiak
         finished: Amaitu
         search: Search
-        state: Estatu
         upcoming: Datozen
       filters_small_view:
         close_modal: Itxi leihoa
diff --git a/decidim-consultations/config/locales/fi-plain.yml b/decidim-consultations/config/locales/fi-plain.yml
index d9d080e5a1b8e..cda8c6b310f49 100644
--- a/decidim-consultations/config/locales/fi-plain.yml
+++ b/decidim-consultations/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fi-pl:
       filters:
         active: Aktiiviset
         all: Kaikki
+        date: Päivämäärä
         finished: Valmiit
         search: Hae
-        state: Tila
         upcoming: Tulevat
       filters_small_view:
         close_modal: Sulje ikkuna
diff --git a/decidim-consultations/config/locales/fi.yml b/decidim-consultations/config/locales/fi.yml
index cf5c971628080..34545d2620ae7 100644
--- a/decidim-consultations/config/locales/fi.yml
+++ b/decidim-consultations/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fi:
       filters:
         active: Aktiiviset
         all: Kaikki
+        date: Päivämäärä
         finished: Valmiit
         search: Hae
-        state: Tila
         upcoming: Tulevat
       filters_small_view:
         close_modal: Sulje ikkuna
diff --git a/decidim-consultations/config/locales/fr-CA.yml b/decidim-consultations/config/locales/fr-CA.yml
index 8641824fbc8c6..0c50701da97c4 100644
--- a/decidim-consultations/config/locales/fr-CA.yml
+++ b/decidim-consultations/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fr-CA:
       filters:
         active: Actives
         all: Tout
+        date: Date
         finished: Passées
         search: Rechercher
-        state: État
         upcoming: À venir
       filters_small_view:
         close_modal: Fermer la fenêtre
diff --git a/decidim-consultations/config/locales/fr.yml b/decidim-consultations/config/locales/fr.yml
index df7245a935413..b35306d6335ce 100644
--- a/decidim-consultations/config/locales/fr.yml
+++ b/decidim-consultations/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fr:
       filters:
         active: Actives
         all: Tout
+        date: Date
         finished: Passées
         search: Rechercher
-        state: État
         upcoming: À venir
       filters_small_view:
         close_modal: Fermer la fenêtre
diff --git a/decidim-consultations/config/locales/ga-IE.yml b/decidim-consultations/config/locales/ga-IE.yml
index e9bd8401496ea..3ad5ccc0e040b 100644
--- a/decidim-consultations/config/locales/ga-IE.yml
+++ b/decidim-consultations/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -95,7 +96,6 @@ ga:
         all: Uile
         finished: Críochnaithe
         search: Cuardaigh
-        state: Stádas
         upcoming: Le teacht
       filters_small_view:
         filter: Scag
diff --git a/decidim-consultations/config/locales/gl.yml b/decidim-consultations/config/locales/gl.yml
index 60007ef86b6df..f3e547dca9732 100644
--- a/decidim-consultations/config/locales/gl.yml
+++ b/decidim-consultations/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -197,9 +198,9 @@ gl:
       filters:
         active: Activo
         all: Todo
+        date: Data
         finished: Terminado
         search: Busca
-        state: Estado
         upcoming: Próximos
       filters_small_view:
         close_modal: Pechar ventá
diff --git a/decidim-consultations/config/locales/hu.yml b/decidim-consultations/config/locales/hu.yml
index f15c1acbe89b1..29b20b7b635c9 100644
--- a/decidim-consultations/config/locales/hu.yml
+++ b/decidim-consultations/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -250,9 +251,9 @@ hu:
       filters:
         active: Aktív
         all: Összes
+        date: Dátum
         finished: Befejezett
         search: Keresés
-        state: �llapot
         upcoming: Közelgő
       filters_small_view:
         close_modal: Ablak bezárása
diff --git a/decidim-consultations/config/locales/id-ID.yml b/decidim-consultations/config/locales/id-ID.yml
index 90b0950ecd25f..4ad56dd51252c 100644
--- a/decidim-consultations/config/locales/id-ID.yml
+++ b/decidim-consultations/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -191,7 +192,6 @@ id:
         all: Semua
         finished: Jadi
         search: Pencarian
-        state: Negara
         upcoming: Mendatang
       filters_small_view:
         close_modal: Tutup jendela
diff --git a/decidim-consultations/config/locales/is-IS.yml b/decidim-consultations/config/locales/is-IS.yml
index 207f89e9015a8..e2890000e6ee1 100644
--- a/decidim-consultations/config/locales/is-IS.yml
+++ b/decidim-consultations/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       consultation:
diff --git a/decidim-consultations/config/locales/it.yml b/decidim-consultations/config/locales/it.yml
index 8a08ae12663db..c36fe1d481d35 100644
--- a/decidim-consultations/config/locales/it.yml
+++ b/decidim-consultations/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ it:
         all: Tutti
         finished: Finito
         search: Ricerca
-        state: Stato
         upcoming: Prossime
       filters_small_view:
         close_modal: Chiudi la finestra
diff --git a/decidim-consultations/config/locales/ja.yml b/decidim-consultations/config/locales/ja.yml
index 3d38cc422d4e0..4ea2af21eb793 100644
--- a/decidim-consultations/config/locales/ja.yml
+++ b/decidim-consultations/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -243,9 +244,9 @@ ja:
       filters:
         active: アクティブ
         all: ���
+        date: 日付
         finished: 完了
         search: 検索
-        state: ステータス
         upcoming: 近日公開
       filters_small_view:
         close_modal: ウィンドウを閉�る
diff --git a/decidim-consultations/config/locales/ka-GE.yml b/decidim-consultations/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-consultations/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-consultations/config/locales/lb.yml b/decidim-consultations/config/locales/lb.yml
index 80cab3f63e455..dd3a2ace39dcc 100644
--- a/decidim-consultations/config/locales/lb.yml
+++ b/decidim-consultations/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -176,7 +177,6 @@ lb:
         all: Alle
         finished: Fertig
         search: Suche
-        state: Zustand
         upcoming: Bevorstehende
       filters_small_view:
         close_modal: Fenster schließen
diff --git a/decidim-consultations/config/locales/lt.yml b/decidim-consultations/config/locales/lt.yml
index 30e1dce42e86c..fb5ec969e6aff 100644
--- a/decidim-consultations/config/locales/lt.yml
+++ b/decidim-consultations/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -267,9 +268,9 @@ lt:
       filters:
         active: Aktyvios
         all: Visi
+        date: Data
         finished: Užbaigta
         search: Ieškoti
-        state: BÅ«sena
         upcoming: Artėjan�ios
       filters_small_view:
         close_modal: Uždaryti langą
diff --git a/decidim-consultations/config/locales/lv.yml b/decidim-consultations/config/locales/lv.yml
index cb9d624c1bed3..6d471325eb8e0 100644
--- a/decidim-consultations/config/locales/lv.yml
+++ b/decidim-consultations/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -258,7 +259,6 @@ lv:
         all: Visi
         finished: Pabeigtas
         search: Meklēt
-        state: Statuss
         upcoming: Gaid�m�s
       filters_small_view:
         close_modal: Aizvērt logu
diff --git a/decidim-consultations/config/locales/nl.yml b/decidim-consultations/config/locales/nl.yml
index 802ea6593b570..63d7db236e7c5 100644
--- a/decidim-consultations/config/locales/nl.yml
+++ b/decidim-consultations/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ nl:
         all: Alle
         finished: Voltooid
         search: Zoeken
-        state: Staat
         upcoming: Toekomstige
       filters_small_view:
         close_modal: Sluit venster
diff --git a/decidim-consultations/config/locales/no.yml b/decidim-consultations/config/locales/no.yml
index df87f796be589..78f86ce58682a 100644
--- a/decidim-consultations/config/locales/no.yml
+++ b/decidim-consultations/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -253,7 +254,6 @@
         all: Alle
         finished: Fullført
         search: Søk
-        state: Status
         upcoming: Kommende
       filters_small_view:
         close_modal: Lukk vindu
diff --git a/decidim-consultations/config/locales/pl.yml b/decidim-consultations/config/locales/pl.yml
index 82674d69474d6..d011564a27d92 100644
--- a/decidim-consultations/config/locales/pl.yml
+++ b/decidim-consultations/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -269,7 +270,6 @@ pl:
         all: Wszystko
         finished: Zakończone
         search: Szukaj
-        state: Status
         upcoming: NadchodzÄ…ce
       filters_small_view:
         close_modal: Zamknij okno
diff --git a/decidim-consultations/config/locales/pt-BR.yml b/decidim-consultations/config/locales/pt-BR.yml
index 870fea37c8140..cd2eeb3270911 100644
--- a/decidim-consultations/config/locales/pt-BR.yml
+++ b/decidim-consultations/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ pt-BR:
         all: Todos
         finished: Acabado
         search: Pesquisa
-        state: Estado
         upcoming: próximos
       filters_small_view:
         close_modal: Janela fechada
diff --git a/decidim-consultations/config/locales/pt.yml b/decidim-consultations/config/locales/pt.yml
index f0d54da42bf2c..96c7c74b2d8d9 100644
--- a/decidim-consultations/config/locales/pt.yml
+++ b/decidim-consultations/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ pt:
         all: Todos
         finished: Acabado
         search: Pesquisar
-        state: Estado
         upcoming: Próximas
       filters_small_view:
         close_modal: Fechar janela
diff --git a/decidim-consultations/config/locales/ro-RO.yml b/decidim-consultations/config/locales/ro-RO.yml
index fc0d7e3b44764..7b0aacf0eab5f 100644
--- a/decidim-consultations/config/locales/ro-RO.yml
+++ b/decidim-consultations/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -259,9 +260,9 @@ ro:
       filters:
         active: Activ
         all: Toate
+        date: Data
         finished: Terminat
         search: Caută
-        state: Status
         upcoming: Urmează
       filters_small_view:
         close_modal: ÃŽnchide fereastra
diff --git a/decidim-consultations/config/locales/ru.yml b/decidim-consultations/config/locales/ru.yml
index 9e6e72aed96d2..efd40fcfaa894 100644
--- a/decidim-consultations/config/locales/ru.yml
+++ b/decidim-consultations/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ ru:
         all: В�е
         finished: Завершившие��
         search: Пои�к
-        state: Cо�то�ние
         upcoming: Пред�то�щие
       filters_small_view:
         close_modal: Закрыть окно
diff --git a/decidim-consultations/config/locales/sk.yml b/decidim-consultations/config/locales/sk.yml
index 4a489bf9ffb8c..f46f1f492c385 100644
--- a/decidim-consultations/config/locales/sk.yml
+++ b/decidim-consultations/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -266,7 +267,6 @@ sk:
         all: VÅ¡etko
         finished: Dokon�ené
         search: Hľadať
-        state: Stav
         upcoming: Nadchádzajúce
       filters_small_view:
         close_modal: Zavrieť okno
diff --git a/decidim-consultations/config/locales/sl.yml b/decidim-consultations/config/locales/sl.yml
index ea5df8d17e2c2..6cec6c90a8e13 100644
--- a/decidim-consultations/config/locales/sl.yml
+++ b/decidim-consultations/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-consultations/config/locales/sv.yml b/decidim-consultations/config/locales/sv.yml
index 1470ed066b70f..0265cb2516545 100644
--- a/decidim-consultations/config/locales/sv.yml
+++ b/decidim-consultations/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ sv:
       filters:
         active: Aktiv
         all: Alla
+        date: Datum
         finished: Avslutade
         search: Sök
-        state: Status
         upcoming: Kommande
       filters_small_view:
         close_modal: Stäng fönstret
diff --git a/decidim-consultations/config/locales/tr-TR.yml b/decidim-consultations/config/locales/tr-TR.yml
index 53b0223980e0f..22a6ea334513a 100644
--- a/decidim-consultations/config/locales/tr-TR.yml
+++ b/decidim-consultations/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ tr:
         all: Tümü
         finished: Bitti
         search: Arama
-        state: Statü
         upcoming: YaklaÅŸan
       filters_small_view:
         close_modal: Pencereyi kapat
diff --git a/decidim-consultations/config/locales/uk.yml b/decidim-consultations/config/locales/uk.yml
index 987d5419bece5..b0cdfec66d673 100644
--- a/decidim-consultations/config/locales/uk.yml
+++ b/decidim-consultations/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ uk:
         all: У�і
         finished: Завершені
         search: Шукати
-        state: Стан
         upcoming: Прийдешні
       filters_small_view:
         close_modal: Закрити вікно
diff --git a/decidim-consultations/config/locales/zh-CN.yml b/decidim-consultations/config/locales/zh-CN.yml
index cec342234327b..9b91f12a03625 100644
--- a/decidim-consultations/config/locales/zh-CN.yml
+++ b/decidim-consultations/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -244,7 +245,6 @@ zh-CN:
         all: 所有的
         finished: 已完�
         search: �索
-        state: 状�
         upcoming: �将到�的
       filters_small_view:
         close_modal: 关闭窗�
diff --git a/decidim-consultations/decidim-consultations.gemspec b/decidim-consultations/decidim-consultations.gemspec
index e9c401103ee07..62d8b75693c7b 100644
--- a/decidim-consultations/decidim-consultations.gemspec
+++ b/decidim-consultations/decidim-consultations.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = ["jsperezg@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-consultations"
   s.summary = "Decidim consultations module"
diff --git a/decidim-consultations/lib/decidim/consultations/participatory_space.rb b/decidim-consultations/lib/decidim/consultations/participatory_space.rb
index 8d2dce8e40775..5bdcdb1a974ef 100644
--- a/decidim-consultations/lib/decidim/consultations/participatory_space.rb
+++ b/decidim-consultations/lib/decidim/consultations/participatory_space.rb
@@ -50,7 +50,7 @@
       start_voting_date: Time.zone.today,
       end_voting_date: Time.zone.today + 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -82,7 +82,7 @@
       start_voting_date: Time.zone.today - 2.months,
       end_voting_date: Time.zone.today - 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -113,7 +113,7 @@
       start_voting_date: Time.zone.today + 1.month + 1.day,
       end_voting_date: Time.zone.today + 2.months,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -148,13 +148,13 @@
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
           organization: organization,
-          hero_image: ActiveStorage::Blob.create_after_upload!(
+          hero_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "hero_image.jpeg",
             content_type: "image/jpeg",
             metadata: nil
           ), # Keep after organization
-          banner_image: ActiveStorage::Blob.create_after_upload!(
+          banner_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city2.jpeg")),
             filename: "banner_image.jpeg",
             content_type: "image/jpeg",
@@ -188,7 +188,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -201,7 +201,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",
diff --git a/decidim-consultations/lib/decidim/consultations/version.rb b/decidim-consultations/lib/decidim/consultations/version.rb
index dfd8b2e51209f..40da4cdbe7960 100644
--- a/decidim-consultations/lib/decidim/consultations/version.rb
+++ b/decidim-consultations/lib/decidim/consultations/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/create_consultation_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/create_consultation_spec.rb
index bb75b0f1f66ef..1057b022c3f8d 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/create_consultation_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/create_consultation_spec.rb
@@ -49,13 +49,13 @@ module Admin
               persisted?: false,
               valid?: false,
               errors: {
-                banner_image: "Image too big"
+                banner_image: "File resolution is too large"
               }
             ).as_null_object
           end
 
           before do
-            expect(Decidim::Consultation).to receive(:new).and_return(invalid_consultation)
+            allow(Decidim::Consultation).to receive(:new).and_return(invalid_consultation)
           end
 
           it "broadcasts invalid" do
@@ -63,14 +63,14 @@ module Admin
           end
 
           it "adds errors to the form" do
-            expect(errors).to receive(:add).with(:banner_image, "Image too big")
+            expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
             subject.call
           end
         end
 
         context "when everything is ok" do
           it "creates a consultation" do
-            expect { subject.call }.to change { Decidim::Consultation.count }.by(1)
+            expect { subject.call }.to change(Decidim::Consultation, :count).by(1)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/create_question_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/create_question_spec.rb
index 690712846f7e7..b139fe781f68a 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/create_question_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/create_question_spec.rb
@@ -12,8 +12,8 @@ module Admin
         let(:consultation) { create(:consultation, organization: organization) }
         let(:scope) { create(:scope, organization: organization) }
         let(:errors) { double.as_null_object }
-        let(:banner_image) { fixture_file_upload(File.open(Decidim::Dev.asset("city.jpeg")), "image/jpeg") }
-        let(:hero_image) { fixture_file_upload(File.open(Decidim::Dev.asset("city.jpeg")), "image/jpeg") }
+        let(:banner_image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+        let(:hero_image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:params) do
           {
             question: {
@@ -41,7 +41,7 @@ module Admin
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -56,15 +56,15 @@ module Admin
               persisted?: false,
               valid?: false,
               errors: {
-                banner_image: "Image too big",
-                hero_image: "Image too big"
+                banner_image: "File resolution is too large",
+                hero_image: "File resolution is too large"
               }
             ).as_null_object
           end
 
           before do
-            expect(form).to receive(:invalid?).and_return(false)
-            expect(Decidim::Consultations::Question).to receive(:new).and_return(invalid_question)
+            allow(form).to receive(:invalid?).and_return(false)
+            allow(Decidim::Consultations::Question).to receive(:new).and_return(invalid_question)
           end
 
           it "broadcasts invalid" do
@@ -84,7 +84,7 @@ module Admin
 
         context "when everything is ok" do
           it "creates a question" do
-            expect { subject.call }.to change { Decidim::Consultations::Question.count }.by(1)
+            expect { subject.call }.to change(Decidim::Consultations::Question, :count).by(1)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_group_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_group_spec.rb
index cffe9b8671c98..82cccfe96e68b 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_group_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_group_spec.rb
@@ -26,7 +26,7 @@ module Admin
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -36,7 +36,7 @@ module Admin
 
         context "when everything is ok" do
           it "creates a response group" do
-            expect { subject.call }.to change { Decidim::Consultations::ResponseGroup.count }.by(1)
+            expect { subject.call }.to change(Decidim::Consultations::ResponseGroup, :count).by(1)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_spec.rb
index ab82b972ced53..bcd5ea2d44199 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/create_response_spec.rb
@@ -27,7 +27,7 @@ module Admin
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -37,7 +37,7 @@ module Admin
 
         context "when everything is ok" do
           it "creates a response" do
-            expect { subject.call }.to change { Decidim::Consultations::Response.count }.by(1)
+            expect { subject.call }.to change(Decidim::Consultations::Response, :count).by(1)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/update_consultation_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/update_consultation_spec.rb
index 1ee2e8a1643b6..948feb869f898 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/update_consultation_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/update_consultation_spec.rb
@@ -45,7 +45,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -62,9 +62,9 @@ module Admin
 
         describe "when the consultation is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
             expect(consultation).to receive(:valid?).at_least(:once).and_return(false)
-            consultation.errors.add(:banner_image, "Image too big")
+            consultation.errors.add(:banner_image, "File resolution is too large")
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_configuration_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_configuration_spec.rb
index 2c7ccddb425c0..a6c7f87e30469 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_configuration_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_configuration_spec.rb
@@ -26,7 +26,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -43,7 +43,7 @@ module Admin
 
         describe "when question is not valid" do
           before do
-            expect(question).to receive(:valid?).and_return(false)
+            allow(question).to receive(:valid?).and_return(false)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_spec.rb
index 15979dada136f..4ce0dc41e73ba 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/update_question_spec.rb
@@ -49,7 +49,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -66,10 +66,10 @@ module Admin
 
         describe "when the question is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
             expect(question).to receive(:valid?).at_least(:once).and_return(false)
-            question.errors.add(:banner_image, "Image too big")
-            question.errors.add(:hero_image, "Image too big")
+            question.errors.add(:banner_image, "File resolution is too large")
+            question.errors.add(:hero_image, "File resolution is too large")
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_group_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_group_spec.rb
index 33d7f038d97ba..42ea4490e4517 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_group_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_group_spec.rb
@@ -28,7 +28,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_spec.rb
index 11936522841cd..9c604258177fb 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/admin/update_response_spec.rb
@@ -28,7 +28,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-consultations/spec/commands/decidim/consultations/multiple_vote_question_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/multiple_vote_question_spec.rb
index edbf7deb38330..f87f261f3482a 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/multiple_vote_question_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/multiple_vote_question_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module Consultations
     describe MultipleVoteQuestion do
-      let(:subject) { described_class.new(form, user) }
+      subject { described_class.new(form, user) }
 
       let(:organization) { create :organization }
       let(:consultation) { create :consultation, organization: organization }
diff --git a/decidim-consultations/spec/commands/decidim/consultations/unvote_question_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/unvote_question_spec.rb
index f1a886190dc84..107dc6d6758f6 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/unvote_question_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/unvote_question_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module Consultations
     describe UnvoteQuestion do
-      let(:subject) { described_class.new(question, user) }
+      subject { described_class.new(question, user) }
 
       let(:organization) { create :organization }
       let(:consultation) { create :consultation, organization: organization }
diff --git a/decidim-consultations/spec/commands/decidim/consultations/vote_question_spec.rb b/decidim-consultations/spec/commands/decidim/consultations/vote_question_spec.rb
index e7fc350afb0ae..822fed4d6537c 100644
--- a/decidim-consultations/spec/commands/decidim/consultations/vote_question_spec.rb
+++ b/decidim-consultations/spec/commands/decidim/consultations/vote_question_spec.rb
@@ -5,7 +5,7 @@
 module Decidim
   module Consultations
     describe VoteQuestion do
-      let(:subject) { described_class.new(form) }
+      subject { described_class.new(form) }
 
       let(:organization) { create :organization }
       let(:consultation) { create :consultation, organization: organization }
diff --git a/decidim-consultations/spec/forms/decidim/consultations/admin/consultation_form_spec.rb b/decidim-consultations/spec/forms/decidim/consultations/admin/consultation_form_spec.rb
index e154bbacd3356..b7eadab273e46 100644
--- a/decidim-consultations/spec/forms/decidim/consultations/admin/consultation_form_spec.rb
+++ b/decidim-consultations/spec/forms/decidim/consultations/admin/consultation_form_spec.rb
@@ -34,7 +34,7 @@ module Admin
         let(:slug) { "slug" }
         let(:start_voting_date) { Time.zone.today }
         let(:end_voting_date) { Time.zone.today + 1.month }
-        let(:attachment) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
+        let(:attachment) { upload_test_file(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")) }
 
         let(:attributes) do
           {
@@ -66,7 +66,7 @@ module Admin
             organization.settings.tap do |settings|
               settings.upload.maximum_file_size.default = 5
             end
-            expect(subject.banner_image).to receive(:size).and_return(6.megabytes)
+            ActiveStorage::Blob.find_signed(attachment).update(byte_size: 6.megabytes)
           end
 
           it { is_expected.not_to be_valid }
diff --git a/decidim-consultations/spec/forms/decidim/consultations/admin/question_form_spec.rb b/decidim-consultations/spec/forms/decidim/consultations/admin/question_form_spec.rb
index 928b531da1132..4817bc887aee9 100644
--- a/decidim-consultations/spec/forms/decidim/consultations/admin/question_form_spec.rb
+++ b/decidim-consultations/spec/forms/decidim/consultations/admin/question_form_spec.rb
@@ -54,8 +54,8 @@ module Admin
             ca: "Què es decideix"
           }
         end
-        let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-        let(:hero_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:banner_image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+        let(:hero_image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:origin_scope) do
           {
             en: "",
@@ -105,7 +105,7 @@ module Admin
               "origin_url" => origin_url,
               "external_voting" => external_voting,
               "i_frame_url" => i_frame_url,
-              "order": order
+              order: order
             }
           }
         end
@@ -120,7 +120,7 @@ module Admin
               organization.settings.tap do |settings|
                 settings.upload.maximum_file_size.default = 5
               end
-              expect(subject.banner_image).to receive(:size).and_return(6.megabytes)
+              ActiveStorage::Blob.find_signed(banner_image).update(byte_size: 6.megabytes)
             end
 
             it { is_expected.not_to be_valid }
@@ -139,14 +139,14 @@ module Admin
               organization.settings.tap do |settings|
                 settings.upload.maximum_file_size.default = 5
               end
-              expect(subject.hero_image).to receive(:size).and_return(6.megabytes)
+              ActiveStorage::Blob.find_signed(hero_image).update(byte_size: 6.megabytes)
             end
 
             it { is_expected.not_to be_valid }
           end
 
           context "and it hasn't the expected type" do
-            let(:hero_image) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
+            let(:hero_image) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")) }
 
             it { is_expected.not_to be_valid }
           end
diff --git a/decidim-consultations/spec/helpers/decidim/consultations/consultations_helper_spec.rb b/decidim-consultations/spec/helpers/decidim/consultations/consultations_helper_spec.rb
index 2459513a7f1df..1bf87e1b63843 100644
--- a/decidim-consultations/spec/helpers/decidim/consultations/consultations_helper_spec.rb
+++ b/decidim-consultations/spec/helpers/decidim/consultations/consultations_helper_spec.rb
@@ -5,11 +5,11 @@
 module Decidim
   module Consultations
     describe ConsultationsHelper do
-      describe "options_for_state_filter" do
+      describe "options_for_date_filter" do
         it "returns options for all available filters" do
-          expect(helper.options_for_state_filter).to include(["all", t("consultations.filters.all", scope: "decidim")])
-          expect(helper.options_for_state_filter).to include(["active", t("consultations.filters.active", scope: "decidim")])
-          expect(helper.options_for_state_filter).to include(["upcoming", t("consultations.filters.upcoming", scope: "decidim")])
+          expect(helper.options_for_date_filter).to include(["all", t("consultations.filters.all", scope: "decidim")])
+          expect(helper.options_for_date_filter).to include(["active", t("consultations.filters.active", scope: "decidim")])
+          expect(helper.options_for_date_filter).to include(["upcoming", t("consultations.filters.upcoming", scope: "decidim")])
         end
       end
     end
diff --git a/decidim-consultations/spec/permissions/decidim/consultations/admin/permissions_spec.rb b/decidim-consultations/spec/permissions/decidim/consultations/admin/permissions_spec.rb
index 4d9c48bf7a725..1e6eae10775a0 100644
--- a/decidim-consultations/spec/permissions/decidim/consultations/admin/permissions_spec.rb
+++ b/decidim-consultations/spec/permissions/decidim/consultations/admin/permissions_spec.rb
@@ -11,7 +11,7 @@
   let(:question) { create :question, consultation: consultation }
   let(:context) { { consultation: consultation, question: question }.merge(extra_context) }
   let(:extra_context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:action) do
     { scope: :admin, action: action_name, subject: action_subject }
   end
@@ -30,7 +30,7 @@
       { scope: :admin, action: :foo, subject: :bar }
     end
 
-    it { is_expected.to eq false }
+    it { is_expected.to be false }
   end
 
   describe "consultations" do
@@ -39,27 +39,27 @@
     context "when creating a consultation" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when reading a consultation" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when updating a consultation" do
       let(:action_name) { :update }
 
       context "when consultation is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when consultation is not present" do
         let(:consultation) { nil }
         let(:question) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -67,14 +67,14 @@
       let(:action_name) { :preview }
 
       context "when consultation is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when consultation is not present" do
         let(:consultation) { nil }
         let(:question) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -84,19 +84,19 @@
       context "when consultation is not finished" do
         let(:consultation) { create :consultation, :active, organization: organization }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when consultation is finished and results not published" do
         let(:consultation) { create :consultation, :finished, :unpublished_results, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when consultation is finished and results published" do
         let(:consultation) { create :consultation, :finished, :published_results, organization: organization }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -106,13 +106,13 @@
       context "when results are not published" do
         let(:consultation) { create :consultation, :unpublished_results, organization: organization }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when results are published" do
         let(:consultation) { create :consultation, :published_results, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -123,26 +123,26 @@
     context "when creating a question" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when reading a question" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when updating a question" do
       let(:action_name) { :update }
 
       context "when question is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when question is not present" do
         let(:question) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -150,13 +150,13 @@
       let(:action_name) { :destroy }
 
       context "when question is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when question is not present" do
         let(:question) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -164,13 +164,13 @@
       let(:action_name) { :preview }
 
       context "when question is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when question is not present" do
         let(:question) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -180,17 +180,17 @@
       context "when question has external voting" do
         let(:question) { create :question, :external_voting, consultation: consultation }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when question has some responses" do
         let!(:response) { create :response, question: question }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when conditions are not met" do
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
@@ -203,26 +203,26 @@
     context "when creating a response" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when reading a response" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when updating a response" do
       let(:action_name) { :update }
 
       context "when response is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when response is not present" do
         let(:response) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -230,13 +230,13 @@
       let(:action_name) { :destroy }
 
       context "when response is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when response is not present" do
         let(:response) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
@@ -250,26 +250,26 @@
     context "when creating a response_group" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when reading a response_group" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when updating a response_group" do
       let(:action_name) { :update }
 
       context "when response_group is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when response_group is not present" do
         let(:response_group) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -277,13 +277,13 @@
       let(:action_name) { :destroy }
 
       context "when response_group is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when response_group is not present" do
         let(:response_group) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -291,7 +291,7 @@
       let(:question) { create :question, consultation: consultation }
       let(:action_name) { :create }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -299,7 +299,7 @@
     let(:action_subject) { :participatory_space }
     let(:action_name) { :read }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "components" do
@@ -309,6 +309,6 @@
       { consultation: nil, participatory_space: question }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 end
diff --git a/decidim-consultations/spec/permissions/decidim/consultations/permissions_spec.rb b/decidim-consultations/spec/permissions/decidim/consultations/permissions_spec.rb
index 93ee4fcaf5498..3792393f3220a 100644
--- a/decidim-consultations/spec/permissions/decidim/consultations/permissions_spec.rb
+++ b/decidim-consultations/spec/permissions/decidim/consultations/permissions_spec.rb
@@ -10,7 +10,7 @@
   let(:consultation) { create :consultation, organization: organization }
   let(:question) { create :question, consultation: consultation }
   let(:context) { { consultation: consultation, question: question } }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when the action is for the admin part" do
     let(:action) do
@@ -32,7 +32,7 @@
       context "when the consultation is published" do
         let(:consultation) { create :consultation, :published, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the consultation is not published" do
@@ -41,13 +41,13 @@
         context "when the user is not an admin" do
           let(:user) { nil }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user is an admin" do
           let(:user) { create :user, :admin, organization: organization }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -58,7 +58,7 @@
       context "when the question is published" do
         let(:question) { create :question, :published, consultation: consultation }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the question is not published" do
@@ -67,13 +67,13 @@
         context "when the user is not an admin" do
           let(:user) { nil }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user is an admin" do
           let(:user) { create :user, :admin, organization: organization }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -92,13 +92,13 @@
       context "when the question can be voted by the user" do
         let(:votable) { true }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the question cannot be voted by the user" do
         let(:votable) { false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -116,13 +116,13 @@
       context "when the question can be unvoted by the user" do
         let(:unvotable) { true }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the question cannot be unvoted by the user" do
         let(:unvotable) { false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
diff --git a/decidim-consultations/spec/requests/consultation_search_spec.rb b/decidim-consultations/spec/requests/consultation_search_spec.rb
new file mode 100644
index 0000000000000..b98b11b0bb123
--- /dev/null
+++ b/decidim-consultations/spec/requests/consultation_search_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Consultation search", type: :request do
+  subject { response.body }
+
+  let(:organization) { create(:organization) }
+  let!(:consultation1) { create(:consultation, :published, title: { en: "A doggo in the title" }, organization: organization) }
+  let!(:consultation2) { create(:consultation, :published, subtitle: { en: "A doggo in the subtitle" }, organization: organization) }
+  let!(:consultation3) { create(:consultation, :published, description: { en: "There is a doggo in the office" }, organization: organization) }
+  let!(:active_consultation) { create(:consultation, :published, :active, organization: organization) }
+  let!(:upcoming_consultation) { create(:consultation, :published, :upcoming, organization: organization) }
+  let!(:finished_consultation) { create(:consultation, :published, :finished, organization: organization) }
+  let!(:unpublished_consultation) { create(:consultation, :unpublished, organization: organization) }
+
+  let(:filter_params) { {} }
+  let(:request_path) { decidim_consultations.consultations_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all published consultations by default" do
+    expect(subject).to include(translated(consultation1.title))
+    expect(subject).to include(translated(consultation2.title))
+    expect(subject).to include(translated(consultation3.title))
+    expect(subject).to include(translated(active_consultation.title))
+    expect(subject).to include(translated(upcoming_consultation.title))
+    expect(subject).to include(translated(finished_consultation.title))
+    expect(subject).not_to include(translated(unpublished_consultation.title))
+  end
+
+  context "when filtering by text" do
+    let(:filter_params) { { search_text_cont: "doggo" } }
+
+    it "displays the consultations containing the search in the title, subtitle or the description" do
+      expect(subject).to include(translated(consultation1.title))
+      expect(subject).to include(translated(consultation2.title))
+      expect(subject).to include(translated(consultation3.title))
+      expect(subject).not_to include(translated(active_consultation.title))
+      expect(subject).not_to include(translated(upcoming_consultation.title))
+      expect(subject).not_to include(translated(finished_consultation.title))
+      expect(subject).not_to include(translated(unpublished_consultation.title))
+    end
+  end
+
+  context "when filtering by date" do
+    let(:filter_params) { { with_any_date: date } }
+
+    context "and the state is active" do
+      let(:date) { "active" }
+
+      it "returns the active consultations" do
+        expect(subject).to include(translated(consultation1.title))
+        expect(subject).to include(translated(consultation2.title))
+        expect(subject).to include(translated(consultation3.title))
+        expect(subject).to include(translated(active_consultation.title))
+        expect(subject).not_to include(translated(upcoming_consultation.title))
+        expect(subject).not_to include(translated(finished_consultation.title))
+        expect(subject).not_to include(translated(unpublished_consultation.title))
+      end
+    end
+
+    context "and the state is upcoming" do
+      let(:date) { "upcoming" }
+
+      it "returns the upcoming consultations" do
+        expect(subject).not_to include(translated(consultation1.title))
+        expect(subject).not_to include(translated(consultation2.title))
+        expect(subject).not_to include(translated(consultation3.title))
+        expect(subject).not_to include(translated(active_consultation.title))
+        expect(subject).to include(translated(upcoming_consultation.title))
+        expect(subject).not_to include(translated(finished_consultation.title))
+        expect(subject).not_to include(translated(unpublished_consultation.title))
+      end
+    end
+
+    context "and the state is finished" do
+      let(:date) { "finished" }
+
+      it "returns the finished consultations" do
+        expect(subject).not_to include(translated(consultation1.title))
+        expect(subject).not_to include(translated(consultation2.title))
+        expect(subject).not_to include(translated(consultation3.title))
+        expect(subject).not_to include(translated(active_consultation.title))
+        expect(subject).not_to include(translated(upcoming_consultation.title))
+        expect(subject).to include(translated(finished_consultation.title))
+        expect(subject).not_to include(translated(unpublished_consultation.title))
+      end
+    end
+
+    context "and the state is all" do
+      let(:date) { "all" }
+
+      it "returns the all consultations" do
+        expect(subject).to include(translated(consultation1.title))
+        expect(subject).to include(translated(consultation2.title))
+        expect(subject).to include(translated(consultation3.title))
+        expect(subject).to include(translated(active_consultation.title))
+        expect(subject).to include(translated(upcoming_consultation.title))
+        expect(subject).to include(translated(finished_consultation.title))
+        expect(subject).not_to include(translated(unpublished_consultation.title))
+      end
+    end
+  end
+end
diff --git a/decidim-consultations/spec/services/decidim/consultations/consultation_search_spec.rb b/decidim-consultations/spec/services/decidim/consultations/consultation_search_spec.rb
deleted file mode 100644
index 708aff2d97b41..0000000000000
--- a/decidim-consultations/spec/services/decidim/consultations/consultation_search_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Consultations
-    # Refers to the filter in consultations list view
-    describe ConsultationSearch do
-      subject do
-        described_class.new(
-          search_text: search_text,
-          state: state,
-          organization: organization
-        ).results
-      end
-
-      let(:organization) { create :organization }
-      let(:search_text) { nil }
-      let(:state) { "all" }
-
-      describe "when the filter includes search_text" do
-        let(:search_text) { "dog" }
-
-        it "returns the consultations containing the search in the title, subtitle or the description" do
-          create_list(:consultation, 3, :published, organization: organization)
-          create(:consultation, :published, title: { 'en': "A dog in the title" }, organization: organization)
-          create(:consultation, :published, subtitle: { 'en': "A dog in the subtitle" }, organization: organization)
-          create(:consultation, :published, description: { 'en': "There is a dog in the office" }, organization: organization)
-
-          expect(subject.size).to eq(3)
-        end
-      end
-
-      describe "when the filter includes state" do
-        let!(:active_consultations) do
-          create_list(:consultation, 3, :published, :active, organization: organization)
-        end
-
-        let!(:upcoming_consultations) do
-          create_list(:consultation, 3, :published, :upcoming, organization: organization)
-        end
-
-        let!(:finished_consultations) do
-          create_list(:consultation, 3, :published, :finished, organization: organization)
-        end
-
-        context "when filtering active consultations" do
-          let(:state) { "active" }
-
-          it "returns only active initiatives" do
-            expect(subject.size).to eq(3)
-            expect(subject).to match_array(active_consultations)
-          end
-        end
-
-        context "when filtering upcoming consultations" do
-          let(:state) { "upcoming" }
-
-          it "returns only upcoming consultations" do
-            expect(subject.size).to eq(3)
-            expect(subject).to match_array(upcoming_consultations)
-          end
-        end
-
-        context "when filtering finished consultations" do
-          let(:state) { "finished" }
-
-          it "returns only finished consultations" do
-            expect(subject.size).to eq(3)
-            expect(subject).to match_array(finished_consultations)
-          end
-        end
-
-        context "when filtering all consultations" do
-          let(:state) { "all" }
-
-          it "Returns all consultations" do
-            expect(subject.size).to eq(9)
-            expect(subject).to include(*active_consultations)
-            expect(subject).to include(*upcoming_consultations)
-            expect(subject).to include(*finished_consultations)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-consultations/spec/services/decidim/consultations/searchable_consultation_resource_spec.rb b/decidim-consultations/spec/services/decidim/consultations/searchable_consultation_resource_spec.rb
index d6a58c78bc2f6..34c4b287ecc5a 100644
--- a/decidim-consultations/spec/services/decidim/consultations/searchable_consultation_resource_spec.rb
+++ b/decidim-consultations/spec/services/decidim/consultations/searchable_consultation_resource_spec.rb
@@ -12,20 +12,20 @@ module Decidim
           organization: organization,
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
-          description: description_1
+          description: description1
         )
       end
       let(:participatory_space) { consultation }
-      let(:consultation_2) do
+      let(:consultation2) do
         create(
           :consultation,
           organization: organization,
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
-          description: description_2
+          description: description2
         )
       end
-      let(:participatory_space2) { consultation_2 }
+      let(:participatory_space2) { consultation2 }
       let(:searchable_resource_attrs_mapper) do
         lambda { |space, locale|
           {
diff --git a/decidim-consultations/spec/system/admin/admin_manages_consultations_spec.rb b/decidim-consultations/spec/system/admin/admin_manages_consultations_spec.rb
index 2b547622f1989..c25eadb8386ce 100644
--- a/decidim-consultations/spec/system/admin/admin_manages_consultations_spec.rb
+++ b/decidim-consultations/spec/system/admin/admin_manages_consultations_spec.rb
@@ -55,10 +55,12 @@
           ca: "Descripció més llarga"
         )
         fill_in :consultation_slug, with: "slug"
-        attach_file :consultation_banner_image, image2_path
+      end
 
-        scope_pick select_data_picker(:consultation_decidim_highlighted_scope_id), organization.scopes.first
+      dynamically_attach_file(:consultation_banner_image, image2_path)
 
+      within ".new_consultation" do
+        scope_pick select_data_picker(:consultation_decidim_highlighted_scope_id), organization.scopes.first
         find("*[type=submit]").click
       end
 
@@ -108,9 +110,12 @@
           ca: "Descripció més llarga"
         )
         fill_in :consultation_slug, with: "slug"
-        attach_file :consultation_banner_image, image2_path
-        scope_pick select_data_picker(:consultation_decidim_highlighted_scope_id), organization.scopes.first
+      end
+
+      dynamically_attach_file(:consultation_banner_image, image2_path)
 
+      within ".new_consultation" do
+        scope_pick select_data_picker(:consultation_decidim_highlighted_scope_id), organization.scopes.first
         find("*[type=submit]").click
       end
 
@@ -131,7 +136,7 @@
         es: "Mi nuevo título",
         ca: "El meu nou títol"
       )
-      attach_file :consultation_banner_image, image3_path
+      dynamically_attach_file(:consultation_banner_image, image3_path, remove_before: true)
 
       within ".edit_consultation" do
         find("*[type=submit]").click
diff --git a/decidim-consultations/spec/system/admin/admin_manages_questions_spec.rb b/decidim-consultations/spec/system/admin/admin_manages_questions_spec.rb
index 11cbc479c31c1..4bcc743381a75 100644
--- a/decidim-consultations/spec/system/admin/admin_manages_questions_spec.rb
+++ b/decidim-consultations/spec/system/admin/admin_manages_questions_spec.rb
@@ -44,10 +44,14 @@
           en: "What is decided"
         )
         fill_in :question_slug, with: "slug"
-        attach_file :question_hero_image, image2_path
-        attach_file :question_banner_image, image1_path
+
         scope_pick select_data_picker(:question_decidim_scope_id), organization.scopes.first
+      end
 
+      dynamically_attach_file(:question_hero_image, image2_path)
+      dynamically_attach_file(:question_banner_image, image1_path)
+
+      within ".new_question" do
         find("*[type=submit]").click
       end
 
@@ -94,10 +98,13 @@
           "#question-what_is_decided-tabs",
           en: "What is decided"
         )
-        attach_file :question_banner_image, image1_path
-        attach_file :question_hero_image, image2_path
         scope_pick select_data_picker(:question_decidim_scope_id), organization.scopes.first
+      end
+
+      dynamically_attach_file(:question_banner_image, image1_path)
+      dynamically_attach_file(:question_hero_image, image2_path)
 
+      within ".new_question" do
         find("*[type=submit]").click
       end
 
@@ -117,7 +124,7 @@
         "#question-title-tabs",
         en: "My new title"
       )
-      attach_file :question_banner_image, image3_path
+      dynamically_attach_file(:question_banner_image, image3_path, remove_before: true)
 
       within ".edit_question" do
         find("*[type=submit]").click
diff --git a/decidim-consultations/spec/system/finished_consultations.rb b/decidim-consultations/spec/system/finished_consultations_spec.rb
similarity index 56%
rename from decidim-consultations/spec/system/finished_consultations.rb
rename to decidim-consultations/spec/system/finished_consultations_spec.rb
index 9208d42cb64b0..7c67825349ef8 100644
--- a/decidim-consultations/spec/system/finished_consultations.rb
+++ b/decidim-consultations/spec/system/finished_consultations_spec.rb
@@ -15,9 +15,16 @@
     end
 
     it "shows them" do
-      visit decidim_consultations.finished_consultations_path
-      expect(page).to have_content("PAST CONSULTATIONS")
-      expect(page).to have_i18n_content(consultation.title)
+      visit decidim_consultations.consultations_path
+
+      within ".filters" do
+        choose "Finished"
+      end
+
+      within ".card--consultation" do
+        expect(page).to have_content("FINISHED")
+        expect(page).to have_i18n_content(consultation.title)
+      end
     end
   end
 
@@ -27,9 +34,12 @@
     end
 
     it "shows them" do
-      visit decidim_consultations.finished_consultations_path
-      expect(page).to have_content("ACTIVE CONSULTATIONS")
-      expect(page).to have_i18n_content(consultation.title)
+      visit decidim_consultations.consultations_path
+
+      within ".card--consultation" do
+        expect(page).to have_content("OPEN VOTES")
+        expect(page).to have_i18n_content(consultation.title)
+      end
     end
   end
 end
diff --git a/decidim-consultations/spec/types/consultation_question_type_spec.rb b/decidim-consultations/spec/types/consultation_question_type_spec.rb
index e98147d64b373..2e1b53abf692c 100644
--- a/decidim-consultations/spec/types/consultation_question_type_spec.rb
+++ b/decidim-consultations/spec/types/consultation_question_type_spec.rb
@@ -142,7 +142,7 @@ module Consultations
         let(:query) { '{ originScope { translation(locale: "en")}}' }
 
         it "returns the originScope field" do
-          expect(response["originScope"]).to be nil
+          expect(response["originScope"]).to be_nil
         end
       end
 
@@ -150,7 +150,7 @@ module Consultations
         let(:query) { '{ originTitle { translation(locale: "en")}}' }
 
         it "returns the originTitle field" do
-          expect(response["originTitle"]).to be nil
+          expect(response["originTitle"]).to be_nil
         end
       end
 
@@ -222,7 +222,7 @@ module Consultations
         let(:query) { '{ instructions { translation(locale: "en")}}' }
 
         it "returns the instructions field" do
-          expect(response["instructions"]).to be nil
+          expect(response["instructions"]).to be_nil
         end
       end
     end
diff --git a/decidim-consultations/spec/types/consultation_type_spec.rb b/decidim-consultations/spec/types/consultation_type_spec.rb
index 7564deb1d2b96..9548bef60c577 100644
--- a/decidim-consultations/spec/types/consultation_type_spec.rb
+++ b/decidim-consultations/spec/types/consultation_type_spec.rb
@@ -77,7 +77,7 @@ module Consultations
       describe "startVotingDate" do
         let(:query) { "{ startVotingDate }" }
 
-        it "returns the signature start date of the consultation " do
+        it "returns the signature start date of the consultation" do
           expect(response["startVotingDate"]).to eq(model.start_voting_date.to_date.iso8601)
         end
       end
@@ -94,7 +94,7 @@ module Consultations
         let(:query) { "{ resultsPublishedAt }" }
 
         it "returns when the consultation results have been published" do
-          expect(response["resultsPublishedAt"]).to be nil
+          expect(response["resultsPublishedAt"]).to be_nil
         end
       end
 
diff --git a/decidim-core/README.md b/decidim-core/README.md
index b1b1f9517e731..2b31cda34f58c 100644
--- a/decidim-core/README.md
+++ b/decidim-core/README.md
@@ -70,7 +70,7 @@ This can be done in an initializer (like user does), in a participatory_space ma
 
 ## Metrics docs
 
-Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://github.com/decidim/decidim/tree/develop/docs/advanced/metrics.md)
+Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://docs.decidim.org/en/develop/metrics/)
 
 ## Contributing
 
diff --git a/decidim-core/app/cells/decidim/amendable/announcement_cell.rb b/decidim-core/app/cells/decidim/amendable/announcement_cell.rb
index 788e679916731..c017836319abd 100644
--- a/decidim-core/app/cells/decidim/amendable/announcement_cell.rb
+++ b/decidim-core/app/cells/decidim/amendable/announcement_cell.rb
@@ -6,16 +6,13 @@ class AnnouncementCell < Decidim::ViewModel
     include Decidim::ApplicationHelper
 
     def show
-      cell "decidim/announcement", announcement
+      cell "decidim/announcement", announcement, callout_class: state_classes
     end
 
     private
 
     def announcement
-      {
-        announcement: emendation_message + promoted_message,
-        callout_class: state_classes
-      }
+      emendation_message + promoted_message
     end
 
     def emendation_message
@@ -57,12 +54,10 @@ def state_classes
       case model.state
       when "accepted"
         "success"
-      when "rejected"
+      when "rejected", "withdrawn"
         "alert"
       when "evaluating"
         "warning"
-      when "withdrawn"
-        "alert"
       else
         "muted"
       end
diff --git a/decidim-core/app/cells/decidim/announcement_cell.rb b/decidim-core/app/cells/decidim/announcement_cell.rb
index dd7f62f94e829..eace044ba03c3 100644
--- a/decidim-core/app/cells/decidim/announcement_cell.rb
+++ b/decidim-core/app/cells/decidim/announcement_cell.rb
@@ -54,7 +54,7 @@ def body
     def clean_body
       return unless body
 
-      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join("")
+      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join
     end
 
     def clean_announcement
@@ -62,7 +62,7 @@ def clean_announcement
     end
 
     def clean(value)
-      decidim_sanitize(translated_attribute(value))
+      decidim_sanitize_admin(translated_attribute(value))
     end
   end
 end
diff --git a/decidim-core/app/cells/decidim/author_cell.rb b/decidim-core/app/cells/decidim/author_cell.rb
index 4a76d6a11a562..117846a80ebdb 100644
--- a/decidim-core/app/cells/decidim/author_cell.rb
+++ b/decidim-core/app/cells/decidim/author_cell.rb
@@ -102,7 +102,7 @@ def creation_date
     end
 
     def commentable?
-      from_context && from_context.class.include?(Decidim::Comments::Commentable)
+      from_context && from_context.class.include?(Decidim::Comments::Commentable) && from_context.try(:commentable?)
     end
 
     def endorsable?
diff --git a/decidim-core/app/cells/decidim/content_blocks/cta_cell.rb b/decidim-core/app/cells/decidim/content_blocks/cta_cell.rb
index 8455b474a425c..419b02adf111e 100644
--- a/decidim-core/app/cells/decidim/content_blocks/cta_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/cta_cell.rb
@@ -16,7 +16,7 @@ def translated_button_text
       end
 
       def translated_description
-        @translated_description ||= decidim_sanitize_editor(translated_attribute(model.settings.description))
+        @translated_description ||= decidim_sanitize_editor_admin(translated_attribute(model.settings.description))
       end
 
       def button_url
diff --git a/decidim-core/app/cells/decidim/content_blocks/footer_sub_hero/show.erb b/decidim-core/app/cells/decidim/content_blocks/footer_sub_hero/show.erb
index ea28c0c1e6e21..9162db0d61781 100644
--- a/decidim-core/app/cells/decidim/content_blocks/footer_sub_hero/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/footer_sub_hero/show.erb
@@ -1,4 +1,4 @@
-<section class="footer__subhero extended subhero home-section">
+<section id="footer_sub_hero" class="footer__subhero extended subhero home-section">
   <div class="row">
     <div class="columns small-centered large-10">
       <h3 class="heading3"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h3>
diff --git a/decidim-core/app/cells/decidim/content_blocks/hero/show.erb b/decidim-core/app/cells/decidim/content_blocks/hero/show.erb
index b34bf35082033..5cdf6f1d54ecb 100644
--- a/decidim-core/app/cells/decidim/content_blocks/hero/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/hero/show.erb
@@ -1,4 +1,4 @@
-<section class="extended hero home-section" style="background-image:url('<%= background_image %>');">
+<section id="hero" class="extended hero home-section" style="background-image:url('<%= background_image %>');">
   <div class="hero__container">
     <div class="row">
       <div class="columns small-centered large-10">
@@ -6,7 +6,7 @@
           <% if translated_welcome_text.blank? %>
             <%= t("decidim.pages.home.hero.welcome", organization: current_organization.name) %>
           <% else %>
-            <%= decidim_sanitize translated_welcome_text %>
+            <%= decidim_sanitize_admin translated_welcome_text %>
           <% end %>
         </h1>
       </div>
diff --git a/decidim-core/app/cells/decidim/content_blocks/hero_cell.rb b/decidim-core/app/cells/decidim/content_blocks/hero_cell.rb
index 5c3dca3acf182..e78d74f6d3af0 100644
--- a/decidim-core/app/cells/decidim/content_blocks/hero_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/hero_cell.rb
@@ -29,6 +29,7 @@ def cache_hash
         hash << Digest::MD5.hexdigest(model.attributes.to_s)
         hash << current_organization.cache_key_with_version
         hash << I18n.locale.to_s
+        hash << background_image
 
         hash.join(Decidim.cache_key_separator)
       end
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb
index cfec795127423..34a71d1b5367a 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb
@@ -1,4 +1,4 @@
-<section class="extended highligted-content-banner home-section"
+<section id="highlighted_content_banner" class="extended highligted-content-banner home-section"
           style="background-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>');">
   <div class="highligted-content-banner__container">
     <div class="row">
@@ -6,9 +6,9 @@
         <h1 class="text-highlight heading1 highligted-content-banner-heading">
           <%= translated_attribute current_organization.highlighted_content_banner_title %>
         </h1>
-        <span class="text-highlight">
-          <%= decidim_sanitize_editor translated_attribute current_organization.highlighted_content_banner_short_description %>
-        </span>
+        <div class="text-highlight">
+          <%= decidim_sanitize_editor_admin translated_attribute current_organization.highlighted_content_banner_short_description %>
+        </div>
       </div>
       <div class="columns large-2">
         <%= link_to current_organization.highlighted_content_banner_action_url,
diff --git a/decidim-core/app/cells/decidim/content_blocks/highlighted_elements_cell.rb b/decidim-core/app/cells/decidim/content_blocks/highlighted_elements_cell.rb
index e1b0c92991425..625f273b37fec 100644
--- a/decidim-core/app/cells/decidim/content_blocks/highlighted_elements_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/highlighted_elements_cell.rb
@@ -44,7 +44,7 @@ def limit
       end
 
       def random_seed
-        rand * 2 - 1
+        (rand * 2) - 1
       end
     end
   end
diff --git a/decidim-core/app/cells/decidim/content_blocks/how_to_participate/show.erb b/decidim-core/app/cells/decidim/content_blocks/how_to_participate/show.erb
index 8aaf29be6cae1..e91aeaaadb679 100644
--- a/decidim-core/app/cells/decidim/content_blocks/how_to_participate/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/how_to_participate/show.erb
@@ -1,4 +1,4 @@
-<section class="extended home-section">
+<section id="how_to_participate" class="extended home-section">
   <div class="wrapper-home">
     <div class="row column text-center">
       <h2 class="heading3"><%= t("decidim.pages.home.extended.how_to_participate") %></h2>
diff --git a/decidim-core/app/cells/decidim/content_blocks/last_activity/show.erb b/decidim-core/app/cells/decidim/content_blocks/last_activity/show.erb
index e23db05c487dc..06803f47473a9 100644
--- a/decidim-core/app/cells/decidim/content_blocks/last_activity/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/last_activity/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home upcoming-events home-section">
+<section id="last_activity" class="wrapper-home upcoming-events home-section">
   <div class="row">
     <h3 class="section-heading"><%= t("decidim.content_blocks.last_activity.title") %></h3>
     <div class="row">
diff --git a/decidim-core/app/cells/decidim/content_blocks/last_activity_cell.rb b/decidim-core/app/cells/decidim/content_blocks/last_activity_cell.rb
index 47d15c81c1836..32b240e6973c1 100644
--- a/decidim-core/app/cells/decidim/content_blocks/last_activity_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/last_activity_cell.rb
@@ -56,10 +56,10 @@ def cache_hash
       end
 
       def activities
-        @activities ||= HomeActivitySearch.new(
+        @activities ||= ActionLog.where(
           organization: current_organization,
-          resource_type: "all"
-        ).results.limit(activities_to_show * 6)
+          visibility: %w(public-only all)
+        ).with_new_resource_type("all").order(created_at: :desc).limit(activities_to_show * 6)
       end
 
       def activities_to_show
diff --git a/decidim-core/app/cells/decidim/content_blocks/stats_cell.rb b/decidim-core/app/cells/decidim/content_blocks/stats_cell.rb
index 06e4ea54d097d..a07ead1ec695c 100644
--- a/decidim-core/app/cells/decidim/content_blocks/stats_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/stats_cell.rb
@@ -3,10 +3,6 @@
 module Decidim
   module ContentBlocks
     class StatsCell < Decidim::ViewModel
-      cache :show, expires_in: 10.minutes, if: :perform_caching? do
-        cache_hash
-      end
-
       def stats
         @stats ||= HomeStatsPresenter.new(organization: current_organization)
       end
@@ -19,6 +15,10 @@ def cache_hash
         hash.push(current_organization.cache_key)
         hash.join(Decidim.cache_key_separator)
       end
+
+      def cache_expiry_time
+        10.minutes
+      end
     end
   end
 end
diff --git a/decidim-core/app/cells/decidim/content_blocks/sub_hero/show.erb b/decidim-core/app/cells/decidim/content_blocks/sub_hero/show.erb
index c51ab647127da..85d65e70bf5e1 100644
--- a/decidim-core/app/cells/decidim/content_blocks/sub_hero/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/sub_hero/show.erb
@@ -1,4 +1,4 @@
-  <section class="extended subhero home-section">
+  <section id="sub_hero" class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
         <h2 class="heading2">
diff --git a/decidim-core/app/cells/decidim/content_blocks/sub_hero_cell.rb b/decidim-core/app/cells/decidim/content_blocks/sub_hero_cell.rb
index 95d7157b2ea00..f87e7abe967ed 100644
--- a/decidim-core/app/cells/decidim/content_blocks/sub_hero_cell.rb
+++ b/decidim-core/app/cells/decidim/content_blocks/sub_hero_cell.rb
@@ -15,7 +15,7 @@ def show
       private
 
       def organization_description
-        desc = decidim_sanitize(translated_attribute(current_organization.description))
+        desc = decidim_sanitize_admin(translated_attribute(current_organization.description))
 
         # Strip the surrounding paragraph tag because it is not allowed within
         # a <hN> element.
diff --git a/decidim-core/app/cells/decidim/data_consent/category.erb b/decidim-core/app/cells/decidim/data_consent/category.erb
new file mode 100644
index 0000000000000..e6bf13ee7d158
--- /dev/null
+++ b/decidim-core/app/cells/decidim/data_consent/category.erb
@@ -0,0 +1,64 @@
+<div class="category-wrapper margin-vertical-1" data-id="<%= category[:slug] %>">
+  <div class="category-row flex-center">
+    <button class="dc-title padding-left-3">
+      <span class="h5 dc-category-title">
+        <strong><%= category[:title] %></strong>
+      </span>
+    </button>
+
+    <div class="dc-switch">
+      <input
+        class="switch-input"
+        <%= %(checked="checked") if category[:mandatory] %>
+        id="dc-<%= category[:slug] %>"
+        type="checkbox"
+        name="<%= category[:slug] %>"
+        <%= "disabled" if category[:mandatory] %>>
+
+      <label class="switch-paddle" for="dc-<%= category[:slug] %>">
+        <span class="show-for-sr"><%= t("layouts.decidim.data_consent.modal.toggle", consent_category: category[:title]) %></span>
+      </label>
+    </div>
+  </div>
+  <div class="dc-description hide">
+    <div class="description-text">
+      <p><%= category[:description] %></p>
+    </div>
+
+    <% if category[:items].present? %>
+      <div class="dataconsent-details-wrapper">
+        <div class="row detail-titles">
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.type") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.name") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.service") %>
+          </div>
+          <div class="columns small-6">
+            <%= t("layouts.decidim.data_consent.details.columns.description") %>
+          </div>
+        </div>
+
+        <% category[:items].each do |item| %>
+          <div class="row dataconsent-detail-row">
+            <div class="columns small-2">
+              <%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %>
+            </div>
+            <div class="columns small-2">
+              <%= item[:name] %>
+            </div>
+            <div class="columns small-2">
+              <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %>
+            </div>
+            <div class="columns small-6">
+              <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/decidim-core/app/cells/decidim/data_consent/dialog.erb b/decidim-core/app/cells/decidim/data_consent/dialog.erb
new file mode 100644
index 0000000000000..1a9d47606d7db
--- /dev/null
+++ b/decidim-core/app/cells/decidim/data_consent/dialog.erb
@@ -0,0 +1,29 @@
+<div id="dc-dialog-wrapper" class="flex-center hide robots-noindex robots-nocontent noindex" data-nosnippet role="region">
+  <div class="dc-dialog padding-vertical-1">
+    <div class="row expanded">
+      <div class="columns medium-12 large-8">
+        <div class="dc-content">
+          <div class="h5">
+            <%= t("layouts.decidim.data_consent.dialog.title") %>
+          </div>
+          <div>
+            <%= t("layouts.decidim.data_consent.dialog.description") %>
+          </div>
+        </div>
+      </div>
+      <div class="columns medium-12 large-4">
+        <div class="dc-button-wrapper flex-center">
+          <button id="dc-dialog-accept" class="button">
+            <%= t("layouts.decidim.data_consent.dialog.accept_all") %>
+          </button>
+          <button id="dc-dialog-reject" class="button hollow">
+            <%= t("layouts.decidim.data_consent.dialog.accept_only_essential") %>
+          </button>
+          <button id="dc-dialog-settings" class="button clear" data-open="dc-modal">
+            <%= t("layouts.decidim.data_consent.dialog.settings") %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/decidim-core/app/cells/decidim/data_consent/modal.erb b/decidim-core/app/cells/decidim/data_consent/modal.erb
new file mode 100644
index 0000000000000..e7859e7e4e539
--- /dev/null
+++ b/decidim-core/app/cells/decidim/data_consent/modal.erb
@@ -0,0 +1,39 @@
+<div class="reveal dc-modal" id="dc-modal" role="dialog" data-close-on-click="false" data-close-on-esc="false" aria-modal="true" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t("layouts.decidim.data_consent.modal.title") %>
+    </h3>
+    <p>
+      <%= t("layouts.decidim.data_consent.modal.description") %>
+    </p>
+  </div>
+
+  <div class="dc-categories">
+    <% categories.each do |category| %>
+      <%= render(
+        {
+          view: :category,
+          locals: {
+            category: category
+          }
+        }
+      ) %>
+    <% end %>
+  </div>
+
+  <div class="dc-buttons-wrapper flex-center">
+    <div class="dc-buttons-left">
+      <button id="dc-modal-accept" class="button" data-close>
+        <%= t("layouts.decidim.data_consent.modal.accept_all") %>
+      </button>
+      <button id="dc-modal-reject" class="button hollow" data-close>
+        <%= t("layouts.decidim.data_consent.modal.accept_only_essential") %>
+      </button>
+    </div>
+    <div class="dc-buttons-right">
+      <button id="dc-modal-save" class="button clear" data-close>
+        <%= t("layouts.decidim.data_consent.modal.save_settings") %>
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/decidim-core/app/cells/decidim/data_consent/show.erb b/decidim-core/app/cells/decidim/data_consent/show.erb
new file mode 100644
index 0000000000000..6f889f353c518
--- /dev/null
+++ b/decidim-core/app/cells/decidim/data_consent/show.erb
@@ -0,0 +1,3 @@
+<%= render :dialog %>
+
+<%= render :modal %>
diff --git a/decidim-core/app/cells/decidim/data_consent_cell.rb b/decidim-core/app/cells/decidim/data_consent_cell.rb
new file mode 100644
index 0000000000000..72af3bda8f59c
--- /dev/null
+++ b/decidim-core/app/cells/decidim/data_consent_cell.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  class DataConsentCell < Decidim::ViewModel
+    def show
+      render
+    end
+
+    def categories
+      @categories ||= Decidim.consent_categories.map do |category|
+        {
+          slug: category[:slug],
+          title: t("layouts.decidim.data_consent.modal.#{category[:slug]}.title"),
+          description: t("layouts.decidim.data_consent.modal.#{category[:slug]}.description"),
+          mandatory: category[:mandatory],
+          items: category.has_key?(:items) ? category[:items] : []
+        }
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/cells/decidim/follow_button_cell.rb b/decidim-core/app/cells/decidim/follow_button_cell.rb
index d6ed8a431e6ea..ad759773e0114 100644
--- a/decidim-core/app/cells/decidim/follow_button_cell.rb
+++ b/decidim-core/app/cells/decidim/follow_button_cell.rb
@@ -28,13 +28,11 @@ def button_classes
 
       extra_classes = ""
       extra_classes += " active" if current_user_follows?
-      extra_classes += begin
-        if large?
-          " button--sc"
-        else
-          " small"
-        end
-      end
+      extra_classes += if large?
+                         " button--sc"
+                       else
+                         " small"
+                       end
 
       "button expanded button--icon follow-button secondary hollow #{extra_classes}"
     end
diff --git a/decidim-core/app/cells/decidim/newsletter_templates/base_cell.rb b/decidim-core/app/cells/decidim/newsletter_templates/base_cell.rb
index 1da4cead5fa7b..770a4c74e517e 100644
--- a/decidim-core/app/cells/decidim/newsletter_templates/base_cell.rb
+++ b/decidim-core/app/cells/decidim/newsletter_templates/base_cell.rb
@@ -25,6 +25,14 @@ def newsletter
       def recipient_user
         options[:recipient_user]
       end
+
+      def custom_url_for_mail_root
+        options[:custom_url_for_mail_root]
+      end
+
+      def decidim
+        @decidim ||= EngineRouter.new("decidim", {})
+      end
     end
   end
 end
diff --git a/decidim-core/app/cells/decidim/newsletter_templates/basic_only_text/show.erb b/decidim-core/app/cells/decidim/newsletter_templates/basic_only_text/show.erb
index 9632d8192018b..bb867ef4c4355 100644
--- a/decidim-core/app/cells/decidim/newsletter_templates/basic_only_text/show.erb
+++ b/decidim-core/app/cells/decidim/newsletter_templates/basic_only_text/show.erb
@@ -16,7 +16,7 @@
               <tr>
                 <th>
                   <center>
-                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization, custom_url_for_mail_root: custom_url_for_mail_root } %>
                   </center>
                 </th>
               </tr>
@@ -27,7 +27,7 @@
               <tr>
                 <th>
                   <% if organization.official_img_header.attached? %>
-                    <%= link_to organization.official_url do %>
+                    <%= link_to newsletter.organization_official_url do %>
                       <%= image_tag organization.attached_uploader(:official_img_header).path, alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
@@ -72,8 +72,8 @@
           <th class="expander"></th>
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
-              <% if @custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
+              <% if custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
               <% else %>
                 <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
diff --git a/decidim-core/app/cells/decidim/newsletter_templates/image_text_cta/show.erb b/decidim-core/app/cells/decidim/newsletter_templates/image_text_cta/show.erb
index d87c928de3150..523ebb65dffca 100644
--- a/decidim-core/app/cells/decidim/newsletter_templates/image_text_cta/show.erb
+++ b/decidim-core/app/cells/decidim/newsletter_templates/image_text_cta/show.erb
@@ -24,7 +24,7 @@ table.button table td {
               <tr>
                 <th>
                   <center>
-                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization, custom_url_for_mail_root: custom_url_for_mail_root } %>
                   </center>
                 </th>
               </tr>
@@ -35,7 +35,7 @@ table.button table td {
               <tr>
                 <th>
                   <% if organization.official_img_header.attached? %>
-                    <%= link_to organization.official_url do %>
+                    <%= link_to newsletter.organization_official_url do %>
                       <%= image_tag organization.attached_uploader(:official_img_header).url(host: organization.host), alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
@@ -111,8 +111,8 @@ table.button table td {
           <th class="expander"></th>
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
-              <% if @custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
+              <% if custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
               <% else %>
                 <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
diff --git a/decidim-core/app/cells/decidim/profile_sidebar_cell.rb b/decidim-core/app/cells/decidim/profile_sidebar_cell.rb
index befa358d6264e..635d43dde932a 100644
--- a/decidim-core/app/cells/decidim/profile_sidebar_cell.rb
+++ b/decidim-core/app/cells/decidim/profile_sidebar_cell.rb
@@ -64,7 +64,7 @@ def can_leave_group?
       return false unless current_user
       return false if model.is_a?(Decidim::User)
 
-      Decidim::UserGroupMembership.where(user: current_user, user_group: model).where.not(role: :creator).any?
+      Decidim::UserGroupMembership.where(user: current_user, user_group: model).any?
     end
 
     def user_group_email_to_be_confirmed?
diff --git a/decidim-core/app/cells/decidim/search_results_cell.rb b/decidim-core/app/cells/decidim/search_results_cell.rb
index f6d43e1ee320c..3f9aa864180f3 100644
--- a/decidim-core/app/cells/decidim/search_results_cell.rb
+++ b/decidim-core/app/cells/decidim/search_results_cell.rb
@@ -29,7 +29,7 @@ def params
     end
 
     def selected_resource_type
-      params.dig(:filter, :resource_type)
+      params.dig(:filter, :with_resource_type)
     end
 
     def has_selected_resource_type?
diff --git a/decidim-core/app/cells/decidim/tos_page/refuse_btn_modal.erb b/decidim-core/app/cells/decidim/tos_page/refuse_btn_modal.erb
index f49c9345dacab..f3a0d64ad00d1 100644
--- a/decidim-core/app/cells/decidim/tos_page/refuse_btn_modal.erb
+++ b/decidim-core/app/cells/decidim/tos_page/refuse_btn_modal.erb
@@ -16,7 +16,7 @@
 
   <div class="row">
     <p>
-      <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", data_portability_path: decidim.data_portability_path, delete_path: decidim.delete_account_path) %>
+      <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", download_your_data_path: decidim.download_your_data_path, delete_path: decidim.delete_account_path) %>
     </p>
   </div>
 
diff --git a/decidim-core/app/cells/decidim/upload_modal/files.erb b/decidim-core/app/cells/decidim/upload_modal/files.erb
new file mode 100644
index 0000000000000..ae6fd09e9aa06
--- /dev/null
+++ b/decidim-core/app/cells/decidim/upload_modal/files.erb
@@ -0,0 +1,52 @@
+<div class="dynamic-uploads <%= with_title %> upload-container-for-<%= attribute %>">
+  <%= tag.strong label unless has_title? %>
+  <div class="<%= actions_wrapper_class %>">
+    <div class="active-uploads">
+      <% attachments.each do |attachment| %>
+        <% next if attachment.is_a? Array %>
+
+        <div class="attachment-details" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
+          <% if has_title? %>
+            <span><%= title_for(attachment) %> (<%= truncated_file_name_for(attachment) %>)</span>
+            <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
+          <% else %>
+            <% if blob(attachment).image? %>
+              <span><%= truncated_file_name_for(attachment, 15) %></span>
+            <% else %>
+              <%= link_to truncated_file_name_for(attachment), file_attachment_path(attachment) %>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+    <%= tag.button button_label,
+      id: button_id,
+      name: attribute,
+      class: button_class,
+      type: "button",
+      data: {
+        open: modal_id,
+        upload: {
+          add_attribute: add_attribute,
+          resource_name: resource_name,
+          resource_class: resource_class,
+          optional: optional,
+          max_file_size: max_file_size,
+          multiple: multiple,
+          titled: has_title?,
+          form_object_class: form_object_class
+        }.transform_keys { |key| key.to_s.camelize(:lower) }
+      } %>
+    <%= input_validation_field unless optional %>
+  </div>
+
+  <% if !has_title? && file_attachment_path(attachments.first) && blob(attachments.first).image? %>
+    <strong><%= attachment_label %></strong>
+    <%= link_to image_tag(file_attachment_path(attachments.first), alt: attribute), file_attachment_path(attachments.first) %>
+  <% elsif !has_title? && uploader_default_image_path(attribute).present? %>
+      <span><%= t("default_image", scope: "decidim.forms") %></span>
+      <%= link_to uploader_default_image_path(attribute) do %>
+        <%= image_tag uploader_default_image_path(attribute) %>
+      <% end %>
+  <% end %>
+</div>
diff --git a/decidim-core/app/cells/decidim/upload_modal/modal.erb b/decidim-core/app/cells/decidim/upload_modal/modal.erb
new file mode 100644
index 0000000000000..3e620a9b55fb6
--- /dev/null
+++ b/decidim-core/app/cells/decidim/upload_modal/modal.erb
@@ -0,0 +1,49 @@
+<div class="reveal upload-modal" id="<%= modal_id %>" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title" data-addlabel="<%= button_label %>" data-editlabel="<%= button_edit_label %>"><%= label %></h3>
+    <button class="close-button" data-close aria-label="<%= t("layouts.decidim.upload_modal.close_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="help">
+    <span><%= explanation %></span>
+    <ul>
+      <% help_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+  <div class="row dropzone-container" data-name="<%= attribute %>">
+    <%= tag.div class: "upload-items", data: {
+        locales: {
+          error: t("decidim.forms.upload.labels.error"),
+          title_required: t("decidim.forms.upload.labels.title_required"),
+          file_size_too_large: t("decidim.forms.upload.labels.file_size_too_large", megabytes: (max_file_size_mb)),
+          remove: t("decidim.forms.upload.labels.remove"),
+          title: t("decidim.forms.upload.labels.title"),
+          uploaded: t("decidim.forms.upload.labels.uploaded"),
+          validating: t("decidim.forms.upload.labels.validating"),
+          validation_error: t("decidim.forms.upload.labels.validation_error")
+        }
+      } %>
+    <label class="dropzone">
+      <%= form.file_field add_attribute,
+        id: nil,
+        class: "hide",
+        label: false,
+        multiple: true,
+        direct_upload: true,
+        data: { direct_upload_url: direct_upload_url } %>
+      <span><%= t("decidim.forms.upload_help.dropzone") %></span>
+    </label>
+  </div>
+
+  <div class="row columns reveal__content">
+    <div class="text-center">
+      <button class="button add-file-<%= attribute %>" data-close><%= t("decidim.forms.upload.labels.save") %></button>
+      <button class="link cancel-attachment margin-left-1" data-close><%= t("decidim.forms.upload.labels.cancel") %></button>
+    </div>
+  </div>
+</div>
diff --git a/decidim-core/app/cells/decidim/upload_modal/show.erb b/decidim-core/app/cells/decidim/upload_modal/show.erb
new file mode 100644
index 0000000000000..22dd48284af98
--- /dev/null
+++ b/decidim-core/app/cells/decidim/upload_modal/show.erb
@@ -0,0 +1,3 @@
+<%= render :files %>
+
+<%= render :modal %>
diff --git a/decidim-core/app/cells/decidim/upload_modal_cell.rb b/decidim-core/app/cells/decidim/upload_modal_cell.rb
new file mode 100644
index 0000000000000..0fbfdc496f1b4
--- /dev/null
+++ b/decidim-core/app/cells/decidim/upload_modal_cell.rb
@@ -0,0 +1,210 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell creates the necessary elements for dynamic uploads.
+  class UploadModalCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include ERB::Util
+
+    alias form model
+
+    def show
+      return unless resource_name
+
+      render
+    end
+
+    private
+
+    def button_id
+      prefix = form.object_name.present? ? "#{form.object_name}_" : ""
+
+      "#{prefix.gsub(/[\[\]]/, "_").gsub(/__+/, "_")}#{attribute}_button"
+    end
+
+    def button_class
+      "button small hollow add-field add-file" if has_title?
+
+      "button small add-file"
+    end
+
+    def label
+      options[:label]
+    end
+
+    def button_label
+      return button_edit_label if attachments.count.positive?
+
+      options[:button_label]
+    end
+
+    def button_edit_label
+      options[:button_edit_label] || options[:button_label]
+    end
+
+    def max_file_size
+      options[:max_file_size]
+    end
+
+    def max_file_size_mb
+      return unless max_file_size
+
+      (((max_file_size / 1024 / 1024) * 100) / 100).round
+    end
+
+    def resource_class
+      options[:resource_class].to_s
+    end
+
+    def resource_name
+      options[:resource_name]
+    end
+
+    def actions_wrapper_class
+      has_title? ? "actions-wrapper titled" : "actions-wrapper"
+    end
+
+    def attribute
+      options[:attribute]
+    end
+
+    def multiple
+      options[:multiple] || false
+    end
+
+    def optional
+      options[:optional]
+    end
+
+    # By default Foundation adds form errors next to input, but since input is in the modal
+    # and modal is hidden by default, we need to add an additional validation field to the form.
+    # This should only be necessary when file is required by the form.
+    def input_validation_field
+      object_name = form.object.present? ? "#{form.object.model_name.param_key}[#{add_attribute}_validation]" : "#{add_attribute}_validation"
+      input = check_box_tag object_name, 1, attachments.present?, class: "hide", label: false, required: !optional
+      message = form.send(:abide_error_element, add_attribute) + form.send(:error_and_help_text, add_attribute)
+      input + message
+    end
+
+    def explanation
+      i18n_options = {
+        scope: options[:help_i18n_scope].presence || "decidim.forms.upload_help",
+        attribute: attribute_translation
+      }
+
+      I18n.t("explanation", **i18n_options)
+    end
+
+    def attribute_translation
+      I18n.t(attribute, scope: [:activemodel, :attributes, resource_class.constantize.model_name.param_key].join("."))
+    rescue NameError
+      I18n.t(attribute, scope: "activemodel.attributes")
+    end
+
+    def add_attribute
+      return "add_#{attribute}" if form.object.respond_to? "add_#{attribute}"
+
+      attribute
+    end
+
+    def has_title?
+      options[:titled] == true
+    end
+
+    def with_title
+      "with-title" if has_title?
+    end
+
+    def attachment_label
+      return I18n.t("current_image", scope: "decidim.forms") if attachments.count.positive? && file_attachment_path(attachments.first).present?
+
+      I18n.t("default_image", scope: "decidim.forms")
+    end
+
+    def help_messages
+      Array(options[:help])
+    end
+
+    def attachments
+      @attachments = begin
+        attachments = options[:attachments] || form.object.send(attribute)
+        attachments = Array(attachments).compact_blank
+        attachments.map { |attachment| attachment.is_a?(String) ? ActiveStorage::Blob.find_signed(attachment) : attachment }
+      end
+    end
+
+    def id_for(attachment)
+      return attachment.id if attachment.respond_to? :id
+
+      rand(1..10_000)
+    end
+
+    def title_for(attachment)
+      return unless has_title?
+
+      translated_attribute(attachment.title)
+    end
+
+    def truncated_file_name_for(attachment, max_length = 31)
+      filename = file_name_for(attachment)
+      return filename if filename.length <= max_length
+
+      name = File.basename(filename, File.extname(filename))
+      name.truncate(max_length, omission: "...#{name.last((max_length / 2) - 3)}#{File.extname(filename)}")
+    end
+
+    def file_name_for(attachment)
+      determine_filename(attachment)
+    end
+
+    def determine_filename(attachment)
+      return attachment.filename.to_s if attachment.is_a? ActiveStorage::Blob
+      return blob(attachment).filename.to_s if blob(attachment).present?
+
+      attachment.url.split("/").last
+    end
+
+    def file_attachment_path(attachment)
+      return unless attachment
+      return Rails.application.routes.url_helpers.rails_blob_url(attachment, only_path: true) if attachment.is_a? ActiveStorage::Blob
+
+      if attachment.try(:attached?)
+        attachment_path = Rails.application.routes.url_helpers&.rails_blob_url(attachment.blob, only_path: true)
+        return attachment_path if attachment_path.present?
+      end
+
+      uploader_default_image_path(attribute)
+    end
+
+    def uploader_default_image_path(attribute)
+      uploader = Decidim::FileValidatorHumanizer.new(form.object, attribute).uploader
+      return if uploader.blank?
+      return unless uploader.is_a?(Decidim::ImageUploader)
+
+      uploader.try(:default_url)
+    end
+
+    def blob(attachment)
+      return attachment if attachment.is_a? ActiveStorage::Blob
+      return ActiveStorage::Blob.find_signed(attachment) if attachment.is_a? String
+      return attachment.file.blob if attachment.is_a? Decidim::Attachment
+      return attachment.blob if attachment.respond_to? :blob
+    end
+
+    def direct_upload_url
+      Rails.application.class.routes.url_helpers.rails_direct_uploads_path
+    end
+
+    def form_object_class
+      form.object.class.to_s
+    end
+
+    def modal_id
+      @modal_id ||= "upload_#{SecureRandom.uuid}"
+    end
+
+    def current_organization
+      controller.current_organization
+    end
+  end
+end
diff --git a/decidim-core/app/cells/decidim/user_conversation/reply.erb b/decidim-core/app/cells/decidim/user_conversation/reply.erb
index b23e96bcf8544..e3287094022a4 100644
--- a/decidim-core/app/cells/decidim/user_conversation/reply.erb
+++ b/decidim-core/app/cells/decidim/user_conversation/reply.erb
@@ -9,7 +9,7 @@
         <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
       <% end %>
 
-      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t("decidim.user_conversations.reply.placeholder") %>
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t("decidim.user_conversations.reply.placeholder"), data: { input_emoji: true } %>
 
       <%= f.submit t("decidim.user_conversations.reply.send"), class: "button secondary light pull-right", data: { disable: true } %>
     <% end %>
diff --git a/decidim-core/app/cells/decidim/user_conversations/add_conversation_users.erb b/decidim-core/app/cells/decidim/user_conversations/add_conversation_users.erb
index 9cd8a2340438d..04b9df3bbe158 100644
--- a/decidim-core/app/cells/decidim/user_conversations/add_conversation_users.erb
+++ b/decidim-core/app/cells/decidim/user_conversations/add_conversation_users.erb
@@ -6,18 +6,20 @@
       </div>
     </div>
     <div class="row">
-      <div class="row columns mentions__container">
+      <div class="row columns multiple-mentions" data-name="recipient_id[]" data-multiple="true">
         <label for="add_conversation_users"><%= t "decidim.user_conversations.index.add_max_users" %></label>
         <input id="add_conversation_users" type="text"
-            class="js-multiple-mentions mentions__container"
+            spellcheck="false"
+            autocomplete="off"
             placeholder="<%= t("decidim.user_conversations.index.add_users_placeholder") %>"
             data-noresults="<%= t("decidim.user_conversations.index.no_results") %>"
             contenteditable="true"
             data-direct-messages-disabled="<%= t("decidim.user_conversations.index.participant_with_disabled_message_reception") %>"
+            data-selected="multiple-mentions-selected"
             aria-expanded="false">
       </div>
       <div class="columns large-12">
-        <div class="js-multiple-mentions-recipients"></div>
+        <ul class="multiple-mentions-selected"></ul>
       </div>
     </div>
   </div>
diff --git a/decidim-core/app/cells/decidim/version_cell.rb b/decidim-core/app/cells/decidim/version_cell.rb
index 353e5ed06f14a..409cff90e6584 100644
--- a/decidim-core/app/cells/decidim/version_cell.rb
+++ b/decidim-core/app/cells/decidim/version_cell.rb
@@ -49,19 +49,8 @@ def i18n_version_created_at
       i18n("version_created_at")
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope
diff --git a/decidim-core/app/cells/decidim/versions_list_cell.rb b/decidim-core/app/cells/decidim/versions_list_cell.rb
index 34a09055d86e8..ae9b4d19d355e 100644
--- a/decidim-core/app/cells/decidim/versions_list_cell.rb
+++ b/decidim-core/app/cells/decidim/versions_list_cell.rb
@@ -32,19 +32,8 @@ def i18n_back_to_resource
       i18n("back_to_resource")
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope
diff --git a/decidim-core/app/cells/decidim/versions_list_item_cell.rb b/decidim-core/app/cells/decidim/versions_list_item_cell.rb
index f8f696fb5c75b..47c04f0df46f2 100644
--- a/decidim-core/app/cells/decidim/versions_list_item_cell.rb
+++ b/decidim-core/app/cells/decidim/versions_list_item_cell.rb
@@ -25,19 +25,8 @@ def i18n_version_index
       i18n("version_index", index: index)
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope
diff --git a/decidim-core/app/commands/decidim/accept_group_invitation.rb b/decidim-core/app/commands/decidim/accept_group_invitation.rb
index 33ae766b22553..baed1709593d8 100644
--- a/decidim-core/app/commands/decidim/accept_group_invitation.rb
+++ b/decidim-core/app/commands/decidim/accept_group_invitation.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to accept an invitation to belong to a
   # group.
-  class AcceptGroupInvitation < Rectify::Command
+  class AcceptGroupInvitation < Decidim::Command
     # Public: Initializes the command.
     #
     # user_group - the UserGroup where the user has been invited
diff --git a/decidim-core/app/commands/decidim/accept_user_group_join_request.rb b/decidim-core/app/commands/decidim/accept_user_group_join_request.rb
index f122f9b0fbf08..6a7bad51316d8 100644
--- a/decidim-core/app/commands/decidim/accept_user_group_join_request.rb
+++ b/decidim-core/app/commands/decidim/accept_user_group_join_request.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to accept a join request to a user
   # group.
-  class AcceptUserGroupJoinRequest < Rectify::Command
+  class AcceptUserGroupJoinRequest < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be accepted.
diff --git a/decidim-core/app/commands/decidim/amendable/accept.rb b/decidim-core/app/commands/decidim/amendable/accept.rb
index db2dec30edf6d..2b6a3a1336851 100644
--- a/decidim-core/app/commands/decidim/amendable/accept.rb
+++ b/decidim-core/app/commands/decidim/amendable/accept.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to accept an amend.
-    class Accept < Rectify::Command
+    class Accept < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/amendable/create_draft.rb b/decidim-core/app/commands/decidim/amendable/create_draft.rb
index a869dfd6e354c..c54372675417d 100644
--- a/decidim-core/app/commands/decidim/amendable/create_draft.rb
+++ b/decidim-core/app/commands/decidim/amendable/create_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
-    class CreateDraft < Rectify::Command
+    class CreateDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/amendable/destroy_draft.rb b/decidim-core/app/commands/decidim/amendable/destroy_draft.rb
index 1368890c1318f..c4046288ccbf6 100644
--- a/decidim-core/app/commands/decidim/amendable/destroy_draft.rb
+++ b/decidim-core/app/commands/decidim/amendable/destroy_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
-    class DestroyDraft < Rectify::Command
+    class DestroyDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # amendment     - The amendment to destroy.
diff --git a/decidim-core/app/commands/decidim/amendable/promote.rb b/decidim-core/app/commands/decidim/amendable/promote.rb
index 68eb05fef0f1f..32006449a668c 100644
--- a/decidim-core/app/commands/decidim/amendable/promote.rb
+++ b/decidim-core/app/commands/decidim/amendable/promote.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user promotes a rejected emendation.
-    class Promote < Rectify::Command
+    class Promote < Decidim::Command
       # Public: Initializes the command.
       #
       # emendation - The emendation to promote.
diff --git a/decidim-core/app/commands/decidim/amendable/publish_draft.rb b/decidim-core/app/commands/decidim/amendable/publish_draft.rb
index 7b4710c495870..c4326f1a909d4 100644
--- a/decidim-core/app/commands/decidim/amendable/publish_draft.rb
+++ b/decidim-core/app/commands/decidim/amendable/publish_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user publishes an amendment draft.
-    class PublishDraft < Rectify::Command
+    class PublishDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/amendable/reject.rb b/decidim-core/app/commands/decidim/amendable/reject.rb
index 88bc4709eb740..59621a611f096 100644
--- a/decidim-core/app/commands/decidim/amendable/reject.rb
+++ b/decidim-core/app/commands/decidim/amendable/reject.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to reject an amend.
-    class Reject < Rectify::Command
+    class Reject < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/amendable/update_draft.rb b/decidim-core/app/commands/decidim/amendable/update_draft.rb
index f097e7a4a192d..fc2816b074f8c 100644
--- a/decidim-core/app/commands/decidim/amendable/update_draft.rb
+++ b/decidim-core/app/commands/decidim/amendable/update_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user updates and amendment draft.
-    class UpdateDraft < Rectify::Command
+    class UpdateDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/amendable/withdraw.rb b/decidim-core/app/commands/decidim/amendable/withdraw.rb
index 1bf292d9723f1..7a9d5c3d5f63b 100644
--- a/decidim-core/app/commands/decidim/amendable/withdraw.rb
+++ b/decidim-core/app/commands/decidim/amendable/withdraw.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to withdraw an amendment.
-    class Withdraw < Rectify::Command
+    class Withdraw < Decidim::Command
       # Public: Initializes the command.
       #
       # amendment     - The amendment to withdraw.
diff --git a/decidim-core/app/commands/decidim/attachment_methods.rb b/decidim-core/app/commands/decidim/attachment_methods.rb
index b14b636d92ceb..bc297ba450bb4 100644
--- a/decidim-core/app/commands/decidim/attachment_methods.rb
+++ b/decidim-core/app/commands/decidim/attachment_methods.rb
@@ -18,7 +18,7 @@ def build_attachment(attached_to = nil)
     end
 
     def delete_attachment(attachment)
-      Attachment.find(attachment.id).delete if attachment.id == proposal.documents.first.id
+      Attachment.find(attachment.id).delete if attachment.id.to_i == proposal.documents.first.id
     end
 
     def attachment_invalid?
@@ -36,7 +36,8 @@ def attachment_file_uploaded?
       !@form.attachment.file.is_a?(Decidim::ApplicationUploader)
     end
 
-    def create_attachment
+    def create_attachment(weight: 0)
+      attachment.weight = weight
       attachment.attached_to = @attached_to
       attachment.save!
     end
diff --git a/decidim-core/app/commands/decidim/create_editor_image.rb b/decidim-core/app/commands/decidim/create_editor_image.rb
index 57a7480e6afe1..c3f4eafd5b254 100644
--- a/decidim-core/app/commands/decidim/create_editor_image.rb
+++ b/decidim-core/app/commands/decidim/create_editor_image.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create an editor image.
-  class CreateEditorImage < Rectify::Command
+  class CreateEditorImage < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/create_follow.rb b/decidim-core/app/commands/decidim/create_follow.rb
index 497e3abbcb214..4929566f097c6 100644
--- a/decidim-core/app/commands/decidim/create_follow.rb
+++ b/decidim-core/app/commands/decidim/create_follow.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic for when a user starts following a resource.
-  class CreateFollow < Rectify::Command
+  class CreateFollow < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/create_omniauth_registration.rb b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
index 4d4f28631db58..609f663cae3e1 100644
--- a/decidim-core/app/commands/decidim/create_omniauth_registration.rb
+++ b/decidim-core/app/commands/decidim/create_omniauth_registration.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user from omniauth
-  class CreateOmniauthRegistration < Rectify::Command
+  class CreateOmniauthRegistration < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -63,13 +63,12 @@ def create_or_find_user
         @user.name = form.name
         @user.nickname = form.normalized_nickname
         @user.newsletter_notifications_at = nil
-        @user.email_on_notification = true
         @user.password = generated_password
         @user.password_confirmation = generated_password
         if form.avatar_url.present?
           url = URI.parse(form.avatar_url)
           filename = File.basename(url.path)
-          file = URI.open(url)
+          file = url.open
           @user.avatar.attach(io: file, filename: filename)
         end
         @user.skip_confirmation! if verified_email
diff --git a/decidim-core/app/commands/decidim/create_registration.rb b/decidim-core/app/commands/decidim/create_registration.rb
index bd0ab010a4c6b..66cc1ead9f19c 100644
--- a/decidim-core/app/commands/decidim/create_registration.rb
+++ b/decidim-core/app/commands/decidim/create_registration.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user through the sign up form.
-  class CreateRegistration < Rectify::Command
+  class CreateRegistration < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -44,7 +44,6 @@ def create_user
         organization: form.current_organization,
         tos_agreement: form.tos_agreement,
         newsletter_notifications_at: form.newsletter_at,
-        email_on_notification: true,
         accepted_tos_version: form.current_organization.tos_version,
         locale: form.current_locale
       )
diff --git a/decidim-core/app/commands/decidim/create_report.rb b/decidim-core/app/commands/decidim/create_report.rb
index 3a091e4064e4a..4b59ecbc65116 100644
--- a/decidim-core/app/commands/decidim/create_report.rb
+++ b/decidim-core/app/commands/decidim/create_report.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic when a user creates a report.
-  class CreateReport < Rectify::Command
+  class CreateReport < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/create_user_group.rb b/decidim-core/app/commands/decidim/create_user_group.rb
index 82eb8900cd665..44dbeac295772 100644
--- a/decidim-core/app/commands/decidim/create_user_group.rb
+++ b/decidim-core/app/commands/decidim/create_user_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user group.
-  class CreateUserGroup < Rectify::Command
+  class CreateUserGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -63,7 +63,7 @@ def notify_admins
         affected_users: Decidim::User.org_admins_except_me(form.current_user)
       }
 
-      Decidim::EventsManager.publish(data)
+      Decidim::EventsManager.publish(**data)
     end
   end
 end
diff --git a/decidim-core/app/commands/decidim/create_user_report.rb b/decidim-core/app/commands/decidim/create_user_report.rb
index 909911975b06d..e9c89eb4d9cc8 100644
--- a/decidim-core/app/commands/decidim/create_user_report.rb
+++ b/decidim-core/app/commands/decidim/create_user_report.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic when a user creates a report.
-  class CreateUserReport < Rectify::Command
+  class CreateUserReport < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
@@ -55,8 +55,10 @@ def update_report_count!
     end
 
     def send_notification_to_admins!
-      current_organization.admins.each do |admin|
-        Decidim::UserReportJob.perform_later(admin, current_user, form.reason, reportable)
+      @current_user.organization.admins.each do |admin|
+        next unless admin.email_on_moderations
+
+        Decidim::UserReportJob.perform_later(admin, report)
       end
     end
 
diff --git a/decidim-core/app/commands/decidim/delete_follow.rb b/decidim-core/app/commands/decidim/delete_follow.rb
index 438a796ac4479..78e4c6459ff65 100644
--- a/decidim-core/app/commands/decidim/delete_follow.rb
+++ b/decidim-core/app/commands/decidim/delete_follow.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic for when a user stops following a resource.
-  class DeleteFollow < Rectify::Command
+  class DeleteFollow < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/demote_membership.rb b/decidim-core/app/commands/decidim/demote_membership.rb
index f87daf8bcb141..15563e2e712e7 100644
--- a/decidim-core/app/commands/decidim/demote_membership.rb
+++ b/decidim-core/app/commands/decidim/demote_membership.rb
@@ -4,7 +4,7 @@ module Decidim
   # A command with all the business logic to demote an admin. This means
   # removing their admin righta dn converting them to a basic member. It's the
   # coutnerpart of `PromoteMembership`.
-  class DemoteMembership < Rectify::Command
+  class DemoteMembership < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be demoted.
diff --git a/decidim-core/app/commands/decidim/destroy_account.rb b/decidim-core/app/commands/decidim/destroy_account.rb
index 4e5d0f3718c10..ba1ffa915040d 100644
--- a/decidim-core/app/commands/decidim/destroy_account.rb
+++ b/decidim-core/app/commands/decidim/destroy_account.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This command destroys the user's account.
-  class DestroyAccount < Rectify::Command
+  class DestroyAccount < Decidim::Command
     # Destroy a user's account.
     #
     # user - The user to be updated.
diff --git a/decidim-core/app/commands/decidim/endorse_resource.rb b/decidim-core/app/commands/decidim/endorse_resource.rb
index 9e7f5b6690085..bffc167194819 100644
--- a/decidim-core/app/commands/decidim/endorse_resource.rb
+++ b/decidim-core/app/commands/decidim/endorse_resource.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic related with a user endorsing a resource.
   # This is a user creates and endorsement.
-  class EndorseResource < Rectify::Command
+  class EndorseResource < Decidim::Command
     # Public: Initializes the command.
     #
     # resource     - An instance of Decidim::Endorsable.
diff --git a/decidim-core/app/commands/decidim/gallery_methods.rb b/decidim-core/app/commands/decidim/gallery_methods.rb
index 51086f6f5b6e3..2d97f6dede89a 100644
--- a/decidim-core/app/commands/decidim/gallery_methods.rb
+++ b/decidim-core/app/commands/decidim/gallery_methods.rb
@@ -8,22 +8,27 @@ module GalleryMethods
 
     def build_gallery(attached_to = nil)
       @gallery = []
-      @form.add_photos.each do |photo|
-        next unless image? photo
+      @form.add_photos.compact_blank.each do |photo|
+        if photo.is_a?(Hash) && photo.has_key?(:id)
+          update_attachment_title_for(photo)
+          next
+        end
 
         @gallery << Attachment.new(
-          title: { I18n.locale => photo.original_filename },
+          title: photos_title(photo),
           attached_to: attached_to || gallery_attached_to,
-          file: photo, # Define attached_to before this
-          content_type: photo.content_type
+          file: photos_signed_id(photo), # Define attached_to before this
+          content_type: photos_content_type(photo)
         )
       end
     end
 
-    def image?(image)
-      return unless image.respond_to? :content_type
+    def update_attachment_title_for(photo)
+      Decidim::Attachment.find(photo[:id]).update(title: title_for(photo))
+    end
 
-      image.content_type.start_with? "image"
+    def image?(signed_id)
+      blob(signed_id).content_type.start_with? "image"
     end
 
     def gallery_invalid?
@@ -36,17 +41,27 @@ def gallery_invalid?
       false
     end
 
-    def create_gallery
+    def create_gallery(first_weight: 0)
+      weight = first_weight
+      # Add the weights first to the old photos
+      @form.photos.each do |photo|
+        photo.update!(weight: weight)
+        weight += 1
+      end
       @gallery.map! do |photo|
+        photo.weight = weight
         photo.attached_to = gallery_attached_to
         photo.save!
+        weight += 1
         @form.photos << photo
       end
     end
 
     def photo_cleanup!
       gallery_attached_to.photos.each do |photo|
-        photo.destroy! if @form.photos.map(&:id).exclude? photo.id
+        next unless @form.photos.map(&:id).exclude?(photo.id)
+
+        photo.destroy! if (@form.respond_to?(:documents) && @form.documents.map(&:id).exclude?(photo.id)) || !@form.respond_to?(:documents)
       end
       # manually reset cached photos
       gallery_attached_to.reload
@@ -68,5 +83,25 @@ def gallery_attached_to
 
       form.current_component.organization if form.respond_to?(:current_component)
     end
+
+    def photos_signed_id(photo)
+      return photo[:file] if photo.is_a?(Hash)
+
+      photo
+    end
+
+    def photos_title(photo)
+      return { I18n.locale => photo[:title] } if photo.is_a?(Hash) && photo.has_key?(:title)
+
+      { I18n.locale => "" }
+    end
+
+    def photos_content_type(photo)
+      blob(photos_signed_id(photo)).content_type
+    end
+
+    def blob(signed_id)
+      ActiveStorage::Blob.find_signed(signed_id)
+    end
   end
 end
diff --git a/decidim-core/app/commands/decidim/invite_user.rb b/decidim-core/app/commands/decidim/invite_user.rb
index 4458148e67588..87e1dc5c1b7b8 100644
--- a/decidim-core/app/commands/decidim/invite_user.rb
+++ b/decidim-core/app/commands/decidim/invite_user.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with the business logic to invite a user to an organization.
-  class InviteUser < Rectify::Command
+  class InviteUser < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -27,9 +27,7 @@ def call
     attr_reader :form
 
     def user
-      # rubocop:disable Rails/FindBy
       @user ||= Decidim::User.where(organization: form.organization).where(email: form.email.downcase).first
-      # rubocop:enable Rails/FindBy
     end
 
     def update_user
diff --git a/decidim-core/app/commands/decidim/invite_user_again.rb b/decidim-core/app/commands/decidim/invite_user_again.rb
index 48db71d72095a..f444cbab9b735 100644
--- a/decidim-core/app/commands/decidim/invite_user_again.rb
+++ b/decidim-core/app/commands/decidim/invite_user_again.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with the business logic to invite an user to an organization.
-  class InviteUserAgain < Rectify::Command
+  class InviteUserAgain < Decidim::Command
     # Public: Initializes the command.
     #
     # user         - The user that receives the invitation instructions.
diff --git a/decidim-core/app/commands/decidim/invite_user_to_group.rb b/decidim-core/app/commands/decidim/invite_user_to_group.rb
index df04c29d92313..5a2f2063d0a84 100644
--- a/decidim-core/app/commands/decidim/invite_user_to_group.rb
+++ b/decidim-core/app/commands/decidim/invite_user_to_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to invite a user to a group.
-  class InviteUserToGroup < Rectify::Command
+  class InviteUserToGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
diff --git a/decidim-core/app/commands/decidim/join_user_group.rb b/decidim-core/app/commands/decidim/join_user_group.rb
index a82fb25ad481f..54aff6c6d66c0 100644
--- a/decidim-core/app/commands/decidim/join_user_group.rb
+++ b/decidim-core/app/commands/decidim/join_user_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to join a user group.
-  class JoinUserGroup < Rectify::Command
+  class JoinUserGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # user - the user that wants to join the group
diff --git a/decidim-core/app/commands/decidim/leave_user_group.rb b/decidim-core/app/commands/decidim/leave_user_group.rb
index 3b87299678570..44a1a80f84525 100644
--- a/decidim-core/app/commands/decidim/leave_user_group.rb
+++ b/decidim-core/app/commands/decidim/leave_user_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to leave a user group.
-  class LeaveUserGroup < Rectify::Command
+  class LeaveUserGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # user - the user that wants to leave the group
@@ -20,6 +20,7 @@ def initialize(user, user_group)
     # Returns nothing.
     def call
       return broadcast(:invalid) unless can_leave?
+      return broadcast(:last_admin) if last_admin?
 
       leave_user_group
 
@@ -35,7 +36,12 @@ def leave_user_group
     end
 
     def can_leave?
-      Decidim::UserGroupMembership.where(user: user, user_group: user_group).where.not(role: :creator).any?
+      Decidim::UserGroupMembership.where(user: user, user_group: user_group).any?
+    end
+
+    def last_admin?
+      admin_memberships = Decidim::UserGroupMembership.where(user_group: user_group, role: [:creator, :admin])
+      admin_memberships.length == 1 && admin_memberships.pluck(:decidim_user_id).include?(user.id)
     end
   end
 end
diff --git a/decidim-core/app/commands/decidim/messaging/reply_to_conversation.rb b/decidim-core/app/commands/decidim/messaging/reply_to_conversation.rb
index c59407a3eb90e..c3f88f7c8e3c7 100644
--- a/decidim-core/app/commands/decidim/messaging/reply_to_conversation.rb
+++ b/decidim-core/app/commands/decidim/messaging/reply_to_conversation.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Messaging
     # A command with all the business logic for replying to a conversation
-    class ReplyToConversation < Rectify::Command
+    class ReplyToConversation < Decidim::Command
       # Public: Initializes the command.
       #
       # conversation - The conversation to be updated.
@@ -72,7 +72,7 @@ def notify_comanagers
       end
 
       # in order for a recipient to receive an email it should not have direct-messages disabled
-      # if direct-messages are disabled, only send if he follows the sending user
+      # if direct-messages are disabled, only send if they follow the sending user
       def notify(recipient)
         return unless conversation.unread_count(recipient) == 1
         return unless recipient.accepts_conversation?(form.context.current_user)
diff --git a/decidim-core/app/commands/decidim/messaging/start_conversation.rb b/decidim-core/app/commands/decidim/messaging/start_conversation.rb
index f46fbdc01d3e5..90125cfe8f024 100644
--- a/decidim-core/app/commands/decidim/messaging/start_conversation.rb
+++ b/decidim-core/app/commands/decidim/messaging/start_conversation.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Messaging
     # A command with all the business logic for replying to a conversation
-    class StartConversation < Rectify::Command
+    class StartConversation < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A conversation form
@@ -72,7 +72,7 @@ def notify_comanagers
       end
 
       # in order for a recipient to receive an email it should not have direct-messages disabled
-      # if direct-messages are disabled, only send if he follows the sending user
+      # if direct-messages are disabled, only send if they follow the sending user
       def notify(recipient)
         return unless recipient.accepts_conversation?(form.context.current_user)
 
diff --git a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
index 2868b7d388bed..bf31aa1665783 100644
--- a/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
+++ b/decidim-core/app/commands/decidim/multiple_attachments_methods.rb
@@ -6,16 +6,25 @@ module MultipleAttachmentsMethods
 
     def build_attachments
       @documents = []
-      @form.add_documents.each do |file|
+      @form.add_documents.compact_blank.each do |attachment|
+        if attachment.is_a?(Hash) && attachment.has_key?(:id)
+          update_attachment_title_for(attachment)
+          next
+        end
+
         @documents << Attachment.new(
-          title: { I18n.locale => file.original_filename },
+          title: title_for(attachment),
           attached_to: @attached_to || documents_attached_to,
-          file: file,
-          content_type: file.content_type
+          file: signed_id_for(attachment),
+          content_type: content_type_for(attachment)
         )
       end
     end
 
+    def update_attachment_title_for(attachment)
+      Decidim::Attachment.find(attachment[:id]).update(title: title_for(attachment))
+    end
+
     def attachments_invalid?
       @documents.each do |document|
         next if document.valid? || !document.errors.has_key?(:file)
@@ -30,10 +39,18 @@ def attachments_invalid?
       false
     end
 
-    def create_attachments
+    def create_attachments(first_weight: 0)
+      weight = first_weight
+      # Add the weights first to the old document
+      @form.documents.each do |document|
+        document.update!(weight: weight)
+        weight += 1
+      end
       @documents.map! do |document|
+        document.weight = weight
         document.attached_to = documents_attached_to
         document.save!
+        weight += 1
         @form.documents << document
       end
     end
@@ -57,5 +74,27 @@ def documents_attached_to
 
       form.current_component.organization if form.respond_to?(:current_component)
     end
+
+    def signed_id_for(attachment)
+      return attachment[:file] if attachment.is_a?(Hash)
+
+      attachment
+    end
+
+    def title_for(attachment)
+      return { I18n.locale => attachment[:title] } if attachment.is_a?(Hash) && attachment.has_key?(:title)
+
+      { I18n.locale => "" }
+    end
+
+    def content_type_for(attachment)
+      return attachment.content_type if attachment.instance_of?(ActionDispatch::Http::UploadedFile)
+
+      blob(signed_id_for(attachment)).content_type
+    end
+
+    def blob(signed_id)
+      ActiveStorage::Blob.find_signed(signed_id)
+    end
   end
 end
diff --git a/decidim-core/app/commands/decidim/promote_membership.rb b/decidim-core/app/commands/decidim/promote_membership.rb
index dd1290563c339..0f5b659da8c5a 100644
--- a/decidim-core/app/commands/decidim/promote_membership.rb
+++ b/decidim-core/app/commands/decidim/promote_membership.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to promote a user to group admin.
-  class PromoteMembership < Rectify::Command
+  class PromoteMembership < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be promoted.
diff --git a/decidim-core/app/commands/decidim/reject_group_invitation.rb b/decidim-core/app/commands/decidim/reject_group_invitation.rb
index f5f54c91cdc26..7a373b85e046c 100644
--- a/decidim-core/app/commands/decidim/reject_group_invitation.rb
+++ b/decidim-core/app/commands/decidim/reject_group_invitation.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to reject an invitation to belong to a
   # group.
-  class RejectGroupInvitation < Rectify::Command
+  class RejectGroupInvitation < Decidim::Command
     # Public: Initializes the command.
     #
     # user_group - the UserGroup where the user has been invited
diff --git a/decidim-core/app/commands/decidim/reject_user_group_join_request.rb b/decidim-core/app/commands/decidim/reject_user_group_join_request.rb
index 1c03ab92908bb..d8236032709f2 100644
--- a/decidim-core/app/commands/decidim/reject_user_group_join_request.rb
+++ b/decidim-core/app/commands/decidim/reject_user_group_join_request.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to reject a join request to a user
   # group.
-  class RejectUserGroupJoinRequest < Rectify::Command
+  class RejectUserGroupJoinRequest < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be accepted.
diff --git a/decidim-core/app/commands/decidim/remove_user_from_group.rb b/decidim-core/app/commands/decidim/remove_user_from_group.rb
index d31c2b65f7693..f4d56a33e4175 100644
--- a/decidim-core/app/commands/decidim/remove_user_from_group.rb
+++ b/decidim-core/app/commands/decidim/remove_user_from_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to remove a user from a group.
-  class RemoveUserFromGroup < Rectify::Command
+  class RemoveUserFromGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be accepted.
diff --git a/decidim-core/app/commands/decidim/resend_confirmation_instructions.rb b/decidim-core/app/commands/decidim/resend_confirmation_instructions.rb
new file mode 100644
index 0000000000000..da17e6a9c1f62
--- /dev/null
+++ b/decidim-core/app/commands/decidim/resend_confirmation_instructions.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResendConfirmationInstructions < Decidim::Command
+    def initialize(user)
+      @user = user
+      @unconfirmed_email = user.unconfirmed_email
+    end
+
+    def call
+      return broadcast(:invalid) unless @unconfirmed_email
+
+      ResendConfirmationInstructionsJob.perform_later(@user)
+
+      broadcast(:ok)
+    end
+  end
+end
diff --git a/decidim-core/app/commands/decidim/search.rb b/decidim-core/app/commands/decidim/search.rb
index 0be566f6055a4..8ef9d695ecf9e 100644
--- a/decidim-core/app/commands/decidim/search.rb
+++ b/decidim-core/app/commands/decidim/search.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # A command that will act as a search service, with all the business logic for performing searches.
-  class Search < Rectify::Command
-    ACCEPTED_FILTERS = [:decidim_scope_id].freeze
+  class Search < Decidim::Command
+    ACCEPTED_FILTERS = [:decidim_scope_id_eq].freeze
     HIGHLIGHTED_RESULTS_COUNT = 4
 
     # Public: Initializes the command.
@@ -30,9 +30,9 @@ def call
         result_ids = filtered_query_for(class_name).pluck(:resource_id)
         results_count = result_ids.count
 
-        results = if filters[:resource_type].present? && filters[:resource_type] == class_name
+        results = if filters[:with_resource_type].present? && filters[:with_resource_type] == class_name
                     paginate(klass.order_by_id_list(result_ids))
-                  elsif filters[:resource_type].present?
+                  elsif filters[:with_resource_type].present?
                     ApplicationRecord.none
                   else
                     klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
@@ -59,15 +59,15 @@ def paginate(collection)
     def clean_filters
       @clean_filters ||= filters.select do |attribute_name, value|
         ACCEPTED_FILTERS.include?(attribute_name.to_sym) && value.present?
-      end.merge(decidim_participatory_space: spaces_to_filter).compact
+      end.compact
     end
 
     def spaces_to_filter
-      return nil if filters[:space_state].blank?
+      return nil if filters[:with_space_state].blank?
 
       Decidim.participatory_space_manifests.flat_map do |manifest|
         public_spaces = manifest.participatory_spaces.call(organization).public_spaces
-        spaces = case filters[:space_state]
+        spaces = case filters[:with_space_state]
                  when "active"
                    public_spaces.active_spaces
                  when "future"
@@ -88,9 +88,10 @@ def filtered_query_for(class_name)
         resource_type: class_name
       )
 
-      clean_filters.each_pair do |attribute_name, value|
-        query = query.where(attribute_name => value)
+      if (spaces = spaces_to_filter)
+        query = query.where(decidim_participatory_space: spaces)
       end
+      query = query.ransack(clean_filters).result if clean_filters.any?
 
       query = query.order("datetime DESC")
       query = query.global_search(I18n.transliterate(term)) if term.present?
diff --git a/decidim-core/app/commands/decidim/unendorse_resource.rb b/decidim-core/app/commands/decidim/unendorse_resource.rb
index a052781fe7a9d..ef71565d785f1 100644
--- a/decidim-core/app/commands/decidim/unendorse_resource.rb
+++ b/decidim-core/app/commands/decidim/unendorse_resource.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to unendorse a resource, both as a user or as a user_group.
-  class UnendorseResource < Rectify::Command
+  class UnendorseResource < Decidim::Command
     # Public: Initializes the command.
     #
     # resource     - A Decidim::Endorsable object.
@@ -31,7 +31,7 @@ def destroy_resource_endorsement
       query = if @current_group.present?
                 @resource.endorsements.where(decidim_user_group_id: @current_group&.id)
               else
-                @resource.endorsements.where(author: @current_user)
+                @resource.endorsements.where(author: @current_user, decidim_user_group_id: nil)
               end
       query.destroy_all
     end
diff --git a/decidim-core/app/commands/decidim/unsubscribe_settings.rb b/decidim-core/app/commands/decidim/unsubscribe_settings.rb
index 7a83e9f73cb9f..1e13a05453729 100644
--- a/decidim-core/app/commands/decidim/unsubscribe_settings.rb
+++ b/decidim-core/app/commands/decidim/unsubscribe_settings.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This command unsubscribes user from newsletter.
-  class UnsubscribeSettings < Rectify::Command
+  class UnsubscribeSettings < Decidim::Command
     # unsubscribe user from newsletter.
     #
     # user - The user to be updated.
diff --git a/decidim-core/app/commands/decidim/update_account.rb b/decidim-core/app/commands/decidim/update_account.rb
index 807af1398ab6e..93073dd0d9be8 100644
--- a/decidim-core/app/commands/decidim/update_account.rb
+++ b/decidim-core/app/commands/decidim/update_account.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This command updates the user's account.
-  class UpdateAccount < Rectify::Command
+  class UpdateAccount < Decidim::Command
     # Updates a user's account.
     #
     # user - The user to be updated.
@@ -24,7 +24,9 @@ def call
         notify_followers
         broadcast(:ok, @user.unconfirmed_email.present?)
       else
-        @form.errors.add :avatar, @user.errors[:avatar] if @user.errors.has_key? :avatar
+        [:avatar, :password, :password_confirmation].each do |key|
+          @form.errors.add key, @user.errors[key] if @user.errors.has_key? key
+        end
         broadcast(:invalid)
       end
     end
@@ -42,7 +44,7 @@ def update_personal_data
 
     def update_avatar
       if @form.avatar.present?
-        @user.avatar = @form.avatar
+        @user.avatar.attach(@form.avatar)
       elsif @form.remove_avatar
         @user.avatar = nil
       end
diff --git a/decidim-core/app/commands/decidim/update_notifications_settings.rb b/decidim-core/app/commands/decidim/update_notifications_settings.rb
index ca09fc7909221..f3679d57921b0 100644
--- a/decidim-core/app/commands/decidim/update_notifications_settings.rb
+++ b/decidim-core/app/commands/decidim/update_notifications_settings.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This command updates the user's notifications settings.
-  class UpdateNotificationsSettings < Rectify::Command
+  class UpdateNotificationsSettings < Decidim::Command
     # Updates a user's notifications settings.
     #
     # user - The user to be updated.
@@ -24,11 +24,12 @@ def call
     private
 
     def update_notifications_settings
-      @user.email_on_notification = @form.email_on_notification
       @user.newsletter_notifications_at = @form.newsletter_notifications_at
       @user.notification_types = @form.notification_types
       @user.direct_message_types = @form.direct_message_types
       @user.email_on_moderations = @form.email_on_moderations
+      @user.notification_settings = @user.notification_settings.merge(@form.notification_settings)
+      @user.notifications_sending_frequency = @form.notifications_sending_frequency
     end
   end
 end
diff --git a/decidim-core/app/commands/decidim/update_password.rb b/decidim-core/app/commands/decidim/update_password.rb
new file mode 100644
index 0000000000000..66e18bf595c9d
--- /dev/null
+++ b/decidim-core/app/commands/decidim/update_password.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Decidim command updates user's password
+  class UpdatePassword < Decidim::Command
+    # Updates a user's password.
+    #
+    # user - The user to be updated.
+    # form - The form with the data.
+    def initialize(user, form)
+      @user = user
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      user.password = form.password
+
+      if user.save
+        broadcast(:ok)
+      else
+        broadcast(:invalid)
+      end
+    end
+
+    private
+
+    attr_reader :form, :user
+  end
+end
diff --git a/decidim-core/app/commands/decidim/update_user_group.rb b/decidim-core/app/commands/decidim/update_user_group.rb
index 086855d16845f..97820b6ec89ef 100644
--- a/decidim-core/app/commands/decidim/update_user_group.rb
+++ b/decidim-core/app/commands/decidim/update_user_group.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to update a user group profile.
-  class UpdateUserGroup < Rectify::Command
+  class UpdateUserGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -60,7 +60,7 @@ def notify_admins
         affected_users: Decidim::User.org_admins_except_me(form.current_user)
       }
 
-      Decidim::EventsManager.publish(data)
+      Decidim::EventsManager.publish(**data)
     end
   end
 end
diff --git a/decidim-core/app/commands/decidim/update_user_interests.rb b/decidim-core/app/commands/decidim/update_user_interests.rb
index 2e49b0f46fa49..9257e5f6ba8aa 100644
--- a/decidim-core/app/commands/decidim/update_user_interests.rb
+++ b/decidim-core/app/commands/decidim/update_user_interests.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This command updates the user's interests.
-  class UpdateUserInterests < Rectify::Command
+  class UpdateUserInterests < Decidim::Command
     # Updates a user's intersts.
     #
     # user - The user to be updated.
diff --git a/decidim-core/app/commands/decidim/validate_upload.rb b/decidim-core/app/commands/decidim/validate_upload.rb
new file mode 100644
index 0000000000000..6d590f0fb822e
--- /dev/null
+++ b/decidim-core/app/commands/decidim/validate_upload.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ValidateUpload < Decidim::Command
+    def initialize(form)
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid, @form.errors) if @form.invalid?
+
+      broadcast(:ok)
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
index 487409e272908..33a31c6940143 100644
--- a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
+++ b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
@@ -25,7 +25,6 @@ module DeviseControllers
       helper Decidim::MetaTagsHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::LayoutHelper
       helper Decidim::MenuHelper
diff --git a/decidim-core/app/controllers/concerns/decidim/filter_resource.rb b/decidim-core/app/controllers/concerns/decidim/filter_resource.rb
index 9fc66044d0269..43f539b90bc59 100644
--- a/decidim-core/app/controllers/concerns/decidim/filter_resource.rb
+++ b/decidim-core/app/controllers/concerns/decidim/filter_resource.rb
@@ -20,20 +20,24 @@ def method_missing(method_name, *_arguments)
       end
 
       def respond_to_missing?(method_name, include_private = false)
-        @filter.present? && @filter.has_key?(method_name) || super
+        (@filter.present? && @filter.has_key?(method_name)) || super
       end
     end
 
     included do
-      helper_method :search, :filter
+      helper_method :search, :filter_params, :filter
 
       private
 
       def search
-        @search ||= search_klass.new(search_params)
+        @search ||= search_with(filter_params)
       end
 
-      def search_klass
+      def search_with(provided_params)
+        search_collection.ransack(provided_params, context_params.merge(auth_object: current_user))
+      end
+
+      def search_collection
         raise NotImplementedError, "A search class is neeeded to filter resources"
       end
 
@@ -41,19 +45,15 @@ def filter
         @filter ||= Filter.new(filter_params)
       end
 
-      def search_params
-        default_search_params
-          .merge(filter_params)
-          .merge(context_params)
-      end
-
+      # Fetches the correct filter parameters from the request parameters in
+      # order to limit the parameters which can be used for searching the
+      # resources. Otherwise the user could pass extra search parameters from
+      # the request using the Ransack API.
       def filter_params
-        default_filter_params
-          .merge(params.to_unsafe_h[:filter].try(:symbolize_keys) || {})
-      end
-
-      def default_search_params
-        {}
+        @filter_params = begin
+          passed_params = params.to_unsafe_h[:filter].try(:symbolize_keys) || {}
+          default_filter_params.merge(passed_params.slice(*default_filter_params.keys))
+        end
       end
 
       def default_filter_params
@@ -76,14 +76,13 @@ def default_filter_scope_params
         end
       end
 
-      # If the controller responds to current_component, its search service uses the
-      # base class Decidim::ResourceSearch; else it uses the ParticipatorySpaceSearch.
-      # They need different context_params to set up the base_query:
-      # - ResourceSearch uses `component`
-      # - ParticipatorySpaceSearch uses `organization`
-      # - Both use `current_user`
-      # - Both need `organization` for localized searches in order to fetch the
-      #   available locales from the organization in Decidim::ResourceSearch.
+      # If the controller responds to current_component, its is probably
+      # searching against that component. Otherwise it is be likely to search
+      # against a participatory space. The context params are passed to the
+      # Ransack search classes which may be customized per model in case they
+      # need this contextual information. For such searches, take a look at the
+      # ResourceSearch class or any search class inheriting from that which
+      # utilize this context information, such as the current user.
       def context_params
         context = {
           current_user: current_user,
diff --git a/decidim-core/app/controllers/concerns/decidim/force_authentication.rb b/decidim-core/app/controllers/concerns/decidim/force_authentication.rb
index 872b75a31dfc3..c36f95156e9f7 100644
--- a/decidim-core/app/controllers/concerns/decidim/force_authentication.rb
+++ b/decidim-core/app/controllers/concerns/decidim/force_authentication.rb
@@ -36,8 +36,7 @@ def allow_unauthorized_path?
 
     def unauthorized_paths
       # /locale is for changing the locale
-      # /cookies is for accepting the cookies
-      %w(/locale /cookies) + Decidim::StaticPage.where(
+      %w(/locale) + Decidim::StaticPage.where(
         organization: current_organization,
         allow_public_access: true
       ).pluck(Arel.sql("CONCAT('/pages/', slug)"))
diff --git a/decidim-core/app/controllers/concerns/decidim/http_caching_disabler.rb b/decidim-core/app/controllers/concerns/decidim/http_caching_disabler.rb
index 247b798413541..7446b5a867944 100644
--- a/decidim-core/app/controllers/concerns/decidim/http_caching_disabler.rb
+++ b/decidim-core/app/controllers/concerns/decidim/http_caching_disabler.rb
@@ -13,9 +13,9 @@ module HttpCachingDisabler
     end
 
     def disable_http_caching
-      response.headers["Cache-Control"] = "no-cache, no-store"
       response.headers["Pragma"] = "no-cache"
       response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+      response.cache_control.replace(no_cache: true, extras: ["no-store"])
     end
   end
 end
diff --git a/decidim-core/app/controllers/concerns/decidim/needs_password_change.rb b/decidim-core/app/controllers/concerns/decidim/needs_password_change.rb
new file mode 100644
index 0000000000000..1d16d4b06f8d2
--- /dev/null
+++ b/decidim-core/app/controllers/concerns/decidim/needs_password_change.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Force user to "Change your password" view when they need to change password
+  module NeedsPasswordChange
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :check_password_update_required
+    end
+
+    private
+
+    def check_password_update_required
+      return unless request.format.html?
+      return unless current_user
+      return unless current_user.admin?
+      return unless Decidim.config.admin_password_strong
+      return unless current_user.needs_password_update?
+      return if password_update_permitted_path?(request.path)
+
+      redirect_to_change_password
+    end
+
+    def password_update_permitted_path?(target_path)
+      permitted_paths = [(tos_path if respond_to?(:tos_path, true)),
+                         decidim.delete_account_path,
+                         decidim.accept_tos_path,
+                         decidim.download_your_data_path,
+                         decidim.export_download_your_data_path,
+                         decidim.download_file_download_your_data_path,
+                         decidim.change_password_path].compact
+      # ensure that path with or without query string pass
+      permitted_paths.find { |el| el.split("?").first == target_path }
+    end
+
+    def redirect_to_change_password
+      flash[:notice] = flash[:notice] if flash[:notice]
+      flash[:secondary] = t("decidim.admin.password_change.alert")
+      redirect_to decidim.change_password_path
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/concerns/decidim/needs_tos_accepted.rb b/decidim-core/app/controllers/concerns/decidim/needs_tos_accepted.rb
index 336b445e79593..f753e48b05aba 100644
--- a/decidim-core/app/controllers/concerns/decidim/needs_tos_accepted.rb
+++ b/decidim-core/app/controllers/concerns/decidim/needs_tos_accepted.rb
@@ -29,9 +29,9 @@ def permitted_paths?
       permitted_paths = [tos_path,
                          decidim.delete_account_path,
                          decidim.accept_tos_path,
-                         decidim.data_portability_path,
-                         decidim.export_data_portability_path,
-                         decidim.download_file_data_portability_path]
+                         decidim.download_your_data_path,
+                         decidim.export_download_your_data_path,
+                         decidim.download_file_download_your_data_path]
       # ensure that path with or without query string pass
       permitted_paths.find { |el| el.split("?").first == request.path }
     end
diff --git a/decidim-core/app/controllers/concerns/decidim/orderable.rb b/decidim-core/app/controllers/concerns/decidim/orderable.rb
index 84a9970f343c7..a525ecf54f6ea 100644
--- a/decidim-core/app/controllers/concerns/decidim/orderable.rb
+++ b/decidim-core/app/controllers/concerns/decidim/orderable.rb
@@ -30,7 +30,7 @@ def default_order
       # random seed at the database.
       def random_seed
         @random_seed ||= begin
-          session[:random_seed] ||= rand * 2 - 1
+          session[:random_seed] ||= (rand * 2) - 1
         end.to_f
       end
     end
diff --git a/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb b/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
index d912295fe16b0..16c1db2c0d25c 100644
--- a/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
+++ b/decidim-core/app/controllers/concerns/decidim/participatory_space_context.rb
@@ -17,8 +17,8 @@ module ParticipatorySpaceContext
       #
       # Returns nothing.
       def participatory_space_layout(options = {})
-        layout :layout, options
-        before_action :authorize_participatory_space, options
+        layout :layout, **options
+        before_action :authorize_participatory_space, **options
       end
     end
 
diff --git a/decidim-core/app/controllers/decidim/account_controller.rb b/decidim-core/app/controllers/decidim/account_controller.rb
index 0a3a85c342126..b86b994c6456b 100644
--- a/decidim-core/app/controllers/decidim/account_controller.rb
+++ b/decidim-core/app/controllers/decidim/account_controller.rb
@@ -5,6 +5,8 @@ module Decidim
   class AccountController < Decidim::ApplicationController
     include Decidim::UserProfile
 
+    helper Decidim::PasswordsHelper
+
     def show
       enforce_permission_to :show, :user, current_user: current_user
       @account = form(AccountForm).from_model(current_user)
@@ -56,8 +58,51 @@ def destroy
       redirect_to decidim.root_path
     end
 
+    def resend_confirmation_instructions
+      enforce_permission_to :update, :user, current_user: current_user
+
+      ResendConfirmationInstructions.call(current_user) do
+        on(:ok) do
+          respond_to do |format|
+            handle_alert(:success, t("resend_successfully", scope: "decidim.account.email_change", unconfirmed_email: current_user.unconfirmed_email))
+            format.js
+          end
+        end
+
+        on(:invalid) do
+          respond_to do |format|
+            handle_alert(:alert, t("resend_error", scope: "decidim.account.email_change"))
+            format.js
+          end
+        end
+      end
+    end
+
+    def cancel_email_change
+      enforce_permission_to :update, :user, current_user: current_user
+
+      if current_user.unconfirmed_email
+        current_user.update(unconfirmed_email: nil)
+
+        respond_to do |format|
+          handle_alert(:success, t("cancel_successfully", scope: "decidim.account.email_change"))
+          format.js
+        end
+      else
+        respond_to do |format|
+          handle_alert(:alert, t("cancel_error", scope: "decidim.account.email_change"))
+          format.js
+        end
+      end
+    end
+
     private
 
+    def handle_alert(alert_class, text)
+      @alert_class = alert_class
+      @text = text
+    end
+
     def account_params
       params[:user].to_unsafe_h
     end
diff --git a/decidim-core/app/controllers/decidim/application_controller.rb b/decidim-core/app/controllers/decidim/application_controller.rb
index 0187496f789e1..f4a4299a015a6 100644
--- a/decidim-core/app/controllers/decidim/application_controller.rb
+++ b/decidim-core/app/controllers/decidim/application_controller.rb
@@ -20,13 +20,13 @@ class ApplicationController < ::DecidimController
     include NeedsSnippets
     include UserBlockedChecker
     include DisableRedirectionToExternalHost
+    include NeedsPasswordChange
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
     helper Decidim::LanguageChooserHelper
     helper Decidim::ReplaceButtonsHelper
     helper Decidim::TranslationsHelper
-    helper Decidim::CookiesHelper
     helper Decidim::AriaSelectedLinkToHelper
     helper Decidim::MenuHelper
     helper Decidim::ComponentPathHelper
diff --git a/decidim-core/app/controllers/decidim/cookie_policy_controller.rb b/decidim-core/app/controllers/decidim/cookie_policy_controller.rb
deleted file mode 100644
index f7a3a417565ff..0000000000000
--- a/decidim-core/app/controllers/decidim/cookie_policy_controller.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This controller allows the user to accept the cookie policy.
-  class CookiePolicyController < Decidim::ApplicationController
-    skip_before_action :store_current_location
-
-    def accept
-      response.set_cookie(
-        Decidim.config.consent_cookie_name,
-        value: "true",
-        path: "/",
-        httponly: true,
-        secure: request.session_options[:secure],
-        expires: 1.year.from_now.utc
-      )
-
-      respond_to do |format|
-        format.js
-        format.html { redirect_back fallback_location: root_path }
-      end
-    end
-  end
-end
diff --git a/decidim-core/app/controllers/decidim/devise/invitations_controller.rb b/decidim-core/app/controllers/decidim/devise/invitations_controller.rb
index 7eea498ff6acc..30e88c88dc29d 100644
--- a/decidim-core/app/controllers/decidim/devise/invitations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/invitations_controller.rb
@@ -7,6 +7,8 @@ class InvitationsController < ::Devise::InvitationsController
       include Decidim::DeviseControllers
       include NeedsTosAccepted
 
+      helper Decidim::PasswordsHelper
+
       before_action :configure_permitted_parameters
 
       # We don't users to create invitations, so we just redirect them to the
diff --git a/decidim-core/app/controllers/decidim/devise/passwords_controller.rb b/decidim-core/app/controllers/decidim/devise/passwords_controller.rb
index 9cf5fc95f86e5..04580cf9b62d3 100644
--- a/decidim-core/app/controllers/decidim/devise/passwords_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/passwords_controller.rb
@@ -6,8 +6,41 @@ module Devise
     class PasswordsController < ::Devise::PasswordsController
       include Decidim::DeviseControllers
 
+      helper Decidim::PasswordsHelper
+
+      prepend_before_action :require_no_authentication, except: [:change_password, :apply_password]
+      skip_before_action :store_current_location
+
       before_action :check_sign_in_enabled
 
+      def change_password
+        self.resource = current_user
+        @send_path = apply_password_path
+
+        flash[:secondary] = t("decidim.admin.password_change.notification", days: Decidim.config.admin_password_expiration_days) if flash[:secondary].blank?
+        render :edit
+      end
+
+      def apply_password
+        self.resource = current_user
+        @send_path = apply_password_path
+
+        @form = Decidim::PasswordForm.from_params(params["user"])
+        Decidim::UpdatePassword.call(current_user, @form) do
+          on(:ok) do
+            flash[:notice] = t("passwords.update.success", scope: "decidim")
+            bypass_sign_in(current_user)
+            redirect_to after_sign_in_path_for current_user
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = t("passwords.update.error", scope: "decidim")
+            resource.errors.errors.concat(@form.errors.errors)
+            render action: "edit"
+          end
+        end
+      end
+
       private
 
       def check_sign_in_enabled
diff --git a/decidim-core/app/controllers/decidim/devise/registrations_controller.rb b/decidim-core/app/controllers/decidim/devise/registrations_controller.rb
index 4ebb3e982624a..ba62d5330b79f 100644
--- a/decidim-core/app/controllers/decidim/devise/registrations_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/registrations_controller.rb
@@ -9,6 +9,8 @@ class RegistrationsController < ::Devise::RegistrationsController
       include Decidim::DeviseControllers
       include NeedsTosAccepted
 
+      helper Decidim::PasswordsHelper
+
       before_action :check_sign_up_enabled
       before_action :configure_permitted_parameters
 
diff --git a/decidim-core/app/controllers/decidim/devise/sessions_controller.rb b/decidim-core/app/controllers/decidim/devise/sessions_controller.rb
index fcfc3291a30cd..1d3c652ad81be 100644
--- a/decidim-core/app/controllers/decidim/devise/sessions_controller.rb
+++ b/decidim-core/app/controllers/decidim/devise/sessions_controller.rb
@@ -22,6 +22,8 @@ def destroy
       def after_sign_in_path_for(user)
         if user.present? && user.blocked?
           check_user_block_status(user)
+        elsif user.needs_password_update?
+          change_password_path
         elsif first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
           decidim_verifications.first_login_authorizations_path
         else
diff --git a/decidim-core/app/controllers/decidim/data_portability_controller.rb b/decidim-core/app/controllers/decidim/download_your_data_controller.rb
similarity index 53%
rename from decidim-core/app/controllers/decidim/data_portability_controller.rb
rename to decidim-core/app/controllers/decidim/download_your_data_controller.rb
index 817901e68c7fd..c77cbee2406c1 100644
--- a/decidim-core/app/controllers/decidim/data_portability_controller.rb
+++ b/decidim-core/app/controllers/decidim/download_your_data_controller.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   # The controller to handle the user's download_my_data page.
-  class DataPortabilityController < Decidim::ApplicationController
+  class DownloadYourDataController < Decidim::ApplicationController
     include Decidim::UserProfile
 
     def show
@@ -16,20 +16,20 @@ def show
     def export
       enforce_permission_to :export, :user, current_user: current_user
 
-      DataPortabilityExportJob.perform_later(current_user)
+      DownloadYourDataExportJob.perform_later(current_user)
 
-      flash[:notice] = t("decidim.account.data_portability_export.notice")
-      redirect_back(fallback_location: data_portability_path)
+      flash[:notice] = t("decidim.account.download_your_data_export.notice")
+      redirect_back(fallback_location: download_your_data_path)
     end
 
     def download_file
       enforce_permission_to :download, :user, current_user: current_user
 
-      if current_user.data_portability_file.attached?
-        redirect_to Rails.application.routes.url_helpers.rails_blob_url(current_user.data_portability_file.blob, only_path: true)
+      if current_user.download_your_data_file.attached?
+        redirect_to Rails.application.routes.url_helpers.rails_blob_url(current_user.download_your_data_file.blob, only_path: true)
       else
-        flash[:error] = t("decidim.account.data_portability_export.file_no_exists")
-        redirect_to data_portability_path
+        flash[:error] = t("decidim.account.download_your_data_export.file_no_exists")
+        redirect_to download_your_data_path
       end
     end
   end
diff --git a/decidim-core/app/controllers/decidim/groups_controller.rb b/decidim-core/app/controllers/decidim/groups_controller.rb
index 06c01879c6690..875c2eca835ed 100644
--- a/decidim-core/app/controllers/decidim/groups_controller.rb
+++ b/decidim-core/app/controllers/decidim/groups_controller.rb
@@ -7,6 +7,7 @@ class GroupsController < Decidim::ApplicationController
     include UserGroups
 
     before_action :enforce_user_groups_enabled
+    before_action :ensure_user_group_not_blocked
 
     def new
       enforce_permission_to :create, :user_group, current_user: current_user
@@ -64,6 +65,11 @@ def leave
           redirect_back fallback_location: profile_path(accepted_user_group.nickname)
         end
 
+        on(:last_admin) do
+          flash[:alert] = t("groups.leave.last_admin", scope: "decidim")
+          redirect_back fallback_location: profile_path(accepted_user_group.nickname)
+        end
+
         on(:invalid) do
           flash[:alert] = t("groups.leave.error", scope: "decidim")
           redirect_back fallback_location: profile_path(accepted_user_group.nickname)
@@ -73,6 +79,10 @@ def leave
 
     private
 
+    def ensure_user_group_not_blocked
+      raise ActionController::RoutingError, "Blocked User Group" if user_group&.blocked?
+    end
+
     def accepted_user_group
       @accepted_user_group ||= Decidim::UserGroups::AcceptedUserGroups.for(current_user).find_by(nickname: params[:id])
     end
diff --git a/decidim-core/app/controllers/decidim/last_activities_controller.rb b/decidim-core/app/controllers/decidim/last_activities_controller.rb
index a9cedf6af4d3f..9ea2083c7e38c 100644
--- a/decidim-core/app/controllers/decidim/last_activities_controller.rb
+++ b/decidim-core/app/controllers/decidim/last_activities_controller.rb
@@ -16,7 +16,7 @@ class LastActivitiesController < Decidim::ApplicationController
     def resource_types
       return @resource_types if defined?(@resource_types)
 
-      @resource_types = search.resource_types.sort_by do |klass|
+      @resource_types = ActionLog.public_resource_types.sort_by do |klass|
         klass.constantize.model_name.human
       end
 
@@ -28,19 +28,21 @@ def resource_types
     end
 
     def activities
-      @activities ||= paginate(search.results)
+      @activities ||= paginate(search.result)
     end
 
-    def search_klass
-      HomeActivitySearch
-    end
-
-    def context_params
-      { organization: current_organization }
+    def search_collection
+      ActionLog
+        .where(
+          organization: current_organization,
+          visibility: %w(public-only all)
+        )
+        .with_new_resource_type("all")
+        .order(created_at: :desc)
     end
 
     def default_filter_params
-      { resource_type: "all" }
+      { with_resource_type: "all" }
     end
   end
 end
diff --git a/decidim-core/app/controllers/decidim/links_controller.rb b/decidim-core/app/controllers/decidim/links_controller.rb
index f1d9455a08dad..d2b63503a775a 100644
--- a/decidim-core/app/controllers/decidim/links_controller.rb
+++ b/decidim-core/app/controllers/decidim/links_controller.rb
@@ -7,9 +7,11 @@ class LinksController < Decidim::ApplicationController
     skip_before_action :store_current_location
 
     helper Decidim::ExternalDomainHelper
+    helper_method :external_url
 
     before_action :parse_url
     rescue_from Decidim::InvalidUrlError, with: :invalid_url
+    rescue_from URI::InvalidURIError, with: :invalid_url
 
     def new
       headers["X-Robots-Tag"] = "noindex"
@@ -25,7 +27,7 @@ def invalid_url
     def parse_url
       raise Decidim::InvalidUrlError unless external_url
 
-      parts = external_url.match %r{^(([a-z]+):)?//([^/]+)(/.*)?$}
+      parts = external_url.match %r{\A(([a-z]+):)?//([^/]+)(/.*)?\z}
       raise Decidim::InvalidUrlError unless parts
 
       @url_parts = {
@@ -36,7 +38,7 @@ def parse_url
     end
 
     def external_url
-      @external_url ||= params[:external_url]
+      @external_url ||= URI.parse(params[:external_url]).to_s
     end
   end
 end
diff --git a/decidim-core/app/controllers/decidim/manifests_controller.rb b/decidim-core/app/controllers/decidim/manifests_controller.rb
new file mode 100644
index 0000000000000..16f52d27ab635
--- /dev/null
+++ b/decidim-core/app/controllers/decidim/manifests_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A controller to serve the manifest file for PWA
+  class ManifestsController < Decidim::ApplicationController
+    def show
+      organization_presenter = OrganizationPresenter.new(current_organization)
+      render layout: false, locals: { organization_params: organization_presenter }, content_type: "application/manifest+json"
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/decidim/newsletters_controller.rb b/decidim-core/app/controllers/decidim/newsletters_controller.rb
index 45d75ed831a16..61e17dc3c38c7 100644
--- a/decidim-core/app/controllers/decidim/newsletters_controller.rb
+++ b/decidim-core/app/controllers/decidim/newsletters_controller.rb
@@ -26,7 +26,7 @@ def unsubscribe
       user = User.find_by(decidim_organization_id: current_organization.id, id: decrypted_string.split("-").first)
       sent_at_time = Time.zone.at(decrypted_string.split("-").second.to_i)
 
-      if sent_at_time > (Time.current - 15.days)
+      if sent_at_time > (15.days.ago)
         UnsubscribeSettings.call(user) do
           on(:ok) do
             flash.now[:notice] = t("newsletters.unsubscribe.success", scope: "decidim")
diff --git a/decidim-core/app/controllers/decidim/notifications_subscriptions_controller.rb b/decidim-core/app/controllers/decidim/notifications_subscriptions_controller.rb
new file mode 100644
index 0000000000000..7be5c3f821861
--- /dev/null
+++ b/decidim-core/app/controllers/decidim/notifications_subscriptions_controller.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle the subscriptions to push notifications
+  class NotificationsSubscriptionsController < Decidim::ApplicationController
+    def create
+      Decidim::NotificationsSubscriptionsPersistor.new(current_user).add_subscription(params)
+      head :ok
+    end
+
+    def destroy
+      Decidim::NotificationsSubscriptionsPersistor.new(current_user).delete_subscription(params[:auth])
+      head :ok
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/decidim/offline_controller.rb b/decidim-core/app/controllers/decidim/offline_controller.rb
new file mode 100644
index 0000000000000..feca536bd6266
--- /dev/null
+++ b/decidim-core/app/controllers/decidim/offline_controller.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OfflineController < Decidim::ApplicationController
+    def show; end
+  end
+end
diff --git a/decidim-core/app/controllers/decidim/profiles_controller.rb b/decidim-core/app/controllers/decidim/profiles_controller.rb
index 6834759d38e52..10875390d0c36 100644
--- a/decidim-core/app/controllers/decidim/profiles_controller.rb
+++ b/decidim-core/app/controllers/decidim/profiles_controller.rb
@@ -13,7 +13,7 @@ class ProfilesController < Decidim::ApplicationController
     before_action :ensure_profile_holder
     before_action :ensure_profile_holder_is_a_group, only: [:members]
     before_action :ensure_profile_holder_is_a_user, only: [:groups, :following]
-    before_action :ensure_user_not_blocked, only: [:following, :followers, :badges]
+    before_action :ensure_user_not_blocked
 
     def show
       return redirect_to profile_timeline_path(nickname: params[:nickname]) if profile_holder == current_user
@@ -83,7 +83,7 @@ def ensure_profile_holder
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by(nickname: params[:nickname], organization: current_organization)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end
diff --git a/decidim-core/app/controllers/decidim/searches_controller.rb b/decidim-core/app/controllers/decidim/searches_controller.rb
index 2b34e3e6e3279..aaa4a7d6d83f1 100644
--- a/decidim-core/app/controllers/decidim/searches_controller.rb
+++ b/decidim-core/app/controllers/decidim/searches_controller.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   class SearchesController < Decidim::ApplicationController
-    include Rectify::ControllerHelpers
+    include Decidim::ControllerHelpers
     include FormFactory
     include FilterResource
     include Paginable
@@ -24,8 +24,9 @@ def index
     def default_filter_params
       {
         term: params[:term],
-        resource_type: nil,
-        decidim_scope_id: nil
+        with_resource_type: nil,
+        with_space_state: nil,
+        decidim_scope_id_eq: nil
       }
     end
 
diff --git a/decidim-core/app/controllers/decidim/short_links_controller.rb b/decidim-core/app/controllers/decidim/short_links_controller.rb
new file mode 100644
index 0000000000000..192f70fdcfa9e
--- /dev/null
+++ b/decidim-core/app/controllers/decidim/short_links_controller.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Redirects users with short links to the correct location on the site.
+  class ShortLinksController < Decidim::ApplicationController
+    skip_before_action :store_current_location
+
+    # The index action redirects the user to the application root in case
+    # someone tries to request the short link URL without an identifier.
+    def index
+      redirect_to decidim.root_path, status: :moved_permanently
+    end
+
+    # Redirects the user to the target URL that the short link is set to
+    # redirect to. Raises an ActionController::RoutingError in case a short link
+    # does not exist with the given identifier.
+    #
+    # @raise [ActionController::RoutingError] if a short link does not exist
+    #   with the given identifier
+    def show
+      raise ActionController::RoutingError, "Not Found" unless link
+
+      redirect_to link.target_url, status: :moved_permanently
+    end
+
+    private
+
+    # Fetches the link based on the provided identifier in the parameters.
+    #
+    # @return [Decidim::ShortLink] The short link matching the identifier
+    def link
+      @link ||= Decidim::ShortLink.find_by(identifier: params[:id])
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/decidim/upload_validations_controller.rb b/decidim-core/app/controllers/decidim/upload_validations_controller.rb
new file mode 100644
index 0000000000000..846def4c64e63
--- /dev/null
+++ b/decidim-core/app/controllers/decidim/upload_validations_controller.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle upload validations
+  class UploadValidationsController < Decidim::ApplicationController
+    include FormFactory
+
+    skip_before_action :verify_organization
+
+    before_action :underscore_params!
+
+    def create
+      @form = form(Decidim::UploadValidationForm).from_params(params)
+
+      ValidateUpload.call(@form) do
+        on(:ok) do
+          render json: []
+        end
+
+        on(:invalid) do |errors|
+          render json: errors
+        end
+      end
+    end
+
+    def organization_time_zone
+      return Rails.application.config.time_zone unless current_organization
+
+      super
+    end
+
+    private
+
+    def ensure_authenticated!
+      return true unless current_organization
+
+      super
+    end
+
+    def underscore_params!
+      params.transform_keys!(&:underscore)
+    end
+  end
+end
diff --git a/decidim-core/app/controllers/decidim/user_activities_controller.rb b/decidim-core/app/controllers/decidim/user_activities_controller.rb
index 9d0b94b783be0..bcc91d97c10c7 100644
--- a/decidim-core/app/controllers/decidim/user_activities_controller.rb
+++ b/decidim-core/app/controllers/decidim/user_activities_controller.rb
@@ -19,34 +19,50 @@ def index
     private
 
     def user
-      @user ||= current_organization.users.find_by(nickname: params[:nickname])
+      return unless params[:nickname]
+
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities
       @activities ||= paginate(
-        ActivitySearch.new(
-          organization: current_organization,
-          user: user,
-          current_user: current_user,
-          resource_type: "all",
-          resource_name: filter.resource_type
-        ).run
+        if own_activities?
+          OwnActivities.new(current_organization, **activity_options).query.with_private_resources
+        else
+          PublicActivities.new(current_organization, **activity_options).query.with_all_resources
+        end
       )
     end
 
+    def activity_options
+      {
+        user: user,
+        current_user: current_user,
+        resource_name: filter.resource_type
+      }
+    end
+
+    def own_activities?
+      @own_activities ||= current_user == user
+    end
+
     def default_filter_params
       { resource_type: nil }
     end
 
     def resource_types
-      @resource_types = %w(Decidim::Proposals::CollaborativeDraft
-                           Decidim::Comments::Comment
-                           Decidim::Debates::Debate
-                           Decidim::Initiative
-                           Decidim::Meetings::Meeting
-                           Decidim::Blogs::Post
-                           Decidim::Proposals::Proposal
-                           Decidim::Consultations::Question)
+      @resource_types = begin
+        array = %w(Decidim::Proposals::CollaborativeDraft
+                   Decidim::Comments::Comment
+                   Decidim::Debates::Debate
+                   Decidim::Initiative
+                   Decidim::Meetings::Meeting
+                   Decidim::Blogs::Post
+                   Decidim::Proposals::Proposal
+                   Decidim::Consultations::Question)
+        array << "Decidim::Budgets::Order" if own_activities?
+        array
+      end
     end
   end
 end
diff --git a/decidim-core/app/controllers/decidim/user_interests_controller.rb b/decidim-core/app/controllers/decidim/user_interests_controller.rb
index b3b6ac7de154d..fa36dd6e3c5df 100644
--- a/decidim-core/app/controllers/decidim/user_interests_controller.rb
+++ b/decidim-core/app/controllers/decidim/user_interests_controller.rb
@@ -5,8 +5,6 @@ module Decidim
   class UserInterestsController < Decidim::ApplicationController
     include Decidim::UserProfile
 
-    helper_method :scopes
-
     def show
       enforce_permission_to :read, :user, current_user: current_user
       @user_interests = form(UserInterestsForm).from_model(current_user)
diff --git a/decidim-core/app/controllers/decidim/user_timeline_controller.rb b/decidim-core/app/controllers/decidim/user_timeline_controller.rb
index 8c083702c4ca6..9b24a0490d7ca 100644
--- a/decidim-core/app/controllers/decidim/user_timeline_controller.rb
+++ b/decidim-core/app/controllers/decidim/user_timeline_controller.rb
@@ -18,21 +18,19 @@ def index
     private
 
     def user
-      @user ||= Decidim::User.find_by(
-        organization: current_organization,
-        nickname: params[:nickname]
-      )
+      return unless params[:nickname]
+
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities
       @activities ||= paginate(
-        ActivitySearch.new(
-          organization: current_organization,
-          resource_type: "all",
+        PublicActivities.new(
+          current_organization,
           scopes: current_user.interested_scopes,
           follows: follows,
           resource_name: filter.resource_type
-        ).run
+        ).query.with_resource_type("all")
       )
     end
 
diff --git a/decidim-core/app/events/decidim/change_nickname_event.rb b/decidim-core/app/events/decidim/change_nickname_event.rb
new file mode 100644
index 0000000000000..7d953abcfc1fa
--- /dev/null
+++ b/decidim-core/app/events/decidim/change_nickname_event.rb
@@ -0,0 +1,21 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ChangeNicknameEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    delegate :organization, to: :user, prefix: false
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+
+    i18n_attributes :link_to_account_settings
+
+    def notification_title
+      I18n.t("decidim.events.nickname_event.notification_body", **i18n_options).to_s.html_safe
+    end
+
+    def i18n_options
+      {
+        link_to_account_settings: url_helpers.account_path
+      }
+    end
+  end
+end
diff --git a/decidim-core/app/forms/decidim/account_form.rb b/decidim-core/app/forms/decidim/account_form.rb
index 4388b2c7e3801..16b138bb59fec 100644
--- a/decidim-core/app/forms/decidim/account_form.rb
+++ b/decidim-core/app/forms/decidim/account_form.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # account in her profile page.
+  # account in their profile page.
   class AccountForm < Form
     include Decidim::HasUploadValidations
 
@@ -14,7 +14,7 @@ class AccountForm < Form
     attribute :email
     attribute :password
     attribute :password_confirmation
-    attribute :avatar
+    attribute :avatar, Decidim::Attributes::Blob
     attribute :remove_avatar, Boolean, default: false
     attribute :personal_url
     attribute :about
diff --git a/decidim-core/app/forms/decidim/form.rb b/decidim-core/app/forms/decidim/form.rb
index 654992b2da4d9..324eaa65c1ebb 100644
--- a/decidim-core/app/forms/decidim/form.rb
+++ b/decidim-core/app/forms/decidim/form.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A base form object to hold common logic, like automatically adding as
   # public method the params sent as context by the `FormFactory` concern.
-  class Form < Rectify::Form
+  class Form < Decidim::AttributeObject::Form
     delegate :current_organization,
              :current_user,
              :current_component,
diff --git a/decidim-core/app/forms/decidim/messaging/conversation_form.rb b/decidim-core/app/forms/decidim/messaging/conversation_form.rb
index b9e79d18fb77e..ca92edd029d0d 100644
--- a/decidim-core/app/forms/decidim/messaging/conversation_form.rb
+++ b/decidim-core/app/forms/decidim/messaging/conversation_form.rb
@@ -7,7 +7,7 @@ class ConversationForm < Decidim::Form
       mimic :conversation
 
       attribute :body, Decidim::Attributes::CleanString
-      attribute :recipient_id, Integer
+      attribute :recipient_id, [Integer]
 
       validates :body, :recipient, presence: true, length: { maximum: Decidim.config.maximum_conversation_message_length }
       validate :check_recipient
diff --git a/decidim-core/app/forms/decidim/notifications_settings_form.rb b/decidim-core/app/forms/decidim/notifications_settings_form.rb
index cedb9e329e05f..2783d6456ac84 100644
--- a/decidim-core/app/forms/decidim/notifications_settings_form.rb
+++ b/decidim-core/app/forms/decidim/notifications_settings_form.rb
@@ -2,22 +2,24 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # notifications settings in her profile page.
+  # notifications settings in their profile page.
   class NotificationsSettingsForm < Form
     mimic :user
 
-    attribute :email_on_notification, Boolean
     attribute :email_on_moderations, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean
     attribute :allow_public_contact, Boolean
+    attribute :notification_settings, Hash
+    attribute :notifications_sending_frequency, String
 
     def map_model(user)
       self.newsletter_notifications = user.newsletter_notifications_at.present?
       self.notifications_from_followed = ["all", "followed-only"].include? user.notification_types
       self.notifications_from_own_activity = ["all", "own-only"].include? user.notification_types
       self.allow_public_contact = user.direct_message_types == "all"
+      self.notifications_sending_frequency = user.notifications_sending_frequency
     end
 
     def newsletter_notifications_at
@@ -49,5 +51,9 @@ def user_is_moderator?(user)
       end
       false
     end
+
+    def meet_push_notifications_requirements?
+      Rails.application.secrets.vapid[:enabled]
+    end
   end
 end
diff --git a/decidim-core/app/forms/decidim/password_form.rb b/decidim-core/app/forms/decidim/password_form.rb
new file mode 100644
index 0000000000000..c866b2dc18ac9
--- /dev/null
+++ b/decidim-core/app/forms/decidim/password_form.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class PasswordForm < Form
+    attribute :password
+    attribute :password_confirmation
+
+    validates :password, confirmation: true
+  end
+end
diff --git a/decidim-core/app/forms/decidim/upload_validation_form.rb b/decidim-core/app/forms/decidim/upload_validation_form.rb
new file mode 100644
index 0000000000000..cf62b81774fe9
--- /dev/null
+++ b/decidim-core/app/forms/decidim/upload_validation_form.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object used to handle upload validations, this is used when user is
+  # adding files to dropzone in upload modal.
+  class UploadValidationForm < Decidim::Form
+    include Decidim::HasUploadValidations
+
+    attribute :resource_class, String
+    # Property is named as attribute in upload modal and passthru validator, but
+    # it cannot be named as attribute here.
+    attribute :property, String
+    attribute :blob, String
+    attribute :form_class, String
+
+    validates :resource_class, presence: true
+    validates :property, presence: true
+    validates :blob, presence: true
+    validate :file_validators, if: ->(form) { form.resource_class.present? && form.property.present? && form.blob.present? }
+
+    alias organization current_organization
+
+    # This is a "trick" to provide the attachment context (i.e. admin or
+    # participant) to the attachment records being validated. This is to show
+    # the invalid content type / file extension errors with the correct file
+    # extensions that may be shown in the help text next to the upload
+    # drag'n'drop field.
+    def attached_to
+      @attached_to ||= AttachmentContextProxy.new(organization, attachment_context)
+    end
+
+    private
+
+    def file_validators
+      org = organization
+      PassthruValidator.new(
+        attributes: [property],
+        to: resource_class.constantize,
+        with: lambda { |record|
+          validate_with.tap do |hash|
+            hash.merge!(organization: record.try(:organization) || org) if !hash[:organization] && record.respond_to?(:organization=)
+          end
+        }
+      ).validate_each(self, property.to_sym, blob)
+    end
+
+    def validate_with
+      if form_object_class && form_object_class._validators[property.to_sym].is_a?(Array) && form_object_class._validators[property.to_sym].size.positive?
+        passthru = form_object_class._validators[property.to_sym].find { |v| v.is_a?(PassthruValidator) }
+        return passthru.options[:with] if passthru && passthru.options[:with].present?
+      end
+      {}
+    end
+
+    def form_object_class
+      @form_object_class ||= begin
+        form_class.constantize if form_class.present?
+      rescue NameError
+        nil
+      end
+    end
+
+    # The attachment context (i.e. admin or participant) is determined using the
+    # form class name and checking if it contains the `Admin` namespace in it.
+    # And example use case is the attachment forms in the admin panel.
+    def attachment_context
+      return :participant unless form_object_class
+      return :admin if form_object_class.name.include? "::Admin::"
+
+      :participant
+    end
+
+    # This class provides ability to interpret the attachment context based on
+    # the details available within the context of this class. Normally the
+    # attachment context would be defined by the record to which the attachment
+    # are added to, e.g. proposals (participant contenxt) or participatory
+    # processes (admin context). Unfortunately this information is not available
+    # when the parameters are passed to the upload validation.
+    class AttachmentContextProxy
+      attr_reader :organization, :attachment_context
+
+      delegate :id, :_read_attribute, to: :organization
+
+      def initialize(organization, attachment_context)
+        @organization = organization
+        @attachment_context = attachment_context
+      end
+
+      def self.primary_key
+        :id
+      end
+
+      def self.polymorphic_name
+        "Decidim::Organization"
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/forms/decidim/user_group_form.rb b/decidim-core/app/forms/decidim/user_group_form.rb
index c4b280207e246..5da3e02ca1a39 100644
--- a/decidim-core/app/forms/decidim/user_group_form.rb
+++ b/decidim-core/app/forms/decidim/user_group_form.rb
@@ -10,13 +10,13 @@ class UserGroupForm < Form
     attribute :name
     attribute :nickname
     attribute :email
-    attribute :avatar
+    attribute :avatar, Decidim::Attributes::Blob
     attribute :about
     attribute :document_number
     attribute :phone
 
     validates :name, presence: true
-    validates :email, presence: true, 'valid_email_2/email': { disposable: true }
+    validates :email, presence: true, "valid_email_2/email": { disposable: true }
     validates :nickname, presence: true
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
diff --git a/decidim-core/app/forms/decidim/user_interest_scope_form.rb b/decidim-core/app/forms/decidim/user_interest_scope_form.rb
index e9e20efa47eee..4e07eb845c94a 100644
--- a/decidim-core/app/forms/decidim/user_interest_scope_form.rb
+++ b/decidim-core/app/forms/decidim/user_interest_scope_form.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestScopeForm < Form
     mimic :scope
 
diff --git a/decidim-core/app/forms/decidim/user_interests_form.rb b/decidim-core/app/forms/decidim/user_interests_form.rb
index e9e6d45aa1ed0..75ad7b786d282 100644
--- a/decidim-core/app/forms/decidim/user_interests_form.rb
+++ b/decidim-core/app/forms/decidim/user_interests_form.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # The form object that handles the data behind updating a user's
-  # interests in her profile page.
+  # interests in their profile page.
   class UserInterestsForm < Form
     mimic :user
 
diff --git a/decidim-core/app/forms/translatable_presence_validator.rb b/decidim-core/app/forms/translatable_presence_validator.rb
index 08bdaba8851df..aa3c951bdbd6e 100644
--- a/decidim-core/app/forms/translatable_presence_validator.rb
+++ b/decidim-core/app/forms/translatable_presence_validator.rb
@@ -9,7 +9,7 @@
 # object (or the `default_locale` of the form's organization) for the given field.
 class TranslatablePresenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
-    translated_attr = "#{attribute}_#{default_locale_for(record)}"
+    translated_attr = "#{attribute}_#{default_locale_for(record)}".gsub("-", "__")
     record.errors.add(translated_attr, :blank) if record.send(translated_attr).blank?
   end
 
@@ -22,7 +22,7 @@ def default_locale_for(record)
       record.current_organization.default_locale
     else
       record.errors.add(:current_organization, :blank)
-      []
+      Decidim.default_locale
     end
   end
 end
diff --git a/decidim-core/app/forms/url_validator.rb b/decidim-core/app/forms/url_validator.rb
index 9675df8fd73e0..757d5184c6435 100644
--- a/decidim-core/app/forms/url_validator.rb
+++ b/decidim-core/app/forms/url_validator.rb
@@ -6,7 +6,7 @@
 #
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << (options[:message] || "must be a valid URL") unless url_valid?(value)
+    record.errors.add attribute, (options[:message] || "must be a valid URL") unless url_valid?(value)
   end
 
   # a URL may be technically well-formed but may
diff --git a/decidim-core/app/helpers/decidim/application_helper.rb b/decidim-core/app/helpers/decidim/application_helper.rb
index 4a00b978393bf..45f5c7cde3bfd 100644
--- a/decidim-core/app/helpers/decidim/application_helper.rb
+++ b/decidim-core/app/helpers/decidim/application_helper.rb
@@ -114,9 +114,9 @@ def step_cta_url(process)
       base_url, params = decidim_participatory_processes.participatory_process_path(process).split("?")
 
       if params.present?
-        [base_url, "/", process.active_step.cta_path, "?", params].join("")
+        [base_url, "/", process.active_step.cta_path, "?", params].join
       else
-        [base_url, "/", process.active_step.cta_path].join("")
+        [base_url, "/", process.active_step.cta_path].join
       end
     end
 
diff --git a/decidim-core/app/helpers/decidim/attachments_helper.rb b/decidim-core/app/helpers/decidim/attachments_helper.rb
index fc0f679b2ce5a..f08bce4100db3 100644
--- a/decidim-core/app/helpers/decidim/attachments_helper.rb
+++ b/decidim-core/app/helpers/decidim/attachments_helper.rb
@@ -10,7 +10,7 @@ module AttachmentsHelper
     #
     # Returns nothing.
     def attachments_for(attached_to)
-      render partial: "decidim/application/attachments.html", locals: { attached_to: attached_to }
+      render partial: "decidim/application/attachments", locals: { attached_to: attached_to }
     end
 
     # Renders the attachment's title.
diff --git a/decidim-core/app/helpers/decidim/cells_paginate_helper.rb b/decidim-core/app/helpers/decidim/cells_paginate_helper.rb
index 78c139e6f2fa8..9d8b258024233 100644
--- a/decidim-core/app/helpers/decidim/cells_paginate_helper.rb
+++ b/decidim-core/app/helpers/decidim/cells_paginate_helper.rb
@@ -8,7 +8,7 @@ module CellsPaginateHelper
     include Cell::ViewModel::Partial
     include Decidim::PaginateHelper
 
-    def paginate(scope, options = {}, &block)
+    def paginate(scope, **options, &block)
       options = options.reverse_merge(views_prefix: "../views/")
       super
     end
diff --git a/decidim-core/app/helpers/decidim/cookies_helper.rb b/decidim-core/app/helpers/decidim/cookies_helper.rb
deleted file mode 100644
index 6c20d45922557..0000000000000
--- a/decidim-core/app/helpers/decidim/cookies_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This module includes helpers to verify the acceptance of the cookie policy
-  module CookiesHelper
-    # Public: Returns true if the cookie policy has been accepted
-    def cookies_accepted?
-      cookies[Decidim.config.consent_cookie_name].present?
-    end
-  end
-end
diff --git a/decidim-core/app/helpers/decidim/datalist_select_helper.rb b/decidim-core/app/helpers/decidim/datalist_select_helper.rb
new file mode 100644
index 0000000000000..06bad47257e8c
--- /dev/null
+++ b/decidim-core/app/helpers/decidim/datalist_select_helper.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides a single method to create datalist select.
+  module DatalistSelectHelper
+    # Public: Creates HTML for datalist select so that you can use seperate ids and labels.
+    #
+    # items - Items in datalist, item should have id and name.
+    # options - a Hash with options
+    #           :id - id of wrapper
+    #           :class - wrapper css classes
+    #           :data - wrapper data attributes
+    #           :label - label for input
+    #           :name - name of input
+    #           :autocomplete - enable or disable autocomplete provided by browser.
+    #           :list - id of datalist
+    # yield - additional html (e.g. hidden input)
+    #
+    # Returns a HTML String div containing following children: label, input and datalist elements.
+    def datalist_select(items, options = {})
+      default_options = {
+        list: "datalist-list",
+        autocomplete: "off"
+      }
+      options = default_options.merge(options)
+      tag.div(id: options[:id], class: options[:class], data: options[:data]) do
+        html = ""
+        html += yield if block_given?
+        html += tag.label(options[:label], for: options[:name])
+        html += tag.input(type: "text", name: options[:name], list: options[:list], autocomplete: options[:autocomplete], placeholder: options[:placeholder])
+        html += tag.datalist(id: options[:list]) do
+          items.map do |item|
+            tag.option(translated_attribute(item.name), data: { value: item.id })
+          end.join.html_safe
+        end
+        html.html_safe
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/helpers/decidim/decidim_form_helper.rb b/decidim-core/app/helpers/decidim/decidim_form_helper.rb
index 854c9ada735a6..d80a0f8310784 100644
--- a/decidim-core/app/helpers/decidim/decidim_form_helper.rb
+++ b/decidim-core/app/helpers/decidim/decidim_form_helper.rb
@@ -190,7 +190,7 @@ def decidim_form_slug_url(prepend_path = "", value = "")
           request.protocol,
           request.host_with_port,
           prepend_slug_path
-        ].join("").html_safe +
+        ].join.html_safe +
           content_tag(:span, value, class: "slug-url-value")
       end
     end
diff --git a/decidim-core/app/helpers/decidim/followable_helper.rb b/decidim-core/app/helpers/decidim/followable_helper.rb
index 3c21cd5ff8a65..82f16a33478c8 100644
--- a/decidim-core/app/helpers/decidim/followable_helper.rb
+++ b/decidim-core/app/helpers/decidim/followable_helper.rb
@@ -5,7 +5,7 @@ module Decidim
   module FollowableHelper
     # Invokes the decidim/shared/follow_button partial.
     def follow_button_for(model, large = nil)
-      render partial: "decidim/shared/follow_button.html", locals: { followable: model, large: large }
+      controller.view_context.render partial: "decidim/shared/follow_button", locals: { followable: model, large: large }
     end
   end
 end
diff --git a/decidim-core/app/helpers/decidim/icon_helper.rb b/decidim-core/app/helpers/decidim/icon_helper.rb
index ce2602bae2200..2e62e026c9cd4 100644
--- a/decidim-core/app/helpers/decidim/icon_helper.rb
+++ b/decidim-core/app/helpers/decidim/icon_helper.rb
@@ -40,7 +40,7 @@ def manifest_icon(manifest, options = {})
     #
     # Returns an HTML tag with the icon.
     def resource_icon(resource, options = {})
-      if resource.class.name == "Decidim::Comments::Comment"
+      if resource.instance_of?(Decidim::Comments::Comment)
         icon "comment-square", options
       elsif resource.respond_to?(:component) && resource.component.present?
         component_icon(resource.component, options)
diff --git a/decidim-core/app/helpers/decidim/layout_helper.rb b/decidim-core/app/helpers/decidim/layout_helper.rb
index 7bd3829d96cb9..f208c5cacde80 100644
--- a/decidim-core/app/helpers/decidim/layout_helper.rb
+++ b/decidim-core/app/helpers/decidim/layout_helper.rb
@@ -15,6 +15,20 @@ def favicon
       end)
     end
 
+    def apple_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
+    end
+
+    def legacy_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:small, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image.gsub(".png", ".ico"), rel: "icon", sizes: "any", type: nil)
+    end
+
     # Outputs an SVG-based icon.
     #
     # name    - The String with the icon name.
@@ -74,8 +88,11 @@ def external_icon(path, options = {})
       classes = _icon_classes(options) + ["external-icon"]
 
       if path.split(".").last == "svg"
+        icon_path = application_path(path)
+        return unless icon_path
+
         attributes = { class: classes.join(" ") }.merge(options)
-        asset = File.read(application_path(path))
+        asset = File.read(icon_path)
         asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
       else
         image_pack_tag(path, class: classes.join(" "), style: "display: none")
@@ -83,9 +100,14 @@ def external_icon(path, options = {})
     end
 
     def application_path(path)
-      img_path = asset_pack_path(path)
-      img_path = URI(img_path).path if Decidim.cors_enabled
-      Rails.root.join("public/#{img_path}")
+      # Force the path to be returned without the protocol and host even when a
+      # custom asset host has been defined. The host parameter needs to be a
+      # non-nil because otherwise it will be set to the asset host at
+      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
+      img_path = asset_pack_path(path, host: "", protocol: :relative)
+      Rails.public_path.join(img_path.sub(%r{^/}, ""))
+    rescue ::Webpacker::Manifest::MissingEntryError
+      nil
     end
 
     # Allows to create role attribute according to accessibility rules
@@ -107,7 +129,7 @@ def extended_navigation_bar(items, max_items: 5)
       extra_items = items.slice((max_items + 1)..-1) || []
       active_item = items.find { |item| item[:active] }
 
-      render partial: "decidim/shared/extended_navigation_bar.html", locals: {
+      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
         items: items,
         extra_items: extra_items,
         active_item: active_item,
diff --git a/decidim-core/app/helpers/decidim/map_helper.rb b/decidim-core/app/helpers/decidim/map_helper.rb
index bdafbe3a8bcf5..47e4798b9772e 100644
--- a/decidim-core/app/helpers/decidim/map_helper.rb
+++ b/decidim-core/app/helpers/decidim/map_helper.rb
@@ -45,12 +45,14 @@ def static_map_link(resource, options = {}, map_html_options = {}, &block)
         link: map_url
       }.merge(options))
 
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
 
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
 
       builder.map_element(
@@ -84,12 +86,14 @@ def dynamic_map_for(options_or_markers = {}, html_options = {}, &block)
       # Ideally we would use Rails' native content_for here (which is exactly
       # for this purpose) but unfortunately it does not work in the cells which
       # also need to display maps.
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
 
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
 
       map_html_options = { id: "map", class: "google-map" }.merge(html_options)
diff --git a/decidim-core/app/helpers/decidim/meta_tags_helper.rb b/decidim-core/app/helpers/decidim/meta_tags_helper.rb
index 2d6aa5e35d9aa..61d0517dc2fc5 100644
--- a/decidim-core/app/helpers/decidim/meta_tags_helper.rb
+++ b/decidim-core/app/helpers/decidim/meta_tags_helper.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Naming/MemoizedInstanceVariableName
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
@@ -128,4 +127,3 @@ def add_decidim_meta_image_url(image_url)
     end
   end
 end
-# rubocop:enable Naming/MemoizedInstanceVariableName
diff --git a/decidim-core/app/helpers/decidim/newsletters_helper.rb b/decidim-core/app/helpers/decidim/newsletters_helper.rb
index b1e83155b0b51..ea0e31c0e5f86 100644
--- a/decidim-core/app/helpers/decidim/newsletters_helper.rb
+++ b/decidim-core/app/helpers/decidim/newsletters_helper.rb
@@ -31,6 +31,7 @@ def parse_interpolations(content, user = nil, id = nil)
     # this method is used to generate the root link on mail with the utm_codes
     # If the newsletter_id is nil, it returns the root_url
     def custom_url_for_mail_root(organization, newsletter_id = nil)
+      decidim = EngineRouter.new("decidim", {})
       if newsletter_id.present?
         decidim.root_url(host: organization.host) + utm_codes(organization.host, newsletter_id.to_s)
       else
diff --git a/decidim-core/app/helpers/decidim/notifications_settings_helper.rb b/decidim-core/app/helpers/decidim/notifications_settings_helper.rb
new file mode 100644
index 0000000000000..33f4db8ca4f2f
--- /dev/null
+++ b/decidim-core/app/helpers/decidim/notifications_settings_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides methods to render the notifications settings form
+  module NotificationsSettingsHelper
+    def frequencies_collection
+      {
+        none: t("decidim.notifications_settings.show.notifications_sending_frequencies.none"),
+        real_time: t("decidim.notifications_settings.show.notifications_sending_frequencies.real_time"),
+        daily: t("decidim.notifications_settings.show.notifications_sending_frequencies.daily"),
+        weekly: t("decidim.notifications_settings.show.notifications_sending_frequencies.weekly")
+      }
+    end
+  end
+end
diff --git a/decidim-core/app/helpers/decidim/passwords_helper.rb b/decidim-core/app/helpers/decidim/passwords_helper.rb
new file mode 100644
index 0000000000000..3f1e5e9b80b6c
--- /dev/null
+++ b/decidim-core/app/helpers/decidim/passwords_helper.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module PasswordsHelper
+    def password_field_options_for(user)
+      user =
+        case user
+        when :user
+          Decidim::User.new
+        when :admin
+          Decidim::User.new(admin: true)
+        when String
+          Decidim::User.with_reset_password_token(user)
+        else
+          user
+        end
+      min_length = ::PasswordValidator.minimum_length_for(user)
+      help_text =
+        if needs_admin_password?(user)
+          t("devise.passwords.edit.password_help_admin", minimun_characters: min_length)
+        else
+          t("devise.passwords.edit.password_help", minimun_characters: min_length)
+        end
+
+      {
+        autocomplete: "new-password",
+        required: true,
+        help_text: help_text,
+        minlength: min_length,
+        maxlength: ::PasswordValidator::MAX_LENGTH
+      }
+    end
+
+    def needs_admin_password?(user)
+      return false unless user&.admin?
+      return false unless Decidim.config.admin_password_strong
+
+      true
+    end
+  end
+end
diff --git a/decidim-core/app/helpers/decidim/sanitize_helper.rb b/decidim-core/app/helpers/decidim/sanitize_helper.rb
index 25a3579fed682..5e4a074050a18 100644
--- a/decidim-core/app/helpers/decidim/sanitize_helper.rb
+++ b/decidim-core/app/helpers/decidim/sanitize_helper.rb
@@ -16,13 +16,18 @@ def self.included(base)
     #
     # Returns an HTML-safe String.
     def decidim_sanitize(html, options = {})
+      scrubber = options[:scrubber] || Decidim::UserInputScrubber.new
       if options[:strip_tags]
-        strip_tags sanitize(html, scrubber: Decidim::UserInputScrubber.new)
+        strip_tags sanitize(html, scrubber: scrubber)
       else
-        sanitize(html, scrubber: Decidim::UserInputScrubber.new)
+        sanitize(html, scrubber: scrubber)
       end
     end
 
+    def decidim_sanitize_admin(html, options = {})
+      decidim_sanitize(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
+    end
+
     def decidim_sanitize_newsletter(html, options = {})
       if options[:strip_tags]
         strip_tags sanitize(html, scrubber: Decidim::NewsletterScrubber.new)
@@ -32,7 +37,12 @@ def decidim_sanitize_newsletter(html, options = {})
     end
 
     def decidim_sanitize_editor(html, options = {})
-      content_tag(:div, decidim_sanitize(html, options), class: %w(ql-editor ql-reset-decidim))
+      content_tag(:div, decidim_sanitize(html, options), class: %w(ql-editor-display))
+    end
+
+    def decidim_sanitize_editor_admin(html, options = {})
+      html = Decidim::IframeDisabler.new(html, options).perform
+      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
     end
 
     def decidim_html_escape(text)
diff --git a/decidim-core/app/helpers/decidim/searches_helper.rb b/decidim-core/app/helpers/decidim/searches_helper.rb
index f6b9f52d27189..8b3b9458dafa6 100644
--- a/decidim-core/app/helpers/decidim/searches_helper.rb
+++ b/decidim-core/app/helpers/decidim/searches_helper.rb
@@ -27,12 +27,12 @@ def search_path_by(resource_type: nil, space_state: nil)
       new_params = {
         utf8: params[:utf8],
         filter: {
-          decidim_scope_id: params.dig(:filter, :decidim_scope_id),
+          with_scope: params.dig(:filter, :with_scope),
           term: params[:term] || params.dig(:filter, :term)
         }
       }
-      new_params[:filter][:resource_type] = resource_type if resource_type.present?
-      new_params[:filter][:space_state] = space_state if space_state.present?
+      new_params[:filter][:with_resource_type] = resource_type if resource_type.present?
+      new_params[:filter][:with_space_state] = space_state if space_state.present?
       decidim.search_path(new_params)
     end
 
@@ -44,14 +44,14 @@ def main_search_path
 
     # Generates the path to filter by resource type, considering the other filters.
     def search_path_by_resource_type(resource_type)
-      search_path_by(space_state: params.dig(:filter, :space_state), resource_type: resource_type)
+      search_path_by(space_state: params.dig(:filter, :with_space_state), resource_type: resource_type)
     end
 
     # Generates the path and link to filter by space state, taking into account
     # the other filters applied.
     def search_path_by_state_link(state)
-      path = search_path_by(resource_type: params.dig(:filter, :resource_type), space_state: state)
-      is_active = params.dig(:filter, :space_state).to_s == state.to_s
+      path = search_path_by(resource_type: params.dig(:filter, :with_resource_type), space_state: state)
+      is_active = params.dig(:filter, :with_space_state).to_s == state.to_s
 
       link_to path, class: "order-by__tab#{" is-active" if is_active}" do
         content_tag(:strong, t(state || :all, scope: "decidim.searches.filters.state"))
diff --git a/decidim-core/app/helpers/decidim/short_link_helper.rb b/decidim-core/app/helpers/decidim/short_link_helper.rb
new file mode 100644
index 0000000000000..e5f00abf0359b
--- /dev/null
+++ b/decidim-core/app/helpers/decidim/short_link_helper.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This helper includes some methods to help with generating short links within
+  # the Decidim engine views.
+  module ShortLinkHelper
+    # A helper method to get a short URL in the current context where this
+    # method is called from. This helper automatically fetches the "target" for
+    # the short link, such as the component or the participatory process. This
+    # also resolves the current mounted route name to make it possible to refer
+    # to the same context when redirecting the short URL to correct full URL.
+    #
+    # @option kwargs [Boolean] :route_name the route name to which the short
+    #   link should link to
+    # @option kwargs [Float] :params the URL query parameters that should be
+    #   included in the URL where the short link redirects to
+    # @return [String] The short URL
+    def short_url(**kwargs)
+      target = respond_to?(:current_component) && current_component
+      target ||= respond_to?(:current_participatory_space) && current_participatory_space
+      target ||= respond_to?(:current_organization) && current_organization
+      target ||= Rails.application
+
+      mounted_engine = EngineResolver.new(_routes).mounted_name
+      ShortLink.to(target, mounted_engine, **kwargs).short_url
+    end
+  end
+end
diff --git a/decidim-core/app/helpers/decidim/translations_helper.rb b/decidim-core/app/helpers/decidim/translations_helper.rb
index e995c02b63c4a..94fe1e5ab53aa 100644
--- a/decidim-core/app/helpers/decidim/translations_helper.rb
+++ b/decidim-core/app/helpers/decidim/translations_helper.rb
@@ -14,10 +14,10 @@ module TranslationsHelper
     # options - Any other option to delegate to the individual I18n.t calls
     #
     # Returns a Hash with the locales as keys and the translations as values.
-    def multi_translation(key, locales = Decidim.available_locales, *options)
+    def multi_translation(key, locales = Decidim.available_locales, **options)
       locales.each_with_object({}) do |locale, result|
         I18n.with_locale(locale) do
-          result[locale.to_sym] = I18n.t(key, *options)
+          result[locale.to_sym] = I18n.t(key, **options)
         end
       end
     end
diff --git a/decidim-core/app/jobs/decidim/data_portability_export_job.rb b/decidim-core/app/jobs/decidim/download_your_data_export_job.rb
similarity index 53%
rename from decidim-core/app/jobs/decidim/data_portability_export_job.rb
rename to decidim-core/app/jobs/decidim/download_your_data_export_job.rb
index 2660299261594..e4e155eb02796 100644
--- a/decidim-core/app/jobs/decidim/data_portability_export_job.rb
+++ b/decidim-core/app/jobs/decidim/download_your_data_export_job.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Decidim
-  class DataPortabilityExportJob < ApplicationJob
+  class DownloadYourDataExportJob < ApplicationJob
     queue_as :default
 
-    def perform(user, export_format = ::Decidim::DataPortabilityExporter::DEFAULT_EXPORT_FORMAT)
+    def perform(user, export_format = ::Decidim::DownloadYourDataExporter::DEFAULT_EXPORT_FORMAT)
       filename = "#{SecureRandom.urlsafe_base64}.zip"
       path = Rails.root.join("tmp/#{filename}")
       password = SecureRandom.urlsafe_base64
@@ -12,17 +12,17 @@ def perform(user, export_format = ::Decidim::DataPortabilityExporter::DEFAULT_EX
       generate_zip_file(user, path, password, export_format)
       save_or_upload_file(user, path)
 
-      ExportMailer.data_portability_export(user, filename, password).deliver_later
+      ExportMailer.download_your_data_export(user, filename, password).deliver_later
     end
 
     private
 
     def generate_zip_file(user, path, password, export_format)
-      DataPortabilityExporter.new(user, path, password, export_format).export
+      DownloadYourDataExporter.new(user, path, password, export_format).export
     end
 
     def save_or_upload_file(user, path)
-      user.data_portability_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
+      user.download_your_data_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
     end
   end
 end
diff --git a/decidim-core/app/jobs/decidim/email_notifications_digest_generator_job.rb b/decidim-core/app/jobs/decidim/email_notifications_digest_generator_job.rb
new file mode 100644
index 0000000000000..64ee63443fa74
--- /dev/null
+++ b/decidim-core/app/jobs/decidim/email_notifications_digest_generator_job.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EmailNotificationsDigestGeneratorJob < ApplicationJob
+    queue_as :mailers
+
+    def perform(user_id, frequency, time: Time.now.utc, force: false)
+      user = Decidim::User.find_by(id: user_id)
+      return if user.blank?
+
+      should_notify = force || NotificationsDigestSendingDecider.must_notify?(user, time: time)
+      return unless should_notify
+
+      notification_ids = user.notifications.try(frequency, time: time).pluck(:id)
+      return if notification_ids.blank?
+
+      NotificationsDigestMailer.digest_mail(user, notification_ids).deliver_later
+      user.update(digest_sent_at: time)
+    end
+  end
+end
diff --git a/decidim-core/app/jobs/decidim/notification_generator_for_recipient_job.rb b/decidim-core/app/jobs/decidim/notification_generator_for_recipient_job.rb
index 0ea97c87dcd70..3c8393def5ea4 100644
--- a/decidim-core/app/jobs/decidim/notification_generator_for_recipient_job.rb
+++ b/decidim-core/app/jobs/decidim/notification_generator_for_recipient_job.rb
@@ -6,9 +6,11 @@ class NotificationGeneratorForRecipientJob < ApplicationJob
 
     def perform(event, event_class_name, resource, recipient, user_role, extra) # rubocop:disable Metrics/ParameterLists
       event_class = event_class_name.constantize
-      NotificationGeneratorForRecipient
-        .new(event, event_class, resource, recipient, user_role, extra)
-        .generate
+      notification = NotificationGeneratorForRecipient
+                     .new(event, event_class, resource, recipient, user_role, extra)
+                     .generate
+
+      SendPushNotification.new.perform(notification) if notification
     end
   end
 end
diff --git a/decidim-core/app/jobs/decidim/reminder_generator_job.rb b/decidim-core/app/jobs/decidim/reminder_generator_job.rb
new file mode 100644
index 0000000000000..53097cc617582
--- /dev/null
+++ b/decidim-core/app/jobs/decidim/reminder_generator_job.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReminderGeneratorJob < ApplicationJob
+    queue_as :reminders
+
+    def perform(generator_class_name)
+      generator = generator_class_name.constantize.new
+      generator.generate
+    end
+  end
+end
diff --git a/decidim-core/app/jobs/decidim/resend_confirmation_instructions_job.rb b/decidim-core/app/jobs/decidim/resend_confirmation_instructions_job.rb
new file mode 100644
index 0000000000000..1deab4ce0fc3c
--- /dev/null
+++ b/decidim-core/app/jobs/decidim/resend_confirmation_instructions_job.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResendConfirmationInstructionsJob < ApplicationJob
+    queue_as :default
+
+    def perform(user)
+      user.send_reconfirmation_instructions
+    end
+  end
+end
diff --git a/decidim-core/app/jobs/decidim/user_report_job.rb b/decidim-core/app/jobs/decidim/user_report_job.rb
index 36b4332f6639e..5f1c703a00325 100644
--- a/decidim-core/app/jobs/decidim/user_report_job.rb
+++ b/decidim-core/app/jobs/decidim/user_report_job.rb
@@ -4,8 +4,8 @@ module Decidim
   class UserReportJob < ApplicationJob
     queue_as :user_report
 
-    def perform(admin, token, reason, user)
-      UserReportMailer.notify(admin, token, reason, user).deliver_now
+    def perform(admin, report)
+      UserReportMailer.notify(admin, report).deliver_now
     end
   end
 end
diff --git a/decidim-core/app/mailers/concerns/decidim/multitenant_asset_host.rb b/decidim-core/app/mailers/concerns/decidim/multitenant_asset_host.rb
index 30b48e9c94999..57de381d18183 100644
--- a/decidim-core/app/mailers/concerns/decidim/multitenant_asset_host.rb
+++ b/decidim-core/app/mailers/concerns/decidim/multitenant_asset_host.rb
@@ -18,15 +18,23 @@ module MultitenantAssetHost
       def set_asset_host
         return if Rails.application.config.action_mailer.asset_host.present?
 
-        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}" }
+        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}#{port_fragment}" }
       end
 
       private
 
       def protocol
-        return "https" if Decidim.force_ssl
+        asset_url_options.protocol
+      end
+
+      def port_fragment
+        return if asset_url_options.default_port?
+
+        ":#{asset_url_options.port}"
+      end
 
-        "http"
+      def asset_url_options
+        @asset_url_options ||= UrlOptionResolver.new
       end
     end
   end
diff --git a/decidim-core/app/mailers/decidim/application_mailer.rb b/decidim-core/app/mailers/decidim/application_mailer.rb
index 7a12e5dc9e645..253ab2173c9b3 100644
--- a/decidim-core/app/mailers/decidim/application_mailer.rb
+++ b/decidim-core/app/mailers/decidim/application_mailer.rb
@@ -23,7 +23,7 @@ def set_smtp
         port: @organization.smtp_settings["port"],
         user_name: @organization.smtp_settings["user_name"],
         password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
-      ) { |_k, o, v| v.presence || o }.reject! { |_k, v| v.blank? }
+      ) { |_k, o, v| v.presence || o }.compact_blank!
     end
   end
 end
diff --git a/decidim-core/app/mailers/decidim/block_user_mailer.rb b/decidim-core/app/mailers/decidim/block_user_mailer.rb
index ca455fc7fcd0f..8648e0ae5af04 100644
--- a/decidim-core/app/mailers/decidim/block_user_mailer.rb
+++ b/decidim-core/app/mailers/decidim/block_user_mailer.rb
@@ -5,17 +5,18 @@ module Decidim
   # when their account was blocked
   class BlockUserMailer < ApplicationMailer
     def notify(user, justification)
-      @user = user
-      @organization = user.organization
-      @justification = justification
-      mail(
-        to: user.email,
-        subject: I18n.t(
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @justification = justification
+        subject = I18n.t(
           "decidim.block_user_mailer.notify.subject",
           organization_name: @organization.name,
           justification: @justification
         )
-      )
+
+        mail(to: user.email, subject: subject)
+      end
     end
   end
 end
diff --git a/decidim-core/app/mailers/decidim/export_mailer.rb b/decidim-core/app/mailers/decidim/export_mailer.rb
index 1378d79fd4862..476bc98217ff7 100644
--- a/decidim-core/app/mailers/decidim/export_mailer.rb
+++ b/decidim-core/app/mailers/decidim/export_mailer.rb
@@ -27,12 +27,12 @@ def export(user, export_name, export_data)
     end
 
     # Public: Sends a notification email with a link to retrieve
-    # the result of a data_portability export in a zipped file.
+    # the result of a download_your_data export in a zipped file.
     #
     # user - The user to be notified.
     #
     # Returns nothing.
-    def data_portability_export(user, filename, password)
+    def download_your_data_export(user, filename, password)
       @user = user
       @organization = user.organization
       @filename = filename
diff --git a/decidim-core/app/mailers/decidim/newsletter_mailer.rb b/decidim-core/app/mailers/decidim/newsletter_mailer.rb
index a7441f52b68f0..ea8b4c7529357 100644
--- a/decidim-core/app/mailers/decidim/newsletter_mailer.rb
+++ b/decidim-core/app/mailers/decidim/newsletter_mailer.rb
@@ -3,22 +3,28 @@
 module Decidim
   class NewsletterMailer < ApplicationMailer
     helper Decidim::SanitizeHelper
+    helper Decidim::TranslationsHelper
+
     include Decidim::NewslettersHelper
 
     layout "decidim/newsletter_base"
 
-    add_template_helper Decidim::TranslationsHelper
-
     helper_method :cell
 
-    def newsletter(user, newsletter)
+    def newsletter(user, newsletter, preview: false)
       return if user.email.blank?
 
       @organization = user.organization
       @newsletter = newsletter
       @user = user
-
-      @custom_url_for_mail_root = custom_url_for_mail_root(@organization, @newsletter.id) if Decidim.config.track_newsletter_links
+      @preview = preview
+
+      @custom_url_for_mail_root =
+        if @preview
+          "#"
+        elsif Decidim.config.track_newsletter_links
+          custom_url_for_mail_root(@organization, @newsletter.id)
+        end
       @encrypted_token = Decidim::NewsletterEncryptor.sent_at_encrypted(@user.id, @newsletter.sent_at)
 
       with_user(user) do
@@ -40,6 +46,7 @@ def cell
         organization: @organization,
         newsletter: @newsletter,
         recipient_user: @user,
+        custom_url_for_mail_root: @custom_url_for_mail_root,
         context: {
           controller: self
         }
diff --git a/decidim-core/app/mailers/decidim/newsletters_opt_in_mailer.rb b/decidim-core/app/mailers/decidim/newsletters_opt_in_mailer.rb
index 2cb60d2a2e389..7e2bc153826f2 100644
--- a/decidim-core/app/mailers/decidim/newsletters_opt_in_mailer.rb
+++ b/decidim-core/app/mailers/decidim/newsletters_opt_in_mailer.rb
@@ -2,14 +2,16 @@
 
 module Decidim
   # A custom mailer for Decidim so we can notify users to verify
-  # his own newsletter notifications settings. GDPR releated
+  # their own newsletter notifications settings. GDPR releated
   class NewslettersOptInMailer < ApplicationMailer
     def notify(user, token)
-      @user = user
-      @organization = user.organization
-      @token = token
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @token = token
 
-      mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+        mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+      end
     end
   end
 end
diff --git a/decidim-core/app/mailers/decidim/notifications_digest_mailer.rb b/decidim-core/app/mailers/decidim/notifications_digest_mailer.rb
new file mode 100644
index 0000000000000..53d14210b6df5
--- /dev/null
+++ b/decidim-core/app/mailers/decidim/notifications_digest_mailer.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A custom mailer for sending notifications to users when
+  # a events are received.
+  class NotificationsDigestMailer < Decidim::ApplicationMailer
+    helper Decidim::ResourceHelper
+    helper Decidim::SanitizeHelper
+    SIZE_LIMIT = 10
+
+    def digest_mail(user, notification_ids)
+      with_user(user) do
+        notifications = Decidim::Notification.where(id: notification_ids)
+        @user = user
+        @organization = user.organization
+        @notifications_digest = Decidim::NotificationsDigestPresenter.new(user)
+        @display_see_more_message = notifications.size > SIZE_LIMIT
+        @notifications = notifications[0...SIZE_LIMIT].map { |notification| Decidim::NotificationToMailerPresenter.new(notification) }
+
+        mail(to: user.email, subject: @notifications_digest.subject)
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/mailers/decidim/user_report_mailer.rb b/decidim-core/app/mailers/decidim/user_report_mailer.rb
index 6165cc1e47f7b..59377fb899834 100644
--- a/decidim-core/app/mailers/decidim/user_report_mailer.rb
+++ b/decidim-core/app/mailers/decidim/user_report_mailer.rb
@@ -4,18 +4,17 @@ module Decidim
   # A custom mailer to notify Decidim users
   # that they have been reported
   class UserReportMailer < ApplicationMailer
-    def notify(admin, token, reason, user)
-      @user = user
-      @organization = user.organization
-      @token = token
-      @reason = reason
+    def notify(admin, report)
+      @report = report
       @admin = admin
-      mail(to: admin.email, subject: I18n.t(
-        "decidim.user_report_mailer.notify.subject",
-        organization_name: @organization.name,
-        reason: @reason,
-        token: @token
-      ))
+      @organization = report.moderation.user.organization
+      with_user(admin) do
+        mail(to: admin.email, subject: I18n.t(
+          "decidim.user_report_mailer.notify.subject",
+          organization_name: report.moderation.user.organization.name,
+          reason: @report.reason
+        ))
+      end
     end
   end
 end
diff --git a/decidim-core/app/models/decidim/action_log.rb b/decidim-core/app/models/decidim/action_log.rb
index 2515e6e212a33..a0073898380ea 100644
--- a/decidim-core/app/models/decidim/action_log.rb
+++ b/decidim-core/app/models/decidim/action_log.rb
@@ -37,9 +37,57 @@ class ActionLog < ApplicationRecord
                class_name: "Decidim::Area",
                optional: true
 
-    validates :organization, :user, :action, presence: true
+    scope :with_resource_type, lambda { |resource_type_key|
+      if publicable_public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key).where.not(action: "create")
+      elsif public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key)
+      else
+        with_all_resources
+      end
+    }
+
+    scope :with_new_resource_type, lambda { |resource_type_key|
+      if publicable_public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key, action: "publish")
+      elsif public_resource_types.include?(resource_type_key)
+        where(resource_type: resource_type_key, action: "create")
+      else
+        with_all_new_resources
+      end
+    }
+
+    scope :with_private_resources, lambda {
+      where(
+        "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
+        "create",
+        publicable_public_resource_types,
+        (private_resource_types + public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    scope :with_all_resources, lambda {
+      where(
+        "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
+        "create",
+        publicable_public_resource_types,
+        (public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    scope :with_all_new_resources, lambda {
+      where(
+        "(action = ? AND resource_type IN (?)) OR (action = ? AND resource_type IN (?))",
+        "publish",
+        publicable_public_resource_types,
+        "create",
+        (public_resource_types - publicable_public_resource_types)
+      )
+    }
+
+    validates :action, presence: true
     validates :resource, presence: true, if: ->(log) { log.action != "delete" }
-    validates :visibility, presence: true, inclusion: { in: %w(admin-only public-only all) }
+    validates :visibility, presence: true, inclusion: { in: %w(private-only admin-only public-only all) }
 
     # To ensure records can't be deleted
     before_destroy { |_record| raise ActiveRecord::ReadOnlyRecord }
@@ -49,6 +97,42 @@ def self.for_admin
       where(visibility: %w(admin-only all))
     end
 
+    # All the resource types that are eligible to be included as an activity.
+    def self.public_resource_types
+      @public_resource_types ||= %w(
+        Decidim::Accountability::Result
+        Decidim::Blogs::Post
+        Decidim::Comments::Comment
+        Decidim::Consultations::Question
+        Decidim::Debates::Debate
+        Decidim::Meetings::Meeting
+        Decidim::Proposals::Proposal
+        Decidim::Surveys::Survey
+        Decidim::Assembly
+        Decidim::Consultation
+        Decidim::Initiative
+        Decidim::ParticipatoryProcess
+      ).select do |klass|
+        klass.safe_constantize.present?
+      end
+    end
+
+    def self.private_resource_types
+      @private_resource_types ||= %w(
+        Decidim::Budgets::Order
+      ).select do |klass|
+        klass.safe_constantize.present?
+      end
+    end
+
+    def self.publicable_public_resource_types
+      @publicable_public_resource_types ||= public_resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
+    end
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_resource_type]
+    end
+
     # Overwrites the method so that records cannot be modified.
     #
     # Returns a Boolean.
diff --git a/decidim-core/app/models/decidim/amendment.rb b/decidim-core/app/models/decidim/amendment.rb
index 1e14f1ab6bdc5..a257e953bfd43 100644
--- a/decidim-core/app/models/decidim/amendment.rb
+++ b/decidim-core/app/models/decidim/amendment.rb
@@ -8,7 +8,6 @@ class Amendment < ApplicationRecord
     belongs_to :amender, foreign_key: "decidim_user_id", class_name: "Decidim::User"
     belongs_to :emendation, foreign_key: "decidim_emendation_id", foreign_type: "decidim_emendation_type", polymorphic: true
 
-    validates :amendable, :amender, :emendation, presence: true
     validates :state, presence: true, inclusion: { in: STATES }
 
     def draft?
diff --git a/decidim-core/app/models/decidim/area.rb b/decidim-core/app/models/decidim/area.rb
index 0645e8e822747..5ab73499cd1aa 100644
--- a/decidim-core/app/models/decidim/area.rb
+++ b/decidim-core/app/models/decidim/area.rb
@@ -20,8 +20,7 @@ class Area < ApplicationRecord
                inverse_of: :areas,
                optional: true
 
-    validates :name, :organization, presence: true
-    validates :name, uniqueness: { scope: [:organization, :area_type] }
+    validates :name, presence: true, uniqueness: { scope: [:organization, :area_type] }
 
     before_destroy :abort_if_dependencies
 
diff --git a/decidim-core/app/models/decidim/area_type.rb b/decidim-core/app/models/decidim/area_type.rb
index 17ed6b6b9aa02..56c171a56adb7 100644
--- a/decidim-core/app/models/decidim/area_type.rb
+++ b/decidim-core/app/models/decidim/area_type.rb
@@ -5,6 +5,7 @@ module Decidim
   # (terriotrial, sectorial, etc.)
   class AreaType < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::Traceable
 
     translatable_fields :name, :plural
 
@@ -20,5 +21,9 @@ class AreaType < ApplicationRecord
     def translated_name
       Decidim::AreaTypePresenter.new(self).translated_name
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AreaTypePresenter
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/attachment.rb b/decidim-core/app/models/decidim/attachment.rb
index 6e057e8f2b1ca..5d3d8c22d9345 100644
--- a/decidim-core/app/models/decidim/attachment.rb
+++ b/decidim-core/app/models/decidim/attachment.rb
@@ -6,6 +6,8 @@ module Decidim
   class Attachment < ApplicationRecord
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Traceable
+
     before_save :set_content_type_and_size, if: :attached?
 
     translatable_fields :title, :description
@@ -92,5 +94,9 @@ def set_content_type_and_size
       self.content_type = file.content_type
       self.file_size = file.byte_size
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AttachmentPresenter
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/attachment_collection.rb b/decidim-core/app/models/decidim/attachment_collection.rb
index a4e8c4eaf4ef8..46f1d2916c012 100644
--- a/decidim-core/app/models/decidim/attachment_collection.rb
+++ b/decidim-core/app/models/decidim/attachment_collection.rb
@@ -4,6 +4,7 @@ module Decidim
   # Categories serve as a taxonomy for attachments to use for while in the
   # context of a participatory space.
   class AttachmentCollection < ApplicationRecord
+    include Traceable
     include Decidim::TranslatableResource
 
     translatable_fields :name, :description
@@ -15,5 +16,9 @@ class AttachmentCollection < ApplicationRecord
     def unused?
       attachments.empty?
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::AttachmentCollectionPresenter
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/category.rb b/decidim-core/app/models/decidim/category.rb
index 2237aeac607f3..f75940bb86d74 100644
--- a/decidim-core/app/models/decidim/category.rb
+++ b/decidim-core/app/models/decidim/category.rb
@@ -5,8 +5,10 @@ module Decidim
   # context of a participatory process.
   class Category < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
+    include Decidim::Traceable
 
-    translatable_fields :name, :description
+    translatable_fields :name
 
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :subcategories, foreign_key: "parent_id", class_name: "Decidim::Category", dependent: :destroy, inverse_of: :parent
@@ -38,11 +40,13 @@ def unused?
       categorizations.empty?
     end
 
-    # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-    ransacker :name do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::CategoryPresenter
     end
 
+    # Allow ransacker to search for a key in a hstore column (`name`.`en`)
+    ransacker_i18n :name
+
     private
 
     # This is done since we only allow one level of subcategories.
@@ -55,6 +59,7 @@ def forbid_deep_nesting
 
     def subcategories_have_same_participatory_space
       return unless parent
+      return if participatory_space == parent.participatory_space
 
       self.participatory_space = parent.participatory_space
     end
diff --git a/decidim-core/app/models/decidim/coauthorship.rb b/decidim-core/app/models/decidim/coauthorship.rb
index 604dd0c6af72a..40afb51f9ddd9 100644
--- a/decidim-core/app/models/decidim/coauthorship.rb
+++ b/decidim-core/app/models/decidim/coauthorship.rb
@@ -6,8 +6,6 @@ class Coauthorship < ApplicationRecord
 
     belongs_to :coauthorable, polymorphic: true, counter_cache: true
 
-    validates :coauthorable, presence: true
-
     after_commit :author_is_follower, on: [:create]
 
     def identity
diff --git a/decidim-core/app/models/decidim/contextual_help_section.rb b/decidim-core/app/models/decidim/contextual_help_section.rb
index cd0ca92b564b2..914d9397fdeb5 100644
--- a/decidim-core/app/models/decidim/contextual_help_section.rb
+++ b/decidim-core/app/models/decidim/contextual_help_section.rb
@@ -3,13 +3,17 @@
 module Decidim
   class ContextualHelpSection < ApplicationRecord
     include Decidim::TranslatableResource
+    include Decidim::Traceable
 
     translatable_fields :content
 
     belongs_to :organization, class_name: "Decidim::Organization"
-    validates :organization, presence: true
     validates :content, presence: true
 
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::ContextualHelpSectionPresenter
+    end
+
     # Public: Finds content given an id
     #
     # organization - The Organization to scope the content to
diff --git a/decidim-core/app/models/decidim/follow.rb b/decidim-core/app/models/decidim/follow.rb
index 9716ed294ed46..801cb3139e9c4 100644
--- a/decidim-core/app/models/decidim/follow.rb
+++ b/decidim-core/app/models/decidim/follow.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   class Follow < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :followable, foreign_key: "decidim_followable_id", foreign_type: "decidim_followable_type", polymorphic: true, counter_cache: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -20,7 +20,7 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityFollowSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataFollowSerializer
     end
 
     def self.user_follower_ids_for_participatory_spaces(spaces)
diff --git a/decidim-core/app/models/decidim/gamification/badge_score.rb b/decidim-core/app/models/decidim/gamification/badge_score.rb
index ef99b128c977a..ec7a850c1592c 100644
--- a/decidim-core/app/models/decidim/gamification/badge_score.rb
+++ b/decidim-core/app/models/decidim/gamification/badge_score.rb
@@ -6,7 +6,6 @@ class BadgeScore < ApplicationRecord
       self.table_name = "decidim_gamification_badge_scores"
 
       belongs_to :user, class_name: "Decidim::UserBaseEntity"
-      validates :user, presence: true
       validates :value, numericality: { greater_than_or_equal_to: 0 }
     end
   end
diff --git a/decidim-core/app/models/decidim/identity.rb b/decidim-core/app/models/decidim/identity.rb
index 25992b933efae..131a0d3391c67 100644
--- a/decidim-core/app/models/decidim/identity.rb
+++ b/decidim-core/app/models/decidim/identity.rb
@@ -3,7 +3,7 @@
 module Decidim
   # Store user's social identities
   class Identity < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::User"
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
@@ -18,7 +18,7 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityIdentitySerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataIdentitySerializer
     end
 
     private
diff --git a/decidim-core/app/models/decidim/messaging/conversation.rb b/decidim-core/app/models/decidim/messaging/conversation.rb
index 2b104ab861f53..8276e52ad313c 100644
--- a/decidim-core/app/models/decidim/messaging/conversation.rb
+++ b/decidim-core/app/models/decidim/messaging/conversation.rb
@@ -10,7 +10,7 @@ module Messaging
     class Conversation < ApplicationRecord
       self.table_name = "decidim_messaging_conversations"
 
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       has_many :participations, foreign_key: :decidim_conversation_id,
                                 class_name: "Decidim::Messaging::Participation",
@@ -110,7 +110,7 @@ def add_message(sender:, body:, user: nil)
       end
 
       #
-      # Given a user, returns her interlocutors in this conversation
+      # Given a user, returns their interlocutors in this conversation
       #
       # @param user [Decidim::User] The user to find interlocutors for
       #
@@ -121,7 +121,7 @@ def interlocutors(user)
       end
 
       #
-      # Given a user, returns if ALL the interlocutors allow her to join the conversation
+      # Given a user, returns if ALL the interlocutors allow the user to join the conversation
       #
       # @return Boolean
       #
@@ -173,7 +173,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::DataPortabilitySerializers::DataPortabilityConversationSerializer
+        Decidim::DownloadYourDataSerializers::DownloadYourDataConversationSerializer
       end
     end
   end
diff --git a/decidim-core/app/models/decidim/messaging/message.rb b/decidim-core/app/models/decidim/messaging/message.rb
index e2324a1d95a44..4940dd839c600 100644
--- a/decidim-core/app/models/decidim/messaging/message.rb
+++ b/decidim-core/app/models/decidim/messaging/message.rb
@@ -26,8 +26,7 @@ class Message < ApplicationRecord
                foreign_key: :decidim_message_id,
                inverse_of: :message
 
-      validates :sender, :body, presence: true
-      validates :body, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
+      validates :body, presence: true, length: { maximum: ->(_message) { Decidim.config.maximum_conversation_message_length } }
 
       default_scope { order(created_at: :asc) }
 
diff --git a/decidim-core/app/models/decidim/messaging/participation.rb b/decidim-core/app/models/decidim/messaging/participation.rb
index 6e89846723cce..18177c534a6d6 100644
--- a/decidim-core/app/models/decidim/messaging/participation.rb
+++ b/decidim-core/app/models/decidim/messaging/participation.rb
@@ -17,8 +17,6 @@ class Participation < ApplicationRecord
                  foreign_key: :decidim_participant_id,
                  class_name: "Decidim::UserBaseEntity"
 
-      validates :conversation, :participant, presence: true
-
       validates :decidim_conversation_id, uniqueness: { scope: :decidim_participant_id }
     end
   end
diff --git a/decidim-core/app/models/decidim/messaging/receipt.rb b/decidim-core/app/models/decidim/messaging/receipt.rb
index 39a19fb3bae6e..13d6f8877cd11 100644
--- a/decidim-core/app/models/decidim/messaging/receipt.rb
+++ b/decidim-core/app/models/decidim/messaging/receipt.rb
@@ -13,8 +13,6 @@ class Receipt < ApplicationRecord
       belongs_to :recipient, foreign_key: "decidim_recipient_id", class_name: "Decidim::User"
       belongs_to :message, foreign_key: "decidim_message_id", class_name: "Decidim::Messaging::Message"
 
-      validates :recipient, :message, presence: true
-
       scope :recipient, ->(recipient) { where(recipient: recipient) }
       scope :unread_by, ->(user) { recipient(user).unread }
       scope :unread, -> { where(read_at: nil) }
diff --git a/decidim-core/app/models/decidim/newsletter.rb b/decidim-core/app/models/decidim/newsletter.rb
index 8e1f534b167a8..8bc224822c679 100644
--- a/decidim-core/app/models/decidim/newsletter.rb
+++ b/decidim-core/app/models/decidim/newsletter.rb
@@ -56,6 +56,24 @@ def template
                     .find_by(scoped_resource_id: id)
     end
 
+    def url(**kwargs)
+      proxy_url(:newsletter_url, id: id, **kwargs)
+    end
+
+    def notifications_settings_url(**kwargs)
+      proxy_url(__method__, **kwargs)
+    end
+
+    def unsubscribe_newsletters_url(**kwargs)
+      proxy_url(__method__, **kwargs)
+    end
+
+    def organization_official_url
+      return "#" unless sent?
+
+      organization.official_url || proxy_url(:root_url)
+    end
+
     private
 
     def author_belongs_to_organization
@@ -63,5 +81,15 @@ def author_belongs_to_organization
 
       errors.add(:author, :invalid) unless author.organization == organization
     end
+
+    def proxy_url(method, **kwargs)
+      return "#" unless sent?
+
+      router.public_send(method, host: organization.host, **kwargs)
+    end
+
+    def router
+      @router ||= EngineRouter.new("decidim", {})
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/notification.rb b/decidim-core/app/models/decidim/notification.rb
index 27ec1edf86eeb..d9bb68b1868ae 100644
--- a/decidim-core/app/models/decidim/notification.rb
+++ b/decidim-core/app/models/decidim/notification.rb
@@ -2,11 +2,23 @@
 
 module Decidim
   class Notification < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :resource, foreign_key: "decidim_resource_id", foreign_type: "decidim_resource_type", polymorphic: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
 
+    # Daily notifications should contain all notifications within the previous
+    # day from the given day.
+    scope :daily, ->(time: Time.now.utc) { where(created_at: (time - 1.day).all_day) }
+
+    # Weekly notifications should contain all notifications within the previous
+    # week counting from the end of the previous day until the start of the day
+    # 1 week ago from the previous day.
+    scope :weekly, lambda { |time: Time.now.utc|
+      end_of_previous_day = (time - 1.day).end_of_day
+      where(created_at: (end_of_previous_day - 7.days).beginning_of_day..end_of_previous_day)
+    }
+
     def event_class_instance
       @event_class_instance ||= event_class.constantize.new(
         resource: resource,
@@ -26,7 +38,7 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityNotificationSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataNotificationSerializer
     end
   end
 end
diff --git a/decidim-core/app/models/decidim/oauth_application.rb b/decidim-core/app/models/decidim/oauth_application.rb
index 5888fb34b4a39..c18c76e6bec3c 100644
--- a/decidim-core/app/models/decidim/oauth_application.rb
+++ b/decidim-core/app/models/decidim/oauth_application.rb
@@ -9,7 +9,18 @@ class OAuthApplication < ::Doorkeeper::Application
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
     has_one_attached :organization_logo
-    validates_upload :organization_logo, uploader: OAuthApplicationLogoUploader
+
+    # validates_upload cannot be used here because the file is not necessarily
+    # attached to any organization yet when creating a new OAuth application.
+    # The organization becomes mapped after the OAuth application is created
+    # but the logo needs to be uploaded in the front-end already before that.
+    validates(
+      :organization_logo,
+      file_size: { less_than_or_equal_to: ->(record) { record.maximum_upload_size } },
+      uploader_content_type: true,
+      uploader_image_dimensions: true
+    )
+    attached_config[:organization_logo] = OpenStruct.new(uploader: OAuthApplicationLogoUploader)
 
     def owner
       organization
diff --git a/decidim-core/app/models/decidim/organization.rb b/decidim-core/app/models/decidim/organization.rb
index d0f4df1569aa6..89874f00c2585 100644
--- a/decidim-core/app/models/decidim/organization.rb
+++ b/decidim-core/app/models/decidim/organization.rb
@@ -22,12 +22,12 @@ class Organization < ApplicationRecord
 
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization, dependent: :destroy
     has_many :static_page_topics, class_name: "Decidim::StaticPageTopic", inverse_of: :organization, dependent: :destroy
-    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization
-    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization
-    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization
-    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization
-    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
-    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
+    has_many :scopes, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Scope", inverse_of: :organization, dependent: :destroy
+    has_many :scope_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::ScopeType", inverse_of: :organization, dependent: :destroy
+    has_many :areas, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::Area", inverse_of: :organization, dependent: :destroy
+    has_many :area_types, -> { order(name: :asc) }, foreign_key: "decidim_organization_id", class_name: "Decidim::AreaType", inverse_of: :organization, dependent: :destroy
+    has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
+    has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :user_entities, foreign_key: "decidim_organization_id", class_name: "Decidim::UserBaseEntity", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
@@ -146,7 +146,7 @@ def machine_translation_prioritizes_translation?
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter
-      Decidim::Debates::OfficialAuthorPresenter.new
+      Decidim::OfficialAuthorPresenter.new
     end
 
     def static_pages_accessible_for(user)
diff --git a/decidim-core/app/models/decidim/participatory_space_private_user.rb b/decidim-core/app/models/decidim/participatory_space_private_user.rb
index d9c146558eb29..50e533951d886 100644
--- a/decidim-core/app/models/decidim/participatory_space_private_user.rb
+++ b/decidim-core/app/models/decidim/participatory_space_private_user.rb
@@ -3,19 +3,21 @@
 module Decidim
   # This class gives a given User access to a given private ParticipatorySpacePrivateUser
   class ParticipatorySpacePrivateUser < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
     belongs_to :privatable_to, polymorphic: true
 
     validate :user_and_participatory_space_same_organization
 
+    scope :by_participatory_space, ->(privatable_to) { where(privatable_to_id: privatable_to.id, privatable_to_type: privatable_to.class.to_s) }
+
     def self.user_collection(user)
       where(decidim_user_id: user.id)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityParticipatorySpacePrivateUserSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataParticipatorySpacePrivateUserSerializer
     end
 
     def self.log_presenter_class_for(_log)
diff --git a/decidim-core/app/models/decidim/permission_action.rb b/decidim-core/app/models/decidim/permission_action.rb
index 76335b53612bf..a3f9aece3825e 100644
--- a/decidim-core/app/models/decidim/permission_action.rb
+++ b/decidim-core/app/models/decidim/permission_action.rb
@@ -55,6 +55,7 @@ def to_s
     end
 
     class PermissionNotSetError < StandardError; end
+
     class PermissionCannotBeDisallowedError < StandardError; end
   end
 end
diff --git a/decidim-core/app/models/decidim/reminder.rb b/decidim-core/app/models/decidim/reminder.rb
new file mode 100644
index 0000000000000..809fd238750d4
--- /dev/null
+++ b/decidim-core/app/models/decidim/reminder.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class Reminder < ApplicationRecord
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :component, foreign_key: "decidim_component_id", class_name: "Decidim::Component"
+    has_many :records, foreign_key: "decidim_reminder_id", class_name: "Decidim::ReminderRecord", dependent: :destroy
+    has_many :deliveries, foreign_key: "decidim_reminder_id", class_name: "Decidim::ReminderDelivery", dependent: :destroy
+  end
+end
diff --git a/decidim-core/app/models/decidim/reminder_delivery.rb b/decidim-core/app/models/decidim/reminder_delivery.rb
new file mode 100644
index 0000000000000..47a8e84ae64ad
--- /dev/null
+++ b/decidim-core/app/models/decidim/reminder_delivery.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReminderDelivery < ApplicationRecord
+    belongs_to :reminder, foreign_key: "decidim_reminder_id", class_name: "Decidim::Reminder"
+  end
+end
diff --git a/decidim-core/app/models/decidim/reminder_record.rb b/decidim-core/app/models/decidim/reminder_record.rb
new file mode 100644
index 0000000000000..803329062317b
--- /dev/null
+++ b/decidim-core/app/models/decidim/reminder_record.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ReminderRecord < ApplicationRecord
+    belongs_to :reminder, foreign_key: "decidim_reminder_id", class_name: "Decidim::Reminder"
+    belongs_to :remindable, foreign_type: "remindable_type", polymorphic: true, optional: true
+
+    scope :active, -> { where(state: "active") }
+    scope :pending, -> { where(state: "pending") }
+    scope :completed, -> { where(state: "completed") }
+    scope :deleted, -> { where(state: "deleted") }
+
+    def active?
+      state == "active"
+    end
+
+    def pending?
+      state == "pending"
+    end
+
+    def completed?
+      state == "completed"
+    end
+
+    def deleted?
+      state == "deleted"
+    end
+  end
+end
diff --git a/decidim-core/app/models/decidim/report.rb b/decidim-core/app/models/decidim/report.rb
index 18941f88ce122..6dcba900b73ae 100644
--- a/decidim-core/app/models/decidim/report.rb
+++ b/decidim-core/app/models/decidim/report.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A reportable can be reported one time for each user.
   class Report < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     REASONS = %w(spam offensive does_not_belong).freeze
 
@@ -20,7 +20,7 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
     private
diff --git a/decidim-core/app/models/decidim/scope.rb b/decidim-core/app/models/decidim/scope.rb
index 76f33653b94a2..d59eb5d118cfd 100644
--- a/decidim-core/app/models/decidim/scope.rb
+++ b/decidim-core/app/models/decidim/scope.rb
@@ -8,6 +8,7 @@ class Scope < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :name
 
@@ -34,7 +35,7 @@ class Scope < ApplicationRecord
 
     before_validation :update_part_of, on: :update
 
-    validates :name, :code, :organization, presence: true
+    validates :name, :code, presence: true
     validates :code, uniqueness: { scope: :organization }
     validate :forbid_cycles
 
@@ -73,9 +74,7 @@ def part_of_scopes(root = nil)
     end
 
     # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-    ransacker :name do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
-    end
+    ransacker_i18n :name
 
     private
 
diff --git a/decidim-core/app/models/decidim/scope_type.rb b/decidim-core/app/models/decidim/scope_type.rb
index 63265d6fae206..65d5df293e96f 100644
--- a/decidim-core/app/models/decidim/scope_type.rb
+++ b/decidim-core/app/models/decidim/scope_type.rb
@@ -5,6 +5,7 @@ module Decidim
   # (municipalities, provinces, states, countries, etc.)
   class ScopeType < ApplicationRecord
     include Decidim::TranslatableResource
+    include Traceable
 
     translatable_fields :name, :plural
     belongs_to :organization,
@@ -15,5 +16,9 @@ class ScopeType < ApplicationRecord
     has_many :scopes, class_name: "Decidim::Scope", inverse_of: :scope_type, dependent: :nullify
 
     validates :name, presence: true
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::ScopeTypePresenter
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/share_token.rb b/decidim-core/app/models/decidim/share_token.rb
index d6a6be259168a..9e9a518bf97cd 100644
--- a/decidim-core/app/models/decidim/share_token.rb
+++ b/decidim-core/app/models/decidim/share_token.rb
@@ -2,8 +2,6 @@
 
 module Decidim
   class ShareToken < ApplicationRecord
-    validates :organization, presence: true
-    validates :user, presence: true
     validates :token, presence: true, uniqueness: { scope: [:decidim_organization_id, :token_for_type, :token_for_id] }
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
diff --git a/decidim-core/app/models/decidim/short_link.rb b/decidim-core/app/models/decidim/short_link.rb
new file mode 100644
index 0000000000000..ed1ec52c12e61
--- /dev/null
+++ b/decidim-core/app/models/decidim/short_link.rb
@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Short links are a way to reference specific locations within Decidim with
+  # shorted URLs, similar to the popular link shortening services. The original
+  # reason for creating the feature was to reference long calendar URLs in a
+  # more compact way for the URLs to be compatible with the calendar programs.
+  # When the URL is long with lots of filtering parameters included in it, it
+  # may be too long for specific 3rd party programs.
+  #
+  # This feature can be used to link to any URLs or resources in Decidim with a
+  # short reference.
+  class ShortLink < ApplicationRecord
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
+    belongs_to :target, polymorphic: true
+
+    validates :identifier, presence: true, uniqueness: true
+
+    before_validation :generate_identifier
+
+    # Finds a matching short link to the same target with exactly the same
+    # parameters if it already exists or creates a new one if it doesn't exist.
+    #
+    # @param target [ActiveRecord::Base] The target where this short link should
+    #   link to. Most of the times [Decidim::Organization], [Decidim::Component]
+    #   or some other top-level record.
+    # @param mounted_engine [String] The mounted engine helper name that will be
+    #   used to generate the link.
+    # @param route_name [String, nil] The route name to be linked to. If not
+    #   defined, the short link will be generated for the root URL for the
+    #   mounted engine.
+    # @param params [Hash] The query parameters that should be included in the
+    #   URL where this short link will redirect to.
+    # @return [Decidim::ShortLink] The short link instance to link to.
+    def self.to(target, mounted_engine, route_name: nil, params: {})
+      organization =
+        if target.is_a?(Decidim::Organization)
+          target
+        else
+          target.try(:organization)
+        end
+
+      values = {
+        organization: organization,
+        target: target,
+        mounted_engine_name: mounted_engine,
+        route_name: route_name
+      }
+      existing =
+        if params
+          where(values).find_by("params = ?::jsonb", params.to_json)
+        else
+          find_by(values.merge(params: nil))
+        end
+
+      existing || create!(values.merge(params: params))
+    end
+
+    # Creates a random unique identifier for any new links. Raises an
+    # OutOfCandidatesError if a free candidate cannot be found with 20 tries.
+    # In this situation the older records should be removed from the database.
+    #
+    # @return [String] A new unique identifier.
+    def self.unique_identifier_within(organization)
+      1.step do |n|
+        raise OutOfCandidatesError if n > 20
+
+        # A-Z, a-z and 0-9
+        # 26 + 26 + 10 = 62 possibilities per character
+        # 62^10 ≈ 8×10¹� total possibilities
+        candidate = SecureRandom.alphanumeric(10)
+        next if where(organization: organization, identifier: candidate).any?
+
+        return candidate
+      end
+    end
+
+    # Overrides the route_name method to add a default route name for the "root"
+    # path in case the route name is not defined for the record.
+    #
+    # @return [String] The route name to link to.
+    def route_name
+      super || "root"
+    end
+
+    # Generates the short URL referencing this link.
+    #
+    # @return [String] The short URL that can be used to link to the target.
+    def short_url
+      EngineRouter.new("decidim", default_url_options).short_link_url(id: identifier)
+    end
+
+    # Generates the full long URL to the resource matching this short link.
+    #
+    # @return [String] The target full URL that the short link should link to.
+    def target_url
+      url_helpers.send("#{route_name}_url", **params)
+    end
+
+    private
+
+    # Generates a new identifier for new records.
+    #
+    # @return [void]
+    def generate_identifier
+      return if identifier.present?
+
+      self.identifier = self.class.unique_identifier_within(organization)
+    end
+
+    # Returns the default URL options for the organization. The participatory
+    # space and component related parameters are excluded from the
+    # default_url_options because these are also needed for the short URL
+    # generation.
+    #
+    # @return [Hash] A hash of the default URL options for the links.
+    def default_url_options
+      { host: organization&.host }.compact
+    end
+
+    # Returns the options for the URL helper call against the routes proxy.
+    # The options include the mounted params for the target, such as
+    # participatory space slug and component ID, depending what the target is.
+    #
+    # @return [Hash] The mounted options for the target record that will be used
+    #   to generate the final link.
+    def mounted_options
+      if target.is_a?(Decidim::Participable)
+        # The mounted_params method returns always e.g. participatory_space_slug
+        # assembly_slug, etc. But when we want to link to the space itself, we
+        # only need the `slug` parameter.
+        { host: target.organization.host, slug: target.slug }
+      elsif target.respond_to?(:mounted_params)
+        target.mounted_params
+      elsif target.respond_to?(:component)
+        target.component.mounted_params.merge(id: target.id)
+      elsif target.respond_to?(:participatory_space)
+        target.participatory_space.mounted_params
+      elsif target.respond_to?(:slug)
+        # E.g. Decidim::StaticPage uses the slug as the `:id` parameter.
+        default_url_options.merge(id: target.slug)
+      elsif !target.is_a?(Decidim::Organization)
+        default_url_options.merge(id: target.id)
+      else
+        default_url_options
+      end
+    end
+
+    # Returns the routes helpers for the target engine.
+    #
+    # @return [Decidim::EngineRouter] An instance of the engine router that will
+    #   be used to generate the links to the correct context.
+    def url_helpers
+      @url_helpers ||= EngineRouter.new(mounted_engine_name, mounted_options)
+    end
+
+    # The OutOfCandidatesError is an error class that will be raised when the
+    # short link identifiers are running out and the short link cannot be
+    # generated.
+    class OutOfCandidatesError < StandardError; end
+  end
+end
diff --git a/decidim-core/app/models/decidim/user.rb b/decidim-core/app/models/decidim/user.rb
index 575affa525904..26504b6e5e3ca 100644
--- a/decidim-core/app/models/decidim/user.rb
+++ b/decidim-core/app/models/decidim/user.rb
@@ -5,15 +5,15 @@
 require "valid_email2"
 
 module Decidim
-  # A User is a citizen that wants to join the platform to participate.
+  # A User is a participant that wants to join the platform to engage.
   class User < UserBaseEntity
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
     include Decidim::Searchable
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
     include Decidim::Traceable
 
-    REGEXP_NICKNAME = /\A[\w\-]+\z/.freeze
+    REGEXP_NICKNAME = /\A[\w\-]+\z/
 
     class Roles
       def self.all
@@ -34,8 +34,7 @@ def self.all
     has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
-
-    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
+    has_many :reminders, foreign_key: "decidim_user_id", class_name: "Decidim::Reminder", dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
     validates :nickname,
@@ -50,7 +49,7 @@ def self.all
 
     validate :all_roles_are_valid
 
-    has_one_attached :data_portability_file
+    has_one_attached :download_your_data_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -81,12 +80,14 @@ def self.all
                         # scope_id: :decidim_scope_id,
                         organization_id: :decidim_organization_id,
                         A: :name,
+                        B: :nickname,
                         datetime: :created_at
                       },
                       index_on_create: ->(user) { !(user.deleted? || user.blocked?) },
                       index_on_update: ->(user) { !(user.deleted? || user.blocked?) })
 
     before_save :ensure_encrypted_password
+    before_save :save_password_change
 
     def user_invited?
       invitation_token_changed? && invitation_accepted_at_changed?
@@ -186,10 +187,10 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityUserSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataUserSerializer
     end
 
-    def self.data_portability_images(user)
+    def self.download_your_data_images(user)
       user_collection(user).map(&:avatar)
     end
 
@@ -255,6 +256,18 @@ def invalidate_all_sessions!
       Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
     end
 
+    def notifications_subscriptions
+      notification_settings.fetch("subscriptions", {})
+    end
+
+    def needs_password_update?
+      return false unless admin?
+      return false unless Decidim.config.admin_password_strong
+      return true if password_updated_at.blank?
+
+      password_updated_at < Decidim.config.admin_password_expiration_days.days.ago
+    end
+
     protected
 
     # Overrides devise email required validation.
@@ -302,5 +315,18 @@ def available_locales
     def ensure_encrypted_password
       restore_encrypted_password! if will_save_change_to_encrypted_password? && encrypted_password.blank?
     end
+
+    def save_password_change
+      return unless persisted?
+      return unless encrypted_password_changed?
+      return unless admin?
+      return unless Decidim.config.admin_password_strong
+
+      # We don't want to run validations here because that could lead to an endless validation loop.
+      # rubocop:disable Rails/SkipsModelValidations
+      update_column(:password_updated_at, Time.current)
+      update_column(:previous_passwords, [encrypted_password_was, *previous_passwords].first(Decidim.config.admin_password_repetition_times))
+      # rubocop:enable Rails/SkipsModelValidations
+    end
   end
 end
diff --git a/decidim-core/app/models/decidim/user_base_entity.rb b/decidim-core/app/models/decidim/user_base_entity.rb
index f6ae9e7575419..7fbb494b1c210 100644
--- a/decidim-core/app/models/decidim/user_base_entity.rb
+++ b/decidim-core/app/models/decidim/user_base_entity.rb
@@ -17,8 +17,10 @@ class UserBaseEntity < ApplicationRecord
     has_many :notifications, foreign_key: "decidim_user_id", class_name: "Decidim::Notification", dependent: :destroy
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
+    has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
+
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/.freeze
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader
diff --git a/decidim-core/app/models/decidim/user_block.rb b/decidim-core/app/models/decidim/user_block.rb
index 9dbbfb0592a82..2a093acedc31f 100644
--- a/decidim-core/app/models/decidim/user_block.rb
+++ b/decidim-core/app/models/decidim/user_block.rb
@@ -4,7 +4,7 @@ module Decidim
   class UserBlock < ApplicationRecord
     MINIMUM_JUSTIFICATION_LENGTH = 15
 
-    belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
-    belongs_to :blocking_user, class_name: "Decidim::User"
+    belongs_to :user, class_name: "Decidim::UserBaseEntity", foreign_key: :decidim_user_id
+    belongs_to :blocking_user, class_name: "Decidim::UserBaseEntity"
   end
 end
diff --git a/decidim-core/app/models/decidim/user_group.rb b/decidim-core/app/models/decidim/user_group.rb
index 1a8c61b28b96f..839bc69189c0f 100644
--- a/decidim-core/app/models/decidim/user_group.rb
+++ b/decidim-core/app/models/decidim/user_group.rb
@@ -4,10 +4,10 @@
 require "valid_email2"
 
 module Decidim
-  # A UserGroup is an organization of citizens
+  # A UserGroup is an organization of participants
   class UserGroup < UserBaseEntity
     include Decidim::Traceable
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
     include Decidim::Searchable
@@ -21,7 +21,7 @@ class UserGroup < UserBaseEntity
              foreign_key: :decidim_user_id,
              source: :user
 
-    validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }
+    validates :name, presence: true, uniqueness: { scope: :decidim_organization_id }, unless: -> { blocked? }
 
     validate :correct_state
     validate :unique_document_number, if: :has_document_number?
@@ -87,7 +87,7 @@ def self.user_collection(user)
     end
 
     def self.export_serializer
-      Decidim::DataPortabilitySerializers::DataPortabilityUserGroupSerializer
+      Decidim::DownloadYourDataSerializers::DownloadYourDataUserGroupSerializer
     end
 
     def document_number
diff --git a/decidim-core/app/models/decidim/user_moderation.rb b/decidim-core/app/models/decidim/user_moderation.rb
index 9aaf7509ffa7d..578ab2119cacc 100644
--- a/decidim-core/app/models/decidim/user_moderation.rb
+++ b/decidim-core/app/models/decidim/user_moderation.rb
@@ -12,8 +12,6 @@ class UserModeration < ApplicationRecord
     scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
 
     delegate :organization, to: :user
-    scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
-    scope :unblocked, -> { joins(:user).where(decidim_users: { blocked: false }) }
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::UserModerationPresenter
diff --git a/decidim-core/app/models/decidim/user_report.rb b/decidim-core/app/models/decidim/user_report.rb
index 07c6d039185fd..cd2edd7cd7f71 100644
--- a/decidim-core/app/models/decidim/user_report.rb
+++ b/decidim-core/app/models/decidim/user_report.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   class UserReport < ApplicationRecord
-    include Decidim::DataPortability
+    include Decidim::DownloadYourData
 
     REASONS = %w(spam offensive does_not_belong).freeze
 
@@ -16,7 +16,7 @@ class UserReport < ApplicationRecord
 
     def self.export_serializer
       raise NotImplementedError
-      # Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+      # Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
     private
diff --git a/decidim-core/app/packs/entrypoints/decidim_core.js b/decidim-core/app/packs/entrypoints/decidim_core.js
index 16e445e62c2ef..9b3e19caabcf3 100644
--- a/decidim-core/app/packs/entrypoints/decidim_core.js
+++ b/decidim-core/app/packs/entrypoints/decidim_core.js
@@ -14,7 +14,6 @@ import "src/decidim/vendor/foundation-datepicker"
 import "src/decidim/foundation_datepicker_locales"
 import "src/decidim/vendor/modernizr"
 import "src/decidim/vendor/social-share-button"
-import "social-share-button"
 
 import "src/decidim/input_tags"
 import "src/decidim/input_hashtags"
@@ -57,7 +56,9 @@ import "src/decidim/start_conversation_dialog"
 import "src/decidim/notifications"
 import "src/decidim/identity_selector_dialog"
 import "src/decidim/gallery"
+import "src/decidim/direct_uploads/upload_field"
 import "src/decidim/back_to_list"
+import "src/decidim/data_consent"
 
 // CSS
 import "entrypoints/decidim_core.scss"
@@ -70,4 +71,3 @@ require.context("../images", true)
 
 // This needs to be loaded after confirm dialog to bind properly
 Rails.start()
-
diff --git a/decidim-core/app/packs/entrypoints/decidim_sw.js b/decidim-core/app/packs/entrypoints/decidim_sw.js
new file mode 100644
index 0000000000000..693a046339e8c
--- /dev/null
+++ b/decidim-core/app/packs/entrypoints/decidim_sw.js
@@ -0,0 +1 @@
+import "src/decidim/sw"
diff --git a/decidim-core/app/packs/src/decidim/account_form.js b/decidim-core/app/packs/src/decidim/account_form.js
index 89c9e2f44a414..1ae1c167804a5 100644
--- a/decidim-core/app/packs/src/decidim/account_form.js
+++ b/decidim-core/app/packs/src/decidim/account_form.js
@@ -1,27 +1,77 @@
+/**
+ * Initializes the edit account form to control the password field elements
+ * which should only be required when they are visible.
+ *
+ * @returns {void}
+ */
+const initializeAccountForm = () => {
+  const editUserForm = document.querySelector("form.edit_user");
+  if (!editUserForm) {
+    return;
+  }
+
+  const passwordChange = editUserForm.querySelector("#passwordChange");
+  if (!passwordChange) {
+    return;
+  }
+
+  const passwordFields = passwordChange.querySelectorAll("input[type='password']");
+  if (passwordFields.length < 1) {
+    return;
+  }
+
+  // Foundation uses jQuery so these have to be bound using jQuery and the
+  // attribute value needs to be set through jQuery.
+  const togglePasswordFieldValidators = (enabled) => {
+    $(passwordFields).attr("required", enabled);
+
+    if (!enabled) {
+      passwordFields.forEach((field) => (field.value = ""));
+    }
+  }
+
+  $(passwordChange).on("on.zf.toggler", () => {
+    togglePasswordFieldValidators(true);
+  });
+  $(passwordChange).on("off.zf.toggler", () => {
+    togglePasswordFieldValidators(false);
+  });
+  togglePasswordFieldValidators(false);
+};
+
 /**
  * Since the delete account has a modal to confirm it we need to copy the content of the
  * reason field to the hidden field in the form inside the modal.
+ *
+ * @return {void}
  */
-$(() => {
+const initializeDeleteAccount = () => {
   const $deleteAccountForm = $(".delete-account");
   const $deleteAccountModalForm = $(".delete-account-modal");
 
-  if ($deleteAccountForm.length > 0) {
-    const $openModalButton = $(".open-modal-button");
-    const $modal = $("#deleteConfirm");
-
-    $openModalButton.on("click", (event) => {
-      try {
-        const reasonValue = $deleteAccountForm.find("textarea#delete_account_delete_reason").val();
-        $deleteAccountModalForm.find("input#delete_account_delete_reason").val(reasonValue);
-        $modal.foundation("open");
-      } catch (error) {
-        console.error(error); // eslint-disable-line no-console
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-      return false;
-    });
+  if ($deleteAccountForm.length < 1) {
+    return;
   }
+
+  const $openModalButton = $(".open-modal-button");
+  const $modal = $("#deleteConfirm");
+
+  $openModalButton.on("click", (event) => {
+    try {
+      const reasonValue = $deleteAccountForm.find("textarea#delete_account_delete_reason").val();
+      $deleteAccountModalForm.find("input#delete_account_delete_reason").val(reasonValue);
+      $modal.foundation("open");
+    } catch (error) {
+      console.error(error); // eslint-disable-line no-console
+    }
+
+    event.preventDefault();
+    event.stopPropagation();
+    return false;
+  });
+};
+
+$(() => {
+  initializeAccountForm();
+  initializeDeleteAccount();
 });
diff --git a/decidim-core/app/packs/src/decidim/autocomplete.js b/decidim-core/app/packs/src/decidim/autocomplete.js
new file mode 100644
index 0000000000000..64efc5923b9b8
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/autocomplete.js
@@ -0,0 +1,298 @@
+import AutoCompleteJS from "@tarekraafat/autocomplete.js";
+
+export default class AutoComplete {
+  constructor(el, options = {}) {
+    this.element = el;
+    this.stickySelectedSpan = null;
+    this.clearStickySelectionSpan = null;
+    this.stickyHiddenInput = null;
+    this.promptDiv = null;
+    const thresholdTemp = options.threshold || 2;
+    this.options = Object.assign({
+      // Defines name of the hidden input (e.g. assembly_member[user_id])
+      name: null,
+      // Placeholder of the visible input field
+      placeholder: "",
+      // Defines what happens after user has selected value from suggestions
+      // sticky - Allows selecting a single value and not editing the value after selected (e.g. as the admin autocomplete fields)
+      // single - Allows selecting a single value and editing the selected text after the selection (e.g. geocoding field)
+      // multi - Allows selecting multiple values
+      // null (default) - Disable selection event handling in this class
+      mode: null,
+      // Defines if we show input help (e.g. "Type at least three characters to search") or not.
+      searchPrompt: false,
+      // Defines search prompt message, only shown if showPrompt is enabled!
+      searchPromptText: `Type at least ${thresholdTemp} characters to search`,
+      // Defines items that are selected already when page is loaded before user selects them. (e.g. when form submit fails)
+      selected: null,
+      // Defines how many characters input has to have before we start searching
+      threshold: thresholdTemp,
+      // Defines how many results to show in the autocomplete selection list
+      // by maximum.
+      maxResults: 10,
+      // Defines the data keys against which to match the user input when
+      // searching through the results. For example, when the following
+      // data is returned by the API:
+      //   { id: 123, name: "John", nickname: "john", __typename: "User" }
+      //
+      // You can define the data keys array as ["name", "nickname"] in
+      // which case the results shown to user would be only those that
+      // have matching text in these defined fields.
+      dataMatchKeys: null,
+      // The data source is a method that gets the callback parameter as
+      // its first argument which should be called with the results array
+      // once they are returned by the API.
+      // For example:
+      //   (query, callback) => {
+      //     (async () => {
+      //       const results = await callAjax(`/api/url?query=${query}`);
+      //       callback(results);
+      //     })();
+      //   }
+      //
+      // Signature: (callback: Function)
+      dataSource: () => [],
+      // Filters the data list returned by the data source before it is shown
+      // to the user. Can be used e.g. to hide already selected values from
+      // the list.
+      dataFilter: null,
+      // Delay in milliseconds how long to wait after user action before
+      // doing a backend request.
+      delay: 200,
+      // Allows modifying the suggested items before they are displayed in the list
+      // Signature: (element: HTMLElement, value: Object)
+      modifyResult: null
+    }, options);
+
+    this.autocomplete = new AutoCompleteJS({
+      selector: () => this.element,
+      placeHolder: options.placeholder,
+      // Delay (milliseconds) before autocomplete engine starts. It's preventing many queries when user is typing fast.
+      debounce: 200,
+      threshold: this.options.threshold,
+      data: {
+        keys: this.options.dataMatchKeys,
+        src: async (query) => {
+          const fetchResults = () => {
+            return new Promise((resolve) => {
+              this.options.dataSource(query, resolve);
+            });
+          }
+
+          try {
+            return await fetchResults();
+          } catch (error) {
+            return error;
+          }
+        },
+        filter: (list) => {
+          if (this.options.dataFilter) {
+            return this.options.dataFilter(list);
+          }
+
+          return list;
+        }
+      },
+      resultsList: {
+        maxResults: this.options.maxResults
+      },
+      resultItem: {
+        element: (item, data) => {
+          if (!this.options.modifyResult) {
+            return;
+          }
+
+          this.options.modifyResult(item, data.value);
+        }
+      },
+      events: {
+        input: {
+          blur: () => {
+            this.promptDiv.style.display = "none";
+          }
+        }
+      }
+    });
+
+    this.acWrapper = this.element.closest(".autoComplete_wrapper");
+    this.element.ac = this.autocomplete;
+
+    // Stop input field from bubbling open and close events to parent elements,
+    // because foundation closes modal from these events.
+    const stopPropagation = (event) => {
+      event.stopPropagation();
+    }
+    this.element.addEventListener("close", stopPropagation);
+    this.element.addEventListener("open", stopPropagation);
+
+    this.createPromptDiv();
+
+    switch (this.options.mode) {
+    case "sticky":
+      this.createStickySelect(this.options.name);
+      break;
+    case "multi":
+      this.createMultiSelect(this.options.name);
+      break;
+    default:
+    }
+  }
+
+  setInput(value) {
+    this.autocomplete.input.value = value;
+  }
+
+  handleEvent(event) {
+    switch (this.options.mode) {
+    case "single":
+      this.setInput(event.detail.selection.value[event.detail.selection.key]);
+      break;
+    case "sticky":
+      this.handleStickyEvents(event);
+      break;
+    case "multi":
+      this.handleMultiEvents(event);
+      break;
+    default:
+    }
+  }
+
+  handleMultiEvents(event) {
+    switch (event.type) {
+    case "selection":
+      this.addMultiSelectItem(event.detail.selection);
+      break;
+    default:
+    }
+  }
+
+  handleStickyEvents(event) {
+    switch (event.type) {
+    case "selection":
+      this.addStickySelectItem(event.detail.selection);
+      break;
+    case "click":
+      if (event.target === this.clearStickySelectionSpan) {
+        this.removeStickySelection();
+      }
+      break;
+    case "keyup":
+      if (this.stickyHiddenInput.value !== "" && event.target === this.element && (["Escape", "Backspace", "Delete"].includes(event.key) || (/^[a-z0-9]$/i).test(event.key))) {
+        this.removeStickySelection();
+      } else if (this.options.searchPrompt) {
+        if (this.stickyHiddenInput.value === "" && this.element.value.length < this.options.threshold) {
+          this.promptDiv.style.display = "block";
+        } else {
+          this.promptDiv.style.display = "none";
+        }
+      }
+      break;
+    default:
+    }
+  }
+
+  createHiddenInput(value) {
+    const hiddenInput = document.createElement("input");
+    hiddenInput.name = this.options.name;
+    hiddenInput.type = "hidden";
+    if (value) {
+      hiddenInput.value = value;
+    }
+    this.acWrapper.prepend(hiddenInput);
+    return hiddenInput;
+  }
+
+  removeStickySelection() {
+    this.stickyHiddenInput.value = "";
+    this.element.placeholder = this.options.placeholder;
+    this.clearStickySelectionSpan.style.display = "none";
+    this.stickySelectedSpan.style.display = "none";
+  }
+
+  addStickySelectItem(selection) {
+    this.stickyHiddenInput.value = selection.value.value;
+    this.element.placeholder = "";
+    this.stickySelectedSpan.innerHTML = selection.value[selection.key];
+    this.stickySelectedSpan.style.display = "block";
+    this.clearStickySelectionSpan.style.display = "block";
+    this.setInput("");
+  }
+
+  addMultiSelectItem(selection) {
+    this.setInput("");
+    const chosen = document.createElement("span");
+    chosen.classList.add("label", "primary", "autocomplete__selected-item", "multi");
+    chosen.innerHTML = selection.value[selection.key];
+    const clearSelection = document.createElement("span");
+    clearSelection.classList.add("clear-multi-selection");
+    clearSelection.innerHTML = "&times;";
+    clearSelection.setAttribute("data-remove", selection.value.value);
+    clearSelection.addEventListener("click", (evt) => {
+      const hiddenInput = this.acWrapper.querySelector(`input[type='hidden'][value='${selection.value.value}']`);
+      if (hiddenInput) {
+        hiddenInput.remove();
+        evt.target.parentElement.remove();
+      }
+    });
+    chosen.appendChild(clearSelection);
+
+    const multiSelectWrapper = this.acWrapper.querySelector(".multiselect");
+    const inputContainer = multiSelectWrapper.querySelector("span.input-container");
+    multiSelectWrapper.insertBefore(chosen, inputContainer);
+    this.createHiddenInput(selection.value.value);
+  }
+
+  createStickySelect() {
+    this.stickySelectedSpan = document.createElement("span");
+    this.stickySelectedSpan.classList.add("autocomplete__selected-item", "sticky");
+    this.stickySelectedSpan.style.display = "none";
+    this.stickySelectedSpan.addEventListener("click", () => this.element.focus());
+    this.stickyHiddenInput = this.createHiddenInput();
+
+    this.clearStickySelectionSpan = document.createElement("span");
+    this.clearStickySelectionSpan.className = "clear-sticky-selection";
+    this.clearStickySelectionSpan.innerHTML = "&times;";
+    this.clearStickySelectionSpan.style.display = "none";
+    this.clearStickySelectionSpan.addEventListener("click", this);
+
+    this.element.addEventListener("selection", this);
+    this.element.addEventListener("keyup", this);
+
+    this.acWrapper.insertBefore(this.clearStickySelectionSpan, this.element);
+    this.acWrapper.insertBefore(this.stickySelectedSpan, this.element);
+    if (this.options.selected) {
+      this.addStickySelectItem(this.options.selected);
+    }
+  }
+
+  createMultiSelect() {
+    const multiSelectWrapper = document.createElement("div");
+    multiSelectWrapper.classList.add("multiselect");
+
+    const inputContainer = document.createElement("span");
+    inputContainer.classList.add("input-container");
+
+    multiSelectWrapper.appendChild(inputContainer);
+    this.acWrapper.prepend(multiSelectWrapper);
+    inputContainer.appendChild(this.element);
+
+    this.element.addEventListener("selection", this);
+    multiSelectWrapper.addEventListener("click", () => {
+      this.element.focus();
+    })
+
+    if (this.options.selected) {
+      this.options.selected.forEach((selection) => {
+        this.addMultiSelectItem(selection);
+      })
+    }
+  }
+
+  createPromptDiv() {
+    this.promptDiv = document.createElement("div");
+    this.promptDiv.classList.add("search-prompt");
+    this.promptDiv.style.display = "none";
+    this.promptDiv.innerHTML = this.options.searchPromptText;
+    this.acWrapper.appendChild(this.promptDiv);
+  }
+}
diff --git a/decidim-core/app/packs/src/decidim/data_consent/consent_manager.js b/decidim-core/app/packs/src/decidim/data_consent/consent_manager.js
new file mode 100644
index 0000000000000..a8242931e60d9
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/data_consent/consent_manager.js
@@ -0,0 +1,136 @@
+import Cookies from "js-cookie";
+
+class ConsentManager {
+  // Options should contain the following keys:
+  // - modal - HTML element of the data consent modal (e.g. "<div id="dc-modal">Foo bar</div>")
+  // - categories - Available data consent categories (e.g. ["essential", "preferences", "analytics", "marketing"])
+  // - cookieName - Name of the cookie saved in the browser (e.g. "decidim-consent")
+  // - warningElement - HTML element to be shown when user has not given the necessary data consent to display the content.
+  constructor(options) {
+    this.modal = options.modal;
+    this.categories = options.categories;
+    this.cookieName = options.cookieName;
+    this.cookie = Cookies.get(this.cookieName);
+    this.warningElement = options.warningElement;
+    if (this.cookie) {
+      this.updateState(JSON.parse(this.cookie));
+    } else {
+      this.updateState({});
+    }
+  }
+
+  updateState(newState) {
+    this.state = newState;
+    Cookies.set(this.cookieName, JSON.stringify(this.state), {
+      domain: document.location.host.split(":")[0],
+      sameSite: "Lax",
+      expires: 365,
+      secure: window.location.protocol === "https:"
+    });
+    this.updateModalSelections();
+    this.triggerState();
+  }
+
+  triggerJavaScripts() {
+    document.querySelectorAll("script[type='text/plain'][data-consent]").forEach((script) => {
+      if (this.state[script.dataset.consent]) {
+        const activeScript = document.createElement("script");
+        if (script.src.length > 0) {
+          activeScript.src = script.src;
+        } else {
+          activeScript.innerHTML = script.innerHTML;
+        }
+        script.parentNode.replaceChild(activeScript, script);
+      }
+    });
+
+    const event = new CustomEvent("dataconsent", { detail: this.state });
+    document.dispatchEvent(event);
+  }
+
+  triggerIframes() {
+    if (this.allAccepted()) {
+      document.querySelectorAll(".disabled-iframe").forEach((original) => {
+        if (original.childNodes && original.childNodes.length) {
+          const content = Array.from(original.childNodes).find((childNode) => {
+            return childNode.nodeType === Node.COMMENT_NODE;
+          });
+          if (!content) {
+            return;
+          }
+          const newElement = document.createElement("div");
+          newElement.innerHTML = content.nodeValue;
+          original.parentNode.replaceChild(newElement.firstElementChild, original);
+        }
+      });
+    } else {
+      document.querySelectorAll("iframe").forEach((original) => {
+        const newElement = document.createElement("div");
+        newElement.className = "disabled-iframe";
+        newElement.appendChild(document.createComment(`${original.outerHTML}`));
+        original.parentNode.replaceChild(newElement, original);
+      });
+    }
+  }
+
+  triggerWarnings() {
+    document.querySelectorAll(".disabled-iframe").forEach((original) => {
+      if (original.querySelector(".dataconsent-warning")) {
+        return;
+      }
+
+      let cloned = this.warningElement.cloneNode(true);
+      cloned.classList.remove("hide");
+      original.appendChild(cloned);
+    });
+  }
+
+  triggerState() {
+    this.triggerJavaScripts();
+    this.triggerIframes();
+    this.triggerWarnings();
+  }
+
+  allAccepted() {
+    return this.categories.every((category) => {
+      return this.state[category] === true;
+    });
+  }
+
+  updateModalSelections() {
+    const categoryElements = this.modal.querySelectorAll(".category-wrapper");
+
+    categoryElements.forEach((categoryEl) => {
+      const categoryInput = categoryEl.querySelector("input");
+      if (this.state && this.state[categoryInput.name]) {
+        categoryInput.checked = true;
+      } else if (!categoryInput.disabled) {
+        categoryInput.checked = false;
+      }
+    });
+  }
+
+  saveSettings(newState) {
+    this.updateState(newState);
+  }
+
+  acceptAll() {
+    const newState = {};
+    this.categories.forEach((category) => {
+      newState[category] = true;
+    });
+    this.updateState(newState);
+  }
+
+  rejectAll() {
+    this.updateState({
+      essential: true
+    });
+  }
+
+  getState() {
+    return this.state;
+  }
+}
+
+export default ConsentManager
diff --git a/decidim-core/app/packs/src/decidim/data_consent/consent_manager.test.js b/decidim-core/app/packs/src/decidim/data_consent/consent_manager.test.js
new file mode 100644
index 0000000000000..7accca6ba645c
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/data_consent/consent_manager.test.js
@@ -0,0 +1,280 @@
+/* global global, jest */
+
+import Cookies from "js-cookie";
+import ConsentManager from "./consent_manager";
+
+// Mock js-cookie so that we can store the return values from the "set" method
+// in order to inspect their flags.
+jest.mock("js-cookie", () => {
+  const originalModule = jest.requireActual("js-cookie");
+
+  return {
+    // ...originalModule,
+    cookieStorage: {},
+    get: originalModule.get,
+    set: function (name, value, options) {
+      this.cookieStorage[name] = originalModule.set(name, value, options);
+    }
+  };
+});
+
+Reflect.deleteProperty(global.window, "location");
+global.window = Object.create(window);
+global.window.location = {
+  protocol: "https:",
+  hostname: "decidim.dev"
+};
+
+describe("ConsentManager", () => {
+  const dialogContent = `
+    <div id="dc-dialog-wrapper" class="flex-center" role="region">
+      <div class="dc-dialog padding-vertical-1">
+        <div class="row expanded">
+          <div class="columns medium-12 large-8">
+            <div class="dc-content">
+              <div class="h5">Information about the cookies used on the website</div>
+              <div>
+                We use cookies on our website to improve the performance and content of the site. The cookies enable us to provide a more individual user experience and social media channels.
+              </div>
+            </div>
+          </div>
+          <div class="columns medium-12 large-4">
+            <div class="dc-button-wrapper flex-center">
+              <button id="dc-dialog-accept" class="button">
+                Accept all
+              </button>
+              <button id="dc-dialog-reject" class="button hollow">
+                Accept only essential
+              </button>
+              <button id="dc-dialog-settings" class="button clear" data-open="dc-modal" aria-controls="dc-modal" aria-haspopup="dialog" tabindex="0">
+                Settings
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  `;
+  const modalContent = `
+    <div class="reveal dc-modal" id="dc-modal" role="dialog" data-close-on-click="false" data-close-on-esc="false" aria-modal="true" aria-hidden="true">
+      <div class="reveal__header">
+        <h3 class="reveal__title">Cookie settings</h3>
+        <p>
+          We use cookies to ensure the basic functionalities of the website and to enhance your online experience. You can choose for each category to opt-in/out whenever you want.
+        </p>
+      </div>
+
+      <div class="dc-categories">
+        <div class="category-wrapper margin-vertical-1" data-id="essential">
+          <div class="category-row flex-center">
+            <button class="dc-title padding-left-3">
+              <span class="h5 dc-category-title">
+                <strong>Essential</strong>
+              </span>
+            </button>
+            <div class="dc-switch">
+              <input class="switch-input" checked="checked" id="dc-essential" type="checkbox" name="essential" disabled="">
+              <label class="switch-paddle" for="dc-essential">
+                <span class="show-for-sr">Toggle Essential</span>
+              </label>
+            </div>
+          </div>
+          <div class="dc-description hide">
+            <div class="description-text">
+              <p>These cookies are essential for the proper functioning of my website. Without these cookies, the website would not work properly.</p>
+            </div>
+            <div class="dataconsent-details-wrapper">
+              <div class="row detail-titles">
+                <div class="columns small-2">Type</div>
+                <div class="columns small-2">Name</div>
+                <div class="columns small-2">Service</div>
+                <div class="columns small-6">Description</div>
+              </div>
+              <div class="row dataconsent-detail-row">
+                <div class="columns small-2">Cookie</div>
+                <div class="columns small-2">_session_id</div>
+                <div class="columns small-2">This website</div>
+                <div class="columns small-6">
+                  Allows websites to remember user within a website when they move between web pages.
+                </div>
+              </div>
+              <div class="row dataconsent-detail-row">
+                <div class="columns small-2">Cookie</div>
+                <div class="columns small-2">decidim-consent</div>
+                <div class="columns small-2">This website</div>
+                <div class="columns small-6">
+                  Stores information about the cookies allowed by the user on this website.
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="category-wrapper margin-vertical-1" data-id="preferences">
+          <div class="category-row flex-center">
+            <button class="dc-title padding-left-3">
+              <span class="h5 dc-category-title">
+                <strong>Preferences</strong>
+              </span>
+            </button>
+            <div class="dc-switch">
+              <input class="switch-input" id="dc-preferences" type="checkbox" name="preferences">
+              <label class="switch-paddle" for="dc-preferences">
+                <span class="show-for-sr">Toggle Preferences</span>
+              </label>
+            </div>
+          </div>
+          <div class="dc-description hide">
+            <div class="description-text">
+              <p>These cookies allow the website to remember the choices you have made in the past</p>
+            </div>
+          </div>
+        </div>
+        <div class="category-wrapper margin-vertical-1" data-id="analytics">
+          <div class="category-row flex-center">
+            <button class="dc-title padding-left-3">
+              <span class="h5 dc-category-title">
+                <strong>Analytics and statistics</strong>
+              </span>
+            </button>
+            <div class="dc-switch">
+              <input class="switch-input" id="dc-analytics" type="checkbox" name="analytics">
+              <label class="switch-paddle" for="dc-analytics">
+                <span class="show-for-sr">Toggle Analytics and statistics</span>
+              </label>
+            </div>
+          </div>
+          <div class="dc-description hide">
+            <div class="description-text">
+              <p>Analytics cookies are cookies that track how users navigate and interact with a website. The information collected is used to help the website owner improve the website.</p>
+            </div>
+          </div>
+        </div>
+        <div class="category-wrapper margin-vertical-1" data-id="marketing">
+          <div class="category-row flex-center">
+            <button class="dc-title padding-left-3">
+              <span class="h5 dc-category-title">
+                <strong>Marketing</strong>
+              </span>
+            </button>
+            <div class="dc-switch">
+              <input class="switch-input" id="dc-marketing" type="checkbox" name="marketing">
+              <label class="switch-paddle" for="dc-marketing">
+                <span class="show-for-sr">Toggle Marketing</span>
+              </label>
+            </div>
+          </div>
+          <div class="dc-description hide">
+            <div class="description-text">
+              <p>These cookies collect information about how you use the website, which pages you visited and which links you clicked on.</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="dc-buttons-wrapper flex-center">
+        <div class="dc-buttons-left">
+          <button id="dc-modal-accept" class="button" data-close="">Accept all</button>
+          <button id="dc-modal-reject" class="button hollow" data-close="">Accept only essential</button>
+        </div>
+        <div class="dc-buttons-right">
+          <button id="dc-modal-save" class="button clear" data-close="">Save settings</button>
+        </div>
+      </div>
+    </div>
+  `;
+  const cookieWarningContent = `
+    <div class="dataconsent-warning flex-center padding-1 hide">
+      <p>You need to enable all cookies in order to see this content.</p>
+      <a href="#" class="button margin-vertical-2" data-open="dc-modal">
+        Change cookie settings
+      </a>
+    </div>
+  `;
+
+  const getCookie = (name) => {
+    for (const [key, value] of Object.entries(Cookies.cookieStorage)) {
+      if (key === name) {
+        const cookie = {};
+        value.split(";").forEach((cookieString) => {
+          const kv = cookieString.trim().split("=");
+          const val = kv[1] || true;
+
+          if (kv[0] === key) {
+            cookie.value = val;
+          } else {
+            cookie[kv[0]] = val;
+          }
+        });
+
+        return cookie;
+      }
+    }
+
+    return null;
+  };
+
+  let manager = null;
+  const originalLocation = window.location;
+
+  beforeEach(() => {
+    Cookies.cookieStorage = {};
+
+    document.body.innerHTML = dialogContent + modalContent + cookieWarningContent;
+
+    const modal = document.querySelector("#dc-modal");
+    const categories = [...modal.querySelectorAll(".category-wrapper")].map((el) => el.dataset.id);
+    manager = new ConsentManager({
+      modal: modal,
+      categories: categories,
+      cookieName: "decidim-consent",
+      warningElement: document.querySelector(".dataconsent-warning")
+    });
+  });
+
+  afterEach(() => {
+    window.location = originalLocation;
+  });
+
+  describe("updateState", () => {
+    let cookie = null;
+
+    describe("when the current URL is secure", () => {
+      beforeEach(() => {
+        manager.updateState({ foo: "bar" });
+        cookie = getCookie("decidim-consent");
+      });
+
+      it("sets the cookie with the correct value", () => {
+        expect(cookie.value).toEqual("{%22foo%22:%22bar%22}");
+      });
+
+      it("sets the cookie with the correct expiry", () => {
+        const expiry = Date.parse(cookie.expires);
+        const oneYearFromNow = Date.now() + 3600 * 24 * 1000 * 365;
+
+        // Expect it to be within a second of the expected expiry time because
+        // it would be pretty hard to try to guess the exact same millisecond.
+        expect(oneYearFromNow - 1000).toBeLessThan(expiry);
+        expect(oneYearFromNow + 1000).toBeGreaterThan(expiry);
+      });
+
+      it("sets the cookie with the correct flags", () => {
+        expect(cookie.domain).toEqual("decidim.dev");
+        expect(cookie.sameSite).toEqual("Lax");
+        expect(cookie.secure).toBe(true);
+      });
+    });
+
+    describe("when the current URL is insecure", () => {
+      beforeEach(() => {
+        Reflect.defineProperty(window.location, "protocol", { value: "http:" })
+
+        manager.updateState({ foo: "bar" });
+        cookie = getCookie("decidim-consent");
+      });
+
+      it("does not set the secure flag", () => {
+        expect(cookie.secure).toBeUndefined();
+      });
+    });
+  });
+});
diff --git a/decidim-core/app/packs/src/decidim/data_consent/index.js b/decidim-core/app/packs/src/decidim/data_consent/index.js
new file mode 100644
index 0000000000000..65446f76ad7c9
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/data_consent/index.js
@@ -0,0 +1,103 @@
+import ConsentManager from "src/decidim/data_consent/consent_manager";
+
+const initDialog = (manager) => {
+  if (Object.keys(manager.state).length > 0) {
+    return;
+  }
+  const dialogWrapper = document.querySelector("#dc-dialog-wrapper");
+  dialogWrapper.classList.remove("hide");
+
+  const acceptAllButton = dialogWrapper.querySelector("#dc-dialog-accept");
+  const rejectAllButton = dialogWrapper.querySelector("#dc-dialog-reject");
+  const settingsButton = dialogWrapper.querySelector("#dc-dialog-settings");
+
+  acceptAllButton.addEventListener("click", () => {
+    manager.acceptAll();
+    dialogWrapper.style.display = "none";
+  });
+
+  rejectAllButton.addEventListener("click", () => {
+    manager.rejectAll();
+    dialogWrapper.style.display = "none";
+  });
+
+  settingsButton.addEventListener("click", () => {
+    dialogWrapper.style.display = "none";
+  });
+}
+
+const initModal = (manager) => {
+  const categoryElements = manager.modal.querySelectorAll(".category-wrapper");
+
+  categoryElements.forEach((categoryEl) => {
+    const categoryButton = categoryEl.querySelector(".dc-title");
+    const categoryDescription = categoryEl.querySelector(".dc-description");
+    categoryButton.addEventListener("click", () => {
+      const hidden = categoryDescription.classList.contains("hide");
+      if (hidden) {
+        categoryButton.classList.add("open");
+        categoryDescription.classList.remove("hide");
+      } else {
+        categoryButton.classList.remove("open");
+        categoryDescription.classList.add("hide");
+      }
+    })
+  })
+
+  const acceptAllButton = manager.modal.querySelector("#dc-modal-accept");
+  const rejectAllButton = manager.modal.querySelector("#dc-modal-reject");
+  const saveSettingsButton = manager.modal.querySelector("#dc-modal-save");
+
+  acceptAllButton.addEventListener("click", () => {
+    manager.acceptAll();
+  })
+
+  rejectAllButton.addEventListener("click", () => {
+    manager.rejectAll();
+  })
+
+  saveSettingsButton.addEventListener("click", () => {
+    let newState = {};
+    manager.categories.forEach((category) => {
+      const accepted = manager.modal.querySelector(`input[name='${category}']`).checked;
+      if (accepted) {
+        newState[category] = true;
+      }
+    })
+    manager.saveSettings(newState);
+  })
+}
+
+const initDisabledIframes = (manager) => {
+  const disabledIframes = document.querySelectorAll(".disabled-iframe")
+  if (manager.allAccepted()) {
+    disabledIframes.forEach((elem) => {
+      const iframe = document.createElement("iframe")
+      iframe.setAttribute("src", elem.getAttribute("src"));
+      iframe.className = elem.classList.toString();
+      iframe.setAttribute("allowfullscreen", elem.getAttribute("allowfullscreen"));
+      iframe.setAttribute("frameborder", elem.getAttribute("frameborder"));
+      elem.parentElement.appendChild(iframe);
+      elem.remove();
+    })
+  }
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  const modal = document.querySelector("#dc-modal");
+  if (!modal) {
+    return;
+  }
+
+  const categories = [...modal.querySelectorAll(".category-wrapper")].map((el) => el.dataset.id)
+  const manager = new ConsentManager({
+    modal: modal,
+    categories: categories,
+    cookieName: window.Decidim.config.get("consent_cookie_name"),
+    warningElement: document.querySelector(".dataconsent-warning")
+  });
+
+  initDisabledIframes(manager);
+  initModal(manager, categories);
+  initDialog(manager);
+});
diff --git a/decidim-core/app/packs/src/decidim/datalist_select.js b/decidim-core/app/packs/src/decidim/datalist_select.js
new file mode 100644
index 0000000000000..54572fa3c0ced
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/datalist_select.js
@@ -0,0 +1,36 @@
+/**
+// Function adds feature to datalist that you can have different id and label.
+// Used with datalist_select_helper.rb#datalist_select
+ * @param {HTMLElement} target - dataselect wrapper
+ * @param {Function} callback - the function to be executed after a successful selection.
+ * @returns {Void} - Returns nothing.
+ */
+
+export const datalistSelect = (target, callback) => {
+  if (!target) {
+    return;
+  }
+
+  const input = target.querySelector("input[type='hidden'");
+  const textInput = target.querySelector("input[type='text']");
+  const items = target.querySelector("datalist").children;
+
+  const selectValue = (selected) => {
+    for (let idx = 0; idx < items.length; idx += 1) {
+      if (items[idx].innerHTML === selected) {
+        const id = items[idx].dataset.value;
+        input.value = id;
+        if (callback) {
+          return callback(id);
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
+  textInput.addEventListener("input", () => {
+    const selected = textInput.value;
+    selectValue(selected);
+  })
+}
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js
new file mode 100644
index 0000000000000..08870e4f6e9e5
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js
@@ -0,0 +1,117 @@
+import UploadModal from "src/decidim/direct_uploads/upload_modal";
+import { truncateFilename, createHiddenInput } from "src/decidim/direct_uploads/upload_utility";
+
+const loadAttachments = (modal) => {
+  Array.from(modal.activeAttachments.children).forEach((child) => {
+    modal.createUploadItem(child.dataset.filename, child.dataset.title, "validated");
+  })
+}
+
+const addInputEventListener = (modal) => {
+  modal.input.addEventListener("change", (event) => {
+    event.preventDefault();
+    const files = event.target.files;
+    Array.from(files).forEach((file) => modal.uploadFile(file));
+  })
+}
+
+const addButtonEventListener = (modal) => {
+  modal.button.addEventListener("click", (event) => {
+    event.preventDefault();
+    Array.from(modal.trashCan.children).forEach((item) => {
+      modal.uploadItems.append(item);
+    })
+    if (modal.uploadItems.children.length === 0) {
+      modal.modalTitle.innerHTML = modal.modalTitle.dataset.addlabel;
+    } else {
+      modal.modalTitle.innerHTML = modal.modalTitle.dataset.editlabel;
+    }
+    modal.updateDropZone();
+  })
+}
+
+const addDropZoneEventListeners = (modal) => {
+  modal.dropZone.addEventListener("dragenter", (event) => {
+    event.preventDefault();
+  })
+
+  modal.dropZone.addEventListener("dragover", (event) => {
+    event.preventDefault();
+    modal.dropZone.classList.add("is-dragover");
+  })
+
+  modal.dropZone.addEventListener("dragleave", () => {
+    modal.dropZone.classList.remove("is-dragover");
+  })
+
+  modal.dropZone.addEventListener("drop", (event) => {
+    event.preventDefault();
+    const files = event.dataTransfer.files;
+    Array.from(files).forEach((file) => modal.uploadFile(file));
+  })
+}
+
+const addSaveButtonEventListener = (modal) => {
+  modal.saveButton.addEventListener("click", (event) => {
+    event.preventDefault();
+    const validatedItems = modal.uploadItems.querySelectorAll(".upload-item[data-state='validated']")
+    const validatedItemsCount = validatedItems.length;
+    validatedItems.forEach((item) => {
+      let details = item.querySelector(".attachment-details");
+      if (details) {
+        modal.activeAttachments.appendChild(details);
+      } else {
+        details = modal.activeAttachments.querySelector(`.attachment-details[data-filename='${item.dataset.filename}'`);
+      }
+      const span = details.querySelector("span");
+      span.classList.add("filename");
+      if (modal.options.titled) {
+        const title = item.querySelector("input[type='text']").value;
+        details.dataset.title = title;
+        let hiddenTitle = details.querySelector(".hidden-title")
+        if (hiddenTitle) {
+          hiddenTitle.value = title;
+        } else {
+          const attachmentId = details.querySelector(`[name='${modal.options.resourceName}[${modal.name}][]'`).value
+          const ordinalNumber = modal.getOrdinalNumber()
+          const hiddenTitleField = createHiddenInput("hidden-title", `${modal.options.resourceName}[${modal.options.addAttribute}][${ordinalNumber}][title]`, title)
+          const hiddenIdField = createHiddenInput("hidden-id", `${modal.options.resourceName}[${modal.options.addAttribute}][${ordinalNumber}][id]`, attachmentId)
+          details.appendChild(hiddenTitleField);
+          details.appendChild(hiddenIdField);
+        }
+        span.innerHTML = `${title} (${truncateFilename(item.dataset.filename)})`;
+      } else {
+        span.innerHTML = truncateFilename(item.dataset.filename, 19);
+      }
+      span.style.display = "block";
+    });
+
+    if (!modal.options.titled && modal.trashCan.children.length > 0) {
+      modal.activeAttachments.innerHTML = `<input name='${modal.options.resourceName}[remove_${modal.name}]' type="hidden" value="true">`;
+    }
+
+    if (validatedItemsCount > 0) {
+      // Foundation helper does some magic with error fields, so these must be triggered using jQuery.
+      const $el = $(modal.uploadContainer.querySelector("input[type='checkbox']"));
+      if ($el) {
+        $el.prop("checked", true);
+        $el.trigger("change");
+      }
+    }
+    modal.cleanTrashCan();
+    modal.updateAddAttachmentsButton();
+  });
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  const attachmentButtons = document.querySelectorAll("button.add-file");
+
+  attachmentButtons.forEach((attachmentButton) => {
+    const modal = new UploadModal(attachmentButton);
+    loadAttachments(modal);
+    addInputEventListener(modal);
+    addButtonEventListener(modal);
+    addDropZoneEventListeners(modal);
+    addSaveButtonEventListener(modal);
+  })
+})
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
new file mode 100644
index 0000000000000..c40f9a4242786
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_modal.js
@@ -0,0 +1,264 @@
+import { Uploader } from "src/decidim/direct_uploads/uploader";
+import { truncateFilename, checkTitles, createHiddenInput } from "src/decidim/direct_uploads/upload_utility";
+
+// This class handles logic inside upload modal, but since modal is not inside the form
+// logic here moves "upload items" / hidden inputs to form.
+export default class UploadModal {
+  constructor(button, options = {}) {
+    // Button that opens the modal.
+    this.button = button;
+
+    // The provided options contains the options passed from the view in the
+    // `data-upload` attribute as a JSON.
+    let providedOptions = {};
+    try {
+      // The providedOptions can contain the following keys:
+      // - addAttribute - Field name / attribute of resource (e.g. avatar)
+      // - resourceName - The resource to which the attribute belongs (e.g. user)
+      // - resourceClass - Ruby class of the resource (e.g. Decidim::User)
+      // - optional - Defines if file is optional
+      // - multiple - Defines if multiple files can be uploaded
+      // - titled - Defines if file(s) can have titles
+      // - maxFileSize - Defines maximum file size in bytes
+      // - formObjectClass - Class of the current form object (e.g. Decidim::AccountForm)
+      providedOptions = JSON.parse(button.dataset.upload);
+    } catch (_e) {
+      // Don't care about the parse errors, just skip the provided options.
+    }
+
+    this.options = Object.assign(providedOptions, options)
+
+    this.name = this.button.name;
+    this.modal = document.querySelector(`#${button.dataset.open}`);
+    this.saveButton = this.modal.querySelector(`button.add-file-${this.name}`);
+    this.attachmentCounter = 0;
+    this.dropZoneEnabled = true;
+    this.modalTitle = this.modal.querySelector(".reveal__title");
+    this.uploadItems = this.modal.querySelector(".upload-items");
+    this.locales = JSON.parse(this.uploadItems.dataset.locales);
+    this.dropZone = this.modal.querySelector(".dropzone");
+    this.input = this.dropZone.querySelector("input");
+    this.uploadContainer = document.querySelector(`.upload-container-for-${this.name}`);
+    this.activeAttachments = this.uploadContainer.querySelector(".active-uploads");
+    this.trashCan = this.createTrashCan();
+  }
+
+  uploadFile(file) {
+    if (!this.dropZoneEnabled) {
+      return;
+    }
+
+    const title = file.name.split(".")[0].slice(0, 31);
+    const uploadItem = this.createUploadItem(file.name, title, "init");
+    const uploader = new Uploader(this, uploadItem, {
+      file: file,
+      url: this.input.dataset.directUploadUrl,
+      attachmentName: file.name
+    });
+    if (uploader.fileTooBig) {
+      return;
+    }
+
+    uploader.upload.create((error, blob) => {
+      if (error) {
+        uploadItem.dataset.state = "error";
+        const progressBar = uploadItem.querySelector(".progress-bar");
+        progressBar.classList.add("filled");
+        progressBar.innerHTML = this.locales.error;
+        console.error(error);
+      } else {
+        const ordinalNumber = this.getOrdinalNumber();
+
+        const attachmentDetails = document.createElement("div");
+        attachmentDetails.classList.add("attachment-details");
+        attachmentDetails.dataset.filename = file.name;
+        const titleAndFileNameSpan = document.createElement("span");
+        titleAndFileNameSpan.style.display = "none";
+        attachmentDetails.appendChild(titleAndFileNameSpan);
+
+        const hiddenBlobField = createHiddenInput(null, null, blob.signed_id);
+        if (this.options.titled) {
+          hiddenBlobField.name = `${this.options.resourceName}[${this.options.addAttribute}][${ordinalNumber}][file]`;
+        } else {
+          hiddenBlobField.name = `${this.options.resourceName}[${this.options.addAttribute}]`;
+        }
+
+        if (this.options.titled) {
+          const hiddenTitleField = createHiddenInput("hidden-title", `${this.options.resourceName}[${this.options.addAttribute}][${ordinalNumber}][title]`, title);
+          titleAndFileNameSpan.innerHTML = `${title} (${file.name})`;
+          attachmentDetails.appendChild(hiddenTitleField);
+        } else {
+          titleAndFileNameSpan.innerHTML = file.name;
+        }
+
+        if (!this.options.multiple) {
+          this.cleanTrashCan();
+        }
+
+        attachmentDetails.appendChild(hiddenBlobField);
+        uploadItem.appendChild(attachmentDetails);
+        uploader.validate(blob.signed_id);
+      }
+    });
+    this.updateDropZone();
+  }
+
+  getOrdinalNumber() {
+    const nextOrdinalNumber = this.attachmentCounter;
+    this.attachmentCounter += 1;
+    return nextOrdinalNumber;
+  }
+
+  updateDropZone() {
+    if (this.options.multiple) {
+      return;
+    }
+
+    if (this.uploadItems.children.length > 0) {
+      this.dropZone.classList.add("disabled");
+      this.dropZoneEnabled = false;
+      this.input.disabled = true;
+    } else {
+      this.dropZone.classList.remove("disabled");
+      this.dropZoneEnabled = true;
+      this.input.disabled = false;
+    }
+  }
+
+  createUploadItem(fileName, title, state) {
+    const wrapper = document.createElement("div");
+    wrapper.classList.add("upload-item");
+    wrapper.setAttribute("data-filename", fileName);
+
+    const firstRow = document.createElement("div");
+    const secondRow = document.createElement("div");
+    const thirdRow = document.createElement("div");
+    firstRow.classList.add("row", "upload-item-first-row");
+    secondRow.classList.add("row", "upload-item-second-row");
+    thirdRow.classList.add("row", "upload-item-third-row");
+
+    const fileNameSpan = document.createElement("span");
+    let fileNameSpanClasses = ["columns", "file-name-span"];
+    if (this.options.titled) {
+      fileNameSpanClasses.push("small-4", "medium-5");
+    } else {
+      fileNameSpanClasses.push("small-12");
+    }
+    fileNameSpan.classList.add(...fileNameSpanClasses);
+    fileNameSpan.innerHTML = truncateFilename(fileName);
+
+    const progressBar = document.createElement("div");
+    progressBar.classList.add("progress-bar");
+    if (state) {
+      if (state === "validated") {
+        progressBar.innerHTML = this.locales.uploaded;
+      } else {
+        progressBar.innerHTML = "0%";
+        progressBar.style.width = "15%";
+      }
+      wrapper.dataset.state = state;
+    }
+
+    const progressBarBorder = document.createElement("div");
+    progressBarBorder.classList.add("progress-bar-border");
+    progressBarBorder.appendChild(progressBar);
+
+    const progressBarWrapper = document.createElement("div");
+    progressBarWrapper.classList.add("columns", "progress-bar-wrapper");
+    progressBarWrapper.appendChild(progressBarBorder);
+    if (this.options.titled) {
+      progressBarWrapper.classList.add("small-4", "medium-5");
+    } else {
+      progressBarWrapper.classList.add("small-10");
+    }
+
+    const errorList = document.createElement("ul");
+    errorList.classList.add("upload-errors");
+
+    const removeButton = document.createElement("button");
+    removeButton.classList.add("columns", "small-3", "medium-2", "remove-upload-item");
+    removeButton.innerHTML = `&times; ${this.locales.remove}`;
+    removeButton.addEventListener(("click"), (event) => {
+      event.preventDefault();
+      const item = this.uploadItems.querySelector(`[data-filename='${fileName}']`);
+      this.trashCan.append(item);
+      this.updateDropZone();
+    })
+
+    const titleAndFileNameSpan = document.createElement("span");
+    titleAndFileNameSpan.classList.add("columns", "small-5", "title-and-filename-span");
+    titleAndFileNameSpan.innerHTML = `${title} (${truncateFilename(fileName)})`;
+
+    firstRow.appendChild(fileNameSpan);
+    secondRow.appendChild(progressBarWrapper);
+    thirdRow.appendChild(errorList);
+
+    let titleInputContainer = null;
+    if (this.options.titled) {
+      const titleInput = document.createElement("input");
+      titleInput.classList.add("attachment-title");
+      titleInput.type = "text";
+      titleInput.value = title;
+      titleInput.addEventListener("input", (event) => {
+        event.preventDefault();
+        checkTitles(this.uploadItems, this.saveButton);
+      })
+      titleInputContainer = document.createElement("div");
+      titleInputContainer.classList.add("columns", "small-5", "title-input-container");
+      titleInputContainer.appendChild(titleInput);
+
+      const noTitleErrorSpan = document.createElement("span");
+      noTitleErrorSpan.classList.add("form-error", "no-title-error");
+      noTitleErrorSpan.role = "alert";
+      noTitleErrorSpan.innerHTML = this.locales.title_required;
+      titleInputContainer.appendChild(noTitleErrorSpan);
+
+      const titleLabelSpan = document.createElement("span");
+      titleLabelSpan.classList.add("title-label-span");
+      titleLabelSpan.innerHTML = this.locales.title;
+
+      const titleContainer = document.createElement("div");
+      titleContainer.classList.add("columns", "small-8", "medium-7", "title-container");
+      titleContainer.appendChild(titleLabelSpan);
+      firstRow.appendChild(titleContainer);
+      secondRow.appendChild(titleInputContainer);
+    }
+
+    secondRow.appendChild(removeButton);
+
+    wrapper.appendChild(firstRow);
+    wrapper.appendChild(secondRow);
+    wrapper.appendChild(thirdRow);
+
+    this.uploadItems.appendChild(wrapper);
+
+    return wrapper;
+  }
+
+  updateAddAttachmentsButton() {
+    if (this.activeAttachments.children.length === 0) {
+      this.button.innerHTML = this.modalTitle.dataset.addlabel;
+    } else {
+      this.button.innerHTML = this.modalTitle.dataset.editlabel;
+    }
+  }
+
+  createTrashCan() {
+    const trashCan =  document.createElement("div");
+    trashCan.classList.add("trash-can");
+    trashCan.style.display = "none";
+    this.uploadItems.parentElement.appendChild(trashCan);
+    return trashCan;
+  }
+
+  cleanTrashCan() {
+    Array.from(this.trashCan.children).forEach((item) => {
+      const fileName = item.dataset.filename;
+      const activeAttachment = this.activeAttachments.querySelector(`div[data-filename='${fileName}']`);
+      if (activeAttachment) {
+        activeAttachment.remove();
+      }
+      item.remove();
+    })
+  }
+}
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_utility.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_utility.js
new file mode 100644
index 0000000000000..a77382f22d2c3
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_utility.js
@@ -0,0 +1,49 @@
+export const checkTitles = (parentElement, saveButton) => {
+  let everyItemHasTitle = true;
+
+  Array.from(parentElement.children).forEach((item) => {
+    const title = item.querySelector("input[type='text']").value;
+    const noTitleErrorSpan = item.querySelector(".no-title-error");
+    if (!title || title.length === 0) {
+      everyItemHasTitle = false;
+      saveButton.disabled = true;
+      noTitleErrorSpan.classList.add("is-visible");
+      item.appendChild(noTitleErrorSpan);
+    } else {
+      noTitleErrorSpan.classList.remove("is-visible");
+    }
+  });
+
+  if (everyItemHasTitle) {
+    saveButton.disabled = false;
+  }
+}
+
+export const truncateFilename = (filename, maxLength = 31) => {
+  if (filename.length <= maxLength) {
+    return filename;
+  }
+
+  const charactersFromBegin = Math.floor(maxLength / 2) - 3;
+  const charactersFromEnd = maxLength - charactersFromBegin - 3;
+  return `${filename.slice(0, charactersFromBegin)}...${filename.slice(-charactersFromEnd)}`;
+}
+
+export const createHiddenInput = (elClasses, elName, elValue) => {
+  const el = document.createElement("input");
+  el.type = "hidden";
+  if (elClasses) {
+    if (typeof (elClasses) === "string") {
+      el.className = elClasses;
+    } else {
+      el.className = elClasses.join(" ")
+    }
+  }
+  if (elName) {
+    el.name = elName;
+  }
+  if (elValue) {
+    el.value = elValue;
+  }
+  return el;
+}
diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/uploader.js b/decidim-core/app/packs/src/decidim/direct_uploads/uploader.js
new file mode 100644
index 0000000000000..90ed1d7906e11
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/direct_uploads/uploader.js
@@ -0,0 +1,89 @@
+import { DirectUpload } from "@rails/activestorage";
+
+export class Uploader {
+  constructor(modal, uploadItem, options) {
+    this.modal = modal;
+    this.uploadItem = uploadItem;
+    this.progressBar = uploadItem.querySelector(".progress-bar");
+    this.validationSent = false;
+    this.fileTooBig = false;
+    if (modal.options.maxFileSize && options.file.size > modal.options.maxFileSize) {
+      this.fileTooBig = true;
+      this.showError([modal.locales.file_size_too_large]);
+    } else {
+      this.upload = new DirectUpload(options.file, options.url, this);
+    }
+  }
+
+  showError(errors) {
+    this.progressBar.classList.add("filled");
+    this.progressBar.innerHTML = this.modal.locales.validation_error;
+    this.uploadItem.dataset.state = "error";
+    const errorList = this.uploadItem.querySelector(".upload-errors");
+    errors.forEach((error) => {
+      const errorItem = document.createElement("li");
+      errorItem.classList.add("form-error", "is-visible");
+      errorItem.innerHTML = error;
+      errorList.appendChild(errorItem);
+    })
+  }
+
+  validate(blobId) {
+    const callback = (data) => {
+      let errors = []
+      for (const [, value] of Object.entries(data)) {
+        errors = errors.concat(value);
+      }
+
+      this.progressBar.style.justifyContent = "center";
+      if (errors.length === 0) {
+        this.progressBar.innerHTML = this.modal.locales.uploaded;
+        this.uploadItem.dataset.state = "validated";
+      } else {
+        this.showError(errors);
+      }
+      this.progressBar.classList.add("filled");
+    }
+
+    if (!this.validationSent) {
+      let property = this.modal.options.addAttribute;
+      if (this.modal.options.titled) {
+        property = "file"
+      }
+      const params = new URLSearchParams({
+        resourceClass: this.modal.options.resourceClass,
+        property: property,
+        blob: blobId,
+        formClass: this.modal.options.formObjectClass
+      });
+
+      fetch(`/upload_validations?${params.toString()}`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-CSRF-Token": $("meta[name=csrf-token]").attr("content")
+        }
+      }).then((response) => response.json()).then((data) => {
+        callback(data);
+      });
+      this.validationSent = true;
+    }
+  }
+
+  directUploadWillStoreFileWithXHR(request) {
+    request.upload.addEventListener("progress", (event) => {
+      const progress = Math.floor(event.loaded / event.total * 100);
+      let width = "15%";
+      if (progress > 15) {
+        width = `${progress}%`;
+      }
+      this.progressBar.style.width = width;
+
+      if (progress === 100) {
+        this.progressBar.innerHTML = this.modal.locales.validating;
+        return;
+      }
+      this.progressBar.innerHTML = `${progress}%`;
+    });
+  }
+}
diff --git a/decidim-core/app/packs/src/decidim/external_domain_warning.js b/decidim-core/app/packs/src/decidim/external_domain_warning.js
index 280c53792ab49..bb8c594d6a873 100644
--- a/decidim-core/app/packs/src/decidim/external_domain_warning.js
+++ b/decidim-core/app/packs/src/decidim/external_domain_warning.js
@@ -9,7 +9,7 @@ export default function updateExternalDomainLinks($target) {
 
   $("a", $target).filter((_i, link) => {
     const $link = $(link);
-    if (!$link[0].hasAttribute("href") || $link.parents(".ql-editor").length > 0) {
+    if (!$link[0].hasAttribute("href") || $link.parents(".editor-container").length > 0) {
       return false;
     }
 
diff --git a/decidim-core/app/packs/src/decidim/external_link.js b/decidim-core/app/packs/src/decidim/external_link.js
index fc2585c37b57b..8484e79e006e6 100644
--- a/decidim-core/app/packs/src/decidim/external_link.js
+++ b/decidim-core/app/packs/src/decidim/external_link.js
@@ -42,13 +42,24 @@ export default class ExternalLink {
       return;
     }
 
-    this.$link.addClass("external-link-container");
+    let $target = this.$link;
+    if (this.$link[0].hasAttribute("data-external-link-target")) {
+      $target = $(this.$link.data("external-link-target"), this.$link);
+      if ($target.length < 1) {
+        $target = this.$link;
+      }
+    }
+
+    $target.addClass("external-link-container");
     let spacer = "&nbsp;";
-    if (this.$link.text().trim().length < 1) {
+    if (this.$link[0].hasAttribute("data-external-link-spacer")) {
+      spacer = this.$link.data("external-link-spacer");
+    } else if ($target.text().trim().length < 1) {
       // Fixes image links extra space
       spacer = "";
     }
-    this.$link.append(`${spacer}${this.generateElement()}`);
+
+    $target.append(`${spacer}${this.generateElement()}`);
   }
 
   generateElement() {
diff --git a/decidim-core/app/packs/src/decidim/external_link.test.js b/decidim-core/app/packs/src/decidim/external_link.test.js
new file mode 100644
index 0000000000000..b47196da610ee
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/external_link.test.js
@@ -0,0 +1,64 @@
+import $ from "jquery"; // eslint-disable-line id-length
+
+import ExternalLink from "./external_link";
+
+describe("ExternalLink", () => {
+  const content = `
+    <div id="links">
+      <a href="https://decidim.org/" target="_blank">This is an external link</a>
+      <a href="https://decidim.org/" target="_blank"><img src="/path/to/image.png" alt=""></a>
+      <a href="https://decidim.org/" target="_blank" data-external-link-spacer="%%%">Custom spacer link</a>
+      <a href="https://decidim.org/" target="_blank" data-external-link-target=".external-wrapper"><span class="external-wrapper"></span>This is the link</a>
+    </div>
+  `;
+
+  const config = {
+    "icons_path": "/path/to/icons.svg"
+  };
+  window.Decidim = {
+    config: {
+      get: (key) => config[key]
+    }
+  }
+  const expectedIcon = '<svg class="icon icon--external-link" role="img" aria-hidden="true"><title>external-link</title><use href="/path/to/icons.svg#icon-external-link"></use></svg>';
+
+  beforeEach(() => {
+    $("body").html(content);
+    $('a[target="_blank"]').each((_i, elem) => {
+      const $link = $(elem);
+      $link.data("external-link", new ExternalLink($link));
+    });
+  });
+
+  it("adds the external link indicator to the normal external link", () => {
+    const $link = $("#links a")[0];
+
+    expect($link.outerHTML).toEqual(
+      `<a href="https://decidim.org/" target="_blank" class="external-link-container">This is an external link&nbsp;<span class="external-link-indicator">${expectedIcon}<span class="show-for-sr">(External link)</span></span></a>`
+    );
+  });
+
+  it("adds the external link indicator without a spacer to the image link", () => {
+    const $link = $("#links a")[1];
+
+    expect($link.outerHTML).toEqual(
+      `<a href="https://decidim.org/" target="_blank" class="external-link-container"><img src="/path/to/image.png" alt=""><span class="external-link-indicator">${expectedIcon}<span class="show-for-sr">(External link)</span></span></a>`
+    );
+  });
+
+  it("adds the external link indicator with a custom spacer to the link with the custom spacer configuration", () => {
+    const $link = $("#links a")[2];
+
+    expect($link.outerHTML).toEqual(
+      `<a href="https://decidim.org/" target="_blank" data-external-link-spacer="%%%" class="external-link-container">Custom spacer link%%%<span class="external-link-indicator">${expectedIcon}<span class="show-for-sr">(External link)</span></span></a>`
+    );
+  });
+
+  it("adds the external link indicator with a custom container to the link with the custom container configuration", () => {
+    const $link = $("#links a")[3];
+
+    expect($link.outerHTML).toEqual(
+      `<a href="https://decidim.org/" target="_blank" data-external-link-target=".external-wrapper"><span class="external-wrapper external-link-container"><span class="external-link-indicator">${expectedIcon}<span class="show-for-sr">(External link)</span></span></span>This is the link</a>`
+    );
+  });
+});
diff --git a/decidim-core/app/packs/src/decidim/form_filter.component.test.js b/decidim-core/app/packs/src/decidim/form_filter.component.test.js
index 9136b9c3b5fad..9f93ff5f5a5b4 100644
--- a/decidim-core/app/packs/src/decidim/form_filter.component.test.js
+++ b/decidim-core/app/packs/src/decidim/form_filter.component.test.js
@@ -1,4 +1,4 @@
-/* global spyOn */
+/* global spyOn, jest */
 /* eslint-disable id-length */
 window.$ = $;
 
@@ -7,6 +7,20 @@ import DataPicker from "./data_picker"
 
 const FormFilterComponent = require("./form_filter.component_for_testing.js");
 
+const expectedPushState = (state, filters) => {
+  const queryString = Object.keys(filters).map((key) => {
+    const name = `filter[${key}]`;
+    const val = filters[key];
+    if (Array.isArray(val)) {
+      return val.map((v) => `${encodeURIComponent(`${name}[]`)}=${encodeURIComponent(v)}`).join("&");
+    }
+
+    return `${encodeURIComponent(name)}=${encodeURIComponent(val)}`;
+  }).join("&");
+
+  return [state, null, `/filters?${queryString}`];
+}
+
 describe("FormFilterComponent", () => {
   const selector = "form#new_filter";
   let subject = null;
@@ -15,6 +29,10 @@ describe("FormFilterComponent", () => {
   beforeEach(() => {
     let form = `
       <form id="new_filter" action="/filters" method="get">
+        <fieldset>
+          <input id="filter_search_text_cont" placeholder="Search" data-disable-dynamic-change="true" type="search" name="filter[search_text_cont]">
+        </fieldset>
+
         <fieldset>
           <div id="filter_somerandomid_scope_id" class="data-picker picker-multiple" data-picker-name="filter[scope_id]">
             <div class="picker-values">
@@ -67,11 +85,25 @@ describe("FormFilterComponent", () => {
     `;
     $("body").append(form);
 
+    const $form = $(document).find("form");
+
     window.Decidim = window.Decidim || {};
 
     window.theDataPicker = new DataPicker($(".data-picker"));
     window.theCheckBoxesTree = new CheckBoxesTree();
-    subject = new FormFilterComponent($(document).find("form"));
+    window.Rails = {
+      fire: (htmlElement, event) => {
+        // Hack to call trigger on the correct instance of the form, as fetching
+        // with the selector does not work.
+        if (htmlElement === $form[0]) {
+          $form.trigger(event);
+        }
+      }
+    };
+
+    subject = new FormFilterComponent($form);
+
+    jest.useFakeTimers();
   });
 
   it("exists", () => {
@@ -88,7 +120,19 @@ describe("FormFilterComponent", () => {
 
   describe("when mounted", () => {
     beforeEach(() => {
-      spyOn(subject.$form, "on");
+      // Jest doesn't implement listening on the form submit event so we need
+      // to hack it.
+      const originalOn = subject.$form.on.bind(subject.$form);
+      jest.spyOn(subject.$form, "on").mockImplementation((...args) => {
+        if (args[0] === "submit") {
+          subject.$form.submitHandler = args[1];
+        } else if (args[0] === "change" && typeof args[1] === "string") {
+          subject.$form.changeHandler = args[2];
+        } else {
+          originalOn(...args);
+        }
+      });
+
       subject.mountComponent();
     });
 
@@ -100,8 +144,98 @@ describe("FormFilterComponent", () => {
       expect(subject.mounted).toBeTruthy();
     });
 
-    it("binds the form change event", () => {
+    it("binds the form change and submit events", () => {
       expect(subject.$form.on).toHaveBeenCalledWith("change", "input:not([data-disable-dynamic-change]), select:not([data-disable-dynamic-change])", subject._onFormChange);
+      expect(subject.$form.on).toHaveBeenCalledWith("submit", subject._onFormSubmit);
+    });
+
+    describe("form changes", () => {
+      beforeEach(() => {
+        spyOn(window.history, "pushState");
+
+        // This is a hack to be able to trigger the events even somewhat close
+        // to an actual situation. In real browser environment the change events
+        // would be triggered by the input/select elements but to simplify the
+        // test implementation, we trigger them directly on the form.
+        const originalTrigger = subject.$form.trigger.bind(subject.$form);
+        jest.spyOn(subject.$form, "trigger").mockImplementation((...args) => {
+          if (args[0] === "submit") {
+            subject.$form.submitHandler(
+              $.event.fix(new CustomEvent("submit", { bubbles: true, cancelable: true }))
+            );
+          } else if (args[0] === "change") {
+            subject.$form.changeHandler();
+          } else {
+            originalTrigger(...args);
+          }
+
+          jest.runAllTimers();
+        });
+      });
+
+      it("does not save the state in case there were no changes to previous state", () => {
+        subject.$form.trigger("change");
+
+        expect(window.history.pushState).not.toHaveBeenCalled();
+      });
+
+      it("saves the state after dynamic form changes", () => {
+        $("#filter_somerandomid_category_id").val(2);
+
+        subject.$form.trigger("change");
+
+        const state = {
+          "filter_somerandomid_scope_id": [
+            {
+              "text": "Scope 1",
+              "url": "picker_url_1",
+              "value": "3"
+            },
+            {
+              "text": "Scope 2",
+              "url": "picker_url_2",
+              "value": "4"
+            }
+          ]
+        };
+        const filters = {
+          "search_text_cont": "",
+          "scope_id": [3, 4],
+          "category_id": 2,
+          "state": [""]
+        };
+        expect(window.history.pushState).toHaveBeenCalledWith(...expectedPushState(state, filters));
+      });
+
+      it("saves the state after form submission through input element", () => {
+        const textInput = document.getElementById("filter_search_text_cont");
+        textInput.value = "search";
+
+        subject.$form.trigger("submit");
+
+        const state = {
+          "filter_somerandomid_scope_id": [
+            {
+              "text": "Scope 1",
+              "url": "picker_url_1",
+              "value": "3"
+            },
+            {
+              "text": "Scope 2",
+              "url": "picker_url_2",
+              "value": "4"
+            }
+          ]
+        }
+        const filters = {
+          "search_text_cont": "search",
+          "scope_id": [3, 4],
+          "category_id": 1,
+          "state": [""]
+        }
+
+        expect(window.history.pushState).toHaveBeenCalledWith(...expectedPushState(state, filters));
+      });
     });
 
     describe("onpopstate event", () => {
@@ -131,6 +265,14 @@ describe("FormFilterComponent", () => {
         expect(checked.map((input) => input.value)).toEqual(["", "accepted", "evaluating"]);
         expect(checked.filter((input) => input.indeterminate).map((input) => input.value)).toEqual([""]);
       });
+
+      it("does not save the state", () => {
+        spyOn(window.history, "pushState");
+
+        window.onpopstate({ isTrusted: true, state: scopesPickerState});
+
+        expect(window.history.pushState).not.toHaveBeenCalled();
+      });
     });
   });
 
@@ -145,8 +287,9 @@ describe("FormFilterComponent", () => {
       expect(subject.mounted).toBeFalsy();
     });
 
-    it("unbinds the form change event", () => {
+    it("unbinds the form change and submit events", () => {
       expect(subject.$form.off).toHaveBeenCalledWith("change", "input, select", subject._onFormChange);
+      expect(subject.$form.off).toHaveBeenCalledWith("submit", subject._onFormSubmit);
     });
   });
 
diff --git a/decidim-core/app/packs/src/decidim/form_filter.js b/decidim-core/app/packs/src/decidim/form_filter.js
index fa85911ae61ef..c60013a1715bc 100644
--- a/decidim-core/app/packs/src/decidim/form_filter.js
+++ b/decidim-core/app/packs/src/decidim/form_filter.js
@@ -23,6 +23,7 @@ export default class FormFilterComponent {
 
     this._updateInitialState();
     this._onFormChange = delayed(this, this._onFormChange.bind(this));
+    this._onFormSubmit = delayed(this, this._onFormSubmit.bind(this));
     this._onPopState = this._onPopState.bind(this);
 
     if (window.Decidim.PopStateHandler) {
@@ -42,6 +43,7 @@ export default class FormFilterComponent {
     if (this.mounted) {
       this.mounted = false;
       this.$form.off("change", "input, select", this._onFormChange);
+      this.$form.off("submit", this._onFormSubmit);
 
       unregisterCallback(`filters-${this.id}`)
     }
@@ -62,6 +64,7 @@ export default class FormFilterComponent {
         contentContainer = this.$form.data("remoteFill");
       }
       this.$form.on("change", "input:not([data-disable-dynamic-change]), select:not([data-disable-dynamic-change])", this._onFormChange);
+      this.$form.on("submit", this._onFormSubmit);
 
       this.currentFormRequest = null;
       this.$form.on("ajax:beforeSend", (e) => {
@@ -254,14 +257,16 @@ export default class FormFilterComponent {
 
     // Only one instance should submit the form on browser history navigation
     if (this.popStateSubmiter) {
-      Rails.fire(this.$form[0], "submit");
+      Rails.fire(this.$form[0], "submit", { from: "pop" });
     }
 
     this.changeEvents = true;
   }
 
   /**
-   * Handles the logic to update the current location after a form change event.
+   * Handles the logic to decide whether the form should be submitted or not
+   * after a form change event. The form is only submitted when changes have
+   * occurred.
    * @private
    * @returns {Void} - Returns nothing.
    */
@@ -270,7 +275,7 @@ export default class FormFilterComponent {
       return;
     }
 
-    const [newPath, newState] = this._currentStateAndPath();
+    const [newPath] = this._currentStateAndPath();
     const path = this._getLocation(false);
 
     if (newPath === path) {
@@ -278,6 +283,23 @@ export default class FormFilterComponent {
     }
 
     Rails.fire(this.$form[0], "submit");
+  }
+
+  /**
+   * Saves the current state of the search on form submit to update the search
+   * parameters to the URL and store the picker states.
+   * @private
+   * @param {jQuery.Event} ev The event that caused the form to submit.
+   * @returns {Void} - Returns nothing.
+   */
+  _onFormSubmit(ev) {
+    const eventDetail = ev.originalEvent.detail;
+    if (eventDetail && eventDetail.from === "pop") {
+      return;
+    }
+
+    const [newPath, newState] = this._currentStateAndPath();
+
     pushState(newPath, newState);
     this._saveFilters(newPath);
   }
@@ -314,7 +336,7 @@ export default class FormFilterComponent {
    * @returns {String} - Returns a unique identifier
    */
   _getUID() {
-    return `filter-form-${new Date().setUTCMilliseconds()}-${Math.floor(Math.random() * 10000000)}`;
+    return `filter-form-${new Date().getUTCMilliseconds()}-${Math.floor(Math.random() * 10000000)}`;
   }
 
   /**
diff --git a/decidim-core/app/packs/src/decidim/geocoding.js b/decidim-core/app/packs/src/decidim/geocoding.js
index db09ebdcd4a6f..ab8ce4416ce50 100644
--- a/decidim-core/app/packs/src/decidim/geocoding.js
+++ b/decidim-core/app/packs/src/decidim/geocoding.js
@@ -1,43 +1,20 @@
-import Tribute from "src/decidim/vendor/tribute"
+import AutoComplete from "src/decidim/autocomplete";
 
 $(() => {
   $("[data-decidim-geocoding]").each((_i, el) => {
     const $input = $(el);
-    const $fieldContainer = $input.parent();
 
-    $fieldContainer.addClass("has-tribute");
-
-    const tribute = new Tribute(
-      {
-        autocompleteMode: true,
-        // autocompleteSeparator: / \+ /, // See below, requires Tribute update
-        allowSpaces: true,
-        positionMenu: false,
-        replaceTextSuffix: "",
-        menuContainer: $fieldContainer.get(0),
-        noMatchTemplate: null,
-        values: (text, cb) => {
-          $input.trigger("geocoder-suggest.decidim", [text, cb]);
-        }
+    const autoComplete = new AutoComplete(el, {
+      mode: "single",
+      dataMatchKeys: ["value"],
+      dataSource: (query, callback) => {
+        $input.trigger("geocoder-suggest.decidim", [query, callback]);
       }
-    );
-
-    // Port https://github.com/zurb/tribute/pull/406
-    // This changes the autocomplete separator from space to " + " so that
-    // we can do searches such as "streetname 4" including a space. Otherwise
-    // this would do two separate searches for "streetname" and "4".
-    tribute.range.getLastWordInText = (text) => {
-      const final = text.replace(/\u00A0/g, " ");
-      const wordsArray = final.split(/ \+ /);
-      const worldsCount = wordsArray.length - 1;
-
-      return wordsArray[worldsCount].trim();
-    };
-
-    tribute.attach($input.get(0));
+    });
+    el.addEventListener("selection", autoComplete);
 
-    $input.on("tribute-replaced", function(ev) {
-      const selectedItem = ev.detail.item.original;
+    $input.on("selection", (event) => {
+      const selectedItem = event.detail.selection.value;
       $input.trigger("geocoder-suggest-select.decidim", [selectedItem]);
 
       // Not all geocoding autocomplete APIs include the coordinates in the
@@ -48,7 +25,5 @@ $(() => {
         $input.trigger("geocoder-suggest-coordinates.decidim", [selectedItem.coordinates]);
       }
     });
-
-    $input.data("geocoder-tribute", tribute);
   });
 });
diff --git a/decidim-core/app/packs/src/decidim/identity_selector_dialog.js b/decidim-core/app/packs/src/decidim/identity_selector_dialog.js
index c7fef44c0d287..60baa408f1294 100644
--- a/decidim-core/app/packs/src/decidim/identity_selector_dialog.js
+++ b/decidim-core/app/packs/src/decidim/identity_selector_dialog.js
@@ -1,6 +1,6 @@
 /**
  * Makes the #select-identity-button to open a popup for the user to
- * select with which identity he wants to perform an action.
+ * select with which identity they want to perform an action.
  *
  */
 $(() => {
diff --git a/decidim-core/app/packs/src/decidim/impersonation.js b/decidim-core/app/packs/src/decidim/impersonation.js
index 648c6bd3ca90a..12783aa74701f 100644
--- a/decidim-core/app/packs/src/decidim/impersonation.js
+++ b/decidim-core/app/packs/src/decidim/impersonation.js
@@ -1,11 +1,11 @@
-import moment from "moment"
+import dayjs from "dayjs"
 
 $(() => {
   const $impersonationWarning = $(".impersonation-warning");
   if ($impersonationWarning.length) {
-    const endsAt = moment($impersonationWarning.data("session-ends-at"));
+    const endsAt = dayjs($impersonationWarning.data("session-ends-at"));
     const exitInterval = setInterval(() => {
-      const diff = (endsAt - moment()) / 60000;
+      const diff = (endsAt - dayjs()) / 60000;
       const diffInMinutes = Math.round(diff);
       $impersonationWarning.find(".minutes").html(diffInMinutes);
 
diff --git a/decidim-core/app/packs/src/decidim/input_character_counter.js b/decidim-core/app/packs/src/decidim/input_character_counter.js
index e6a8a65cdb1c2..3eba367322b8d 100644
--- a/decidim-core/app/packs/src/decidim/input_character_counter.js
+++ b/decidim-core/app/packs/src/decidim/input_character_counter.js
@@ -1,4 +1,16 @@
+/* eslint max-lines: ["error", {"max": 350, "skipBlankLines": true}] */
+
 const COUNT_KEY = "%count%";
+// How often SR announces the message in relation to maximum characters. E.g.
+// if max characters is 1000, screen reader announces the remaining characters
+// every 100 (= 0.1 * 1000) characters. This will be "floored" to the closest
+// 100 if the maximum characters > 100. E.g. if max characters is 5500, the
+// threshold is 500 (= Math.floor(550 / 100) * 100). With 100 or less
+// characters, this ratio is omitted and the announce threshold is always set to
+// 10.
+const SR_ANNOUNCE_THRESHOLD_RATIO = 0.1;
+// The number of characters left after which every keystroke will be announced.
+const SR_ANNOUNCE_EVERY_THRESHOLD = 10;
 const DEFAULT_MESSAGES = {
   charactersAtLeast: {
     one: `at least ${COUNT_KEY} character`,
@@ -21,15 +33,35 @@ export default class InputCharacterCounter {
     this.$target = $(this.$input.data("remaining-characters"));
     this.minCharacters = parseInt(this.$input.attr("minlength"), 10);
     this.maxCharacters = parseInt(this.$input.attr("maxlength"), 10);
+    this.describeByCounter = typeof this.$input.attr("aria-describedby") === "undefined";
+
+    // Define the closest length for the input "gaps" defined by the threshold.
+    if (this.maxCharacters > 10) {
+      if (this.maxCharacters > 100) {
+        this.announceThreshold = Math.floor(this.maxCharacters * SR_ANNOUNCE_THRESHOLD_RATIO);
+      } else {
+        this.announceThreshold = 10;
+      }
 
-    if (this.$target.length < 1) {
-      let targetId = null;
+      // The number of characters left after which every keystroke will be announced.
+      this.announceEveryThreshold = SR_ANNOUNCE_EVERY_THRESHOLD;
+    } else {
+      this.announceThreshold = 1;
+      this.announceEveryThreshold = 1;
+    }
+
+    let targetId = this.$target.attr("id");
+    if (typeof targetId === "undefined") {
       if (this.$input.attr("id") && this.$input.attr("id").length > 0) {
         targetId = `${this.$input.attr("id")}_characters`;
       } else {
         targetId = `characters_${Math.random().toString(36).substr(2, 9)}`;
       }
+    }
 
+    if (this.$target.length > 0) {
+      this.$target.attr("id", targetId)
+    } else {
       this.$target = $(`<span id="${targetId}" class="form-input-extra-before" />`)
 
       // If input is a hidden for WYSIWYG editor add it at the end
@@ -49,37 +81,174 @@ export default class InputCharacterCounter {
     }
 
     if (this.$target.length > 0 && (this.maxCharacters > 0 || this.minCharacters > 0)) {
-      this.bindEvents();
+      // Create the screen reader target element. We don't want to constantly
+      // announce every change to screen reader, only occasionally.
+      this.$srTarget = $(
+        `<span role="status" id="${targetId}_sr" class="show-for-sr remaining-character-count-sr" />`
+      );
+      this.$target.before(this.$srTarget);
+      this.$target.attr("aria-hidden", "true");
+
+      this.$userInput = this.$input;
+
+      // In WYSIWYG editors (Quill) we need to find the active editor from the
+      // DOM node. Quill has the experimental "find" method that should work
+      // fine in this case
+      if (Quill && this.$input.parent().is(".editor")) {
+        // Wait until the next javascript loop so Quill editors are created
+        setTimeout(() => {
+          this.editor = Quill.find(this.$input.siblings(".editor-container")[0]);
+          this.$userInput = $(this.editor.root);
+          this.initialize();
+        });
+      } else {
+        this.initialize();
+      }
+    }
+  }
+
+  initialize() {
+    this.updateInputLength();
+    this.previousInputLength = this.inputLength;
+
+    this.bindEvents();
+    this.setDescribedBy(true);
+  }
+
+  setDescribedBy(active) {
+    if (!this.describeByCounter) {
+      return;
+    }
+
+    if (active) {
+      this.$userInput.attr("aria-describedby", this.$srTarget.attr("id"));
+    } else {
+      this.$userInput.removeAttr("aria-describedby");
     }
   }
 
   bindEvents() {
-    // In WYSIWYG editors (Quill) we need to find the active editor from the
-    // DOM node. Quill has the experimental "find" method that should work
-    // fine in this case
-    if (Quill && this.$input.parent().is(".editor")) {
-      // Wait until the next javascript loop so Quill editors are created
-      setTimeout(() => {
-        const editor = Quill.find(this.$input.siblings(".editor-container")[0]);
-        editor.on("text-change", () => {
-          this.updateStatus();
-        });
-      })
+    if (this.editor) {
+      this.editor.on("text-change", () => {
+        this.handleInput();
+      });
+    } else {
+      this.$userInput.on("input", () => {
+        this.handleInput();
+      });
     }
-    this.$input.on("keyup", () => {
+
+    this.$userInput.on("keyup", () => {
       this.updateStatus();
     });
-    if (this.$input.get(0) !== null) {
-      this.$input.get(0).addEventListener("emoji.added", () => {
+    this.$userInput.on("focus", () => {
+      this.updateScreenReaderStatus();
+    });
+    this.$userInput.on("blur", () => {
+      this.updateScreenReaderStatus();
+      this.setDescribedBy(true);
+    });
+    if (this.$userInput.get(0) !== null) {
+      this.$userInput.get(0).addEventListener("emoji.added", () => {
         this.updateStatus();
       });
     }
     this.updateStatus();
+    this.updateScreenReaderStatus();
   }
 
-  updateStatus() {
-    const numCharacters = this.$input.val().length;
+  getInputLength() {
+    return this.inputLength;
+  }
+
+  updateInputLength() {
+    this.previousInputLength = this.inputLength;
+    if (this.editor) {
+      this.inputLength = this.editor.getLength();
+    } else {
+      this.inputLength = this.$input.val().length;
+    }
+  }
+
+  handleInput() {
+    this.updateInputLength();
+    this.checkScreenReaderUpdate();
+    // If the input is "described by" the character counter, some screen
+    // readers (NVDA) announce the status twice when it is updated. By
+    // removing the aria-describedby attribute while the user is typing makes
+    // the screen reader announce the status only once.
+    this.setDescribedBy(false);
+  }
+
+  /**
+   * This compares the current inputLength to the previous value and decides
+   * whether the user is currently adding or deleting characters from the view.
+   *
+   * @returns {String} The input direction either "ins" for insert or "del" for
+   *   delete.
+   */
+  getInputDirection() {
+    if (this.inputLength < this.previousInputLength) {
+      return "del";
+    }
+
+    return "ins";
+  }
+
+  getScreenReaderLength() {
+    const currentLength = this.getInputLength();
+    if (this.maxCharacters < 10) {
+      return currentLength;
+    } else if (this.maxCharacters - currentLength <= this.announceEveryThreshold) {
+      return currentLength;
+    }
+
+    const srLength = currentLength - currentLength % this.announceThreshold;
+
+    // Prevent the screen reader telling too many characters left if the user
+    // deletes a characters. This can cause confusing experience e.g. when the
+    // user is closing the maximum amount of characters, so if the previous
+    // announcement was "10 characters left" and the user removes one character,
+    // the screen reader would announce "100 characters left" next time (when
+    // they actually have only 11 characters left). Similar when they are
+    // deleting a character at 900 characters, the screen reader would announce
+    // "1000 characters left" even when they only have 901 characters left.
+    if (this.getInputDirection() === "del") {
+      // The first branch makes sure that if the SR length matches the actual
+      // length, it will be always announced.
+      if (srLength === currentLength) {
+        return srLength;
+      // The second branch checks that if we are at the final threshold, we
+      // should not announce "0 characters left" when the user deletes more than
+      // the "announce after every stroke" limit (this.announceEveryThreshold).
+      } else if (this.maxCharacters - srLength === this.announceThreshold) {
+        return this.announcedAt || currentLength;
+      // The third branch checks that when deleting characters, we should
+      // announce the next threshold to get accurate annoucement. E.g. when we
+      // have 750 characters left and the user deletes 100 characters at once,
+      // we should announce "700 characters left" after that deletion.
+      } else if (srLength < currentLength) {
+        return srLength + this.announceThreshold;
+      }
+    // This fixes an issue in the following situation:
+    // 1. 750 characters left
+    // 2. Delete 100 characters in a row
+    // 3. SR: "800 characters left" (actual 850)
+    // 4. Type one additional character
+    // 5. Without this, SR would announce "900 characters left" = confusing
+    } else if (srLength < this.announcedAt) {
+      return this.announcedAt;
+    }
+
+    return srLength;
+  }
+
+  getMessages(currentLength = null) {
     const showMessages = [];
+    let inputLength = currentLength;
+    if (inputLength === null) {
+      inputLength = this.getInputLength()
+    }
 
     if (this.minCharacters > 0) {
       let message = MESSAGES.charactersAtLeast.other;
@@ -90,7 +259,7 @@ export default class InputCharacterCounter {
     }
 
     if (this.maxCharacters > 0) {
-      const remaining = this.maxCharacters - numCharacters;
+      const remaining = this.maxCharacters - inputLength;
       let message = MESSAGES.charactersLeft.other;
       if (remaining === 1) {
         message = MESSAGES.charactersLeft.one;
@@ -101,12 +270,36 @@ export default class InputCharacterCounter {
       showMessages.push(message.replace(COUNT_KEY, remaining));
     }
 
-    this.$target.text(showMessages.join(", "));
+    return showMessages;
+  }
+
+  updateStatus() {
+    this.$target.text(this.getMessages().join(", "));
+  }
+
+  checkScreenReaderUpdate() {
+    if (this.maxCharacters < 1) {
+      return;
+    }
+
+    const currentLength = this.getScreenReaderLength();
+    if (currentLength === this.announcedAt) {
+      return;
+    }
+
+    this.announcedAt = currentLength;
+    this.updateScreenReaderStatus(currentLength);
+  }
+
+  updateScreenReaderStatus(currentLength = null) {
+    this.$srTarget.text(this.getMessages(currentLength).join(", "));
   }
 }
 
 const createCharacterCounter = ($input) => {
-  $input.data("remaining-characters-counter", new InputCharacterCounter($input));
+  if (typeof $input !== "undefined" && $input.length) {
+    $input.data("remaining-characters-counter", new InputCharacterCounter($input));
+  }
 }
 
 $(() => {
diff --git a/decidim-core/app/packs/src/decidim/input_multiple_mentions.js b/decidim-core/app/packs/src/decidim/input_multiple_mentions.js
index 7bccc6ccd5662..defa47391e76f 100644
--- a/decidim-core/app/packs/src/decidim/input_multiple_mentions.js
+++ b/decidim-core/app/packs/src/decidim/input_multiple_mentions.js
@@ -1,5 +1,4 @@
-/* eslint no-unused-vars: 0 */
-import Tribute from "src/decidim/vendor/tribute"
+import AutoComplete from "src/decidim/autocomplete";
 
 const updateSubmitButton = ($fieldContainer, $selectedItems) => {
   const $form = $fieldContainer.closest("form");
@@ -16,200 +15,101 @@ const updateSubmitButton = ($fieldContainer, $selectedItems) => {
 }
 
 $(() => {
-  const $multipleMentionContainer = $(".js-multiple-mentions");
-  const $multipleMentionRecipientsContainer = $(".js-multiple-mentions-recipients");
-  const nodatafound = $multipleMentionContainer.attr("data-noresults");
-  const directMessageDisabled = $multipleMentionContainer.attr("data-direct-messages-disabled");
-
-  const maxRecipients = 9;
-  let mentionsCount = 0;
-
-  /* eslint no-unused-vars: 0 */
-  let deleteRecipient = function(element) {
-    // Remove recipient
-    element.remove();
-    mentionsCount -= 1;
-    // In case mentions container disable, enable again
-    if ($multipleMentionContainer.prop("disabled")) {
-      $multipleMentionContainer.prop("disabled", false);
-    }
-  };
-
-  let noMatchTemplate = null
-  if (nodatafound) {
-    noMatchTemplate = () => `<li>${nodatafound}</li>`;
+  const $fieldContainer = $(".multiple-mentions");
+  if ($fieldContainer.length < 1) {
+    return;
   }
 
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds
-  /* eslint no-invalid-this: 0 */
-  /* eslint consistent-this: 0 */
-  /* eslint prefer-reflect: 0 */
-  const debounce = function(callback, wait) {
-    let timeout = null;
-    return (...args) => {
-      const context = this;
-      clearTimeout(timeout);
-      timeout = setTimeout(() => callback.apply(context, args), wait);
-    };
+  const allMessages = window.Decidim.config.get("messages");
+  const messages = allMessages.mentionsModal || {};
+
+  const $searchInput = $("input", $fieldContainer);
+  const $selectedItems = $(`ul.${$searchInput.data().selected}`);
+  const options = $fieldContainer.data();
+  let selected = [];
+  const iconsPath = window.Decidim.config.get("icons_path");
+  const removeLabel = messages.removeRecipient || "Remove recipient %name%";
+
+  let emptyFocusElement = $fieldContainer[0].querySelector(".empty-list");
+  if (!emptyFocusElement) {
+    emptyFocusElement = document.createElement("div");
+    emptyFocusElement.tabIndex = "-1";
+    emptyFocusElement.className = "empty-list";
+    $selectedItems.before(emptyFocusElement);
   }
 
-  /* eslint no-use-before-define: ["error", { "variables": false }]*/
-  /* eslint no-unused-expressions: 0 */
-  let remoteSearch = function(text, cb) {
-    let exclusionIds = [];
-    $multipleMentionRecipientsContainer.find("input[name^='recipient_id']").each(function(index) {
-      exclusionIds.push($(this).val());
-    });
-    let query = `{users(filter:{wildcard:"${text}",excludeIds:[${exclusionIds}]}){id,nickname,name,avatarUrl,__typename,...on UserGroup{membersCount},...on User{directMessagesEnabled}}}`;
-    $.post("/api", {query: query}).
-      then((response) => {
-        let data = response.data.users || {};
-        cb(data)
-      }).fail(function() {
-        cb([])
-      }).always(() => {
-      // This function runs Tribute every single time you type something
-      // So we must evalute DOM properties after each
-        const $parent = $(tribute.current.element).parent();
-        $parent.addClass("is-active");
-
-        // We need to move the container to the wrapper selected
-        const $tribute = $parent.find(".tribute-container");
-        // Remove the inline styles, relative to absolute positioning
-        $tribute.removeAttr("style");
-      })
-  };
-
-  // tribute.js docs - http://github.com/zurb/tribute
-  /* global Tribute*/
-  /* eslint multiline-ternary: 0 */
-  /* eslint no-ternary: 0 */
-  let tribute = new Tribute({
-    autocompleteMode: true,
-    // avoid overloading the API if the user types too fast
-    values: debounce(function (text, cb) {
-      remoteSearch(text, (users) => cb(users));
-    }, 250),
-    positionMenu: true,
-    menuContainer: null,
-    menuItemLimit: 10,
-    fillAttr: "nickname",
-    noMatchTemplate: noMatchTemplate,
-    lookup: (item) => item.nickname + item.name,
-    selectTemplate: function(item) {
-      mentionsCount += 1;
-      if (mentionsCount >= maxRecipients) {
-        $multipleMentionContainer.prop("disabled", true);
-      }
-      if (typeof item === "undefined") {
-        return null;
-      }
-      // Set recipient profile view
-      let recipientLabel = `
-        <label style="padding: 0 0 10px 0">
-          <img src="${item.original.avatarUrl}" alt="${item.original.name}" height="35" width="35" style="border-radius: 50%;" aria-label="${item.original.name}">&nbsp;
-          <b>${item.original.name}</b>
-          <input type="hidden" name="recipient_id[]" value="${item.original.id}">
-          <div class="float-right">&times;</div>
-        </label>
-      `;
-
-      // Append new recipient to DOM
-      if (item.original.__typename === "UserGroup" || item.original.directMessagesEnabled === "true") {
-        $multipleMentionRecipientsContainer.append($(recipientLabel));
-        $multipleMentionContainer.val("");
-      }
-
-      // In order to add tabindex accessibility control to each recipient in list
-      $multipleMentionRecipientsContainer.find("label").each(function(index) {
-        $(this).find("div").attr("tabIndex", 0).attr("aria-controls", 0).attr("aria-label", "Close").attr("role", "tab");
+  updateSubmitButton($fieldContainer, $selectedItems);
+  const autoComplete = new AutoComplete($searchInput[0], {
+    dataMatchKeys: ["name", "nickname"],
+    dataSource: (query, callback) => {
+      $.post("/api", {
+        "query": `
+          {
+            users(filter:{wildcard:"${query}",excludeIds:[]})
+              {
+                id,nickname,name,avatarUrl,__typename,...on UserGroup{membersCount},...on User{
+                  directMessagesEnabled
+                }
+              }
+          }`
+      }).then((response) => {
+        callback(response.data.users);
       });
-
-      updateSubmitButton($multipleMentionContainer, $multipleMentionRecipientsContainer);
-      // Clean input
-      return "";
     },
-    menuItemTemplate: function(item) {
-      let svg = "";
-      let enabled = item.original.directMessagesEnabled === "true";
-      if (window.Decidim && item.original.__typename === "UserGroup") {
-        enabled = true;
-        const iconsPath = window.Decidim.config.get("icons_path");
-        svg = `<span class="is-group">${item.original.membersCount}x <svg class="icon--members icon"><use href="${iconsPath}#icon-members"/></svg></span>`;
+    dataFilter: (list) => {
+      return list.filter(
+        (item) => !selected.includes(item.value.id)
+      );
+    },
+    modifyResult: (element, value) => {
+      $(element).html(`
+        <span class="author__avatar"><img src="${value.avatarUrl}" alt="${value.name}"></span>
+        <strong>${value.nickname}</strong>
+        <small>${value.name}</small>
+      `);
+      if (value.directMessagesEnabled === "false") {
+        $(element).addClass("disabled");
+        $(element).append(`<span>${$searchInput.data().directMessagesDisabled}</span>`);
+      }
+      if (value.membersCount) {
+        $(element).append(`<span class="is-group">${value.membersCount}x <svg class="icon--members icon"><use href="${iconsPath}#icon-members"/></svg></span>`);
       }
-      let disabledElementClass = enabled ? "" : "disabled-tribute-element";
-      let disabledElementMessage = enabled ? "" : `&nbsp;<span class="disabled-tribute-element-info">${directMessageDisabled}</span>`;
-      return `<div class="tribute-item ${item.original.__typename} ${disabledElementClass}">
-      <span class="author__avatar"><img src="${item.original.avatarUrl}" alt="author-avatar"></span>
-        <strong>${item.original.nickname}</strong>
-        <small>${item.original.name}</small>
-        ${svg}
-        ${disabledElementMessage}
-      </div>`;
     }
   });
 
-  let setupEvents = function($element) {
-    updateSubmitButton($multipleMentionContainer, $multipleMentionRecipientsContainer);
-
-    // DOM manipulation
-    $element.on("focusin", (event) => {
-      // Set the parent container relative to the current element
-      tribute.menuContainer = event.target.parentNode;
-    });
-    $element.on("focusout", (event) => {
-      let $parent = $(event.target).parent();
-
-      if ($parent.hasClass("is-active")) {
-        $parent.removeClass("is-active");
-      }
-    });
-    $element.on("input", (event) => {
-      let $parent = $(event.target).parent();
-
-      if (tribute.isActive) {
-        // We need to move the container to the wrapper selected
-        let $tribute = $(".tribute-container");
-        $tribute.appendTo($parent);
-        // Remove the inline styles, relative to absolute positioning
-        $tribute.removeAttr("style");
-        // Parent adaptation
-        $parent.addClass("is-active");
-      } else {
-        $parent.removeClass("is-active");
-      }
-    });
-  };
+  $searchInput.on("selection", (event) => {
+    const feedback = event.detail;
+    const selection = feedback.selection;
+    const id = selection.value.id;
+    if (selected.length >= 9 || selection.value.directMessagesEnabled === "false") {
+      return;
+    }
 
-  let setupRecipientEvents = function($element) {
-    // Allow delete with click on element in recipients list
-    $element.on("click", (event) => {
-      let $target = event.target.parentNode;
-      if ($target.tagName === "LABEL") {
-        deleteRecipient($target);
-        updateSubmitButton($multipleMentionContainer, $multipleMentionRecipientsContainer);
-      }
-    });
-    // Allow delete with keypress on element in recipients list
-    $element.on("keypress", (event) => {
-      let $target = event.target.parentNode;
-      if ($target.tagName === "LABEL") {
-        deleteRecipient($target);
-        updateSubmitButton($multipleMentionContainer, $multipleMentionRecipientsContainer);
+    const label = removeLabel.replace("%name%", selection.value.name);
+    $selectedItems.append(`
+      <li tabindex="-1">
+        <input type="hidden" name="${options.name}" value="${id}">
+        <img src="${selection.value.avatarUrl}" class="author__avatar" alt="${selection.value.name}">
+        <b>${selection.value.name}</b>
+        <button type="button" class="float-right" data-remove="${id}" tabindex="0" aria-controls="0" aria-label="${label}">&times;</button>
+      </li>
+    `);
+
+    autoComplete.setInput("");
+    selected.push(id);
+    updateSubmitButton($fieldContainer, $selectedItems);
+
+    $selectedItems.find(`*[data-remove="${id}"]`).on("keypress click", (evt) => {
+      const target = evt.target.parentNode;
+      if (target.tagName === "LI") {
+        const focusElement = target.nextElementSibling || target.previousElementSibling || emptyFocusElement;
+
+        selected = selected.filter((identifier) => identifier !== id);
+        target.remove();
+
+        updateSubmitButton($fieldContainer, $selectedItems);
+        focusElement.focus();
       }
-    });
-  };
-
-  // Call only if we have containter to bind events to
-  if ($multipleMentionContainer.length) {
-    setupEvents($multipleMentionContainer);
-    tribute.attach($multipleMentionContainer);
-  }
-
-  // Call only if we have containter to bind events to
-  if ($multipleMentionRecipientsContainer.length) {
-    setupRecipientEvents($multipleMentionRecipientsContainer);
-  }
-});
+    })
+  })
+})
diff --git a/decidim-core/app/packs/src/decidim/map/icon.js b/decidim-core/app/packs/src/decidim/map/icon.js
index ad4ce1d9ff57d..969c4d8b98432 100644
--- a/decidim-core/app/packs/src/decidim/map/icon.js
+++ b/decidim-core/app/packs/src/decidim/map/icon.js
@@ -1,10 +1,11 @@
 import * as L from "leaflet";
-import { SVGIcon } from "leaflet-svgicon"
+import { SVGIcon } from "src/decidim/map/svg-icon";
 
 L.DivIcon.SVGIcon = SVGIcon;
 L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
   options: {
     fillColor: "#ef604d",
+    fillOpacity: 1,
     opacity: 0
   },
   _createPathDescription: function() {
diff --git a/decidim-core/app/packs/src/decidim/map/svg-icon.js b/decidim-core/app/packs/src/decidim/map/svg-icon.js
new file mode 100644
index 0000000000000..eccf6fc288d47
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/map/svg-icon.js
@@ -0,0 +1,248 @@
+/* eslint prefer-reflect: 0 */
+
+// Leaflet-SVGIcon
+// SVG icon for any marker class
+//
+// Copyright (c) 2016 University of New Hampshire - The MIT License
+// Author: Ilya Atkin <ilya.atkin@unh.edu>
+// Originally copied from https://github.com/iatkin/leaflet-svgicon
+//
+
+let SVGIcon = L.DivIcon.extend({
+  options: {
+    "circleText": "",
+    "className": "svg-icon",
+    // defaults to [iconSize.x/2, iconSize.x/2]
+    "circleAnchor": null,
+    // defaults to color
+    "circleColor": null,
+    // defaults to opacity
+    "circleOpacity": null,
+    "circleFillColor": "rgb(255,255,255)",
+    // default to opacity
+    "circleFillOpacity": null,
+    "circleRatio": 0.5,
+    // defaults to weight
+    "circleWeight": null,
+    "color": "rgb(0,102,255)",
+    // defaults to color
+    "fillColor": null,
+    "fillOpacity": 0.4,
+    "fontColor": "rgb(0, 0, 0)",
+    "fontOpacity": "1",
+    // defaults to iconSize.x/4
+    "fontSize": null,
+    "fontWeight": "normal",
+    // defaults to [iconSize.x/2, iconSize.y] (point tip)
+    "iconAnchor": null,
+    "iconSize": L.point(32, 48),
+    "opacity": 1,
+    "popupAnchor": null,
+    "shadowAngle": 45,
+    "shadowBlur": 1,
+    "shadowColor": "rgb(0,0,10)",
+    "shadowEnable": false,
+    "shadowLength": 0.75,
+    "shadowOpacity": 0.5,
+    "shadowTranslate": L.point(0, 0),
+    "weight": 2
+  },
+  initialize: function(_options) {
+    let options = L.Util.setOptions(this, _options)
+
+    // iconSize needs to be converted to a Point object if it is not passed as one
+    options.iconSize = L.point(options.iconSize)
+
+    // in addition to setting option dependant defaults, Point-based options are converted to Point objects
+    if (options.circleAnchor) {
+      options.circleAnchor = L.point(options.circleAnchor)
+    } else {
+      options.circleAnchor = L.point(Number(options.iconSize.x) / 2, Number(options.iconSize.x) / 2)
+    }
+    if (!options.circleColor) {
+      options.circleColor = options.color
+    }
+    if (!options.circleFillOpacity) {
+      options.circleFillOpacity = options.opacity
+    }
+    if (!options.circleOpacity) {
+      options.circleOpacity = options.opacity
+    }
+    if (!options.circleWeight) {
+      options.circleWeight = options.weight
+    }
+    if (!options.fillColor) {
+      options.fillColor = options.color
+    }
+    if (!options.fontSize) {
+      options.fontSize = Number(options.iconSize.x / 4)
+    }
+    if (options.iconAnchor) {
+      options.iconAnchor = L.point(options.iconAnchor)
+    }
+    else {
+      options.iconAnchor = L.point(Number(options.iconSize.x) / 2, Number(options.iconSize.y))
+    }
+    if (options.popupAnchor) {
+      options.popupAnchor = L.point(options.popupAnchor)
+    }
+    else {
+      options.popupAnchor = L.point(0, (-0.75) * (options.iconSize.y))
+    }
+
+    options.html = this._createSVG()
+  },
+  _createCircle: function() {
+    let cx = Number(this.options.circleAnchor.x)
+    let cy = Number(this.options.circleAnchor.y)
+    let radius = this.options.iconSize.x / 2 * Number(this.options.circleRatio)
+    let fill = this.options.circleFillColor
+    let fillOpacity = this.options.circleFillOpacity
+    let stroke = this.options.circleColor
+    let strokeOpacity = this.options.circleOpacity
+    let strokeWidth = this.options.circleWeight
+    let className = `${this.options.className}-circle`
+
+    let circle = `<circle class="${className}" cx="${cx}" cy="${cy}" r="${radius
+    }" fill="${fill}" fill-opacity="${fillOpacity
+    }" stroke="${stroke}" stroke-opacity=${strokeOpacity}" stroke-width="${strokeWidth}"/>`
+
+    return circle
+  },
+  _createPathDescription: function() {
+    let height = Number(this.options.iconSize.y)
+    let width = Number(this.options.iconSize.x)
+    let weight = Number(this.options.weight)
+    let margin = weight / 2
+
+    let startPoint = `M ${margin} ${width / 2} `
+    let leftLine = `L ${width / 2} ${height - weight} `
+    let rightLine = `L ${width - margin} ${width / 2} `
+    let arc = `A ${width / 4} ${width / 4} 0 0 0 ${margin} ${width / 2} Z`
+
+    let description = startPoint + leftLine + rightLine + arc
+
+    return description
+  },
+  _createPath: function() {
+    let pathDescription = this._createPathDescription()
+    let strokeWidth = this.options.weight
+    let stroke = this.options.color
+    let strokeOpacity = this.options.opacity
+    let fill = this.options.fillColor
+    let fillOpacity = this.options.fillOpacity
+    let className = `${this.options.className}-path`
+
+    let path = `<path class="${className}" d="${pathDescription
+    }" stroke-width="${strokeWidth}" stroke="${stroke}" stroke-opacity="${strokeOpacity
+    }" fill="${fill}" fill-opacity="${fillOpacity}"/>`
+
+    return path
+  },
+  _createShadow: function() {
+    let pathDescription = this._createPathDescription()
+    let strokeWidth = this.options.weight
+    let stroke = this.options.shadowColor
+    let fill = this.options.shadowColor
+    let className = `${this.options.className}-shadow`
+
+    let origin = `${this.options.iconSize.x / 2}px ${this.options.iconSize.y}px`
+    let rotation = this.options.shadowAngle
+    let height = this.options.shadowLength
+    let opacity = this.options.shadowOpacity
+    let blur = this.options.shadowBlur
+    let translate = `${this.options.shadowTranslate.x}px, ${this.options.shadowTranslate.y}px`
+
+    let blurFilter = `<filter id='iconShadowBlur'><feGaussianBlur in='SourceGraphic' stdDeviation='${blur}'/></filter>`
+
+    let shadow = `<path filter="url(#iconShadowBlur") class="${className}" d="${pathDescription}" fill="${fill}" stroke-width="${strokeWidth}" stroke="${stroke}" style="opacity: ${opacity}; transform-origin: ${origin}; transform: rotate(${rotation}deg) translate(${translate}) scale(1, ${height})" />`
+
+    return blurFilter + shadow
+  },
+  _createSVG: function() {
+    let path = this._createPath()
+    let circle = this._createCircle()
+    let text = this._createText()
+    let shadow = ""
+    if (this.options.shadowEnable) {
+      shadow = this._createShadow()
+    }
+
+    let className = `${this.options.className}-svg`
+    let width = this.options.iconSize.x
+    let height = this.options.iconSize.y
+
+    if (this.options.shadowEnable) {
+      width += this.options.iconSize.y * this.options.shadowLength - (this.options.iconSize.x / 2)
+      width = Math.max(width, 32)
+      height += this.options.iconSize.y * this.options.shadowLength
+    }
+
+    let style = `width:${width}px; height:${height}`
+    let svg = `<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="${className}" style="${style}">${shadow}${path}${circle}${text}</svg>`
+
+    return svg
+  },
+  _createText: function() {
+    let fontSize = `${this.options.fontSize}px`
+    let fontWeight = this.options.fontWeight
+    let lineHeight = Number(this.options.fontSize)
+
+    let coordX = this.options.circleAnchor.x
+    // 35% was found experimentally
+    let coordY = this.options.circleAnchor.y + (lineHeight * 0.35)
+    let circleText = this.options.circleText
+    let textColor = this.options.fontColor.replace("rgb(", "rgba(").replace(")", `,${this.options.fontOpacity})`)
+
+    let text = `<text text-anchor="middle" x="${coordX}" y="${coordY}" style="font-size: ${fontSize}; font-weight: ${fontWeight}" fill="${textColor}">${circleText}</text>`
+
+    return text
+  }
+})
+
+let SVGMarker = L.Marker.extend({
+  options: {
+    "iconFactory": L.divIcon.svgIcon,
+    "iconOptions": {}
+  },
+  initialize: function(latlng, _options) {
+    let options = L.Util.setOptions(this, _options)
+    options.icon = options.iconFactory(options.iconOptions)
+    this._latlng = latlng
+  },
+  onAdd: function(map) {
+    L.Marker.prototype.onAdd.call(this, map)
+  },
+  setStyle: function(style) {
+    if (this._icon) {
+      //      let svg = this._icon.children[0]
+      let iconBody = this._icon.children[0].children[0]
+      let iconCircle = this._icon.children[0].children[1]
+
+      if (style.color && !style.iconOptions) {
+        let stroke = style.color.replace("rgb", "rgba").replace(")", `,${this.options.icon.options.opacity})`)
+        let fill = style.color.replace("rgb", "rgba").replace(")", `,${this.options.icon.options.fillOpacity})`)
+        iconBody.setAttribute("stroke", stroke)
+        iconBody.setAttribute("fill", fill)
+        iconCircle.setAttribute("stroke", stroke)
+
+        this.options.icon.fillColor = fill
+        this.options.icon.color = stroke
+        this.options.icon.circleColor = stroke
+      }
+      if (style.opacity) {
+        this.setOpacity(style.opacity)
+      }
+      if (style.iconOptions) {
+        if (style.color) {
+          style.iconOptions.color = style.color
+        }
+        let iconOptions = L.Util.setOptions(this.options.icon, style.iconOptions)
+        this.setIcon(L.divIcon.svgIcon(iconOptions))
+      }
+    }
+  }
+});
+
+export { SVGMarker, SVGIcon }
+
diff --git a/decidim-core/app/packs/src/decidim/security/selfxss_warning.js b/decidim-core/app/packs/src/decidim/security/selfxss_warning.js
index 8e49d2b5ee19a..7f2ff6d5565d7 100644
--- a/decidim-core/app/packs/src/decidim/security/selfxss_warning.js
+++ b/decidim-core/app/packs/src/decidim/security/selfxss_warning.js
@@ -1,10 +1,14 @@
-/* eslint-disable no-console */
+/* eslint-disable no-console, no-process-env, no-undef */
 
 $(() => {
   if (!console) {
     return;
   }
 
+  if (process.env.NODE_ENV === "development") {
+    return;
+  }
+
   const allMessages = window.Decidim.config.get("messages");
   if (!allMessages) {
     return;
diff --git a/decidim-core/app/packs/src/decidim/session_timeouter.js b/decidim-core/app/packs/src/decidim/session_timeouter.js
index a5630e0f585e8..d39f906a68e86 100644
--- a/decidim-core/app/packs/src/decidim/session_timeouter.js
+++ b/decidim-core/app/packs/src/decidim/session_timeouter.js
@@ -1,4 +1,4 @@
-import moment from "moment"
+import dayjs from "dayjs"
 
 $(() => {
   let sessionTimeOutEnabled = true;
@@ -8,20 +8,20 @@ $(() => {
   const heartbeatPath = $timeoutModal.data("heartbeat-path");
   const interval = parseInt($timeoutModal.data("session-timeout-interval"), 10);
   const preventTimeOutSeconds = $timeoutModal.data("prevent-timeout-seconds");
-  let endsAt = moment().add(timeoutInSeconds, "seconds");
-  let lastAction = moment();
+  let endsAt = dayjs().add(timeoutInSeconds, "seconds");
+  let lastAction = dayjs();
   const $continueSessionButton = $("#continueSession");
-  let lastActivityCheck = moment();
+  let lastActivityCheck = dayjs();
   // 5 * 60 seconds = 5 Minutes
   const activityCheckInterval = 5 * 60;
-  const preventTimeOutUntil = moment().add(preventTimeOutSeconds, "seconds");
+  const preventTimeOutUntil = dayjs().add(preventTimeOutSeconds, "seconds");
 
   // Ajax request is made at timeout_modal.html.erb
   $continueSessionButton.on("click", () => {
     $timeoutModal.foundation("close");
     // In admin panel we have to hide all overlays
     $(".reveal-overlay").css("display", "none");
-    lastActivityCheck = moment();
+    lastActivityCheck = dayjs();
   })
 
   if (isNaN(interval)) {
@@ -43,7 +43,7 @@ $(() => {
     if (!secondsUntilExpiration) {
       return;
     }
-    endsAt = moment().add(secondsUntilExpiration, "seconds");
+    endsAt = dayjs().add(secondsUntilExpiration, "seconds");
   }
 
   const sessionTimeLeft = () => {
@@ -66,27 +66,27 @@ $(() => {
   }
 
   const userBeenActiveSince = (seconds) => {
-    return (moment() - lastAction) / 1000 < seconds;
+    return (dayjs() - lastAction) / 1000 < seconds;
   }
 
   const exitInterval = setInterval(() => {
-    const timeSinceLastActivityCheckInSeconds = Math.round((moment() - lastActivityCheck) / 1000);
+    const timeSinceLastActivityCheckInSeconds = Math.round((dayjs() - lastActivityCheck) / 1000);
 
     const popupOpen = $("#timeoutModal").parent().css("display") === "block";
     if (!popupOpen && timeSinceLastActivityCheckInSeconds >= activityCheckInterval) {
-      lastActivityCheck = moment();
+      lastActivityCheck = dayjs();
       if (userBeenActiveSince(activityCheckInterval)) {
         heartbeat();
         return;
       }
     }
 
-    const timeRemaining = Math.round((endsAt - moment()) / 1000);
+    const timeRemaining = Math.round((endsAt - dayjs()) / 1000);
     if (timeRemaining > 170) {
       return;
     }
 
-    if (moment() < preventTimeOutUntil) {
+    if (dayjs() < preventTimeOutUntil) {
       heartbeat();
       return;
     }
@@ -106,13 +106,13 @@ $(() => {
   }, interval);
 
   $(document).mousemove(() => {
-    lastAction = moment();
+    lastAction = dayjs();
   })
   $(document).scroll(() => {
-    lastAction = moment();
+    lastAction = dayjs();
   })
   $(document).keypress(() => {
-    lastAction = moment();
+    lastAction = dayjs();
   })
 
   // Devise restarts its own timer on ajax requests,
diff --git a/decidim-core/app/packs/src/decidim/sw/a2hs.js b/decidim-core/app/packs/src/decidim/sw/a2hs.js
new file mode 100644
index 0000000000000..7943e6d49a7a3
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/sw/a2hs.js
@@ -0,0 +1,37 @@
+const visitedPages = JSON.parse(sessionStorage.getItem("visitedPages")) || []
+const DELAYED_VISITS = 2
+let deferredPrompt = null
+
+const shouldCountVisitedPages = () => sessionStorage.getItem("userChoice") !== "dismissed" && visitedPages.length < DELAYED_VISITS && !visitedPages.includes(location.pathname)
+const shouldPrompt = () => {
+  // Disable the application install prompt showing constantly.
+  if (localStorage.getItem("pwaInstallPromptSeen")) {
+    return false
+  }
+
+  return deferredPrompt && sessionStorage.getItem("userChoice") !== "dismissed" && visitedPages.length >= DELAYED_VISITS
+}
+
+window.addEventListener("beforeinstallprompt", (event) => {
+  event.preventDefault()
+  deferredPrompt = event
+
+  // allow the user browse through different locations before prompt them anything
+  if (shouldCountVisitedPages()) {
+    sessionStorage.setItem("visitedPages", JSON.stringify([...visitedPages, location.pathname]))
+  }
+});
+
+// to trigger the prompt, it must be a "user gesture"
+window.addEventListener("click", async (event) => {
+  if (shouldPrompt()) {
+    event.preventDefault()
+    deferredPrompt.prompt()
+
+    const { outcome } = await deferredPrompt.userChoice;
+    // store the user choice to avoid asking again in the current session
+    sessionStorage.setItem("userChoice", outcome)
+    sessionStorage.removeItem("visitedPages")
+    localStorage.setItem("pwaInstallPromptSeen", true)
+  }
+});
diff --git a/decidim-core/app/packs/src/decidim/sw/index.js b/decidim-core/app/packs/src/decidim/sw/index.js
new file mode 100644
index 0000000000000..a4f0468983af0
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/sw/index.js
@@ -0,0 +1,3 @@
+import "./loader"
+import "./a2hs"
+import "./push-permissions"
diff --git a/decidim-core/app/packs/src/decidim/sw/loader.js b/decidim-core/app/packs/src/decidim/sw/loader.js
new file mode 100644
index 0000000000000..401bea9def5fc
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/sw/loader.js
@@ -0,0 +1,18 @@
+// check if the browser supports serviceWorker at all
+window.addEventListener("load", async () => {
+  if ("serviceWorker" in navigator) {
+    await navigator.serviceWorker.register("/sw.js", { scope: "/" });
+
+    const mandatoryElements = document.querySelector(".js-sw-mandatory");
+    // Opera uses Opera for versions <= 12 and OPR for versions > 12
+    const isOperaMini =
+      ((navigator.userAgent.indexOf("OPR") > -1) || (navigator.userAgent.indexOf("Opera") > -1)) &&
+      (navigator.userAgent.indexOf("Mini") > -1);
+
+    if (mandatoryElements && isOperaMini) {
+      mandatoryElements.classList.add("hide")
+    }
+  } else {
+    console.log("Your browser doesn't support service workers 🤷�♀�");
+  }
+});
diff --git a/decidim-core/app/packs/src/decidim/sw/push-permissions.js b/decidim-core/app/packs/src/decidim/sw/push-permissions.js
new file mode 100644
index 0000000000000..c235a2ae2b14b
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/sw/push-permissions.js
@@ -0,0 +1,87 @@
+window.addEventListener("DOMContentLoaded", async () => {
+  const GRANTED_PERMISSION = "granted"
+
+  const hideReminder = function() {
+    const reminder = document.querySelector("#push-notifications-reminder")
+    reminder.classList.add("hide")
+  }
+
+  const subscribeToNotifications = async (registration) => {
+    const permission = await window.Notification.requestPermission();
+
+    if (registration && permission === GRANTED_PERMISSION) {
+      const vapidElement = document.querySelector("#vapidPublicKey")
+      // element could not exist in DOM
+      if (vapidElement) {
+        const vapidPublicKeyElement = JSON.parse(vapidElement.value)
+        const subscription = await registration.pushManager.subscribe({
+          userVisibleOnly: true,
+          applicationServerKey: new Uint8Array(vapidPublicKeyElement)
+        });
+
+        if (subscription) {
+          await fetch("/notifications_subscriptions", {
+            headers: {
+              "Content-Type": "application/json",
+              "X-CSRF-Token": document.querySelector("meta[name=csrf-token]")?.content
+            },
+            method: "POST",
+            body: JSON.stringify(subscription)
+          });
+        }
+      }
+      hideReminder()
+    } else {
+      throw new Error("Permission not granted for Notification");
+    }
+  }
+
+  const unsubscribeFromNotifications = async (registration) => {
+    /* eslint-disable no-shadow */
+    const currentSubscription = await registration.pushManager.getSubscription()
+    const auth = currentSubscription.toJSON().keys.auth
+    await fetch(`/notifications_subscriptions/${auth}`, {
+      headers: {
+        "Content-Type": "application/json",
+        "X-CSRF-Token": document.querySelector("meta[name=csrf-token]")?.content
+      },
+      method: "DELETE"
+    });
+  }
+
+  const setToggleState = async (registration, toggle) => {
+    const currentSubscription = await registration.pushManager.getSubscription()
+    let toggleChecked = false
+
+    if (window.Notification.permission === GRANTED_PERMISSION) {
+      hideReminder()
+      if (currentSubscription) {
+        const auth = currentSubscription.toJSON().keys.auth
+        const subKeys = JSON.parse(document.querySelector("#subKeys").value)
+        // Subscribed && browser notifications enabled
+        if (subKeys.includes(auth)) {
+          toggleChecked = true
+        }
+      }
+    }
+    toggle.checked = toggleChecked
+  }
+
+  if ("serviceWorker" in navigator) {
+    const toggle = document.getElementById("allow_push_notifications")
+
+    if (toggle) {
+      const registration = await navigator.serviceWorker.ready
+
+      setToggleState(registration, toggle)
+
+      toggle.addEventListener("change", async ({ target }) => {
+        if (target.checked) {
+          await subscribeToNotifications(registration);
+        } else {
+          await unsubscribeFromNotifications(registration)
+        }
+      })
+    }
+  }
+});
diff --git a/decidim-core/app/packs/src/decidim/sw/sw.js b/decidim-core/app/packs/src/decidim/sw/sw.js
new file mode 100644
index 0000000000000..9f65edf964b36
--- /dev/null
+++ b/decidim-core/app/packs/src/decidim/sw/sw.js
@@ -0,0 +1,80 @@
+import {
+  imageCache,
+  staticResourceCache,
+  offlineFallback
+} from "workbox-recipes";
+import { registerRoute } from "workbox-routing";
+import { NetworkFirst, NetworkOnly } from "workbox-strategies";
+import { CacheableResponsePlugin } from "workbox-cacheable-response";
+import { ExpirationPlugin } from "workbox-expiration";
+
+
+// https://developers.google.com/web/tools/workbox/guides/troubleshoot-and-debug#debugging_workbox
+self.__WB_DISABLE_DEV_LOGS = true
+
+/**
+ * This is a workaround to bypass a webpack compilation error
+ *
+ * The InjectManifest function requires the __WB_MANIFEST somewhere in this file,
+ * however, we cannot add precacheAndRoute as the issue suggests,
+ * as the other workbox-recipes won't work properly
+ *
+ * See more: https://github.com/GoogleChrome/workbox/issues/2519#issuecomment-634164566
+ */
+// eslint-disable-next-line no-unused-vars
+const dummy = self.__WB_MANIFEST;
+
+self.addEventListener("push", (event) => {
+  const { title, ...opts } = event.data.json();
+  event.waitUntil(self.registration.showNotification(title, { ...opts }));
+});
+
+// Event handler for click on the notification event
+self.addEventListener("notificationclick", (event) => {
+  event.notification.close();
+  // Get all the Window clients
+  event.waitUntil(
+    self.clients.matchAll({ type: "window" }).then((clientsArr) => {
+      const windowToFocus = clientsArr.find((windowClient) => windowClient.url === event.notification.data.url);
+      if (windowToFocus) {
+        // If a Window tab matching the targeted URL already exists, focus that
+        windowToFocus.focus()
+      } else {
+        // Otherwise, open a new tab to the applicable URL and focus it
+        self.clients.
+          openWindow(event.notification.data.url).
+          then((windowClient) => windowClient && windowClient.focus());
+      }
+    })
+  );
+});
+
+// avoid caching admin or users paths
+registerRoute(
+  ({ url }) => ["/admin/", "/users/"].some((path) => url.pathname.startsWith(path)),
+  new NetworkOnly()
+);
+
+// https://developers.google.com/web/tools/workbox/modules/workbox-recipes#pattern_3
+registerRoute(
+  ({ request }) => request.mode === "navigate",
+  new NetworkFirst({
+    networkTimeoutSeconds: 3,
+    cacheName: "pages",
+    plugins: [
+      new CacheableResponsePlugin({
+        statuses: [0, 200]
+      }),
+      new ExpirationPlugin({
+        maxAgeSeconds: 60 * 60
+      })
+    ]
+  }),
+);
+
+// common recipes
+staticResourceCache();
+
+imageCache();
+
+offlineFallback({ pageFallback: "/offline" });
diff --git a/decidim-core/app/packs/src/decidim/vizzs.js b/decidim-core/app/packs/src/decidim/vizzs.js
deleted file mode 100644
index 4f1a3c9be9dc4..0000000000000
--- a/decidim-core/app/packs/src/decidim/vizzs.js
+++ /dev/null
@@ -1 +0,0 @@
-import "src/decidim/vizzs/metrics"
diff --git a/decidim-core/app/packs/src/decidim/vizzs/areachart.js b/decidim-core/app/packs/src/decidim/vizzs/areachart.js
index ac944908c0517..f09eb96734158 100644
--- a/decidim-core/app/packs/src/decidim/vizzs/areachart.js
+++ b/decidim-core/app/packs/src/decidim/vizzs/areachart.js
@@ -1,10 +1,15 @@
-/* global d3 */
 /* eslint-disable require-jsdoc, id-length, no-undefined, no-unused-vars, multiline-ternary, no-ternary, no-nested-ternary, no-invalid-this */
 /* eslint prefer-reflect: ["error", { "exceptions": ["call"] }] */
 /* eslint dot-location: ["error", "property"] */
 /* eslint no-unused-vars: 0 */
 
-import * as d3 from "d3";
+import { select, mouse } from "d3-selection";
+import { min, max, extent, ascending, bisector } from "d3-array";
+import { scaleTime, scaleLinear } from "d3-scale";
+import { axisLeft, axisBottom } from "d3-axis";
+import { timeMonth } from "d3-time";
+import { timeFormat, isoParse } from "d3-time-format";
+import { area, line } from "d3-shape";
 
 // lib
 export default function areachart(opts = {}) {
@@ -12,12 +17,12 @@ export default function areachart(opts = {}) {
   const parseData = (data) => {
     // format the data
     data.forEach((d) => {
-      d.key = d3.isoParse(d.key)
+      d.key = isoParse(d.key)
       d.value = Number(d.value)
     });
 
     // order by date
-    return data.sort((x, y) => d3.ascending(x.key, y.key))
+    return data.sort((x, y) => ascending(x.key, y.key))
   }
 
   // OPTIONAL: Helper function to accumulates all data values
@@ -32,7 +37,7 @@ export default function areachart(opts = {}) {
   let data = parseData(opts.data)
   let title = opts.title
   let objectName = opts.objectName || ""
-  let container = d3.select(opts.container)
+  let container = select(opts.container)
   let showAxis = opts.axis || false
   let ratio = (opts.ratio || "").split(":").reduce((a, b) => a / b) || (4 / 3)
   let showTooltip = Object.is(opts.tip, undefined) ? true : opts.tip
@@ -52,20 +57,20 @@ export default function areachart(opts = {}) {
 
   let width = Number(container.node().getBoundingClientRect().width) - margin.left - margin.right
   let height = (width / ratio) - margin.top - margin.bottom
-  let titlePadding = d3.min([width / 10, 32])
+  let titlePadding = min([width / 10, 32])
 
   // set the ranges
-  let x = d3.scaleTime().range([0, width]);
-  let y = d3.scaleLinear().range([height, 0]);
+  let x = scaleTime().range([0, width]);
+  let y = scaleLinear().range([height, 0]);
 
   // define the area
-  let area = d3.area()
+  let _area = area()
     .x((d) => x(d.key))
     .y0(height)
     .y1((d) => y(d.value));
 
   // define the line
-  let valueline = d3.line()
+  let valueline = line()
     .x((d) => x(d.key))
     .y((d) => y(d.value));
 
@@ -76,8 +81,8 @@ export default function areachart(opts = {}) {
     .attr("transform", `translate(${margin.left},${margin.top})`);
 
   // scale the range of the data
-  x.domain(d3.extent(data, (d) => d.key));
-  y.domain([0, d3.max(data, (d) => d.value)]).nice();
+  x.domain(extent(data, (d) => d.key));
+  y.domain([0, max(data, (d) => d.value)]).nice();
 
   // add the valueline path.
   let topLine = svg.append("path")
@@ -89,7 +94,7 @@ export default function areachart(opts = {}) {
   svg.append("path")
     .data([data])
     .attr("class", "area")
-    .attr("d", area)
+    .attr("d", _area)
 
   if (showTooltip) {
     // tooltip
@@ -98,7 +103,7 @@ export default function areachart(opts = {}) {
       .attr("r", 6)
       .style("display", "none")
 
-    let tooltip = d3.select("body").append("div")
+    let tooltip = select("body").append("div")
       .attr("id", `${container.node().id}-tooltip`)
       .attr("class", "chart-tooltip")
       .style("opacity", 0)
@@ -113,8 +118,8 @@ export default function areachart(opts = {}) {
         tooltip.style("opacity", 0)
       })
       .on("mousemove", function() {
-        let x0 = x.invert(d3.mouse(this)[0])
-        let i = d3.bisector((d) => d.key).left(data, x0, 1)
+        let x0 = x.invert(mouse(this)[0])
+        let i = bisector((d) => d.key).left(data, x0, 1)
         let d0 = data[i - 1]
         let d1 = data[i]
         let d = (x0 - d0.key > d1.key - x0) ? d1 : d0
@@ -127,7 +132,7 @@ export default function areachart(opts = {}) {
 
         let tooltipContent = `
           <div class="tooltip-content">
-            ${d3.timeFormat("%e %B %Y")(d.key)}<br />
+            ${timeFormat("%e %B %Y")(d.key)}<br />
             ${d.value.toLocaleString()} ${objectName}
           </div>`
 
@@ -139,11 +144,11 @@ export default function areachart(opts = {}) {
   }
 
   if (showAxis) {
-    let xAxis = d3.axisBottom(x)
-      .ticks(d3.timeMonth)
-      .tickFormat(d3.timeFormat("%b %y"))
+    let xAxis = axisBottom(x)
+      .ticks(timeMonth)
+      .tickFormat(timeFormat("%b %y"))
       .tickSize(-height)
-    let yAxis = d3.axisLeft(y)
+    let yAxis = axisLeft(y)
       .ticks(5)
       .tickSize(8)
 
@@ -200,10 +205,10 @@ export default function areachart(opts = {}) {
         .text(title)
         .call(function(fulltext, wrapwidth, start = 0) {
           fulltext.each(function() {
-            let text = d3.select(this)
+            let text = select(this)
             let word = ""
             let words = text.text().split(/\s+/).reverse()
-            let line = []
+            let _line = []
             let lineNumber = 0
             let lineHeight = 1.1
             let _x = text.attr("x")
@@ -217,12 +222,12 @@ export default function areachart(opts = {}) {
 
             /* eslint-disable no-cond-assign, no-plusplus */
             while (word = words.pop()) {
-              line.push(word);
-              tspan.text(line.join(" "));
+              _line.push(word);
+              tspan.text(_line.join(" "));
               if (tspan.node().getComputedTextLength() > wrapwidth) {
-                line.pop()
-                tspan.text(line.join(" "))
-                line = [word]
+                _line.pop()
+                tspan.text(_line.join(" "))
+                _line = [word]
                 tspan = text.append("tspan")
                   .attr("x", _x)
                   .attr("y", _y)
diff --git a/decidim-core/app/packs/src/decidim/vizzs/metrics.js b/decidim-core/app/packs/src/decidim/vizzs/index.js
similarity index 100%
rename from decidim-core/app/packs/src/decidim/vizzs/metrics.js
rename to decidim-core/app/packs/src/decidim/vizzs/index.js
diff --git a/decidim-core/app/packs/src/decidim/vizzs/linechart.js b/decidim-core/app/packs/src/decidim/vizzs/linechart.js
index 7d47f1e0b6094..40a213b8a3cbf 100644
--- a/decidim-core/app/packs/src/decidim/vizzs/linechart.js
+++ b/decidim-core/app/packs/src/decidim/vizzs/linechart.js
@@ -1,9 +1,15 @@
 /* eslint-disable require-jsdoc, max-lines, id-length, no-invalid-this, no-cond-assign, no-unused-vars, max-params, no-undefined, no-sequences, multiline-ternary, no-ternary */
 /* eslint prefer-reflect: ["error", { "exceptions": ["call"] }] */
 /* eslint dot-location: ["error", "property"] */
-/* global d3, DATACHARTS, fetchDatacharts */
+/* global DATACHARTS, fetchDatacharts */
 
-import * as d3 from "d3"
+import { select, mouse } from "d3-selection";
+import { extent, ascending } from "d3-array";
+import { scaleTime, scaleLinear } from "d3-scale";
+import { axisLeft, axisBottom } from "d3-axis";
+import { timeMonth } from "d3-time";
+import { timeFormat, isoParse } from "d3-time-format";
+import { line } from "d3-shape";
 
 export default function renderLineCharts() {
   // lib
@@ -15,9 +21,9 @@ export default function renderLineCharts() {
     let data = opts.data
     let title = opts.title
     let subtitle = opts.subtitle
-    let container = d3.select(opts.container)
+    let container = select(opts.container)
     let ratio = opts.ratio
-    let xTickFormat = opts.xTickFormat || d3.timeFormat("%b %y")
+    let xTickFormat = opts.xTickFormat || timeFormat("%b %y")
     let showTooltip = opts.tip !== "false"
 
     // precalculation
@@ -40,13 +46,13 @@ export default function renderLineCharts() {
     let height = (width / ratio) - margin.top - margin.bottom
 
     // set the ranges
-    const x = d3.scaleTime().range([0, width])
-    const y = d3.scaleLinear().range([height, 0])
+    const x = scaleTime().range([0, width])
+    const y = scaleLinear().range([height, 0])
 
     // set the scales
-    x.domain(d3.extent([...new Set([].concat(...data.map((f) => f.value.map((d) => d.key))))]))
+    x.domain(extent([...new Set([].concat(...data.map((f) => f.value.map((d) => d.key))))]))
     // group names
-    y.domain(d3.extent([...new Set([].concat(...data.map((f) => f.value.map((d) => d.value))))]))
+    y.domain(extent([...new Set([].concat(...data.map((f) => f.value.map((d) => d.value))))]))
 
     // container
     let svg = container.append("svg")
@@ -103,23 +109,22 @@ export default function renderLineCharts() {
       .attr("transform", `translate(${margin.left},${margin.top - headerHeight})`)
       .attr("class", "group")
 
-    let line = d3.line()
-      // .curve(d3.curveBasis)
+    let _line = line()
       .x((d) => x(d.key))
       .y((d) => y(d.value))
 
     let cat = g.selectAll("path")
       .data(data)
       .enter().append("path")
-      .attr("d", (d) => line(d.value))
+      .attr("d", (d) => _line(d.value))
       .attr("class", (d) =>  `line type-${keys.indexOf(d.key)}`)
 
     // axis
-    let xAxis = d3.axisBottom(x)
-      .ticks(d3.timeMonth.every(4))
+    let xAxis = axisBottom(x)
+      .ticks(timeMonth.every(4))
       .tickSize(-height)
       .tickFormat(xTickFormat)
-    let yAxis = d3.axisLeft(y)
+    let yAxis = axisLeft(y)
       .ticks(5)
 
     let _xAxis = (xg) => {
@@ -146,7 +151,7 @@ export default function renderLineCharts() {
 
     // tooltip
     if (showTooltip) {
-      let tooltip = d3.select("body").append("div")
+      let tooltip = select("body").append("div")
         .attr("id", `${container.node().id}-tooltip`)
         .attr("class", "chart-tooltip")
         .style("opacity", 0)
@@ -159,7 +164,7 @@ export default function renderLineCharts() {
           tooltip.style("opacity", 0)
         })
         .on("mousemove", function() {
-          let x0 = x.invert(d3.mouse(this)[0])
+          let x0 = x.invert(mouse(this)[0])
 
           let ge = []
           data.forEach((o) => {
@@ -225,10 +230,10 @@ export default function renderLineCharts() {
       // format the data
       data.forEach((d) => {
         d.value.forEach((f) => {
-          f.key = d3.isoParse(f.key)
+          f.key = isoParse(f.key)
         })
 
-        d.value.sort((x, y) => d3.ascending(x.key, y.key))
+        d.value.sort((x, y) => ascending(x.key, y.key))
       });
 
       return data
diff --git a/decidim-core/app/packs/src/decidim/vizzs/renders.js b/decidim-core/app/packs/src/decidim/vizzs/renders.js
deleted file mode 100644
index 2cfaa92497b26..0000000000000
--- a/decidim-core/app/packs/src/decidim/vizzs/renders.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* eslint-disable require-jsdoc */
-// renderChart receives a chart function as argument and renders it
-// Also captures change.zf.tabs event and re-renders the chart
-export default function renderChart(chart) {
-  chart()
-  $(document).on("change.zf.tabs", () => {
-    chart()
-  });
-}
diff --git a/decidim-core/app/packs/src/decidim/vizzs/rowchart.js b/decidim-core/app/packs/src/decidim/vizzs/rowchart.js
index cb0d9a5d70e5f..3b7f4767f453f 100644
--- a/decidim-core/app/packs/src/decidim/vizzs/rowchart.js
+++ b/decidim-core/app/packs/src/decidim/vizzs/rowchart.js
@@ -1,9 +1,13 @@
 /* eslint-disable require-jsdoc, max-lines, id-length, no-invalid-this, no-cond-assign, no-unused-vars, max-params, no-sequences, no-ternary */
 /* eslint prefer-reflect: ["error", { "exceptions": ["call"] }] */
 /* eslint dot-location: ["error", "property"] */
-/* global d3, DATACHARTS, fetchDatacharts */
+/* global DATACHARTS, fetchDatacharts */
 
-import * as d3 from "d3"
+import { select } from "d3-selection";
+import { max } from "d3-array";
+import { scaleBand, scaleLinear } from "d3-scale";
+import { axisLeft, axisBottom } from "d3-axis";
+import "d3-transition"
 
 export default function renderRowCharts() {
   // lib
@@ -15,14 +19,14 @@ export default function renderRowCharts() {
     let data = opts.data
     let title = opts.title
     let subtitle = opts.subtitle
-    let container = d3.select(opts.container)
+    let container = select(opts.container)
     let ratio = opts.ratio
     let xTickFormat = opts.xTickFormat
     let showTooltip = opts.tip !== "false"
 
     // precalculation
     // Explanation: get the inner values foreach object outer values, flat the array, remove duplicates
-    let maxValue = d3.max([...new Set([].concat(...data.map((f) => f.value.map((d) => d.value))))])
+    let maxValue = max([...new Set([].concat(...data.map((f) => f.value.map((d) => d.value))))])
     // Explanation: get the inner keys foreach object outer values, flat the array, remove duplicates
     let keys = [...new Set([].concat(...data.map((f) => f.value.map((d) => d.key))))]
 
@@ -57,9 +61,9 @@ export default function renderRowCharts() {
     let height = (width / ratio) - margin.top - margin.bottom
 
     // set the ranges
-    const x = d3.scaleLinear().rangeRound([0, width])
-    const y0 = d3.scaleBand().rangeRound([height, 0]).paddingInner(0.1)
-    const y1 = d3.scaleBand().padding(0.05)
+    const x = scaleLinear().rangeRound([0, width])
+    const y0 = scaleBand().rangeRound([height, 0]).paddingInner(0.1)
+    const y1 = scaleBand().padding(0.05)
 
     // set the scales
     x.domain([0, maxValue]).nice()
@@ -123,11 +127,11 @@ export default function renderRowCharts() {
       .attr("transform", `translate(${margin.left},${margin.top - headerHeight})`)
 
     // axis
-    let xAxis = d3.axisBottom(x)
+    let xAxis = axisBottom(x)
       .ticks(5)
       .tickSize(-height)
       .tickFormat(xTickFormat)
-    let yAxis = d3.axisLeft(y0)
+    let yAxis = axisLeft(y0)
 
     let _xAxis = (xg) => {
       xg.call(xAxis)
@@ -142,7 +146,7 @@ export default function renderRowCharts() {
       yg.selectAll(".tick text")
         .attr("class", "text-large")
         .each(function() {
-          let text = d3.select(this)
+          let text = select(this)
           let limitLength = margin.left - (gutter * 10)
 
           if (text.node().getComputedTextLength() > limitLength) {
@@ -210,7 +214,7 @@ export default function renderRowCharts() {
 
     // tooltip
     if (showTooltip) {
-      let tooltip = d3.select("body").append("div")
+      let tooltip = select("body").append("div")
         .attr("id", `${container.node().id}-tooltip`)
         .attr("class", "chart-tooltip")
         .style("opacity", 0)
diff --git a/decidim-core/app/packs/stylesheets/decidim/_editor.scss b/decidim-core/app/packs/stylesheets/decidim/_editor.scss
index 2fd3ad4d2d23f..e39e15bf0eb59 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_editor.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_editor.scss
@@ -10,4 +10,133 @@
     margin-bottom: $paragraph-margin-bottom;
     text-rendering: $paragraph-text-rendering;
   }
+
+  ul,
+  ol{
+    margin-bottom: $paragraph-margin-bottom;
+  }
+}
+
+.ql-editor-display{
+  ul,
+  ol{
+    li{
+      list-style-type: none;
+      margin-bottom: .5rem;
+
+      &::before{
+        content: "\2022";
+        display: inline-block;
+        white-space: nowrap;
+        width: 1.2em;
+      }
+
+      &.ql-indent-1{
+        padding-left: 3em;
+      }
+
+      &.ql-indent-2{
+        padding-left: 6em;
+      }
+
+      &.ql-indent-3{
+        padding-left: 9em;
+      }
+
+      &.ql-indent-4{
+        padding-left: 12em;
+      }
+
+      &.ql-indent-5{
+        padding-left: 15em;
+      }
+
+      &.ql-indent-6{
+        padding-left: 18em;
+      }
+
+      &.ql-indent-7{
+        padding-left: 21em;
+      }
+
+      &.ql-indent-8{
+        padding-left: 24em;
+      }
+
+      &.ql-indent-9{
+        padding-left: 27em;
+      }
+    }
+  }
+
+  ol{
+    li{
+      counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+      counter-increment: list-0;
+
+      &::before{ content: counter(list-0, decimal) ". "; }
+
+      &.ql-indent-1{
+        counter-increment: list-1;
+        counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-1, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-2{
+        counter-increment: list-2;
+        counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-2, lower-roman) ". "; }
+      }
+
+      &.ql-indent-3{
+        counter-increment: list-3;
+        counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-3, decimal) ". "; }
+      }
+
+      &.ql-indent-4{
+        counter-increment: list-4;
+        counter-reset: list-5 list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-4, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-5{
+        counter-increment: list-5;
+        counter-reset: list-6 list-7 list-8 list-9;
+
+        &::before{ content: counter(list-5, lower-roman) ". "; }
+      }
+
+      &.ql-indent-6{
+        counter-increment: list-6;
+        counter-reset: list-7 list-8 list-9;
+
+        &::before{ content: counter(list-6, decimal) ". "; }
+      }
+
+      &.ql-indent-7{
+        counter-increment: list-7;
+        counter-reset: list-8 list-9;
+
+        &::before{ content: counter(list-7, lower-alpha) ". "; }
+      }
+
+      &.ql-indent-8{
+        counter-increment: list-8;
+        counter-reset: list-9;
+
+        &::before{ content: counter(list-8, lower-roman) ". "; }
+      }
+
+      &.ql-indent-9{
+        counter-increment: list-9;
+
+        &::before{ content: counter(list-9, decimal) ". "; }
+      }
+    }
+  }
 }
diff --git a/decidim-core/app/packs/stylesheets/decidim/email.scss b/decidim-core/app/packs/stylesheets/decidim/email.scss
index 27e5aa3375ed5..9ca48c9d696e8 100644
--- a/decidim-core/app/packs/stylesheets/decidim/email.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/email.scss
@@ -25,6 +25,13 @@ body{
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
+
+  &.preview{
+    .see-on-website,
+    .unsubscribe{
+      cursor: not-allowed;
+    }
+  }
 }
 
 .ExternalClass{
@@ -1781,3 +1788,69 @@ th,
 td{
   box-sizing: border-box;
 }
+
+.email-notifications-digest{
+  .email-header{
+    margin-bottom: 32px;
+    font-size: 16px;
+    font-weight: bold;
+    color: #2c2930;
+    display: inline-block;
+    width: 49%;
+
+    &--right{
+      text-align: right;
+    }
+  }
+
+  .email-intro{
+    font-size: 16px;
+    line-height: 21px;
+  }
+
+  .email-content-notifications{
+    background-color: #f4f4f4;
+    border-radius: 5px;
+    border: 1px #e5e5e5;
+    padding: 16px;
+    margin: 32px 0;
+  }
+
+  .email-content-notification{
+    p a{
+      color: #327f9b;
+      font-weight: bold;
+      text-decoration: underline;
+    }
+  }
+
+  .email-element-separator{
+    margin: 24px 0;
+    color: #e5e5e5;
+    border-color: #e5e5e5;
+    height: 0;
+    border-style: solid;
+    border-width: 1px;
+  }
+
+  .email-notification-date{
+    color: #666d7a;
+    display: block;
+    margin-bottom: 10px;
+  }
+
+  .email-closing{
+    font-size: 14px;
+  }
+
+  .email-btn{
+    border: solid 1px;
+    margin: 0 33% 30px;
+    width: 33%;
+    text-align: center;
+    display: inline-block;
+    padding: 10px;
+    color: #5295ad;
+    text-decoration: none;
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/extras/_quill.scss b/decidim-core/app/packs/stylesheets/decidim/extras/_quill.scss
index bb3cc5b656c8b..5979511bfd2ff 100644
--- a/decidim-core/app/packs/stylesheets/decidim/extras/_quill.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/extras/_quill.scss
@@ -11,9 +11,3 @@
   margin-top: 0;
   margin-bottom: 0;
 }
-
-.ql-reset-decidim{
-  display: inline;
-  padding: 0;
-  white-space: inherit;
-}
diff --git a/decidim-core/app/packs/stylesheets/decidim/layouts/_user.scss b/decidim-core/app/packs/stylesheets/decidim/layouts/_user.scss
index d6b91fc9834e2..939c1bef7c849 100644
--- a/decidim-core/app/packs/stylesheets/decidim/layouts/_user.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/layouts/_user.scss
@@ -37,6 +37,14 @@
   }
 }
 
+.account-notification{
+  display: flex;
+
+  &.callout.flash{
+    margin-bottom: 1rem;
+  }
+}
+
 .badge-card__content{
   @extend .card__content;
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_autocomplete.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_autocomplete.scss
new file mode 100644
index 0000000000000..177d27e2b456b
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_autocomplete.scss
@@ -0,0 +1,99 @@
+@import "@tarekraafat/autocomplete.js/dist/css/autoComplete.02.css";
+
+$autocomplete-item-color: $secondary !default;
+$autocomplete-item-hover-bg: #ededed !default;
+$autocomplete-multiselect-bg: $white !default;
+$autocomplete-multiselect-border-color: $medium-gray !default;
+$autocomplete-multiselect-search-prompt-color: $dark-gray;
+
+.autoComplete_wrapper{
+  width: 100%;
+
+  input{
+    color: $black;
+    width: 100%;
+    margin: 0;
+  }
+
+  ul{
+    position: relative;
+    margin: 0;
+
+    li{
+      color: $autocomplete-item-color;
+
+      span{
+        &.author__avatar{
+          display: inline-block;
+        }
+      }
+
+      &:hover,
+      &[aria-selected="true"]{
+        background-color: $autocomplete-item-hover-bg;
+      }
+
+      &.disabled{
+        pointer-events: none;
+        opacity: .6;
+      }
+
+      .is-group{
+        float: right;
+      }
+    }
+  }
+
+  span{
+    &.autocomplete__selected-item.sticky{
+      position: absolute;
+      height: 3rem;
+      line-height: 3rem;
+      padding: 0 1rem;
+    }
+  }
+
+  .clear-sticky-selection{
+    display: inline;
+    position: absolute;
+    font-size: 1.3rem;
+    cursor: pointer;
+    right: 1rem;
+  }
+
+  .clear-multi-selection{
+    cursor: pointer;
+  }
+
+  .search-prompt{
+    color: $autocomplete-multiselect-search-prompt-color;
+    border: 1px solid $autocomplete-multiselect-border-color;
+    padding: .2rem;
+  }
+}
+
+.multiselect{
+  background-color: $autocomplete-multiselect-bg;
+  display: inline-block;
+  border: 1px solid $autocomplete-multiselect-border-color;
+  width: 100%;
+  cursor: text;
+  padding: 0 .5rem;
+  min-height: 2.4375rem;
+
+  span{
+    display: inline-block;
+    position: relative;
+    margin: .5rem .5rem .5rem 0;
+
+    input{
+      border: none;
+      outline: none;
+    }
+
+    &.clear-multi-selection{
+      margin: 0 0 0 .2rem;
+      cursor: pointer;
+    }
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_cookie-bar.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_cookie-bar.scss
deleted file mode 100644
index 2a2a7ce761c50..0000000000000
--- a/decidim-core/app/packs/stylesheets/decidim/modules/_cookie-bar.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.cookie-warning{
-  background: $medium-gray;
-  padding: .5em 1em;
-  text-align: center;
-
-  a{
-    color: darken($anchor-color, 10%);
-  }
-}
-
-.cookie-warning__action{
-  text-align: center;
-
-  .button{
-    margin: .5em 0;
-  }
-
-  @include breakpoint(mediumlarge){
-    vertical-align: baseline;
-    display: inline-block;
-
-    .button{
-      margin: 0 0 0 1em;
-    }
-  }
-}
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_data-consent.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_data-consent.scss
new file mode 100644
index 0000000000000..0dc34c5e6ec62
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_data-consent.scss
@@ -0,0 +1,115 @@
+#dc-dialog-wrapper{
+  z-index: 1000000;
+
+  .dc-dialog{
+    position: fixed;
+    background-color: $white;
+    bottom: 0;
+    width: 100%;
+
+    @include breakpoint(large){
+      width: unset;
+    }
+
+    .dc-button-wrapper{
+      flex-direction: column;
+      margin: 1rem 0;
+
+      > *{
+        width: 100%;
+        margin: .5rem 0;
+      }
+
+      @include breakpoint(medium){
+        flex-direction: row;
+
+        > *{
+          width: unset;
+          margin: 0 1rem;
+        }
+      }
+
+      @include breakpoint(large){
+        justify-content: flex-end;
+      }
+    }
+  }
+}
+
+#dc-modal{
+  background-color: $white;
+
+  .category-wrapper{
+    background-color: $light-gray;
+    padding: .2rem;
+
+    .category-row{
+      position: relative;
+      justify-content: space-between;
+
+      .dc-title{
+        &::before{
+          border: solid #2d4156;
+          border-width: 0 2px 2px 0;
+          padding: .2em;
+          display: inline-block;
+          content: '';
+          margin-right: 15px;
+          position: absolute;
+          left: 1.2em;
+          top: 50%;
+          transform: translateY(-50%) rotate(45deg);
+        }
+
+        &.open{
+          &::before{
+            transform: translateY(-50%) rotate(225deg);
+          }
+        }
+      }
+
+      .dc-switch{
+        padding: .5rem 0 0;
+      }
+    }
+
+    .dataconsent-details-wrapper{
+      .detail-titles{
+        border-bottom: 1px solid $medium-gray;
+
+        > *{
+          font-weight: 600;
+        }
+      }
+
+      .dataconsent-detail-row{
+        font-size: .6rem;
+      }
+    }
+  }
+
+  .dc-buttons-wrapper{
+    justify-content: space-between;
+  }
+}
+
+.disabled-iframe{
+  background-color: $light-gray;
+  border: 1px solid $medium-gray;
+  cursor: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  max-height: 20rem;
+
+  &.ql-video{
+    display: flex;
+  }
+}
+
+.dataconsent-warning{
+  flex-direction: column;
+  font-size: 2rem;
+  font-weight: $global-weight-bold;
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_footer.scss
index fdd184a645d0e..c9b62ba318939 100644
--- a/decidim-core/app/packs/stylesheets/decidim/modules/_footer.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_footer.scss
@@ -7,6 +7,10 @@ $footer-bg: $black;
 .mini-footer{
   color: $medium-gray;
 
+  .link-separator{
+    margin: 0 .5rem;
+  }
+
   a{
     color: darken($medium-gray, 40%);
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss
index a03151105b3c5..630c2c7fabf4a 100644
--- a/decidim-core/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss
@@ -1,5 +1,32 @@
 @import "tributejs/tribute";
 
-input.js-multiple-mentions.mentions__container::placeholder{
-  color: $input-multiple-placeholder-color;
+.multiple-mentions{
+  input::placeholder{
+    color: $input-multiple-placeholder-color;
+  }
+}
+
+.multiple-mentions-selected{
+  font-size: 1.3rem;
+  line-height: 1.8;
+  list-style: none;
+  margin: 1rem 0 0;
+
+  button{
+    cursor: pointer;
+  }
+
+  img{
+    &.author__avatar{
+      display: inline-block;
+      padding: 0;
+      border-radius: 50%;
+      width: 35px;
+      height: 35px;
+    }
+  }
+
+  li b{
+    font-size: .875rem;
+  }
 }
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_modules.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_modules.scss
index 7594caf25d9ec..4c20ff18e69cc 100644
--- a/decidim-core/app/packs/stylesheets/decidim/modules/_modules.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_modules.scss
@@ -53,6 +53,7 @@
 @import "stylesheets/decidim/modules/sticky";
 @import "stylesheets/decidim/modules/notification";
 @import "stylesheets/decidim/modules/statistics";
+@import "stylesheets/decidim/modules/autocomplete";
 
 //Process elements
 @import "stylesheets/decidim/modules/process-header";
@@ -81,7 +82,7 @@
 //Additional elements
 @import "stylesheets/decidim/modules/share";
 @import "stylesheets/decidim/modules/help";
-@import "stylesheets/decidim/modules/cookie-bar";
+@import "stylesheets/decidim/modules/data-consent";
 @import "stylesheets/decidim/modules/map";
 @import "stylesheets/decidim/modules/omnipresent_banner";
 @import "stylesheets/decidim/modules/wizard-steps";
@@ -90,3 +91,4 @@
 @import "stylesheets/decidim/modules/fingerprint";
 @import "stylesheets/decidim/modules/toggle";
 @import "stylesheets/decidim/modules/loading-spinner";
+@import "stylesheets/decidim/modules/upload_modal";
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_reveal.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_reveal.scss
index 0b7b4cd32ea8a..e25d1148d5d17 100644
--- a/decidim-core/app/packs/stylesheets/decidim/modules/_reveal.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_reveal.scss
@@ -19,6 +19,21 @@
   }
 }
 
+.reveal{
+  .calendar-url-description{
+    margin-bottom: .5rem;
+  }
+
+  .calendar_url_input{
+    margin-top: 1rem;
+  }
+
+  #urlCalendarUrl{
+    // Prevent the "not-allowed" cursor in the share input.
+    cursor: auto;
+  }
+}
+
 .reveal__footer{
   border-top: $border;
 
diff --git a/decidim-core/app/packs/stylesheets/decidim/modules/_upload_modal.scss b/decidim-core/app/packs/stylesheets/decidim/modules/_upload_modal.scss
new file mode 100644
index 0000000000000..63a4755a5c7bd
--- /dev/null
+++ b/decidim-core/app/packs/stylesheets/decidim/modules/_upload_modal.scss
@@ -0,0 +1,143 @@
+@import "stylesheets/decidim/variables";
+
+.upload-modal{
+  .button{
+    margin: 0;
+  }
+
+  .dropzone-container{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-bottom: 1rem;
+
+    input[type="file"]{
+      display: none;
+    }
+
+    label{
+      background-color: $white;
+      margin: 1rem 0;
+      cursor: pointer;
+
+      &.is-dragover{
+        background-color: lighten($secondary, 50);
+      }
+
+      &.dropzone{
+        padding: 1rem;
+        text-align: center;
+        border-style: dashed;
+        border-color: $secondary;
+        border-width: 2px;
+        border-radius: 4px;
+
+        * >{
+          display: none;
+        }
+
+        .form-error{
+          margin: 0;
+        }
+      }
+
+      &.disabled{
+        background-color: $light-gray;
+        cursor: not-allowed;
+        border-color: lighten($secondary, 50);
+
+        span{
+          color: #ccc;
+        }
+      }
+    }
+  }
+
+  .upload-items{
+    .upload-item{
+      input[type="text"]{
+        margin: 0;
+      }
+
+      .file-name-span{
+        overflow: hidden;
+      }
+
+      .progress-bar-wrapper{
+        .progress-bar-border{
+          height: 2rem;
+          border: 1px solid $primary;
+          box-sizing: border-box;
+          padding: 0;
+
+          .progress-bar{
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            color: white;
+            background-color: $primary;
+            padding: 0 .5rem;
+            height: 2rem;
+
+            &.filled{
+              justify-content: center;
+              width: 100% !important;
+            }
+          }
+        }
+      }
+    }
+
+    .remove-upload-item{
+      cursor: pointer;
+    }
+
+    .upload-errors{
+      .form-error{
+        margin: 0;
+      }
+    }
+  }
+}
+
+.dynamic-uploads{
+  display: flex;
+  flex-direction: column;
+
+  @include breakpoint(large down){
+    margin-bottom: .5rem;
+  }
+
+  .actions-wrapper{
+    display: flex;
+    justify-content: flex-start;
+    align-items: baseline;
+
+    button.primary{
+      margin-right: .5rem;
+    }
+
+    button.remove-upload{
+      cursor: pointer;
+    }
+
+    &.titled{
+      flex-direction: column-reverse;
+    }
+
+    .active-uploads{
+      span.filename{
+        margin-right: .5rem;
+      }
+
+      span:last-child{
+        margin-right: .5rem;
+      }
+    }
+  }
+
+  &.with-title{
+    display: block;
+    margin: 0;
+  }
+}
diff --git a/decidim-core/app/packs/stylesheets/decidim/utils/_fontface.scss b/decidim-core/app/packs/stylesheets/decidim/utils/_fontface.scss
index 1d26f99c461ff..50773b14a96b7 100644
--- a/decidim-core/app/packs/stylesheets/decidim/utils/_fontface.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/utils/_fontface.scss
@@ -2,6 +2,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_400.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_400.woff') format('woff'),
@@ -12,6 +13,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_600.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_600.woff') format('woff'),
@@ -22,6 +24,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 900;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_900.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_900.woff') format('woff'),
diff --git a/decidim-core/app/permissions/decidim/permissions.rb b/decidim-core/app/permissions/decidim/permissions.rb
index 9fe2d9896068f..2909d64f1d406 100644
--- a/decidim-core/app/permissions/decidim/permissions.rb
+++ b/decidim-core/app/permissions/decidim/permissions.rb
@@ -150,7 +150,7 @@ def user_group_action?
       user_group = context.fetch(:user_group)
 
       if permission_action.action == :leave
-        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).where.not(role: :creator).any?
+        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).any?
         return toggle_allow(user_can_leave_group)
       end
 
@@ -164,9 +164,7 @@ def user_group_invitations_action?
 
     def user_can_preview_component?
       return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
-    rescue ActiveRecord::RecordNotFound
-      nil
-    rescue StandardError
+    rescue ActiveRecord::RecordNotFound, StandardError
       nil
     end
 
diff --git a/decidim-core/app/presenters/decidim/admin_log/area_type_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/area_type_presenter.rb
new file mode 100644
index 0000000000000..f55b5d0aa3379
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/area_type_presenter.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AreaType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AreaTypePresenter.new(action_log, view_helpers).present
+    class AreaTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.area_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/attachment_collection_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/attachment_collection_presenter.rb
new file mode 100644
index 0000000000000..5d1d7e198f999
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/attachment_collection_presenter.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AttachmentCollection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentCollectionPresenter.new(action_log, view_helpers).present
+    class AttachmentCollectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment_collection.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/attachment_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/attachment_presenter.rb
new file mode 100644
index 0000000000000..b765fd879769e
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/attachment_presenter.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Attachment`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentPresenter.new(action_log, view_helpers).present
+    class AttachmentPresenter < Decidim::Log::BasePresenter
+      private
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/category_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/category_presenter.rb
new file mode 100644
index 0000000000000..7d8af736b2e05
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/category_presenter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Category`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    CategoryPresenter.new(action_log, view_helpers).present
+    class CategoryPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer,
+          parent_id: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.category.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/component_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/component_presenter.rb
index 8cb68fb3d158f..2c38d2f1e301b 100644
--- a/decidim-core/app/presenters/decidim/admin_log/component_presenter.rb
+++ b/decidim-core/app/presenters/decidim/admin_log/component_presenter.rb
@@ -18,7 +18,8 @@ def diff_fields_mapping
         {
           name: :i18n,
           published_at: :date,
-          weight: :integer
+          weight: :integer,
+          permissions: :jsonb
         }
       end
 
@@ -28,15 +29,46 @@ def i18n_labels_scope
 
       def action_string
         case action
-        when "create", "delete", "publish", "unpublish"
+        when "export_component"
           "decidim.admin_log.component.#{action}"
+        when "create", "delete", "publish", "unpublish", "update_permissions"
+          generate_action_string(action)
         else
           super
         end
       end
 
+      def generate_action_string(action)
+        string = if action_log.participatory_space.present?
+                   "#{action}_with_space"
+                 else
+                   action
+                 end
+        "decidim.log.base_presenter.#{string}"
+      end
+
       def diff_actions
-        super + %w(unpublish)
+        super + %w(unpublish update_permissions)
+      end
+
+      def i18n_params
+        case action_log.extra["name"]
+        when "proposal_comments", "result_comments", "comments", "meeting_comments"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.comments"),
+                        format_name: action_log.extra["format"]
+                      })
+        when "projects", "results", "answers"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.#{action_log.extra["name"]}"),
+                        format_name: action_log.extra["format"]
+                      })
+        else
+          super.merge({
+                        component_name: "",
+                        format_name: action_log.extra["format"]
+                      })
+        end
       end
     end
   end
diff --git a/decidim-core/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb
new file mode 100644
index 0000000000000..b2fbf9b66fc01
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ContextualHelpSection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ContextualHelpSectionPresenter.new(action_log, view_helpers).present
+    class ContextualHelpSectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          content: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "update"
+          "decidim.admin_log.contextual_help_section.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/organization_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/organization_presenter.rb
index 890a6a217acea..25b1b00cf96c7 100644
--- a/decidim-core/app/presenters/decidim/admin_log/organization_presenter.rb
+++ b/decidim-core/app/presenters/decidim/admin_log/organization_presenter.rb
@@ -15,6 +15,8 @@ class OrganizationPresenter < Decidim::Log::BasePresenter
       private
 
       def diff_fields_mapping
+        return { external_domain_whitelist: :string } if action == "update_external_domain"
+
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)
           .merge(highlighted_content_banner_attributes_mapping)
@@ -79,9 +81,12 @@ def id_documents_attributes_mapping
       end
 
       def action_string
-        return "decidim.admin_log.organization.update_id_documents_config" if action == "update_id_documents_config"
-
-        "decidim.admin_log.organization.update"
+        case action
+        when "update_id_documents_config", "update_external_domain"
+          "decidim.admin_log.organization.#{action}"
+        else
+          "decidim.admin_log.organization.update"
+        end
       end
 
       def i18n_labels_scope
@@ -89,7 +94,7 @@ def i18n_labels_scope
       end
 
       def diff_actions
-        super + %w(update_id_documents_config)
+        super + %w(update_id_documents_config update_external_domain)
       end
     end
   end
diff --git a/decidim-core/app/presenters/decidim/admin_log/scope_type_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/scope_type_presenter.rb
new file mode 100644
index 0000000000000..15a7976f855fc
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/admin_log/scope_type_presenter.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ScopeType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ScopeTypePresenter.new(action_log, view_helpers).present
+    class ScopeTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.scope_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/admin_log/user_group_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/user_group_presenter.rb
index 52dcbe858fac3..5166b6f27780a 100644
--- a/decidim-core/app/presenters/decidim/admin_log/user_group_presenter.rb
+++ b/decidim-core/app/presenters/decidim/admin_log/user_group_presenter.rb
@@ -20,7 +20,7 @@ def has_diff?
 
       def action_string
         case action
-        when "verify", "verify_via_csv", "reject"
+        when "verify", "verify_via_csv", "reject", "block", "unblock"
           "decidim.admin_log.user_group.#{action}"
         else
           super
diff --git a/decidim-core/app/presenters/decidim/admin_log/user_moderation_presenter.rb b/decidim-core/app/presenters/decidim/admin_log/user_moderation_presenter.rb
index 069c448be91df..8392731749d33 100644
--- a/decidim-core/app/presenters/decidim/admin_log/user_moderation_presenter.rb
+++ b/decidim-core/app/presenters/decidim/admin_log/user_moderation_presenter.rb
@@ -52,7 +52,7 @@ def unreported_user_presenter
       end
 
       def unreported_user
-        @unreported_user ||= Decidim::User.find_by(id: action_log.extra.dig("extra", "user_id"))
+        @unreported_user ||= Decidim::UserBaseEntity.find_by(id: action_log.extra.dig("extra", "user_id"))
       end
 
       def has_diff?
diff --git a/decidim-core/app/presenters/decidim/home_stats_presenter.rb b/decidim-core/app/presenters/decidim/home_stats_presenter.rb
index 41e0abc983952..aedab9312323a 100644
--- a/decidim-core/app/presenters/decidim/home_stats_presenter.rb
+++ b/decidim-core/app/presenters/decidim/home_stats_presenter.rb
@@ -2,8 +2,10 @@
 
 module Decidim
   # A presenter to render statistics in the homepage.
-  class HomeStatsPresenter < Rectify::Presenter
-    attribute :organization, Decidim::Organization
+  class HomeStatsPresenter < SimpleDelegator
+    def organization
+      __getobj__.fetch(:organization)
+    end
 
     # Public: Render a collection of primary stats.
     def highlighted
diff --git a/decidim-core/app/presenters/decidim/log/base_presenter.rb b/decidim-core/app/presenters/decidim/log/base_presenter.rb
index 0149ff76d83d6..f239611e4222b 100644
--- a/decidim-core/app/presenters/decidim/log/base_presenter.rb
+++ b/decidim-core/app/presenters/decidim/log/base_presenter.rb
@@ -107,7 +107,7 @@ def present_explanation
         h.content_tag(:div, class: "logs__log__explanation") do
           I18n.t(
             action_string,
-            i18n_params
+            **i18n_params
           ).html_safe
         end
       end
diff --git a/decidim-core/app/presenters/decidim/menu_item_presenter.rb b/decidim-core/app/presenters/decidim/menu_item_presenter.rb
index d6615ce859dd7..e75aad277553c 100644
--- a/decidim-core/app/presenters/decidim/menu_item_presenter.rb
+++ b/decidim-core/app/presenters/decidim/menu_item_presenter.rb
@@ -28,7 +28,7 @@ def initialize(menu_item, view, options = {})
     def render
       content_tag :li, class: link_wrapper_classes do
         output = [link_to(composed_label, url, link_options)]
-        output.push(@view.send(:simple_menu, @menu_item.submenu).render) if @menu_item.submenu
+        output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
 
         safe_join(output)
       end
diff --git a/decidim-core/app/presenters/decidim/metric_charts_presenter.rb b/decidim-core/app/presenters/decidim/metric_charts_presenter.rb
index fc6eb27f965e0..e0c6a61937c30 100644
--- a/decidim-core/app/presenters/decidim/metric_charts_presenter.rb
+++ b/decidim-core/app/presenters/decidim/metric_charts_presenter.rb
@@ -2,7 +2,13 @@
 
 module Decidim
   # A presenter to render metrics in pages
-  class MetricChartsPresenter < Rectify::Presenter
+  class MetricChartsPresenter < SimpleDelegator
+    delegate :content_tag, :concat, :safe_join, to: :view_context
+
+    def view_context
+      @view_context ||= __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+    end
+
     # Public: Render a collection of primary metrics.
     def highlighted
       render_highlighted(highlighted_metrics)
diff --git a/decidim-core/app/presenters/decidim/nil_presenter.rb b/decidim-core/app/presenters/decidim/nil_presenter.rb
index 6368c56008255..125e3aa81ecdf 100644
--- a/decidim-core/app/presenters/decidim/nil_presenter.rb
+++ b/decidim-core/app/presenters/decidim/nil_presenter.rb
@@ -7,7 +7,9 @@ module Decidim
   #
   # It behaves as a presenter for deleted resources.
   # Returns an empty string for most of the method calls.
-  class NilPresenter < Rectify::Presenter
+  class NilPresenter
+    def initialize(*); end
+
     def deleted?
       true
     end
diff --git a/decidim-core/app/presenters/decidim/notification_to_mailer_presenter.rb b/decidim-core/app/presenters/decidim/notification_to_mailer_presenter.rb
new file mode 100644
index 0000000000000..47c73deecf09d
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/notification_to_mailer_presenter.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for notifications in mail digest
+  #
+  class NotificationToMailerPresenter < SimpleDelegator
+    include Decidim::TranslatableAttributes
+
+    delegate :url_helpers, to: "Decidim::Core::Engine.routes"
+    delegate :resource_title, to: :event
+    delegate :resource_url, to: :event
+    delegate :email_intro, to: :event
+    delegate :resource_path, to: :event
+
+    def date_time
+      if frequency == :daily
+        created_at.strftime("%H:%M")
+      else
+        I18n.l(created_at, format: :decidim_short)
+      end
+    end
+
+    private
+
+    def event
+      @event ||= event_class.constantize.new(
+        resource: resource,
+        user: user,
+        event_name: event_name,
+        extra: extra
+      )
+    end
+
+    def frequency
+      @frequency ||= user.notifications_sending_frequency
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/notifications_digest_presenter.rb b/decidim-core/app/presenters/decidim/notifications_digest_presenter.rb
new file mode 100644
index 0000000000000..ca5e5c42759cb
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/notifications_digest_presenter.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for events in mail digest
+  #
+  class NotificationsDigestPresenter < SimpleDelegator
+    def subject
+      I18n.t("decidim.notifications_digest_mailer.subject")
+    end
+
+    def header
+      I18n.t("decidim.notifications_digest_mailer.header.#{frequency}")
+    end
+
+    def formated_date(date)
+      I18n.l(date, format: :long)
+    end
+
+    def greeting
+      I18n.t("decidim.notifications_digest_mailer.hello", name: name)
+    end
+
+    def intro
+      I18n.t("decidim.notifications_digest_mailer.intro.#{frequency}")
+    end
+
+    def outro
+      I18n.t("decidim.notifications_digest_mailer.outro")
+    end
+
+    def see_more
+      I18n.t("decidim.notifications_digest_mailer.see_more")
+    end
+
+    private
+
+    def frequency
+      notifications_sending_frequency || "daily"
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/official_author_presenter.rb b/decidim-core/app/presenters/decidim/official_author_presenter.rb
index 72d75bf37aa59..c488572e916ee 100644
--- a/decidim-core/app/presenters/decidim/official_author_presenter.rb
+++ b/decidim-core/app/presenters/decidim/official_author_presenter.rb
@@ -5,6 +5,10 @@ module Decidim
   # A dummy presenter to abstract out the author of an official resource.
   #
   class OfficialAuthorPresenter
+    def name
+      I18n.t("decidim.author.official_author")
+    end
+
     def nickname
       ""
     end
diff --git a/decidim-core/app/presenters/decidim/organization_presenter.rb b/decidim-core/app/presenters/decidim/organization_presenter.rb
new file mode 100644
index 0000000000000..fd275dd3bd93a
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/organization_presenter.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A general presenter to render organization logic to build a manifest
+  class OrganizationPresenter < SimpleDelegator
+    def html_name
+      name.html_safe
+    end
+
+    def translated_description
+      ActionView::Base.full_sanitizer.sanitize(translated_attribute(description)).html_safe
+    end
+
+    def pwa_display
+      "standalone"
+    end
+
+    def start_url
+      "/"
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/push_notification_presenter.rb b/decidim-core/app/presenters/decidim/push_notification_presenter.rb
new file mode 100644
index 0000000000000..cf1d09fe8e43a
--- /dev/null
+++ b/decidim-core/app/presenters/decidim/push_notification_presenter.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for push notifications.
+  #
+  class PushNotificationPresenter < SimpleDelegator
+    def title
+      event_class.constantize.model_name.human
+    end
+
+    def body
+      # Not using Rails sanitizers here because they escape HTML entities (i.e &amp;) and we want to keep them
+      Nokogiri::HTML(event_class_instance.notification_title).text if event_class_instance.notification_title.present?
+    end
+
+    def icon
+      user.organization.attached_uploader(:favicon).variant_url(:big, host: user.organization.host)
+    end
+
+    def url
+      event_class_instance.resource_url
+    end
+  end
+end
diff --git a/decidim-core/app/presenters/decidim/stats_presenter.rb b/decidim-core/app/presenters/decidim/stats_presenter.rb
index edc5e4ec36150..d1b73a4b41879 100644
--- a/decidim-core/app/presenters/decidim/stats_presenter.rb
+++ b/decidim-core/app/presenters/decidim/stats_presenter.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # A general presenter to render statistics in participatory spaces.
-  class StatsPresenter < Rectify::Presenter
+  class StatsPresenter < SimpleDelegator
     def comments_stats(name)
       comments = Decidim.component_manifests.map do |component_manifest|
         component_manifest.stats.only([:comments_count])
diff --git a/decidim-core/app/presenters/decidim/validation_errors_presenter.rb b/decidim-core/app/presenters/decidim/validation_errors_presenter.rb
index 1865b2b29f430..a60e3f6b3b4e1 100644
--- a/decidim-core/app/presenters/decidim/validation_errors_presenter.rb
+++ b/decidim-core/app/presenters/decidim/validation_errors_presenter.rb
@@ -4,7 +4,7 @@ module Decidim
   #
   # Decorator to format validation errors of a form in html format
   #
-  class ValidationErrorsPresenter < Rectify::Presenter
+  class ValidationErrorsPresenter < SimpleDelegator
     include Decidim::SanitizeHelper
 
     attr_reader :error, :form
diff --git a/decidim-core/app/queries/decidim/messaging/user_conversations.rb b/decidim-core/app/queries/decidim/messaging/user_conversations.rb
index b88f8c4f1de3b..26ebf1deecd1d 100644
--- a/decidim-core/app/queries/decidim/messaging/user_conversations.rb
+++ b/decidim-core/app/queries/decidim/messaging/user_conversations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Messaging
     # A class used to find the conversations a user is participating in.
-    class UserConversations < Rectify::Query
+    class UserConversations < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which processes can manage
diff --git a/decidim-core/app/queries/decidim/metric_manage.rb b/decidim-core/app/queries/decidim/metric_manage.rb
index 9a5f2f6eefe3c..4c9c11f499be8 100644
--- a/decidim-core/app/queries/decidim/metric_manage.rb
+++ b/decidim-core/app/queries/decidim/metric_manage.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # This class search for objects related to Metrics, and creates a new registry within
-  # his own parameters
+  # its own parameters
   class MetricManage
     def self.for(day_string, organization)
       new(day_string, organization)
diff --git a/decidim-core/app/queries/decidim/own_activities.rb b/decidim-core/app/queries/decidim/own_activities.rb
new file mode 100644
index 0000000000000..1a22e159965b3
--- /dev/null
+++ b/decidim-core/app/queries/decidim/own_activities.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OwnActivities < PublicActivities
+    private
+
+    def visibility
+      %w(private-only public-only all)
+    end
+  end
+end
diff --git a/decidim-core/app/queries/decidim/participatory_processes_with_user_role.rb b/decidim-core/app/queries/decidim/participatory_processes_with_user_role.rb
index 484910aa07557..e97948ed54b76 100644
--- a/decidim-core/app/queries/decidim/participatory_processes_with_user_role.rb
+++ b/decidim-core/app/queries/decidim/participatory_processes_with_user_role.rb
@@ -3,7 +3,7 @@
 module Decidim
   # A class used to find the ParticipatoryProcesses that the given user has
   # the specific role privilege.
-  class ParticipatoryProcessesWithUserRole < Rectify::Query
+  class ParticipatoryProcessesWithUserRole < Decidim::Query
     # Syntactic sugar to initialize the class and return the queried objects.
     #
     # user - a User that needs to find which processes can manage
diff --git a/decidim-core/app/services/decidim/activity_search.rb b/decidim-core/app/queries/decidim/public_activities.rb
similarity index 57%
rename from decidim-core/app/services/decidim/activity_search.rb
rename to decidim-core/app/queries/decidim/public_activities.rb
index 0c6e0dd39a3e2..c68fa10930c72 100644
--- a/decidim-core/app/services/decidim/activity_search.rb
+++ b/decidim-core/app/queries/decidim/public_activities.rb
@@ -1,100 +1,60 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A class to search for recent activity performed in a Decidim Organization.
-  # It is intended to be used in the user profile, to retrieve activity and
-  # timeline for that user.
+  # This query finds the public ActionLog entries that can be shown in the
+  # participant views of the application within a Decidim Organization. It is
+  # intended to be used in the user profile, to retrieve activity and timeline
+  # for that user.
   #
-  # It will return any action for a given resource, except `create` on resources
-  # that implement the `Decidim::Publicable` concern to avoid leaking private
-  # data.
+  # This will create the base query for the activities but the resulting query
+  # needs to be scoped with either `with_resource_type` or
+  # `with_new_resource_type` in order to avoid leaking private data.
   #
   # Possible options:
   #
-  # :organization - the `Decidim::Organization` to scope to search. Required.
-  # :user - an optional `Decidim::USer` that performed the activites
+  # :resource_name - an optional name for a resource for searching only that
+  #    type of resources.
+  # :user - an optional `Decidim::User` that performed the activites
+  # :current_user - an optional `Decidim::User` for defining whether to show the
+  #   private log entries that relate to the current user.
   # :follows - a collection of `Decidim::Follow` resources. It will return any
   #   activity affecting any of these resources, performed by any of them or
   #   contained in any of them as spaces.
   # :scopes - a collection of `Decidim::Scope`. It will return any activity that
   #   took place in any of those scopes.
-  class ActivitySearch < Searchlight::Search
-    # Needed by Searchlight, this is the base query that will be used to
-    # append other criteria to the search.
-    def base_query
+  class PublicActivities < Decidim::Query
+    def initialize(organization, options = {})
+      @organization = organization
+      @resource_name = options[:resource_name]
+      @user = options[:user]
+      @current_user = options[:current_user]
+      @follows = options[:follows]
+      @scopes = options[:scopes]
+    end
+
+    def query
       query = ActionLog
-              .where(visibility: %w(public-only all))
-              .where(organization: options.fetch(:organization))
+              .where(visibility: visibility)
+              .where(organization: organization)
 
-      query = query.where(user: options[:user]) if options[:user]
-      query = query.where(resource_type: options[:resource_name]) if options[:resource_name]
+      query = query.where(user: user) if user
+      query = query.where(resource_type: resource_name) if resource_name.present?
 
       query = filter_follows(query)
-      filter_hidden(query)
-    end
-
-    # Overwrites the default Searchlight run method since we want to return
-    # activities in an specific order but we need to set it at the end of the chain.
-    def run
-      super.order(created_at: :desc)
-    end
-
-    # Adds a constrain to filter by resource type(s).
-    def search_resource_type
-      if resource_types.include?(resource_type)
-        scope_for(resource_type)
-      else
-        all_resources_scope
-      end
-    end
+      query = filter_hidden(query)
 
-    # All the resource types that are eligible to be included as an activity.
-    def resource_types
-      @resource_types ||= %w(
-        Decidim::Accountability::Result
-        Decidim::Blogs::Post
-        Decidim::Comments::Comment
-        Decidim::Consultations::Question
-        Decidim::Debates::Debate
-        Decidim::Meetings::Meeting
-        Decidim::Proposals::Proposal
-        Decidim::Surveys::Survey
-        Decidim::Assembly
-        Decidim::Consultation
-        Decidim::Initiative
-        Decidim::ParticipatoryProcess
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+      query.order(created_at: :desc)
     end
 
     private
 
-    def publicable_resource_types
-      @publicable_resource_types ||= resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
-    end
-
-    def scope_for(resource_type)
-      if publicable_resource_types.include?(resource_type)
-        query.where(resource_type: resource_type).where.not(action: "create")
-      else
-        query.where(resource_type: resource_type)
-      end
-    end
+    attr_reader :organization, :resource_name, :user, :current_user, :follows, :scopes
 
-    def all_resources_scope
-      query
-        .where(
-          "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
-          "create",
-          publicable_resource_types,
-          (resource_types - publicable_resource_types)
-        )
+    def visibility
+      %w(public-only all)
     end
 
     def filter_follows(query)
-      follows = options[:follows]
-      interesting_scopes = options[:scopes]
       conditions = []
 
       if follows.present?
@@ -108,14 +68,12 @@ def filter_follows(query)
         conditions += followed_spaces_conditions(follows)
       end
 
-      conditions += interesting_scopes_conditions(interesting_scopes)
+      conditions += interesting_scopes_conditions(scopes)
 
       return query if conditions.empty?
 
       chained_conditions = conditions.inject do |previous_condition, condition|
-        next condition unless previous_condition
-
-        previous_condition.or(condition)
+        previous_condition.present? ? previous_condition.or(condition) : condition
       end
 
       query.where(chained_conditions)
@@ -134,7 +92,7 @@ def filter_hidden(query)
 
       # Filter out the private space items that should not be visible for the
       # current user.
-      current_user_id = options.fetch(:current_user, nil)&.id.to_i
+      current_user_id = current_user&.id.to_i
       Decidim.participatory_space_manifests.map do |manifest|
         klass = manifest.model_class_name.constantize
         next unless klass.include?(Decidim::HasPrivateUsers)
diff --git a/decidim-core/app/queries/decidim/public_components.rb b/decidim-core/app/queries/decidim/public_components.rb
index de70d7ccfe826..22cb754c15eb3 100644
--- a/decidim-core/app/queries/decidim/public_components.rb
+++ b/decidim-core/app/queries/decidim/public_components.rb
@@ -3,7 +3,7 @@
 module Decidim
   # This query finds the published components for all public participatory
   # spaces in the given organization. Can filter by manifest name.
-  class PublicComponents < Rectify::Query
+  class PublicComponents < Decidim::Query
     def self.for(organization, manifest_name: nil)
       new(organization, manifest_name: manifest_name).query
     end
diff --git a/decidim-core/app/queries/decidim/similar_emendations.rb b/decidim-core/app/queries/decidim/similar_emendations.rb
index 1ed4b2844635d..2cafdacb60125 100644
--- a/decidim-core/app/queries/decidim/similar_emendations.rb
+++ b/decidim-core/app/queries/decidim/similar_emendations.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   # Class used to retrieve similar emendations, scoped to the current component.
-  class SimilarEmendations < Rectify::Query
+  class SimilarEmendations < Decidim::Query
     include Decidim::TranslationsHelper
 
     # Syntactic sugar to initialize the class and return the queried objects.
diff --git a/decidim-core/app/queries/decidim/stats_users_count.rb b/decidim-core/app/queries/decidim/stats_users_count.rb
index a413f3609c089..e3614bfdb1f69 100644
--- a/decidim-core/app/queries/decidim/stats_users_count.rb
+++ b/decidim-core/app/queries/decidim/stats_users_count.rb
@@ -3,7 +3,7 @@
 module Decidim
   # This query counts registered users from a collection of organizations
   # in an optional interval of time.
-  class StatsUsersCount < Rectify::Query
+  class StatsUsersCount < Decidim::Query
     def self.for(organization, start_at = nil, end_at = nil)
       new(organization, start_at, end_at).query
     end
diff --git a/decidim-core/app/queries/decidim/user_groups/accepted_memberships.rb b/decidim-core/app/queries/decidim/user_groups/accepted_memberships.rb
index 8ba4facb8c21b..5160d19691ce6 100644
--- a/decidim-core/app/queries/decidim/user_groups/accepted_memberships.rb
+++ b/decidim-core/app/queries/decidim/user_groups/accepted_memberships.rb
@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the accepted memberships of the given user group.
-    class AcceptedMemberships < Rectify::Query
+    class AcceptedMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its accepted memberships
diff --git a/decidim-core/app/queries/decidim/user_groups/accepted_user_groups.rb b/decidim-core/app/queries/decidim/user_groups/accepted_user_groups.rb
index 57c1062f8ef88..31185490fb09b 100644
--- a/decidim-core/app/queries/decidim/user_groups/accepted_user_groups.rb
+++ b/decidim-core/app/queries/decidim/user_groups/accepted_user_groups.rb
@@ -5,7 +5,7 @@ module UserGroups
     # Use this class to find the user groups the given user is accepted. In order
     # to calculate this, we get those groups where the user has a role of
     # member, creator or admin.
-    class AcceptedUserGroups < Rectify::Query
+    class AcceptedUserGroups < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find the groups where they are accepted
diff --git a/decidim-core/app/queries/decidim/user_groups/accepted_users.rb b/decidim-core/app/queries/decidim/user_groups/accepted_users.rb
index 3ba4efaf36ba1..1fd7fcb5ed2e3 100644
--- a/decidim-core/app/queries/decidim/user_groups/accepted_users.rb
+++ b/decidim-core/app/queries/decidim/user_groups/accepted_users.rb
@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the accepted members of the given user group.
-    class AcceptedUsers < Rectify::Query
+    class AcceptedUsers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its accepted members
diff --git a/decidim-core/app/queries/decidim/user_groups/admin_memberships.rb b/decidim-core/app/queries/decidim/user_groups/admin_memberships.rb
index ab26a2c474e3b..ce44358a8a4ee 100644
--- a/decidim-core/app/queries/decidim/user_groups/admin_memberships.rb
+++ b/decidim-core/app/queries/decidim/user_groups/admin_memberships.rb
@@ -4,7 +4,7 @@ module Decidim
   module UserGroups
     # Use this class to find the the admins of the given user group with the
     # "admin" role. It returns memberships.
-    class AdminMemberships < Rectify::Query
+    class AdminMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its admin users
diff --git a/decidim-core/app/queries/decidim/user_groups/invited_memberships.rb b/decidim-core/app/queries/decidim/user_groups/invited_memberships.rb
index 3c38b0445ca2a..61969f18d1761 100644
--- a/decidim-core/app/queries/decidim/user_groups/invited_memberships.rb
+++ b/decidim-core/app/queries/decidim/user_groups/invited_memberships.rb
@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the invitations to user groups the given user has.
-    class InvitedMemberships < Rectify::Query
+    class InvitedMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which groups they have been invited to
diff --git a/decidim-core/app/queries/decidim/user_groups/manageable_user_groups.rb b/decidim-core/app/queries/decidim/user_groups/manageable_user_groups.rb
index 78d38b7764464..2084814cbde6f 100644
--- a/decidim-core/app/queries/decidim/user_groups/manageable_user_groups.rb
+++ b/decidim-core/app/queries/decidim/user_groups/manageable_user_groups.rb
@@ -5,7 +5,7 @@ module UserGroups
     # Use this class to find the user groups the given user can manage. In order
     # to calculate this, we get those groups where the user has a role of
     # creator or admin.
-    class ManageableUserGroups < Rectify::Query
+    class ManageableUserGroups < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which groups can manage
diff --git a/decidim-core/app/queries/decidim/user_groups/member_memberships.rb b/decidim-core/app/queries/decidim/user_groups/member_memberships.rb
index f833cc2af41c3..441b8457b7b44 100644
--- a/decidim-core/app/queries/decidim/user_groups/member_memberships.rb
+++ b/decidim-core/app/queries/decidim/user_groups/member_memberships.rb
@@ -4,7 +4,7 @@ module Decidim
   module UserGroups
     # Use this class to find the the members of the given user group with the
     # "member" role. It returns memberships.
-    class MemberMemberships < Rectify::Query
+    class MemberMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its member users
diff --git a/decidim-core/app/scrubbers/decidim/admin_input_scrubber.rb b/decidim-core/app/scrubbers/decidim/admin_input_scrubber.rb
new file mode 100644
index 0000000000000..13ad3b49ef1f0
--- /dev/null
+++ b/decidim-core/app/scrubbers/decidim/admin_input_scrubber.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Use this class as a scrubber to sanitize admin user input. The default
+  # scrubbed provided by Rails does not allow `iframe`s, and we're using
+  # them to embed videos, so we need to provide a whole new scrubber.
+  #
+  # Example:
+  #
+  #    sanitize(@page.body, scrubber: Decidim::AdminInputScrubber.new)
+  #
+  # Lists of default tags and attributes are extracted from
+  # https://stackoverflow.com/a/35073814/2110884.
+  class AdminInputScrubber < UserInputScrubber
+    private
+
+    def custom_allowed_attributes
+      super + %w(frameborder allowfullscreen) - %w(onerror)
+    end
+
+    def custom_allowed_tags
+      super + %w(comment iframe)
+    end
+  end
+end
diff --git a/decidim-core/app/scrubbers/decidim/user_input_scrubber.rb b/decidim-core/app/scrubbers/decidim/user_input_scrubber.rb
index 0feb9c0bef717..c32321d41dce5 100644
--- a/decidim-core/app/scrubbers/decidim/user_input_scrubber.rb
+++ b/decidim-core/app/scrubbers/decidim/user_input_scrubber.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Use this class as a scrubber to sanitize user input. The default
-  # scrubbed provided by Rails does not allow `iframe`s, and we're using
-  # them to embed videos, so we need to provide a whole new scrubber.
+  # Use this class as a scrubber to sanitize participant user input.
   #
   # Example:
   #
@@ -21,11 +19,11 @@ def initialize
     private
 
     def custom_allowed_attributes
-      Loofah::HTML5::SafeList::ALLOWED_ATTRIBUTES + %w(frameborder allowfullscreen) - %w(onerror)
+      Loofah::HTML5::SafeList::ALLOWED_ATTRIBUTES
     end
 
     def custom_allowed_tags
-      Loofah::HTML5::SafeList::ALLOWED_ELEMENTS_WITH_LIBXML2 + %w(iframe)
+      Loofah::HTML5::SafeList::ALLOWED_ELEMENTS_WITH_LIBXML2
     end
   end
 end
diff --git a/decidim-core/app/services/decidim/data_portability_exporter.rb b/decidim-core/app/services/decidim/download_your_data_exporter.rb
similarity index 87%
rename from decidim-core/app/services/decidim/data_portability_exporter.rb
rename to decidim-core/app/services/decidim/download_your_data_exporter.rb
index 8aa0258609b88..a8633f50d7e84 100644
--- a/decidim-core/app/services/decidim/data_portability_exporter.rb
+++ b/decidim-core/app/services/decidim/download_your_data_exporter.rb
@@ -9,11 +9,11 @@ module Decidim
   # somewhere so users can download their data.
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
-  class DataPortabilityExporter
+  class DownloadYourDataExporter
     include ::Decidim::ZipStream::Writer
 
     DEFAULT_EXPORT_FORMAT = "CSV"
-    ZIP_FILE_NAME = "data-portability.zip"
+    ZIP_FILE_NAME = "download-your-data.zip"
 
     # Public: Initializes the class.
     #
@@ -56,18 +56,18 @@ def data_for(user, format)
       export_data = []
       export_attachments = []
 
-      data_portability_entities.each do |object|
+      download_your_data_entities.each do |object|
         klass = Object.const_get(object)
         export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
-        attachments = klass.data_portability_images(user)
+        attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
 
       [export_data, export_attachments]
     end
 
-    def data_portability_entities
-      @data_portability_entities ||= DataPortabilitySerializers.data_entities
+    def download_your_data_entities
+      @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
   end
 end
diff --git a/decidim-core/app/services/decidim/email_notification_generator.rb b/decidim-core/app/services/decidim/email_notification_generator.rb
index e27584fc7f25e..edca51eaa9069 100644
--- a/decidim-core/app/services/decidim/email_notification_generator.rb
+++ b/decidim-core/app/services/decidim/email_notification_generator.rb
@@ -54,7 +54,7 @@ def generate
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 
     # Private: sends the notification email to the user if they have the
-    # `email_on_notification` flag active.
+    # `notifications_sending_frequency` set to real_time.
     #
     # recipient - The user that will receive the email.
     # user_role - the role the user takes for this notification (either
@@ -63,7 +63,7 @@ def generate
     # Returns nothing.
     def send_email_to(recipient, user_role:)
       return unless recipient
-      return unless recipient.email_on_notification?
+      return unless recipient.notifications_sending_frequency == "real_time"
       return if resource.respond_to?(:can_participate?) && !resource.can_participate?(recipient)
 
       wait_time = 0
diff --git a/decidim-core/app/services/decidim/engine_resolver.rb b/decidim-core/app/services/decidim/engine_resolver.rb
new file mode 100644
index 0000000000000..70ff96ffd4eb3
--- /dev/null
+++ b/decidim-core/app/services/decidim/engine_resolver.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class can be used to resolve the mounted route based on the current
+  # routes in any provided context.
+  class EngineResolver
+    # Initializes the engine resolver instance.
+    #
+    # @param current_routes [ActionDispatch::Routing::RouteSet] the route set
+    #  for the context
+    def initialize(current_routes)
+      @current_routes = current_routes
+    end
+
+    # Resolves the mounted route name for the provided context.
+    #
+    # @return [String] The resolved route name or "decidim" if it could not be
+    #   resolved
+    def mounted_name
+      return "main_app" if base_engine.routes == current_routes
+
+      route = find_mounted_route(base_engine)
+      route&.name || "decidim"
+    end
+
+    private
+
+    attr_reader :current_routes
+
+    # Provides the base engine from which the search is started from.
+    #
+    # @return [Rails::Engine] The engine to start the search from
+    def base_engine
+      Rails.application
+    end
+
+    # Finds the mounted route for current context based on the current routes.
+    #
+    # @param target_engine [Rails::Engine] The engine from which the search is
+    #   performed.
+    # @return [ActionDispatch::Journey::Route] The defined route that matches
+    #   the current context based on the current routes provided for the
+    #   initializer.
+    def find_mounted_route(target_engine)
+      target_engine.routes.set.each do |route|
+        # If the route is a dispatcher
+        # (ActionDispatch::Routing::RouteSet::Dispatcher), it won't have an
+        # engine app mapped to it in which case the app won't respond to the
+        # `routes` method.
+        next if route.dispatcher?
+        next unless route.app.app.is_a?(Class)
+        next unless route.app.app < Rails::Engine
+
+        # route.app -> ActionDispatch::Routing::Mapper::Constraints
+        # route.app.app -> the target engine
+        return route if route.app.app.routes == current_routes
+
+        # Test the sub-engines if any engines are mounted to this engine.
+        sub = find_mounted_route(route.app.app)
+        return sub if sub
+      end
+
+      nil
+    end
+  end
+end
diff --git a/decidim-core/app/services/decidim/events_manager.rb b/decidim-core/app/services/decidim/events_manager.rb
index ea2c0f5f18c6a..ec90853657306 100644
--- a/decidim-core/app/services/decidim/events_manager.rb
+++ b/decidim-core/app/services/decidim/events_manager.rb
@@ -27,8 +27,8 @@ class EventsManager
     def self.publish(event:, resource:, event_class: Decidim::Events::BaseEvent, affected_users: [], followers: [], extra: {}, force_send: false)
       ActiveSupport::Notifications.publish(
         event,
-        event_class: event_class.name,
         resource: resource,
+        event_class: event_class.name,
         affected_users: affected_users.uniq.compact,
         followers: followers.uniq.compact,
         force_send: force_send,
diff --git a/decidim-core/app/services/decidim/home_activity_search.rb b/decidim-core/app/services/decidim/home_activity_search.rb
deleted file mode 100644
index 6d9b6767ffaf3..0000000000000
--- a/decidim-core/app/services/decidim/home_activity_search.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A class to search for recent activity performed in a Decidim Organization.
-  # It will only return the `Decidim::ActionLog` rows that have an action as
-  # `created` or `published`.
-  #
-  # This class is thought to be used in the `LastActivityCell` uniquely.
-  class HomeActivitySearch < Searchlight::Search
-    # Needed by Searchlight, this is the base query that will be used to
-    # append other criteria to the search.
-    def base_query
-      ActionLog
-        .where(visibility: %w(public-only all))
-        .where(organization: options.fetch(:organization))
-    end
-
-    # Overwrites the default Searchlight run method since we want to return
-    # activities in an specific order but we need to set it at the end of the chain.
-    def run
-      super.order(created_at: :desc)
-    end
-
-    # Adds a constrain to filter by resource type(s).
-    def search_resource_type
-      if resource_types.include?(resource_type)
-        scope_for(resource_type)
-      else
-        all_resources_scope
-      end
-    end
-
-    # All the resource types that are eligible to be included as an activity.
-    def resource_types
-      @resource_types ||= %w(
-        Decidim::Accountability::Result
-        Decidim::Blogs::Post
-        Decidim::Comments::Comment
-        Decidim::Consultations::Question
-        Decidim::Debates::Debate
-        Decidim::Meetings::Meeting
-        Decidim::Proposals::Proposal
-        Decidim::Surveys::Survey
-        Decidim::Assembly
-        Decidim::Consultation
-        Decidim::Initiative
-        Decidim::ParticipatoryProcess
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
-    end
-
-    private
-
-    def publicable_resource_types
-      @publicable_resource_types ||= resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
-    end
-
-    def scope_for(resource_type)
-      action = if publicable_resource_types.include?(resource_type)
-                 "publish"
-               else
-                 "create"
-               end
-
-      query.where(resource_type: resource_type, action: action)
-    end
-
-    def all_resources_scope
-      query
-        .where(
-          "(action = ? AND resource_type IN (?)) OR (action = ? AND resource_type IN (?))",
-          "publish",
-          publicable_resource_types,
-          "create",
-          (resource_types - publicable_resource_types)
-        )
-    end
-  end
-end
diff --git a/decidim-core/app/services/decidim/iframe_disabler.rb b/decidim-core/app/services/decidim/iframe_disabler.rb
new file mode 100644
index 0000000000000..522eaf56b80e2
--- /dev/null
+++ b/decidim-core/app/services/decidim/iframe_disabler.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  class IframeDisabler
+    def initialize(text, _options = {})
+      @text = text
+    end
+
+    def perform
+      @document = Nokogiri::HTML::DocumentFragment.parse(@text)
+      disable_iframes(@document)
+      document.to_html
+    end
+
+    private
+
+    attr_reader :document
+
+    def disable_iframes(node)
+      if node.name == "iframe"
+        orig_node = node.to_s
+        node.replace(%(<div class="disabled-iframe"><!-- #{orig_node} --></div>))
+      end
+
+      node.children.each do |child|
+        disable_iframes(child)
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/services/decidim/notification_generator_for_recipient.rb b/decidim-core/app/services/decidim/notification_generator_for_recipient.rb
index 093c7d22c1c23..d8909f3111f34 100644
--- a/decidim-core/app/services/decidim/notification_generator_for_recipient.rb
+++ b/decidim-core/app/services/decidim/notification_generator_for_recipient.rb
@@ -31,7 +31,7 @@ def generate
       return unless resource
       return unless recipient
 
-      notification.save!
+      notification if notification.save!
     end
 
     private
diff --git a/decidim-core/app/services/decidim/notifications_digest_sending_decider.rb b/decidim-core/app/services/decidim/notifications_digest_sending_decider.rb
new file mode 100644
index 0000000000000..7b8b43c2d264f
--- /dev/null
+++ b/decidim-core/app/services/decidim/notifications_digest_sending_decider.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  class NotificationsDigestSendingDecider
+    class << self
+      def must_notify?(user, time: Time.now.utc)
+        return true if user.digest_sent_at.blank?
+
+        # Note that we are checking whether the notifications were sent at any
+        # time during the assumed sending day moment to prevent potential issues
+        # during the sending if the digest_sent_at is set to some other moment
+        # than the exact beginning of that day.
+        case user.notifications_sending_frequency.to_sym
+        when :none then false
+        when :daily then user.digest_sent_at <= (time - 1.day).end_of_day
+        when :weekly then user.digest_sent_at <= (time - 1.day - 1.week).end_of_day
+        else true
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/services/decidim/notifications_subscriptions_persistor.rb b/decidim-core/app/services/decidim/notifications_subscriptions_persistor.rb
new file mode 100644
index 0000000000000..49742ac30a78d
--- /dev/null
+++ b/decidim-core/app/services/decidim/notifications_subscriptions_persistor.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class manages the creation and deletion of user notifications
+
+  class NotificationsSubscriptionsPersistor
+    attr_reader :user
+
+    def initialize(user)
+      @user = user
+    end
+
+    def add_subscription(params)
+      subscriptions = user.notification_settings["subscriptions"] || {}
+      filtered_params = filter_params(params)
+      new_subscription = { filtered_params[:auth] => filtered_params }
+      user.notification_settings["subscriptions"] = subscriptions.merge(new_subscription)
+      user.save
+    end
+
+    def delete_subscription(auth_key)
+      subscriptions = user.notification_settings["subscriptions"] || {}
+      user.notification_settings["subscriptions"] = subscriptions.except(auth_key)
+      user.save
+    end
+
+    private
+
+    def filter_params(params)
+      {
+        auth: params[:keys][:auth],
+        p256dh: params[:keys][:p256dh],
+        endpoint: params[:endpoint]
+      }
+    end
+  end
+end
diff --git a/decidim-core/app/services/decidim/open_data_exporter.rb b/decidim-core/app/services/decidim/open_data_exporter.rb
index 839c39c50c9fb..9a42182fe765c 100644
--- a/decidim-core/app/services/decidim/open_data_exporter.rb
+++ b/decidim-core/app/services/decidim/open_data_exporter.rb
@@ -23,7 +23,7 @@ def initialize(organization, path)
     def export
       dirname = File.dirname(path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      File.open(path, "wb") { |file| file.write(data) }
+      File.binwrite(path, data)
     end
 
     private
diff --git a/decidim-core/app/services/decidim/participatory_space_search.rb b/decidim-core/app/services/decidim/participatory_space_search.rb
deleted file mode 100644
index 84175fe8948cb..0000000000000
--- a/decidim-core/app/services/decidim/participatory_space_search.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This is the base class to be used by other ParticipatorySpace search services
-  # Searchlight documentation: https://github.com/nathanl/searchlight
-  class ParticipatorySpaceSearch < Searchlight::Search
-    # Initialize the Searchlight::Search base class with the options provided.
-    #
-    # scope   - The scope used to create the base query
-    # options - A hash of options to modify the search. These options will be
-    #          converted to methods by SearchLight so they can be used on filter
-    #          methods. (Default {})
-    def initialize(scope, options = {})
-      super(options)
-      @scope = scope
-    end
-
-    # Creates the SearchLight base query.
-    def base_query
-      @scope = @scope.where(organization: organization)
-      @scope = @scope.published if @scope.respond_to?(:published)
-      @scope = @scope.visible_for(current_user) if @scope.respond_to?(:visible_for)
-    end
-
-    # Handles the scope_id filter.
-    def search_scope_id
-      clean_scope_ids = if scope_id.is_a?(Hash)
-                          scope_id.values
-                        else
-                          [scope_id].flatten
-                        end
-      conditions = []
-      conditions << "decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
-      conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
-
-      query.includes(:scope).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
-    end
-
-    # Handle the area_id filter
-    def search_area_id
-      query.includes(:area).where(decidim_area_id: area_id)
-    end
-
-    private
-
-    def organization
-      options[:organization]
-    end
-
-    def current_user
-      options[:current_user]
-    end
-  end
-end
diff --git a/decidim-core/app/services/decidim/resource_search.rb b/decidim-core/app/services/decidim/resource_search.rb
index 7f3bfad0610b7..815eaee307901 100644
--- a/decidim-core/app/services/decidim/resource_search.rb
+++ b/decidim-core/app/services/decidim/resource_search.rb
@@ -1,177 +1,30 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This is the base class to be used by other search services.
-  # Searchlight documentation: https://github.com/nathanl/searchlight
-  class ResourceSearch < Searchlight::Search
-    attr_reader :user, :organization, :component
+  # This is the base class to be used by other search services. This helps the
+  # searches to work with context attributes that are not passed from the user
+  # interface.
+  class ResourceSearch < Ransack::Search
+    attr_reader :user, :organization, :component, :search_context
 
-    # Initialize the Searchlight::Search base class with the options provided.
-    #
-    # scope   - The scope used to create the base query
-    # options - A hash of options to modify the search. These options will be
-    #          converted to methods by SearchLight so they can be used on filter
-    #          methods. (Default {})
-    def initialize(scope, options = {})
-      super(options)
-      @scope = scope
+    def initialize(object, params = {}, options = {})
       @user = options[:current_user] || options[:user]
       @component = options[:component]
       @organization = options[:organization] || component&.organization
-    end
-
-    # Public: Companion method to `search_search_text` which defines the
-    # attributes where we should search for text values in a model.
-    def self.text_search_fields(*fields)
-      @text_search_fields = fields if fields.any?
-      @text_search_fields
-    end
-
-    # Handle the search_text filter. We have to cast the JSONB columns
-    # into a `text` type so that we can search.
-    def search_search_text
-      return query unless self.class.text_search_fields.any?
-
-      fields = self.class.text_search_fields.dup
-
-      text_query = query.where(localized_search_text_in("#{query.model_name.plural}.#{fields.shift}"), text: "%#{search_text}%")
-
-      fields.each do |field|
-        text_query = text_query.or(query.where(localized_search_text_in("#{query.model_name.plural}.#{field}"), text: "%#{search_text}%"))
-      end
-      text_query
-    end
-
-    # Creates the SearchLight base query.
-    # Check if the option component was provided.
-    def base_query
-      raise "Missing component" unless component
-
-      @scope.where(component: component)
-    end
-
-    # Handle the category_id filter
-    def search_category_id
-      return query if category_ids.include?("all")
-
-      query
-        .includes(:categorization)
-        .where(decidim_categorizations: { decidim_category_id: all_category_ids })
-    end
-
-    # Handles the scope_ids filter. When we want to show only those that do not
-    # have a scope_ids set, we cannot pass an empty String or nil because Searchlight
-    # will automatically filter out these params, so the method will not be used.
-    # Instead, we need to pass a fake ID and then convert it inside. In this case,
-    # in order to select those elements that do not have a scope_ids set we use
-    # `"global"` as parameter, and in the method we do the needed changes to search
-    # properly.
-    def search_scope_id
-      return query if scope_ids.include?("all")
-
-      clean_scope_ids = scope_ids
-
-      conditions = []
-      conditions << "#{query.model_name.plural}.decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
-      conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
-
-      query.includes(:scope).references(:decidim_scopes).where(Arel.sql(conditions.join(" OR ")).to_s, *clean_scope_ids.map(&:to_i))
-    end
-
-    # Handle the origin filter.
-    def search_origin
-      renamed_origin = Array(origin).map do |search_value|
-        "#{search_value}_origin"
-      end
-      apply_scopes(%w(official_origin citizens_origin user_group_origin meeting_origin), renamed_origin)
-    end
-
-    # We overwrite the `results` method to ensure we only return unique
-    # results. We can't use `#uniq` because it returns an Array and we're
-    # adding scopes in the controller, and `#distinct` doesn't work here
-    # because in the later scopes we're ordering by `RANDOM()` in a DB level,
-    # and `SELECT DISTINCT` doesn't work with `RANDOM()` sorting, so we need
-    # to perform two queries.
-    #
-    # The correct behaviour is backed by tests.
-    def results
-      base_query.model.where(id: super.pluck(:id))
-    end
-
-    private
-
-    # Private: To be used by classes that inherit from ResourceSearch.
-    #
-    # This method is useful when the values of the filters match the names of
-    # defined scopes in a model, it applies those scopes that are included in
-    # the search values.
-    #
-    # Example:
-    #   Consider you want to filter by state, and your model has an `open` and
-    #   a `closed` ActiveRecord scope.
-    #
-    #   def search_state
-    #     apply_scopes(%w(open closed), state)
-    #   end
-    #
-    #   In this scenario, the `state` variable has the input by the use, who
-    #   has selected which states they want to see. `states` here is an array
-    #   of strings.
-    #
-    # Returns an ActiveRecord::Relation.
-    def apply_scopes(scopes, search_values)
-      search_values = Array(search_values)
-
-      conditions = scopes.map do |scope|
-        search_values.member?(scope.to_s) ? query.try(scope) : nil
-      end.compact
-
-      return query unless conditions.any?
-
-      scoped_query = query.where(id: conditions.shift)
-
-      conditions.each do |condition|
-        scoped_query = scoped_query.or(query.where(id: condition))
-      end
-
-      scoped_query
-    end
-
-    # Private: Creates an array of category ids.
-    # It contains categories' subcategories ids as well.
-    def all_category_ids
-      cat_ids = category_ids.without("without")
-
-      component
-        .categories
-        .where(id: cat_ids)
-        .or(component.categories.where(parent_id: cat_ids))
-        .pluck(:id).tap { |ids| ids.prepend(nil) if category_ids.include?("without") }
-    end
-
-    # Private: Returns an array with checked category ids.
-    def category_ids
-      Array(category_id)
-    end
+      @search_context = options[:search_context] || :participants
+      configure(options)
 
-    # Private: Returns an array with checked scope ids.
-    def scope_ids
-      if scope_id.is_a?(Hash)
-        scope_id.values
-      else
-        Array(scope_id)
-      end
+      # The super method calls the build method in the super class, which can be
+      # overridden by the individual search implementations, so call this as the
+      # last thing at the initialize method. The params are passed to the
+      # build method as the only argument.
+      super
     end
 
-    # Internal: builds the needed query to search for a text in the organization's
-    # available locales. Note that it is intended to be used as follows:
-    #
-    # Example:
-    #   Resource.where(localized_search_text_for(:title, text: "my_query"))
-    #
-    # The Hash with the `:text` key is required or it won't work.
-    def localized_search_text_in(field)
-      organization.available_locales.map { |l| "#{field} ->> '#{l}' ILIKE :text" }.join(" OR ")
+    def configure(options)
+      # This can be overridden by the search implementations in order to set
+      # extra variables based on the options passed to the search class before
+      # calling the build method below.
     end
   end
 end
diff --git a/decidim-core/app/services/decidim/send_push_notification.rb b/decidim-core/app/services/decidim/send_push_notification.rb
new file mode 100644
index 0000000000000..75405579288fe
--- /dev/null
+++ b/decidim-core/app/services/decidim/send_push_notification.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "webpush"
+
+module Decidim
+  # This class generates a notification based on the given event, for the given
+  # resource/recipient couple. It is intended to be used by the
+  # `Decidim::NotificationGenerator` class, which schedules a job for each recipient
+  # of the event, so that we can easily control which jobs fail.
+
+  class SendPushNotification
+    include ActionView::Helpers::UrlHelper
+
+    # Send the push notification. Returns `nil` if the user didn't allowed push notifications
+    # or if the subscription to push notifications doesn't exist
+    #
+    # Returns the result of the dispatch or nil if user or subscription are empty
+    def perform(notification)
+      return unless Rails.application.secrets.vapid[:enabled]
+
+      I18n.with_locale(notification.user.locale || notification.user.organization.default_locale) do
+        notification.user.notifications_subscriptions.values.map do |subscription|
+          message_params = notification_params(Decidim::PushNotificationPresenter.new(notification))
+          payload = build_payload(message_params, subscription)
+          # Capture webpush exceptions in order to avoid this call to be repeated by the background job runner
+          # Webpush::Error class is the parent class of all defined errors
+          begin
+            Webpush.payload_send(**payload)
+          rescue Webpush::Error => e
+            Rails.logger.warn("[ERROR] Push notification delivery failed due to #{e.message}")
+            nil
+          end
+        end.compact
+      end
+    end
+
+    private
+
+    def notification_params(notification)
+      {
+        title: notification.title,
+        body: notification.body,
+        icon: notification.icon,
+        data: { url: notification.url }
+      }
+    end
+
+    def build_payload(message_params, subscription)
+      {
+        message: JSON.generate(message_params),
+        endpoint: subscription["endpoint"],
+        p256dh: subscription["p256dh"],
+        auth: subscription["auth"],
+        vapid: {
+          public_key: Rails.application.secrets.vapid[:public_key],
+          private_key: Rails.application.secrets.vapid[:private_key]
+        }
+      }
+    end
+  end
+end
diff --git a/decidim-core/app/services/decidim/traceability.rb b/decidim-core/app/services/decidim/traceability.rb
index d762574c06e7b..f451ba6d25da7 100644
--- a/decidim-core/app/services/decidim/traceability.rb
+++ b/decidim-core/app/services/decidim/traceability.rb
@@ -64,7 +64,7 @@ def perform_action!(action, resource, author, extra_log_info = {})
           result = block_given? ? yield : nil
           loggable_resource = resource.is_a?(Class) ? result : resource
           log(action, author, loggable_resource, extra_log_info)
-          return result
+          result
         end
       end
     end
diff --git a/decidim-core/app/uploaders/decidim/application_uploader.rb b/decidim-core/app/uploaders/decidim/application_uploader.rb
index 2168a2304dacf..bbdada682e420 100644
--- a/decidim-core/app/uploaders/decidim/application_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/application_uploader.rb
@@ -47,11 +47,7 @@ def variant_url(key, options = {})
       return unless attached?
 
       representable = variant(key)
-      if representable.is_a? ActiveStorage::Attached
-        Rails.application.routes.url_helpers.rails_blob_url(representable.blob, **protocol_option.merge(options))
-      else
-        Rails.application.routes.url_helpers.rails_representation_url(representable, **protocol_option.merge(options))
-      end
+      AssetRouter::Storage.new(representable).url(**options)
     end
 
     def path(options = {})
@@ -68,18 +64,12 @@ def variant_path(key, options = {})
     def remote_url=(url)
       uri = URI.parse(url)
       filename = File.basename(uri.path)
-      file = URI.open(url)
+      file = URI.parse(url).open
       model.send(mounted_as).attach(io: file, filename: filename)
     rescue URI::InvalidURIError
       model.errors.add(mounted_as, :invalid)
     end
 
-    def protocol_option
-      return {} unless Rails.application.config.force_ssl
-
-      { protocol: "https" }
-    end
-
     class << self
       # Each class inherits variants from parents and can define their own
       # variants with the set_variants class method
diff --git a/decidim-core/app/uploaders/decidim/avatar_uploader.rb b/decidim-core/app/uploaders/decidim/avatar_uploader.rb
index faedc3ae5c0ce..649a1d2894657 100644
--- a/decidim-core/app/uploaders/decidim/avatar_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/avatar_uploader.rb
@@ -12,11 +12,11 @@ class AvatarUploader < ImageUploader
     end
 
     def default_url(*)
-      ActionController::Base.helpers.asset_pack_path("media/images/default-avatar.svg")
+      AssetRouter::Pipeline.new("media/images/default-avatar.svg", model: model).url
     end
 
     def default_multiuser_url(*)
-      ActionController::Base.helpers.asset_pack_path("media/images/avatar-multiuser.png")
+      AssetRouter::Pipeline.new("media/images/avatar-multiuser.png", model: model).url
     end
   end
 end
diff --git a/decidim-core/app/uploaders/decidim/cw/attachment_uploader.rb b/decidim-core/app/uploaders/decidim/cw/attachment_uploader.rb
index 89df27a6c6309..14b015e9ea8ae 100644
--- a/decidim-core/app/uploaders/decidim/cw/attachment_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/cw/attachment_uploader.rb
@@ -47,7 +47,7 @@ def validate_dimensions
       return unless image?(self)
 
       manipulate! do |image|
-        raise CarrierWave::IntegrityError, I18n.t("carrierwave.errors.image_too_big") if image.dimensions.any? { |dimension| dimension > max_image_height_or_width }
+        raise CarrierWave::IntegrityError, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > max_image_height_or_width }
 
         image
       end
diff --git a/decidim-core/app/uploaders/decidim/cw/data_portability_uploader.rb b/decidim-core/app/uploaders/decidim/cw/download_your_data_uploader.rb
similarity index 61%
rename from decidim-core/app/uploaders/decidim/cw/data_portability_uploader.rb
rename to decidim-core/app/uploaders/decidim/cw/download_your_data_uploader.rb
index afe1b52982721..1fcf3d86be056 100644
--- a/decidim-core/app/uploaders/decidim/cw/data_portability_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/cw/download_your_data_uploader.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module Decidim::Cw
-  # This class deals with saving data portability Zip Files to App
-  class DataPortabilityUploader < ApplicationUploader
+  # This class deals with saving download your data Zip Files to App
+  class DownloadYourDataUploader < ApplicationUploader
     # Override the directory where uploaded files will be stored.
     def store_dir
-      default_path = "uploads/data-portability/"
+      default_path = "uploads/download-your-data/"
 
       return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
 
diff --git a/decidim-core/app/uploaders/decidim/cw/image_uploader.rb b/decidim-core/app/uploaders/decidim/cw/image_uploader.rb
index 0ae3ab58458a8..ffac55204dbe4 100644
--- a/decidim-core/app/uploaders/decidim/cw/image_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/cw/image_uploader.rb
@@ -48,14 +48,14 @@ def extension_allowlist
     # See https://hackerone.com/reports/390
     def validate_dimensions
       manipulate! do |image|
-        validation_error!(I18n.t("carrierwave.errors.image_too_big")) if image.dimensions.any? { |dimension| dimension > max_image_height_or_width }
+        validation_error!(I18n.t("carrierwave.errors.file_resolution_too_large")) if image.dimensions.any? { |dimension| dimension > max_image_height_or_width }
         image
       end
     end
 
     def validate_size
       manipulate! do |image|
-        validation_error!(I18n.t("carrierwave.errors.image_too_big")) if image.size > maximum_upload_size
+        validation_error!(I18n.t("carrierwave.errors.file_size_too_large")) if image.size > maximum_upload_size
         image
       end
     end
diff --git a/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb b/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
index 0ef477bd9dd44..6141dcb81bb12 100644
--- a/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
+++ b/decidim-core/app/uploaders/decidim/organization_favicon_uploader.rb
@@ -4,8 +4,9 @@ module Decidim
   # This class deals with uploading an organization's favicon.
   class OrganizationFaviconUploader < ImageUploader
     SIZES = {
-      big: 152,
-      medium: 64,
+      huge: 512,
+      big: 192,
+      medium: 180,
       small: 32
     }.freeze
 
diff --git a/decidim-core/app/validators/file_content_type_validator.rb b/decidim-core/app/validators/file_content_type_validator.rb
new file mode 100644
index 0000000000000..2525e32decb18
--- /dev/null
+++ b/decidim-core/app/validators/file_content_type_validator.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# We need to define the validator in the `ActiveModel::Validations` namespace as
+# this is what the `file_validators` uses and this is what gets priority over
+# the root namespace class.
+module ActiveModel
+  module Validations
+    # This validator provides content type validation for uploaded files. Extends
+    # the validator provided by the `file_validators` gem by fixing some weird
+    # messages in that validator.
+    class FileContentTypeValidator
+      private
+
+      alias mark_invalid_original mark_invalid unless private_method_defined?(:mark_invalid_original)
+
+      # This fixes the "weird" error messages such as "(?-mix:image\\/.*)" because
+      # this is the notation Regexp#to_s will return. Instead, we want to show the
+      # inner contents of the regular expressions.
+      #
+      # @see ActiveModel::Validations::FileContentTypeValidator#mark_invalid
+      def mark_invalid(record, attribute, error, option_types)
+        mark_invalid_original(record, attribute, error, invalid_types(option_types))
+      end
+
+      # Converts the configured content type matches to extensions if extensions are
+      # recognized for the specified content type and if not, the content type
+      # string itself.
+      #
+      # @param option_types [Array<Regexp, String>] Array of configured types.
+      # @param allowed_extensions [Array<String>, nil] Array of allowed extensions
+      #   or nil if all extensions are "allowed" (in case we want to show the
+      #   denylist error or hard code the types).
+      # @return [Array<String>] The invalid types as strings.
+      def invalid_types(option_types, allowed_extensions = nil)
+        extensions = []
+        content_types = []
+        option_types.each do |type|
+          # Since the original content types may have endings such as image/.*?, we
+          # want to replace the regexp pattern just with a star with the fallback
+          # option.
+          content_type = (type.try(:source) || type.to_s).gsub(".*?", "*")
+          if (exts = content_type_extensions(content_type, allowed_extensions))
+            extensions += exts
+          else
+            content_types << content_type
+          end
+        end
+
+        extensions.sort + content_types.sort
+      end
+
+      # Resolves the content type extensions through MiniMime or looks up all the
+      # possible extensions for wildcard content types such as `image/*`. For the
+      # wildcard extension types only those listed in the `allowed_extensions` will
+      # be returned.
+      #
+      # @param content_type [String] The content type, such as application/pdf or
+      #   image/*.
+      # @param allowed_extensions [Array, nil] Array of allowed extensions
+      #   or nil if all extensions are "allowed" (in case we want to show the
+      #   denylist error or hard code the types).
+      # @return [Array<String>, nil] An array of the allowed extensions or nil when
+      #   no extensions could be found.
+      def content_type_extensions(content_type, allowed_extensions = nil)
+        extensions =
+          if content_type.ends_with?("/*")
+            main_type = content_type.split("/")[0]
+            extensions_matching(%r{#{main_type}/.*})
+          else
+            extensions_matching(content_type)
+          end
+        return if extensions.count.zero?
+        return extensions unless allowed_extensions
+
+        extensions & allowed_extensions
+      end
+
+      # Looks up the extensions matching the content type lookup based on the
+      # MiniMime content types.
+      #
+      # @param content_type_lookup [String, Regexp] The lookup to be matched
+      #   against.
+      # @return [Array<String>] The array of extensions.
+      def extensions_matching(content_type_lookup)
+        extensions = []
+        File.open(MiniMime::Configuration.ext_db_path).each do |line|
+          info = line.split(/\s+/)
+          next unless info[1].match?(content_type_lookup)
+
+          extensions << info[0]
+        end
+
+        extensions
+      end
+    end
+  end
+end
+
+# This is just to make Zeitwerk happy. The actual validator that gets priority
+# is the class above as all validators in the `ActiveModel::Validations`
+# namespace will be used primarily and only if a matching validator is not found
+# in that namespace, the ones at the root level are used.
+class FileContentTypeValidator < ActiveModel::Validations::FileContentTypeValidator; end
diff --git a/decidim-core/app/validators/passthru_validator.rb b/decidim-core/app/validators/passthru_validator.rb
index 4fea15db3856c..44ff99d5a0be9 100644
--- a/decidim-core/app/validators/passthru_validator.rb
+++ b/decidim-core/app/validators/passthru_validator.rb
@@ -18,6 +18,9 @@
 #     validates :image, passthru: { to: Person, attribute: :avatar_image }
 #   end
 class PassthruValidator < ActiveModel::EachValidator
+  # record - Form object (e.g. Decidim::UploadValidationForm)
+  # attribute - The attribute to validate (e.g. :avatar)
+  # value - Blob's signed id (e.g. "eyJfcmFpbHMi...")
   def validate_each(record, attribute, value)
     return unless target_class
 
@@ -25,12 +28,20 @@ def validate_each(record, attribute, value)
 
     # Create a dummy record for which the validations are actually run on
     dummy = validation_record(record)
+    if dummy.respond_to?(dummy_attr) && !(value.class <= ActiveStorage::Attached)
+      dummy.public_send("#{dummy_attr}=", value)
+      value = dummy.public_send(dummy_attr)
+    elsif dummy.respond_to? :file
+      dummy.public_send("file=", value)
+      value = dummy.public_send(:file)
+    end
 
     target_validators(attribute).each do |validator|
       next unless validator.is_a?(ActiveModel::EachValidator)
       next unless check_validator_conditions(dummy, validator)
 
       dummy.errors.clear
+
       validator.validate_each(dummy, dummy_attr, value)
       dummy.errors[dummy_attr].each do |err|
         record.errors.add(attribute, err)
@@ -51,9 +62,20 @@ def validation_record(record)
     elsif dummy.respond_to?(:organization=) && record.respond_to?(:organization)
       dummy.organization = record.organization
     end
+    validation_record_context(dummy, record)
     dummy
   end
 
+  def validation_record_context(dummy, record)
+    if dummy.is_a?(Decidim::Form)
+      dummy.with_context(
+        current_organization: record.try(:current_organization) || record.try(:ganization),
+        current_participatory_space: record.try(:current_participatory_space) || record.try(:participatory_space),
+        current_component: record.try(:current_component) || record.try(:component)
+      )
+    end
+  end
+
   def target_validators(attribute)
     target_class.validators_on(target_attribute(attribute))
   end
@@ -67,13 +89,12 @@ def target_attribute(default = nil)
   end
 
   def target_instance(record)
-    instance_attributes = begin
-      if options[:with].respond_to?(:call)
-        options[:with].call(record)
-      else
-        options[:with] || {}
-      end
-    end
+    instance_attributes = if options[:with].respond_to?(:call)
+                            options[:with].call(record)
+                          else
+                            options[:with] || {}
+                          end
+
     instance_attributes.each do |key, val|
       instance_attributes[key] = val.call(record) if val.respond_to?(:call)
     end
@@ -85,24 +106,22 @@ def target_instance(record)
 
   def check_validator_conditions(record, validator)
     if (condition = validator.options[:if])
-      if_result = begin
-        if condition.respond_to?(:call)
-          condition.call(record)
-        else
-          record.public_send(condition)
-        end
-      end
+      if_result = if condition.respond_to?(:call)
+                    condition.call(record)
+                  else
+                    record.public_send(condition)
+                  end
+
       return false unless if_result
     end
 
     if (condition = validator.options[:unless])
-      unless_result = begin
-        if condition.respond_to?(:call)
-          condition.call(record)
-        else
-          record.public_send(condition)
-        end
-      end
+      unless_result = if condition.respond_to?(:call)
+                        condition.call(record)
+                      else
+                        record.public_send(condition)
+                      end
+
       return false if unless_result
     end
 
diff --git a/decidim-core/app/validators/password_validator.rb b/decidim-core/app/validators/password_validator.rb
index de25c9d1d3471..8a8e3bcbc8f27 100644
--- a/decidim-core/app/validators/password_validator.rb
+++ b/decidim-core/app/validators/password_validator.rb
@@ -6,6 +6,8 @@ class PasswordValidator < ActiveModel::EachValidator
   MAX_LENGTH = 256
   MIN_UNIQUE_CHARACTERS = 5
   IGNORE_SIMILARITY_SHORTER_THAN = 4
+  ADMIN_MINIMUM_LENGTH = Decidim.config.admin_password_min_length
+  ADMIN_REPETITION_TIMES = Decidim.config.admin_password_repetition_times
   VALIDATION_METHODS = [
     :password_too_short?,
     :password_too_long?,
@@ -15,9 +17,16 @@ class PasswordValidator < ActiveModel::EachValidator
     :email_included_in_password?,
     :domain_included_in_password?,
     :password_too_common?,
-    :blacklisted?
+    :blacklisted?,
+    :password_repeated?
   ].freeze
 
+  def self.minimum_length_for(record)
+    return ADMIN_MINIMUM_LENGTH if record.try(:admin?) && Decidim.config.admin_password_strong
+
+    MINIMUM_LENGTH
+  end
+
   # Check if user's password is strong enough
   #
   # record - Instance of a form (e.g. Decidim::RegistrationForm) or model
@@ -35,7 +44,7 @@ def validate_each(record, attribute, value)
     return true if strong?
 
     @weak_password_reasons.each do |reason|
-      record.errors[attribute] << get_message(reason)
+      record.errors.add attribute, get_message(reason)
     end
 
     false
@@ -67,7 +76,7 @@ def strong?
   end
 
   def password_too_short?
-    value.length < MINIMUM_LENGTH
+    value.length < self.class.minimum_length_for(record)
   end
 
   def password_too_long?
@@ -82,7 +91,7 @@ def name_included_in_password?
     return false if !record.respond_to?(:name) || record.name.blank?
     return true if value.include?(record.name.delete(" "))
 
-    record.name.split(" ").each do |part|
+    record.name.split.each do |part|
       next if part.length < IGNORE_SIMILARITY_SHORTER_THAN
 
       return true if value.include?(part)
@@ -129,4 +138,16 @@ def blacklisted?
   def password_too_common?
     Decidim::CommonPasswords.instance.passwords.include?(value)
   end
+
+  def password_repeated?
+    return false unless Decidim.config.admin_password_strong
+    return false unless record.try(:admin?)
+    return false unless record.try(:encrypted_password_changed?)
+
+    [record.encrypted_password_was, *record.previous_passwords].compact_blank.take(ADMIN_REPETITION_TIMES).each do |encrypted_password|
+      return true if Devise::Encryptor.compare(Decidim::User, encrypted_password, value)
+    end
+
+    false
+  end
 end
diff --git a/decidim-core/app/validators/uploader_content_type_validator.rb b/decidim-core/app/validators/uploader_content_type_validator.rb
index 4246692a6b141..444ccd007f345 100644
--- a/decidim-core/app/validators/uploader_content_type_validator.rb
+++ b/decidim-core/app/validators/uploader_content_type_validator.rb
@@ -41,4 +41,26 @@ def validate_each(record, attribute, value)
   # rubocop: enable Metrics/CyclomaticComplexity
 
   def check_validity!; end
+
+  private
+
+  # This fixes the "weird" error messages such as "(?-mix:image\\/.*)" because
+  # this is the notation Regexp#to_s will return. Instead, we want to show the
+  # inner contents of the regular expressions.
+  #
+  # @see ActiveModel::Validations::FileContentTypeValidator#mark_invalid
+  def mark_invalid(record, attribute, error, option_types)
+    allowed_extensions = nil
+    if error == :allowed_file_content_types
+      uploader = record.attached_uploader(attribute) if record.respond_to?(:attached_uploader)
+      allowed_extensions =
+        # Note that this may be a private method in some uploaders.
+        if uploader && uploader.respond_to?(:extension_allowlist, true)
+          uploader.send(:extension_allowlist)
+        else
+          Decidim.organization_settings(record).upload_allowed_file_extensions
+        end
+    end
+    mark_invalid_original(record, attribute, error, invalid_types(option_types, allowed_extensions))
+  end
 end
diff --git a/decidim-core/app/validators/uploader_image_dimensions_validator.rb b/decidim-core/app/validators/uploader_image_dimensions_validator.rb
index 14d1e0c9b662e..a9089ceae830a 100644
--- a/decidim-core/app/validators/uploader_image_dimensions_validator.rb
+++ b/decidim-core/app/validators/uploader_image_dimensions_validator.rb
@@ -28,7 +28,7 @@ def validate_image_size(record, attribute, file, uploader)
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.image_too_big") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
+    record.errors.add attribute, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
   end
 
   def extract_image(file)
diff --git a/decidim-core/app/views/decidim/account/_account_notification.js.erb b/decidim-core/app/views/decidim/account/_account_notification.js.erb
new file mode 100644
index 0000000000000..cb9a9fcebc758
--- /dev/null
+++ b/decidim-core/app/views/decidim/account/_account_notification.js.erb
@@ -0,0 +1,20 @@
+var existingNotification = document.querySelector("main > .flash.callout");
+if (existingNotification) {
+  existingNotification.classList.add("hide");
+}
+
+var accountNotification = document.querySelector(".account-notification");
+document.querySelector("main").prepend(accountNotification);
+
+if (accountNotification.querySelector(".account-message")) {
+  accountNotification.querySelector(".account-message").remove();
+}
+var messageDiv = document.createElement("div");
+messageDiv.classList.add("account-message");
+
+accountNotification.appendChild(messageDiv);
+messageDiv.innerHTML = <%== @text.to_json %>;
+
+accountNotification.classList.add("<%= @alert_class %>");
+accountNotification.classList.remove("hide");
+accountNotification.removeAttribute("style");
diff --git a/decidim-core/app/views/decidim/account/_password_fields.html.erb b/decidim-core/app/views/decidim/account/_password_fields.html.erb
index b1e759947f76b..7ef1f3bd3a320 100644
--- a/decidim-core/app/views/decidim/account/_password_fields.html.erb
+++ b/decidim-core/app/views/decidim/account/_password_fields.html.erb
@@ -1,2 +1,2 @@
-<%= form.password_field :password, value: form.object.password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH) %>
-<%= form.password_field :password_confirmation, value: form.object.password_confirmation, autocomplete: "off" %>
+<%= form.password_field :password, password_field_options_for(current_user) %>
+<%= form.password_field :password_confirmation, password_field_options_for(current_user).except(:help_text) %>
diff --git a/decidim-core/app/views/decidim/account/cancel_email_change.js.erb b/decidim-core/app/views/decidim/account/cancel_email_change.js.erb
new file mode 100644
index 0000000000000..018b7ddd56067
--- /dev/null
+++ b/decidim-core/app/views/decidim/account/cancel_email_change.js.erb
@@ -0,0 +1,6 @@
+<%= render partial: "account_notification" %>
+
+if ("<%= @alert_class %>" === "success") {
+  document.querySelector("#email-change-pending").classList.add("hide");
+  document.querySelector("#user_email").disabled = false;
+}
diff --git a/decidim-core/app/views/decidim/account/resend_confirmation_instructions.erb b/decidim-core/app/views/decidim/account/resend_confirmation_instructions.erb
new file mode 100644
index 0000000000000..cd9e5524008af
--- /dev/null
+++ b/decidim-core/app/views/decidim/account/resend_confirmation_instructions.erb
@@ -0,0 +1 @@
+<%= render partial: "account_notification" %>
diff --git a/decidim-core/app/views/decidim/account/show.html.erb b/decidim-core/app/views/decidim/account/show.html.erb
index 14207f164c0cd..22ad77fcf155b 100644
--- a/decidim-core/app/views/decidim/account/show.html.erb
+++ b/decidim-core/app/views/decidim/account/show.html.erb
@@ -1,20 +1,33 @@
+<%= alert_box("", "account-notification hide", true) %>
 <% add_decidim_page_title(t("profile", scope: "layouts.decidim.user_menu")) %>
 <% content_for(:subtitle) { t("profile", scope: "layouts.decidim.user_menu") } %>
 
 <div class="row">
-  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "off" }) do |f| %>
-    <input autocomplete="off" name="hidden" type="password" style="display:none;">
+  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "on" }) do |f| %>
     <div class="columns large-4">
       <%= f.upload :avatar %>
     </div>
 
     <div class="columns large-8 end">
+      <% if current_user.unconfirmed_email.present? %>
+        <div id="email-change-pending" class="callout secondary">
+          <p><strong><%= t("decidim.account.email_change.title") %></strong></p>
+          <p><%= t("decidim.account.email_change.body1", unconfirmed_email: current_user.unconfirmed_email) %></p>
+          <p>
+            <%== t(
+              "decidim.account.email_change.body2",
+              resend_link: link_to(t("decidim.account.email_change.send_again"), resend_confirmation_instructions_account_path, role: :button, method: :post, remote: true),
+              cancel_link: link_to(t("decidim.account.email_change.cancel"), cancel_email_change_account_path, role: :button, method: :post, remote: true)) %>
+          </p>
+        </div>
+      <% end %>
+
       <%= form_required_explanation %>
 
-      <%= f.text_field :name %>
-      <%= f.text_field :nickname %>
-      <%= f.email_field :email %>
-      <%= f.url_field :personal_url %>
+      <%= f.text_field :name, autocomplete: "name" %>
+      <%= f.text_field :nickname, autocomplete: "nickname" %>
+      <%= f.email_field :email, disabled: current_user.unconfirmed_email.present?, autocomplete: "email" %>
+      <%= f.url_field :personal_url, autocomplete: "url" %>
       <%= f.text_area :about, rows: 5 %>
 
       <%= f.collection_select(
diff --git a/decidim-core/app/views/decidim/application/_attachments.html.erb b/decidim-core/app/views/decidim/application/_attachments.erb
similarity index 50%
rename from decidim-core/app/views/decidim/application/_attachments.html.erb
rename to decidim-core/app/views/decidim/application/_attachments.erb
index ba7fe990cc8c9..2e9afce5a3e78 100644
--- a/decidim-core/app/views/decidim/application/_attachments.html.erb
+++ b/decidim-core/app/views/decidim/application/_attachments.erb
@@ -1,12 +1,12 @@
 <% if attached_to.attachments.any? %>
   <div class="row attachments">
     <div class="columns large-12">
-      <%= render partial: "decidim/application/documents.html", locals: { documents: attached_to.documents } %>
+      <%= render partial: "decidim/application/documents", locals: { documents: attached_to.documents } %>
     </div>
   </div>
   <div class="row attachments">
     <div class="columns large-12">
-      <%= render partial: "decidim/application/photos.html", locals: { photos: attached_to.photos } %>
+      <%= render partial: "decidim/application/photos", locals: { photos: attached_to.photos } %>
     </div>
   </div>
 <% end %>
diff --git a/decidim-core/app/views/decidim/application/_collection.html.erb b/decidim-core/app/views/decidim/application/_collection.html.erb
index b547da8aa3bb7..6d4f28768610e 100644
--- a/decidim-core/app/views/decidim/application/_collection.html.erb
+++ b/decidim-core/app/views/decidim/application/_collection.html.erb
@@ -12,7 +12,7 @@
 
       <div class="card card--list">
         <% documents.each do |document| %>
-          <%= render partial: "decidim/application/document.html", locals: { document: document } %>
+          <%= render partial: "decidim/application/document", locals: { document: document } %>
         <% end %>
       </div>
     </div>
diff --git a/decidim-core/app/views/decidim/application/_document.html.erb b/decidim-core/app/views/decidim/application/_document.erb
similarity index 100%
rename from decidim-core/app/views/decidim/application/_document.html.erb
rename to decidim-core/app/views/decidim/application/_document.erb
diff --git a/decidim-core/app/views/decidim/application/_documents.html.erb b/decidim-core/app/views/decidim/application/_documents.erb
similarity index 70%
rename from decidim-core/app/views/decidim/application/_documents.html.erb
rename to decidim-core/app/views/decidim/application/_documents.erb
index 9bf1641d7d0bd..03be715155386 100644
--- a/decidim-core/app/views/decidim/application/_documents.html.erb
+++ b/decidim-core/app/views/decidim/application/_documents.erb
@@ -4,12 +4,12 @@
     <% if (documents_without_collection = documents.reject(&:attachment_collection_id?)).any? %>
       <div class="card card--list">
         <% documents_without_collection.each do |document| %>
-          <%= render partial: "decidim/application/document.html", locals: { document: document } %>
+          <%= render partial: "decidim/application/document", locals: { document: document } %>
         <% end %>
       </div>
     <% end %>
     <% documents.select(&:attachment_collection_id?).group_by(&:attachment_collection).sort_by { |c, d| c.weight }.each do |collection, documents| %>
-      <%= render partial: "decidim/application/collection.html", locals: { attachment_collection: collection, documents: documents } %>
+      <%= render partial: "decidim/application/collection", locals: { attachment_collection: collection, documents: documents } %>
     <% end %>
   </div>
 <% end %>
diff --git a/decidim-core/app/views/decidim/application/_photos.html.erb b/decidim-core/app/views/decidim/application/_photos.erb
similarity index 100%
rename from decidim-core/app/views/decidim/application/_photos.html.erb
rename to decidim-core/app/views/decidim/application/_photos.erb
diff --git a/decidim-core/app/views/decidim/cookie_policy/accept.js.erb b/decidim-core/app/views/decidim/cookie_policy/accept.js.erb
deleted file mode 100644
index c058788d96112..0000000000000
--- a/decidim-core/app/views/decidim/cookie_policy/accept.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-const $cookieWarning = $('.cookie-warning');
-
-$cookieWarning.hide();
diff --git a/decidim-core/app/views/decidim/devise/confirmations/new.html.erb b/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
index 128c161029558..b7d14128254c5 100644
--- a/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
@@ -16,7 +16,7 @@
             <%= render "devise/shared/error_messages", resource: resource %>
 
             <div class="field">
-              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), autocomplete: "email" %>
             </div>
 
             <div class="actions">
diff --git a/decidim-core/app/views/decidim/devise/invitations/edit.html.erb b/decidim-core/app/views/decidim/devise/invitations/edit.html.erb
index a6a11518535cb..69ffe42ac3873 100644
--- a/decidim-core/app/views/decidim/devise/invitations/edit.html.erb
+++ b/decidim-core/app/views/decidim/devise/invitations/edit.html.erb
@@ -21,17 +21,16 @@
 
             <div class="user-nickname">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", prefix: { value: "@", small: 1, large: 1 } %>
+                <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
               </div>
             </div>
 
             <% if f.object.class.require_password_on_accepting %>
               <div class="field">
-                <p><%= f.password_field :password, required: "required", minlength: ::PasswordValidator::MINIMUM_LENGTH, maxlength: ::PasswordValidator::MAX_LENGTH %></p>
+                <p><%= f.password_field :password, password_field_options_for(:user).except(:help_text) %></p>
               </div>
-
               <div class="field">
-                <p><%= f.password_field :password_confirmation, required: "required", minlength: ::PasswordValidator::MINIMUM_LENGTH, maxlength: ::PasswordValidator::MAX_LENGTH %></p>
+                <p><%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %></p>
               </div>
             <% end %>
           </div>
diff --git a/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb b/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
index 9877b293f3bdb..e32c07808e8c1 100644
--- a/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/omniauth_registrations/new.html.erb
@@ -18,18 +18,18 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
               </div>
             </div>
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name) %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), autocomplete: "nickname" %>
               </div>
             </div>
 
             <div class="field">
-              <%= f.email_field :email %>
+              <%= f.email_field :email, autocomplete: "email" %>
             </div>
 
             <%= f.hidden_field :uid %>
diff --git a/decidim-core/app/views/decidim/devise/passwords/edit.html.erb b/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
index caf4cfb30331e..e5a1c54087947 100644
--- a/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
+++ b/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
@@ -2,7 +2,7 @@
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
-      <h1><%= t("devise.passwords.edit.change_your_password") %></h1>
+      <h1><%= t("devise.passwords.edit.title") %></h1>
     </div>
   </div>
 
@@ -10,17 +10,17 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: @send_path || password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
             <%= form_required_explanation %>
 
             <%= f.hidden_field :reset_password_token %>
 
             <div class="field">
-              <%= f.password_field :password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH) %>
+              <%= f.password_field :password, password_field_options_for(current_user || params["reset_password_token"]) %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation, autocomplete: "off" %>
+              <%= f.password_field :password_confirmation, password_field_options_for(current_user || params["reset_password_token"]).except(:help_text) %>
             </div>
 
             <div class="actions">
@@ -28,7 +28,9 @@
             </div>
           <% end %>
 
-          <%= render "decidim/devise/shared/links" %>
+          <% unless current_user %>
+            <%= render "decidim/devise/shared/links" %>
+          <% end %>
         </div>
       </div>
     </div>
diff --git a/decidim-core/app/views/decidim/devise/passwords/new.html.erb b/decidim-core/app/views/decidim/devise/passwords/new.html.erb
index 4663ef247ba44..c555ee7547ddc 100644
--- a/decidim-core/app/views/decidim/devise/passwords/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/passwords/new.html.erb
@@ -14,7 +14,7 @@
         <div class="card__content">
           <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <div class="field">
-              <%= f.email_field :email, autofocus: true %>
+              <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
             </div>
 
             <div class="actions">
diff --git a/decidim-core/app/views/decidim/devise/registrations/new.html.erb b/decidim-core/app/views/decidim/devise/registrations/new.html.erb
index 98a8232dff93a..4de2e89375bb8 100644
--- a/decidim-core/app/views/decidim/devise/registrations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/registrations/new.html.erb
@@ -34,26 +34,26 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
               </div>
             </div>
 
             <div class="user-nickname">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 } %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
               </div>
             </div>
 
             <div class="field">
-              <%= f.email_field :email %>
+              <%= f.email_field :email, autocomplete: "email" %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password, help_text: t(".password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH), autocomplete: "off" %>
+              <%= f.password_field :password, password_field_options_for(:user) %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation %>
+              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
             </div>
           </div>
         </div>
diff --git a/decidim-core/app/views/decidim/devise/sessions/new.html.erb b/decidim-core/app/views/decidim/devise/sessions/new.html.erb
index d80fbb2791fde..00c094475718f 100644
--- a/decidim-core/app/views/decidim/devise/sessions/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/sessions/new.html.erb
@@ -33,10 +33,10 @@
               <%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
                 <div>
                   <div class="field">
-                    <%= f.email_field :email %>
+                    <%= f.email_field :email, autocomplete: "email" %>
                   </div>
                   <div class="field">
-                    <%= f.password_field :password, autocomplete: "off" %>
+                    <%= f.password_field :password, autocomplete: "current-password" %>
                   </div>
                 </div>
                   <% if devise_mapping.rememberable? %>
diff --git a/decidim-core/app/views/decidim/data_portability/export.html.erb b/decidim-core/app/views/decidim/download_your_data/export.html.erb
similarity index 100%
rename from decidim-core/app/views/decidim/data_portability/export.html.erb
rename to decidim-core/app/views/decidim/download_your_data/export.html.erb
diff --git a/decidim-core/app/views/decidim/data_portability/show.html.erb b/decidim-core/app/views/decidim/download_your_data/show.html.erb
similarity index 68%
rename from decidim-core/app/views/decidim/data_portability/show.html.erb
rename to decidim-core/app/views/decidim/download_your_data/show.html.erb
index bd5a55f7c908a..8e6c6c9e3644d 100644
--- a/decidim-core/app/views/decidim/data_portability/show.html.erb
+++ b/decidim-core/app/views/decidim/download_your_data/show.html.erb
@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("my_data", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 
-<div class="data-portability">
+<div class="download-your-data">
   <strong><%= t(".download_data") %></strong>
   <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>
-  <%= button_to t(".request_data"), export_data_portability_path, class: "button", data: { disable: true } %>
+  <%= button_to t(".request_data"), export_download_your_data_path, class: "button", data: { disable: true } %>
 </div>
diff --git a/decidim-core/app/views/decidim/export_mailer/data_portability_export.html.erb b/decidim-core/app/views/decidim/export_mailer/data_portability_export.html.erb
deleted file mode 100644
index 8132ea4b73bb6..0000000000000
--- a/decidim-core/app/views/decidim/export_mailer/data_portability_export.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="email-instructions">
-  <%= t(".click_button", password: @password, date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
-</p>
-
-<p class="email-button email-button__cta">
-  <%= link_to t(".download"), download_file_data_portability_url(host: @organization.host, filename: @filename), class: "button expanded hollow button--sc" %>
-</p>
diff --git a/decidim-core/app/views/decidim/export_mailer/download_your_data_export.html.erb b/decidim-core/app/views/decidim/export_mailer/download_your_data_export.html.erb
new file mode 100644
index 0000000000000..9866da1d274b2
--- /dev/null
+++ b/decidim-core/app/views/decidim/export_mailer/download_your_data_export.html.erb
@@ -0,0 +1,7 @@
+<p class="email-instructions">
+  <%= t(".click_button", password: @password, date: l(Decidim.download_your_data_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
+</p>
+
+<p class="email-button email-button__cta">
+  <%= link_to t(".download"), download_file_download_your_data_url(host: @organization.host, filename: @filename), class: "button expanded hollow button--sc" %>
+</p>
diff --git a/decidim-core/app/views/decidim/last_activities/index.html.erb b/decidim-core/app/views/decidim/last_activities/index.html.erb
index 9f59cd32b2429..098a87f8c8eea 100644
--- a/decidim-core/app/views/decidim/last_activities/index.html.erb
+++ b/decidim-core/app/views/decidim/last_activities/index.html.erb
@@ -7,7 +7,7 @@
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">
         <%= filter_form_for filter, last_activities_path do |form| %>
-          <%= form.collection_radio_buttons :resource_type, resource_types, :first, :last, legend_title: t(".resource_type") %>
+          <%= form.collection_radio_buttons :with_resource_type, resource_types, :first, :last, legend_title: t(".resource_type") %>
         <% end %>
       </div>
     </div>
diff --git a/decidim-core/app/views/decidim/manifests/show.json.erb b/decidim-core/app/views/decidim/manifests/show.json.erb
new file mode 100644
index 0000000000000..fa6ec19886162
--- /dev/null
+++ b/decidim-core/app/views/decidim/manifests/show.json.erb
@@ -0,0 +1,31 @@
+{
+  "name": "<%= organization_params.html_name %>",
+  "lang": "<%= organization_params.default_locale %>",
+  "description": "<%= organization_params.translated_description %>",
+  "display": "<%= organization_params.pwa_display %>",
+  "start_url": "<%= organization_params.start_url %>",
+  "theme_color": "<%= organization_params.colors["theme"] %>",
+  "background_color": "<%= organization_params.colors["theme"] %>",
+  "icons": [
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :medium %>",
+      "sizes": "180x180",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :big %>",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :huge %>",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
+}
diff --git a/decidim-core/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb b/decidim-core/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb
index c96e4f824cbc3..7f1816fb7cd8e 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb
@@ -6,17 +6,19 @@
       </div>
     </div>
     <div class="row">
-      <div class="row columns mentions__container">
+      <div class="row columns multiple-mentions" data-name="recipient_id[]" data-multiple="true">
         <label for="add_conversation_users"><%= t(".add_max_users") %></label>
         <input id="add_conversation_users" type="text"
-            class="js-multiple-mentions mentions__container"
+            spellcheck="false"
+            autocomplete="off"
             placeholder="<%= t(".add_users_placeholder") %>"
             data-noresults="<%= t(".no_results") %>"
+            data-selected="multiple-mentions-selected"
             contenteditable="true"
             data-direct-messages-disabled="<%= t("decidim.messaging.conversations.add_conversation_users.participant_with_disabled_message_reception") %>">
       </div>
       <div class="columns large-12">
-        <div class="js-multiple-mentions-recipients"></div>
+        <ul class="multiple-mentions-selected"></ul>
       </div>
     </div>
   </div>
diff --git a/decidim-core/app/views/decidim/messaging/conversations/_conversation.html.erb b/decidim-core/app/views/decidim/messaging/conversations/_conversation.html.erb
index 10c35c7924b98..32fbd14be595e 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/_conversation.html.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/_conversation.html.erb
@@ -9,7 +9,7 @@
             <%= image_tag present(current_user).avatar.default_multiuser_url, alt: t("decidim.author.avatar_multiuser") %>
           <% end %>
         </div>
-        <span class="text-medium mt-xs"><%= Date::ABBR_DAYNAMES[conversation.created_at.wday] %> <%= conversation.created_at.wday %></span>
+        <span class="text-medium mt-xs"><%= Date::ABBR_DAYNAMES[conversation.created_at.wday] %> <%= l conversation.created_at, format: :decidim_short %></span>
       </div>
     </li>
     <li class="card-data__item card--list__item card-data__item--expand absolutes">
diff --git a/decidim-core/app/views/decidim/messaging/conversations/_reply.html.erb b/decidim-core/app/views/decidim/messaging/conversations/_reply.html.erb
index 6da921138e8b3..5811b3e60ce85 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/_reply.html.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/_reply.html.erb
@@ -5,7 +5,7 @@
 
   <%= decidim_form_for form, url: decidim.conversation_path(conversation.id), method: :put, remote: true do |f| %>
     <%= f.label :body, nil, class: "show-for-sr" %>
-    <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder") %>
+    <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { input_emoji: true } %>
 
     <%= f.submit t(".send"), class: "button pull-right", data: { disable: true } %>
   <% end %>
diff --git a/decidim-core/app/views/decidim/messaging/conversations/_start.html.erb b/decidim-core/app/views/decidim/messaging/conversations/_start.html.erb
index f56596c740d85..bb86f3116acc5 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/_start.html.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/_start.html.erb
@@ -6,13 +6,11 @@
   </h2>
 
   <%= decidim_form_for form, url: decidim.conversations_path, remote: true do |f| %>
-    <%= form_required_explanation %>
-
     <% @form.recipient.each do |recipient| %>
       <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
     <% end %>
     <%= f.label :body, nil, class: "show-for-sr" %>
-    <%= f.text_area :body, label: false, rows: 4, required: true %>
+    <%= f.text_area :body, label: false, rows: 4, required: true, data: { input_emoji: true } %>
 
     <%= f.submit t(".send") %>
   <% end %>
diff --git a/decidim-core/app/views/decidim/messaging/conversations/create.js.erb b/decidim-core/app/views/decidim/messaging/conversations/create.js.erb
index 71114c233a4d3..8cddbd3db6901 100644
--- a/decidim-core/app/views/decidim/messaging/conversations/create.js.erb
+++ b/decidim-core/app/views/decidim/messaging/conversations/create.js.erb
@@ -1,3 +1,4 @@
 $("#messages").append("<%= j(render "messages", sender: conversation.messages.first.sender, messages: [conversation.messages.first]).html_safe %>");
 $(".add-message").replaceWith("<%= j(render "reply", form: form, conversation: conversation).html_safe %>");
 $("#new_message_").foundation();
+Decidim.addInputEmoji();
diff --git a/decidim-core/app/views/decidim/newsletter_mailer/newsletter.html.erb b/decidim-core/app/views/decidim/newsletter_mailer/newsletter.html.erb
index 1dedb4b3ebc7e..e44032337ee44 100644
--- a/decidim-core/app/views/decidim/newsletter_mailer/newsletter.html.erb
+++ b/decidim-core/app/views/decidim/newsletter_mailer/newsletter.html.erb
@@ -1,16 +1,16 @@
 <%= decidim_sanitize_newsletter cell.to_s %>
 
 <% content_for :note do %>
-  <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
+  <%== t ".note", organization_name: h(@organization.name), link: @newsletter.notifications_settings_url %>
 <% end %>
 
 <% content_for :unsubscribe do %>
-  <%== t ".unsubscribe", link: decidim.unsubscribe_newsletters_url(host: @organization.host, u: @encrypted_token ) %>
+  <%== t ".unsubscribe", link: @newsletter.unsubscribe_newsletters_url(u: @encrypted_token) %>
 <% end %>
 
 <% content_for :see_on_website do %>
   <center style="display: none">
     <%== CGI.unescapeHTML truncate(cell.body, max_length: 50) %>
   </center>
-  <%== t ".see_on_website", link: decidim.newsletter_url(host: @organization.host, id: @newsletter) %>
+  <%== t ".see_on_website", link: @newsletter.url %>
 <% end %>
diff --git a/decidim-core/app/views/decidim/newsletters/show.html.erb b/decidim-core/app/views/decidim/newsletters/show.html.erb
index 47639661e31a1..4c4fb3f52749c 100644
--- a/decidim-core/app/views/decidim/newsletters/show.html.erb
+++ b/decidim-core/app/views/decidim/newsletters/show.html.erb
@@ -5,7 +5,7 @@
   newsletter: newsletter,
   recipient_user: @user
 ) %>
-<%= decidim_sanitize_editor @cell.to_s %>
+<%= decidim_sanitize_newsletter @cell.to_s %>
 
 <% content_for :note do %>
   <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
diff --git a/decidim-core/app/views/decidim/notifications_digest_mailer/_email_content.html.erb b/decidim-core/app/views/decidim/notifications_digest_mailer/_email_content.html.erb
new file mode 100644
index 0000000000000..4786545ff9be1
--- /dev/null
+++ b/decidim-core/app/views/decidim/notifications_digest_mailer/_email_content.html.erb
@@ -0,0 +1,11 @@
+<div class="email-content-notification">
+  <span class="email-notification-date"> <%= notification.date_time %> </span>
+  <p class="email-instructions">
+    <%= notification.email_intro %>
+  </p>
+  <% if notification.resource_path.present? && notification.resource_title.present? %>
+    <p class="email-button email-button__cta">
+      <%= link_to decidim_sanitize(notification.resource_title, strip_tags: true), notification.resource_url %>
+    </p>
+  <% end %>
+</div>
diff --git a/decidim-core/app/views/decidim/notifications_digest_mailer/digest_mail.erb b/decidim-core/app/views/decidim/notifications_digest_mailer/digest_mail.erb
new file mode 100644
index 0000000000000..d8b989461d6cd
--- /dev/null
+++ b/decidim-core/app/views/decidim/notifications_digest_mailer/digest_mail.erb
@@ -0,0 +1,27 @@
+<div class="email-notifications-digest">
+  <div>
+    <p class="email-header"> <%= @notifications_digest.header %> </p>
+    <p class="email-header email-header--right"> <%= @notifications_digest.formated_date(Date.today) %> </p>
+  </div>
+
+  <p class="email-greeting"><%= @notifications_digest.greeting %></p>
+  <p class="email-intro"><%= @notifications_digest.intro %></p>
+
+  <div class="email-content-notifications">
+    <% length = @notifications.size - 1 %>
+    <% @notifications.each_with_index do |notification, i| %>
+      <%= render("decidim/notifications_digest_mailer/email_content", notification: notification) %>
+      <% if i < length %>
+        <hr class="email-element-separator">
+      <% end %>
+    <% end %>
+  </div>
+
+  <% if(@display_see_more_message) %>
+    <div>
+      <%= link_to @notifications_digest.see_more, decidim.notifications_url(host: @organization.host), class: "email-btn" %>
+    </div>
+  <% end %>
+
+  <p class="email-closing"><%= @notifications_digest.outro %></p>
+</div>
diff --git a/decidim-core/app/views/decidim/notifications_settings/show.html.erb b/decidim-core/app/views/decidim/notifications_settings/show.html.erb
index 097354d3d6839..2797396d426ad 100644
--- a/decidim-core/app/views/decidim/notifications_settings/show.html.erb
+++ b/decidim-core/app/views/decidim/notifications_settings/show.html.erb
@@ -18,14 +18,8 @@
     <% end %>
   </div>
 
-  <p><strong><%= t(".send_notifications_by_email") %></strong></p>
-  <div class="switch tiny switch-with-label email_on_notification">
-    <%= f.label :email_on_notification do %>
-      <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".email_on_notification") %></span>
-    <% end %>
-  </div>
+  <p><strong><%= t(".notifications_sending_frequency") %></strong></p>
+  <%= f.collection_radio_buttons :notifications_sending_frequency, frequencies_collection, :first, :last, { checked: @notifications_settings.notifications_sending_frequency || "daily" } %>
 
   <p><strong><%= t(".newsletters") %></strong></p>
   <div class="switch tiny switch-with-label newsletter_notifications">
@@ -54,6 +48,37 @@
         <span class="switch-label"><%= t(".email_on_moderations") %></span>
       </label>
     </div>
+
+    <% Decidim.notification_settings_registry.manifests.filter{ |a| a.settings_area == :administrators }.each do |manifest| %>
+      <div class="switch tiny switch-with-label notification_settings">
+        <label>
+          <%= f.check_box "notification_settings[#{manifest.name}]",
+                          checked: ["1", true].include?(current_user.notification_settings.fetch(manifest.name.to_s, manifest.default_value)),
+                          label: false,
+                          class: "switch-input" %>
+          <span class="switch-paddle"></span>
+          <span class="switch-label"><%= t(".notification_settings.#{manifest.name}") %></span>
+        </label>
+      </div>
+    <% end %>
+
+  <% end %>
+
+  <% if @notifications_settings.meet_push_notifications_requirements? %>
+    <div class="push-notifications js-sw-mandatory">
+      <p><strong><%= t(".push_notifications") %></strong></p>
+      <p id="push-notifications-reminder" class="push-notifications__reminder"><i><%= t(".push_notifications_reminder") %></i></p>
+      <div class="switch tiny switch-with-label allow_push_notifications">
+        <label>
+          <%= check_box_tag :allow_push_notifications, 0, false, class: "switch-input" %>
+          <span class="switch-paddle"></span>
+          <span class="switch-label"><%= t(".allow_push_notifications") %></span>
+        </label>
+      </div>
+    </div>
+
+    <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Rails.application.secrets.vapid[:public_key]).bytes %>">
+    <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
   <% end %>
 
   <%= f.submit t(".update_notifications_settings") %>
diff --git a/decidim-core/app/views/decidim/offline/show.html.erb b/decidim-core/app/views/decidim/offline/show.html.erb
new file mode 100644
index 0000000000000..65faa739d813c
--- /dev/null
+++ b/decidim-core/app/views/decidim/offline/show.html.erb
@@ -0,0 +1,9 @@
+<div id="offline-fallback-html" style="text-align:center;padding:1rem">
+  <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
+    <path
+    d="m20.293 4-1.477 1.477A4.473 4.473 0 0 0 11.17 7.33 4.362 4.362 0 0 0 9.5 7a4.486 4.486 0 0 0-4.23 3.01 4.49 4.49 0 0 0 .042 8.971L4 20.293l.707.707L21 4.707zM19.99 8.21a3.936 3.936 0 0 0-.16-.92L8.12 19H18.5a5.497 5.497 0 0 0 1.49-10.79z"
+    style="fill:#1a181d" />
+  </svg>
+  <h3><%= t(".message") %></h3>
+  <button class="button large button--sc mt-s" onclick="location.reload()"><%= t(".retry") %></button>
+</div>
diff --git a/decidim-core/app/views/decidim/pages/_standalone.html.erb b/decidim-core/app/views/decidim/pages/_standalone.html.erb
index 89bfca994cefb..d3f9b774a7ecf 100644
--- a/decidim-core/app/views/decidim/pages/_standalone.html.erb
+++ b/decidim-core/app/views/decidim/pages/_standalone.html.erb
@@ -10,7 +10,7 @@
 
     <div class="columns small-12">
       <div class="card">
-        <div class="card__content"><%= decidim_sanitize translated_attribute page.content %></div>
+        <div class="card__content"><%= decidim_sanitize_editor_admin translated_attribute page.content %></div>
       </div>
     </div>
 
diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index 3a9020a097719..4707ae3be2432 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -32,7 +32,7 @@
                 <h2>
                   <%= translated_attribute page.title %>
                 </h2>
-                <%= decidim_sanitize_editor translated_attribute page.content %>
+                <%= decidim_sanitize_editor_admin translated_attribute page.content %>
               </div>
             </div>
           </div>
diff --git a/decidim-core/app/views/decidim/reported_mailer/hide.html.erb b/decidim-core/app/views/decidim/reported_mailer/hide.html.erb
index 3d7fbb9e4c724..6252cdabe8022 100644
--- a/decidim-core/app/views/decidim/reported_mailer/hide.html.erb
+++ b/decidim-core/app/views/decidim/reported_mailer/hide.html.erb
@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", { url: reported_content_url }) %>
+  <%= t(".report_html", url: reported_content_url ) %>
 </p>
 
 <p class="email-button email-button__cta">
diff --git a/decidim-core/app/views/decidim/reported_mailer/report.html.erb b/decidim-core/app/views/decidim/reported_mailer/report.html.erb
index 009a570c87ceb..dfcae7554539f 100644
--- a/decidim-core/app/views/decidim/reported_mailer/report.html.erb
+++ b/decidim-core/app/views/decidim/reported_mailer/report.html.erb
@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", { url: reported_content_url }) %>
+  <%= t(".report_html", url: reported_content_url) %>
 </p>
 
 <br>
diff --git a/decidim-core/app/views/decidim/scopes/picker.html.erb b/decidim-core/app/views/decidim/scopes/picker.html.erb
index 945c5beb06989..f0ee3ab2d02de 100644
--- a/decidim-core/app/views/decidim/scopes/picker.html.erb
+++ b/decidim-core/app/views/decidim/scopes/picker.html.erb
@@ -41,7 +41,7 @@
       <% if current || !required %>
         <a class="button" role="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" aria-controls="<%= picker_target_id %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
       <% else %>
-        <a class="button muted">
+        <a class="button" disabled="true">
       <% end %>
           <%= t("decidim.scopes.picker.choose") %>
         </a>
diff --git a/decidim-core/app/views/decidim/searches/_filters.html.erb b/decidim-core/app/views/decidim/searches/_filters.html.erb
index 5b5fc9230ba61..fe58caaacbd5f 100644
--- a/decidim-core/app/views/decidim/searches/_filters.html.erb
+++ b/decidim-core/app/views/decidim/searches/_filters.html.erb
@@ -1,5 +1,5 @@
 <label class="text-medium mb-s"><%= t(".jump_to") %></label>
-<% if params.dig(:filter, :resource_type).present? %>
+<% if params.dig(:filter, :with_resource_type).present? %>
   <p class="text-secondary">
     <%= link_to main_search_path do %>
       <%= icon "caret-left", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;<%= t(".back") %>
@@ -12,7 +12,7 @@
 <%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_comment } %>
 <div class="card card--secondary">
   <%= filter_form_for filter do |form| %>
-    <%= scopes_picker_filter form, :decidim_scope_id %>
+    <%= scopes_picker_filter form, :decidim_scope_id_eq %>
     <%= form.hidden_field :term %>
   <% end %>
 </div>
diff --git a/decidim-core/app/views/decidim/shared/participatory_space_filters/_filters.html.erb b/decidim-core/app/views/decidim/shared/participatory_space_filters/_filters.html.erb
index 5fb7c33eb04dd..f5f8b8e652abc 100644
--- a/decidim-core/app/views/decidim/shared/participatory_space_filters/_filters.html.erb
+++ b/decidim-core/app/views/decidim/shared/participatory_space_filters/_filters.html.erb
@@ -1,14 +1,14 @@
 <%= filter_form_for filter do |form| %>
   <div class="columns mediumlarge-6 large-5">
-    <%= scopes_picker_filter form, :scope_id, checkboxes_on_top: checkboxes_on_top %>
+    <%= scopes_picker_filter form, :with_scope, checkboxes_on_top: checkboxes_on_top %>
   </div>
   <div class="columns mediumlarge-6 large-5">
-    <%= form.areas_select :area_id,
+    <%= form.areas_select :with_area,
                           areas_for_select(current_organization),
                           {
                             legend_title: t(".areas"),
                             label: "",
-                            selected: filter.area_id,
+                            selected: filter.with_area,
                             include_blank: t(".select_an_area")
                           },
                           "aria-label": t(".areas") %>
diff --git a/decidim-core/app/views/decidim/user_report_mailer/notify.html.erb b/decidim-core/app/views/decidim/user_report_mailer/notify.html.erb
index 92bec7185ddef..d3aad1353df87 100644
--- a/decidim-core/app/views/decidim/user_report_mailer/notify.html.erb
+++ b/decidim-core/app/views/decidim/user_report_mailer/notify.html.erb
@@ -1,7 +1,14 @@
 <p class="email-greeting"><%= t ".hello", admin: h(@admin.name) %></p>
 
-<p class="email-instructions"><%= t ".body_1", user: h(@user.user_name), token: h(@token.name) %></p>
+<p class="email-instructions"><%= t ".body_1", user: h(@report.moderation.user.name), token: h(@report.user.name) %></p>
 
-<p class="email-instructions"><%= t ".body_2", reason: h(@reason) %></p>
+<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: @report.moderation.user.organization.name, scope: "decidim.shared.flag_user_modal") %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<% if @report.details.present? %>
+  <p class="email-instructions"><%= t(".details") %></p>
+  <blockquote>
+    <%= @report.details %>
+  </blockquote>
+<% end %>
+
+<p class="email-closing"><%= t(".greetings", organization_name: h(@report.moderation.user.organization.name), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>
diff --git a/decidim-core/app/views/devise/mailer/confirmation_instructions.html.erb b/decidim-core/app/views/devise/mailer/confirmation_instructions.html.erb
index 120656c714c3e..f548cbed222ce 100644
--- a/decidim-core/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/decidim-core/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,4 +1,6 @@
-<p class="email-greeting"><%= t(".greeting", recipient: @resource.email) %></p>
+<% if @resource.unconfirmed_email.blank? %>
+  <p class="email-greeting"><%= t(".greeting", recipient: @email) %></p>
+<% end %>
 
 <p class="email-instructions"><%= t(".instruction") %></p>
 
diff --git a/decidim-core/app/views/layouts/decidim/_application.html.erb b/decidim-core/app/views/layouts/decidim/_application.html.erb
index bf71711a92de2..c210fa4d07eba 100644
--- a/decidim-core/app/views/layouts/decidim/_application.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_application.html.erb
@@ -4,14 +4,16 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
-    <%= render partial: "layouts/decidim/js_configuration" %>
   </head>
 
   <body>
+    <!--noindex--><!--googleoff: all-->
+    <%= cell("decidim/data_consent", current_organization) %>
     <%= render partial: "layouts/decidim/impersonation_warning" %>
-    <%= render partial: "layouts/decidim/cookie_warning" %>
     <%= render partial: "layouts/decidim/omnipresent_banner" %>
     <%= render partial: "layouts/decidim/timeout_modal" %>
+    <%= render partial: "layouts/decidim/offline_banner" %>
+    <!--googleon: all--><!--/noindex-->
 
     <%= render "layouts/decidim/wrapper" do %>
       <%= yield %>
@@ -20,6 +22,7 @@
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>
-    <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
+    <%= render partial: "layouts/decidim/data_consent_warning" %>
   </body>
 </html>
diff --git a/decidim-core/app/views/layouts/decidim/_cookie_warning.html.erb b/decidim-core/app/views/layouts/decidim/_cookie_warning.html.erb
deleted file mode 100644
index 4202f7a19d5d6..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_cookie_warning.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% unless cookies_accepted? %>
-  <div class="cookie-warning" role="region">
-    <%= t(".description_html", link: link_to(t(".link_label"), decidim.page_path("terms-and-conditions"), title: t(".link_label"), target: "_blank")) %>
-    <div class="cookie-warning__action">
-      <%= button_to t(".ok"), decidim.accept_cookies_path, method: :get, remote: true, class: "button tiny cookie-bar__button" %>
-    </div>
-  </div>
-<% end %>
diff --git a/decidim-core/app/views/layouts/decidim/_data_consent_warning.html.erb b/decidim-core/app/views/layouts/decidim/_data_consent_warning.html.erb
new file mode 100644
index 0000000000000..dcd9e6d535576
--- /dev/null
+++ b/decidim-core/app/views/layouts/decidim/_data_consent_warning.html.erb
@@ -0,0 +1,8 @@
+<div class="dataconsent-warning flex-center padding-1 hide">
+  <p>
+  <%= t("layouts.decidim.data_consent.warning.consent_required", categories: t("layouts.decidim.data_consent.warning.all_categories")) %>
+  </p>
+  <a href="#" class="button margin-vertical-2" data-open="dc-modal">
+    <%= t("change_settings", scope: "layouts.decidim.data_consent.warning") %>
+  </a>
+</div>
diff --git a/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb b/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb
new file mode 100644
index 0000000000000..54d202babc5d3
--- /dev/null
+++ b/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb
@@ -0,0 +1,12 @@
+<%= javascript_pack_tag "decidim_core", defer: false %>
+<% if Decidim.service_worker_enabled %>
+  <%= javascript_pack_tag "decidim_sw", defer: false %>
+<% end %>
+<%= render partial: "layouts/decidim/js_configuration" %>
+
+<%= yield :js_content %>
+
+<%= snippets.display(:foot) %>
+<%= content_for :header_snippets %>
+
+<%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
diff --git a/decidim-core/app/views/layouts/decidim/_head.html.erb b/decidim-core/app/views/layouts/decidim/_head.html.erb
index b6a8a273fe3ba..8d86fcaeb2e61 100644
--- a/decidim-core/app/views/layouts/decidim/_head.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_head.html.erb
@@ -21,13 +21,15 @@
   <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
 <% end %>
 
+<%= legacy_favicon %>
 <%= favicon %>
+<%= apple_favicon %>
+<link rel="manifest" href="/manifest.webmanifest">
+
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
 <%= snippets.display(:head) %>
-<%= content_for :header_snippets %>
diff --git a/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb b/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
index e489bc42a32b6..b0b382a09c9f6 100644
--- a/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
@@ -5,9 +5,13 @@ js_configs = {
     "selfxssWarning": {
       title: t("decidim.security.selfxss_warning.title"),
       description: t("decidim.security.selfxss_warning.description")
+    },
+    "mentionsModal": {
+      "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
     }
   },
-  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist
+  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist,
+  consent_cookie_name: Decidim.consent_cookie_name
 }
 character_messages = {
   "charactersAtLeast": {
diff --git a/decidim-core/app/views/layouts/decidim/_mailer_logo.html.erb b/decidim-core/app/views/layouts/decidim/_mailer_logo.html.erb
index 300ef3bfd3263..ae5c7f4a70ea9 100644
--- a/decidim-core/app/views/layouts/decidim/_mailer_logo.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_mailer_logo.html.erb
@@ -1,6 +1,6 @@
 <% if organization %>
-  <% if @custom_url_for_mail_root.present? %>
-    <% url = @custom_url_for_mail_root %>
+  <% if defined?(custom_url_for_mail_root) && custom_url_for_mail_root.present? %>
+    <% url = custom_url_for_mail_root %>
   <% else %>
     <% url = decidim.root_url(host: organization.host) %>
   <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/_main_footer.html.erb b/decidim-core/app/views/layouts/decidim/_main_footer.html.erb
index 92e977bbf6a17..11bbeec80a88e 100644
--- a/decidim-core/app/views/layouts/decidim/_main_footer.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_main_footer.html.erb
@@ -22,6 +22,7 @@
             <% end %>
           <% end %>
           <li><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
+          <li><a href="#" data-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a></li>
         </ul>
       </nav>
     </div>
diff --git a/decidim-core/app/views/layouts/decidim/_offline_banner.html.erb b/decidim-core/app/views/layouts/decidim/_offline_banner.html.erb
new file mode 100644
index 0000000000000..d0ebfcb2db185
--- /dev/null
+++ b/decidim-core/app/views/layouts/decidim/_offline_banner.html.erb
@@ -0,0 +1,11 @@
+<div class="flash callout primary small js-offline-message" style="display: none">
+  <%= t(".cache_version_page") %>
+</div>
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    // show the banner if it's offline AND the offline-fallback is not displaying
+    if (!navigator.onLine && !document.querySelector("#offline-fallback-html")) {
+      document.querySelector(".js-offline-message").style.display = "block"
+    }
+  })
+</script>
diff --git a/decidim-core/app/views/layouts/decidim/newsletter_base.html.erb b/decidim-core/app/views/layouts/decidim/newsletter_base.html.erb
index 171b7b4dd3bf6..096bcd11fa406 100644
--- a/decidim-core/app/views/layouts/decidim/newsletter_base.html.erb
+++ b/decidim-core/app/views/layouts/decidim/newsletter_base.html.erb
@@ -6,7 +6,7 @@
     <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 
-  <body>
+  <%= content_tag :body, class: @preview ? "preview" : nil do %>
     <!-- <style> -->
     <table class="body">
       <% if content_for?(:see_on_website) %>
@@ -42,5 +42,5 @@
         </td>
       </tr>
     </table>
-  </body>
+  <% end %>
 </html>
diff --git a/decidim-core/app/views/layouts/decidim/widget.html.erb b/decidim-core/app/views/layouts/decidim/widget.html.erb
index 5df6dd19a519d..8e42e52728ffb 100644
--- a/decidim-core/app/views/layouts/decidim/widget.html.erb
+++ b/decidim-core/app/views/layouts/decidim/widget.html.erb
@@ -4,7 +4,6 @@
     <title><%= decidim_page_title %></title>
     <%= csrf_meta_tags %>
     <%= stylesheet_pack_tag "decidim_core" %>
-    <%= javascript_pack_tag "decidim_core", defer: false %>
   </head>
 
   <body class="widget">
@@ -27,8 +26,9 @@
       <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
     </div>
 
-    <%= javascript_pack_tag "decidim_widget" %>
+    <%= javascript_pack_tag "decidim_core", defer: false %>
     <%= render partial: "layouts/decidim/js_configuration" %>
+    <%= javascript_pack_tag "decidim_widget" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
   </body>
 </html>
diff --git a/decidim-core/config/assets.rb b/decidim-core/config/assets.rb
index 79dec554c52f2..786cd5ce94bfb 100644
--- a/decidim-core/config/assets.rb
+++ b/decidim-core/config/assets.rb
@@ -5,6 +5,7 @@
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
   decidim_core: "#{base_path}/app/packs/entrypoints/decidim_core.js",
+  decidim_sw: "#{base_path}/app/packs/entrypoints/decidim_sw.js",
   decidim_conference_diploma: "#{base_path}/app/packs/entrypoints/decidim_conference_diploma.js",
   decidim_email: "#{base_path}/app/packs/entrypoints/decidim_email.js",
   decidim_map: "#{base_path}/app/packs/entrypoints/decidim_map.js",
diff --git a/decidim-core/config/locales/ar.yml b/decidim-core/config/locales/ar.yml
index bb44dc068d634..963d80b722244 100644
--- a/decidim-core/config/locales/ar.yml
+++ b/decidim-core/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -75,9 +76,6 @@ ar:
   booleans:
     'false': 'لا'
     'true': 'نعم'
-  carrierwave:
-    errors:
-      image_too_big: الصورة كبيرة جدا
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -85,12 +83,6 @@ ar:
       decidim_with_day_and_month_name: "%A %d %b %Y"
       decidim_with_month_name: "%d %B %Y"
       decidim_with_month_name_short: "%d %b"
-  datetime:
-    distance_in_words:
-      x_seconds:
-        one: منذ ثانية
-        other: "منذ %{count} ثوان"
-        zero: للتو
   decidim:
     accessibility:
       external_link: الرابط الخارجي
@@ -98,9 +90,6 @@ ar:
       logo: "شعار %{organization} الرسمي"
       skip_button: تخطي إلى المحتوى الرئيسي
     account:
-      data_portability_export:
-        file_no_exists: المل� غير موجود
-        notice: يتم تنزيل بياناتك حاليًا. ستتلقى بريدًا إلكترونيًا عند اكتماله.
       delete:
         confirm:
           close: أغلق النا�ذة
@@ -111,8 +100,17 @@ ar:
       destroy:
         error: حدثت مشكلة �ي حذ� حسابك.
         success: تم حذ� حسابك بنجاح.
+      download_your_data_export:
+        file_no_exists: المل� غير موجود
+        notice: يتم تنزيل بياناتك حاليًا. ستتلقى بريدًا إلكترونيًا عند اكتماله.
+      email_change:
+        body1: لقد أرسلنا رسالة بريد إلكتروني إلى %{unconfirmed_email} للتحقق من عنوان بريدك الإلكتروني الجديد.
+        body2: هل تحتاج إلينا لإرسال بريد إلكتروني للتحقق مرة أخرى؟ %{resend_link} أو %{cancel_link}.
+        cancel_error: لا يمكن إلغاء طلب تغيير البريد الإلكتروني.
+        cancel_successfully: تم إلغاء تغيير البريد الإلكتروني بنجاح.
+        send_again: إرسل مجددا
       show:
-        available_locales_helper: اختر اللغة التي تريد استخدامها لتص�ح وتلقي الإشعارات �ي Decidim
+        available_locales_helper: اختر اللغة التي تريد استخدامها لتص�ح وتلقي الإشعارات على المنصة
         change_password: غير كلمة السر
         update_account: تحديث الحساب
       update:
@@ -132,6 +130,11 @@ ar:
         delete: "%{user_name} إزالة المكون %{resource_name} من %{space_name} ال�ضاء"
         publish: "%{user_name} نشر المكون %{resource_name} �ي ال�ضاء %{space_name}"
         unpublish: "%{user_name} غير منشور المكون %{resource_name} من %{space_name} ال�ضاء"
+      helpers:
+        answers: أجوبة
+        comments: تعليقات
+        projects: مشاريع
+        results: نتائج
       moderation:
         hide: "%{user_name} اختبأ مورد من النوع %{resource_type} �ي ال�ضاء %{space_name}"
         unreport: "%{user_name} الإبلاغ عن مورد من النوع %{resource_type} �ي %{space_name} ال�ضاء"
@@ -302,6 +305,8 @@ ar:
           title: غير مخوّل
         unconfirmed:
           title: تأكيد البريد الإلكتروني
+      show:
+        close_modal: إغلاق مشروط
     block_user_mailer:
       notify:
         hello: مرحبًا،
@@ -328,8 +333,8 @@ ar:
           global:
             amendments_enabled: تم تمكين التعديلات
             comments_enabled: تم تمكين التعليقات
-            dummy_global_attribute_1: السمة الدمية 1
-            dummy_global_attribute_2: السمة الدمية 2
+            dummy_global_attribute1: السمة الدمية 1
+            dummy_global_attribute2: السمة الدمية 2
             dummy_global_translatable_text: نص ا�تراضي قابل للترجمة
             enable_pads_creation: تمكين إنشاء منصات
             resources_permissions_enabled: تم تمكين أذونات الموارد
@@ -338,8 +343,8 @@ ar:
             amendment_promotion_enabled: ترقية التعديلات م��عّلة
             amendments_visibility: طريقة عرض التعديلات
             comments_blocked: تم حظر التعليقات
-            dummy_step_attribute_1: الخطوة الدمية السمة 1
-            dummy_step_attribute_2: الخطوة الدمية السمة 2
+            dummy_step_attribute1: الخطوة الدمية السمة 1
+            dummy_step_attribute2: الخطوة الدمية السمة 2
             dummy_step_translatable_text: نص ا�تراضي للخطوة قابل للترجمة
     contact: اتصل
     content_blocks:
@@ -372,12 +377,6 @@ ar:
       actions:
         login_before_access: من �ضلك ، ل�ج بحسابك قبل الوصول
         unauthorized: غير مصرح لك بتن�يذ هذا الإجراء
-    data_portability:
-      export:
-        ready: جاهز
-      show:
-        download_data: قم بتنزيل البيانات
-        request_data: طلب البيانات
     datepicker:
       help_text: 'التنسيق المتوقع: %{datepicker_format}'
     devise:
@@ -443,6 +442,12 @@ ar:
           this_application_will_not_be_able_to: 'لن يكون هذا التطبيق قادرًا على:'
           update_profile: تحديث مل�ك الشخصي
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> يريد استخدام حسابك"
+    download_your_data:
+      export:
+        ready: جاهز
+      show:
+        download_data: قم بتنزيل البيانات
+        request_data: طلب البيانات
     endorsable:
       endorsements: موا�قات
     errors:
@@ -572,7 +577,7 @@ ar:
           email_subject: "%{nickname} تحديث مل�هم الشخصي"
           notification_title: و <a href="%{resource_path}">ص�حة المل� الشخصي</a> من %{name} (%{nickname})، الذي كنت التالية، وقد تم تحديثها.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: تحميل
       export:
         ready: يرجى الاطلاع على نسخة مضغوطة من التصدير.
@@ -606,7 +611,6 @@ ar:
         button: إيقا� المتابَعة
         error: حدثت مشكلة �ي إلغاء متابعة هذا المورد.
     forms:
-      current_file: المل� الحالي
       current_image: الصورة الحالية
       default_image: الصورة الا�تراضية
       errors:
@@ -614,7 +618,26 @@ ar:
           password: الكلمة السرية قصيرة جدا.
           password_confirmation: يجب أن يكون تأكيد كلمة المرور مطابق للكلمة السرية.
         error: يوجد خطأ �ي هذا المجال.
-      remove_this_file: أزل هذا المل�
+      file_help:
+        file:
+          message_2: بالنسبة للصور، ي��ضل استخدام صور بالوضع العرضي، تقوم الخدمة باقتصاص الصورة.
+        icon:
+          explanation: 'إرشادات للأيقونة:'
+          message_1: يجب أن تكون صورة مربعة.
+          message_2: الحجم الموصى به لهذه الصورة هو 512 × 512.
+      upload:
+        labels:
+          add_attachment: إضا�ة مر�ق
+          add_file: إضا�ة مل�
+          add_image: إضا�ة صورة
+          cancel: إلغاء
+          edit_image: تعديل الصورة
+          error: خطأ!
+          remove: حذ�
+          replace: إستبدال
+          save: ح�ظ
+          title: العنوان
+          title_required: العنوان مطلوب!
     gamification:
       all_badges_link: رؤية جميع الشارات المتاحة.
       badges:
@@ -715,7 +738,6 @@ ar:
       no_user_groups: لا ينتمي إلى أي مجموعة حتى الآن.
       roles:
         admin: مدير
-        creator: المنشئ
         member: عضو
       update:
         error: حدثت مشكلة أثناء تحديث المجموعة
@@ -737,6 +759,7 @@ ar:
     links:
       warning:
         cancel: إلغاء
+        close_modal: إغلاق مشروط
     log:
       base_presenter:
         create: "%{user_name} تم الإنشاء %{resource_name}"
@@ -812,7 +835,6 @@ ar:
     newsletter_mailer:
       newsletter:
         note: لقد تلقيت هذه الرسالة الإلكترونية لأنك مشترك �ي الرسائل الإخبارية على %{organization_name}. يمكنك تغيير الإعدادات الخاصة بك على هات�ك <a href="%{link}">الص�حة إخطارات</a>.
-        see_on_website: لا يمكن عرض هذا البريد الإلكتروني بشكل صحيح؟ اطلع عليه على <a href="%{link}" target="_blank">الموقع</a>.
         unsubscribe: لإلغاء الاشتراك �ي تلقي هذا النوع من البريد الإلكتروني ، <a href="%{link}" target="_blank" class="unsubscribe">إلغاء الاشتراك</a>.
     newsletter_templates:
       image_text_cta_settings_form:
@@ -843,13 +865,12 @@ ar:
       no_notifications: لا إخطارات حتى الآن.
     notifications_settings:
       show:
-        email_on_notification: أرغب �ي تلقي رسالة بريد إلكتروني �ي كل مرة أتلقى �يها إشعارًا.
+        email_on_moderations: أريد أن أتلقى رسالة بريد إلكتروني كلما يتم �يها الإبلاغ عن شيء أو عن شخص ما للإشرا�.
         everything_followed: كل شيء أتابعه
         newsletter_notifications: أريد أن أتلقى رسائل إخبارية
         newsletters: النشرات الإخبارية
         own_activity: نشاطي الخاص ، مثلما يعلقني أحدهم �ي اقتراحي أو يذكرني
         receive_notifications_about: أريد الحصول على إشعارات حول
-        send_notifications_by_email: إرسال الإخطارات عن طريق البريد الإلكتروني
         update_notifications_settings: ح�ظ التغييرات
       update:
         error: حدثت مشكلة أثناء تحديث إعدادات الإشعارات.
@@ -906,7 +927,6 @@ ar:
         form:
           legend: توا�ق على شروط وأحكام الاستخدام
         refuse:
-          modal_body: إذا ر�ضت ، �لن تتمكن من استخدام النظام الأساسي ، يمكنك <a href="%{data_portability_path}">تنزيل بياناتك</a> و / أو <a href="%{delete_path}">حذ� حسابك</a>.
           modal_btn_continue: قبول الشروط والمتابعة
           modal_btn_exit: سأراجعها لاحقًا
           modal_button: ر�ض الشروط
@@ -958,7 +978,9 @@ ar:
       report:
         content_original_language: لغة المحتوى الأصلية
         hello: مرحبا %{name}،
+        reason: السبب
         report_html: <p>تم الإبلاغ عن المحتوى <a href="%{url}">التالي</a> .</p>
+        see_report: معاينة التقرير
         subject: تم الإبلاغ عن مورد
     reports:
       create:
@@ -1048,9 +1070,6 @@ ar:
       pages_count: ص�حات
       participants_count: المشاركون
       users_count: المشاركون
-    user_activity:
-      index:
-        no_activities_warning: هذا المشارك لم يقم بأي نشاط حتى الآن.
     user_conversations:
       index:
         add_users_placeholder: البحث…
@@ -1106,7 +1125,6 @@ ar:
     invitations:
       edit:
         header: الانتهاء من إنشاء حسابك
-        nickname_help: اسم الشهرة الخاص بك �ي %{organization}.
         submit_button: ح�ظ
         subtitle: إذا قبلت الدعوة ، �يرجى تعيين اسم المستخدم وكلمة المرور الخاصين بك.
       invitation_removed: تمت إزالة دعوتك.
@@ -1173,7 +1191,6 @@ ar:
     passwords:
       edit:
         change_my_password: تغيير كلمة المرور الخاصة بي
-        change_your_password: غير كلمة المرور الخاصة بك
         confirm_new_password: تأكيد كلمة المرور الجديدة
         new_password: كلمة السر الجديدة
       new:
@@ -1247,10 +1264,6 @@ ar:
     timestamp_error_message: آس� ، كان ذلك سريعًا جدًا! يرجى إعادة تقديم.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: يستخدم هذا الموقع مل�ات تعري� الارتباط. من خلال الاستمرار �ي تص�ح الموقع ، �إنك توا�ق على استخدامنا لمل�ات تعري� الارتباط. اكتش� المزيد عنها %{link}.
-        link_label: هنا
-        ok: أنا موا�ق
       edit_link:
         edit: تعديل
       footer:
diff --git a/decidim-core/config/locales/bg.yml b/decidim-core/config/locales/bg.yml
index 5b9d86e9fa297..d7f0fb57068b9 100644
--- a/decidim-core/config/locales/bg.yml
+++ b/decidim-core/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
@@ -58,9 +59,6 @@ bg:
   booleans:
     'false': '�е'
     'true': 'Да'
-  carrierwave:
-    errors:
-      image_too_big: Изображението е твърде гол�мо
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -73,9 +71,6 @@ bg:
       logo: "Официално лого на %{organization}"
       skip_button: Към �ъдържанието
     account:
-      data_portability_export:
-        file_no_exists: Файлът не �ъще�твува
-        notice: Свал�нето на Вашите данни е в проце�. Ще получите ел. пи�мо когато приключи.
       delete:
         confirm:
           close: Затвори прозореца
@@ -86,6 +81,9 @@ bg:
       destroy:
         error: Възникна проблем � изтриването на профила Ви.
         success: Ваши�т профил е у�пешно изтрит.
+      download_your_data_export:
+        file_no_exists: Файлът не �ъще�твува
+        notice: Свал�нето на Вашите данни е в проце�. Ще получите ел. пи�мо когато приключи.
       show:
         change_password: См�на на паролата
         update_account: Обнови профил
@@ -300,6 +298,8 @@ bg:
           explanation_html: За да изпълните това дей�твие, първо �е идентифицирайте, но преди това потвърдете вашата ел. поща <strong>%{email}</strong>.
           request_confirmation_instructions: За�вка на ин�трукции за потвърждение
           title: Потвърдете Вашата ел. поща
+      show:
+        close_modal: Затвори прозорчето
     collapsible_list:
       hidden_elements_count:
         one: и още %{count}
@@ -329,8 +329,8 @@ bg:
           global:
             amendments_enabled: Поправки разрешени
             comments_enabled: Коментари разрешени
-            dummy_global_attribute_1: Макетен атрибут 1
-            dummy_global_attribute_2: Макетен атрибут 2
+            dummy_global_attribute1: Макетен атрибут 1
+            dummy_global_attribute2: Макетен атрибут 2
             dummy_global_translatable_text: Макетен преводим тек�т
             enable_pads_creation: �ктивирай �ъздаване на бележки
             resources_permissions_enabled: Разрешени� за ре�ур� включени
@@ -340,8 +340,8 @@ bg:
             amendment_reaction_enabled: Реагиране на поправки разрешено
             amendments_visibility: Видимо�т на поправки
             comments_blocked: Коментари блокирани
-            dummy_step_attribute_1: �трибут 1 на макетната �тъпка
-            dummy_step_attribute_2: �трибут 2 на макетната �тъпка
+            dummy_step_attribute1: �трибут 1 на макетната �тъпка
+            dummy_step_attribute2: �трибут 2 на макетната �тъпка
             dummy_step_translatable_text: Преводим тек�т на макетната �тъпка
     contact: Контакт
     content_blocks:
@@ -373,12 +373,6 @@ bg:
       actions:
         login_before_access: Влезте в профила �и за до�тъп
         unauthorized: ��мате права за това дей�твие
-    data_portability:
-      export:
-        ready: Готов
-      show:
-        download_data: Изтегл�не на данни
-        request_data: За�ви данни
     datepicker:
       help_text: 'Очакван формат: %{datepicker_format}'
     devise:
@@ -395,7 +389,6 @@ bg:
           already_have_an_account?: Вече имате профил?
           newsletter: Получавайте извънреден бюлетин � подход�ща информаци�
           newsletter_title: Разрешение за контакт � Ва�
-          password_help: "Минимум %{minimun_characters} �имвола, не тр�бва да �а разпро�транени (например, 123456) и тр�бва да �а различни от вашите име и ел. поща."
           sign_in: Вход
           sign_up: Реги�траци�
           sign_up_as:
@@ -436,6 +429,12 @@ bg:
           this_application_will_not_be_able_to: 'Това приложение не може:'
           update_profile: Обновете профила �и
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> желае да ползва профила Ви"
+    download_your_data:
+      export:
+        ready: Готов
+      show:
+        download_data: Изтегл�не на данни
+        request_data: За�ви данни
     endorsable:
       endorsements: Одобр�вани�
     endorsement_buttons_cell:
@@ -587,7 +586,7 @@ bg:
           email_subject: "%{nickname} обнови �во� профил"
           notification_title: Профилната <a href="%{resource_path}">�траница</a> на %{name} (%{nickname}), който �ледвате е обновена.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Свал�не
       export:
         ready: Ще намерите като прикачен файл, компре�ирана вер�и� на Ваши� ек�порт.
@@ -621,7 +620,6 @@ bg:
         button: Спри �ледването
         error: Възникна проблем � отказа от �ледване на този ре�ур�.
     forms:
-      current_file: Текущ файл
       current_image: Текущо изображение
       default_image: Изображение по подразбиране
       errors:
@@ -629,7 +627,6 @@ bg:
           password: Паролата е твърде къ�а.
           password_confirmation: Паролата и потвърждението на паролата тр�бва да �ъвпадат.
         error: В това поле има грешка.
-      remove_this_file: Премахни този файл
     gamification:
       all_badges_link: Виж в�ички до�тъпни значки.
       badges:
@@ -730,7 +727,6 @@ bg:
       no_user_groups: �е принадлежи към нико� група.
       roles:
         admin: �дмини�тратор
-        creator: Създател
         member: Член
       update:
         error: Възникна проблем при обнов�ването на групата
@@ -749,6 +745,9 @@ bg:
       index:
         last_activity: По�ледна активно�т
         resource_type: Тип
+    links:
+      warning:
+        close_modal: Затвори прозорчето
     log:
       base_presenter:
         create: "%{user_name} �ъздаде %{resource_name}"
@@ -856,7 +855,6 @@ bg:
     newsletter_mailer:
       newsletter:
         note: Получихте това пи�мо, защото �те абонирани за бюлетини на %{organization_name}. Можете да промените вашите на�тройки на <a href="%{link}">�траницата "изве�ти�"</a>.
-        see_on_website: �е виждате това пи�мо правилно? Вижте го на <a href="%{link}" target="_blank">�айта</a>.
         unsubscribe: За да �е откажете от получаването на такъв тип пи�ма <a href="%{link}" target="_blank" class="unsubscribe">Отпишете �е</a>.
     newsletter_templates:
       basic_only_text:
@@ -904,13 +902,11 @@ bg:
       show:
         allow_public_contact: Позвол�вам на в�еки да ми изпраща директно �ъобщение, дори и да не го �ледвам.
         direct_messages: Получавайте директни �ъобщени� от в�еки
-        email_on_notification: Жела� да получавам ел. поща в�еки път, когато получа уведомление.
         everything_followed: В�ичко, което �ледвам
         newsletter_notifications: Жела� да получавам бюлетин
         newsletters: Бюлетин � ново�ти
         own_activity: Мо�та дейно�т, например когато н�кой коментира мое предложение или ме �помене
         receive_notifications_about: И�кам да получавам изве�ти� за
-        send_notifications_by_email: Изпращай изве�ти� по ел. поща
         update_notifications_settings: Запази промените
       update:
         error: Има проблем � обнов�ването на на�тройките Ви за изве�ти�.
@@ -967,7 +963,6 @@ bg:
         form:
           legend: Съгла��вам �е � общите у�лови� за ползване
         refuse:
-          modal_body: �ко откажете, не може да използвате платформата, но можете да<a href="%{data_portability_path}">�валите данните �и</a> и/или <a href="%{delete_path}">изтриете профила</a>.
           modal_btn_continue: Приемам у�лови�та и продължавам
           modal_btn_exit: Ще ги прегледам по-къ�но
           modal_button: Отказвам у�лови�та
@@ -1100,9 +1095,6 @@ bg:
         share_link: Сподели връзка
     statistics:
       comments_count: Коментари
-    user_activity:
-      index:
-        no_activities_warning: Този уча�тник в�е още не е имал активно�т.
     user_contact_disabled: Този уча�тник не приема директни �ъобщени�.
     user_conversations:
       create:
@@ -1198,7 +1190,6 @@ bg:
     invitations:
       edit:
         header: Завършете �ъздаването на профила �и
-        nickname_help: Ваши�т п�евдоним в %{organization}.
         submit_button: Запази
         subtitle: �ко приемате поканата, мол� задайте �во� п�евдоним и парола.
       invitation_removed: Поканата Ви беше премахната.
@@ -1265,7 +1256,6 @@ bg:
     passwords:
       edit:
         change_my_password: Пром�на на паролата ми
-        change_your_password: Промени паролата �и
         confirm_new_password: Потвърди нова парола
         new_password: �ова парола
         password_help: "Минимум %{minimun_characters} �имвола, не тр�бва да �а разпро�транени (например, 123456) и тр�бва да �а различни от вашите име и ел. поща."
@@ -1340,10 +1330,6 @@ bg:
     timestamp_error_message: Извинете, това беше твърде бързо! Мол�, изпратете отново.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Този �айт използва би�квитки. Продължавайки да разглеждате �айта, вие приемате използването на би�квитки. �аучете повече за това %{link}.
-        link_label: тук
-        ok: Съгла��вам �е
       edit_link:
         edit: Редактирай
       footer:
diff --git a/decidim-core/config/locales/ca.yml b/decidim-core/config/locales/ca.yml
index 879d92c0dbbb9..b7a717eaf7aa8 100644
--- a/decidim-core/config/locales/ca.yml
+++ b/decidim-core/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ ca:
     'true': 'Sí'
   carrierwave:
     errors:
-      image_too_big: La imatge és massa gran
+      file_resolution_too_large: La resolució de l'arxiu és massa gran
+      file_size_too_large: La mida del fitxer és massa gran
       not_inside_organization: L'arxiu no està relacionat amb cap organització
   date:
     formats:
@@ -110,7 +112,6 @@ ca:
       x_seconds:
         one: fa 1 segon
         other: "fa %{count} segons"
-        zero: ara mateix
   decidim:
     accessibility:
       external_link: Enllaç extern
@@ -119,9 +120,6 @@ ca:
       skip_button: Vés al contingut principal
     account:
       blocked: Aquest compte ha estat bloquejat degut a una violació dels Termes i Condicions d'ús
-      data_portability_export:
-        file_no_exists: L'arxiu no existeix
-        notice: La descàrrega de les teves dades està en curs. Rebràs un correu electrònic quan estigui completa.
       delete:
         alert: Aquesta acció no es pot desfer. Si esborres el teu compte no podràs entrar amb les teves credencials. L'eliminació del teu compte tindrà com a resultat l'anonimització de les teves contribucions. Continuaràs podent crear un nou compte, però aquestes contribucions no estaran associades a ell.
         confirm:
@@ -133,8 +131,21 @@ ca:
       destroy:
         error: S'ha produït un error en eliminar el teu compte.
         success: El teu compte s'ha eliminat correctament.
+      download_your_data_export:
+        file_no_exists: L'arxiu no existeix
+        notice: La descàrrega de les teves dades està en curs. Rebràs un correu electrònic quan estigui completa.
+      email_change:
+        body1: Hem enviat un correu a %{unconfirmed_email} per a verificar la teva nova adreça de correu electrònic.
+        body2: Cal que et reenviem el correu de verificació? %{resend_link} o %{cancel_link}.
+        cancel: cancel·lar
+        cancel_error: No s'ha pogut cancel·lar el canvi de correu electrònic.
+        cancel_successfully: Canvi de correu electrònic cancel·lat amb èxit.
+        resend_error: No s'ha pogut reenviar el correu de confirmació.
+        resend_successfully: Correu de confirmació reenviat amb èxit a %{unconfirmed_email}
+        send_again: Tornar a enviar
+        title: Verificació del canvi de correu electrònic
       show:
-        available_locales_helper: Tria l'idioma que vols utilitzar per a navegar i rebre notificacions a Decidim
+        available_locales_helper: Tria l'idioma que en que vols navegar i rebre notificacions de la plataforma
         change_password: Canvia la contrasenya
         update_account: Actualitzar compte
       update:
@@ -144,16 +155,44 @@ ca:
     admin:
       actions:
         cancel: Cancel·lar
+      password_change:
+        alert: Has de canviar la teva contrasenya per a poder seguir endavant
+        notification: Les usuàries amb rol d'administració han de canviar la seva contrasenya cada %{days} dies.
     admin_log:
       area:
         create: "%{user_name} ha creat l'àrea %{resource_name}"
         delete: "%{user_name} ha eliminat l'àrea %{resource_name}"
         update: "%{user_name} ha actualitzat l'àrea %{resource_name}"
+      area_type:
+        create: "%{user_name} ha creat el tipus d'àrea %{resource_name}"
+        delete: "%{user_name} ha eliminat el tipus d'àrea %{resource_name}"
+        update: "%{user_name} ha actualitzat el tipus d'àrea %{resource_name}"
+      attachment:
+        create: "%{user_name} ha creat l'adjunt %{resource_name}"
+        delete: "%{user_name} ha eliminat l'adjunt %{resource_name}"
+        update: "%{user_name} ha actualitzat l'adjunt %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} ha creat la col·lecció d'adjunts %{resource_name}"
+        delete: "%{user_name} ha eliminat la col·lecció d'adjunts %{resource_name}"
+        update: "%{user_name} ha actualitzat la col·lecció d'adjunts %{resource_name}"
+      category:
+        create: "%{user_name} ha afegit la categoria %{resource_name} a l'espai %{space_name}"
+        delete: "%{user_name} ha eliminat la categoria %{resource_name} de l'espai %{space_name}"
+        update: "%{user_name} ha actualitzat la categoria %{resource_name} de l'espai %{space_name}"
       component:
         create: "%{user_name} ha afegit el component %{resource_name} a l'espai %{space_name}"
         delete: "%{user_name} ha eliminat el component %{resource_name} de l'espai %{space_name}"
+        export_component: "%{user_name} ha exportat %{resource_name}%{component_name} de %{space_name} com %{format_name}"
         publish: "%{user_name} ha publicat el component %{resource_name} a l'espai %{space_name}"
         unpublish: "%{user_name} ha despublicat el component %{resource_name} de l'espai %{space_name}"
+        update_permissions_with_space: "%{user_name} ha actualitzat els permisos de %{resource_name} a %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} ha actualitzat la secció d'ajuda %{resource_name}"
+      helpers:
+        answers: respostes
+        comments: comentaris
+        projects: projectes
+        results: resultats
       impersonation_log:
         manage: "%{user_name} ha gestionat a %{resource_name} perquè %{reason}"
       moderation:
@@ -170,6 +209,7 @@ ca:
         update: "%{user_name} ha actualitzat la aplicació d'OAuth %{resource_name}"
       organization:
         update: "%{user_name} ha actualitzat la configuració de l'organització"
+        update_external_domain: "%{user_name} ha actualitzat els dominis externs de l'organització"
       participatory_space_private_user:
         create: "%{user_name} ha convidat %{resource_name} com a participant privada"
         create_via_csv: "%{user_name} ha convidat %{resource_name} via CSV per a ser participant privada"
@@ -181,6 +221,10 @@ ca:
         delete_with_parent: "%{user_name} ha suprimit l'àmbit %{resource_name} dins l'àmbit %{parent_scope}"
         update: "%{user_name} ha actualitzat l'àmbit %{resource_name}"
         update_with_parent: "%{user_name} ha actualitzat l'àmbit %{resource_name} dins l'àmbit %{parent_scope}"
+      scope_type:
+        create: "%{user_name} ha creat el tipus d'àmbit %{resource_name}"
+        delete: "%{user_name} ha eliminat el tipus d'àmbit %{resource_name}"
+        update: "%{user_name} ha actualitzat el tipus d'àmbit %{resource_name}"
       static_page:
         create: "%{user_name} ha creat la pàgina estàtica %{resource_name}"
         delete: "%{user_name} ha esborrat la pàgina estàtica %{resource_name}"
@@ -196,7 +240,9 @@ ca:
         unblock: "%{user_name} ha desbloquejat a la usuària %{resource_name}"
         unofficialize: "%{user_name} ha desoficialitzat la participant %{resource_name}"
       user_group:
+        block: "%{user_name} ha bloquejat al grup d'usuàries %{resource_name}"
         reject: "%{user_name} ha rebutjat la verificació del grup %{resource_name}"
+        unblock: "%{user_name} ha desbloquejat al grup d'usuàries %{resource_name}"
         verify: "%{user_name} ha verificat el grup %{resource_name}"
         verify_via_csv: "%{user_name} ha verificat el grup %{resource_name} a través d'un fitxer CSV"
       user_moderation:
@@ -230,7 +276,7 @@ ca:
         success: L'esborrany d'esmena s'ha eliminat correctament.
       edit_draft:
         discard: Descarta aquest esborrany
-        discard_confirmation: Estàs segur de que vols descartar l'esborrany d'aquesta esmena?
+        discard_confirmation: Segur que vols descartar l'esborrany d'aquesta esmena?
         send: Vista prèvia
         title: Edita l'esborrany d'esmena
       emendation:
@@ -304,6 +350,7 @@ ca:
       endorsements:
         one: adhesió
         other: adhesions
+      official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Verifica't introduint un número de passaport que comenci per "A"
@@ -370,7 +417,7 @@ ca:
           request_confirmation_instructions: Sol·licita instruccions de confirmació
           title: Confirma el teu correu electrònic
       show:
-        close_modal: Tancar el modal
+        close_modal: Tanca modal
     block_user_mailer:
       notify:
         body_1: El teu compte ha estat bloquejat.
@@ -394,6 +441,7 @@ ca:
           debate: Debat
           initiative: Iniciativa
           meeting: Trobada
+          order: Votació pressupostària
           post: Publicar
           proposal: Proposta
           question: Pregunta
@@ -408,8 +456,8 @@ ca:
             amendments_enabled: Esmenes habilitades
             comments_enabled: Comentaris habilitats
             comments_max_length: Longitud màxima dels comentaris
-            dummy_global_attribute_1: Atribut de prova 1
-            dummy_global_attribute_2: Atribut de prova 2
+            dummy_global_attribute1: Atribut de prova 1
+            dummy_global_attribute2: Atribut de prova 2
             dummy_global_translatable_text: Text traduïble de proves
             enable_pads_creation: Habilitar la creació de pads
             resources_permissions_enabled: Permisos de recursos habilitats
@@ -421,8 +469,8 @@ ca:
             amendment_reaction_enabled: Reacció a esmenes habilitada
             amendments_visibility: Visibilitat de les esmenes
             comments_blocked: Comentaris bloquejats
-            dummy_step_attribute_1: Atribut de fase de prova 1
-            dummy_step_attribute_2: Atribut de fase de prova 2
+            dummy_step_attribute1: Atribut de fase de prova 1
+            dummy_step_attribute2: Atribut de fase de prova 2
             dummy_step_translatable_text: Text de fase traduïble de proves
     contact: Contacte
     content_blocks:
@@ -466,13 +514,6 @@ ca:
       actions:
         login_before_access: Si us plau, identifica't amb el teu compte abans d'accedir
         unauthorized: No tens permís per realitzar aquesta acció
-    data_portability:
-      export:
-        ready: Llest
-      show:
-        download_data: Descarrega't les dades
-        download_data_description: S'enviarà un arxiu amb tota la informació associada al teu compte a <strong>%{user_email}</strong>. Aquest correu electrònic contindrà un arxiu .zip i una contrasenya per obrir-lo.<br/><br/>Per a descomprimir l'arxiu, necessitaràs <a href="https://www.7-zip.org/">7-Zip</a> (per a Windows) o <a href="https://www.keka.io/">Keka</a> (per a MacOS). Si uses Linux, la majoria de les vegades ho tindràs instal·lat per defecte. Si no, pots utilitzar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Sol·licita dades
     datepicker:
       help_text: 'Format esperat: %{datepicker_format}'
     devise:
@@ -491,7 +532,6 @@ ca:
           newsletter: Vull rebre un butlletí ocasional amb informació rellevant
           newsletter_title: Permís de contacte
           nickname_help: El teu àlies a %{organization}. Només pot contenir lletres, números, '-' and '_'.
-          password_help: "%{minimun_characters} caràcters mínim, no ha de ser massa comú (per exemple 123456) i ha de ser diferent del teu nom d'usuari i la teva adreça de correu electrònic."
           sign_in: Entra
           sign_up: Registra't
           sign_up_as:
@@ -516,9 +556,9 @@ ca:
             close_modal: Tanca modal
             uncheck: Deixa desmarcada
           notice: |-
-            <p>Hola, estàs segura que no vols rebre un butlletí?<br>
-            Si us plau, torna a marcar la casella de selecció de butlletí a continuació.<br>
-            Per a nosaltres és molt important que rebeu correus electrònics ocasionals per fer avisos importants, sempre podeu canviar-lo a la pàgina de configuració de les notificacions.</p>
+            <p>Hola, segur que no vols rebre un butlletí?<br>
+            Si us plau, pren en consideració marcar la casella de selecció de butlletí a continuació.<br>
+            Per a nosaltres és molt important que rebis correus electrònics ocasionals per fer avisos importants, sempre pots canviar-ho a la pàgina de configuració de les notificacions.</p>
             <p>Si no marques la casella, pot ser que et falti informació rellevant sobre noves oportunitats de participació dins de la plataforma.<br>
             Si encara vols evitar rebre butlletins, entenem perfectament la teva decisió.</p>
             <p>Gràcies per llegir això.</p>
@@ -540,6 +580,13 @@ ca:
           this_application_will_not_be_able_to: 'Aquesta aplicació no podrà:'
           update_profile: Actualitza el teu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> vol utilitzar el teu compte"
+    download_your_data:
+      export:
+        ready: Llest
+      show:
+        download_data: Descarrega't les dades
+        download_data_description: S'enviarà un arxiu amb tota la informació associada al teu compte a <strong>%{user_email}</strong>. Aquest correu electrònic contindrà un arxiu .zip i una contrasenya per obrir-lo.<br/><br/>Per a descomprimir l'arxiu, necessitaràs <a href="https://www.7-zip.org/">7-Zip</a> (per a Windows) o <a href="https://www.keka.io/">Keka</a> (per a MacOS). Si uses Linux, la majoria de les vegades ho tindràs instal·lat per defecte. Si no, pots utilitzar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Sol·licita dades
     editor_images:
       create:
         error: S'ha produït un error en pujar la imatge
@@ -683,13 +730,15 @@ ca:
           email_outro: Has rebut aquesta notificació perquè ets una de les administradores de la plataforma.
           email_subject: Un grup d'usuàries ha actualitzat el seu perfil
           notification_title: El grup d'usuàries %{user_group_name} ha actualitzat el seu perfil perdent-ne la verificació. Pots tornar a verificar-lo a través del <a href="%{groups_admin_path}"> taulell d'administració</a>.
+      nickname_event:
+        notification_body: S'ha corregit la manera en que es fan servir els àlies per a que no n'hi hagi de duplicats, per fer-ho ja no distingueix les majúscules de les minúscules. <br/> El teu àlies es va crear més tard que un altre d'igual, així que se t'ha renombrat automàticament. Pot modificar el teu àlies des de la <a href="%{link_to_account_settings}">configuració del teu compte</a>.
       notification_event:
         notification_title: S'ha produït un esdeveniment a <a href="%{resource_path}">%{resource_title}</a>.
       reports:
         resource_hidden:
           email_intro: Una administradora ha eliminat el teu %{resource_type} degut a que has estat reportada com a %{report_reasons}.
           email_outro: Has rebut aquesta notificació perquè ets autora d'un contingut eliminat.
-          email_subject: S'ha eliminat el teu %{resource_type}
+          email_subject: S'ha eliminat el/la teu/teva %{resource_type}
           notification_title: |-
             Una administradora ha eliminat el teu %{resource_type} degut a que has estat reportada com a %{report_reasons}..</br>
             <i>%{resource_content}</i>
@@ -710,7 +759,7 @@ ca:
           email_subject: "S'ha oficialitzat a %{name}"
           notification_title: La participant %{name} (%{nickname}) ha estat oficialitzada.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Fes clic en el següent enllaç per descarregar les teves dades.<br/>L''arxiu estarà disponible fins %{date}.<br/>Necessitaràs <a href="https://www.7-zip.org/">7-Zip</a> (per a Windows), <a href="https://www.keka.io/en/">Keka</a> (per a MacOS) o <a href="https://peazip.github.io">PeaZip</a> (per a Linux) per obrir-lo. Contrasenya: %{password}'
         download: Descarregar
       export:
@@ -750,7 +799,6 @@ ca:
         button: Deixar de seguir
         error: S'ha produït un error en deixar de seguir aquest recurs.
     forms:
-      current_file: Fitxer actual
       current_image: Imatge actual
       default_image: Imatge predeterminada
       errors:
@@ -762,15 +810,41 @@ ca:
         file:
           explanation: 'Instruccions per a l''arxiu:'
           message_1: Ha de ser una imatge o un document.
-          message_2: Per a les imatges, utilitza preferentment imatges apaïsades, el servei retalla la imatge. Per als arxius CSV, el separador entre columnes ha de ser una coma (",")
+          message_2: Per a les imatges, fes servir imatges apaïsades preferiblement, el servei retalla la imatge.
+        icon:
+          explanation: 'Instruccions per a la icona:'
+          message_1: Ha de ser una imatge quadrada.
+          message_2: La mida recomanada per a aquesta imatge és 512x512.
         image:
           explanation: 'Instruccions per a la imatge:'
           message_1: Preferiblement una imatge apaïsada que no tingui cap text.
           message_2: El servei retalla la imatge.
       file_validation:
         allowed_file_extensions: 'Tipus de fitxers admesos: %{extensions}'
+        max_file_dimension: 'Mides máximes de l''arxiu: %{resolution} pixels'
         max_file_size: 'Mida màxima del fitxer:%{megabytes}MB'
-      remove_this_file: Eliminar aquest arxiu
+      files:
+        extension_allowlist: 'Formats acceptats: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Afegir adjunt
+          add_file: Afegir fitxer
+          add_image: Afegir imatge
+          cancel: Cancel·lar
+          edit_image: Editar imatge
+          error: Error!
+          file_size_too_large: 'L''arxiu és massa gran! Pes d''arxiu màxim: %{megabytes}MB'
+          remove: Eliminar
+          replace: Reemplaçar
+          save: Desar
+          title: Títol
+          title_required: Un títol és necessari!
+          uploaded: Pujat
+          validating: Validant...
+          validation_error: Error de validació!
+      upload_help:
+        dropzone: Arrossegar-hi arxius o fer clic per a pujar-los
+        explanation: Guia per a %{attribute}
     gamification:
       all_badges_link: Veure totes les insígnies disponibles.
       badges:
@@ -794,7 +868,7 @@ ca:
       reached_top: Has arribat al màxim nivell d'aquesta insígnia.
     group_admins:
       actions:
-        are_you_sure: Segura? Això no eliminarà la participant del grup.
+        are_you_sure: Segur? Això no eliminarà la participant del grup.
         demote_admin: Elimina l'administradora
       demote:
         error: S'ha produït un error en eliminar aquesta participant de la llista d'administradores
@@ -823,7 +897,7 @@ ca:
         error: S'ha produït un error en acceptar aquesta sol·licitud d'incorporació al grup
         success: Sol·licitud acceptada correctament
       actions:
-        are_you_sure: Estàs segur?
+        are_you_sure: Segur?
         promote_to_admin: Fer administrador
         remove_from_group: Eliminar participant
       index:
@@ -840,7 +914,7 @@ ca:
         success: La participant s'ha eliminat correctament del grup
     groups:
       actions:
-        are_you_sure: Estàs segur?
+        are_you_sure: Segur?
       create:
         error: S'ha produït un errot en crear el grup
         success: Grup creat correctament
@@ -859,6 +933,7 @@ ca:
         success: La sol·licitud per a formar-ne part s'ha enviat correctament. Una administradora revisarà la teva sol·licitud abans d'acceptar-te al grup.
       leave:
         error: S'ha produït un error en abandonar el grup
+        last_admin: No et pots esborrar tu mateixa d'aquest grup perquè n'ets la darrera administradora. Fes a una altra membre administradora per a poder abandonar aquest grup.
         success: El grup s'ha abandonat correctament.
       members:
         accept_or_reject_join_requests: 'Les següents participants han sol·licitat unir-se a aquest grup. Accepta o rebutja les seves sol·licituds:'
@@ -871,7 +946,7 @@ ca:
       no_user_groups: Encara no pertanys a cap grup.
       roles:
         admin: Administradora
-        creator: Creadora
+        creator: Administradora
         member: Membre
       update:
         error: S'ha produït un error en actualitzar el grup
@@ -896,7 +971,7 @@ ca:
         body_1: Estàs a punt de visitar un enllaç extern i et recomanem que siguis prudent pel que fa als continguts en pàgines externes.
         body_2: Assegura't que l'enllaç que visitaràs és d'un lloc segur abans de seguir.
         cancel: Cancel·lar
-        close_modal: Tancar finestra
+        close_modal: Tanca modal
         proceed: Continuar
         title: Obrir enllaç extern
     log:
@@ -905,9 +980,12 @@ ca:
         create_with_space: "%{user_name} ha creat %{resource_name} a %{space_name}"
         delete: "%{user_name} ha eliminat %{resource_name}"
         delete_with_space: "%{user_name} ha eliminat %{resource_name} en %{space_name}"
+        publish_with_space: "%{user_name} ha publicat %{resource_name} en %{space_name}"
         unknown_action: "%{user_name} ha realitzat una acció a %{resource_name}"
         unknown_action_with_space: "%{user_name} ha realitzat una acció a %{resource_name} en %{space_name}"
+        unpublish_with_space: "%{user_name} ha despublicat %{resource_name} en %{space_name}"
         update: "%{user_name} ha actualitzat %{resource_name}"
+        update_permissions_with_space: "%{user_name} ha actualitzat els permisos de %{resource_name} a %{space_name}"
         update_with_space: "%{user_name} ha actualitzat %{resource_name} a %{space_name}"
       value_types:
         area_presenter:
@@ -1028,7 +1106,7 @@ ca:
     newsletter_mailer:
       newsletter:
         note: Has rebut aquest correu electrònic perquè estàs subscrita a butlletins de notícies a %{organization_name}. Pots canviar la configuració a la teva <a href="%{link}">pàgina de notificacions</a>.
-        see_on_website: No pots veure correctament aquest correu electrònic? Veu la seva <a href="%{link}" target="_blank"> versió web</a>.
+        see_on_website: No pots veure correctament aquest correu electrònic? Veu la seva <<a href="%{link}" target="_blank" class="see-on-website">versió web</a>.
         unsubscribe: Per desactivar la recepció d'aquest tipus de correu electrònic, <a href="%{link}" target="_blank" class="unsubscribe">dona't de baixa</a>.
     newsletter_templates:
       basic_only_text:
@@ -1080,23 +1158,47 @@ ca:
       no_notifications: Encara no hi ha notificacions.
       show:
         missing_event: Vaja, aquesta notificació pertany a un element que ja no està disponible. Pots descartar-la.
+    notifications_digest_mailer:
+      header:
+        daily: Resum diari de notificacions
+        weekly: Resum setmanal de notificacions
+      hello: Hola %{name},
+      intro:
+        daily: 'Aquestes són les notificacions del darrer dia basades en l''activitat que segueixes:'
+        weekly: 'Aquestes són les notificacions de la darrera setmana basades en l''activitat que segueixes:'
+      outro: Has rebut aquestes notificacions perquè segueixes aquest contingut o les seves autores. Pots deixar de seguir-les des de les seves respectives pàgines.
+      see_more: Veure més notificacions
+      subject: Aquest és el teu correu resum
     notifications_settings:
       show:
         administrators: Administradores
         allow_public_contact: Permetre que qualsevol participant m'envïi missatges directes, encara que no la segueixi.
+        allow_push_notifications: Mostrar notificacions emergents per a saber que passa mentre no estàs a la plataforma. Pots deshabilitar-les en qualsevol moment.
         direct_messages: Rebre missatges directes de qualsevol
-        email_on_moderations: Vull rebre un correu electrònic cada cop que es reporti quelcom per moderació.
-        email_on_notification: Vull rebre un correu electrònic cada vegada que rebi una notificació.
+        email_on_moderations: Vull rebre un correu electrònic cada cop que es reporti algo o a algú per moderació.
         everything_followed: Tot el que segueixo
         newsletter_notifications: Vull rebre butlletins informatius
         newsletters: Butlletins informatius
+        notification_settings:
+          close_meeting_reminder: Vull rebre un correu electrònic recordatori de trobades passades amb informes sense publicar
+        notifications_sending_frequencies:
+          daily: Diàriament
+          none: Cap
+          real_time: En temps real
+          weekly: Setmanalment
+        notifications_sending_frequency: Amb quina freqüència vols rebre el correu de notificacions?
         own_activity: La meva pròpia activitat, com quan algú fa comentaris a la meva proposta o em menciona
+        push_notifications: Notificacions emergents
+        push_notifications_reminder: Per rebre notificacions de la plataforma, primer les has de permetre a la configuració del teu navegador.
         receive_notifications_about: Vull rebre notificacions
-        send_notifications_by_email: Enviar notificacions per correu electrònic
         update_notifications_settings: Guardar canvis
       update:
         error: S'ha produït un error en actualitzar la configuració de les notificacions.
         success: La configuració de les notificacions s'ha actualitzat correctament.
+    offline:
+      show:
+        message: Sembla que estàs desconnectada. Torna a intentar-ho més tard, si us plau.
+        retry: Torna-ho a provar
     open_data:
       not_available_yet: Els fitxers Open Data encara no estan disponibles, torna-ho a provar d'aquí a uns minuts.
     own_user_groups:
@@ -1150,7 +1252,7 @@ ca:
           agreement: Estic d'acord amb aquests termes
           legend: Accepto els termes i condicions
         refuse:
-          modal_body: Si no acceptes, no podràs utilitzar la plataforma, pots <a href="%{data_portability_path}">descarregar les teves dades</a> i / o <a href="%{delete_path}">esborrar el teu compte de</a>.
+          modal_body: Si no acceptes, no podràs utilitzar la plataforma, pots <a href="%{download_your_data_path}">descarregar les teves dades</a> i/o <a href="%{delete_path}">esborrar el teu compte de</a>.
           modal_btn_continue: Acceptar els termes i continuar
           modal_btn_exit: Ho revisaré més tard
           modal_button: Rebutjar els termes
@@ -1162,6 +1264,10 @@ ca:
           title: 'Obligatori: revisa l''actualització dels nostres Termes de Servei'
     participatory_space_private_users:
       not_allowed: No tens permís per visualitzar aquest contingut
+    passwords:
+      update:
+        error: Hi ha hagut un problema en actualitzar la contrasenya
+        success: La contrasenya s'ha actualitzat correctament
     profile:
       deleted: Participant eliminada
       inaccessible_message: Aquest perfil és inaccessible degut a la violació dels Termes i Condicions d'ús!
@@ -1306,6 +1412,8 @@ ca:
         close_modal: Tancar el modal
         please_sign_in: Si us plau, inicia sessió
         sign_up: Registra't
+      mentions_modal:
+        remove_recipient: Eliminar destinatària %{name}
       participatory_space_filters:
         filters:
           areas: Àrees
@@ -1393,6 +1501,7 @@ ca:
       notify:
         body_1: La usuària %{user} ha estat reportada per %{token}
         body_2: 'Motiu: %{reason}'
+        details: Detalls proporcionats per la usuària
         greetings: Salutacions,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hola %{admin},
         subject: Una nova usuària ha estat reportada a %{organization_name}
@@ -1453,7 +1562,7 @@ ca:
     invitations:
       edit:
         header: Acabar de crear el teu compte
-        nickname_help: El teu àlies a %{organization}.
+        nickname_help: El teu àlies a %{organization}. Només pot contenir lletres, números, '-' i '_'.
         submit_button: Desa
         subtitle: Si acceptes la invitació, si us plau, estableix el teu àlies i contrasenya.
       invitation_removed: S'ha eliminat la teva invitació.
@@ -1519,10 +1628,11 @@ ca:
     passwords:
       edit:
         change_my_password: Canvia la meva contrasenya
-        change_your_password: Canvia la teva contrasenya
         confirm_new_password: Confirmar la nova contrasenya
         new_password: Nova contrasenya
         password_help: "%{minimun_characters} caràcters mínim, no ha de ser massa comú (per exemple 123456) i ha de ser diferent del teu nom d'usuari i la teva adreça de correu electrònic."
+        password_help_admin: "%{minimun_characters} caràcters mínim, no ha de ser massa comú (per exemple 123456) i ha de ser diferent del teu àlies, de la teva adreça de correu electrònic i de les teves antigues contrasenyes."
+        title: Canvi de contrasenya
       new:
         forgot_your_password: Has oblidat la teva contrasenya?
         send_me_reset_password_instructions: Envia'm les instruccions per restablir la contrasenya
@@ -1570,6 +1680,7 @@ ca:
       public: La teva informació pública.
   errors:
     messages:
+      allowed_file_content_types: 'només s''accepten arxius amb les següents extensions: %{types}'
       already_confirmed: ja s'ha confirmat, si us plau intenta iniciar la sessió
       confirmation_period_expired: s'ha de confirmar dins de %{period}, si us plau sol·licita'n un de nou
       content_type_allowlist_error: el tipus de fitxer no és vàlid
@@ -1587,7 +1698,7 @@ ca:
         other: 'S''han produït múltiples errors en processar la vostra sol·licitud:'
       too_many_marks: Estàs fent servir massa signes de puntuació consecutius (p. ex. i?)
       too_much_caps: Estàs utilitzant massa lletres majúscules (més del 25% del text)
-      too_short: És massa curt (menys %{count} caràcters)
+      too_short: és massa curt (menys %{count} caràcters)
   forms:
     correct_errors: Hi ha errors al formulari, si us plau corregeix-los per continuar.
     length_validator:
@@ -1601,14 +1712,60 @@ ca:
     timestamp_error_message: Ho sentim, has estat massa ràpid! Si us plau, torna a enviar-ho.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Aquest lloc web fa servir cookies pròpies i de tercers per millorar l’experiència de navegació, i oferir continguts i serveis d’interès. En continuar la navegació entenem que acceptes la nostra política de cookies. Per a més informació consulta %{link}.
-        link_label: aquí
-        ok: Hi estic d'acord
+      data_consent:
+        details:
+          columns:
+            description: Descripció
+            name: Nom
+            service: Servei
+            type: Tipus
+          items:
+            _session_id:
+              description: Permet als llocs web recordar a la usuària dins d'un lloc web quan es mou entre pàgines web.
+              service: Aquesta pàgina web
+            decidim-consent:
+              description: Emmagatzema informació sobre les galetes permeses per la usuària en aquesta pàgina web.
+              service: Aquesta pàgina web
+            pwaInstallPromptSeen:
+              description: Guarda l'estat si la notificació d'instal·lació de l'aplicació web progressiva (PWA) ja ha estat vista per la usuària.
+              service: Aquesta pàgina web
+          types:
+            cookie: Galeta
+            local_storage: Emmagatzematge local
+        dialog:
+          accept_all: Acceptar totes
+          accept_only_essential: Acceptar només les essencials
+          description: Utilitzem galetes en el nostre lloc web per a millorar el rendiment i el contingut d'aquest. Les galetes ens permeten oferir una experiència d'usuari i uns continguts més personalitzats des dels nostres canals de xarxes socials.
+          settings: Configuració
+          title: Informació sobre les galetes que es fan servir a aquesta pàgina web
+        modal:
+          accept_all: Acceptar totes
+          accept_only_essential: Acceptar només les essencials
+          analytics:
+            description: Aquestes galetes s'utilitzen per a mesurar i analitzar l'audiència del lloc web per a ajudar a millorar-lo.
+            title: Analítiques i estadístiques
+          description: Fem servir galetes per assegurar les funcionalitats bàsiques del lloc web i per a millorar la teva experiència en línia. Pots configurar i acceptar l'ús de galetes, i modificar les teves opcions de consentiment en qualsevol moment.
+          essential:
+            description: Aquestes galetes permeten la funcionalitat clau del lloc web i ajuden a mantenir a les seves usuàries segures. Es guarden automàticament al navegador i no es poden desactivar.
+            title: Essencials
+          marketing:
+            description: Aquestes galetes recullen informació sobre com fas servir el lloc web i es poden fer servir per a proporcionar-te un servei més personalitzat en els diferents espais en què participes.
+            title: Màrqueting
+          preferences:
+            description: Aquestes galetes permeten que el lloc web recordi les opcions que s'han triat en el passat a aquest lloc web per tal de proporcionar una experiència més personalitzada a les usuàries.
+            title: Preferències
+          save_settings: Guardar configuració
+          title: Configuració de les galetes
+          toggle: Canviar %{consent_category}
+        warning:
+          all_categories: totes les galetes
+          change_settings: Canviar la configuració de les galetes
+          consent_required: Cal que habilitis %{categories} per veure aquest contingut.
       edit_link:
         edit: Edita
       footer:
         cc_by_license: Amb llicència Creative Commons
+        data_consent_settings: Configuració de les galetes
         decidim_logo: Logo Decidim
         download_open_data: Descarrega els fitxers de dades obertes
         made_with_open_source: Web creada amb <a target="_blank" href="https://github.com/decidim/decidim">programari lliure</a>.
@@ -1628,6 +1785,8 @@ ca:
       notifications_dashboard:
         mark_all_as_read: Marcar tot com a llegit
         mark_as_read: Marcar com a llegit
+      offline_banner:
+        cache_version_page: Ostres! La teva xarxa està desconnectada. El que estàs veient és una versió prèvia de la pàgina desada a la memòria cau i que podria no estar actualitzada.
       social_media_links:
         facebook: "%{organization} a Facebook"
         github: "%{organization} a GitHub"
@@ -1639,6 +1798,8 @@ ca:
         continue_session: Continuar la sessió
         sign_out: Tancar sessió
         title: Vols continuar amb la sessió?
+      upload_modal:
+        close_modal: Tancar finestra
       user_menu:
         account: 'Compte d''usuària: %{name}'
         admin_dashboard: Tauler d'administració
@@ -1671,6 +1832,7 @@ ca:
     nickname_included_in_password: és massa semblant al teu àlies
     not_enough_unique_characters: no té prou caràcters únics
     password_not_allowed: no està permès
+    password_repeated: no pots reutilitzar una antiga contrasenya
     password_too_common: és massa comú
     password_too_long: és massa llarg
     password_too_short: és massa curt
@@ -1712,8 +1874,8 @@ ca:
         mailer:
           invitation_instructions:
             accept_until_format: "%B %d, %Y %I:%M %p"
-      long: "%d de %B, %Y %H:%M"
-      long_dashed: "%d-%m-%Y %H:%M:%S"
+      long: "%B %d, %Y %H:%M"
+      long_dashed: "%A-%m-%d %H:%M:%S"
       short: "%d/%m/%Y %H:%M"
       time_of_day: "%H:%M"
   versions:
diff --git a/decidim-core/config/locales/cs.yml b/decidim-core/config/locales/cs.yml
index 659295f2bf566..e0f6701fca611 100644
--- a/decidim-core/config/locales/cs.yml
+++ b/decidim-core/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -82,7 +83,8 @@ cs:
     'true': 'Ano'
   carrierwave:
     errors:
-      image_too_big: Obraz je příliš velký
+      file_resolution_too_large: Rozlišení souboru je příliš velké
+      file_size_too_large: Soubor je příliš velký
       not_inside_organization: Soubor není připojen k žádné organizaci
   date:
     formats:
@@ -131,8 +133,9 @@ cs:
         other: "před %{count} minutami"
       x_seconds:
         one: před 1 vteřinou
+        few: "před %{count} vteřinami"
+        many: "před %{count} vteřinami"
         other: "před %{count} vteřinami"
-        zero: právě te�
   decidim:
     accessibility:
       external_link: Externí odkaz
@@ -141,9 +144,6 @@ cs:
       skip_button: Přesko�it na hlavní obsah
     account:
       blocked: Tento ú�et byl zablokován kvůli porušení smluvních podmínek
-      data_portability_export:
-        file_no_exists: Soubor neexistuje
-        notice: Vaše data jsou momentálně v provozu. Po dokon�ení e-mailu obdržíte e-mail.
       delete:
         alert: Tuto akci nelze vrátit zpět. Pokud smažete svůj ú�et, nebudete se moci přihlásit pomocí přihlašovacích údajů. Odstranění vašeho ú�tu povede k anonymizaci vašich příspěvků. Stále budete moci vytvořit nový ú�et, ale tyto příspěvky s ním nebudou spojeny.
         confirm:
@@ -155,8 +155,21 @@ cs:
       destroy:
         error: Při mazání ú�tu došlo k chybě.
         success: Ú�et byl úspěšně smazán.
+      download_your_data_export:
+        file_no_exists: Soubor neexistuje
+        notice: Vaše data jsou momentálně v provozu. Po dokon�ení e-mailu obdržíte e-mail.
+      email_change:
+        body1: Poslali jsme e-mail na %{unconfirmed_email} k ověření Vaší nové e-mailové adresy.
+        body2: Potřebujete poslat znovu ověřovací e-mail? %{resend_link} nebo %{cancel_link}.
+        cancel: zrušit
+        cancel_error: Nelze zrušit změnu e-mailu.
+        cancel_successfully: Změna e-mailu byla úspěšně zrušena.
+        resend_error: Potvrzovací e-mail nelze znovu odeslat.
+        resend_successfully: Potvrzovací e-mail byl úspěšně odeslán na %{unconfirmed_email}
+        send_again: Znovu odeslat
+        title: Ověření změny e-mailu
       show:
-        available_locales_helper: Vyberte jazyk, který chcete použít k procházení a přijímání oznámení v Decidim
+        available_locales_helper: Vyberte jazyk, který chcete použít k procházení a přijímání oznámení na platformě
         change_password: Změnit heslo
         update_account: Aktualizovat ú�et
       update:
@@ -166,16 +179,44 @@ cs:
     admin:
       actions:
         cancel: Zrušit
+      password_change:
+        alert: Abyste mohli pokra�ovat, musíte změnit heslo
+        notification: Uživatelé správce si musí měnit heslo každých %{days} dní.
     admin_log:
       area:
         create: "%{user_name} vytvořila oblast %{resource_name}"
         delete: "%{user_name} odstranila oblast %{resource_name}"
         update: "%{user_name} aktualizovala oblast %{resource_name}"
+      area_type:
+        create: "%{user_name} vytvořil typ oblasti %{resource_name}"
+        delete: "%{user_name} odstranil typ oblasti %{resource_name}"
+        update: "%{user_name} aktualizoval typ oblasti %{resource_name}"
+      attachment:
+        create: "%{user_name} vytvořil/a přílohu %{resource_name}"
+        delete: "%{user_name} odstranil přílohu %{resource_name}"
+        update: "%{user_name} aktualizoval přílohu %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} vytvořil/a kolekci příloh %{resource_name}"
+        delete: "%{user_name} odstranil kolekci příloh %{resource_name}"
+        update: "%{user_name} aktualizoval kolekci příloh %{resource_name}"
+      category:
+        create: "%{user_name} přidal kategorii %{resource_name} do prostoru %{space_name}"
+        delete: "%{user_name} odstranil kategorii %{resource_name} z prostoru %{space_name}"
+        update: "%{user_name} aktualizoval kategorii %{resource_name} v prostoru %{space_name}"
       component:
         create: "%{user_name} přidal %{resource_name} komponent do prostoru %{space_name}"
         delete: "%{user_name} odstranila %{resource_name} komponentu z %{space_name} místa"
+        export_component: "%{user_name} exportoval %{resource_name} %{component_name} v %{space_name} jako %{format_name}"
         publish: "%{user_name} publikoval %{resource_name} komponentu ve %{space_name} prostoru"
         unpublish: "%{user_name} nepublikoval %{resource_name} komponentu z %{space_name} místa"
+        update_permissions_with_space: "%{user_name} aktualizoval oprávnění %{resource_name} v %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} aktualizoval sekci nápovědy %{resource_name}"
+      helpers:
+        answers: odpovědi
+        comments: komentáře
+        projects: projekty
+        results: výsledky
       impersonation_log:
         manage: "%{user_name} spravoval %{resource_name}, protože %{reason}"
       moderation:
@@ -192,6 +233,7 @@ cs:
         update: "%{user_name} aktualizovala %{resource_name} aplikaci OAuth"
       organization:
         update: "%{user_name} aktualizovala nastavení organizace"
+        update_external_domain: "%{user_name} aktualizoval externí domény organizace"
       participatory_space_private_user:
         create: "%{user_name} pozval %{resource_name} aby se stal soukromým uživatelem"
         create_via_csv: "%{user_name} pozval %{resource_name} prostřednictvím CSV k tomu, aby byl soukromým ú�astníkem"
@@ -203,6 +245,10 @@ cs:
         delete_with_parent: "%{user_name} odstranilo %{resource_name} rozsah uvnitÅ™ rozsahu %{parent_scope}"
         update: "%{user_name} aktualizoval oblast působnosti %{resource_name}"
         update_with_parent: "%{user_name} aktualizoval oblast působnosti %{resource_name} uvnitř oblasti působnosti %{parent_scope}"
+      scope_type:
+        create: "%{user_name} vytvořil/a typ rozsahu %{resource_name}"
+        delete: "%{user_name} odstranil typ rozsahu %{resource_name}"
+        update: "%{user_name} aktualizoval typ rozsahu %{resource_name}"
       static_page:
         create: "%{user_name} vytvořila %{resource_name} statickou stránku"
         delete: "%{user_name} odstranila %{resource_name} statickou stránku"
@@ -218,7 +264,9 @@ cs:
         unblock: "%{user_name} odblokoval uživatele %{resource_name}"
         unofficialize: "%{user_name} neoficiální uživatel %{resource_name}"
       user_group:
+        block: "%{user_name} zablokoval uživatelskou skupinu %{resource_name}"
         reject: "%{user_name} odmítl ověření skupiny %{resource_name} uživatelů"
+        unblock: "%{user_name} odblokoval uživatelskou skupinu %{resource_name}"
         verify: "%{user_name} ověřilo %{resource_name} uživatelskou skupinu"
         verify_via_csv: "%{user_name} ověřilo %{resource_name} skupinu uživatelů prostřednictvím souboru CSV"
       user_moderation:
@@ -335,6 +383,7 @@ cs:
         few: schválení
         many: schválení
         other: schválení
+      official_author: Oficiální
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Ověřte si zavedením �ísla pasu za�ínajícím písmenem "A"
@@ -427,6 +476,7 @@ cs:
           debate: Debata
           initiative: Iniciativa
           meeting: Schůzka
+          order: Hlasování o rozpo�tu
           post: Příspěvek
           proposal: Návrh
           question: Otázka
@@ -441,8 +491,8 @@ cs:
             amendments_enabled: Pozměňovací návrhy povoleny
             comments_enabled: Komentáře povoleny
             comments_max_length: Maximální délka komentářů
-            dummy_global_attribute_1: Zástupný atribut 1
-            dummy_global_attribute_2: Zástupný atribut 2
+            dummy_global_attribute1: Zástupný atribut 1
+            dummy_global_attribute2: Zástupný atribut 2
             dummy_global_translatable_text: Zástupný text k přeložení
             enable_pads_creation: Povolit vytvoření sdíleného textu
             resources_permissions_enabled: Oprávnění zdrojů povoleno
@@ -454,8 +504,8 @@ cs:
             amendment_reaction_enabled: Reakce na změnu byla povolena
             amendments_visibility: Viditelnost pozměňovacího návrhu
             comments_blocked: Komentáře blokovány
-            dummy_step_attribute_1: Atribut 1 zástupného kroku
-            dummy_step_attribute_2: Atribut 2 zástupného kroku
+            dummy_step_attribute1: Atribut 1 zástupného kroku
+            dummy_step_attribute2: Atribut 2 zástupného kroku
             dummy_step_translatable_text: Zástupný krok textu k přeložení
     contact: Kontakt
     content_blocks:
@@ -499,13 +549,6 @@ cs:
       actions:
         login_before_access: Prosím přihlašte se k ú�tu abyste mohli vstoupit
         unauthorized: Nemáte oprávnění k provedení této akce
-    data_portability:
-      export:
-        ready: Připraven
-      show:
-        download_data: Stáhnout data
-        download_data_description: Soubor obsahující všechny informace spojené s vaším ú�tem bude odeslán na adresu <strong>%{user_email}</strong>. Tento e-mail bude obsahovat .zip soubor a heslo pro jeho otevření.<br/><br/>Pro rozbalení souboru budete potřebovat <a href="https://www.7-zip.org/">7-Zip</a> (pro Windows) nebo <a href="https://www.keka.io/">Keku</a> (pro MacOS). Pokud používáte Linux, většinou jej budete mít nainstalovaný ve výchozím nastavení. Pokud ne, můžete použít <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> nebo <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Vyžádat data
     datepicker:
       help_text: 'O�ekávaný formát: %{datepicker_format}'
     devise:
@@ -524,7 +567,6 @@ cs:
           newsletter: Chci dostávat příležitostný zpravodaj s relevantními informacemi
           newsletter_title: Povolení kontaktu
           nickname_help: Váš alias v %{organization}. Může obsahovat pouze písmena, �íslice, '-' a '_'.
-          password_help: "%{minimun_characters} je minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."
           sign_in: Přihlásit se
           sign_up: Zaregistrovat se
           sign_up_as:
@@ -577,6 +619,13 @@ cs:
           this_application_will_not_be_able_to: 'Tato aplikace nebude moci:'
           update_profile: Aktualizujte svůj profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> chce používat váš ú�et"
+    download_your_data:
+      export:
+        ready: Připraven
+      show:
+        download_data: Stáhnout data
+        download_data_description: Soubor obsahující všechny informace spojené s vaším ú�tem bude odeslán na adresu <strong>%{user_email}</strong>. Tento e-mail bude obsahovat .zip soubor a heslo pro jeho otevření.<br/><br/>Pro rozbalení souboru budete potřebovat <a href="https://www.7-zip.org/">7-Zip</a> (pro Windows) nebo <a href="https://www.keka.io/">Keku</a> (pro MacOS). Pokud používáte Linux, většinou jej budete mít nainstalovaný ve výchozím nastavení. Pokud ne, můžete použít <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> nebo <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Vyžádat data
     editor_images:
       create:
         error: Chyba při nahrávání obrázku
@@ -720,6 +769,8 @@ cs:
           email_outro: Toto oznámení jste obdrželi, protože jste administrátor platformy.
           email_subject: Skupina uživatelů aktualizovala svůj profil
           notification_title: Uživatelská skupina %{user_group_name} aktualizovala svůj profil, ponechala jej neověřený. Nyní jej můžete ověřit v <a href="%{groups_admin_path}">admin panelu</a>.
+      nickname_event:
+        notification_body: Opravili jsme způsob, jakým jsou přezdívky používány, aby nedocházelo k duplicitám, a proto jsme odstranili pravidlo citlivého na případ případu. <br/> Vaše přezdívka byla vytvořena po jiné, se stejným jménem, takže jsme ji automaticky přejmenovali. Můžete to změnit z <a href="%{link_to_account_settings}">nastavení ú�tu</a>.
       notification_event:
         notification_title: Došlo k události <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -747,7 +798,7 @@ cs:
           email_subject: "%{name} byl oficializován"
           notification_title: Uživatel %{name} (%{nickname}) byl oficiálně zveřejněn.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Klikněte na následující odkaz pro stažení vašich dat.<br/>Soubor bude k dispozici do %{date}.<br/>Budete potřebovat <a href="https://www.7-zip.org/">7-Zip</a> (pro Windows), <a href="https://www.keka.io/en/">Keka</a> (pro MacOS) nebo <a href="https://peazip.github.io">PeaZip</a> (pro Linux) pro jeho otevření. Heslo: %{password}'
         download: Stažení
       export:
@@ -789,7 +840,6 @@ cs:
         button: Ukon�it sledování
         error: Při sledování tohoto zdroje došlo k chybě.
     forms:
-      current_file: Aktuální soubor
       current_image: Aktuální obrázek
       default_image: Výchozí obrázek
       errors:
@@ -801,15 +851,41 @@ cs:
         file:
           explanation: 'Pokyny pro soubor:'
           message_1: Jedná se o obrázek nebo dokument.
-          message_2: Pro obrázky použijte pokud možno orientaci na šířku, služba ořeže obrázek. Pro CSV soubory musí být oddělova� mezi sloupci �árkou (",")
+          message_2: U obrázků použijte pokud možno formát na šířku, obrázek bude oříznut.
+        icon:
+          explanation: 'Pokyny pro ikonu:'
+          message_1: Musí to být �tvercový obrázek.
+          message_2: Doporu�ená velikost pro tento obrázek je 512 x 512.
         image:
           explanation: 'Pokyny pro obrázek:'
           message_1: Je vhodnější obrázek na šířku, který nemá žádný text.
           message_2: Software tento obrázek ořízne.
       file_validation:
         allowed_file_extensions: 'Povolené přípony souborů: %{extensions}'
+        max_file_dimension: 'Maximální rozměry souboru: %{resolution} pixelů'
         max_file_size: 'Maximální velikost souboru: %{megabytes}MB'
-      remove_this_file: Odstranit tento soubor
+      files:
+        extension_allowlist: 'Přijaté formáty: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Přidat přílohu
+          add_file: Přidat soubor
+          add_image: Přidat obrázek
+          cancel: Zrušit
+          edit_image: Upravit obrázek
+          error: Chyba!
+          file_size_too_large: 'Velikost souboru je příliš velká! Maximální velikost souboru: %{megabytes}MB'
+          remove: Odebrat
+          replace: Nahradit
+          save: Uložit
+          title: Název
+          title_required: Název je povinný!
+          uploaded: Nahráno
+          validating: Probíhá ověřování...
+          validation_error: Chyba ověření!
+      upload_help:
+        dropzone: Přetáhněte soubory sem nebo klikněte pro nahrání
+        explanation: Návod pro %{attribute}
     gamification:
       all_badges_link: Zobrazit všechny dostupné odznaky.
       badges:
@@ -898,6 +974,7 @@ cs:
         success: Žádost o připojení byla úspěšně vytvořena. Před přijetím do skupiny administrátor váš požadavek zkontroluje.
       leave:
         error: Při opouštění skupiny došlo k problému
+        last_admin: Nemůžete se odebrat z této skupiny, protože jste poslední správce. Vytvořte jiného �lena administrátora, abyste opustili skupinu.
         success: Skupina úspěšně opustila.
       members:
         accept_or_reject_join_requests: 'Následující uživatelé se připojili k této skupině. Přijmout nebo odmítnout jejich požadavky:'
@@ -910,7 +987,7 @@ cs:
       no_user_groups: Nepatří do žádné skupiny.
       roles:
         admin: Správce
-        creator: Tvůrce
+        creator: Administrátor
         member: ÄŒlen
       update:
         error: Při aktualizaci skupiny došlo k problému
@@ -935,7 +1012,7 @@ cs:
         body_1: Chystáte se navštívit externí odkaz a chtěli bychom, abyste byli opatrní, pokud jde o obsah na externím webu.
         body_2: Zkontrolujte prosím odkaz, který se chystáte navštívit, a než budete pokra�ovat, ujistěte se, že jste jej rozpoznali jako bezpe�ný web.
         cancel: Zrušit
-        close_modal: Zavřít modal
+        close_modal: Zavřít okno
         proceed: Pokra�ovat
         title: Otevřít externí odkaz
     log:
@@ -944,9 +1021,12 @@ cs:
         create_with_space: "%{user_name} vytvořil %{resource_name} v %{space_name}"
         delete: "%{user_name} odstraněno %{resource_name}"
         delete_with_space: "%{user_name} smazán %{resource_name} v %{space_name}"
+        publish_with_space: "%{user_name} publikoval %{resource_name} v %{space_name}"
         unknown_action: "%{user_name} provedla nějakou akci na %{resource_name}"
         unknown_action_with_space: "%{user_name} provedlo nějakou akci na %{resource_name} v %{space_name}"
+        unpublish_with_space: "%{user_name} zrušil publikaci %{resource_name} v %{space_name}"
         update: "%{user_name} aktualizováno %{resource_name}"
+        update_permissions_with_space: "%{user_name} aktualizoval oprávnění k %{resource_name} v %{space_name}"
         update_with_space: "%{user_name} aktualizováno %{resource_name} v %{space_name}"
       value_types:
         area_presenter:
@@ -1067,7 +1147,6 @@ cs:
     newsletter_mailer:
       newsletter:
         note: Tento e-mail jste obdrželi, protože jste odběrateli zpravodajů na %{organization_name}. Můžete změnit nastavení na <a href="%{link}">oznámení straně</a>.
-        see_on_website: Nelze vidět tento e-mail správně? Zobrazte jej na webu <a href="%{link}" target="_blank"></a>.
         unsubscribe: Chcete-li se odhlásit z příjmu tohoto typu e-mailu, <a href="%{link}" target="_blank" class="unsubscribe">Odhlásit se</a>.
     newsletter_templates:
       basic_only_text:
@@ -1119,23 +1198,47 @@ cs:
       no_notifications: Zatím žádné oznámení.
       show:
         missing_event: Jejda, toto oznámení patří k položce, která již není k dispozici. Můžete ho zahodit.
+    notifications_digest_mailer:
+      header:
+        daily: Denní výběr oznámení
+        weekly: Týdenní výběr oznámení
+      hello: Dobrý den %{name},
+      intro:
+        daily: 'Toto jsou oznámení z posledního dne založená na aktivitě, kterou máte:'
+        weekly: 'Toto jsou oznámení z minulého týdne založená na aktivitě, kterou máte:'
+      outro: Obdrželi jste tato oznámení, protože sledujete tento obsah nebo jeho autory. Můžete je zrušit z jejich příslušných stránek.
+      see_more: Zobrazit další oznámení
+      subject: Tohle je váš emailový přehled
     notifications_settings:
       show:
         administrators: Správci
         allow_public_contact: Umožnit komukoli poslat mi přímou zprávu, i když je nesleduji.
+        allow_push_notifications: Získejte oznámení a zjistěte, co se děje, když nejste na platformě. Kdykoli je můžete vypnout.
         direct_messages: Přijímat přímé zprávy od kohokoli
-        email_on_moderations: Chci dostávat e-mail pokaždé, když je něco nahlášeno pro moderování.
-        email_on_notification: Chci dostávat e-mail pokaždé, když obdržím oznámení.
+        email_on_moderations: Chci dostávat e-mail pokaždé, když je něco nahlášeno k moderování.
         everything_followed: VÅ¡echno, co sleduji
         newsletter_notifications: Chci dostávat zpravodaje
         newsletters: Zpravodaje
+        notification_settings:
+          close_meeting_reminder: Chci dostávat e-mailem připomenutí uzavřených schůzek nepublikovaných zpráv
+        notifications_sending_frequencies:
+          daily: DennÄ›
+          none: Vůbec
+          real_time: V reálném �ase
+          weekly: Týdně
+        notifications_sending_frequency: Jak �asto chcete dostávat e-mail s oznámením?
         own_activity: Moje vlastní �innost, jako kdyby někdo komentoval ve svém návrhu nebo mě zmínil
+        push_notifications: Push oznámení
+        push_notifications_reminder: Chcete-li dostávat oznámení z platformy, musíte je nejdříve povolit v nastavení prohlíže�e.
         receive_notifications_about: Chci dostávat oznámení
-        send_notifications_by_email: Poslat oznámení emailem
         update_notifications_settings: Uložit změny
       update:
         error: Při aktualizaci nastavení oznámení došlo k chybě.
         success: Nastavení oznámení bylo úspěšně aktualizováno.
+    offline:
+      show:
+        message: Vypadá to, že jste v režimu offline. Zkuste to prosím později.
+        retry: Zkusit znovu
     open_data:
       not_available_yet: Soubory Open Data nejsou dosud k dispozici. Zkuste to prosím znovu za pár minut.
     own_user_groups:
@@ -1189,7 +1292,7 @@ cs:
           agreement: Souhlasím s těmito podmínkami
           legend: Souhlasíte s podmínkami používání
         refuse:
-          modal_body: Pokud odmítnete, nebudete moci používat platformu, můžete <a href="%{data_portability_path}">stahovat data</a> a / nebo <a href="%{delete_path}">smazat svůj ú�et</a>.
+          modal_body: Pokud odmítnete, nebudete moci platformu používat, můžete <a href="%{download_your_data_path}">stáhnout svá data</a> a/nebo <a href="%{delete_path}">smazat svůj ú�et</a>.
           modal_btn_continue: Přijměte termíny a pokra�ujte
           modal_btn_exit: Později to přezkoumám
           modal_button: Odmítněte podmínky
@@ -1201,6 +1304,10 @@ cs:
           title: 'Požadováno: Zkontrolujte aktualizace našich smluvních podmínek'
     participatory_space_private_users:
       not_allowed: Nemáte oprávnění k zobrazení tohoto obsahu
+    passwords:
+      update:
+        error: Došlo k problému s aktualizací hesla
+        success: Heslo bylo úspěšně změněno
     profile:
       deleted: Vymazaný uživatel
       inaccessible_message: Tento profil je nedostupný z důvodu porušení smluvních podmínek!
@@ -1347,6 +1454,8 @@ cs:
         close_modal: Zavřít okno
         please_sign_in: Přihlaste se, prosím
         sign_up: Přihlásit se
+      mentions_modal:
+        remove_recipient: Odebrat příjemce %{name}
       participatory_space_filters:
         filters:
           areas: Oblasti
@@ -1387,7 +1496,7 @@ cs:
       show_translated: Zobrazit automaticky přeložený text
     user_activity:
       index:
-        no_activities_warning: Tento ú�astník zatím nemá žádnou aktivitu.
+        no_activities_warning: Tento uživatel zatím nemá žádnou aktivitu.
     user_contact_disabled: Tento uživatel nepřijímá přímé zprávy.
     user_conversations:
       create:
@@ -1434,6 +1543,7 @@ cs:
       notify:
         body_1: Uživatel %{user} byl nahlášen od %{token}
         body_2: 'Důvod: %{reason}'
+        details: Podrobnosti poskytnuté uživatelem
         greetings: Zdravíme<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Dobrý den %{admin},
         subject: Nový uživatel byl nahlášen v %{organization_name}
@@ -1494,7 +1604,7 @@ cs:
     invitations:
       edit:
         header: Dokon�ete vytvoření ú�tu
-        nickname_help: Vaše přezdívka v %{organization}.
+        nickname_help: Vaše přezdívka v %{organization}. Může obsahovat pouze písmena, �íslice, '-' a '_'.
         submit_button: Uložit
         subtitle: Pokud přijmete pozvánku, nastavte svou přezdívku a heslo.
       invitation_removed: Vaše pozvánka byla odstraněna.
@@ -1561,10 +1671,11 @@ cs:
     passwords:
       edit:
         change_my_password: Změňte heslo
-        change_your_password: Změňte si své heslo
         confirm_new_password: Potvr�te nové heslo
         new_password: Nové heslo
         password_help: "%{minimun_characters} je minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."
+        password_help_admin: "minimálně %{minimun_characters} znaků, nesmí být příliš �asté (např. 123456), musí se lišit od vaší přezdívky a e-mailu a musí se lišit od vašich starých hesel."
+        title: Změna hesla
       new:
         forgot_your_password: Zapomněli jste heslo?
         send_me_reset_password_instructions: Pošlete mi pokyny k resetování hesla
@@ -1614,6 +1725,7 @@ cs:
       public: Vaše veřejné informace.
   errors:
     messages:
+      allowed_file_content_types: 'jsou povoleny pouze soubory s následujícími příponami: %{types}'
       already_confirmed: bylo již potvrzeno, zkuste prosím přihlásit
       confirmation_period_expired: musí být potvrzeno v rámci %{period}, požádejte o nový
       content_type_allowlist_error: typ souboru není platný
@@ -1649,14 +1761,60 @@ cs:
     timestamp_error_message: Promiňte, bylo to příliš rychlé! Znovu odešlete.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Tento web používá cookies. Pokra�ováním v procházení webu souhlasíte s používáním souborů cookie. Zjistěte více o tom %{link}.
-        link_label: Zjistěte více o cookies
-        ok: Souhlasím
+      data_consent:
+        details:
+          columns:
+            description: Popis
+            name: Název
+            service: Služba
+            type: Typ
+          items:
+            _session_id:
+              description: Umožňuje webovým stránkám zapamatovat si uživatele na webových stránkách, když se pohybují mezi webovými stránkami.
+              service: Tato stránka
+            decidim-consent:
+              description: Uloží informace o cookies povolených uživatelem na této stránce.
+              service: Tato stránka
+            pwaInstallPromptSeen:
+              description: Uloží stav, pokud uživatel již viděl instala�ní oznámení progresivní webové aplikace (PWA).
+              service: Tato stránka
+          types:
+            cookie: Cookie
+            local_storage: Místní úložiště
+        dialog:
+          accept_all: Přijmout vše
+          accept_only_essential: Přijmout pouze nezbytné soubory cookie
+          description: Na našich webových stránkách používáme soubory cookie ke zlepšení výkonu a obsahu těchto stránek. Soubory cookie nám umožňují poskytovat individuálnější uživatelské nastavení a sociální kanály.
+          settings: Nastavení
+          title: Informace o cookies používaných na internetových stránkách
+        modal:
+          accept_all: Přijmout vše
+          accept_only_essential: Přijmout pouze nezbytné soubory cookie
+          analytics:
+            description: Tyto soubory cookie se používají k měření a analýze publika internetových stránek, aby pomohly zlepšit webové stránky.
+            title: Analytika a statistiky
+          description: Soubory cookie používáme, abychom zajistili základní funkce webových stránek a zlepšili vaše online zkušenosti. Můžete si kdykoliv nastavit a akceptovat používání cookies a změnit své možnosti souhlasu.
+          essential:
+            description: Tyto soubory cookie umožňují klí�ové funkce webu a pomáhají udržet uživatele v bezpe�í. Jsou automaticky uloženy v prohlíže�i a nemohou být zakázány.
+            title: Zásadní
+          marketing:
+            description: Tyto soubory cookie shromaž�ují informace o tom, jak používáte webovou stránku a mohou být využity k poskytování více individualizovaného marketingu na různých webových stránkách, které používáte.
+            title: Marketing
+          preferences:
+            description: Tyto soubory cookie umožňují si pamatovat si volby, které jste u�inili v minulosti na těchto webových stránkách, aby poskytovaly více individualizovaného zážitku pro uživatele webových stránek.
+            title: Předvolby
+          save_settings: Uložit nastavení
+          title: Nastavení cookies
+          toggle: Přepína� %{consent_category}
+        warning:
+          all_categories: všechny cookie
+          change_settings: Změnit nastavení cookie
+          consent_required: Abyste mohli vidět tento obsah, musíte povolit %{categories}.
       edit_link:
         edit: Upravit
       footer:
         cc_by_license: Licence Creative Commons
+        data_consent_settings: Nastavení cookies
         decidim_logo: Logo Decidim
         download_open_data: Stáhněte si soubory s otevřenými daty
         made_with_open_source: Webová stránka vytvořená s <a target="_blank" href="https://github.com/decidim/decidim">svobodným softwarem</a>.
@@ -1676,6 +1834,8 @@ cs:
       notifications_dashboard:
         mark_all_as_read: Ozna�it vše jako pře�tené
         mark_as_read: Ozna�it jako pře�tené
+      offline_banner:
+        cache_version_page: Jejda! Vaše síť je offline. Toto je dříve uložená verze stránky, kterou navštívíte, možná není aktualizovaná.
       social_media_links:
         facebook: "%{organization} na Facebooku"
         github: "%{organization} na GitHubu"
@@ -1687,6 +1847,8 @@ cs:
         continue_session: Pokra�ovat v relaci
         sign_out: Odhlásit se
         title: Chcete pokra�ovat v relaci?
+      upload_modal:
+        close_modal: Zavřít modal
       user_menu:
         account: 'Uživatelský ú�et: %{name}'
         admin_dashboard: Ovládací panel
@@ -1719,6 +1881,7 @@ cs:
     nickname_included_in_password: je příliš podobné vaší přezdívce
     not_enough_unique_characters: nemá dostatek jedine�ných znaků
     password_not_allowed: není povoleno
+    password_repeated: nelze znovu použít staré heslo
     password_too_common: je příliš běžné
     password_too_long: je to moc dlouhé
     password_too_short: je příliš krátké
diff --git a/decidim-core/config/locales/de.yml b/decidim-core/config/locales/de.yml
index 5b4a65f935705..e552d2546f468 100644
--- a/decidim-core/config/locales/de.yml
+++ b/decidim-core/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -73,7 +74,8 @@ de:
     'true': 'Ja'
   carrierwave:
     errors:
-      image_too_big: Das Bild ist zu groß
+      file_resolution_too_large: Die Datei-Auflösung ist zu groß
+      file_size_too_large: Datei ist zu groß
       not_inside_organization: Die Datei ist keiner Organisation hinzugefügt
   date:
     formats:
@@ -107,9 +109,8 @@ de:
         one: Vor 1 Minute
         other: "Vor %{count} Minuten"
       x_seconds:
-        one: vor 1 Sekunde
+        one: Vor 1 Sekunde
         other: "Vor %{count} Sekunden"
-        zero: sofort
   decidim:
     accessibility:
       external_link: Externer Link
@@ -118,9 +119,6 @@ de:
       skip_button: Zu Hauptinhalten überspringen
     account:
       blocked: Dieses Konto wurde wegen Verletzung der Allgemeinen Geschäftsbedingungen gesperrt
-      data_portability_export:
-        file_no_exists: Diese Datei existiert nicht
-        notice: Ihre Daten werden gerade bereitgestellt. Sie erhalten nach Fertigstellung eine E-Mail.
       delete:
         alert: Diese Aktion kann nicht rückgängig gemacht werden. Wenn Sie Ihr Konto löschen, können Sie sich nicht mehr einloggen. Mit der Löschung ihres Accounts werden all Ihre Beiträge anonymisiert. Sie können später wieder ein neues Konto erstellen, aber diese Beiträge werden nicht mehr mit dem neuen Konto verknüpft sein.
         confirm:
@@ -132,8 +130,20 @@ de:
       destroy:
         error: Beim Löschen Ihres Kontos ist ein Fehler aufgetreten.
         success: Ihr Konto wurde erfolgreich gelöscht.
+      download_your_data_export:
+        file_no_exists: Diese Datei existiert nicht
+        notice: Ihre Daten werden gerade bereitgestellt. Sie erhalten nach Fertigstellung eine E-Mail.
+      email_change:
+        body1: Wir haben eine E-Mail an %{unconfirmed_email} gesendet, um Ihre neue E-Mail-Adresse zu verifizieren.
+        body2: Möchten Sie die Verifizierungs-E-Mail erneut senden? %{resend_link} oder %{cancel_link}.
+        cancel: stornieren
+        cancel_error: Die Änderung der E-Mail-Adresse konnte nicht storniert werden.
+        cancel_successfully: Die Änderung der E-Mail-Adresse wurde erfolgreich storniert.
+        resend_error: Bestätigungs-E-Mail konnte nicht erneut gesendet werden.
+        resend_successfully: Die Bestätigungs-E-Mail wurde erfolgreich an %{unconfirmed_email} gesendet
+        send_again: Erneut senden
       show:
-        available_locales_helper: Wählen Sie die Sprache aus, die Sie verwenden möchten, um in Decidim zu surfen und Benachrichtigungen zu erhalten
+        available_locales_helper: Wählen Sie die Sprache aus, in der Sie Decidim verwenden und Benachrichtigungen erhalten möchten
         change_password: Passwort ändern
         update_account: Konto aktualisieren
       update:
@@ -143,16 +153,44 @@ de:
     admin:
       actions:
         cancel: Stornieren
+      password_change:
+        alert: Sie müssen Ihr Passwort ändern, um fortzufahren
+        notification: Administratoren müssen ihr Passwort alle %{days} Tage ändern.
     admin_log:
       area:
         create: "%{user_name} hat den Bereich %{resource_name} erstellt"
         delete: "%{user_name} hat den Bereich %{resource_name} gelöscht"
         update: "%{user_name} hat den Bereich %{resource_name} aktualisiert"
+      area_type:
+        create: "%{user_name} hat den Bereichstyp %{resource_name} erstellt"
+        delete: "%{user_name} hat den Bereichstyp %{resource_name} gelöscht"
+        update: "%{user_name} hat den Bereichstyp %{resource_name} aktualisiert"
+      attachment:
+        create: "%{user_name} hat den Anhang %{resource_name} erstellt"
+        delete: "%{user_name} hat den Anhang %{resource_name} gelöscht"
+        update: "%{user_name} hat den Anhang %{resource_name} aktualisiert"
+      attachment_collection:
+        create: "%{user_name} hat den Ordner %{resource_name} erstellt"
+        delete: "%{user_name} hat den Ordner %{resource_name} gelöscht"
+        update: "%{user_name} hat den Ordner %{resource_name} aktualisiert"
+      category:
+        create: "%{user_name} hat die Kategorie %{resource_name} im Bereich %{space_name} hinzugefügt"
+        delete: "%{user_name} hat die Kategorie %{resource_name} im Bereich %{space_name} gelöscht"
+        update: "%{user_name} hat die Kategorie %{resource_name} im Bereich %{space_name} aktualisiert"
       component:
         create: "%{user_name} hat die Komponente %{resource_name} zu %{space_name} hinzugefügt"
         delete: "%{user_name} hat die Komponente %{resource_name} aus %{space_name} entfernt"
+        export_component: "%{user_name} hat %{resource_name} %{component_name} in %{space_name} als %{format_name} exportiert"
         publish: "%{user_name} hat die Komponente %{resource_name} in %{space_name} veröffentlicht"
         unpublish: "%{user_name} hat die Komponente %{resource_name} in %{space_name} auf \"unveröffentlicht\" gesetzt"
+        update_permissions_with_space: "%{user_name} hat die Berechtigungen für %{resource_name} in %{space_name} aktualisiert"
+      contextual_help_section:
+        update: "%{user_name} hat den Hilfebereich %{resource_name} aktualisiert"
+      helpers:
+        answers: antworten
+        comments: kommentare
+        projects: projekte
+        results: ergebnisse
       impersonation_log:
         manage: "%{user_name} hat %{resource_name} verwaltet, weil %{reason}"
       moderation:
@@ -306,6 +344,7 @@ de:
       endorsements:
         one: Befürwortung
         other: Befürwortungen
+      official_author: Offiziell
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Lassen Sie sich verifizieren, indem Sie eine Reisepassnummer eingeben, die mit "A" beginnt
@@ -408,8 +447,8 @@ de:
             amendments_enabled: Änderungen aktiviert
             comments_enabled: Kommentare aktiviert
             comments_max_length: Maximallänge der Kommentare
-            dummy_global_attribute_1: Dummy-Attribut 1
-            dummy_global_attribute_2: Dummy-Attribut 2
+            dummy_global_attribute1: Dummy-Attribut 1
+            dummy_global_attribute2: Dummy-Attribut 2
             dummy_global_translatable_text: Ãœbersetzbarer Blindtext
             enable_pads_creation: Aktivieren Sie die Pads-Erstellung
             resources_permissions_enabled: Ressourcenberechtigungen aktiviert
@@ -421,8 +460,8 @@ de:
             amendment_reaction_enabled: Reaktionen auf Änderungen aktiviert
             amendments_visibility: Sichtbarkeit der Änderungsvorschläge
             comments_blocked: Kommentare blockiert
-            dummy_step_attribute_1: Dummy-Schritt-Attribut 1
-            dummy_step_attribute_2: Dummy-Schritt-Attribut 2
+            dummy_step_attribute1: Dummy-Schritt-Attribut 1
+            dummy_step_attribute2: Dummy-Schritt-Attribut 2
             dummy_step_translatable_text: Ãœbersetzbarer Blindtext des Schritts
     contact: Kontakt
     content_blocks:
@@ -466,13 +505,6 @@ de:
       actions:
         login_before_access: Bitte melden Sie sich mit Ihrem Konto an, um auf diese Seite zuzugreifen
         unauthorized: Sie sind nicht berechtigt, diese Aktion auszuführen
-    data_portability:
-      export:
-        ready: Bereit
-      show:
-        download_data: Daten herunterladen
-        download_data_description: Eine Datei, die alle mit Ihrem Konto verknüpften Informationen enthält, wird an <strong>%{user_email}</strong> gesendet. Diese E-Mail enthält eine .zip-Datei und ein Passwort, um sie zu öffnen.<br/><br/>Um die Datei zu entpacken, benötigen Sie <a href="https://www.7-zip.org/">7-Zip</a> (für Windows) oder <a href="https://www.keka.io/">Keka</a> (für MacOS). Wenn Sie Linux verwenden, wird es meistens standardmäßig installiert. Wenn nicht, können Sie <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> oder <a href="https://peazip.github.io">PeaZip</a> verwenden.
-        request_data: Daten anfordern
     datepicker:
       help_text: 'Erwartetes Format: %{datepicker_format}'
     devise:
@@ -491,7 +523,6 @@ de:
           newsletter: Gelegentlich einen Newsletter mit relevanten Informationen erhalten
           newsletter_title: Kontakterlaubnis
           nickname_help: Ihr Pseudonym in %{organization}. Kann nur Buchstaben, Zahlen, '-' und '_' enthalten.
-          password_help: "Mindestens %{minimun_characters} Zeichen, nicht zu gewöhnlich (z. B. 123456) und darf nicht Ihr Benutzername oder Ihre E-Mail-Adresse sein."
           sign_in: Anmelden
           sign_up: Registrieren
           sign_up_as:
@@ -540,6 +571,13 @@ de:
           this_application_will_not_be_able_to: 'Diese Anwendung kann nicht:'
           update_profile: Profil aktualisieren
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> möchte Ihr Konto verwenden"
+    download_your_data:
+      export:
+        ready: Bereit
+      show:
+        download_data: Daten herunterladen
+        download_data_description: Eine Datei, die alle mit Ihrem Konto verknüpften Informationen enthält, wird an <strong>%{user_email}</strong> gesendet. Diese E-Mail enthält eine .zip-Datei und ein Passwort, um sie zu öffnen.<br/><br/>Um die Datei zu entpacken, benötigen Sie <a href="https://www.7-zip.org/">7-Zip</a> (für Windows) oder <a href="https://www.keka.io/">Keka</a> (für MacOS). Wenn Sie Linux verwenden, wird es meistens standardmäßig installiert. Wenn nicht, können Sie <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> oder <a href="https://peazip.github.io">PeaZip</a> verwenden.
+        request_data: Daten anfordern
     editor_images:
       create:
         error: Fehler beim Hochladen des Bildes
@@ -710,7 +748,7 @@ de:
           email_subject: "%{name} wurde offiziell bestätigt"
           notification_title: Teilnehmer %{name} (%{nickname}) wurde offiziell bestätigt.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Klicken Sie auf den Link, um Ihre Daten herunterzuladen.<br/>Die Datei steht bis zum %{date} zur Verfügung.<br/>Sie benötigen <a href="https://www.7-zip.org/">7-Zip</a> (für Windows), <a href="https://www.keka.io/en/">Keka</a> (für MacOS) oder <a href="https://peazip.github.io">PeaZip</a> (für Linux) um die Datei zu öffnen. Passwort: %{password}'
         download: Herunterladen
       export:
@@ -750,7 +788,6 @@ de:
         button: Entfolgen
         error: Beim Entfolgen dieser Ressource ist ein Fehler aufgetreten.
     forms:
-      current_file: Aktuelle Datei
       current_image: Aktuelles Bild
       default_image: Standardbild
       errors:
@@ -762,15 +799,39 @@ de:
         file:
           explanation: 'Anleitung für Datei:'
           message_1: Muss ein Bild oder ein Dokument sein.
-          message_2: Für Bilder, verwenden Sie vorzugsweise Landschaftsbilder, der Dienst erzeugt das Bild. Für CSV-Dateien muss der Trenner zwischen Spalten ein Komma (",") sein
+          message_2: Verwenden Sie für Bilder vorzugsweise das Querformat, der Dienst beschneidet das Bild.
+        icon:
+          explanation: 'Hinweise für das Bild:'
+          message_1: Muss ein quadratisches Bild sein.
+          message_2: Die empfohlene Größe für dieses Bild ist 512x512 Pixel.
         image:
           explanation: 'Anleitung für Bild:'
           message_1: Vorzugsweise ein Querformat ohne Text.
           message_2: Der Dienst schneidet die Datei zu.
       file_validation:
         allowed_file_extensions: 'Erlaubte Dateiendungen: %{extensions}'
+        max_file_dimension: 'Maximale Dateigröße: %{resolution} Pixel'
         max_file_size: 'Maximale Dateigröße: %{megabytes}MB'
-      remove_this_file: Diese Datei entfernen
+      upload:
+        labels:
+          add_attachment: Anhang hinzufügen
+          add_file: Datei hinzufügen
+          add_image: Bild hinzufügen
+          cancel: Abbrechen
+          edit_image: Bild bearbeiten
+          error: Fehler!
+          file_size_too_large: 'Datei ist zu groß! Maximale Dateigröße: %{megabytes}MB'
+          remove: Entfernen
+          replace: Ersetzen
+          save: Speichern
+          title: Titel
+          title_required: Titel ist erforderlich!
+          uploaded: Hochgeladen
+          validating: Wird validiert...
+          validation_error: Validierungsfehler!
+      upload_help:
+        dropzone: Zum Hochladen hier klicken oder Dateien hierher ziehen
+        explanation: Anleitung für %{attribute}
     gamification:
       all_badges_link: Sieh dir alle verfügbaren Abzeichen an.
       badges:
@@ -859,6 +920,7 @@ de:
         success: Join-Anforderung wurde erfolgreich erstellt. Ein Administrator überprüft Ihre Anfrage, bevor er Sie für die Gruppe akzeptiert.
       leave:
         error: Es gab ein Problem, die Gruppe zu verlassen
+        last_admin: Sie können sich nicht von dieser Gruppe entfernen, da Sie der letzte Administrator sind. Machen Sie ein anderes Mitglied zum Administrator, um die Gruppe zu verlassen.
         success: Gruppe erfolgreich verlassen.
       members:
         accept_or_reject_join_requests: 'Die folgenden Benutzer haben sich angemeldet, um dieser Gruppe beizutreten. Akzeptieren oder ablehnen ihrer Anfragen:'
@@ -871,7 +933,7 @@ de:
       no_user_groups: Gehört noch keiner Gruppe an.
       roles:
         admin: Administrator
-        creator: Schöpfer
+        creator: Administrator
         member: Mitglied
       update:
         error: Beim Aktualisieren der Gruppe ist ein Problem aufgetreten
@@ -896,7 +958,7 @@ de:
         body_1: Sie sind dabei einen externen Link zu besuchen und wir möchten, dass Sie hinsichtlich der Inhalte auf der externen Seite vorsichtig sind.
         body_2: Bitte überprüfen Sie den Link und stellen Sie sicher, dass es sich um eine vertrauenswürdige Seite handelt, bevor Sie fortfahren.
         cancel: Abbrechen
-        close_modal: Dialog schließen
+        close_modal: Modal schließen
         proceed: Fortfahren
         title: Externen Link öffnen
     log:
@@ -905,9 +967,11 @@ de:
         create_with_space: "%{user_name} hat %{resource_name} in %{space_name} erstellt"
         delete: "%{user_name} hat %{resource_name} gelöscht"
         delete_with_space: "%{user_name} hat %{resource_name} in %{space_name} gelöscht"
+        publish_with_space: "%{user_name} veröffentlichte %{resource_name} in %{space_name}"
         unknown_action: "%{user_name} hat eine Aktion an %{resource_name} ausgeführt"
         unknown_action_with_space: "%{user_name} hat eine Aktion an %{resource_name} in %{space_name} ausgeführt"
         update: "%{user_name} hat %{resource_name} aktualisiert"
+        update_permissions_with_space: "%{user_name} hat die Berechtigungen für %{resource_name} in %{space_name} aktualisiert"
         update_with_space: "%{user_name} hat %{resource_name} in %{space_name} aktualisiert"
       value_types:
         area_presenter:
@@ -1028,7 +1092,6 @@ de:
     newsletter_mailer:
       newsletter:
         note: Sie haben diese E-Mail erhalten, weil Sie Newsletter auf %{organization_name}abonniert haben. Sie können Ihre Einstellungen auf Ihrer ändern <a href="%{link}">Benachrichtigungen Seite</a>.
-        see_on_website: Kann diese E-Mail nicht korrekt angezeigt werden? Klicken Sie bitte hier <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Um den Empfang dieser Art von E-Mail zu deaktivieren, <a href="%{link}" target="_blank" class="unsubscribe">Abbestellen</a>.
     newsletter_templates:
       basic_only_text:
@@ -1078,23 +1141,41 @@ de:
       no_notifications: Noch keine Benachrichtigungen
       show:
         missing_event: Hoppla, diese Benachrichtigung gehört zu einem Artikel, der nicht mehr verfügbar ist. Du kannst sie verwerfen.
+    notifications_digest_mailer:
+      header:
+        daily: Tägliche Zusammenfassung
+        weekly: Wöchentliche Zusammenfassung
+      hello: Hallo %{name}
+      see_more: Weitere Benachrichtigungen ansehen
+      subject: Dies ist deine E-Mail-Zusammenfassung
     notifications_settings:
       show:
         administrators: Administratoren
         allow_public_contact: Allen erlauben, mir Direktnachrichten zu senden, selbst wenn ich ihnen nicht folge.
+        allow_push_notifications: Erhalten Sie Push-Benachrichtigungen, um herauszufinden, was vor sich geht, wenn Sie nicht auf der Plattform sind. Sie können diese jederzeit ausschalten.
         direct_messages: Direktnachrichten von allen erhalten
-        email_on_moderations: Ich möchte eine E-Mail erhalten, wenn etwas zur Moderation gemeldet wird.
-        email_on_notification: Ich möchte jedes Mal eine E-Mail erhalten, wenn ich eine Benachrichtigung erhalte.
+        email_on_moderations: Ich möchte jedes Mal, wenn etwas oder jemand zur Moderation gemeldet wird, eine E-Mail erhalten.
         everything_followed: Alles was ich folge
         newsletter_notifications: Ich möchte Newsletter erhalten
         newsletters: Newsletter
+        notifications_sending_frequencies:
+          daily: Täglich
+          none: Keine
+          real_time: In Echtzeit
+          weekly: Wöchentlich
+        notifications_sending_frequency: Wie oft möchten Sie die Benachrichtigungs-E-Mail erhalten?
         own_activity: Meine eigene Tätigkeit, etwa wenn sich jemand in meinem Vorschlag äußert oder mich erwähnt
+        push_notifications: Push-Benachrichtigungen
+        push_notifications_reminder: Um Benachrichtigungen von der Plattform zu erhalten, müssen Sie diese zuerst in den Browser-Einstellungen zulassen.
         receive_notifications_about: Ich möchte Benachrichtigungen erhalten über
-        send_notifications_by_email: Senden Sie Benachrichtigungen per E-Mail
         update_notifications_settings: Änderungen speichern
       update:
         error: Beim Aktualisieren der Benachrichtigungseinstellungen ist ein Fehler aufgetreten.
         success: Ihre Benachrichtigungseinstellungen wurden erfolgreich aktualisiert.
+    offline:
+      show:
+        message: Es sieht so aus, als ob du momentan offline bist. Bitte versuche es später erneut.
+        retry: Wiederholen
     open_data:
       not_available_yet: Die Open Data-Dateien sind noch nicht verfügbar. Bitte versuchen Sie es in einigen Minuten erneut.
     own_user_groups:
@@ -1148,7 +1229,7 @@ de:
           agreement: Ich stimme diesen Bedingungen zu
           legend: Stimme den Nutzungsbedingungen zu
         refuse:
-          modal_body: Wenn Sie sich weigern, werden Sie nicht in der Lage sein , die Plattform zu nutzen, können Sie <a href="%{data_portability_path}">laden Sie Ihre Daten</a> und / oder <a href="%{delete_path}">Ihr Konto löschen</a>.
+          modal_body: Wenn Sie Ihre Zustimmung nicht erteilen, werden Sie nicht in der Lage sein, die Plattform zu nutzen; Sie können <a href="%{download_your_data_path}">Ihre Daten herunterladen</a> und/oder <a href="%{delete_path}">Ihr Konto löschen</a>.
           modal_btn_continue: Bedingungen akzeptieren und fortfahren
           modal_btn_exit: Ich werde es später überprüfen
           modal_button: Bedingungen ablehnen
@@ -1160,6 +1241,10 @@ de:
           title: 'Erforderlich: Überprüfen Sie die Aktualisierungen unserer Nutzungsbedingungen'
     participatory_space_private_users:
       not_allowed: Sie dürfen diesen Inhalt nicht sehen
+    passwords:
+      update:
+        error: Es gab ein Problem bei der Aktualisierung des Passwortes
+        success: Passwort erfolgreich aktualisiert
     profile:
       deleted: Teilnehmer gelöscht
       inaccessible_message: Dieses Profil ist wegen Verletzung der Nutzungsbedingungen nicht zugänglich!
@@ -1304,6 +1389,8 @@ de:
         close_modal: Modal schließen
         please_sign_in: Bitte einloggen
         sign_up: Registrieren
+      mentions_modal:
+        remove_recipient: Empfänger %{name} entfernen
       participatory_space_filters:
         filters:
           areas: Bereiche
@@ -1342,9 +1429,6 @@ de:
       help_text: "<strong>Warnung:</strong> Inhalt könnte automatisch übersetzt werden und nicht 100% korrekt sein."
       show_original: Originaltext anzeigen
       show_translated: Automatisch übersetzter Text anzeigen
-    user_activity:
-      index:
-        no_activities_warning: Dieser Benutzer hat noch keine Aktivität gehabt.
     user_contact_disabled: Dieser Teilnehmer akzeptiert keine Direktnachrichten.
     user_conversations:
       create:
@@ -1391,6 +1475,7 @@ de:
       notify:
         body_1: Benutzer %{user} wurde von %{token} gemeldet
         body_2: 'Grund: %{reason}'
+        details: Vom Nutzer übermittelte Details
         greetings: Grüße,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hallo %{admin},
         subject: Ein neuer Benutzer wurde in %{organization_name} gemeldet
@@ -1451,7 +1536,6 @@ de:
     invitations:
       edit:
         header: Beenden Sie die Erstellung Ihres Kontos
-        nickname_help: Ihre eindeutige ID in %{organization}.
         submit_button: Speichern
         subtitle: Wenn Sie die Einladung annehmen, geben Sie bitte Ihren Benutzernamen und Ihr Passwort ein.
       invitation_removed: Ihre Einladung wurde entfernt.
@@ -1518,10 +1602,10 @@ de:
     passwords:
       edit:
         change_my_password: Ändere mein Passwort
-        change_your_password: Ändern Sie Ihr Passwort
         confirm_new_password: Bestätige neues Passwort
         new_password: Neues Passwort
         password_help: "Mindestens %{minimun_characters} Zeichen, nicht zu gewöhnlich (z. B. 123456) und darf nicht Ihr Benutzername oder Ihre E-Mail-Adresse sein."
+        title: Passwort ändern
       new:
         forgot_your_password: Haben Sie Ihr Passwort vergessen?
         send_me_reset_password_instructions: Senden Sie mir das Passwort zurück
@@ -1599,14 +1683,53 @@ de:
     timestamp_error_message: Entschuldigung, das war zu schnell! Bitte erneut einreichen
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Diese Seite verwendet Cookies. Indem Sie die Seite weiter durchsuchen, stimmen Sie der Verwendung von Cookies zu. Erfahren Sie mehr darüber %{link}.
-        link_label: Hier
-        ok: Ich stimme zu
+      data_consent:
+        details:
+          columns:
+            description: Beschreibung
+            name: Name
+            service: Service
+          items:
+            _session_id:
+              description: Ermöglicht es Websites, sich an Benutzer zu erinnern, wenn diese verschiedene Seiten aufrufen.
+              service: Diese Website
+            decidim-consent:
+              description: Speichert Informationen über die vom Benutzer erlaubten Cookies auf dieser Website.
+              service: Diese Website
+            pwaInstallPromptSeen:
+              service: Diese Website
+          types:
+            cookie: Cookie
+            local_storage: Lokaler Speicher
+        dialog:
+          accept_all: Alle akzeptieren
+          accept_only_essential: Nur essentielle Cookies akzeptieren
+          description: Wir verwenden Cookies auf unserer Website, um die Leistung und den Inhalt der Website zu verbessern. Die Cookies ermöglichen uns, Ihnen eine individuellere Nutzererfahrung und Social-Media-Kanäle zu bieten.
+          settings: Einstellungen
+          title: Informationen über die auf dieser Website verwendeten Cookies
+        modal:
+          accept_all: Alle akzeptieren
+          accept_only_essential: Nur essentielle Cookies akzeptieren
+          analytics:
+            title: Analysen und Statistiken
+          essential:
+            title: Notwendige
+          marketing:
+            title: Marketing
+          preferences:
+            title: Präferenzen
+          save_settings: Einstellungen speichern
+          title: Cookie Einstellungen
+          toggle: '%{consent_category} umschalten'
+        warning:
+          all_categories: alle Cookies
+          change_settings: Cookie Einstellungen ändern
+          consent_required: Sie müssen %{categories} aktivieren, um diesen Inhalt sehen zu können.
       edit_link:
         edit: Bearbeiten
       footer:
         cc_by_license: Creative Commons Lizenz
+        data_consent_settings: Cookie Einstellungen
         decidim_logo: Decidim-Logo
         download_open_data: Open Data Dateien herunterladen
         made_with_open_source: Website mit <a target="_blank" href="https://github.com/decidim/decidim">freier Software erstellt</a>.
@@ -1626,6 +1749,8 @@ de:
       notifications_dashboard:
         mark_all_as_read: Alles als gelesen markieren
         mark_as_read: Als gelesen markieren
+      offline_banner:
+        cache_version_page: Hoppla! Ihr Netzwerk ist offline. Dies ist eine zuvor gecachte Version der Seite, die Sie besuchen, möglicherweise ist der Inhalt nicht aktuell.
       social_media_links:
         facebook: "%{organization} auf Facebook"
         github: "%{organization} auf GitHub"
@@ -1637,6 +1762,8 @@ de:
         continue_session: Sitzung fortsetzen
         sign_out: Ausloggen
         title: Möchten Sie ihre Sitzung fortsetzen?
+      upload_modal:
+        close_modal: Modal schließen
       user_menu:
         account: 'Benutzerkonto: %{name}'
         admin_dashboard: Admin-Dashboard
@@ -1669,6 +1796,7 @@ de:
     nickname_included_in_password: ist Ihrem Nicknamen zu ähnlich
     not_enough_unique_characters: hat nicht genug eindeutige Zeichen
     password_not_allowed: ist nicht erlaubt
+    password_repeated: ein früheres Passwort kann nicht wieder verwendet werden
     password_too_common: ist zu allgemein
     password_too_long: es ist zu lang
     password_too_short: ist zu kurz
diff --git a/decidim-core/config/locales/el.yml b/decidim-core/config/locales/el.yml
index ff2bfb43d80e2..e8cc30359297d 100644
--- a/decidim-core/config/locales/el.yml
+++ b/decidim-core/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -60,9 +61,6 @@ el:
   booleans:
     'false': 'Όχι'
     'true': '�αι'
-  carrierwave:
-    errors:
-      image_too_big: Η εικόνα είναι πολ� μεγάλη
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -76,9 +74,6 @@ el:
       logo: "Επίσημο λογότυπο του ο�γανισμο� %{organization}"
       skip_button: Μετάβαση στο κ��ιο πε�ιεχόμενο
     account:
-      data_portability_export:
-        file_no_exists: Το α�χείο δεν υπά�χει
-        notice: Η λήψη των δεδομένων σας είναι σε εξέλιξη. Θα λάβετε email όταν ολοκλη�ωθεί.
       delete:
         confirm:
           close: Κλείσιμο πα�αθ��ου
@@ -89,6 +84,9 @@ el:
       destroy:
         error: Υπή�ξε ένα π�όβλημα κατά τη διαγ�αφή του λογα�ιασμο� σας.
         success: Ο λογα�ιασμός σας διαγ�άφηκε με επιτυχία.
+      download_your_data_export:
+        file_no_exists: Το α�χείο δεν υπά�χει
+        notice: Η λήψη των δεδομένων σας είναι σε εξέλιξη. Θα λάβετε email όταν ολοκλη�ωθεί.
       show:
         change_password: Αλλαγή κωδικο� π�όσβασης
         update_account: Ενημέ�ωση λογα�ιασμο�
@@ -305,7 +303,7 @@ el:
           request_confirmation_instructions: Ζητήστε οδηγίες επιβεβαίωσης
           title: Επιβεβαίωση διε�θυνσης email
       show:
-        close_modal: Κλείσιμο πα�αθ��ου
+        close_modal: Κλείσιμο βοηθητικο� στοιχείου
     collapsible_list:
       hidden_elements_count:
         one: και %{count} ακόμη
@@ -335,8 +333,8 @@ el:
           global:
             amendments_enabled: Οι τ�οποποιήσεις ενε�γοποιήθηκαν
             comments_enabled: Τα σχόλια ενε�γοποιήθηκαν
-            dummy_global_attribute_1: Εικονικό χα�ακτη�ιστικό 1
-            dummy_global_attribute_2: Εικονικό χα�ακτη�ιστικό 2
+            dummy_global_attribute1: Εικονικό χα�ακτη�ιστικό 1
+            dummy_global_attribute2: Εικονικό χα�ακτη�ιστικό 2
             dummy_global_translatable_text: Εικονικό μετατ�έψιμο κείμενο
             enable_pads_creation: Ενε�γοποίηση δημιου�γίας πινάκων σημειώσεων
             resources_permissions_enabled: Τα δικαιώματα πό�ων ενε�γοποιήθηκαν
@@ -346,8 +344,8 @@ el:
             amendment_reaction_enabled: Η αντίδ�αση στην τ�οποποίηση ενε�γοποιήθηκε
             amendments_visibility: Ο�ατότητα τ�οποποίησης
             comments_blocked: Τα σχόλια αποκλείστηκαν
-            dummy_step_attribute_1: Εικονικό χα�ακτη�ιστικό βήματος 1
-            dummy_step_attribute_2: Εικονικό χα�ακτη�ιστικό βήματος 2
+            dummy_step_attribute1: Εικονικό χα�ακτη�ιστικό βήματος 1
+            dummy_step_attribute2: Εικονικό χα�ακτη�ιστικό βήματος 2
             dummy_step_translatable_text: Εικονικό μετατ�έψιμο κείμενο βήματος
     contact: Επικοινωνία
     content_blocks:
@@ -379,12 +377,6 @@ el:
       actions:
         login_before_access: Συνδεθείτε με τον λογα�ιασμό σας π�ιν από την π�όσβαση
         unauthorized: Δεν είστε εξουσιοδοτημένοι να εκτελέσετε αυτήν την ενέ�γεια
-    data_portability:
-      export:
-        ready: Έτοιμο
-      show:
-        download_data: Π�αγματοποιήστε λήψη των δεδομένων
-        request_data: Αίτηση για δεδομένα
     datepicker:
       help_text: 'Αναμενόμενη μο�φή: %{datepicker_format}'
     devise:
@@ -401,7 +393,6 @@ el:
           already_have_an_account?: Έχετε ήδη λογα�ιασμό;
           newsletter: Λάβετε ένα πε�ιστασιακό ενημε�ωτικό δελτίο με σχετικές πλη�οφο�ίες
           newsletter_title: Άδεια επικοινωνίας
-          password_help: "Τουλάχιστον %{minimun_characters} χα�ακτή�ες, δεν π�έπει να είναι πολ� συνηθισμένο (π.χ. 123456) και π�έπει να διαφέ�ει από το ψευδώνυμο και το email σας."
           sign_in: Σ�νδεση
           sign_up: Εγγ�αφή
           sign_up_as:
@@ -451,6 +442,12 @@ el:
           this_application_will_not_be_able_to: 'Αυτή η εφα�μογή δεν θα μπο�εί να:'
           update_profile: Ενημε�ώστε το π�οφίλ σας
           wants_to_use_your_account_html: "Η εφα�μογή <strong>%{application_name}</strong> θέλει να χ�ησιμοποιήσει τον λογα�ιασμό σας"
+    download_your_data:
+      export:
+        ready: Έτοιμο
+      show:
+        download_data: Π�αγματοποιήστε λήψη των δεδομένων
+        request_data: Αίτηση για δεδομένα
     endorsable:
       endorsements: Επιδοκιμασίες
       endorsements_count: Καταμέτ�ηση επιδοκιμασιών
@@ -603,7 +600,7 @@ el:
           email_subject: "Ο/η %{nickname} ενημέ�ωσε το π�οφίλ του/της"
           notification_title: Η <a href="%{resource_path}">σελίδα π�οφίλ</a> του υποστη�ικτή %{name} (%{nickname}), τον οποίο ακολουθείτε, έχει ενημε�ωθεί.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Λήψη
       export:
         ready: Επισυνάπτεται μια συμπιεσμένη έκδοση της εξαγωγής σας.
@@ -640,7 +637,6 @@ el:
         button: Διακοπή πα�ακολο�θησης
         error: Υπή�ξε ένα π�όβλημα κατά τη διακοπή πα�ακολο�θησης αυτο� του πό�ου.
     forms:
-      current_file: Τ�έχον α�χείο
       current_image: Τ�έχουσα εικόνα
       default_image: Π�οεπιλεγμένη εικόνα
       errors:
@@ -659,7 +655,6 @@ el:
       file_validation:
         allowed_file_extensions: 'Επιτ�επόμενα είδη α�χείου: %{extensions}'
         max_file_size: 'Μέγιστο μέγεθος α�χείου: %{megabytes}MB'
-      remove_this_file: Κατα�γήστε αυτό το α�χείο
     gamification:
       all_badges_link: Δείτε όλα τα διαθέσιμα εμβλήματα.
       badges:
@@ -760,7 +755,6 @@ el:
       no_user_groups: Δεν ανήκει σε καμία ομάδα ακόμα.
       roles:
         admin: Διαχει�ιστής
-        creator: Δημιου�γός
         member: Μέλος
       update:
         error: Υπή�ξε ένα π�όβλημα κατά την ενημέ�ωση της ομάδας
@@ -779,6 +773,9 @@ el:
       index:
         last_activity: Τελευταία δ�αστη�ιότητα
         resource_type: Τ�πος
+    links:
+      warning:
+        close_modal: Κλείσιμο βοηθητικο� στοιχείου
     log:
       base_presenter:
         create: "Ο χ�ήστης %{user_name} δημιο��γησε το στοιχείο %{resource_name}"
@@ -896,7 +893,6 @@ el:
     newsletter_mailer:
       newsletter:
         note: Λάβατε αυτό το email επειδή έχετε εγγ�αφεί σε ενημε�ωτικά δελτία στον ο�γανισμό %{organization_name}. Μπο�είτε να αλλάξετε τις �υθμίσεις σας στη <a href="%{link}">σελίδα ειδοποιήσεων</a>.
-        see_on_website: Δεν βλέπετε αυτό το email σωστά; Δείτε το στον <a href="%{link}" target="_blank">ιστότοπο</a>.
         unsubscribe: Για να εξαι�εθείτε από τη λήψη αυτο� του τ�που email, πατήστε <a href="%{link}" target="_blank" class="unsubscribe">Κατά�γηση εγγ�αφής</a>.
     newsletter_templates:
       basic_only_text:
@@ -944,13 +940,11 @@ el:
       show:
         allow_public_contact: �α επιτ�έπεται σε οποιονδήποτε να μου στέλνει άμεσο μήνυμα, ακόμα κι αν δεν τον ακολουθώ.
         direct_messages: �α λαμβάνω άμεσα μην�ματα από οποιονδήποτε
-        email_on_notification: Θέλω να λαμβάνω email κάθε φο�ά που λαμβάνω ειδοποίηση.
         everything_followed: Όλα όσα ακολουθώ
         newsletter_notifications: Θέλω να λαμβάνω ενημε�ωτικά δελτία
         newsletters: Ενημε�ωτικά δελτία
         own_activity: Η δική μου δ�αστη�ιότητα, όπως όταν κάποιος σχολιάζει την π�ότασή μου ή με αναφέ�ει
         receive_notifications_about: Θέλω να λαμβάνω ειδοποιήσεις για
-        send_notifications_by_email: Αποστολή ειδοποιήσεων μέσω email
         update_notifications_settings: Αποθήκευση αλλαγών
       update:
         error: Υπή�ξε ένα π�όβλημα κατά την ενημέ�ωση των �υθμίσεων ειδοποιήσεων.
@@ -1007,7 +1001,6 @@ el:
         form:
           legend: Αποδοχή των ό�ων και των π�οϋποθέσεων χ�ήσης
         refuse:
-          modal_body: Εάν α�νηθείτε, δεν θα μπο�είτε να χ�ησιμοποιήσετε την πλατφό�μα, μπο�είτε να π�αγματοποιήσετε <a href="%{data_portability_path}">λήψη των δεδομένων σας</a> ή/και <a href="%{delete_path}">διαγ�αφή του λογα�ιασμο� σας</a>.
           modal_btn_continue: Αποδοχή των ό�ων και συνέχεια
           modal_btn_exit: Θα τους διαβάσω α�γότε�α
           modal_button: Από��ιψη των ό�ων
@@ -1159,9 +1152,6 @@ el:
     tags:
       filter_results_for_category: 'Φιλτ�ά�ισμα αποτελεσμάτων για την κατηγο�ία: %{resource}'
       filter_results_for_scope: 'Φιλτ�ά�ισμα αποτελεσμάτων για το πεδίο εφα�μογής: %{resource}'
-    user_activity:
-      index:
-        no_activities_warning: Αυτός ο συμμετέχων δεν έχει ακόμη κάποια δ�αστη�ιότητα.
     user_contact_disabled: Αυτός ο συμμετέχων δεν δέχεται άμεσα μην�ματα.
     user_conversations:
       create:
@@ -1257,7 +1247,6 @@ el:
     invitations:
       edit:
         header: Ολοκλη�ώστε τη δημιου�γία του λογα�ιασμο� σας
-        nickname_help: Το ψευδώνυμό σας στον ο�γανισμό %{organization}.
         submit_button: Αποθήκευση
         subtitle: Εάν αποδεχτείτε την π�όσκληση, ο�ίστε το ψευδώνυμο και τον κωδικό π�όσβασής σας.
       invitation_removed: Η π�όσκλησή σας κατα�γήθηκε.
@@ -1324,7 +1313,6 @@ el:
     passwords:
       edit:
         change_my_password: Αλλαγή του κωδικο� π�όσβασής μου
-        change_your_password: Αλλάξτε τον κωδικό π�όσβασής σας
         confirm_new_password: Επιβεβαιώστε τον νέο κωδικό π�όσβασης
         new_password: �έος κωδικός π�όσβασης
         password_help: "Τουλάχιστον %{minimun_characters} χα�ακτή�ες, δεν π�έπει να είναι πολ� συνηθισμένο (π.χ. 123456) και π�έπει να διαφέ�ει από το ψευδώνυμο και το email σας."
@@ -1401,10 +1389,6 @@ el:
     timestamp_error_message: Συγνώμη, αυτό ήταν πολ� γ�ήγο�ο! Επαναλάβετε την υποβολή.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Αυτός ο ιστότοπος χ�ησιμοποιεί cookies. Συνεχίζοντας την πε�ιήγηση στον ιστότοπο, αποδέχεστε τη χ�ήση των cookies από εμάς. %{link}.
-        link_label: Μάθετε πε�ισσότε�α για τα cookies
-        ok: Συμφωνώ
       edit_link:
         edit: Επεξε�γασία
       footer:
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 01d8ebac7ccc9..c10735622aeae 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -75,7 +75,8 @@ en:
     'true': 'Yes'
   carrierwave:
     errors:
-      image_too_big: The image is too big
+      file_resolution_too_large: File resolution is too large
+      file_size_too_large: File size is too large
       not_inside_organization: The file is not attached to any organization
   date:
     formats:
@@ -120,9 +121,6 @@ en:
       skip_button: Skip to main content
     account:
       blocked: This account has been blocked due to Terms and Conditions violation
-      data_portability_export:
-        file_no_exists: File does not exist
-        notice: The download of your data is currently in progress. You'll receive an email when it's complete.
       delete:
         alert: This action cannot be undone. If you delete your account you won't be able to log in with your credentials. The deletion of your account will result in the anonymization of your contributions. You will still be able to create a new account, but these contributions will not be associated with it.
         confirm:
@@ -134,8 +132,21 @@ en:
       destroy:
         error: There was a problem deleting your account.
         success: Your account was successfully deleted.
+      download_your_data_export:
+        file_no_exists: File does not exist
+        notice: The download of your data is currently in progress. You'll receive an email when it's complete.
+      email_change:
+        body1: We've sent an email to %{unconfirmed_email} to verify your new email address.
+        body2: Need us to send the verification email again? %{resend_link} or %{cancel_link}.
+        cancel: cancel
+        cancel_error: Could not cancel the email change.
+        cancel_successfully: Email change cancelled successfully.
+        resend_error: Could not resend confirmation email.
+        resend_successfully: Confirmation email resent successfully to %{unconfirmed_email}
+        send_again: Send again
+        title: Email change verification
       show:
-        available_locales_helper: Choose the language you want to use to browse and receive notifications in Decidim
+        available_locales_helper: Choose the language you want to use to browse and receive notifications on the platform
         change_password: Change password
         update_account: Update account
       update:
@@ -145,16 +156,44 @@ en:
     admin:
       actions:
         cancel: Cancel
+      password_change:
+        alert: You need to change your password in order to proceed further
+        notification: Admin users need to change their password every %{days} days.
     admin_log:
       area:
         create: "%{user_name} created the %{resource_name} area"
         delete: "%{user_name} deleted the %{resource_name} area"
         update: "%{user_name} updated the %{resource_name} area"
+      area_type:
+        create: "%{user_name} created the %{resource_name} area type"
+        delete: "%{user_name} deleted the %{resource_name} area type"
+        update: "%{user_name} updated the %{resource_name} area type"
+      attachment:
+        create: "%{user_name} created the %{resource_name} attachment"
+        delete: "%{user_name} deleted the %{resource_name} attachment"
+        update: "%{user_name} updated the %{resource_name} attachment"
+      attachment_collection:
+        create: "%{user_name} created the %{resource_name} attachment collection"
+        delete: "%{user_name} deleted the %{resource_name} attachment collection"
+        update: "%{user_name} updated the %{resource_name} attachment collection"
+      category:
+        create: "%{user_name} added the %{resource_name} category to the %{space_name} space"
+        delete: "%{user_name} deleted the %{resource_name} category from the %{space_name} space"
+        update: "%{user_name} updated the %{resource_name} category in the %{space_name} space"
       component:
         create: "%{user_name} added the %{resource_name} component to the %{space_name} space"
         delete: "%{user_name} removed the %{resource_name} component from the %{space_name} space"
+        export_component: "%{user_name} exported the %{resource_name} %{component_name} in %{space_name} as %{format_name}"
         publish: "%{user_name} published the %{resource_name} component in the %{space_name} space"
         unpublish: "%{user_name} unpublished the %{resource_name} component from the %{space_name} space"
+        update_permissions_with_space: "%{user_name} updated the permissions of %{resource_name} in %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} updated the %{resource_name} help section"
+      helpers:
+        answers: answers
+        comments: comments
+        projects: projects
+        results: results
       impersonation_log:
         manage: "%{user_name} has managed %{resource_name} because %{reason}"
       moderation:
@@ -171,6 +210,7 @@ en:
         update: "%{user_name} updated the %{resource_name} OAuth application"
       organization:
         update: "%{user_name} updated the organization settings"
+        update_external_domain: "%{user_name} updated the organization external domains"
       participatory_space_private_user:
         create: "%{user_name} invited %{resource_name} to be a private participant"
         create_via_csv: "%{user_name} invited %{resource_name} via CSV to be a private participant"
@@ -182,6 +222,10 @@ en:
         delete_with_parent: "%{user_name} deleted the %{resource_name} scope inside the %{parent_scope} scope"
         update: "%{user_name} updated the %{resource_name} scope"
         update_with_parent: "%{user_name} updated the %{resource_name} scope inside the %{parent_scope} scope"
+      scope_type:
+        create: "%{user_name} created the %{resource_name} scope type"
+        delete: "%{user_name} deleted the %{resource_name} scope type"
+        update: "%{user_name} updated the %{resource_name} scope type"
       static_page:
         create: "%{user_name} created the %{resource_name} static page"
         delete: "%{user_name} deleted the %{resource_name} static page"
@@ -197,7 +241,9 @@ en:
         unblock: "%{user_name} unblocked user %{resource_name}"
         unofficialize: "%{user_name} unofficialized the participant %{resource_name}"
       user_group:
+        block: "%{user_name} blocked user group %{resource_name}"
         reject: "%{user_name} rejected the %{resource_name} group verification"
+        unblock: "%{user_name} unblocked user group %{resource_name}"
         verify: "%{user_name} verified the group %{resource_name}"
         verify_via_csv: "%{user_name} verified the group %{resource_name} via a CSV file"
       user_moderation:
@@ -308,6 +354,7 @@ en:
       endorsements:
         one: endorsement
         other: endorsements
+      official_author: Official
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Get verified by introducing a passport number starting with "A"
@@ -398,6 +445,7 @@ en:
           debate: Debate
           initiative: Initiative
           meeting: Meeting
+          order: Budgeting vote
           post: Post
           proposal: Proposal
           question: Question
@@ -412,8 +460,8 @@ en:
             amendments_enabled: Amendments enabled
             comments_enabled: Comments enabled
             comments_max_length: Comments max length
-            dummy_global_attribute_1: Dummy Attribute 1
-            dummy_global_attribute_2: Dummy Attribute 2
+            dummy_global_attribute1: Dummy Attribute 1
+            dummy_global_attribute2: Dummy Attribute 2
             dummy_global_translatable_text: Dummy Translatable Text
             enable_pads_creation: Enable pads creation
             resources_permissions_enabled: Resources permissions enabled
@@ -425,8 +473,8 @@ en:
             amendment_reaction_enabled: Amendment reaction enabled
             amendments_visibility: Amendment visibility
             comments_blocked: Comments blocked
-            dummy_step_attribute_1: Dummy Step Attribute 1
-            dummy_step_attribute_2: Dummy Step Attribute 2
+            dummy_step_attribute1: Dummy Step Attribute 1
+            dummy_step_attribute2: Dummy Step Attribute 2
             dummy_step_translatable_text: Dummy Step Translatable Text
     contact: Contact
     content_blocks:
@@ -470,13 +518,6 @@ en:
       actions:
         login_before_access: Please, login with your account before access
         unauthorized: You are not authorized to perform this action
-    data_portability:
-      export:
-        ready: Ready
-      show:
-        download_data: Download the data
-        download_data_description: A file containing all the information associated with your account will be sent to <strong>%{user_email}</strong>. This email will contain a .zip file and a password to open it.<br/><br/>To unzip the file, you will need <a href="https://www.7-zip.org/">7-Zip</a> (for Windows) or <a href="https://www.keka.io/">Keka</a> (for MacOS). If you use Linux, most of the time you will have it installed by default. If not, you can use <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> or <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Request data
     datepicker:
       help_text: 'Expected format: %{datepicker_format}'
     devise:
@@ -495,7 +536,6 @@ en:
           newsletter: Receive an occasional newsletter with relevant information
           newsletter_title: Contact permission
           nickname_help: Your alias in %{organization}. Can only contain letters, numbers, '-' and '_'.
-          password_help: "%{minimun_characters} characters minimum, must not be too common (e.g. 123456) and must be different from your nickname and your email."
           sign_in: Log in
           sign_up: Sign up
           sign_up_as:
@@ -548,6 +588,13 @@ en:
           this_application_will_not_be_able_to: 'This application will not be able to:'
           update_profile: Update your profile
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> wants to use your account"
+    download_your_data:
+      export:
+        ready: Ready
+      show:
+        download_data: Download the data
+        download_data_description: A file containing all the information associated with your account will be sent to <strong>%{user_email}</strong>. This email will contain a .zip file and a password to open it.<br/><br/>To unzip the file, you will need <a href="https://www.7-zip.org/">7-Zip</a> (for Windows) or <a href="https://www.keka.io/">Keka</a> (for MacOS). If you use Linux, most of the time you will have it installed by default. If not, you can use <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> or <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Request data
     editor_images:
       create:
         error: Error uploading image
@@ -691,6 +738,8 @@ en:
           email_outro: You have received this notification because you are an admin of the platform.
           email_subject: A user group has updated its profile
           notification_title: The %{user_group_name} user group has updated its profile, leaving it unverified. You can now verify it in the <a href="%{groups_admin_path}">admin panel</a>.
+      nickname_event:
+        notification_body: We have corrected the way nicknames are used so that there are no duplicates, and that's why we have removed the case sensitive rule. <br/> Your nickname was created after another one with the same name, so we have automatically renamed it. You can change it from <a href="%{link_to_account_settings}">your account settings</a>.
       notification_event:
         notification_title: An event occured to <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -718,7 +767,7 @@ en:
           email_subject: "%{name} has been officialized"
           notification_title: Participant %{name} (%{nickname}) has been officialized.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Click the next link to download your data.<br/>The file will be available until %{date}.<br/>You will need <a href="https://www.7-zip.org/">7-Zip</a> (for Windows), <a href="https://www.keka.io/en/">Keka</a> (for MacOS) or <a href="https://peazip.github.io">PeaZip</a> (for Linux) to open it. Password: %{password}'
         download: Download
       export:
@@ -760,7 +809,6 @@ en:
         button: Stop following
         error: There was a problem unfollowing this resource.
     forms:
-      current_file: Current file
       current_image: Current image
       default_image: Default image
       errors:
@@ -772,15 +820,41 @@ en:
         file:
           explanation: 'Guidance for file:'
           message_1: Has to be an image or a document.
-          message_2: For images, use preferrably landscape images, the service crops the image. For CSV files, the separator between columns must be a comma (",")
+          message_2: For images, use preferrably landscape images, the service crops the image.
+        icon:
+          explanation: 'Guidance for icon:'
+          message_1: Has to be a square image.
+          message_2: The recommended size for this image is 512x512.
         image:
           explanation: 'Guidance for image:'
           message_1: Preferrably a landscape image that does not have any text.
           message_2: The service crops the image.
       file_validation:
         allowed_file_extensions: 'Allowed file extensions: %{extensions}'
+        max_file_dimension: 'Maximum file dimensions: %{resolution} pixels'
         max_file_size: 'Maximum file size: %{megabytes}MB'
-      remove_this_file: Remove this file
+      files:
+        extension_allowlist: 'Accepted formats: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Add attachment
+          add_file: Add file
+          add_image: Add image
+          cancel: Cancel
+          edit_image: Edit image
+          error: Error!
+          file_size_too_large: 'File size is too large! Maximun file size: %{megabytes}MB'
+          remove: Remove
+          replace: Replace
+          save: Save
+          title: Title
+          title_required: Title is required!
+          uploaded: Uploaded
+          validating: Validating...
+          validation_error: Validation error!
+      upload_help:
+        dropzone: Drop files here or click to upload
+        explanation: Guidance for %{attribute}
     gamification:
       all_badges_link: See all available badges.
       badges:
@@ -869,6 +943,7 @@ en:
         success: Join request successfully created. An admin will review your request before accepting you to the group.
       leave:
         error: There was a problem leaving the group
+        last_admin: You can't remove yourself from this group as you're the last administrator. Make another member an administrator in order to leave the group.
         success: Group successfully abandoned.
       members:
         accept_or_reject_join_requests: 'The following users have applied to join this group. Accept or reject their requests:'
@@ -881,7 +956,7 @@ en:
       no_user_groups: Doesn't belong to any group yet.
       roles:
         admin: Administrator
-        creator: Creator
+        creator: Administrator
         member: Member
       update:
         error: There was a problem updating the group
@@ -915,9 +990,12 @@ en:
         create_with_space: "%{user_name} created %{resource_name} in %{space_name}"
         delete: "%{user_name} deleted %{resource_name}"
         delete_with_space: "%{user_name} deleted %{resource_name} in %{space_name}"
+        publish_with_space: "%{user_name} published %{resource_name} in %{space_name}"
         unknown_action: "%{user_name} performed some action on %{resource_name}"
         unknown_action_with_space: "%{user_name} performed some action on %{resource_name} in %{space_name}"
+        unpublish_with_space: "%{user_name} unpublished %{resource_name} from %{space_name}"
         update: "%{user_name} updated %{resource_name}"
+        update_permissions_with_space: "%{user_name} updated the permissions of %{resource_name} in %{space_name}"
         update_with_space: "%{user_name} updated %{resource_name} in %{space_name}"
       value_types:
         area_presenter:
@@ -1038,7 +1116,7 @@ en:
     newsletter_mailer:
       newsletter:
         note: You received this email because you're subscribed to newsletters on %{organization_name}. You can change your settings on your <a href="%{link}">notifications page</a>.
-        see_on_website: Can’t see this email correctly? View it on the <a href="%{link}" target="_blank">website</a>.
+        see_on_website: Can’t see this email correctly? View it on the <a href="%{link}" target="_blank" class="see-on-website">website</a>.
         unsubscribe: To opt out of receiving this type of email, <a href="%{link}" target="_blank" class="unsubscribe">Unsubscribe</a>.
     newsletter_templates:
       basic_only_text:
@@ -1090,23 +1168,47 @@ en:
       no_notifications: No notifications yet.
       show:
         missing_event: Oops, this notification belongs to an item that is no longer available. You can discard it.
+    notifications_digest_mailer:
+      header:
+        daily: Daily Notification Digest
+        weekly: Weekly Notification Digest
+      hello: Hello %{name},
+      intro:
+        daily: 'These are the notifications from the last day based on the activity you are following:'
+        weekly: 'These are the notifications from the last week based on the activity you are following:'
+      outro: You have received these notifications because you are following this content or its authors. You can unfollow them from their respective pages.
+      see_more: See more notifications
+      subject: This is your mail digest
     notifications_settings:
       show:
         administrators: Administrators
         allow_public_contact: Allow anyone to send me a direct message, even if I don't follow them.
+        allow_push_notifications: Get push notifications to find out what's going on when you're not on the platform. You can turn them off anytime.
         direct_messages: Receive direct messages from anyone
-        email_on_moderations: I want to receive an email every time something is reported for moderation.
-        email_on_notification: I want to receive an email every time I receive a notification.
+        email_on_moderations: I want to receive an email every time something or someone is reported for moderation.
         everything_followed: Everything I follow
         newsletter_notifications: I want to receive newsletters
         newsletters: Newsletters
+        notification_settings:
+          close_meeting_reminder: I want to receive email reminders of closed meetings unpublished reports
+        notifications_sending_frequencies:
+          daily: Daily
+          none: None
+          real_time: Real time
+          weekly: Weekly
+        notifications_sending_frequency: How often do you want to receive the notifications email?
         own_activity: My own activity, like when someone comments in my proposal or mentions me
+        push_notifications: Push notifications
+        push_notifications_reminder: To get notifications from the platform, you'll need to allow them in your browser settings first.
         receive_notifications_about: I want to get notifications about
-        send_notifications_by_email: Send notifications by email
         update_notifications_settings: Save changes
       update:
         error: There was a problem updating your notifications settings.
         success: Your notifications settings were successfully updated.
+    offline:
+      show:
+        message: It looks like you're currently offline. Please, try again later.
+        retry: Retry
     open_data:
       not_available_yet: The Open Data files are not yet available, please try again in a few minutes.
     own_user_groups:
@@ -1160,7 +1262,7 @@ en:
           agreement: I agree with these terms
           legend: Agree to the terms and conditions of use
         refuse:
-          modal_body: If you refuse, you won't be able to use the platform, you can <a href="%{data_portability_path}">download your data</a> and/or <a href="%{delete_path}">delete your account</a>.
+          modal_body: If you refuse, you won't be able to use the platform, you can <a href="%{download_your_data_path}">download your data</a> and/or <a href="%{delete_path}">delete your account</a>.
           modal_btn_continue: Accept terms and continue
           modal_btn_exit: I'll review it later
           modal_button: Refuse the terms
@@ -1172,6 +1274,10 @@ en:
           title: 'Required: Review updates to our terms of service'
     participatory_space_private_users:
       not_allowed: You are not allowed to view this content
+    passwords:
+      update:
+        error: There was a problem updating the password
+        success: Password successfully updated
     profile:
       deleted: Participant deleted
       inaccessible_message: This profile is inaccessible due to Terms and Conditions violation!
@@ -1316,6 +1422,8 @@ en:
         close_modal: Close modal
         please_sign_in: Please sign in
         sign_up: Sign up
+      mentions_modal:
+        remove_recipient: Remove recipient %{name}
       participatory_space_filters:
         filters:
           areas: Areas
@@ -1356,7 +1464,7 @@ en:
       show_translated: Show automatically-translated text
     user_activity:
       index:
-        no_activities_warning: This participant hasn't had any activity yet.
+        no_activities_warning: This participant does not have any activity yet.
     user_contact_disabled: This participant does not accept direct messages.
     user_conversations:
       create:
@@ -1403,6 +1511,7 @@ en:
       notify:
         body_1: User %{user} has been reported by %{token}
         body_2: 'Reason: %{reason}'
+        details: User provided details
         greetings: Greetings,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hello %{admin},
         subject: A new user has been reported in %{organization_name}
@@ -1463,7 +1572,7 @@ en:
     invitations:
       edit:
         header: Finish creating your account
-        nickname_help: Your nickname in %{organization}.
+        nickname_help: Your nickname in %{organization}. Can only contain letters, numbers, '-' and '_'.
         submit_button: Save
         subtitle: If you accept the invitation please set your nickname and password.
       invitation_removed: Your invitation was removed.
@@ -1530,10 +1639,11 @@ en:
     passwords:
       edit:
         change_my_password: Change my password
-        change_your_password: Change your password
         confirm_new_password: Confirm new password
         new_password: New password
         password_help: "%{minimun_characters} characters minimum, must not be too common (e.g. 123456) and must be different from your nickname and your email."
+        password_help_admin: "%{minimun_characters} characters minimum, must not be too common (e.g. 123456), must be different from your nickname and your email and must be different from your old passwords."
+        title: Password change
       new:
         forgot_your_password: Forgot your password?
         send_me_reset_password_instructions: Send me reset password instructions
@@ -1581,6 +1691,7 @@ en:
       public: Your public information.
   errors:
     messages:
+      allowed_file_content_types: 'only files with the following extensions are allowed: %{types}'
       already_confirmed: was already confirmed, please try signing in
       confirmation_period_expired: needs to be confirmed within %{period}, please request a new one
       content_type_allowlist_error: the file type is not valid
@@ -1612,14 +1723,60 @@ en:
     timestamp_error_message: Sorry, that was too quick! Please resubmit.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: This site uses cookies. By continuing to browse the site, you agree to our use of cookies. %{link}.
-        link_label: Find out more about cookies
-        ok: I agree
+      data_consent:
+        details:
+          columns:
+            description: Description
+            name: Name
+            service: Service
+            type: Type
+          items:
+            _session_id:
+              description: Allows websites to remember user within a website when they move between web pages.
+              service: This website
+            decidim-consent:
+              description: Stores information about the cookies allowed by the user on this website.
+              service: This website
+            pwaInstallPromptSeen:
+              description: Stores status if the progressive web application (PWA) install notification has been already seen by the user.
+              service: This website
+          types:
+            cookie: Cookie
+            local_storage: Local storage
+        dialog:
+          accept_all: Accept all
+          accept_only_essential: Accept only essential
+          description: We use cookies on our website to improve the performance and content of the site. The cookies enable us to provide a more individual user experience and social media channels.
+          settings: Settings
+          title: Information about the cookies used on the website
+        modal:
+          accept_all: Accept all
+          accept_only_essential: Accept only essential
+          analytics:
+            description: These cookies are used to measure and analyse the website audience to help improve the website.
+            title: Analytics and statistics
+          description: We use cookies to ensure the basic functionalities of the website and to enhance your online experience. You can configure and accept the use of the cookies, and modify your consent options, at any time.
+          essential:
+            description: These cookies enable key functionality of the website and help to keep its users secured. They are automatically saved in the browser and cannot be disabled.
+            title: Essential
+          marketing:
+            description: These cookies collect information about how you use the website and they can be utilized to provide you more personalized marketing across the different websites you use.
+            title: Marketing
+          preferences:
+            description: These cookies allow the website to remember the choices you have made in the past on this website to provide a more personalized experience for the website users.
+            title: Preferences
+          save_settings: Save settings
+          title: Cookie settings
+          toggle: Toggle %{consent_category}
+        warning:
+          all_categories: all cookies
+          change_settings: Change cookie settings
+          consent_required: You need to enable %{categories} in order to see this content.
       edit_link:
         edit: Edit
       footer:
         cc_by_license: Creative Commons License
+        data_consent_settings: Cookie settings
         decidim_logo: Decidim Logo
         download_open_data: Download Open Data files
         made_with_open_source: Website made with <a target="_blank" href="https://github.com/decidim/decidim">free software</a>.
@@ -1639,6 +1796,8 @@ en:
       notifications_dashboard:
         mark_all_as_read: Mark all as read
         mark_as_read: Mark as read
+      offline_banner:
+        cache_version_page: Oooops! Your network is offline. This is a previously cached version of the page you're visiting, perhaps the content is not up to date.
       social_media_links:
         facebook: "%{organization} at Facebook"
         github: "%{organization} at GitHub"
@@ -1650,6 +1809,8 @@ en:
         continue_session: Continue session
         sign_out: Sign out
         title: Would you like to continue your session?
+      upload_modal:
+        close_modal: Close modal
       user_menu:
         account: 'User account: %{name}'
         admin_dashboard: Admin dashboard
@@ -1682,6 +1843,7 @@ en:
     nickname_included_in_password: is too similar to your nickname
     not_enough_unique_characters: does not have enough unique characters
     password_not_allowed: is not allowed
+    password_repeated: cannot reuse old password
     password_too_common: is too common
     password_too_long: is too long
     password_too_short: is too short
diff --git a/decidim-core/config/locales/eo.yml b/decidim-core/config/locales/eo.yml
index 46d2b72ed37dc..a0f5f24ddd1d7 100644
--- a/decidim-core/config/locales/eo.yml
+++ b/decidim-core/config/locales/eo.yml
@@ -1,3 +1,4 @@
+---
 eo:
   activemodel:
     attributes:
@@ -45,9 +46,6 @@ eo:
   booleans:
     'false': 'Ne'
     'true': 'Jes'
-  carrierwave:
-    errors:
-      image_too_big: La bildo estas tro granda
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -57,12 +55,12 @@ eo:
       decidim_with_month_name_short: "%d %b"
   decidim:
     account:
-      data_portability_export:
-        file_no_exists: Dosiero ne ekzistas
-        notice: La mal�ar�o de viaj datumoj nuntempe progresas. Vi ricevos retpo�ton kiam �i estos kompleta.
       delete:
         confirm:
           close: Fermu la fenestron
+      download_your_data_export:
+        file_no_exists: Dosiero ne ekzistas
+        notice: La mal�ar�o de viaj datumoj nuntempe progresas. Vi ricevos retpo�ton kiam �i estos kompleta.
     amendments:
       accepted:
         success: La amendo estis akceptita sukcese.
diff --git a/decidim-core/config/locales/es-MX.yml b/decidim-core/config/locales/es-MX.yml
index 1cf9108970dd6..ad1510d34494f 100644
--- a/decidim-core/config/locales/es-MX.yml
+++ b/decidim-core/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ es-MX:
     'true': 'Sí'
   carrierwave:
     errors:
-      image_too_big: La imagen es demasiado grande
+      file_resolution_too_large: La resolución del archivo es demasiado grande
+      file_size_too_large: El tamaño del archivo es demasiado grande
       not_inside_organization: El archivo no está relacionado con ninguna organización
   date:
     formats:
@@ -110,7 +112,6 @@ es-MX:
       x_seconds:
         one: hace 1 segundo
         other: "hace %{count} segundos"
-        zero: ahora mismo
   decidim:
     accessibility:
       external_link: Enlace externo
@@ -119,9 +120,6 @@ es-MX:
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los Términos y Condiciones de uso
-      data_portability_export:
-        file_no_exists: El archivo no existe
-        notice: Tus datos están actualmente en progreso. Recibirás un correo electrónico cuando se complete.
       delete:
         alert: Esta acción no se puede deshacer. Si eliminas tu cuenta no podrás iniciar sesión con tus credenciales. La eliminación de tu cuenta resultará en la anonimización de tus contribuciones. Aún podrás crear una nueva cuenta, pero estas contribuciones no se asociarán a ella.
         confirm:
@@ -133,8 +131,21 @@ es-MX:
       destroy:
         error: Se ha producido un error al eliminar tu cuenta.
         success: Tu cuenta se ha eliminado correctamente.
+      download_your_data_export:
+        file_no_exists: El archivo no existe
+        notice: Tus datos están actualmente en progreso. Recibirás un correo electrónico cuando se complete.
+      email_change:
+        body1: Hemos enviado un correo electrónico a %{unconfirmed_email} para verificar tu nueva dirección de correo electrónico.
+        body2: '¿Necesitas que te reenviemos el correo de verificación? %{resend_link} o %{cancel_link}.'
+        cancel: cancelar
+        cancel_error: No se ha podido cancelar el cambio de correo electrónico.
+        cancel_successfully: Cambio de correo electrónico cancelado con éxito.
+        resend_error: No se ha podido reenviar el correo de confirmación.
+        resend_successfully: Correo de confirmación reenviado correctamente a %{unconfirmed_email}
+        send_again: Volver a enviar
+        title: Verificación del cambio de correo electrónico
       show:
-        available_locales_helper: Elige el idioma que quieres utilizar para navegar y recibir notificaciones en Decidim
+        available_locales_helper: Elige el idioma que deseas utilizar para navegar y recibir notificaciones en la plataforma
         change_password: Cambia la contraseña
         update_account: Actualizar cuenta
       update:
@@ -144,16 +155,44 @@ es-MX:
     admin:
       actions:
         cancel: Cancelar
+      password_change:
+        alert: Tienes que cambiar tu contraseña para poder seguir adelante
+        notification: Las usuarias con rol de administración tienen que cambiar su contraseña cada %{days} días.
     admin_log:
       area:
         create: "%{user_name} creó el área %{resource_name}"
         delete: "%{user_name} borró el área %{resource_name}"
         update: "%{user_name} actualizó el área %{resource_name}"
+      area_type:
+        create: "%{user_name} ha creado el tipo de área %{resource_name}"
+        delete: "%{user_name} ha eliminado el tipo de área %{resource_name}"
+        update: "%{user_name} ha actualizado tipo de área %{resource_name}"
+      attachment:
+        create: "%{user_name} ha creado el adjunto %{resource_name}"
+        delete: "%{user_name} ha eliminado el adjunto %{resource_name}"
+        update: "%{user_name} ha actualizado el adjunto %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} creó la colección de adjuntos %{resource_name}"
+        delete: "%{user_name} eliminó la colección de adjuntos %{resource_name}"
+        update: "%{user_name} actualizó la colección de adjuntos %{resource_name}"
+      category:
+        create: "%{user_name} ha añadido la categoria %{resource_name} al espacio %{space_name}"
+        delete: "%{user_name} ha eliminado la categoria %{resource_name} al espacio %{space_name}"
+        update: "%{user_name} ha actualizado la categoria %{resource_name} al espacio %{space_name}"
       component:
         create: "%{user_name} agregó el componente %{resource_name} al espacio %{space_name}"
         delete: "%{user_name} eliminó el componente %{resource_name} del espacio %{space_name}"
+        export_component: "%{user_name} ha exportado %{resource_name} %{component_name} en %{space_name} como %{format_name}"
         publish: "%{user_name} publicó el componente %{resource_name} en el espacio %{space_name}"
         unpublish: "%{user_name} ha despublicado el componente %{resource_name} del espacio %{space_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} ha actualizado la sección de ayuda %{resource_name}"
+      helpers:
+        answers: respuestas
+        comments: comentarios
+        projects: proyectos
+        results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
       moderation:
@@ -170,6 +209,7 @@ es-MX:
         update: "%{user_name} actualizó la aplicación %{resource_name} OAuth"
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
+        update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
       participatory_space_private_user:
         create: "%{user_name} ha invitado a %{resource_name} a ser un usuario privado"
         create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
@@ -181,6 +221,10 @@ es-MX:
         delete_with_parent: "%{user_name} eliminó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
         update: "%{user_name} actualizó el ámbito %{resource_name}"
         update_with_parent: "%{user_name} actualizó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
+      scope_type:
+        create: "%{user_name} creó el tipo de ámbito %{resource_name}"
+        delete: "%{user_name} borró el tipo de ámbito %{resource_name}"
+        update: "%{user_name} actualizó el tipo de ámbito %{resource_name}"
       static_page:
         create: "%{user_name} creó la página estática %{resource_name}"
         delete: "%{user_name} eliminó la página estática %{resource_name}"
@@ -196,7 +240,9 @@ es-MX:
         unblock: "%{user_name} desoficializó a la usuaria %{resource_name}"
         unofficialize: "%{user_name} desoficializó al usuario %{resource_name}"
       user_group:
+        block: "%{user_name} ha bloqueado al grup de usuarias %{resource_name}"
         reject: "%{user_name} rechazó la verificación del grupo de usuarios %{resource_name}"
+        unblock: "%{user_name} ha desbloqueado el grupo de usuarias %{resource_name}"
         verify: "%{user_name} verificó al grupo de usuarios %{resource_name}"
         verify_via_csv: "%{user_name} verificó el grupo de %{resource_name} usuario a través de un archivo CSV"
       user_moderation:
@@ -307,6 +353,7 @@ es-MX:
       endorsements:
         one: adhesión
         other: adhesiones
+      official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Verifíquese introduciendo un número de pasaporte que comience por "A"
@@ -373,7 +420,7 @@ es-MX:
           request_confirmation_instructions: Solicitar instrucciones de confirmación
           title: Confirma tu email
       show:
-        close_modal: Cerrar el modal
+        close_modal: Cerrar modal
     block_user_mailer:
       notify:
         body_1: Tu cuenta ha sido bloqueda.
@@ -397,6 +444,7 @@ es-MX:
           debate: Debate
           initiative: Iniciativa
           meeting: Encuentro
+          order: Votación presupuestaria
           post: Publicar
           proposal: Propuesta
           question: Pregunta
@@ -411,8 +459,8 @@ es-MX:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
             comments_max_length: Longitud máxima de los comentarios
-            dummy_global_attribute_1: Atributo de prueba 1
-            dummy_global_attribute_2: Atributo de prueba 2
+            dummy_global_attribute1: Atributo de prueba 1
+            dummy_global_attribute2: Atributo de prueba 2
             dummy_global_translatable_text: Texto de ejemplo traducible
             enable_pads_creation: Habilitar la creación de pads
             resources_permissions_enabled: Habilitar permisos de recursos
@@ -424,8 +472,8 @@ es-MX:
             amendment_reaction_enabled: Reacción de enmienda activada
             amendments_visibility: Visibilidad de la enmienda
             comments_blocked: Comentarios bloqueados
-            dummy_step_attribute_1: Atributo de fase de prueba 1
-            dummy_step_attribute_2: Atributo de fase de prueba 2
+            dummy_step_attribute1: Atributo de fase de prueba 1
+            dummy_step_attribute2: Atributo de fase de prueba 2
             dummy_step_translatable_text: Fase de ejemplo traducible
     contact: Contacto
     content_blocks:
@@ -469,13 +517,6 @@ es-MX:
       actions:
         login_before_access: Por favor, inicia sesión con tu cuenta antes de acceder
         unauthorized: No tienes permiso para realizar esta acción.
-    data_portability:
-      export:
-        ready: Listo
-      show:
-        download_data: Descargar los datos
-        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Solicitar datos
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ es-MX:
           newsletter: Quiero recibir un boletín ocasional con información relevante
           newsletter_title: Permiso de contacto
           nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
-          password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
           sign_in: Entra
           sign_up: Regístrate
           sign_up_as:
@@ -543,6 +583,13 @@ es-MX:
           this_application_will_not_be_able_to: 'Esta aplicación no podrá:'
           update_profile: Actualiza tu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quiere usar tu cuenta"
+    download_your_data:
+      export:
+        ready: Listo
+      show:
+        download_data: Descargar los datos
+        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Solicitar datos
     editor_images:
       create:
         error: Error al subir la imagen
@@ -686,6 +733,8 @@ es-MX:
           email_outro: Has recibido esta notificación porque eres una de las administradoras de la plataforma.
           email_subject: Un grupo de usuarias ha actualizado su perfil
           notification_title: El grupo de usuarias %{user_group_name} ha actualizado su perfil perdiendo la verificación. Puedes volver a verificarlo a través del <a href="%{groups_admin_path}">panel de administración</a>.
+      nickname_event:
+        notification_body: Hemos corregido la forma en que se utilizan los alias para que no haya duplicados, para hacerlo ya no se distingue entre mayúsculas y minúsculas. <br/> Tu alias fue creado después de otro igual, así que lo hemos renombrado automáticamente. Puedes modificarlo desde la <a href="%{link_to_account_settings}">configuración de tu cuenta</a>.
       notification_event:
         notification_title: Un evento ha ocurrido en <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -713,7 +762,7 @@ es-MX:
           email_subject: "Se ha oficializado a %{name}"
           notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible hasta %{date}.<br/>Necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows), <a href="https://www.keka.io/en/">Keka</a> (para MacOS) o <a href="https://peazip.github.io">PeaZip</a> (para Linux) para abrirlo. Contraseña: %{password}'
         download: Descargar
       export:
@@ -753,7 +802,6 @@ es-MX:
         button: Dejar de seguir
         error: Ha habido un error dejando de seguir este recurso.
     forms:
-      current_file: Archivo actual
       current_image: Imagen actual
       default_image: Imagen predeterminada
       errors:
@@ -765,15 +813,41 @@ es-MX:
         file:
           explanation: 'Instrucciones para el archivo:'
           message_1: Tiene que ser una imagen o un documento.
-          message_2: Para las imágenes, utilizar imágenes preferiblemente apaisadas, el servicio recorta la imagen. Para los archivos CSV, el separador entre columnas debe ser una coma (",")
+          message_2: Para las imágenes, utilizar imágenes apaisadas preferiblemente, el servicio recorta la imagen.
+        icon:
+          explanation: 'Instrucciones para el icono:'
+          message_1: Tiene que ser una imagen cuadrada.
+          message_2: El tamaño recomendado para esta imagen es 512x512.
         image:
           explanation: 'Instrucciones para la imagen:'
           message_1: Preferiblemente una imagen de paisaje que no tenga ningún texto.
           message_2: El servicio recorta la imagen.
       file_validation:
         allowed_file_extensions: 'Formatos de archivo permitidos: %{extensions}'
+        max_file_dimension: 'Medidas máximas de archivo: %{resolution} píxeles'
         max_file_size: 'Tamaño máximo del archivo: %{megabytes}MB'
-      remove_this_file: Eliminar este archivo
+      files:
+        extension_allowlist: 'Formatos aceptados: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Añadir adjunto
+          add_file: Añadir archivo
+          add_image: Añadir imagen
+          cancel: Cancelar
+          edit_image: Editar imagen
+          error: '¡Error!'
+          file_size_too_large: '¡El archivo es demasiado grande! Peso de archivo máximo: %{megabytes}MB'
+          remove: Eliminar
+          replace: Reemplazar
+          save: Guardar
+          title: Título
+          title_required: '¡Se requiere un título!'
+          uploaded: Subido
+          validating: Validando...
+          validation_error: '¡Error de validación!'
+      upload_help:
+        dropzone: Arrastrar archivos aquí o haz clic para subirlos
+        explanation: Guía para %{attribute}
     gamification:
       all_badges_link: Ver todas los distintivos disponibles.
       badges:
@@ -862,6 +936,7 @@ es-MX:
         success: Solicitud enviada correctamente. Un administrador la revisará antes de aceptarte en el grupo.
       leave:
         error: Ha habido un problema al dejar el grupo
+        last_admin: No puedes abandonar este grupo porque eres la última administradora. Haz administradora a otra persona miembro para poder hacerlo.
         success: Has dejado el grupo correctamente.
       members:
         accept_or_reject_join_requests: 'Los siguientes usuarios han solicitado unirse a este grupo. Acepta o rechaza sus solicitudes:'
@@ -874,7 +949,7 @@ es-MX:
       no_user_groups: Aún no perteneces a ningún grupo.
       roles:
         admin: Administrador
-        creator: Creador
+        creator: Administradora
         member: Miembro
       update:
         error: Ha habido un problema al actualizar el grupo
@@ -899,7 +974,7 @@ es-MX:
         body_1: Estás a punto de visitar un enlace externo y te recomendamos que seas prudente respecto al contenido de páginas externas.
         body_2: Por favor, antes de seguir, comprueba que el enlace que estás a punto de visitar pertenece a un sitio seguro.
         cancel: Cancelar
-        close_modal: Cerrar ventana
+        close_modal: Cerrar modal
         proceed: Continuar
         title: Abrir enlace externo
     log:
@@ -908,9 +983,12 @@ es-MX:
         create_with_space: "%{user_name} creó %{resource_name} en %{space_name}"
         delete: "%{user_name} eliminó %{resource_name}"
         delete_with_space: "%{user_name} eliminó %{resource_name} en %{space_name}"
+        publish_with_space: "%{user_name} ha publicado %{resource_name} en %{space_name}"
         unknown_action: "%{user_name} realizó una acción en %{resource_name}"
         unknown_action_with_space: "%{user_name} realizó una acción en %{resource_name} en %{space_name}"
+        unpublish_with_space: "%{user_name} ha despublicado %{resource_name} en %{space_name}"
         update: "%{user_name} actualizó %{resource_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
         update_with_space: "%{user_name} actualizó %{resource_name} en %{space_name}"
       value_types:
         area_presenter:
@@ -1031,7 +1109,7 @@ es-MX:
     newsletter_mailer:
       newsletter:
         note: Has recibido este mensaje porque estás suscrito a boletines de noticias en %{organization_name}. Puedes cambiar la configuración en tu <a href="%{link}">página de notificaciones</a>.
-        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank">versión web</a>.'
+        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank" class="see-on-website">versión web</a>.'
         unsubscribe: Si no quieres recibir este tipo de correo electrónico, <a href="%{link}" target="_blank" class="unsubscribe">unsubscríbete</a>.
     newsletter_templates:
       basic_only_text:
@@ -1083,23 +1161,47 @@ es-MX:
       no_notifications: No hay notificaciones aún.
       show:
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
+    notifications_digest_mailer:
+      header:
+        daily: Resumen diario de notificaciones
+        weekly: Resumen semanal de notificaciones
+      hello: Hola %{name},
+      intro:
+        daily: 'Estas son las notificaciones del último día basadas en la actividad que estás siguiendo:'
+        weekly: 'Estas son las notificaciones de la última semana basadas en la actividad que estás siguiendo:'
+      outro: Has recibido estas notificaciones porque sigues este contenido o a sus autoras. Puedes dejar de seguirlas desde sus respectivas páginas.
+      see_more: Ver más notificaciones
+      subject: Este es tu correo resumen
     notifications_settings:
       show:
         administrators: Administradoras
         allow_public_contact: Permitir que cualquiera me envíe un mensaje directo, incluso si no le sigo.
+        allow_push_notifications: Mostrar notificaciones emergentes para saber qué pasa cuando no estás en la plataforma. Puedes desactivarlas en cualquier momento.
         direct_messages: Recibir mensajes directos de cualquiera
-        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo por moderación.
-        email_on_notification: Quiero recibir un correo electrónico cada vez que recibo una notificación.
+        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo o a alguien para moderación.
         everything_followed: Todo lo que sigo
         newsletter_notifications: Quiero recibir boletines informativos
         newsletters: Boletines de noticias
+        notification_settings:
+          close_meeting_reminder: Quiero recibir recordatorios por correo electrónico de reuniones pasadas con informes sin publicar
+        notifications_sending_frequencies:
+          daily: Diariamente
+          none: Ninguna
+          real_time: En tiempo real
+          weekly: Semanalmente
+        notifications_sending_frequency: '¿Con qué frecuencia quieres recibir el correo resumen de notificaciones?'
         own_activity: Mi propia actividad, como cuando alguien comenta en mi propuesta o me menciona.
+        push_notifications: Notificaciones emergentes
+        push_notifications_reminder: Para obtener notificaciones de la plataforma, primero tienes que permitirlas en la configuración de tu navegador.
         receive_notifications_about: Quiero recibir notificaciones sobre
-        send_notifications_by_email: Enviar notificaciones por correo electrónico
         update_notifications_settings: Guardar cambios
       update:
         error: Ha habido un error al actualizar la configuración de las notificaciones.
         success: La configuración de las notificaciones se han actualizado correctamente.
+    offline:
+      show:
+        message: Parece que estás desconectada. Por favor, inténtalo de nuevo más tarde.
+        retry: Reintentar
     open_data:
       not_available_yet: Los ficheros de datos abiertos aún no están disponibles, inténtalo de nuevo en unos minutos.
     own_user_groups:
@@ -1153,7 +1255,7 @@ es-MX:
           agreement: Estoy de acuerdo con estos términos
           legend: Aceptar los Términos y Condiciones de uso
         refuse:
-          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{data_portability_path}">descargar tus datos</a> y / o <a href="%{delete_path}">eliminar tu cuenta</a>.
+          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{download_your_data_path}">descargar tus datos</a> y/o <a href="%{delete_path}">eliminar tu cuenta</a>.
           modal_btn_continue: Aceptar los términos y continuar
           modal_btn_exit: Lo revisaré más tarde
           modal_button: Rechazar los términos
@@ -1165,6 +1267,10 @@ es-MX:
           title: 'Obligatorio: revisa las actualizaciones de nuestros Términos de Servicio'
     participatory_space_private_users:
       not_allowed: No puedes ver este contenido
+    passwords:
+      update:
+        error: Ha habido un problema al actualizar la contraseña
+        success: Contraseña actualizada correctamente
     profile:
       deleted: Usuario eliminado
       inaccessible_message: '¡Este perfil es inaccesible debido a la violación de Términos y Condiciones de uso!'
@@ -1309,6 +1415,8 @@ es-MX:
         close_modal: Cerrar el modal
         please_sign_in: Por favor, regístrate
         sign_up: Regístrate
+      mentions_modal:
+        remove_recipient: Eliminar destinataria %{name}
       participatory_space_filters:
         filters:
           areas: �reas
@@ -1349,7 +1457,7 @@ es-MX:
       show_translated: Mostrar el texto traducido automáticamente
     user_activity:
       index:
-        no_activities_warning: Este usuario no ha tenido ninguna actividad todavía.
+        no_activities_warning: Esta participante no ha tenido ninguna actividad todavía.
     user_contact_disabled: Esta participante no acepta mensajes directos.
     user_conversations:
       create:
@@ -1396,6 +1504,7 @@ es-MX:
       notify:
         body_1: La usuaria %{user} ha sido reportada por %{token}
         body_2: 'Motivo: %{reason}'
+        details: Datos proporcionados por la usuaria
         greetings: Saludos,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hola %{admin},
         subject: Una nueva usuaria ha sido reportada en %{organization_name}
@@ -1456,7 +1565,7 @@ es-MX:
     invitations:
       edit:
         header: Termina de crear tu cuenta
-        nickname_help: Tu identificador único en %{organization}.
+        nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
         submit_button: Guardar
         subtitle: Si aceptas la invitación, por favor establece tu nombre de usuario/a y contraseña.
       invitation_removed: Tu invitación fue eliminada.
@@ -1523,10 +1632,11 @@ es-MX:
     passwords:
       edit:
         change_my_password: Cambiar mi contraseña
-        change_your_password: Cambia tu contraseña
         confirm_new_password: Confirmar la nueva contraseña
         new_password: Contraseña
         password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
+        password_help_admin: "%{minimun_characters} caracteres como mínimo, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu alias, correo electrónico y antiguas contraseñas."
+        title: Cambio de contraseña
       new:
         forgot_your_password: '¿Olvidaste tu contraseña?'
         send_me_reset_password_instructions: Enviarme instrucciones para restablecer la contraseña
@@ -1574,6 +1684,7 @@ es-MX:
       public: Tu información pública
   errors:
     messages:
+      allowed_file_content_types: 'solo se permiten archivos con las siguientes extensiones: %{types}'
       already_confirmed: Ya fuiste confirmado, intenta iniciar sesión
       confirmation_period_expired: Necesitas ser confirmado dentro de %{period}, por favor solicita uno nuevo.
       content_type_allowlist_error: el tipo de archivo no es válido
@@ -1591,7 +1702,7 @@ es-MX:
         other: 'Hubo varios errores al procesar tu solicitud:'
       too_many_marks: Estás usando demasiados signos de puntuación consecutivos (por ejemplo,! y?)
       too_much_caps: Está usando demasiadas letras mayúsculas (más del 25% del texto)
-      too_short: Es demasiado corto (menos %{count} caracteres)
+      too_short: es demasiado corto (menos %{count} caracteres)
   forms:
     correct_errors: Hay errores en el formulario, por favor corrígelos para continuar.
     length_validator:
@@ -1605,14 +1716,60 @@ es-MX:
     timestamp_error_message: Lo siento, has sido demasiado rápido! Por favor, vuelva a enviar.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este sitio web utiliza cookies propias y de terceros para mejorar la experiencia de navegación, y ofrecer contenidos y servicios de interés. Al continuar la navegación entendemos que se acepta nuestra política de cookies. Para más información consulta %{link}.
-        link_label: aquí
-        ok: Estoy de acuerdo
+      data_consent:
+        details:
+          columns:
+            description: Descripción
+            name: Nombre
+            service: Servicio
+            type: Tipo
+          items:
+            _session_id:
+              description: Permite a los sitios web recordar a la usuaria dentro de un sitio web cuando se mueve entre páginas web.
+              service: Esta página web
+            decidim-consent:
+              description: Almacena información sobre las cookies permitidas por la usuaria en esta página web.
+              service: Esta página web
+            pwaInstallPromptSeen:
+              description: Guarda el estado si la notificación de instalación de la aplicación web progresiva (PWA) ya ha sido vista por la usuaria.
+              service: Esta página web
+          types:
+            cookie: Cookie
+            local_storage: Almacenamiento local
+        dialog:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          description: Utilizamos cookies en nuestro sitio web para mejorar el rendimiento y el contenido del mismo. Las cookies nos permiten ofrecer una experiencia de usuario y unos contenidos más personalizados desde nuestros canales de redes sociales.
+          settings: Configuración
+          title: Información sobre las cookies utilizadas en la página web
+        modal:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          analytics:
+            description: Estas cookies se utilizan para medir y analizar la audiencia del sitio web para ayudar a mejorarlo.
+            title: Analíticas y estadísticas
+          description: Utilizamos cookies para asegurar las funcionalidades básicas del sitio web y para mejorar tu experiencia en línea. Puedes configurar y aceptar el uso de las cookies, y modificar tus opciones de consentimiento en cualquier momento.
+          essential:
+            description: Estas cookies permiten la funcionalidad clave del sitio web y ayudan a mantener a sus usuarias seguras. Se guardan automáticamente en el navegador y no se pueden desactivar.
+            title: Esenciales
+          marketing:
+            description: Estas cookies recopilan información sobre cómo utilizas el sitio web y se pueden utilizar para proporcionarte un servicio más personalizado en los diferentes espacios en los que participas.
+            title: Marketing
+          preferences:
+            description: Estas cookies permiten que el sitio web recuerde las opciones que se han elegido en el pasado en este sitio web para proporcionar una experiencia más personalizada a las usuarias.
+            title: Preferencias
+          save_settings: Guardar configuración
+          title: Configuración de cookies
+          toggle: Cambiar %{consent_category}
+        warning:
+          all_categories: todas las cookies
+          change_settings: Cambiar la configuración de cookies
+          consent_required: Necesitas habilitar %{categories} para ver este contenido.
       edit_link:
         edit: Editar
       footer:
         cc_by_license: Con licencia Creative Commons
+        data_consent_settings: Configuración de cookies
         decidim_logo: Logo Decidim
         download_open_data: Descargar ficheros de datos abiertos
         made_with_open_source: Sitio web creado con <a target="_blank" href="https://github.com/decidim/decidim">software libre</a>.
@@ -1632,6 +1789,8 @@ es-MX:
       notifications_dashboard:
         mark_all_as_read: Marcar todo como leído
         mark_as_read: Marcar como leído
+      offline_banner:
+        cache_version_page: '¡Ups! Tu red está desconectada. Esta es una versión en caché de la página que estás visitando, quizás el contenido no está actualizado.'
       social_media_links:
         facebook: "%{organization} en Facebook"
         github: "%{organization} en GitHub"
@@ -1643,6 +1802,8 @@ es-MX:
         continue_session: Continuar sesión
         sign_out: Cerrar sesión
         title: '¿Quieres continuar con la sesión?'
+      upload_modal:
+        close_modal: Cerrar ventana
       user_menu:
         account: 'Cuenta de usuario: %{name}'
         admin_dashboard: Tablero de administración
@@ -1675,6 +1836,7 @@ es-MX:
     nickname_included_in_password: es demasiado similar a tu alias
     not_enough_unique_characters: No tiene suficientes caracteres únicos
     password_not_allowed: No se permite
+    password_repeated: no puedes reutilizar una contraseña antigua
     password_too_common: Es demasiado común
     password_too_long: Es demasiado largo
     password_too_short: Es demasiado corto
diff --git a/decidim-core/config/locales/es-PY.yml b/decidim-core/config/locales/es-PY.yml
index b1dc7f2774270..a9be2bfdf77b7 100644
--- a/decidim-core/config/locales/es-PY.yml
+++ b/decidim-core/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ es-PY:
     'true': 'Sí'
   carrierwave:
     errors:
-      image_too_big: La imagen es demasiado grande
+      file_resolution_too_large: La resolución del archivo es demasiado grande
+      file_size_too_large: El tamaño del archivo es demasiado grande
       not_inside_organization: El archivo no está relacionado con ninguna organización
   date:
     formats:
@@ -110,7 +112,6 @@ es-PY:
       x_seconds:
         one: hace 1 segundo
         other: "hace %{count} segundos"
-        zero: ahora mismo
   decidim:
     accessibility:
       external_link: Enlace externo
@@ -119,9 +120,6 @@ es-PY:
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los Términos y Condiciones de uso
-      data_portability_export:
-        file_no_exists: El archivo no existe
-        notice: Tus datos están actualmente en progreso. Recibirás un correo electrónico cuando se complete.
       delete:
         alert: Esta acción no se puede deshacer. Si eliminas tu cuenta no podrás iniciar sesión con tus credenciales. La eliminación de tu cuenta resultará en la anonimización de tus contribuciones. Aún podrás crear una nueva cuenta, pero estas contribuciones no se asociarán a ella.
         confirm:
@@ -133,8 +131,21 @@ es-PY:
       destroy:
         error: Se ha producido un error al eliminar tu cuenta.
         success: Tu cuenta se ha eliminado correctamente.
+      download_your_data_export:
+        file_no_exists: El archivo no existe
+        notice: Tus datos están actualmente en progreso. Recibirás un correo electrónico cuando se complete.
+      email_change:
+        body1: Hemos enviado un correo electrónico a %{unconfirmed_email} para verificar tu nueva dirección de correo electrónico.
+        body2: '¿Necesitas que te reenviemos el correo de verificación? %{resend_link} o %{cancel_link}.'
+        cancel: cancelar
+        cancel_error: No se ha podido cancelar el cambio de Correo electrónico.
+        cancel_successfully: Cambio de correo electrónico cancelado con éxito.
+        resend_error: No se ha podido reenviar el correo de confirmación.
+        resend_successfully: Correo de confirmación reenviado correctamente a %{unconfirmed_email}
+        send_again: Volver a enviar
+        title: Verificación del cambio de correo electrónico
       show:
-        available_locales_helper: Elige el idioma que quieres utilizar para navegar y recibir notificaciones en Decidim
+        available_locales_helper: Elige el idioma que deseas utilizar para navegar y recibir notificaciones en la plataforma
         change_password: Cambia la contraseña
         update_account: Actualizar cuenta
       update:
@@ -144,16 +155,44 @@ es-PY:
     admin:
       actions:
         cancel: Cancelar
+      password_change:
+        alert: Tienes que cambiar tu contraseña para poder seguir adelante
+        notification: Las usuarias con rol de administración tienen que cambiar su contraseña cada %{days} días.
     admin_log:
       area:
         create: "%{user_name} creó el área %{resource_name}"
         delete: "%{user_name} borró el área %{resource_name}"
         update: "%{user_name} actualizó el área %{resource_name}"
+      area_type:
+        create: "%{user_name} ha creado el tipo de área %{resource_name}"
+        delete: "%{user_name} ha eliminado el tipo de área %{resource_name}"
+        update: "%{user_name} ha actualizado tipo de área %{resource_name}"
+      attachment:
+        create: "%{user_name} ha creado el adjunto %{resource_name}"
+        delete: "%{user_name} ha eliminado el adjunto %{resource_name}"
+        update: "%{user_name} ha actualizado el adjunto %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} ha creado la colección de adjuntos %{resource_name}"
+        delete: "%{user_name} ha eliminado la colección de adjuntos %{resource_name}"
+        update: "%{user_name} ha actualizado la colección de adjuntos %{resource_name}"
+      category:
+        create: "%{user_name} ha añadido la categoria %{resource_name} al espacio %{space_name}"
+        delete: "%{user_name} ha eliminado la categoria %{resource_name} al espacio %{space_name}"
+        update: "%{user_name} ha actualizado la categoria %{resource_name} al espacio %{space_name}"
       component:
         create: "%{user_name} agregó el componente %{resource_name} al espacio %{space_name}"
         delete: "%{user_name} eliminó el componente %{resource_name} del espacio %{space_name}"
+        export_component: "%{user_name} ha exportado %{resource_name} %{component_name} en %{space_name} como %{format_name}"
         publish: "%{user_name} publicó el componente %{resource_name} en el espacio %{space_name}"
         unpublish: "%{user_name} ha despublicado el componente %{resource_name} del espacio %{space_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} ha actualizado la sección de ayuda %{resource_name}"
+      helpers:
+        answers: respuestas
+        comments: comentarios
+        projects: proyectos
+        results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
       moderation:
@@ -170,6 +209,7 @@ es-PY:
         update: "%{user_name} actualizó la aplicación %{resource_name} OAuth"
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
+        update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
       participatory_space_private_user:
         create: "%{user_name} invitados %{resource_name} para ser un usuario privado"
         create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
@@ -181,6 +221,10 @@ es-PY:
         delete_with_parent: "%{user_name} eliminó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
         update: "%{user_name} actualizó el ámbito %{resource_name}"
         update_with_parent: "%{user_name} actualizó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
+      scope_type:
+        create: "%{user_name} ha creado el tipo de ámbito %{resource_name}"
+        delete: "%{user_name} ha eliminado el tipo de ámbito %{resource_name}"
+        update: "%{user_name} ha actualizado el tipo de ámbito %{resource_name}"
       static_page:
         create: "%{user_name} creó la página estática %{resource_name}"
         delete: "%{user_name} eliminó la página estática %{resource_name}"
@@ -196,7 +240,9 @@ es-PY:
         unblock: "%{user_name} desoficializó a la usuaria %{resource_name}"
         unofficialize: "%{user_name} desoficializó al usuario %{resource_name}"
       user_group:
+        block: "%{user_name} ha bloqueado al grup de usuarias %{resource_name}"
         reject: "%{user_name} rechazó la verificación del grupo de usuarios %{resource_name}"
+        unblock: "%{user_name} ha desbloqueado el grupo de usuarias %{resource_name}"
         verify: "%{user_name} verificó al grupo de usuarios %{resource_name}"
         verify_via_csv: "%{user_name} verificó el grupo de %{resource_name} usuario a través de un archivo CSV"
       user_moderation:
@@ -307,6 +353,7 @@ es-PY:
       endorsements:
         one: adhesión
         other: adhesiones
+      official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Verifíquese introduciendo un número de pasaporte que comience por "A"
@@ -373,7 +420,7 @@ es-PY:
           request_confirmation_instructions: Solicitar instrucciones de confirmación
           title: Confirma tu email
       show:
-        close_modal: Cerrar el modal
+        close_modal: Cerrar modal
     block_user_mailer:
       notify:
         body_1: Tu cuenta ha sido bloqueda.
@@ -397,6 +444,7 @@ es-PY:
           debate: Debate
           initiative: Iniciativa
           meeting: Encuentro
+          order: Votación presupuestaria
           post: Publicar
           proposal: Propuesta
           question: Pregunta
@@ -411,8 +459,8 @@ es-PY:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
             comments_max_length: Longitud máxima de los comentarios
-            dummy_global_attribute_1: Atributo ficticio 1
-            dummy_global_attribute_2: Atributo ficticio 2
+            dummy_global_attribute1: Atributo ficticio 1
+            dummy_global_attribute2: Atributo ficticio 2
             dummy_global_translatable_text: Texto de ejemplo traducible
             enable_pads_creation: Habilitar la creación de pads
             resources_permissions_enabled: Permisos sobre recursos habilitados
@@ -424,8 +472,8 @@ es-PY:
             amendment_reaction_enabled: Reacción de enmienda activada
             amendments_visibility: Visibilidad de la enmienda
             comments_blocked: Comentarios bloqueados
-            dummy_step_attribute_1: Atributo de paso ficticio 1
-            dummy_step_attribute_2: Atributo de paso ficticio 2
+            dummy_step_attribute1: Atributo de paso ficticio 1
+            dummy_step_attribute2: Atributo de paso ficticio 2
             dummy_step_translatable_text: Fase de ejemplo traducible
     contact: Contacto
     content_blocks:
@@ -469,13 +517,6 @@ es-PY:
       actions:
         login_before_access: Por favor, inicia sesión con tu cuenta antes de acceder
         unauthorized: No tienes permiso para realizar esta acción.
-    data_portability:
-      export:
-        ready: Listo
-      show:
-        download_data: Descargar los datos
-        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Solicitar datos
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ es-PY:
           newsletter: Quiero recibir un boletín ocasional con información relevante
           newsletter_title: Permiso de contacto
           nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
-          password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
           sign_in: Entra
           sign_up: Regístrate
           sign_up_as:
@@ -543,6 +583,13 @@ es-PY:
           this_application_will_not_be_able_to: 'Esta aplicación no podrá:'
           update_profile: Actualiza tu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quiere usar tu cuenta"
+    download_your_data:
+      export:
+        ready: Listo
+      show:
+        download_data: Descargar los datos
+        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Solicitar datos
     editor_images:
       create:
         error: Error al subir la imagen
@@ -686,6 +733,8 @@ es-PY:
           email_outro: Has recibido esta notificación porque eres una de las administradoras de la plataforma.
           email_subject: Un grupo de usuarias ha actualizado su perfil
           notification_title: El grupo de usuarias %{user_group_name} ha actualizado su perfil perdiendo la verificación. Puedes volver a verificarlo a través del <a href="%{groups_admin_path}">panel de administración</a>.
+      nickname_event:
+        notification_body: Hemos corregido la forma en que se utilizan los alias para que no haya duplicados, para hacerlo ya no se distingue entre mayúsculas y minúsculas. <br/> Tu alias fue creado después de otro igual, así que lo hemos renombrado automáticamente. Puedes modificarlo desde la <a href="%{link_to_account_settings}">configuración de tu cuenta</a>.
       notification_event:
         notification_title: Un evento ha ocurrido en <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -713,7 +762,7 @@ es-PY:
           email_subject: "Se ha oficializado a %{name}"
           notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible hasta %{date}.<br/>Necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows), <a href="https://www.keka.io/en/">Keka</a> (para MacOS) o <a href="https://peazip.github.io">PeaZip</a> (para Linux) para abrirlo. Contraseña: %{password}'
         download: Descargar
       export:
@@ -753,7 +802,6 @@ es-PY:
         button: Dejar de seguir
         error: Ha habido un error dejando de seguir este recurso.
     forms:
-      current_file: Archivo actual
       current_image: Imagen actual
       default_image: Imagen predeterminada
       errors:
@@ -765,15 +813,41 @@ es-PY:
         file:
           explanation: 'Instrucciones para el archivo:'
           message_1: Tiene que ser una imagen o un documento.
-          message_2: Para las imágenes, utilizar imágenes preferiblemente apaisadas, el servicio recorta la imagen. Para los archivos CSV, el separador entre columnas debe ser una coma (",")
+          message_2: Para las imágenes, utilizar imágenes apaisadas preferiblemente, el servicio recorta la imagen.
+        icon:
+          explanation: 'Instrucciones para el icono:'
+          message_1: Tiene que ser una imagen cuadrada.
+          message_2: El tamaño recomendado para esta imagen es 512x512.
         image:
           explanation: 'Instrucciones para la imagen:'
           message_1: Preferiblemente una imagen de paisaje que no tenga ningún texto.
           message_2: El servicio recorta la imagen.
       file_validation:
         allowed_file_extensions: 'Formatos de archivo permitidos: %{extensions}'
+        max_file_dimension: 'Medidas máximas de archivo: %{resolution} píxeles'
         max_file_size: 'Tamaño máximo del archivo: %{megabytes}MB'
-      remove_this_file: Eliminar este archivo
+      files:
+        extension_allowlist: 'Formatos aceptados: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Añadir adjunto
+          add_file: Añadir archivo
+          add_image: Añadir imagen
+          cancel: Cancelar
+          edit_image: Editar imagen
+          error: '¡Error!'
+          file_size_too_large: '¡El archivo es demasiado grande! Peso de archivo máximo: %{megabytes}MB'
+          remove: Eliminar
+          replace: Reemplazar
+          save: Guardar
+          title: Título
+          title_required: '¡Se requiere un título!'
+          uploaded: Subido
+          validating: Validando...
+          validation_error: '¡Error de validación!'
+      upload_help:
+        dropzone: Arrastrar archivos aquí o haz clic para subirlos
+        explanation: Guía para %{attribute}
     gamification:
       all_badges_link: Ver todas los distintivos disponibles.
       badges:
@@ -862,6 +936,7 @@ es-PY:
         success: Únete a la solicitud creada con éxito. Un administrador revisará su solicitud antes de aceptarlo en el grupo.
       leave:
         error: Ha habido un problema al dejar el grupo.
+        last_admin: No puedes abandonar este grupo porque eres la última administradora. Haz administradora a otra persona miembro para poder hacerlo.
         success: Grupo salió con éxito.
       members:
         accept_or_reject_join_requests: 'Los siguientes usuarios han solicitado unirse a este grupo. Aceptar o rechazar sus solicitudes:'
@@ -874,7 +949,7 @@ es-PY:
       no_user_groups: Aún no pertenece a ningún grupo.
       roles:
         admin: Administrador
-        creator: Creador
+        creator: Administradora
         member: Miembro
       update:
         error: Ha habido un problema al actualizar el grupo.
@@ -899,7 +974,7 @@ es-PY:
         body_1: Estás a punto de visitar un enlace externo y te recomendamos que seas prudente respecto al contenido de páginas externas.
         body_2: Por favor, antes de seguir, comprueba que el enlace que estás a punto de visitar pertenece a un sitio seguro.
         cancel: Cancelar
-        close_modal: Cerrar ventana
+        close_modal: Cerrar modal
         proceed: Continuar
         title: Abrir enlace externo
     log:
@@ -908,9 +983,12 @@ es-PY:
         create_with_space: "%{user_name} creó %{resource_name} en %{space_name}"
         delete: "%{user_name} eliminó %{resource_name}"
         delete_with_space: "%{user_name} eliminó %{resource_name} en %{space_name}"
+        publish_with_space: "%{user_name} ha publicado %{resource_name} en %{space_name}"
         unknown_action: "%{user_name} realizó una acción en %{resource_name}"
         unknown_action_with_space: "%{user_name} realizó una acción en %{resource_name} en %{space_name}"
+        unpublish_with_space: "%{user_name} ha despublicado %{resource_name} en %{space_name}"
         update: "%{user_name} actualizó %{resource_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
         update_with_space: "%{user_name} actualizó %{resource_name} en %{space_name}"
       value_types:
         area_presenter:
@@ -1031,7 +1109,7 @@ es-PY:
     newsletter_mailer:
       newsletter:
         note: Has recibido este mensaje porque estás suscrito a boletines de noticias en %{organization_name}. Puedes cambiar la configuración en tu <a href="%{link}">página de notificaciones</a>.
-        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank">versión web</a>.'
+        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank" class="see-on-website">versión web</a>.'
         unsubscribe: Si no quieres recibir este tipo de correo electrónico, <a href="%{link}" target="_blank" class="unsubscribe">unsubscríbete</a>.
     newsletter_templates:
       basic_only_text:
@@ -1083,23 +1161,47 @@ es-PY:
       no_notifications: No hay notificaciones aún.
       show:
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
+    notifications_digest_mailer:
+      header:
+        daily: Resumen diario de notificaciones
+        weekly: Resumen semanal de notificaciones
+      hello: Hola %{name},
+      intro:
+        daily: 'Estas son las notificaciones del último día basadas en la actividad que estás siguiendo:'
+        weekly: 'Estas son las notificaciones de la última semana basadas en la actividad que estás siguiendo:'
+      outro: Has recibido estas notificaciones porque sigues este contenido o a sus autoras. Puedes dejar de seguirlas desde sus respectivas páginas.
+      see_more: Ver más notificaciones
+      subject: Este es tu correo resumen
     notifications_settings:
       show:
         administrators: Administradoras
         allow_public_contact: Permitir que cualquiera me envíe un mensaje directo, incluso si no le sigo.
+        allow_push_notifications: Mostrar notificaciones emergentes para saber qué pasa cuando no estás en la plataforma. Puedes desactivarlas en cualquier momento.
         direct_messages: Recibir mensajes directos de cualquiera
-        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo por moderación.
-        email_on_notification: Quiero recibir un correo electrónico cada vez que recibo una notificación.
+        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo o a alguien para moderación.
         everything_followed: Todo lo que sigo
         newsletter_notifications: Quiero recibir boletines informativos
         newsletters: Boletines de noticias
+        notification_settings:
+          close_meeting_reminder: Quiero recibir recordatorios por correo electrónico de reuniones pasadas con informes sin publicar
+        notifications_sending_frequencies:
+          daily: Diariamente
+          none: Ninguna
+          real_time: En tiempo real
+          weekly: Semanalmente
+        notifications_sending_frequency: '¿Con qué frecuencia quieres recibir el correo resumen de notificaciones?'
         own_activity: Mi propia actividad, como cuando alguien comenta en mi propuesta o me menciona.
+        push_notifications: Notificaciones emergentes
+        push_notifications_reminder: Para obtener notificaciones de la plataforma, primero tienes que permitirlas en la configuración de tu navegador.
         receive_notifications_about: Quiero recibir notificaciones sobre
-        send_notifications_by_email: Enviar notificaciones por correo electrónico
         update_notifications_settings: Guardar cambios
       update:
         error: Ha habido un error al actualizar la configuración de las notificaciones.
         success: La configuración de las notificaciones se han actualizado correctamente.
+    offline:
+      show:
+        message: Parece que estás desconectada. Por favor, inténtalo de nuevo más tarde.
+        retry: Reintentar
     open_data:
       not_available_yet: Los ficheros de datos abiertos aún no están disponibles, inténtalo de nuevo en unos minutos.
     own_user_groups:
@@ -1153,7 +1255,7 @@ es-PY:
           agreement: Estoy de acuerdo con estos términos
           legend: Aceptar los Términos y Condiciones de uso
         refuse:
-          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{data_portability_path}">descargar tus datos</a> y / o <a href="%{delete_path}">eliminar tu cuenta</a>.
+          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{download_your_data_path}">descargar tus datos</a> y/o <a href="%{delete_path}">eliminar tu cuenta</a>.
           modal_btn_continue: Aceptar los términos y continuar
           modal_btn_exit: Lo revisaré más tarde
           modal_button: Rechazar los términos
@@ -1165,6 +1267,10 @@ es-PY:
           title: 'Obligatorio: revisa las actualizaciones de nuestros Términos de Servicio'
     participatory_space_private_users:
       not_allowed: No puedes ver este contenido
+    passwords:
+      update:
+        error: Ha habido un problema al actualizar la contraseña
+        success: Contraseña actualizada correctamente
     profile:
       deleted: Usuario eliminado
       inaccessible_message: '¡Este perfil es inaccesible debido a la violación de Términos y Condiciones de uso!'
@@ -1309,6 +1415,8 @@ es-PY:
         close_modal: Cerrar el modal
         please_sign_in: Por favor, regístrate
         sign_up: Regístrate
+      mentions_modal:
+        remove_recipient: Eliminar destinataria %{name}
       participatory_space_filters:
         filters:
           areas: �reas
@@ -1349,7 +1457,7 @@ es-PY:
       show_translated: Mostrar el texto traducido automáticamente
     user_activity:
       index:
-        no_activities_warning: Este usuario no ha tenido ninguna actividad todavía.
+        no_activities_warning: Esta participante no ha tenido ninguna actividad todavía.
     user_contact_disabled: Esta participante no acepta mensajes directos.
     user_conversations:
       create:
@@ -1396,6 +1504,7 @@ es-PY:
       notify:
         body_1: La usuaria %{user} ha sido reportada por %{token}
         body_2: 'Motivo: %{reason}'
+        details: Datos proporcionados por la usuaria
         greetings: Saludos,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hola %{admin},
         subject: Una nueva usuaria ha sido reportada en %{organization_name}
@@ -1456,7 +1565,7 @@ es-PY:
     invitations:
       edit:
         header: Termina de crear tu cuenta
-        nickname_help: Tu identificador único en %{organization}.
+        nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
         submit_button: Guardar
         subtitle: Si aceptas la invitación, por favor establece tu nombre de usuario/a y contraseña.
       invitation_removed: Tu invitación fue eliminada.
@@ -1523,10 +1632,11 @@ es-PY:
     passwords:
       edit:
         change_my_password: Cambiar mi contraseña
-        change_your_password: cambia tu contraseña
         confirm_new_password: Confirmar nueva contraseña
         new_password: Contraseña
         password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
+        password_help_admin: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo, de tu correo electrónico y de tus antiguas contraseñas."
+        title: Cambio de contraseña
       new:
         forgot_your_password: '¿Olvidaste tu contraseña?'
         send_me_reset_password_instructions: Enviarme instrucciones para restablecer la contraseña
@@ -1574,6 +1684,7 @@ es-PY:
       public: Tu información pública
   errors:
     messages:
+      allowed_file_content_types: 'solo se permiten archivos con las siguientes extensiones: %{types}'
       already_confirmed: ya fue confirmado, intente iniciar sesión
       confirmation_period_expired: necesita ser confirmado dentro de %{period}, por favor solicite uno nuevo
       content_type_allowlist_error: el tipo de archivo no es válido
@@ -1591,7 +1702,7 @@ es-PY:
         other: 'Hubo varios errores al procesar tu solicitud:'
       too_many_marks: está usando demasiados signos de puntuación consecutivos (por ejemplo,! y?)
       too_much_caps: está usando demasiadas letras mayúsculas (más del 25% del texto)
-      too_short: Es demasiado corto (menos %{count} caracteres)
+      too_short: es demasiado corto (menos %{count} caracteres)
   forms:
     correct_errors: Hay errores en el formulario, por favor corrígelos para continuar.
     length_validator:
@@ -1605,14 +1716,60 @@ es-PY:
     timestamp_error_message: Lo siento, has sido demasiado rápido! Por favor, vuelva a enviar.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este sitio web utiliza cookies propias y de terceros para mejorar la experiencia de navegación, y ofrecer contenidos y servicios de interés. Al continuar la navegación entendemos que se acepta nuestra política de cookies. Para más información consulta %{link}.
-        link_label: aquí
-        ok: Estoy de acuerdo
+      data_consent:
+        details:
+          columns:
+            description: Descripción
+            name: Nombre
+            service: Servicio
+            type: Tipo
+          items:
+            _session_id:
+              description: Permite a los sitios web recordar a la usuaria dentro de un sitio web cuando se mueve entre páginas web.
+              service: Esta página web
+            decidim-consent:
+              description: Almacena información sobre las cookies permitidas por la usuaria en esta página web.
+              service: Esta página web
+            pwaInstallPromptSeen:
+              description: Guarda el estado si la notificación de instalación de la aplicación web progresiva (PWA) ya ha sido vista por la usuaria.
+              service: Esta página web
+          types:
+            cookie: Cookie
+            local_storage: Almacenamiento local
+        dialog:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          description: Utilizamos cookies en nuestro sitio web para mejorar el rendimiento y el contenido del mismo. Las cookies nos permiten ofrecer una experiencia de usuario y unos contenidos más personalizados desde nuestros canales de redes sociales.
+          settings: Configuración
+          title: Información sobre las cookies utilizadas en la página web
+        modal:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          analytics:
+            description: Estas cookies se utilizan para medir y analizar la audiencia del sitio web para ayudar a mejorarlo.
+            title: Analíticas y estadísticas
+          description: Utilizamos cookies para asegurar las funcionalidades básicas del sitio web y para mejorar tu experiencia en línea. Puedes configurar y aceptar el uso de las cookies, y modificar tus opciones de consentimiento en cualquier momento.
+          essential:
+            description: Estas cookies permiten la funcionalidad clave del sitio web y ayudan a mantener a sus usuarias seguras. Se guardan automáticamente en el navegador y no se pueden desactivar.
+            title: Esenciales
+          marketing:
+            description: Estas cookies recopilan información sobre cómo utilizas el sitio web y se pueden utilizar para proporcionarte un servicio más personalizado en los diferentes espacios en los que participas.
+            title: Marketing
+          preferences:
+            description: Estas cookies permiten que el sitio web recuerde las opciones que se han elegido en el pasado en este sitio web para proporcionar una experiencia más personalizada a las usuarias.
+            title: Preferencias
+          save_settings: Guardar configuración
+          title: Configuración de cookies
+          toggle: Cambiar %{consent_category}
+        warning:
+          all_categories: todas las cookies
+          change_settings: Cambiar la configuración de cookies
+          consent_required: Necesitas habilitar %{categories} para ver este contenido.
       edit_link:
         edit: Editar
       footer:
         cc_by_license: Con licencia Creative Commons
+        data_consent_settings: Configuración de cookies
         decidim_logo: Logo Decidim
         download_open_data: Descargar ficheros de datos abiertos
         made_with_open_source: Sitio web creado con <a target="_blank" href="https://github.com/decidim/decidim">software libre</a>.
@@ -1632,6 +1789,8 @@ es-PY:
       notifications_dashboard:
         mark_all_as_read: Marcar todo como leído
         mark_as_read: Marcar como leído
+      offline_banner:
+        cache_version_page: '¡Ups! Tu red está desconectada. Esta es una versión en caché de la página que estás visitando, quizás el contenido no está actualizado.'
       social_media_links:
         facebook: "%{organization} en Facebook"
         github: "%{organization} en GitHub"
@@ -1643,6 +1802,8 @@ es-PY:
         continue_session: Continuar sesión
         sign_out: Cerrar sesión
         title: '¿Quieres continuar con la sesión?'
+      upload_modal:
+        close_modal: Cerrar ventana
       user_menu:
         account: 'Cuenta de usuario: %{name}'
         admin_dashboard: Tablero de administración
@@ -1675,6 +1836,7 @@ es-PY:
     nickname_included_in_password: es demasiado similar a tu alias
     not_enough_unique_characters: No tiene suficientes caracteres únicos
     password_not_allowed: No se permite
+    password_repeated: no puedes reutilizar una contraseña antigua
     password_too_common: Es demasiado común
     password_too_long: Es demasiado largo
     password_too_short: Es demasiado corto
diff --git a/decidim-core/config/locales/es.yml b/decidim-core/config/locales/es.yml
index 8b5da46cbe7b5..de34b9eb3df77 100644
--- a/decidim-core/config/locales/es.yml
+++ b/decidim-core/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ es:
     'true': 'Sí'
   carrierwave:
     errors:
-      image_too_big: La imagen es demasiado grande
+      file_resolution_too_large: La resolución del archivo es demasiado grande
+      file_size_too_large: El tamaño del archivo es demasiado grande
       not_inside_organization: El archivo no está relacionado con ninguna organización
   date:
     formats:
@@ -110,7 +112,6 @@ es:
       x_seconds:
         one: hace 1 segundo
         other: "hace %{count} segundos"
-        zero: ahora mismo
   decidim:
     accessibility:
       external_link: Enlace externo
@@ -119,9 +120,6 @@ es:
       skip_button: Saltar al contenido principal
     account:
       blocked: Esta cuenta ha sido bloqueada por una violación de los Términos y Condiciones de uso
-      data_portability_export:
-        file_no_exists: El archivo no existe
-        notice: La descarga de tus datos está en curso. Recibirás un correo electrónico cuando se complete.
       delete:
         alert: Esta acción no se puede deshacer. Si eliminas tu cuenta no podrás iniciar sesión con tus credenciales. La eliminación de tu cuenta resultará en la anonimización de tus contribuciones. Aún podrás crear una nueva cuenta, pero estas contribuciones no se asociarán a ella.
         confirm:
@@ -133,8 +131,21 @@ es:
       destroy:
         error: Se ha producido un error al eliminar tu cuenta.
         success: Tu cuenta se ha eliminado correctamente.
+      download_your_data_export:
+        file_no_exists: El archivo no existe
+        notice: La descarga de tus datos está en curso. Recibirás un correo electrónico cuando se complete.
+      email_change:
+        body1: Hemos enviado un correo electrónico a %{unconfirmed_email} para verificar tu nueva dirección de correo electrónico.
+        body2: '¿Necesitas que te reenviemos el correo de verificación? %{resend_link} o %{cancel_link}.'
+        cancel: cancelar
+        cancel_error: No se ha podido cancelar el cambio de Correo electrónico.
+        cancel_successfully: Cambio de correo electrónico cancelado con éxito.
+        resend_error: No se ha podido reenviar el correo de confirmación.
+        resend_successfully: Correo de confirmación reenviado correctamente a %{unconfirmed_email}
+        send_again: Volver a enviar
+        title: Verificación del cambio de correo electrónico
       show:
-        available_locales_helper: Elige el idioma que quieres utilizar para navegar y recibir notificaciones en Decidim
+        available_locales_helper: Elige el idioma que deseas utilizar para navegar y recibir notificaciones en la plataforma
         change_password: Cambia la contraseña
         update_account: Actualizar cuenta
       update:
@@ -144,16 +155,44 @@ es:
     admin:
       actions:
         cancel: Cancelar
+      password_change:
+        alert: Tienes que cambiar tu contraseña para poder seguir adelante
+        notification: Las usuarias con rol de administración tienen que cambiar su contraseña cada %{days} días.
     admin_log:
       area:
         create: "%{user_name} creó el área %{resource_name}"
         delete: "%{user_name} eliminó el área %{resource_name}"
         update: "%{user_name} actualizó el área %{resource_name}"
+      area_type:
+        create: "%{user_name} ha creado el tipo de área %{resource_name}"
+        delete: "%{user_name} ha eliminado el tipo de área %{resource_name}"
+        update: "%{user_name} ha actualizado tipo de área %{resource_name}"
+      attachment:
+        create: "%{user_name} ha creado el adjunto %{resource_name}"
+        delete: "%{user_name} ha eliminado el adjunto %{resource_name}"
+        update: "%{user_name} ha actualizado el adjunto %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} ha creado la colección de adjuntos %{resource_name}"
+        delete: "%{user_name} ha eliminado la colección de adjuntos %{resource_name}"
+        update: "%{user_name} ha actualizado la colección de adjuntos %{resource_name}"
+      category:
+        create: "%{user_name} ha añadido la categoria %{resource_name} al espacio %{space_name}"
+        delete: "%{user_name} ha eliminado la categoria %{resource_name} al espacio %{space_name}"
+        update: "%{user_name} ha actualizado la categoria %{resource_name} al espacio %{space_name}"
       component:
         create: "%{user_name} agregó el componente %{resource_name} al espacio %{space_name}"
         delete: "%{user_name} eliminó el componente %{resource_name} del espacio %{space_name}"
+        export_component: "%{user_name} ha exportado %{resource_name} %{component_name} en %{space_name} como %{format_name}"
         publish: "%{user_name} publicó el componente %{resource_name} en el espacio %{space_name}"
         unpublish: "%{user_name} ha despublicado el componente %{resource_name} del espacio %{space_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} ha actualizado la sección de ayuda %{resource_name}"
+      helpers:
+        answers: respuestas
+        comments: comentarios
+        projects: proyectos
+        results: resultados
       impersonation_log:
         manage: "%{user_name} ha gestionado a %{resource_name} porque %{reason}"
       moderation:
@@ -170,6 +209,7 @@ es:
         update: "%{user_name} actualizó la aplicación %{resource_name} OAuth"
       organization:
         update: "%{user_name} actualizó la configuración de la organización"
+        update_external_domain: "%{user_name} ha actualizado los dominios externos de la organización"
       participatory_space_private_user:
         create: "%{user_name} ha invitado a %{resource_name} como participante privada"
         create_via_csv: "%{user_name} invitó a %{resource_name} vía CSV a ser un participante privada"
@@ -181,6 +221,10 @@ es:
         delete_with_parent: "%{user_name} eliminó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
         update: "%{user_name} actualizó el ámbito %{resource_name}"
         update_with_parent: "%{user_name} actualizó el ámbito %{resource_name} dentro del ámbito %{parent_scope}"
+      scope_type:
+        create: "%{user_name} ha creado el tipo de ámbito %{resource_name}"
+        delete: "%{user_name} ha eliminado el tipo de ámbito %{resource_name}"
+        update: "%{user_name} ha actualizado el tipo de ámbito %{resource_name}"
       static_page:
         create: "%{user_name} creó la página estática %{resource_name}"
         delete: "%{user_name} eliminó la página estática %{resource_name}"
@@ -196,7 +240,9 @@ es:
         unblock: "%{user_name} desoficializó a la usuaria %{resource_name}"
         unofficialize: "%{user_name} ha desoficializado a la participante %{resource_name}"
       user_group:
+        block: "%{user_name} ha bloqueado al grup de usuarias %{resource_name}"
         reject: "%{user_name} rechazó la verificación del grupo %{resource_name}"
+        unblock: "%{user_name} ha desbloqueado el grupo de usuarias %{resource_name}"
         verify: "%{user_name} verificó el grupo %{resource_name}"
         verify_via_csv: "%{user_name} verificó el grupo %{resource_name} través de un archivo CSV"
       user_moderation:
@@ -304,6 +350,7 @@ es:
       endorsements:
         one: adhesión
         other: adhesiones
+      official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Verifícate introduciendo un número de pasaporte que comience por "A"
@@ -370,7 +417,7 @@ es:
           request_confirmation_instructions: Solicitar instrucciones de confirmación
           title: Confirma tu email
       show:
-        close_modal: Cerrar el modal
+        close_modal: Cierra modal
     block_user_mailer:
       notify:
         body_1: Tu cuenta ha sido bloqueda.
@@ -394,6 +441,7 @@ es:
           debate: Debate
           initiative: Iniciativa
           meeting: Encuentro
+          order: Votación presupuestaria
           post: Publicar
           proposal: Propuesta
           question: Pregunta
@@ -408,8 +456,8 @@ es:
             amendments_enabled: Enmiendas habilitadas
             comments_enabled: Comentarios habilitados
             comments_max_length: Longitud máxima de los comentarios
-            dummy_global_attribute_1: Atributo de prueba 1
-            dummy_global_attribute_2: Atributo de prueba 2
+            dummy_global_attribute1: Atributo de prueba 1
+            dummy_global_attribute2: Atributo de prueba 2
             dummy_global_translatable_text: Texto de ejemplo traducible
             enable_pads_creation: Habilitar la creación de pads
             resources_permissions_enabled: Permisos de recursos habilitados
@@ -421,8 +469,8 @@ es:
             amendment_reaction_enabled: Reacción de enmienda activada
             amendments_visibility: Visibilidad de la enmienda
             comments_blocked: Comentarios bloqueados
-            dummy_step_attribute_1: Atributo de fase de prueba 1
-            dummy_step_attribute_2: Atributo de fase de prueba 2
+            dummy_step_attribute1: Atributo de fase de prueba 1
+            dummy_step_attribute2: Atributo de fase de prueba 2
             dummy_step_translatable_text: Fase de ejemplo traducible
     contact: Contacto
     content_blocks:
@@ -466,13 +514,6 @@ es:
       actions:
         login_before_access: Por favor, inicia sesión con tu cuenta antes de acceder
         unauthorized: No tienes permisos para realizar esta acción
-    data_portability:
-      export:
-        ready: Listo
-      show:
-        download_data: Descárgate los datos
-        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Solicita datos
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -491,7 +532,6 @@ es:
           newsletter: Quiero recibir un boletín ocasional con información relevante
           newsletter_title: Permiso de contacto
           nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
-          password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
           sign_in: Entra
           sign_up: Regístrate
           sign_up_as:
@@ -516,10 +556,10 @@ es:
             close_modal: Cierra modal
             uncheck: Mantener desmarcado
           notice: |-
-            <p>Hola, ¿estás segura de que no quieres recibir un boletín informativo?<br>
+            <p>Hola, ¿seguro que no quieres recibir un boletín informativo?<br>
             Por favor, considera volver a marcar la casilla de selección del boletín a continuación.<br>
             Es muy importante para nosotras que puedas recibir correos electrónicos ocasionales para hacer avisos importantes, siempre puedes cambiar esto en la página de configuración de notificaciones.</p>
-            <p>Si no marcas la casilla, es posible que se pierda información relevante sobre nuevas oportunidades de participación dentro de la plataforma.<br>
+            <p>Si no marcas la casilla, es posible que te pierdas información relevante sobre nuevas oportunidades de participación dentro de la plataforma.<br>
             Si aún deseas evitar recibir boletines, entendemos perfectamente tu decisión.</p>
             <p>¡Gracias por leer esto!</p>
           title: Notificaciones de boletines
@@ -540,6 +580,13 @@ es:
           this_application_will_not_be_able_to: 'Esta aplicación no podrá:'
           update_profile: Actualiza tu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quiere usar tu cuenta"
+    download_your_data:
+      export:
+        ready: Listo
+      show:
+        download_data: Descárgate los datos
+        download_data_description: Se enviará un archivo con toda la información asociada a tu cuenta a <strong>%{user_email}</strong>. Este correo electrónico contendrá un archivo .zip y una contraseña para abrirlo.<br/><br/>Para descomprimir el archivo, necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) o <a href="https://www.keka.io/">Keka</a> (para MacOS). Si usas Linux, la mayoría de las veces lo tendrás instalado por defecto. Si no, puedes utilizar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Solicita datos
     editor_images:
       create:
         error: Error al subir la imagen
@@ -683,6 +730,8 @@ es:
           email_outro: Has recibido esta notificación porque eres una de las administradoras de la plataforma.
           email_subject: Un grupo ha actualizado su perfil
           notification_title: El grupo %{user_group_name} ha actualizado su perfil perdiendo la verificación. Puedes volver a verificarlo a través del <a href="%{groups_admin_path}">panel de administración</a>.
+      nickname_event:
+        notification_body: Hemos corregido la forma en que se utilizan los alias para que no haya duplicados, para hacerlo ya no se distingue entre mayúsculas y minúsculas. <br/> Tu alias fue creado después de otro igual, así que lo hemos renombrado automáticamente. Puedes modificarlo desde la <a href="%{link_to_account_settings}">configuración de tu cuenta</a>.
       notification_event:
         notification_title: Se ha producido un evento a <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -710,7 +759,7 @@ es:
           email_subject: "Se ha oficializado a %{name}"
           notification_title: La participante %{name} (%{nickname}) ha sido oficializada.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Haz clic en el siguiente enlace para descargar tus datos.<br/>El archivo estará disponible hasta %{date}.<br/>Necesitarás <a href="https://www.7-zip.org/">7-Zip</a> (para Windows), <a href="https://www.keka.io/en/">Keka</a> (para MacOS) o <a href="https://peazip.github.io">PeaZip</a> (para Linux) para abrirlo. Contraseña: %{password}'
         download: Descargar
       export:
@@ -750,7 +799,6 @@ es:
         button: Dejar de seguir
         error: Se ha producido un error al dejar de seguir este recurso.
     forms:
-      current_file: Archivo actual
       current_image: Imagen actual
       default_image: Imagen predeterminada
       errors:
@@ -762,15 +810,41 @@ es:
         file:
           explanation: 'Instrucciones para el archivo:'
           message_1: Tiene que ser una imagen o un documento.
-          message_2: Para las imágenes, utilizar imágenes preferiblemente apaisadas, el servicio recorta la imagen. Para los archivos CSV, el separador entre columnas debe ser una coma (",")
+          message_2: Para las imágenes, utilizar imágenes apaisadas preferiblemente, el servicio recorta la imagen.
+        icon:
+          explanation: 'Instrucciones para el icono:'
+          message_1: Tiene que ser una imagen cuadrada.
+          message_2: El tamaño recomendado para esta imagen es 512x512.
         image:
           explanation: 'Instrucciones para la imagen:'
           message_1: Preferiblemente una imagen apaisada que no tenga ningún texto.
           message_2: El servicio recorta la imagen.
       file_validation:
         allowed_file_extensions: 'Formatos de archivo permitidos: %{extensions}'
+        max_file_dimension: 'Medidas máximas de archivo: %{resolution} píxeles'
         max_file_size: 'Tamaño máximo del archivo: %{megabytes}MB'
-      remove_this_file: Eliminar este archivo
+      files:
+        extension_allowlist: 'Formatos aceptados: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Añadir adjunto
+          add_file: Añadir archivo
+          add_image: Añadir imagen
+          cancel: Cancelar
+          edit_image: Editar imagen
+          error: '¡Error!'
+          file_size_too_large: '¡El archivo es demasiado grande! Peso de archivo máximo: %{megabytes}MB'
+          remove: Eliminar
+          replace: Reemplazar
+          save: Guardar
+          title: Título
+          title_required: '¡Se requiere un título!'
+          uploaded: Subido
+          validating: Validando...
+          validation_error: '¡Error de validación!'
+      upload_help:
+        dropzone: Arrastrar archivos aquí o haz clic para subirlos
+        explanation: Guía para %{attribute}
     gamification:
       all_badges_link: Ver todas las insígnias disponibles.
       badges:
@@ -794,7 +868,7 @@ es:
       reached_top: Has alcanzado el nivel superior para esta insignia.
     group_admins:
       actions:
-        are_you_sure: '¿Segura? Esto no eliminará a la participante del grupo.'
+        are_you_sure: '¿Seguro? Esto no eliminará a la participante del grupo.'
         demote_admin: Eliminar permisos de administración
       demote:
         error: Se ha producido un error al eliminar esta participante de la lista de administradoras
@@ -823,7 +897,7 @@ es:
         error: Se ha producido un error al aceptar esta solicitud de incorporación al grupo
         success: Solicitud aceptada correctamente
       actions:
-        are_you_sure: '¿Estás seguro?'
+        are_you_sure: '¿Seguro?'
         promote_to_admin: Hacer administrador
         remove_from_group: Eliminar participante
       index:
@@ -840,7 +914,7 @@ es:
         success: Participante eliminada correctamente del grupo
     groups:
       actions:
-        are_you_sure: '¿Estás seguro?'
+        are_you_sure: '¿Seguro?'
       create:
         error: Se ha producido un error al crear el grupo
         success: Grupo creado correctamente
@@ -859,6 +933,7 @@ es:
         success: La solicitud para formar parte se ha enviado correctamente. Una administradora revisará tu solicitud antes de aceptarte en el grupo.
       leave:
         error: Se ha producido un error al dejar el grupo
+        last_admin: No puedes abandonar este grupo porque eres la última administradora. Haz administradora a otra persona miembro para poder hacerlo.
         success: Has dejado el grupo correctamente.
       members:
         accept_or_reject_join_requests: 'Las siguientes participantes han solicitado unirse a este grupo. Acepta o rechaza sus solicitudes:'
@@ -871,7 +946,7 @@ es:
       no_user_groups: Aún no perteneces a ningún grupo.
       roles:
         admin: Administradora
-        creator: Creadora
+        creator: Administradora
         member: Miembro
       update:
         error: Se ha producido un error al actualizar el grupo
@@ -896,7 +971,7 @@ es:
         body_1: Estás a punto de visitar un enlace externo y te recomendamos que seas prudente respecto al contenido de páginas externas.
         body_2: Por favor, antes de seguir, comprueba que el enlace que estás a punto de visitar pertenece a un sitio seguro.
         cancel: Cancelar
-        close_modal: Cerrar ventana
+        close_modal: Cierra modal
         proceed: Continuar
         title: Abrir enlace externo
     log:
@@ -905,9 +980,12 @@ es:
         create_with_space: "%{user_name} creó %{resource_name} en %{space_name}"
         delete: "%{user_name} eliminó %{resource_name}"
         delete_with_space: "%{user_name} eliminó %{resource_name} en %{space_name}"
+        publish_with_space: "%{user_name} ha publicado %{resource_name} en %{space_name}"
         unknown_action: "%{user_name} realizó una acción en %{resource_name}"
         unknown_action_with_space: "%{user_name} realizó una acción en %{resource_name} en %{space_name}"
+        unpublish_with_space: "%{user_name} ha despublicado %{resource_name} en %{space_name}"
         update: "%{user_name} actualizó %{resource_name}"
+        update_permissions_with_space: "%{user_name} ha actualizado los permisos de %{resource_name} en %{space_name}"
         update_with_space: "%{user_name} actualizó %{resource_name} en %{space_name}"
       value_types:
         area_presenter:
@@ -1028,7 +1106,7 @@ es:
     newsletter_mailer:
       newsletter:
         note: Has recibido este correo electrónico porque estás suscrita a boletines de noticias en %{organization_name}. Puedes cambiar la configuración en tu <a href="%{link}">página de notificaciones</a>.
-        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank">versión web</a>.'
+        see_on_website: '¿No puedes ver este correo electrónico correctamente? Accede a su <a href="%{link}" target="_blank" class="see-on-website">versión web</a>.'
         unsubscribe: Para desactivar la recepción este tipo de correo electrónico, <a href="%{link}" target="_blank" class="unsubscribe">unsubscríbete</a>.
     newsletter_templates:
       basic_only_text:
@@ -1080,23 +1158,47 @@ es:
       no_notifications: Aún no hay notificaciones.
       show:
         missing_event: Vaya, esta notificación pertenece a un elemento que ya no está disponible. Puedes descartarla.
+    notifications_digest_mailer:
+      header:
+        daily: Resumen diario de notificaciones
+        weekly: Resumen semanal de notificaciones
+      hello: Hola %{name},
+      intro:
+        daily: 'Estas son las notificaciones del último día basadas en la actividad que estás siguiendo:'
+        weekly: 'Estas son las notificaciones de la última semana basadas en la actividad que estás siguiendo:'
+      outro: Has recibido estas notificaciones porque sigues este contenido o a sus autoras. Puedes dejar de seguirlas desde sus respectivas páginas.
+      see_more: Ver más notificaciones
+      subject: Este es tu correo resumen
     notifications_settings:
       show:
         administrators: Administradoras
         allow_public_contact: Permitir que cualquiera me envíe un mensaje directo, incluso si no le sigo.
+        allow_push_notifications: Mostrar notificaciones emergentes para saber qué pasa cuando no estás en la plataforma. Puedes desactivarlas en cualquier momento.
         direct_messages: Recibir mensajes directos de cualquiera
-        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo por moderación.
-        email_on_notification: Quiero recibir un correo electrónico cada vez que reciba una notificación.
+        email_on_moderations: Quiero recibir un correo electrónico cada vez que se reporta algo o a alguien para moderación.
         everything_followed: Todo lo que sigo
         newsletter_notifications: Quiero recibir boletines informativos
         newsletters: Boletines informativos
+        notification_settings:
+          close_meeting_reminder: Quiero recibir recordatorios por correo electrónico de reuniones pasadas con informes sin publicar
+        notifications_sending_frequencies:
+          daily: Diariamente
+          none: Ninguna
+          real_time: En tiempo real
+          weekly: Semanalmente
+        notifications_sending_frequency: '¿Con qué frecuencia quieres recibir el correo resumen de notificaciones?'
         own_activity: Mi propia actividad, como cuando alguien comenta en mi propuesta o me menciona
+        push_notifications: Notificaciones emergentes
+        push_notifications_reminder: Para obtener notificaciones de la plataforma, primero tienes que permitirlas en la configuración de tu navegador.
         receive_notifications_about: Quiero recibir notificaciones
-        send_notifications_by_email: Enviar notificaciones por correo electrónico
         update_notifications_settings: Guardar cambios
       update:
         error: Se ha producido un error al actualizar la configuración de las notificaciones.
         success: La configuración de las notificaciones se ha actualizado correctamente.
+    offline:
+      show:
+        message: Parece que estás desconectada. Por favor, inténtalo de nuevo más tarde.
+        retry: Reintentar
     open_data:
       not_available_yet: Los ficheros Open Data aún no están disponibles, inténtalo de nuevo en unos minutos.
     own_user_groups:
@@ -1150,7 +1252,7 @@ es:
           agreement: Estoy de acuerdo con estos términos
           legend: Acepto los Términos y Condiciones de uso
         refuse:
-          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{data_portability_path}">descargar tus datos</a> y / o <a href="%{delete_path}">eliminar tu cuenta</a>.
+          modal_body: Si no aceptas, no podrás utilizar la plataforma, puedes <a href="%{download_your_data_path}">descargar tus datos</a> y/o <a href="%{delete_path}">eliminar tu cuenta</a>.
           modal_btn_continue: Aceptar los términos y continuar
           modal_btn_exit: Lo revisaré más tarde
           modal_button: Rechazar los términos
@@ -1162,6 +1264,10 @@ es:
           title: 'Obligatorio: revisa las actualizaciones de nuestros Términos de Servicio'
     participatory_space_private_users:
       not_allowed: No tienes permiso para visualizar este contenido
+    passwords:
+      update:
+        error: Ha habido un problema al actualizar la contraseña
+        success: Contraseña actualizada correctamente
     profile:
       deleted: Participante eliminada
       inaccessible_message: '¡Este perfil es inaccesible debido a la violación de Términos y Condiciones de uso!'
@@ -1219,7 +1325,7 @@ es:
     reports:
       create:
         error: Se ha producido un error al denunciar el contenido. Por favor, inténtalo otra vez.
-        success: El contenido se ha denunciado con éxtio y será revisado por una administradora.
+        success: El contenido se ha denunciado con éxito y será revisado por una administradora.
     resource_endorsements:
       create:
         error: Se ha producido un error durante la acción de adhesión.
@@ -1306,6 +1412,8 @@ es:
         close_modal: Cerrar el modal
         please_sign_in: Por favor, inicia sesión
         sign_up: Regístrate
+      mentions_modal:
+        remove_recipient: Eliminar destinataria %{name}
       participatory_space_filters:
         filters:
           areas: �reas
@@ -1393,6 +1501,7 @@ es:
       notify:
         body_1: La usuaria %{user} ha sido reportada por %{token}
         body_2: 'Motivo: %{reason}'
+        details: Datos proporcionados por la usuaria
         greetings: Saludos,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hola %{admin},
         subject: Una nueva usuaria ha sido reportada en %{organization_name}
@@ -1453,7 +1562,7 @@ es:
     invitations:
       edit:
         header: Termina de crear tu cuenta
-        nickname_help: Tu alias en %{organization}.
+        nickname_help: Tu alias en %{organization}. Solo puede contener letras, números, '-' y '_'.
         submit_button: Guardar
         subtitle: Si aceptas la invitación, por favor establece tu alias y contraseña.
       invitation_removed: Se ha eliminado tu invitación.
@@ -1519,10 +1628,11 @@ es:
     passwords:
       edit:
         change_my_password: Cambiar mi contraseña
-        change_your_password: Cambia tu contraseña
         confirm_new_password: Confirmar la nueva contraseña
         new_password: Nueva contraseña
         password_help: "%{minimun_characters} caracteres mínimos, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu apodo y tu correo electrónico."
+        password_help_admin: "%{minimun_characters} caracteres como mínimo, no debe ser demasiado común (por ejemplo, 123456) y debe ser diferente de tu alias, correo electrónico y antiguas contraseñas."
+        title: Cambio de contraseña
       new:
         forgot_your_password: '¿Olvidaste tu contraseña?'
         send_me_reset_password_instructions: Envíame instrucciones para restablecer la contraseña
@@ -1570,6 +1680,7 @@ es:
       public: Tu información pública
   errors:
     messages:
+      allowed_file_content_types: 'solo se permiten archivos con las siguientes extensiones: %{types}'
       already_confirmed: ya fue confirmado, por favor intenta iniciar sesión
       confirmation_period_expired: se tiene que confirmar dentro de %{period}, por favor solicita uno nuevo
       content_type_allowlist_error: el tipo de archivo no es válido
@@ -1587,7 +1698,7 @@ es:
         other: 'Hubo varios errores al procesar tu solicitud:'
       too_many_marks: Estás usando demasiados signos de puntuación consecutivos (por ejemplo,! y?)
       too_much_caps: Está usando demasiadas letras mayúsculas (más del 25% del texto)
-      too_short: Es demasiado corto (menos %{count} caracteres)
+      too_short: es demasiado corto (menos %{count} caracteres)
   forms:
     correct_errors: Hay errores en el formulario, por favor corrígelos para continuar.
     length_validator:
@@ -1601,14 +1712,60 @@ es:
     timestamp_error_message: Lo siento, has sido demasiado rápido! Por favor, vuelve a enviar.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este sitio web utiliza cookies propias y de terceros para mejorar la experiencia de navegación, y ofrecer contenidos y servicios de interés. Al continuar la navegación entendemos que aceptas nuestra política de cookies. Para más información consulta %{link}.
-        link_label: aquí
-        ok: Estoy de acuerdo
+      data_consent:
+        details:
+          columns:
+            description: Descripción
+            name: Nombre
+            service: Servicio
+            type: Tipo
+          items:
+            _session_id:
+              description: Permite a los sitios web recordar a la usuaria dentro de un sitio web cuando se mueve entre páginas web.
+              service: Esta página web
+            decidim-consent:
+              description: Almacena información sobre las cookies permitidas por la usuaria en esta página web.
+              service: Esta página web
+            pwaInstallPromptSeen:
+              description: Guarda el estado si la notificación de instalación de la aplicación web progresiva (PWA) ya ha sido vista por la usuaria.
+              service: Esta página web
+          types:
+            cookie: Cookie
+            local_storage: Almacenamiento local
+        dialog:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          description: Utilizamos cookies en nuestro sitio web para mejorar el rendimiento y el contenido del mismo. Las cookies nos permiten ofrecer una experiencia de usuario y unos contenidos más personalizados desde nuestros canales de redes sociales.
+          settings: Configuración
+          title: Información sobre las cookies utilizadas en la página web
+        modal:
+          accept_all: Aceptar todas
+          accept_only_essential: Aceptar solo las esenciales
+          analytics:
+            description: Estas cookies se utilizan para medir y analizar la audiencia del sitio web para ayudar a mejorarlo.
+            title: Analíticas y estadísticas
+          description: Utilizamos cookies para asegurar las funcionalidades básicas del sitio web y para mejorar tu experiencia en línea. Puedes configurar y aceptar el uso de las cookies, y modificar tus opciones de consentimiento en cualquier momento.
+          essential:
+            description: Estas cookies permiten la funcionalidad clave del sitio web y ayudan a mantener a sus usuarias seguras. Se guardan automáticamente en el navegador y no se pueden desactivar.
+            title: Esenciales
+          marketing:
+            description: Estas cookies recopilan información sobre cómo utilizas el sitio web y se pueden utilizar para proporcionarte un servicio más personalizado en los diferentes espacios en los que participas.
+            title: Marketing
+          preferences:
+            description: Estas cookies permiten que el sitio web recuerde las opciones que se han elegido en el pasado en este sitio web para proporcionar una experiencia más personalizada a las usuarias.
+            title: Preferencias
+          save_settings: Guardar configuración
+          title: Configuración de cookies
+          toggle: Cambiar %{consent_category}
+        warning:
+          all_categories: todas las cookies
+          change_settings: Cambiar la configuración de cookies
+          consent_required: Necesitas habilitar %{categories} para ver este contenido.
       edit_link:
         edit: Edita
       footer:
         cc_by_license: Con licencia Creative Commons
+        data_consent_settings: Configuración de cookies
         decidim_logo: Logo Decidim
         download_open_data: Descargar ficheros de datos abiertos
         made_with_open_source: Web creada con <a target="_blank" href="https://github.com/decidim/decidim">software libre</a>.
@@ -1628,6 +1785,8 @@ es:
       notifications_dashboard:
         mark_all_as_read: Marcar todo como leído
         mark_as_read: Marcar como leído
+      offline_banner:
+        cache_version_page: '¡Ups! Tu red está desconectada. Esta es una versión en caché de la página que estás visitando, quizás el contenido no está actualizado.'
       social_media_links:
         facebook: "%{organization} en Facebook"
         github: "%{organization} en GitHub"
@@ -1639,6 +1798,8 @@ es:
         continue_session: Continuar sesión
         sign_out: Cerrar sesión
         title: '¿Quieres continuar con la sesión?'
+      upload_modal:
+        close_modal: Cerrar ventana
       user_menu:
         account: 'Cuenta de usuario: %{name}'
         admin_dashboard: Tablero de administración
@@ -1671,6 +1832,7 @@ es:
     nickname_included_in_password: es demasiado similar a tu alias
     not_enough_unique_characters: no tiene suficientes caracteres únicos
     password_not_allowed: no está permitido
+    password_repeated: no puedes reutilizar una contraseña antigua
     password_too_common: es demasiado común
     password_too_long: es demasiado largo
     password_too_short: es demasiado corto
diff --git a/decidim-core/config/locales/eu.yml b/decidim-core/config/locales/eu.yml
index c929953bc14c7..924393de7f21d 100644
--- a/decidim-core/config/locales/eu.yml
+++ b/decidim-core/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -6,12 +7,12 @@ eu:
       common:
         created_at: Sortze-data
       conversation:
-        body: Gorputza
+        body: Testua
       group:
         about: Honi buruz
-        avatar: Avatar
-        document_number: Dokumentuaren zenbakia
-        email: E-maila
+        avatar: Abatarra
+        document_number: Dokumentu-zenbakia
+        email: Helbide elektronikoa
         name: Izena
         nickname: Goitizena
         phone: Telefonoa
@@ -20,7 +21,7 @@ eu:
       report:
         details: Iruzkin gehigarriak
       user:
-        about: About
+        about: Honi buruz
         email: Zure helbide elektronikoa
         name: Zure izena
         nickname: Ezizena
@@ -30,10 +31,11 @@ eu:
         remove_avatar: Kendu avatar-a
     models:
       decidim/attachment_created_event: eranskina
-      decidim/component_published_event: Osagai aktiboa
+      decidim/component_published_event: Osagai erabilgarria
       decidim/demoted_membership: Ez da talde admin gehiago
       decidim/gamification/badge_earned_event: Badge irabazi
       decidim/gamification/level_up_event: Berdindu duzu
+      decidim/invited_to_group_event: Taldera gonbidatuta
       decidim/join_request_accepted_event: Erregistratu eskaera onartua
       decidim/join_request_rejected_event: Erregistratu eskaera baztertu da
       decidim/profile_updated_event: Profila eguneratu da
@@ -64,7 +66,6 @@ eu:
     'true': 'Bai'
   carrierwave:
     errors:
-      image_too_big: Irudia pisuegia da
       not_inside_organization: Artxiboa ez dago antolatzaile batekin erlazionatuta
   date:
     formats:
@@ -73,12 +74,6 @@ eu:
       decidim_with_day_and_month_name: "%A %d %b %Y"
       decidim_with_month_name: "%d %B %Y"
       decidim_with_month_name_short: "%d %b"
-  datetime:
-    distance_in_words:
-      x_seconds:
-        one: Orain dela segundu 1
-        other: "Orain dela %{count} segundu"
-        zero: orain
   decidim:
     accessibility:
       external_link: Kanpoko lotura
@@ -86,9 +81,6 @@ eu:
       skip_button: Joan eduki nagusira
     account:
       blocked: Kontu hau blokeatu da erabilera-irizpideak eta baldintzak urratzeagatik
-      data_portability_export:
-        file_no_exists: Fitxategia ez dago
-        notice: Zure datuak une honetan egiten ari dira. Mezu elektroniko bat jasoko duzu beteta dagoenean.
       delete:
         alert: Ekintza hori ezin da desegin. Zure kontua ezabatzen baduzu, ezin izango duzu saioa hasi zure kredentzialekin. Zure kontua ezabatzeak zure ekarpenen anonimotasuna ekarriko du. Oraindik kontu berri bat sortu ahal izango duzu, baina ekarpen horiek ez dira kontu horrekin lotuko.
         confirm:
@@ -100,8 +92,10 @@ eu:
       destroy:
         error: Errore bat gertatu da zure kontua ezabatzean.
         success: Zure kontua ezabatu egin da.
+      download_your_data_export:
+        file_no_exists: Fitxategia ez dago
+        notice: Zure datuak une honetan egiten ari dira. Mezu elektroniko bat jasoko duzu beteta dagoenean.
       show:
-        available_locales_helper: Aukeratu zein hizkuntza erabili nahi duzun Decidimen nabigatzeko eta jakinarazpenak jasotzeko
         change_password: Aldatu pasahitza
         update_account: Eguneratu kontua
       update:
@@ -169,7 +163,7 @@ eu:
       user_moderation:
         unreport: "%{user_name} desegin du %{resource_type} - %{unreported_user_name} erreportea"
     admin_terms_of_use:
-      default_body: "<h2>TÉRMINOS ADMIN DE USO</h2><p>Sistemaren tokiko administratzailearen ohiko azalpena jaso duzulakoan gaude. Oro har, hiru gauza hauetara mugatzen da:</p><ol><li>Besteen pribatutasuna errespetatzea.</li><li>Klikatu aurretik pentsatu.</li><li>Botere handiak erantzukizun handia dakar.</li></ol>"
+      default_body: "<h2>TERABILTZEKO ADMINISTRAZIOAREN BALDINTZAK</h2><p>Sistemaren tokiko administratzailearen ohiko azalpena jaso duzulakoan gaude. Oro har, hiru gauza hauetara mugatzen da:</p><ol><li>Besteen pribatutasuna errespetatzea.</li><li>Klikatu aurretik pentsatu.</li><li>Botere handiak erantzukizun handia dakar.</li></ol>"
     alert:
       dismiss: Baztertu jakinarazpena
     amendments:
@@ -340,7 +334,7 @@ eu:
           request_confirmation_instructions: Eska ezazu berrespen-argibideak
           title: Berretsi zure posta elektronikoa
       show:
-        close_modal: Itxi leihoa
+        close_modal: Itxi modal
     block_user_mailer:
       notify:
         body_1: Zure kontua blokeatu egin da.
@@ -378,8 +372,8 @@ eu:
             amendments_enabled: Emendakinak gaituta
             comments_enabled: Iruzkinak gaituta
             comments_max_length: Iruzkinen gehieneko luzera
-            dummy_global_attribute_1: Dummy Atributua 1
-            dummy_global_attribute_2: Dummy Attribute 2
+            dummy_global_attribute1: Dummy Atributua 1
+            dummy_global_attribute2: Dummy Attribute 2
             dummy_global_translatable_text: Itzul daitekeen adibidearen testua
             enable_pads_creation: Gaitu pads sortzea
             resources_permissions_enabled: Baliabideen baimenak gaituta
@@ -391,8 +385,8 @@ eu:
             amendment_reaction_enabled: Zuzenketaren erreakzioa aktibatuta
             amendments_visibility: Zuzenketaren ikusgarritasuna
             comments_blocked: Iruzkinak blokeatuta
-            dummy_step_attribute_1: Dummy Step Attribute 1
-            dummy_step_attribute_2: Dummy Step Attribute 2
+            dummy_step_attribute1: Dummy Step Attribute 1
+            dummy_step_attribute2: Dummy Step Attribute 2
             dummy_step_translatable_text: Itzul daitekeen adibidearen fasea
     contact: Harremanetarako
     content_blocks:
@@ -436,12 +430,6 @@ eu:
       actions:
         login_before_access: Mesedez, sartu baino lehen hasi saioa zure kontuarekin
         unauthorized: Ez duzu baimenik ekintza honi heltzeko.
-    data_portability:
-      export:
-        ready: prest
-      show:
-        download_data: Deskargatu datuak
-        request_data: Eskaera datuak
     datepicker:
       help_text: 'Espero den formatua: %{datepicker_format}'
     devise:
@@ -504,6 +492,12 @@ eu:
           this_application_will_not_be_able_to: 'Aplikazio honek ezin izango du:'
           update_profile: Eguneratu profila
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> zure kontua erabili nahi du"
+    download_your_data:
+      export:
+        ready: prest
+      show:
+        download_data: Deskargatu datuak
+        request_data: Eskaera datuak
     editor_images:
       create:
         error: Arazoa irudia eguneratzean
@@ -669,7 +663,7 @@ eu:
           email_subject: "%{nickname} profilean eguneratu dute"
           notification_title: <a href="%{resource_path}">profile orriaren 1233_4_1_321 %{name} (%{nickname}) jarraitzen ari zarenean, eguneratu egin da.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Egin klik hurrengo loturan zure datuak deskargatzeko. <br/>Artxiboa eskuragai egongo da data honetara arte %{date}.<br/>Irekitzeko beharko duzu <a href="https://www.7-zip.org/">7-Zip</a> (Windowserako), <a href="https://www.keka.io/en/">Keka</a> (para MacOS) o <a href="https://peazip.github.io">PeaZip</a> (Linuxerako). Pasahitza: %{password}'
         download: Deskarga
       export:
@@ -705,7 +699,6 @@ eu:
         button: Jarraitzeari utzi
         error: Errorea gertatu da baliabide hau jarraitzeari uztean.
     forms:
-      current_file: Oraingo fitxategia
       current_image: Oraingo irudia
       default_image: Irudi lehenetsia
       errors:
@@ -717,7 +710,6 @@ eu:
         file:
           explanation: 'Jarraibideak artxiborako:'
           message_1: Irudi bat edo dokumentu bat izan behar da.
-          message_2: Irudietarako, ahal izanez gero, erabili irudi etzanak, zerbitzuak irudia moztu egiten baitu. CSV artxiboetarako zutabeen arteko banatzailea koma bat izan behar da (",")
         image:
           explanation: 'Jarraibideak irudirako:'
           message_1: Ahal izanez gero, irudi etzana eta testurik gabekoa.
@@ -725,7 +717,11 @@ eu:
       file_validation:
         allowed_file_extensions: 'Onartutako artxiboen formatua: %{extensions}'
         max_file_size: 'Artxiboaren gehieneko tamaina: %{megabytes}MB'
-      remove_this_file: Ezabatu artxibo hau
+      files:
+        extension_allowlist: 'Onartutako formatuak: %{extensions}'
+      upload:
+        labels:
+          add_file: Gehitu fitxategiak
     gamification:
       all_badges_link: Ikusi eskuragarri dauden txapak.
       badges:
@@ -826,7 +822,6 @@ eu:
       no_user_groups: Oraindik ez da talde batekoa.
       roles:
         admin: Administrator
-        creator: Sortzailea
         member: kidea
       update:
         error: Arazo bat izan da taldea eguneratzean
@@ -848,10 +843,10 @@ eu:
     links:
       invalid_url: URL baliogabea
       warning:
-        body_1: Kanpoko lotura bat bisitatuko duzu eta eskatzen dizugu zuhurra izatea kanpoko orrialdeen edukiarekin.
+        body_1: Kanpoko lesteka bat bisitatuko duzu eta eskatzen dizugu zuhurra izatea kanpoko orrialdeen edukiarekin.
         body_2: Mesedez, jarraitu aurretik, egiaztatu bisitatuko duzun lotura leku seguru batena dela.
         cancel: Utzi
-        close_modal: Itxi leihoa
+        close_modal: Itxi modal
         proceed: Jarraitu
         title: Ireki kanpoko lotura
     log:
@@ -981,22 +976,21 @@ eu:
     newsletter_mailer:
       newsletter:
         note: 'Mezu hau jaso duzu albiste-buletinean harpidetuta zaudelako hemen: %{organization_name}. Ezarpenak aldatu ditzakezu zure <a href="%{link}">jakinarazpen-orrian</a>.'
-        see_on_website: Ezin da mezu hau zuzenean ikusi? Ikusi <a href="%{link}" target="_blank">website</a> orrian.
         unsubscribe: Mezu mota hau jasotzeko ez onartzeko, <a href="%{link}" target="_blank" class="unsubscribe"> Harpidetu</a>.
     newsletter_templates:
       basic_only_text:
-        body_preview: 'Alegiazko testua gorputzerako: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu".'
+        body_preview: 'Alegiazko testua: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu".'
         name: Oinarrizkoa (testua soilik)
       basic_only_text_settings_form:
-        body: Gorputza
+        body: Testua
         interpolations_hint: 'Iradokizuna: "%{name}" erabil dezakezu gaiaren edo testuaren edozein tokitan, eta horren ordez hartzailearen izena agertuko da.'
       image_text_cta:
-        body_preview: 'Alegiazko testua gorputzerako: Maecenas ac nisl vitae lectus pretium facilisis. Etiam facilisis sem nibh, sit amet rutrum mi aliquam nec. Sed id urna at nisl pretium mollis eu vel velit. Proin vitae suscipit urna, sed faucibus urna. Pellentesque id libero vulputate ipsum scelerisque suscipit. Nam aliquam sodales mi sit amet cursus. Donec mattis faucibus purus. Aenean tincidunt porta lorem ac commodo. Vestibulum in mollis mi. Morbi eros erat, cursus ut tortor sit amet, imperdiet dapibus arcu. Suspendisse id egestas enim. In eget magna sed enim efficitur elementum sit amet aliquam quam. Donec fermentum metus eget urna luctus pulvinar.'
+        body_preview: 'Alegiazko testua: Maecenas ac nisl vitae lectus pretium facilisis. Etiam facilisis sem nibh, sit amet rutrum mi aliquam nec. Sed id urna at nisl pretium mollis eu vel velit. Proin vitae suscipit urna, sed faucibus urna. Pellentesque id libero vulputate ipsum scelerisque suscipit. Nam aliquam sodales mi sit amet cursus. Donec mattis faucibus purus. Aenean tincidunt porta lorem ac commodo. Vestibulum in mollis mi. Morbi eros erat, cursus ut tortor sit amet, imperdiet dapibus arcu. Suspendisse id egestas enim. In eget magna sed enim efficitur elementum sit amet aliquam quam. Donec fermentum metus eget urna luctus pulvinar.'
         cta_text_preview: Ekintza-botoiaren testua
         introduction_preview: 'Alegiazko testua sarrerarako: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu".'
         name: Irudia, testua eta ekintza-botoia
       image_text_cta_settings_form:
-        body: Gorputza
+        body: Testua
         cta_text: Ekintza-botoiaren testua
         cta_url: Ekintza-botoiaren URLa
         interpolations_hint: 'Iradokizuna: "%{name}" erabil dezakezu sarreraren, gorputzaren, ekintza-botoiaren testuaren edo gaiaren edozein lekutan, eta horren ordez erabiltzailearen izena agertuko da.'
@@ -1018,7 +1012,7 @@ eu:
       notify:
         body_1: Datu pertsonalen tratamendua eta babesak gero eta garrantzi handiagoa hartzen ari dira guztiontzat. 2018ko maiatzaren 25eko Datuen Babeserako Datu Orokor berriaren (GDPR) datu pertsonalak hobeto kontrolatzen ditu. Horregatik, "OK" behar dugu, %{organization_name}jardueren inguruko informazio garrantzitsua bidaltzen jarraitzeko.
         body_2: 'Nola eman dezakezun zure baimena? Egin klik botoi honetan:'
-        body_3: Baimen honekin plataformaren zerbitzuei buruzko informazioa jasotzen jarraitu ahal izango duzu. Aitzitik, ez badugu baieztapen positiboa jasoko, zure mezuak bidaltzen jarraituko dugu. Jakinarazten jarraitu nahi duzula baieztatzen baduzu, edonoiz bertan behera uzteko aukera izango duzu beti.
+        body_3: Baimen honekin plataformako zerbitzuei buruzko informazioa jasotzen jarraitu ahal izango duzu. Aitzitik, zure baieztapena jasotzen ez badugu, gure mezuak bidaltzeari utziko diogu. Informatuta egon nahi duzula baieztatzen baduzu, edozein unetan ezeztatzeko aukera izango duzu.
         button: Bai, informazio garrantzitsua jasotzen jarraitu nahi dut
         greetings: Agurrak,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Kaixo,
@@ -1030,14 +1024,11 @@ eu:
         administrators: Administratzaileak
         allow_public_contact: Baimentzea edonork bidali diezadala mezu zuzena, nahiz eta nik jarraitu ez.
         direct_messages: Edonoren mezu zuzenak jasotzea
-        email_on_moderations: Mezu elektroniko bat jaso nahi dut zerbait neurriz erreportatzen den bakoitzean.
-        email_on_notification: Mezu elektroniko bat jaso nahi dut jakinarazpen bat jasotzen dudan bakoitzean.
         everything_followed: Jarraitzen dudan guztia
         newsletter_notifications: Buletinak jaso nahi ditut
         newsletters: Buletinak
         own_activity: Nire jarduera, norbaiti nire proposamena iruzkindu edo aipatzen dudanean
         receive_notifications_about: Jakinarazpenak jaso nahi ditut
-        send_notifications_by_email: Bidali jakinarazpenak posta elektronikoz
         update_notifications_settings: Gorde aldaketak
       update:
         error: Errore bat gertatu da jakinarazpenen konfigurazioa eguneratzean.
@@ -1095,7 +1086,6 @@ eu:
           agreement: Ados nago irizpide hauekin
           legend: Erabiltzeko baldintzak eta baldintzak onartzen dituzu
         refuse:
-          modal_body: Uko egiten baduzu, ezin izango duzu plataforman erabiltzeko gai, ezin duzu <a href="%{data_portability_path}">deskargatu zure datu</a> edo / <a href="%{delete_path}">zure kontua ezabatu</a>.
           modal_btn_continue: Baldintzak onartu eta jarraitu
           modal_btn_exit: Berriro berrikusiko dut geroago
           modal_button: Ezetsi terminoak
@@ -1289,9 +1279,6 @@ eu:
       help_text: "<strong>Oharra:</strong> Edukia automatikoki itzul daiteke eta ez izan zuzena %100ean."
       show_original: Erakutsi jatorrizko testua
       show_translated: Erakutsi automatikoki itzulitako testua
-    user_activity:
-      index:
-        no_activities_warning: Erabiltzaile honek ez du oraindik jarduera izan.
     user_contact_disabled: Parte-hartzaile honek ez du mezu zuzenik onartzen.
     user_conversations:
       create:
@@ -1328,14 +1315,14 @@ eu:
       show:
         my_interests: Nire interesak
         no_scopes: Antolakuntza honek ez du inongo esparrurik!
-        select_your_interests: Aukeratu interesatzen zaizkizun gaiak zure profileko Timeline fitxan erlazionatutako gertaerak jasotzeko.
+        select_your_interests: Aukeratu interesatzen zaizkizun gaiak zure profileko denbora lerroan.
         update_my_interests: Eguneratu nire interesak
       update:
         error: Errore bat gertatu da zure interesak eguneratzean.
         success: Zure interesak ondo eguneratu dira.
     user_report_mailer:
       notify:
-        body_1: '%{user} erabiltzailea %{token} k erreportatu du'
+        body_1: '%{user} erabiltzailea %{token}-ek erreportatu du'
         body_2: 'Arrazoia: %{reason}'
         greetings: Agur, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Kaixo, %{admin},
@@ -1397,7 +1384,6 @@ eu:
     invitations:
       edit:
         header: Amaitu zure kontua sortzea
-        nickname_help: Zure identifikadore bakarra %{organization} zenbakian.
         submit_button: Gorde
         subtitle: Gonbidapena onartzen baduzu, ezarri zure ezizena eta pasahitza.
       invitation_removed: Zure gonbidapena kendu egin da.
@@ -1464,9 +1450,10 @@ eu:
     passwords:
       edit:
         change_my_password: Aldatu nire pasahitza
-        change_your_password: Aldatu zure pasahitza
         confirm_new_password: Berretsi pasahitz berria
         new_password: Pasahitza
+        password_help: "%{minimun_characters} karaktere minimo, ez da oso arrunta izan behar (adibidez, 123456) eta zure ezizena eta posta elektronikoa desberdinak izan behar dira."
+        password_help_admin: "%{minimun_characters} karaktere minimo, ez da oso arrunta izan behar (adibidez, 123456), zure ezizena eta posta elektronikoa desberdinak izan behar dira eta zure pasahitz zaharrak ez bezalakoak izan behar dute."
       new:
         forgot_your_password: Zure pasahitza ahaztu duzu?
         send_me_reset_password_instructions: Bidali berrezarri pasahitzaren argibideak
@@ -1514,6 +1501,7 @@ eu:
       public: Zure informazio publikoa.
   errors:
     messages:
+      allowed_file_content_types: 'soilik onartuko dira honako hedapenak: %{types}'
       already_confirmed: dagoeneko baieztatu da. Saiatu saioa hasi
       confirmation_period_expired: '%{period}barruan baieztatu behar da, eskatu beste bat'
       content_type_allowlist_error: fitxategiaren mota ez da baliozkoa
@@ -1521,7 +1509,7 @@ eu:
       expired: iraungi egin da, eskatu beste bat
       file_size_is_less_than_or_equal_to: fitxategiaren pisuak %{count} izan behar du, edo gutxiago
       invalid_time_zone: ordu-zona ez da baliozkoa
-      long_words: luzeegia daukaten hitzak (35 karaktere baino gehiago)
+      long_words: luzeegiak diren hitzak ditu (35 karaktere baino gehiago)
       must_start_with_caps: letra maiuskulaz hasi behar da
       nesting_too_deep: ezin da egon azpikategoria batean
       not_found: ezin izan da aurkitu. Aldez aurretik erregistratu zara?
@@ -1541,10 +1529,6 @@ eu:
     timestamp_error_message: Barkatu, baina azkarregi aritu zara! Mesedez, bidali.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: 'Webgune honek bere cookieak eta hirugarrenenak erabiltzen ditu, nabigazioa hobetu eta intereseko edukiak eta zerbitzuak eskaintze aldera. Nabigatzen jarraituz gero, gure cookie-politika onartzen delakoan gaude. Argibide gehiago jasotzeko, kontsultatu hemen: %{link}.'
-        link_label: hemen
-        ok: Ados nago
       edit_link:
         edit: Editatu
       footer:
diff --git a/decidim-core/config/locales/fi-plain.yml b/decidim-core/config/locales/fi-plain.yml
index 8c8f907f2d136..88c9f555b6d26 100644
--- a/decidim-core/config/locales/fi-plain.yml
+++ b/decidim-core/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ fi-pl:
     'true': 'Kyllä'
   carrierwave:
     errors:
-      image_too_big: Kuva on liian suuri
+      file_resolution_too_large: Tiedoston resoluutio on liian suuri
+      file_size_too_large: Tiedoston koko on liian suuri
       not_inside_organization: Tiedostoa ei ole liitetty mihinkään organisaatioon
   date:
     formats:
@@ -110,7 +112,6 @@ fi-pl:
       x_seconds:
         one: sekunti sitten
         other: "%{count} sekuntia sitten"
-        zero: juuri nyt
   decidim:
     accessibility:
       external_link: Ulkoinen linkki
@@ -119,9 +120,6 @@ fi-pl:
       skip_button: Siirry sisältöön
     account:
       blocked: Tämä käyttäjätili on estetty, koska käyttäjä ei noudattanut käyttöehtoja
-      data_portability_export:
-        file_no_exists: Tiedostoa ei ole olemassa
-        notice: Tietojen vienti on käynnissä. Saat sähköpostiviestin, kun se valmistuu.
       delete:
         alert: Tätä toimintoa ei voi peruuttaa. Jos poistat tilisi, et voi enää kirjautua sisään tunnuksillasi. Tilisi poiston yhteydessä nimesi ja tietosi poistuvat kaikkien laatimiesi asioiden yhteydestä. Voit kuitenkin aina luoda uuden tilin, mutta näitä aikaisemmin laadittuja asioita ei voida enää jälkikäteen liittää uuteen tiliisi.
         confirm:
@@ -133,8 +131,21 @@ fi-pl:
       destroy:
         error: Tilin poistossa tapahtui virhe.
         success: Tilisi poistaminen onnistui.
+      download_your_data_export:
+        file_no_exists: Tiedostoa ei ole olemassa
+        notice: Tietojen vienti on käynnissä. Saat sähköpostiviestin, kun se valmistuu.
+      email_change:
+        body1: Olemme lähettäneet viestin osoitteeseen %{unconfirmed_email} vahvistaaksemme uuden sähköpostiosoitteesi.
+        body2: Haluatko tilata vahvistussähköpostin uudestaan? %{resend_link} tai %{cancel_link}.
+        cancel: peruuta
+        cancel_error: Sähköpostin muutosta ei voitu peruuttaa.
+        cancel_successfully: Sähköpostin muuttamisen peruuttaminen onnistui.
+        resend_error: Vahvistussähköpostia ei voitu lähettää uudestaan.
+        resend_successfully: Vahvistussähköpostin lähetys osoitteeseen %{unconfirmed_email} onnistui
+        send_again: Lähetä uudestaan
+        title: Sähköpostin muuttamisen vahvistus
       show:
-        available_locales_helper: Valitse kieli, jota haluat käyttää selataksesi Decidimiä ja vastaanottaaksesi ilmoituksia
+        available_locales_helper: Valitse haluamasi kieli alustan käyttämiseen ja ilmoitusten vastaanottamiseen
         change_password: Vaihda salasana
         update_account: Päivitä tili
       update:
@@ -144,16 +155,44 @@ fi-pl:
     admin:
       actions:
         cancel: Peruuta
+      password_change:
+        alert: Sinun täytyy vaihtaa salasanasi, jotta voit jatkaa eteenpäin
+        notification: Hallintakäyttäjien on vaihdettava salasanansa %{days} päivän välein.
     admin_log:
       area:
         create: "%{user_name} loi %{resource_name} alueen"
         delete: "%{user_name} poisti %{resource_name} -alueen"
         update: "%{user_name} päivitti %{resource_name} -alueen"
+      area_type:
+        create: "%{user_name} loi aluetyypin %{resource_name}"
+        delete: "%{user_name} poisti aluetyypin %{resource_name}"
+        update: "%{user_name} päivitti aluetyyppiä %{resource_name}"
+      attachment:
+        create: "%{user_name} loi liitteen %{resource_name}"
+        delete: "%{user_name} poisti liitteen %{resource_name}"
+        update: "%{user_name} päivitti liitettä %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} loi liitekansion %{resource_name}"
+        delete: "%{user_name} poisti liitekansion %{resource_name}"
+        update: "%{user_name} päivitti liitekansiota %{resource_name}"
+      category:
+        create: "%{user_name} lisäsi aihepiirin %{resource_name} tilaan %{space_name}"
+        delete: "%{user_name} poisti aihepiirin %{resource_name} tilasta %{space_name}"
+        update: "%{user_name} päivitti aihepiiriä %{resource_name} tilassa %{space_name}"
       component:
         create: "%{user_name} lisäsi %{resource_name} -komponentin %{space_name} -tilaan"
         delete: "%{user_name} poisti %{resource_name} -komponentin %{space_name} -tilasta"
+        export_component: "%{user_name} vei komponentin %{component_name} %{resource_name} tilassa %{space_name} tiedostomuodossa %{format_name}"
         publish: "%{user_name} julkaisi %{resource_name} -komponentin %{space_name} -tilassa"
         unpublish: "%{user_name} lopetti %{resource_name} -komponentin julkaisemisen %{space_name} -tilassa"
+        update_permissions_with_space: "%{user_name} päivitti oikeuksia kohteessa %{resource_name} tilassa %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} päivitti ohjeosiota %{resource_name}"
+      helpers:
+        answers: vastaukset
+        comments: kommentit
+        projects: projektit
+        results: tulokset
       impersonation_log:
         manage: "%{user_name} hallinnoi käyttäjää %{resource_name}, koska %{reason}"
       moderation:
@@ -170,6 +209,7 @@ fi-pl:
         update: "%{user_name} päivitti %{resource_name} OAuth-sovellusta"
       organization:
         update: "%{user_name} päivitti organisaation asetuksia"
+        update_external_domain: "%{user_name} päivitti organisaation ulkoisia verkkotunnuksia"
       participatory_space_private_user:
         create: "%{user_name} kutsui %{resource_name} yksityiseksi käyttäjaksi"
         create_via_csv: "%{user_name} kutsui yksityisen osallistujan %{resource_name} CSV-tuonnin kautta"
@@ -181,6 +221,10 @@ fi-pl:
         delete_with_parent: "%{user_name} poisti %{resource_name} teeman %{parent_scope} teeman alta"
         update: "%{user_name} päivitti %{resource_name} teemaa"
         update_with_parent: "%{user_name} päivitti %{resource_name} teemaa %{parent_scope} teeman alla"
+      scope_type:
+        create: "%{user_name} loi teematyypin %{resource_name}"
+        delete: "%{user_name} poisti teematyypin %{resource_name}"
+        update: "%{user_name} päivitti teematyyppiä %{resource_name}"
       static_page:
         create: "%{user_name} loi staattisen sivun %{resource_name}"
         delete: "%{user_name} poisti staattisen sivun %{resource_name}"
@@ -196,7 +240,9 @@ fi-pl:
         unblock: "%{user_name} poisti eston käyttäjältä %{resource_name}"
         unofficialize: "%{user_name} poisti käyttäjän %{resource_name} virallistamisen"
       user_group:
+        block: "%{user_name} esti käyttäjän %{resource_name}"
         reject: "%{user_name} hylkäsi käyttäjäryhmän %{resource_name} vahvistaminen"
+        unblock: "%{user_name} poisti eston käyttäjältä %{resource_name}"
         verify: "%{user_name} vahvisti käyttäjäryhmän %{resource_name}"
         verify_via_csv: "%{user_name} vahvisti käyttäjäryhmän %{resource_name} CSV-tiedoston avulla"
       user_moderation:
@@ -307,6 +353,7 @@ fi-pl:
       endorsements:
         one: suositus
         other: suositusta
+      official_author: Virallinen
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Vahvista tilisi syöttämällä passin numero, joka alkaa kirjaimella "A"
@@ -397,6 +444,7 @@ fi-pl:
           debate: Keskustelu
           initiative: Aloite
           meeting: Tapaaminen
+          order: Budjetointiääni
           post: Artikkeli
           proposal: Ehdotus
           question: Kysymys
@@ -411,8 +459,8 @@ fi-pl:
             amendments_enabled: Muutokset käytössä
             comments_enabled: Kommentit käytössä
             comments_max_length: Kommenttien maksimipituus
-            dummy_global_attribute_1: Esimerkkitietue 1
-            dummy_global_attribute_2: Esimerkkitietue 2
+            dummy_global_attribute1: Esimerkkitietue 1
+            dummy_global_attribute2: Esimerkkitietue 2
             dummy_global_translatable_text: Käännettävän tekstin esimerkki
             enable_pads_creation: Ota käyttöön muistioiden luominen
             resources_permissions_enabled: Resurssien käyttöoikeudet ovat käytössä
@@ -424,8 +472,8 @@ fi-pl:
             amendment_reaction_enabled: Reaktiot käytössä muutoksille
             amendments_visibility: Muutosten näkyvyys
             comments_blocked: Kommentit estetty
-            dummy_step_attribute_1: Esimerkkivaiheen tietue 1
-            dummy_step_attribute_2: Esimerkkivaiheen tietue 2
+            dummy_step_attribute1: Esimerkkivaiheen tietue 1
+            dummy_step_attribute2: Esimerkkivaiheen tietue 2
             dummy_step_translatable_text: Vaiheen käännettävän tekstin esimerkki
     contact: Ota yhteyttä
     content_blocks:
@@ -469,13 +517,6 @@ fi-pl:
       actions:
         login_before_access: Sinun täytyy kirjautua sisään, jotta kuin voit tarkastella tätä sisältöä
         unauthorized: Tiliäsi ei ole varmennettu tämän toiminnon suorittamiseen
-    data_portability:
-      export:
-        ready: Valmis
-      show:
-        download_data: Lataa tiedot
-        download_data_description: Tiedosto sisältää kaikki tiliisi liitetyt tiedot ja se lähetetään osoitteeseen <strong>%{user_email}</strong>. Kyseinen sähköposti sisältää .zip-tiedoston ja salasanan, jolla kyseisen tiedoston voi avata.<br/><br/>Purkaaksesi tiedoston, tarvitset <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille) tai <a href="https://www.keka.io/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille). Jos käytät Linux-käyttöjärjestelmää, useimmiten paketin avaamiseen tarvittava ohjelmisto on valmiiksi asennettuna järjestelmääsi. Jos näin ei kuitenkaan ole, voit käyttää <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller -ohjelmistoa</a> tai <a href="https://peazip.github.io">PeaZip-ohjelmistoa</a> paketin avaamiseen.
-        request_data: Pyydä tietoja
     datepicker:
       help_text: 'Odotettu muoto: %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ fi-pl:
           newsletter: Vastaanota silloin tällöin olennaista tietoa sisältävä uutiskirje
           newsletter_title: Yhteydenottolupa
           nickname_help: Nimimerkkisi palvelussa %{organization}. Voi sisältää ainoastaan kirjaimia, numeroita sekä yhdysmerkkejä "-" ja alaviivoja "_".
-          password_help: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi."
           sign_in: Kirjaudu sisään
           sign_up: Rekisteröidy
           sign_up_as:
@@ -543,6 +583,13 @@ fi-pl:
           this_application_will_not_be_able_to: 'Tämä sovellus ei voi:'
           update_profile: Päivittää profiiliasi
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> haluaa käyttää tiliäsi"
+    download_your_data:
+      export:
+        ready: Valmis
+      show:
+        download_data: Lataa tiedot
+        download_data_description: Tiedosto sisältää kaikki tiliisi liitetyt tiedot ja se lähetetään osoitteeseen <strong>%{user_email}</strong>. Kyseinen sähköposti sisältää .zip-tiedoston ja salasanan, jolla kyseisen tiedoston voi avata.<br/><br/>Purkaaksesi tiedoston, tarvitset <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille) tai <a href="https://www.keka.io/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille). Jos käytät Linux-käyttöjärjestelmää, useimmiten paketin avaamiseen tarvittava ohjelmisto on valmiiksi asennettuna järjestelmääsi. Jos näin ei kuitenkaan ole, voit käyttää <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller -ohjelmistoa</a> tai <a href="https://peazip.github.io">PeaZip-ohjelmistoa</a> paketin avaamiseen.
+        request_data: Pyydä tietoja
     editor_images:
       create:
         error: Kuvan lähettäminen epäonnistui
@@ -686,6 +733,8 @@ fi-pl:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet palvelun hallintakäyttäjä.
           email_subject: Ryhmä on päivittänyt profiiliaan
           notification_title: Ryhmä nimeltä %{user_group_name} on päivittänyt profiiliaan, jättäen ryhmän varmentamattomaksi. Voit varmentaa ryhmän <a href="%{groups_admin_path}">hallintapaneelin kautta</a>.
+      nickname_event:
+        notification_body: Olemme muuttaneet nimimerkkien sääntöjä varmistaaksemme, että alustalla ei ole useampaa tiliä samalla nimimerkillä eri tavalla kirjoitettuna. <br/> Tilisi on luotu toisen samaa nimimerkkiä käyttäneen henkilön jälkeen, joten olemme vaihtaneet nimimerkkiäsi automaattisesti. Halutessasi voit vaihtaa nimimerkkiäsi <a href="%{link_to_account_settings}">tilisi asetuksista</a>.
       notification_event:
         notification_title: Kohteelle <a href="%{resource_path}">%{resource_title}</a> järjestettiin tapahtuma.
       reports:
@@ -712,7 +761,7 @@ fi-pl:
           email_subject: "%{name} on virallistettu"
           notification_title: Osallistuja %{name} (%{nickname}) on virallistettu.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Napsauta Seuraava-linkkiä ladataksesi tietosi.<br/>Tiedosto on saatavilla %{date} saakka.<br/>Tarvitset paketin avaamiseen <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille), <a href="https://www.keka.io/en/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille) tai <a href="https://peazip.github.io">PeaZip-ohjelmiston</a> (Linux-käyttöjärjestelmille). Salasana: %{password}'
         download: Lataa
       export:
@@ -752,7 +801,6 @@ fi-pl:
         button: Lopeta seuranta
         error: Tämän kohteen seuraamisen lopetuksessa tapahtui virhe.
     forms:
-      current_file: Nykyinen tiedosto
       current_image: Nykyinen kuva
       default_image: Oletuskuva
       errors:
@@ -764,15 +812,41 @@ fi-pl:
         file:
           explanation: 'Tiedoston ohjeistus:'
           message_1: On oltava kuva tai asiakirja.
-          message_2: Käytä kuvina mieluiten vaakasuuntaisia kuvia, palvelu rajaa kuvaa sopivaksi näkymään. CSV-tiedostojen osalta käytä sarake-erottimena pilkkua (",")
+          message_2: Kuvina käytä mieluiten vaakasuintaisia kuvia, palvelu rajaa kuvaa.
+        icon:
+          explanation: 'Ikonin ohjeistus:'
+          message_1: On oltava neliömuotoinen kuva.
+          message_2: Tämän kuvan suositeltu koko on 512x512.
         image:
           explanation: 'Kuvan ohjeistus:'
           message_1: Käytä mieluiten vaakasuuntaista kuvaa, jossa ei ole tekstiä.
           message_2: Palvelu rajaa kuvaa.
       file_validation:
         allowed_file_extensions: 'Sallitut tiedostopäätteet: %{extensions}'
+        max_file_dimension: 'Tiedoston enimmäismitat: %{resolution} pikseliä'
         max_file_size: 'Tiedoston koon rajoitus: %{megabytes}Mt'
-      remove_this_file: Poista tiedosto
+      files:
+        extension_allowlist: 'Hyväksytyt tiedostomuodot: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Lisää liite
+          add_file: Lisää tiedosto
+          add_image: Lisää kuva
+          cancel: Peruuta
+          edit_image: Muokkaa kuvaa
+          error: Virhe!
+          file_size_too_large: 'Tiedoston koko on liian suuri! Suurin tiedostokoko: %{megabytes}MB'
+          remove: Poista
+          replace: Korvaa
+          save: Tallenna
+          title: Tiedosto-otsikko
+          title_required: Tiedosto-otsikko tarvitaan!
+          uploaded: Ladattu
+          validating: Validoidaan...
+          validation_error: Validointivirhe!
+      upload_help:
+        dropzone: Pudota tiedostot tähän tai napsauta ladataksesi
+        explanation: Ohjeita %{attribute} varten
     gamification:
       all_badges_link: Kaikki saatavilla olevat kunniamerkit.
       badges:
@@ -861,6 +935,7 @@ fi-pl:
         success: Liittymispyyntö luotu onnistuneesti. Ylläpitäjä tarkistaa pyyntösi ennen hyväksymistäsi ryhmään.
       leave:
         error: Ryhmästä poistuttaessa esiintyi ongelma
+        last_admin: Et voi poistaa itseäsi tästä ryhmästä, koska olet sen ainoa hallinnoija. Tee toisesta ryhmän jäsenestä hallinnoija, mikäli haluat poistua ryhmästä.
         success: Ryhmästä poistuminen onnistui.
       members:
         accept_or_reject_join_requests: 'Seuraavat käyttäjät ovat tehneet liittymispyynnön tähän ryhmään. Hyväksy tai hylkää heidän pyyntönsä:'
@@ -873,7 +948,7 @@ fi-pl:
       no_user_groups: Ei kuulu vielä yhteenkään ryhmään.
       roles:
         admin: Ylläpitäjä
-        creator: Luoja
+        creator: Hallinnoija
         member: Jäsen
       update:
         error: Ryhmää päivitettäessä esiintyi ongelma
@@ -907,9 +982,12 @@ fi-pl:
         create_with_space: "%{user_name} loi %{resource_name} tilassa %{space_name}"
         delete: "%{user_name} poisti %{resource_name}"
         delete_with_space: "%{user_name} poisti %{resource_name} tilassa %{space_name}"
+        publish_with_space: "%{user_name} julkaisi %{resource_name} osallistumistilassa %{space_name}"
         unknown_action: "%{user_name} suoritti toimenpiteen koskien kohdetta %{resource_name}"
         unknown_action_with_space: "%{user_name} suoritti toimenpiteen koskien kohdetta %{resource_name} tilassa %{space_name}"
+        unpublish_with_space: "%{user_name} lopetti %{resource_name} julkaisun osallistumistilassa %{space_name}"
         update: "%{user_name} päivitti %{resource_name}"
+        update_permissions_with_space: "%{user_name} päivitti kohteen %{resource_name} oikeuksia tilassa %{space_name}"
         update_with_space: "%{user_name} päivitti %{resource_name} tilassa %{space_name}"
       value_types:
         area_presenter:
@@ -1030,7 +1108,7 @@ fi-pl:
     newsletter_mailer:
       newsletter:
         note: Tämä viesti on lähetetty sinulle, koska olet tilannut uutiskirjeet organisaatiolta %{organization_name}. Voit muuttaa asetuksiasi <a href="%{link}">ilmoitusten sivulla</a>.
-        see_on_website: Etkö näe tätä sähköpostia oikein? Avaa sähköposti <a href="%{link}" target="_blank">selaimessasi</a>.
+        see_on_website: Etkö näe tätä sähköpostia oikein? Avaa sähköposti <a href="%{link}" target="_blank" class="see-on-website">selaimessasi</a>.
         unsubscribe: Voit lopettaa tämäntyyppisten sähköpostien vastaanottamisen <a href="%{link}" target="_blank" class="unsubscribe">poistumalla sähköpostilistalta</a>.
     newsletter_templates:
       basic_only_text:
@@ -1082,23 +1160,47 @@ fi-pl:
       no_notifications: Ei vielä ilmoituksia.
       show:
         missing_event: Hups, tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
+    notifications_digest_mailer:
+      header:
+        daily: Päivittäinen ilmoitusyhteenveto
+        weekly: Viikottainen ilmoitusyhteenveto
+      hello: Hei %{name},
+      intro:
+        daily: 'Tässä on lista edellisen päivän ilmoituksista niistä asioista, joita seuraat:'
+        weekly: 'Tässä on lista edellisen viikon ilmoituksista niistä asioista, joita seuraat:'
+      outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat ilmoitukseen liittyviä sisältöjä tai niiden tekijöitä. Voit lopettaa seuraamisen näiden sisältöjen sivuilta.
+      see_more: Näytä lisää ilmoituksia
+      subject: Tämä on sähköpostiyhteenvetosi
     notifications_settings:
       show:
         administrators: Hallintakäyttäjät
         allow_public_contact: Salli kenen tahansa lähettää minulle yksityisviestejä, vaikka en seuraisi heitä.
+        allow_push_notifications: Vastaanota push-ilmoituksia, mikäli haluat tietää, mitä alustalla tapahtuu, kun et ole paikalla. Voit poistaa ne käytöstä milloin tahansa.
         direct_messages: Vastaanota yksityisviestejä kaikilta
-        email_on_moderations: Haluan saada sähköpostia aina, kun jotain ilmoitetaan moderointiin.
-        email_on_notification: Haluan saada sähköpostia aina, kun saan ilmoituksen.
+        email_on_moderations: Haluan saada sähköpostia aina, kun jotain tai joku käyttäjä ilmoitetaan moderoitavaksi.
         everything_followed: Kaikki mitä seuraan
         newsletter_notifications: Haluan vastaanottaa uutiskirjeitä
         newsletters: Uutiskirjeet
+        notification_settings:
+          close_meeting_reminder: Haluan vastaanottaa sähköpostimuistutuksia suljetuista tapaamisista, jotka odottavat raportointia
+        notifications_sending_frequencies:
+          daily: Päivittäin
+          none: En koskaan
+          real_time: Reaaliajassa
+          weekly: Viikoittain
+        notifications_sending_frequency: Kuinka usein haluat vastaanottaa ilmoituksia sähköpostitse?
         own_activity: Oma toiminta, kuten omia ehdotuksia koskevat kommentit tai maininnat
+        push_notifications: Push-ilmoitukset
+        push_notifications_reminder: Mikäli haluat vastaanottaa push-ilmoituksia alustalta, sinun on sallittava ne ensin selaimesi asetuksista tälle sivustolle.
         receive_notifications_about: Haluan saada ilmoituksia
-        send_notifications_by_email: Lähetä ilmoitukset sähköpostitse
         update_notifications_settings: Tallenna muutokset
       update:
         error: Ilmoitusasetustesi päivityksessä tapahtui virhe.
         success: Ilmoitusasetuksesi päivitettiin onnistuneesti.
+    offline:
+      show:
+        message: Näyttää, että olet tällä hetkellä offline-tilassa. Yritä myöhemmin uudestaan.
+        retry: Yritä uudestaan
     open_data:
       not_available_yet: Avoimet datatiedostot eivät ole vielä käytettävissä, yritä uudelleen muutaman minuutin kuluttua.
     own_user_groups:
@@ -1152,7 +1254,7 @@ fi-pl:
           agreement: Hyväksyn nämä ehdot
           legend: Hyväksy käyttöehdot
         refuse:
-          modal_body: Jos kieltäydyt, et voi käyttää palvelua. Voit <a href="%{data_portability_path}">ladata omat tietosi</a> ja/tai <a href="%{delete_path}">poistaa tilisi</a>.
+          modal_body: Jos kieltäydyt hyväksymästä ehtoja, et voi käyttää palvelua. Voit <a href="%{download_your_data_path}">ladata omat tietosi</a> ja/tai <a href="%{delete_path}">poistaa tilisi</a>.
           modal_btn_continue: Hyväksy ehdot ja jatka
           modal_btn_exit: Tarkastan ne myöhemmin
           modal_button: Kieltäydy hyväksymästä ehtoja
@@ -1164,6 +1266,10 @@ fi-pl:
           title: 'Pakollinen: Tarkista päivitetyt käyttöehtomme'
     participatory_space_private_users:
       not_allowed: Et voi katsoa tätä sisältöä
+    passwords:
+      update:
+        error: Salasanan päivittäminen epäonnistui
+        success: Salasanan päivitys onnistui
     profile:
       deleted: Poistettu käyttäjä
       inaccessible_message: Tämä käyttäjäprofiili ei ole käytettävissä, koska käyttäjä on rikkonut käyttöehtoja!
@@ -1308,6 +1414,8 @@ fi-pl:
         close_modal: Sulje ikkuna
         please_sign_in: Kirjaudu sisään
         sign_up: Rekisteröidy
+      mentions_modal:
+        remove_recipient: Poista vastaanottaja %{name}
       participatory_space_filters:
         filters:
           areas: alueet
@@ -1348,7 +1456,7 @@ fi-pl:
       show_translated: Näytä automaattisesti käännetty teksti
     user_activity:
       index:
-        no_activities_warning: Tämä käyttäjä ei ole vielä ollut aktiivinen.
+        no_activities_warning: Tällä osallistujalla ei ole vielä ollut toimintaa.
     user_contact_disabled: Tämä osallistuja ei ole sallinut yksityisviestejä muilta käyttäjiltä.
     user_conversations:
       create:
@@ -1395,6 +1503,7 @@ fi-pl:
       notify:
         body_1: Käyttäjä %{user} on ilmoitettu käyttäjän %{token} toimesta
         body_2: 'Syy: %{reason}'
+        details: Käyttäjä antoi lisätietoja
         greetings: Terveisin,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hei %{admin},
         subject: Uusi käyttäjä on ilmoitettu palvelussa %{organization_name}
@@ -1455,7 +1564,7 @@ fi-pl:
     invitations:
       edit:
         header: Viimeistele tilisi
-        nickname_help: Yksilöllinen käyttäjänimesi organisaatiossa %{organization}.
+        nickname_help: Nimimerkkisi palvelussa %{organization}. Voi sisältää ainoastaan kirjaimia, numeroita sekä yhdysmerkkejä "-" ja alaviivoja "_".
         submit_button: Tallenna
         subtitle: Jos hyväksyt kutsun, aseta käyttäjänimesi ja salasana.
       invitation_removed: Kutsusi peruutettiin.
@@ -1522,10 +1631,11 @@ fi-pl:
     passwords:
       edit:
         change_my_password: Vaihda salasanani
-        change_your_password: Vaihda salasanasi
         confirm_new_password: Vahvista uusi salasana
         new_password: Uusi salasana
         password_help: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi."
+        password_help_admin: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi. On myös oltava eri salasana kuin edelliset salasanasi."
+        title: Salasanan vaihto
       new:
         forgot_your_password: Unohditko salasanasi?
         send_me_reset_password_instructions: Lähetä minulle ohjeet salasanan vaihtamiseen
@@ -1573,6 +1683,7 @@ fi-pl:
       public: Julkiset tietosi.
   errors:
     messages:
+      allowed_file_content_types: 'ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
       already_confirmed: on jo vahvistettu, yritä kirjautua sisään
       confirmation_period_expired: on vahvistettava %{period} kuluessa, pyydä uutta
       content_type_allowlist_error: tiedostotyyppi ei kelpaa
@@ -1604,14 +1715,60 @@ fi-pl:
     timestamp_error_message: Pahoittelut, olit liian nopea! Lähetä lomake uudestaan.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Tämä sivusto käyttää evästeitä. Jatkamalla tämän sivuston käyttöä hyväksyt selaimeesi asettamamme evästeet. Lue lisää %{link}.
-        link_label: täältä
-        ok: Hyväksyn
+      data_consent:
+        details:
+          columns:
+            description: Kuvaus
+            name: Nimi
+            service: Palvelu
+            type: Tyyppi
+          items:
+            _session_id:
+              description: Mahdollistaa verkkosivuston muistavan käyttäjän, kun käyttäjä liikkuu sivuston eri sivujen välillä.
+              service: Tämä sivusto
+            decidim-consent:
+              description: Tallentaa tietoja sallimistasi evästeistä tällä sivustolla.
+              service: Tämä sivusto
+            pwaInstallPromptSeen:
+              description: Tallentaa tiedon siitä, onko progressiivisen verkkosovelluksen (PWA) asennusilmoitus jo nähty käyttäjän toimesta.
+              service: Tämä sivusto
+          types:
+            cookie: Eväste
+            local_storage: Paikallinen tietovarasto
+        dialog:
+          accept_all: Hyväksy kaikki
+          accept_only_essential: Vain välttämättömät
+          description: Käytämme sivustollamme evästeitä sivuston suorituskyvyn ja sisällön parantamiseksi. Evästeiden avulla voimme tarjota yksilöllisemmän käyttäjäkokemuksen ja sisältöjä sosiaalisen median kanavista.
+          settings: Asetukset
+          title: Tietoa verkkosivustolla käytetyistä evästeistä
+        modal:
+          accept_all: Hyväksy kaikki
+          accept_only_essential: Vain välttämättömät
+          analytics:
+            description: Näitä evästeitä käytetään sivuston kävijätilastojen mittaamiseen ja analysointiin, jotta sivustoa voidaan parantaa.
+            title: Analytiikka ja tilastot
+          description: Käytämme evästeitä varmistaaksemme sivuston perustoiminnot ja parantaaksemme sen käyttökokemusta. Voit määrittää sallimiesi evästeiden käytön ja muokata näitä asetuksia milloin tahansa.
+          essential:
+            description: Nämä evästeet mahdollistavat sivuston perustoiminnot ja auttavat pitämään sen käyttäjät suojattuina. Ne tallennetaan automaattisesti selaimeen, eikä sivusto toimi ilman niitä, minkä takia ne ovat pakollisia.
+            title: Välttämättömät
+          marketing:
+            description: Nämä evästeet keräävät tietoa siitä, miten käytät verkkosivustoa, ja niitä voidaan hyödyntää personoidumman markkinoinnin tarjoamiseen eri sivustojen kautta.
+            title: Markkinointi
+          preferences:
+            description: Näiden evästeiden avulla verkkosivusto voi muistaa aiemmin tällä sivustolla tekemiäsi valintoja tarjotaksemme sinulle henkilökohtaisemman käyttökokemuksen tällä sivustolla.
+            title: Mieltymykset
+          save_settings: Tallenna asetukset
+          title: Evästeasetukset
+          toggle: Muuta tilaa kohteelle %{consent_category}
+        warning:
+          all_categories: kaikki evästeet
+          change_settings: Muuta evästeasetuksiasi
+          consent_required: Sinun täytyy sallia %{categories} nähdäksesi tämän sisällön.
       edit_link:
         edit: Muokkaa
       footer:
         cc_by_license: Creative Commons -lisenssi
+        data_consent_settings: Evästeasetukset
         decidim_logo: Decidim-logo
         download_open_data: Lataa avoimet datatiedostot
         made_with_open_source: Verkkosivusto luotu <a target="_blank" href="https://github.com/decidim/decidim">vapaan ohjelmiston</a> avulla.
@@ -1631,6 +1788,8 @@ fi-pl:
       notifications_dashboard:
         mark_all_as_read: Merkitse kaikki luetuiksi
         mark_as_read: Merkitse luetuiksi
+      offline_banner:
+        cache_version_page: Hups! Verkkosi on offline-tilassa. Tämä on aiemmin välimuistissa oleva versio vierailemasi sivusta, jonka sisältö ei välttämättä ole ajan tasalla.
       social_media_links:
         facebook: "%{organization} Facebookissa"
         github: "%{organization} GitHubissa"
@@ -1642,6 +1801,8 @@ fi-pl:
         continue_session: Jatka palvelun käyttöä
         sign_out: Kirjaudu ulos
         title: Haluatko jatkaa palvelun käyttöä?
+      upload_modal:
+        close_modal: Sulje ikkuna
       user_menu:
         account: 'Käyttäjätili: %{name}'
         admin_dashboard: Hallintapaneeli
@@ -1674,6 +1835,7 @@ fi-pl:
     nickname_included_in_password: liian samankaltainen nimesi kanssa
     not_enough_unique_characters: ei sisällä tarpeeksi yksilöllisiä merkkejä
     password_not_allowed: ei ole sallittu
+    password_repeated: et voi uudelleenkäyttää vanhaa salasanaa
     password_too_common: liian yleinen
     password_too_long: liian pitkä
     password_too_short: liian lyhyt (alle 10 merkkiä)
diff --git a/decidim-core/config/locales/fi.yml b/decidim-core/config/locales/fi.yml
index b46d05ecdf5ae..d89475f6da8cb 100644
--- a/decidim-core/config/locales/fi.yml
+++ b/decidim-core/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ fi:
     'true': 'Kyllä'
   carrierwave:
     errors:
-      image_too_big: Kuva on liian suuri
+      file_resolution_too_large: Tiedoston resoluutio on liian suuri
+      file_size_too_large: Tiedoston koko on liian suuri
       not_inside_organization: Tiedostoa ei ole liitetty mihinkään organisaatioon
   date:
     formats:
@@ -110,7 +112,6 @@ fi:
       x_seconds:
         one: sekunti sitten
         other: "%{count} sekuntia sitten"
-        zero: juuri nyt
   decidim:
     accessibility:
       external_link: Ulkoinen linkki
@@ -119,9 +120,6 @@ fi:
       skip_button: Siirry sisältöön
     account:
       blocked: Tämä käyttäjätili on estetty, koska käyttäjä ei noudattanut käyttöehtoja
-      data_portability_export:
-        file_no_exists: Tiedostoa ei ole olemassa
-        notice: Tietojen vienti on käynnissä. Saat sähköpostiviestin, kun se valmistuu.
       delete:
         alert: Tätä toimintoa ei voi peruuttaa. Jos poistat tilisi, et voi enää kirjautua sisään tunnuksillasi. Tilisi poiston yhteydessä nimesi ja tietosi poistuvat kaikkien laatimiesi asioiden yhteydestä. Voit kuitenkin aina luoda uuden tilin, mutta näitä aikaisemmin laadittuja asioita ei voida enää jälkikäteen liittää uuteen tiliisi.
         confirm:
@@ -133,8 +131,21 @@ fi:
       destroy:
         error: Tilisi poistaminen epäonnistui.
         success: Tilisi poistaminen onnistui.
+      download_your_data_export:
+        file_no_exists: Tiedostoa ei ole olemassa
+        notice: Tietojen vienti on käynnissä. Saat sähköpostiviestin, kun se valmistuu.
+      email_change:
+        body1: Olemme lähettäneet viestin osoitteeseen %{unconfirmed_email} vahvistaaksemme uuden sähköpostiosoitteesi.
+        body2: Haluatko tilata vahvistussähköpostin uudestaan? %{resend_link} tai %{cancel_link}.
+        cancel: peruuta
+        cancel_error: Sähköpostin muutosta ei voitu peruuttaa.
+        cancel_successfully: Sähköpostin muuttamisen peruuttaminen onnistui.
+        resend_error: Vahvistussähköpostia ei voitu lähettää uudestaan.
+        resend_successfully: Vahvistussähköpostin lähetys osoitteeseen %{unconfirmed_email} onnistui
+        send_again: Lähetä uudestaan
+        title: Sähköpostin muuttamisen vahvistus
       show:
-        available_locales_helper: Valitse kieli, jota haluat käyttää selataksesi Decidimiä ja vastaanottaaksesi ilmoituksia
+        available_locales_helper: Valitse haluamasi kieli alustan käyttämiseen ja ilmoitusten vastaanottamiseen
         change_password: Vaihda salasana
         update_account: Päivitä tili
       update:
@@ -144,16 +155,44 @@ fi:
     admin:
       actions:
         cancel: Peruuta
+      password_change:
+        alert: Sinun täytyy vaihtaa salasanasi, jotta voit jatkaa eteenpäin
+        notification: Hallintakäyttäjien on vaihdettava salasanansa %{days} päivän välein.
     admin_log:
       area:
         create: "%{user_name} loi %{resource_name} alueen"
         delete: "%{user_name} poisti %{resource_name} -alueen"
         update: "%{user_name} päivitti %{resource_name} -alueen"
+      area_type:
+        create: "%{user_name} loi aluetyypin %{resource_name}"
+        delete: "%{user_name} poisti aluetyypin %{resource_name}"
+        update: "%{user_name} päivitti aluetyyppiä %{resource_name}"
+      attachment:
+        create: "%{user_name} loi liitteen %{resource_name}"
+        delete: "%{user_name} poisti liitteen %{resource_name}"
+        update: "%{user_name} päivitti liitettä %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} loi liitekansion %{resource_name}"
+        delete: "%{user_name} poisti liitekansion %{resource_name}"
+        update: "%{user_name} päivitti liitekansiota %{resource_name}"
+      category:
+        create: "%{user_name} lisäsi aihepiirin %{resource_name} tilaan %{space_name}"
+        delete: "%{user_name} poisti aihepiirin %{resource_name} tilasta %{space_name}"
+        update: "%{user_name} päivitti aihepiiriä %{resource_name} tilassa %{space_name}"
       component:
         create: "%{user_name} lisäsi komponentin %{resource_name} osallistumistilaan %{space_name}"
         delete: "%{user_name} poisti %{resource_name} -komponentin %{space_name} -tilasta"
+        export_component: "%{user_name} vei komponentin %{component_name} %{resource_name} tilassa %{space_name} tiedostomuodossa %{format_name}"
         publish: "%{user_name} julkaisi komponentin %{resource_name} osallistumistilassa %{space_name}"
         unpublish: "%{user_name} lopetti komponentin %{resource_name} julkaisemisen osallistumistilassa %{space_name}"
+        update_permissions_with_space: "%{user_name} päivitti oikeuksia kohteessa %{resource_name} tilassa %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} päivitti ohjeosiota %{resource_name}"
+      helpers:
+        answers: vastaukset
+        comments: kommentit
+        projects: projektit
+        results: tulokset
       impersonation_log:
         manage: "%{user_name} hallinnoi käyttäjää %{resource_name}, koska %{reason}"
       moderation:
@@ -170,6 +209,7 @@ fi:
         update: "%{user_name} päivitti %{resource_name} OAuth-sovellusta"
       organization:
         update: "%{user_name} päivitti organisaation asetuksia"
+        update_external_domain: "%{user_name} päivitti organisaation ulkoisia verkkotunnuksia"
       participatory_space_private_user:
         create: "%{user_name} kutsui käyttäjän %{resource_name} yksityiseksi käyttäjäksi"
         create_via_csv: "%{user_name} kutsui yksityisen osallistujan %{resource_name} CSV-tuonnin kautta"
@@ -181,6 +221,10 @@ fi:
         delete_with_parent: "%{user_name} poisti %{resource_name} teeman %{parent_scope} teeman alta"
         update: "%{user_name} päivitti %{resource_name} teemaa"
         update_with_parent: "%{user_name} päivitti %{resource_name} teemaa %{parent_scope} teeman alla"
+      scope_type:
+        create: "%{user_name} loi teematyypin %{resource_name}"
+        delete: "%{user_name} poisti teematyypin %{resource_name}"
+        update: "%{user_name} päivitti teematyyppiä %{resource_name}"
       static_page:
         create: "%{user_name} loi staattisen sivun %{resource_name}"
         delete: "%{user_name} poisti staattisen sivun %{resource_name}"
@@ -196,7 +240,9 @@ fi:
         unblock: "%{user_name} poisti eston käyttäjältä %{resource_name}"
         unofficialize: "%{user_name} poisti käyttäjän %{resource_name} virallistamisen"
       user_group:
+        block: "%{user_name} esti käyttäjän %{resource_name}"
         reject: "%{user_name} hylkäsi käyttäjäryhmän %{resource_name} vahvistaminen"
+        unblock: "%{user_name} poisti eston käyttäjältä %{resource_name}"
         verify: "%{user_name} vahvisti käyttäjäryhmän %{resource_name}"
         verify_via_csv: "%{user_name} vahvisti käyttäjäryhmän %{resource_name} CSV-tiedoston avulla"
       user_moderation:
@@ -307,6 +353,7 @@ fi:
       endorsements:
         one: suositus
         other: suositusta
+      official_author: Virallinen
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Vahvista tilisi syöttämällä passin numero, joka alkaa kirjaimella "A"
@@ -397,6 +444,7 @@ fi:
           debate: Keskustelu
           initiative: Aloite
           meeting: Tapaaminen
+          order: Budjetointiääni
           post: Artikkeli
           proposal: Ehdotus
           question: Kysymys
@@ -411,8 +459,8 @@ fi:
             amendments_enabled: Muutokset käytössä
             comments_enabled: Kommentit käytössä
             comments_max_length: Kommenttien maksimipituus
-            dummy_global_attribute_1: Esimerkkitietue 1
-            dummy_global_attribute_2: Esimerkkitietue 2
+            dummy_global_attribute1: Esimerkkitietue 1
+            dummy_global_attribute2: Esimerkkitietue 2
             dummy_global_translatable_text: Käännettävän tekstin esimerkki
             enable_pads_creation: Ota käyttöön muistioiden luominen
             resources_permissions_enabled: Resurssien käyttöoikeudet ovat käytössä
@@ -424,8 +472,8 @@ fi:
             amendment_reaction_enabled: Reaktiot käytössä muutoksille
             amendments_visibility: Muutosten näkyvyys
             comments_blocked: Kommentit estetty
-            dummy_step_attribute_1: Esimerkkivaiheen tietue 1
-            dummy_step_attribute_2: Esimerkkivaiheen tietue 2
+            dummy_step_attribute1: Esimerkkivaiheen tietue 1
+            dummy_step_attribute2: Esimerkkivaiheen tietue 2
             dummy_step_translatable_text: Vaiheen käännettävän tekstin esimerkki
     contact: Ota yhteyttä
     content_blocks:
@@ -469,13 +517,6 @@ fi:
       actions:
         login_before_access: Sinun täytyy kirjautua sisään, jotta voit tarkastella tätä sisältöä
         unauthorized: Tiliäsi ei ole varmennettu tämän toiminnon suorittamiseen
-    data_portability:
-      export:
-        ready: Valmis
-      show:
-        download_data: Lataa tiedot
-        download_data_description: Tiedosto sisältää kaikki tiliisi liitetyt tiedot ja se lähetetään osoitteeseen <strong>%{user_email}</strong>. Kyseinen sähköposti sisältää .zip-tiedoston ja salasanan, jolla kyseisen tiedoston voi avata.<br/><br/>Purkaaksesi tiedoston, tarvitset <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille) tai <a href="https://www.keka.io/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille). Jos käytät Linux-käyttöjärjestelmää, useimmiten paketin avaamiseen tarvittava ohjelmisto on valmiiksi asennettuna järjestelmääsi. Jos näin ei kuitenkaan ole, voit käyttää <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller -ohjelmistoa</a> tai <a href="https://peazip.github.io">PeaZip-ohjelmistoa</a> paketin avaamiseen.
-        request_data: Pyydä tietoja
     datepicker:
       help_text: 'Odotettu muoto: %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ fi:
           newsletter: Vastaanota silloin tällöin olennaista tietoa sisältävä uutiskirje
           newsletter_title: Yhteydenottolupa
           nickname_help: Nimimerkkisi palvelussa %{organization}. Voi sisältää ainoastaan kirjaimia, numeroita sekä yhdysmerkkejä "-" ja alaviivoja "_".
-          password_help: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi."
           sign_in: Kirjaudu sisään
           sign_up: Rekisteröidy
           sign_up_as:
@@ -543,6 +583,13 @@ fi:
           this_application_will_not_be_able_to: 'Tämä sovellus ei voi:'
           update_profile: Päivittää profiiliasi
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> haluaa käyttää tiliäsi"
+    download_your_data:
+      export:
+        ready: Valmis
+      show:
+        download_data: Lataa tiedot
+        download_data_description: Tiedosto sisältää kaikki tiliisi liitetyt tiedot ja se lähetetään osoitteeseen <strong>%{user_email}</strong>. Kyseinen sähköposti sisältää .zip-tiedoston ja salasanan, jolla kyseisen tiedoston voi avata.<br/><br/>Purkaaksesi tiedoston, tarvitset <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille) tai <a href="https://www.keka.io/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille). Jos käytät Linux-käyttöjärjestelmää, useimmiten paketin avaamiseen tarvittava ohjelmisto on valmiiksi asennettuna järjestelmääsi. Jos näin ei kuitenkaan ole, voit käyttää <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller -ohjelmistoa</a> tai <a href="https://peazip.github.io">PeaZip-ohjelmistoa</a> paketin avaamiseen.
+        request_data: Pyydä tietoja
     editor_images:
       create:
         error: Kuvan lähettäminen epäonnistui
@@ -686,6 +733,8 @@ fi:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet palvelun hallintakäyttäjä.
           email_subject: Ryhmä on päivittänyt profiiliaan
           notification_title: Ryhmä nimeltä %{user_group_name} on päivittänyt profiiliaan, jättäen ryhmän varmentamattomaksi. Voit varmentaa ryhmän <a href="%{groups_admin_path}">hallintapaneelin kautta</a>.
+      nickname_event:
+        notification_body: Olemme muuttaneet nimimerkkien sääntöjä varmistaaksemme, että alustalla ei ole useampaa tiliä samalla nimimerkillä eri tavalla kirjoitettuna. <br/> Tilisi on luotu toisen samaa nimimerkkiä käyttäneen henkilön jälkeen, joten olemme vaihtaneet nimimerkkiäsi automaattisesti. Halutessasi voit vaihtaa nimimerkkiäsi <a href="%{link_to_account_settings}">tilisi asetuksista</a>.
       notification_event:
         notification_title: Kohteelle <a href="%{resource_path}">%{resource_title}</a> järjestettiin tapahtuma.
       reports:
@@ -712,7 +761,7 @@ fi:
           email_subject: "%{name} on virallistettu"
           notification_title: Osallistuja %{name} (%{nickname}) on virallistettu.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Napsauta Seuraava-linkkiä ladataksesi tietosi.<br/>Tiedosto on saatavilla %{date} saakka.<br/>Tarvitset paketin avaamiseen <a href="https://www.7-zip.org/">7-Zip-ohjelmiston</a> (Windows-käyttöjärjestelmille), <a href="https://www.keka.io/en/">Keka-ohjelmiston</a> (MacOS-käyttöjärjestelmille) tai <a href="https://peazip.github.io">PeaZip-ohjelmiston</a> (Linux-käyttöjärjestelmille). Salasana: %{password}'
         download: Lataa
       export:
@@ -752,7 +801,6 @@ fi:
         button: Lopeta seuranta
         error: Tämän kohteen seuraamisen lopetus epäonnistui.
     forms:
-      current_file: Nykyinen tiedosto
       current_image: Nykyinen kuva
       default_image: Oletuskuva
       errors:
@@ -764,15 +812,41 @@ fi:
         file:
           explanation: 'Tiedoston ohjeistus:'
           message_1: On oltava kuva tai asiakirja.
-          message_2: Käytä kuvina mieluiten vaakasuuntaisia kuvia, palvelu rajaa kuvaa sopivaksi näkymään. CSV-tiedostojen osalta käytä sarake-erottimena pilkkua (",")
+          message_2: Kuvina käytä mieluiten vaakasuintaisia kuvia, palvelu rajaa kuvaa.
+        icon:
+          explanation: 'Ikonin ohjeistus:'
+          message_1: On oltava neliömuotoinen kuva.
+          message_2: Tämän kuvan suositeltu koko on 512x512.
         image:
           explanation: 'Kuvan ohjeistus:'
           message_1: Käytä mieluiten vaakasuuntaista kuvaa, jossa ei ole tekstiä.
           message_2: Palvelu rajaa kuvaa.
       file_validation:
         allowed_file_extensions: 'Sallitut tiedostopäätteet: %{extensions}'
+        max_file_dimension: 'Tiedoston enimmäismitat: %{resolution} pikseliä'
         max_file_size: 'Tiedoston koon rajoitus: %{megabytes}Mt'
-      remove_this_file: Poista tiedosto
+      files:
+        extension_allowlist: 'Hyväksytyt tiedostomuodot: %{extensions}'
+      upload:
+        labels:
+          add_attachment: Lisää liite
+          add_file: Lisää tiedosto
+          add_image: Lisää kuva
+          cancel: Peruuta
+          edit_image: Muokkaa kuvaa
+          error: Virhe!
+          file_size_too_large: 'Tiedoston koko on liian suuri! Suurin tiedostokoko: %{megabytes}MB'
+          remove: Poista
+          replace: Korvaa
+          save: Tallenna
+          title: Tiedosto-otsikko
+          title_required: Tiedosto-otsikko tarvitaan!
+          uploaded: Ladattu
+          validating: Validoidaan...
+          validation_error: Validointivirhe!
+      upload_help:
+        dropzone: Pudota tiedostot tähän tai napsauta ladataksesi
+        explanation: Ohjeita %{attribute} varten
     gamification:
       all_badges_link: Kaikki saatavilla olevat kunniamerkit.
       badges:
@@ -861,6 +935,7 @@ fi:
         success: Liittymispyynnön luonti onnistui. Ylläpitäjä tarkistaa pyyntösi ennen hyväksymistäsi ryhmään.
       leave:
         error: Ryhmästä poistuminen epäonnistui
+        last_admin: Et voi poistaa itseäsi tästä ryhmästä, koska olet sen ainoa hallinnoija. Tee toisesta ryhmän jäsenestä hallinnoija, mikäli haluat poistua ryhmästä.
         success: Ryhmästä poistuminen onnistui.
       members:
         accept_or_reject_join_requests: 'Seuraavat käyttäjät ovat tehneet liittymispyynnön tähän ryhmään. Hyväksy tai hylkää heidän pyyntönsä:'
@@ -873,7 +948,7 @@ fi:
       no_user_groups: Ei kuulu vielä yhteenkään ryhmään.
       roles:
         admin: Ylläpitäjä
-        creator: Luoja
+        creator: Hallinnoija
         member: Jäsen
       update:
         error: Ryhmän päivitys epäonnistui
@@ -907,9 +982,12 @@ fi:
         create_with_space: "%{user_name} loi %{resource_name} osallistumistilassa %{space_name}"
         delete: "%{user_name} poisti %{resource_name}"
         delete_with_space: "%{user_name} poisti %{resource_name} osallistumistilassa %{space_name}"
+        publish_with_space: "%{user_name} julkaisi %{resource_name} osallistumistilassa %{space_name}"
         unknown_action: "%{user_name} suoritti toimenpiteen koskien kohdetta %{resource_name}"
         unknown_action_with_space: "%{user_name} suoritti toimenpiteen koskien kohdetta %{resource_name} osallistumistilassa %{space_name}"
+        unpublish_with_space: "%{user_name} lopetti %{resource_name} julkaisun osallistumistilassa %{space_name}"
         update: "%{user_name} päivitti %{resource_name}"
+        update_permissions_with_space: "%{user_name} päivitti kohteen %{resource_name} oikeuksia tilassa %{space_name}"
         update_with_space: "%{user_name} päivitti %{resource_name} osallistumistilassa %{space_name}"
       value_types:
         area_presenter:
@@ -1030,7 +1108,7 @@ fi:
     newsletter_mailer:
       newsletter:
         note: Tämä viesti on lähetetty sinulle, koska olet tilannut uutiskirjeet organisaatiolta %{organization_name}. Voit muuttaa asetuksiasi <a href="%{link}">ilmoitusten sivulla</a>.
-        see_on_website: Etkö näe tätä sähköpostia oikein? Avaa sähköposti <a href="%{link}" target="_blank">selaimessasi</a>.
+        see_on_website: Etkö näe tätä sähköpostia oikein? Avaa sähköposti <a href="%{link}" target="_blank" class="see-on-website">selaimessasi</a>.
         unsubscribe: Voit lopettaa tämäntyyppisten sähköpostien vastaanottamisen <a href="%{link}" target="_blank" class="unsubscribe">poistumalla sähköpostilistalta</a>.
     newsletter_templates:
       basic_only_text:
@@ -1082,23 +1160,47 @@ fi:
       no_notifications: Ei vielä ilmoituksia.
       show:
         missing_event: Hups, tämä ilmoitus kuuluu kohteeseen, joka ei ole enää käytettävissä. Voit merkitä sen luetuksi.
+    notifications_digest_mailer:
+      header:
+        daily: Päivittäinen ilmoitusyhteenveto
+        weekly: Viikottainen ilmoitusyhteenveto
+      hello: Hei %{name},
+      intro:
+        daily: 'Tässä on lista edellisen päivän ilmoituksista niistä asioista, joita seuraat:'
+        weekly: 'Tässä on lista edellisen viikon ilmoituksista niistä asioista, joita seuraat:'
+      outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat ilmoitukseen liittyviä sisältöjä tai niiden tekijöitä. Voit lopettaa seuraamisen näiden sisältöjen sivuilta.
+      see_more: Näytä lisää ilmoituksia
+      subject: Tämä on sähköpostiyhteenvetosi
     notifications_settings:
       show:
         administrators: Hallintakäyttäjät
         allow_public_contact: Salli kenen tahansa lähettää minulle yksityisviestejä, vaikka en seuraisi heitä.
+        allow_push_notifications: Vastaanota push-ilmoituksia, mikäli haluat tietää, mitä alustalla tapahtuu, kun et ole paikalla. Voit poistaa ne käytöstä milloin tahansa.
         direct_messages: Vastaanota yksityisviestejä kaikilta
-        email_on_moderations: Haluan saada sähköpostia aina, kun jotain ilmoitetaan moderointiin.
-        email_on_notification: Haluan saada sähköpostia aina, kun saan ilmoituksen.
+        email_on_moderations: Haluan saada sähköpostia aina, kun jotain tai joku käyttäjä ilmoitetaan moderoitavaksi.
         everything_followed: Kaikki mitä seuraan
         newsletter_notifications: Haluan vastaanottaa uutiskirjeitä
         newsletters: Uutiskirjeet
+        notification_settings:
+          close_meeting_reminder: Haluan vastaanottaa sähköpostimuistutuksia suljetuista tapaamisista, jotka odottavat raportointia
+        notifications_sending_frequencies:
+          daily: Päivittäin
+          none: En koskaan
+          real_time: Reaaliajassa
+          weekly: Viikoittain
+        notifications_sending_frequency: Kuinka usein haluat vastaanottaa ilmoituksia sähköpostitse?
         own_activity: Oma toiminta, kuten omia ehdotuksia koskevat kommentit tai maininnat
+        push_notifications: Push-ilmoitukset
+        push_notifications_reminder: Mikäli haluat vastaanottaa push-ilmoituksia alustalta, sinun on sallittava ne ensin selaimesi asetuksista tälle sivustolle.
         receive_notifications_about: Haluan saada ilmoituksia
-        send_notifications_by_email: Lähetä ilmoitukset sähköpostitse
         update_notifications_settings: Tallenna muutokset
       update:
         error: Ilmoitusasetustesi päivitys epäonnistui.
         success: Ilmoitusasetuksesi päivitys onnistui.
+    offline:
+      show:
+        message: Näyttää, että olet tällä hetkellä offline-tilassa. Yritä myöhemmin uudestaan.
+        retry: Yritä uudestaan
     open_data:
       not_available_yet: Avoimet datatiedostot eivät ole vielä käytettävissä, yritä uudelleen muutaman minuutin kuluttua.
     own_user_groups:
@@ -1152,7 +1254,7 @@ fi:
           agreement: Hyväksyn nämä ehdot
           legend: Hyväksy käyttöehdot
         refuse:
-          modal_body: Jos kieltäydyt, et voi käyttää palvelua. Voit <a href="%{data_portability_path}">ladata omat tietosi</a> ja/tai <a href="%{delete_path}">poistaa tilisi</a>.
+          modal_body: Jos kieltäydyt hyväksymästä ehtoja, et voi käyttää palvelua. Voit <a href="%{download_your_data_path}">ladata omat tietosi</a> ja/tai <a href="%{delete_path}">poistaa tilisi</a>.
           modal_btn_continue: Hyväksy ehdot ja jatka
           modal_btn_exit: Tarkastan ne myöhemmin
           modal_button: Kieltäydy hyväksymästä ehtoja
@@ -1164,6 +1266,10 @@ fi:
           title: 'Pakollinen: Tarkista päivitetyt käyttöehtomme'
     participatory_space_private_users:
       not_allowed: Et voi katsoa tätä sisältöä
+    passwords:
+      update:
+        error: Salasanan päivittäminen epäonnistui
+        success: Salasanan päivitys onnistui
     profile:
       deleted: Poistettu käyttäjä
       inaccessible_message: Tämä käyttäjäprofiili ei ole käytettävissä, koska käyttäjä on rikkonut käyttöehtoja!
@@ -1308,6 +1414,8 @@ fi:
         close_modal: Sulje ikkuna
         please_sign_in: Kirjaudu sisään
         sign_up: Rekisteröidy
+      mentions_modal:
+        remove_recipient: Poista vastaanottaja %{name}
       participatory_space_filters:
         filters:
           areas: Alueet
@@ -1348,7 +1456,7 @@ fi:
       show_translated: Näytä automaattisesti käännetty teksti
     user_activity:
       index:
-        no_activities_warning: Tämä käyttäjä ei ole vielä ollut aktiivinen.
+        no_activities_warning: Tällä osallistujalla ei ole vielä ollut toimintaa.
     user_contact_disabled: Tämä osallistuja ei ole sallinut yksityisviestejä muilta käyttäjiltä.
     user_conversations:
       create:
@@ -1395,6 +1503,7 @@ fi:
       notify:
         body_1: Käyttäjä %{user} on ilmoitettu käyttäjän %{token} toimesta
         body_2: 'Syy: %{reason}'
+        details: Käyttäjä antoi lisätietoja
         greetings: Terveisin,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hei %{admin},
         subject: Uusi käyttäjä on ilmoitettu palvelussa %{organization_name}
@@ -1455,7 +1564,7 @@ fi:
     invitations:
       edit:
         header: Viimeistele tilisi
-        nickname_help: Nimimerkkisi organisaatiossa %{organization}.
+        nickname_help: Nimimerkkisi palvelussa %{organization}. Voi sisältää ainoastaan kirjaimia, numeroita sekä yhdysmerkkejä "-" ja alaviivoja "_".
         submit_button: Tallenna
         subtitle: Jos hyväksyt kutsun, aseta käyttäjänimesi ja salasana.
       invitation_removed: Kutsusi peruutettiin.
@@ -1522,10 +1631,11 @@ fi:
     passwords:
       edit:
         change_my_password: Vaihda salasanani
-        change_your_password: Vaihda salasanasi
         confirm_new_password: Vahvista uusi salasana
         new_password: Uusi salasana
         password_help: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi."
+        password_help_admin: "Tulee sisältää vähintään %{minimun_characters} merkkiä, ei voi olla yleisesti käytetty salasana (esim. 123456), eikä voi vastata nimimerkkiäsi tai sähköpostiosoitettasi. On myös oltava eri salasana kuin edelliset salasanasi."
+        title: Salasanan vaihto
       new:
         forgot_your_password: Unohditko salasanasi?
         send_me_reset_password_instructions: Lähetä minulle ohjeet salasanan vaihtamiseen
@@ -1573,6 +1683,7 @@ fi:
       public: Julkiset tietosi.
   errors:
     messages:
+      allowed_file_content_types: 'ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
       already_confirmed: on jo vahvistettu, yritä kirjautua sisään
       confirmation_period_expired: on vahvistettava %{period} kuluessa, pyydä uutta
       content_type_allowlist_error: tiedostotyyppi ei kelpaa
@@ -1604,14 +1715,60 @@ fi:
     timestamp_error_message: Pahoittelut, olit liian nopea! Lähetä lomake uudestaan.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Tämä sivusto käyttää evästeitä. Jatkamalla tämän sivuston käyttöä hyväksyt selaimeesi asettamamme evästeet. %{link}.
-        link_label: Lue lisää evästeistä
-        ok: Hyväksyn
+      data_consent:
+        details:
+          columns:
+            description: Kuvaus
+            name: Nimi
+            service: Palvelu
+            type: Tyyppi
+          items:
+            _session_id:
+              description: Mahdollistaa verkkosivuston muistavan käyttäjän, kun käyttäjä liikkuu sivuston eri sivujen välillä.
+              service: Tämä sivusto
+            decidim-consent:
+              description: Tallentaa tietoja sallimistasi evästeistä tällä sivustolla.
+              service: Tämä sivusto
+            pwaInstallPromptSeen:
+              description: Tallentaa tiedon siitä, onko progressiivisen verkkosovelluksen (PWA) asennusilmoitus jo nähty käyttäjän toimesta.
+              service: Tämä sivusto
+          types:
+            cookie: Eväste
+            local_storage: Paikallinen tietovarasto
+        dialog:
+          accept_all: Hyväksy kaikki
+          accept_only_essential: Vain välttämättömät
+          description: Käytämme sivustollamme evästeitä sivuston suorituskyvyn ja sisällön parantamiseksi. Evästeiden avulla voimme tarjota yksilöllisemmän käyttäjäkokemuksen ja sisältöjä sosiaalisen median kanavista.
+          settings: Asetukset
+          title: Tietoa verkkosivustolla käytetyistä evästeistä
+        modal:
+          accept_all: Hyväksy kaikki
+          accept_only_essential: Vain välttämättömät
+          analytics:
+            description: Näitä evästeitä käytetään sivuston kävijätilastojen mittaamiseen ja analysointiin, jotta sivustoa voidaan parantaa.
+            title: Analytiikka ja tilastot
+          description: Käytämme evästeitä varmistaaksemme sivuston perustoiminnot ja parantaaksemme sen käyttökokemusta. Voit määrittää sallimiesi evästeiden käytön ja muokata näitä asetuksia milloin tahansa.
+          essential:
+            description: Nämä evästeet mahdollistavat sivuston perustoiminnot ja auttavat pitämään sen käyttäjät suojattuina. Ne tallennetaan automaattisesti selaimeen, eikä sivusto toimi ilman niitä, minkä takia ne ovat pakollisia.
+            title: Välttämättömät
+          marketing:
+            description: Nämä evästeet keräävät tietoa siitä, miten käytät verkkosivustoa, ja niitä voidaan hyödyntää personoidumman markkinoinnin tarjoamiseen eri sivustojen kautta.
+            title: Markkinointi
+          preferences:
+            description: Näiden evästeiden avulla verkkosivusto voi muistaa aiemmin tällä sivustolla tekemiäsi valintoja tarjotaksemme sinulle henkilökohtaisemman käyttökokemuksen tällä sivustolla.
+            title: Mieltymykset
+          save_settings: Tallenna asetukset
+          title: Evästeasetukset
+          toggle: Muuta tilaa kohteelle %{consent_category}
+        warning:
+          all_categories: kaikki evästeet
+          change_settings: Muuta evästeasetuksiasi
+          consent_required: Sinun täytyy sallia %{categories} nähdäksesi tämän sisällön.
       edit_link:
         edit: Muokkaa
       footer:
         cc_by_license: Creative Commons -lisenssi
+        data_consent_settings: Evästeasetukset
         decidim_logo: Decidim-logo
         download_open_data: Lataa avoimet datatiedostot
         made_with_open_source: Verkkosivusto luotu <a target="_blank" href="https://github.com/decidim/decidim">vapaan ohjelmiston</a> avulla.
@@ -1631,6 +1788,8 @@ fi:
       notifications_dashboard:
         mark_all_as_read: Merkitse kaikki luetuiksi
         mark_as_read: Merkitse luetuiksi
+      offline_banner:
+        cache_version_page: Hups! Verkkosi on offline-tilassa. Tämä on aiemmin välimuistissa oleva versio vierailemasi sivusta, jonka sisältö ei välttämättä ole ajan tasalla.
       social_media_links:
         facebook: "%{organization} Facebookissa"
         github: "%{organization} GitHubissa"
@@ -1642,6 +1801,8 @@ fi:
         continue_session: Jatka palvelun käyttöä
         sign_out: Kirjaudu ulos
         title: Haluatko jatkaa palvelun käyttöä?
+      upload_modal:
+        close_modal: Sulje ikkuna
       user_menu:
         account: 'Käyttäjätili: %{name}'
         admin_dashboard: Hallintapaneeli
@@ -1674,6 +1835,7 @@ fi:
     nickname_included_in_password: liian samankaltainen nimesi kanssa
     not_enough_unique_characters: ei sisällä tarpeeksi yksilöllisiä merkkejä
     password_not_allowed: ei ole sallittu
+    password_repeated: et voi uudelleenkäyttää vanhaa salasanaa
     password_too_common: liian yleinen
     password_too_long: liian pitkä
     password_too_short: liian lyhyt (alle 10 merkkiä)
@@ -1714,7 +1876,7 @@ fi:
       devise:
         mailer:
           invitation_instructions:
-            accept_until_format: "%B %d, %Y klo %k:%M"
+            accept_until_format: "%B %d., %Y klo %k:%M"
       long: "%B %d., %Y %H:%M"
       long_dashed: "%Y-%m-%d %H:%M:%S"
       short: "%d.%m.%Y %H:%M"
diff --git a/decidim-core/config/locales/fr-CA.yml b/decidim-core/config/locales/fr-CA.yml
index b60850b426a7f..a08eca4c964ce 100644
--- a/decidim-core/config/locales/fr-CA.yml
+++ b/decidim-core/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ fr-CA:
     'true': 'Oui'
   carrierwave:
     errors:
-      image_too_big: L'image est trop grande
+      file_resolution_too_large: La résolution du fichier est trop grande
+      file_size_too_large: Le fichier est trop volumineux
       not_inside_organization: Le fichier n'est relié à aucune organisation
   date:
     formats:
@@ -110,7 +112,6 @@ fr-CA:
       x_seconds:
         one: Il y a 1 seconde
         other: "Il y a %{count} secondes"
-        zero: à l’instant
   decidim:
     accessibility:
       external_link: Lien externe
@@ -119,9 +120,6 @@ fr-CA:
       skip_button: Passer au contenu principal
     account:
       blocked: Ce compte a été bloqué en raison d'une violation des Conditions Générales d'Utilisation
-      data_portability_export:
-        file_no_exists: Le fichier n'existe pas
-        notice: Votre export est actuellement en cours. Vous recevrez un email quand il sera complet.
       delete:
         alert: Cette action ne peut être annulée. Si vous supprimez votre compte, vous ne pourrez pas vous connecter avec vos identifiants. La suppression de votre compte entraînera l'anonymisation de vos contributions. Vous serez toujours en mesure de créer un nouveau compte, mais vos anciennes contributions n'y seront plus associées.
         confirm:
@@ -133,8 +131,21 @@ fr-CA:
       destroy:
         error: Une erreur s'est produite lors de la suppression de votre compte.
         success: Votre compte a été supprimé avec succès.
+      download_your_data_export:
+        file_no_exists: Le fichier n'existe pas
+        notice: Votre export est actuellement en cours. Vous recevrez un email quand il sera complet.
+      email_change:
+        body1: Nous avons envoyé un e-mail à %{unconfirmed_email} pour vérifier votre nouvelle adresse e-mail.
+        body2: Envoyer à nouveau l'e-mail de vérification ? %{resend_link} ou %{cancel_link}.
+        cancel: annuler
+        cancel_error: Impossible d'annuler la modification de l'e-mail.
+        cancel_successfully: Modification de l'e-mail annulée.
+        resend_error: Impossible de renvoyer l'e-mail de confirmation.
+        resend_successfully: E-mail de confirmation renvoyé avec succès à %{unconfirmed_email}
+        send_again: Envoyer à nouveau
+        title: Vérification du changement d'adresse e-mail
       show:
-        available_locales_helper: Choisissez la langue que vous souhaitez utiliser pour naviguer et recevoir des notifications dans Decidim
+        available_locales_helper: Choisissez la langue que vous souhaitez utiliser pour naviguer et recevoir des notifications sur la plateforme
         change_password: Changer de mot de passe
         update_account: Mettre à jour votre compte
       update:
@@ -144,16 +155,44 @@ fr-CA:
     admin:
       actions:
         cancel: Annuler
+      password_change:
+        alert: Vous devez changer votre mot de passe pour continuer
+        notification: Les administrateurs doivent changer leur mot de passe tous les %{days} jours.
     admin_log:
       area:
         create: "%{user_name} a créé la zone d'application %{resource_name}"
         delete: "%{user_name} a supprimé la zone d'application %{resource_name}"
         update: "%{user_name} a mis à jour la zone d'application %{resource_name}"
+      area_type:
+        create: "%{user_name} a créé le type de zone d'application %{resource_name}"
+        delete: "%{user_name} a supprimé le type de zone d'application %{resource_name}"
+        update: "%{user_name} a mis à jour le type de zone d'application %{resource_name}"
+      attachment:
+        create: "%{user_name} a créé le document %{resource_name}"
+        delete: "%{user_name} a supprimé le document %{resource_name}"
+        update: "%{user_name} a mis à jour le document %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} a créé le fichier %{resource_name}"
+        delete: "%{user_name} a supprimé le fichier %{resource_name}"
+        update: "%{user_name} a mis à jour le fichier %{resource_name}"
+      category:
+        create: "%{user_name} a ajouté la catégorie %{resource_name} à l'espace %{space_name}"
+        delete: "%{user_name} a supprimé la catégorie %{resource_name} sur l'espace %{space_name}"
+        update: "%{user_name} a mis à jour la catégorie %{resource_name} dans l'espace %{space_name}"
       component:
         create: "%{user_name} a ajouté la fonctionnalité %{resource_name} à l'espace %{space_name}"
         delete: "%{user_name} a supprimé la fonctionnalité %{resource_name} de l'espace %{space_name}"
+        export_component: "%{user_name} a exporté le %{resource_name} %{component_name} dans %{space_name} en tant que %{format_name}"
         publish: "%{user_name} a publié la fonctionnalité %{resource_name} dans l'espace %{space_name}"
         unpublish: "%{user_name} a dépublié la fonctionnalité %{resource_name} de l'espace %{space_name}"
+        update_permissions_with_space: "%{user_name} a mis à jour les permissions de %{resource_name} dans %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} a mis à jour la section d'aide %{resource_name}"
+      helpers:
+        answers: réponses
+        comments: commentaires
+        projects: projets
+        results: résultats
       impersonation_log:
         manage: "%{user_name} a représenté %{resource_name} parce que %{reason}"
       moderation:
@@ -170,6 +209,7 @@ fr-CA:
         update: "%{user_name} a mis à jour l'application OAuth %{resource_name}"
       organization:
         update: "%{user_name} a mis à jour les paramètres de l'organisation"
+        update_external_domain: "%{user_name} a mis à jour les domaines externes de l'organisation"
       participatory_space_private_user:
         create: "%{user_name} invité %{resource_name} pour être un utilisateur privé"
         create_via_csv: "%{user_name} a invité %{resource_name} via CSV à être un utilisateur privé"
@@ -181,6 +221,10 @@ fr-CA:
         delete_with_parent: "%{user_name} a supprimé le périmètre d'application %{resource_name} à l'intérieur du périmètre d'application %{parent_scope}"
         update: "%{user_name} a mis à jour le périmètre d'application %{resource_name}"
         update_with_parent: "%{user_name} a mis à jour le périmètre d'application %{resource_name} à l'intérieur du périmètre d'application %{parent_scope}"
+      scope_type:
+        create: "%{user_name} a créé le type de secteur %{resource_name}"
+        delete: "%{user_name} a supprimé le type de secteur %{resource_name}"
+        update: "%{user_name} a mis à jour le type de secteur %{resource_name}"
       static_page:
         create: "%{user_name} a créé la page statique %{resource_name}"
         delete: "%{user_name} a supprimé la page statique %{resource_name}"
@@ -196,7 +240,9 @@ fr-CA:
         unblock: "%{user_name} a débloqué l'utilisateur %{resource_name}"
         unofficialize: "%{user_name} a retiré l'officialisation de l'utilisateur %{resource_name}"
       user_group:
+        block: "%{user_name} a bloqué le groupe d'utilisateurs %{resource_name}"
         reject: "%{user_name} a rejeté la vérification du groupe d'utilisateurs %{resource_name}"
+        unblock: "%{user_name} a débloqué le groupe d'utilisateurs %{resource_name}"
         verify: "%{user_name} a vérifié le groupe d'utilisateurs %{resource_name}"
         verify_via_csv: "%{user_name} vérifié le groupe %{resource_name} utilisateur via un fichier CSV"
       user_moderation:
@@ -307,6 +353,7 @@ fr-CA:
       endorsements:
         one: soutien
         other: soutiens
+      official_author: Officiel
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Obtenir une vérification en saisissant un numéro de passeport commençant par "A"
@@ -373,7 +420,7 @@ fr-CA:
           request_confirmation_instructions: Demander des instructions de confirmation
           title: confirmez votre email
       show:
-        close_modal: Fermer la fenêtre modale
+        close_modal: Fermer la fenêtre
     block_user_mailer:
       notify:
         body_1: Votre compte a été bloqué.
@@ -397,6 +444,7 @@ fr-CA:
           debate: Débat
           initiative: Pétition
           meeting: Rencontre
+          order: Vote du budget
           post: Publication
           proposal: Proposition
           question: Question
@@ -411,8 +459,8 @@ fr-CA:
             amendments_enabled: Modifications activées
             comments_enabled: Activer le module de commentaire
             comments_max_length: Longueur maximale des commentaires
-            dummy_global_attribute_1: Attribut factice 1
-            dummy_global_attribute_2: Attribut factice 2
+            dummy_global_attribute1: Attribut factice 1
+            dummy_global_attribute2: Attribut factice 2
             dummy_global_translatable_text: Texte traduisible factice
             enable_pads_creation: Activer la création de pads
             resources_permissions_enabled: Autorisations de ressources activées
@@ -424,8 +472,8 @@ fr-CA:
             amendment_reaction_enabled: Réaction d'amendement activée
             amendments_visibility: Visibilité des amendements
             comments_blocked: Bloquer la création de nouveaux commentaires
-            dummy_step_attribute_1: Attribut d'étape factice 1
-            dummy_step_attribute_2: Attribut d'étape factice 2
+            dummy_step_attribute1: Attribut d'étape factice 1
+            dummy_step_attribute2: Attribut d'étape factice 2
             dummy_step_translatable_text: Texte traduisible de l'étape factice
     contact: Contact
     content_blocks:
@@ -469,13 +517,6 @@ fr-CA:
       actions:
         login_before_access: Veuillez vous connecter avec votre compte avant de réaliser cette action
         unauthorized: Vous n'êtes pas autorisé à effectuer cette action
-    data_portability:
-      export:
-        ready: Prêt
-      show:
-        download_data: Télécharger les données
-        download_data_description: Un fichier contenant toutes les informations associées à votre compte sera envoyé à <strong>%{user_email}</strong>. Cet e-mail contiendra un fichier .zip et un mot de passe pour l'ouvrir.<br/><br/>Pour décompresser le fichier, vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (pour Windows) ou <a href="https://www.keka.io/">Keka</a> (pour MacOS). Si vous utilisez Linux, la plupart du temps, vous l'aurez installé par défaut. Sinon, vous pouvez utiliser <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>.
-        request_data: Demander les données
     datepicker:
       help_text: 'Format attendu : %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ fr-CA:
           newsletter: Recevoir une newsletter sur l'actualité de la plateforme
           newsletter_title: Autorisation de contact
           nickname_help: Cet identifiant est public et unique sur %{organization} ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne doit pas contenir d’espace ni de caractère spécial.
-          password_help: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email."
           sign_in: Se connecter
           sign_up: S'inscrire
           sign_up_as:
@@ -538,6 +578,13 @@ fr-CA:
           this_application_will_not_be_able_to: 'Cette application ne sera pas capable de :'
           update_profile: Mettre à jour votre profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> veut utiliser votre compte"
+    download_your_data:
+      export:
+        ready: Prêt
+      show:
+        download_data: Télécharger les données
+        download_data_description: Un fichier contenant toutes les informations associées à votre compte sera envoyé à <strong>%{user_email}</strong>. Cet e-mail contiendra un fichier .zip et un mot de passe pour l'ouvrir.<br/><br/>Pour décompresser le fichier, vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (pour Windows) ou <a href="https://www.keka.io/">Keka</a> (pour MacOS). Si vous utilisez Linux, la plupart du temps, vous l'aurez installé par défaut. Sinon, vous pouvez utiliser <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>.
+        request_data: Demander les données
     editor_images:
       create:
         error: Erreur lors de l'envoi de l'image
@@ -681,6 +728,8 @@ fr-CA:
           email_outro: Vous avez reçu cette notification parce que vous êtes un administrateur de la plateforme.
           email_subject: Un group d'utilisateurs viens de mettre à jour son profil
           notification_title: Le groupe d'utilisateurs %{user_group_name} a mis à jour son profil, le laissant non vérifié. Vous pouvez maintenant le vérifier dans le <a href="%{groups_admin_path}">panneau d'administration</a>.
+      nickname_event:
+        notification_body: Nous avons corrigé la façon dont les pseudonymes sont utilisés pour qu'il n'y ait pas de doublons, quelque soit l'utilisation de majuscules et/ou de minuscules. <br/> Votre pseudonyme a été créé après un autre qui était identique, nous l'avons donc automatiquement renommé. Vous pouvez le modifier depuis <a href="%{link_to_account_settings}">les paramètres de votre compte</a>.
       notification_event:
         notification_title: Un événement a eu lieu à <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -708,7 +757,7 @@ fr-CA:
           email_subject: "%{name} a été officialisé"
           notification_title: Le participant %{name} (%{nickname}) a été officialisé.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Cliquez sur le bouton suivant pour télécharger vos données.<br/>Le fichier sera disponible jusqu''au %{date}.<br/>Vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (Windows), <a href="https://www.keka.io/en/">Keka</a> (MacOS) ou <a href="https://peazip.github.io">PeaZip</a> (Linux) pour l''ouvrir. Mot de passe : %{password}'
         download: Télécharger
       export:
@@ -748,7 +797,6 @@ fr-CA:
         button: Ne plus suivre
         error: Une erreur s'est produite lors du traitement de votre demande de ne plus suivre ce contenu.
     forms:
-      current_file: Fichier actuel
       current_image: Image actuelle
       default_image: Image par défaut
       errors:
@@ -760,15 +808,41 @@ fr-CA:
         file:
           explanation: 'Orientation pour le fichier :'
           message_1: Doit être une image ou un document.
-          message_2: Pour les images, utilisez de préférence des formats paysage, car le service recadre l'image. Pour les fichiers CSV, le séparateur entre les colonnes doit être une virgule (",")
+          message_2: Pour les images, utilisez de préférence des images en format paysage, le service rogne l'image.
+        icon:
+          explanation: 'Manuel pour l''image:'
+          message_1: Doit être une image carrée.
+          message_2: La taille recommandée pour cette image est de 512x512.
         image:
           explanation: 'Orientation pour l''image:'
           message_1: De préférence une image de paysage qui n'a pas de texte.
           message_2: Le service récolte l'image.
       file_validation:
         allowed_file_extensions: 'Extensions de fichier autorisées : %{extensions}'
+        max_file_dimension: 'Dimensions de fichier maximales : %{resolution} pixels'
         max_file_size: 'Taille maximale du fichier : %{megabytes}Mo'
-      remove_this_file: Supprimer ce fichier
+      files:
+        extension_allowlist: 'Formats acceptés : %{extensions}'
+      upload:
+        labels:
+          add_attachment: Ajouter une pièce jointe
+          add_file: Ajouter un fichier
+          add_image: Ajouter une image
+          cancel: Annuler
+          edit_image: Modifier l'Image
+          error: Erreur !
+          file_size_too_large: 'Le fichier est trop volumineux ! Poids de fichier maximum : %{megabytes}Mo'
+          remove: Supprimer
+          replace: Remplacer
+          save: Sauvegarder
+          title: Titre
+          title_required: Le titre est requis !
+          uploaded: Téléchargé
+          validating: Validation en cours...
+          validation_error: Erreur de validation !
+      upload_help:
+        dropzone: Déposez les fichiers ici ou cliquez pour télécharger
+        explanation: Explication pour %{attribute}
     gamification:
       all_badges_link: Voir tous les badges disponibles.
       badges:
@@ -857,6 +931,7 @@ fr-CA:
         success: Demande de jointure créée avec succès. Un administrateur examinera votre demande avant de vous accepter au groupe.
       leave:
         error: Il y a eu un problème pour quitter le groupe
+        last_admin: Vous ne pouvez pas vous retirer de ce groupe car vous êtes le dernier administrateur. Attribuez le rôle d'administrateur à un autre membre afin de pouvoir quitter le groupe.
         success: Le groupe est parti avec succès.
       members:
         accept_or_reject_join_requests: 'Les utilisateurs suivants ont demandé à rejoindre ce groupe. Accepter ou rejeter leurs demandes:'
@@ -869,7 +944,7 @@ fr-CA:
       no_user_groups: N'appartient à aucun groupe pour l'instant.
       roles:
         admin: Administrateur
-        creator: Créateur
+        creator: Administrateur
         member: Membre
       update:
         error: Un problème est survenu lors de la mise à jour du groupe.
@@ -894,7 +969,7 @@ fr-CA:
         body_1: Vous êtes sur le point de visiter un lien externe et nous aimerions que vous soyez prudent quant au contenu du site externe.
         body_2: Veuillez vérifier le lien que vous êtes sur le point de visiter et assurez-vous de le reconnaître comme un site sûr avant de poursuivre.
         cancel: Annuler
-        close_modal: Fermer la fenêtre de dialogue
+        close_modal: Fermer la fenêtre
         proceed: Continuer
         title: Ouvrir le lien externe
     log:
@@ -903,9 +978,12 @@ fr-CA:
         create_with_space: "%{user_name} a créé %{resource_name} dans %{space_name}"
         delete: "%{user_name} a supprimé %{resource_name}"
         delete_with_space: "%{user_name} a supprimé %{resource_name} dans %{space_name}"
+        publish_with_space: "%{user_name} a publié %{resource_name} dans %{space_name}"
         unknown_action: "%{user_name} a effectué une action sur %{resource_name}"
         unknown_action_with_space: "%{user_name} a effectué une action sur %{resource_name} dans %{space_name}"
+        unpublish_with_space: "%{user_name} a dépublié %{resource_name} de %{space_name}"
         update: "%{user_name} a mis à jour %{resource_name}"
+        update_permissions_with_space: "%{user_name} a mis à jour les permissions de %{resource_name} dans %{space_name}"
         update_with_space: "%{user_name} a mis à jour %{resource_name} dans %{space_name}"
       value_types:
         area_presenter:
@@ -1078,23 +1156,47 @@ fr-CA:
       no_notifications: Il n'y a pas encore de notifications.
       show:
         missing_event: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
+    notifications_digest_mailer:
+      header:
+        daily: Résumé quotidien des notifications
+        weekly: Résumé hebdomadaire des notifications
+      hello: Bonjour %{name},
+      intro:
+        daily: 'Voici les notifications de la veille, basées sur les ressources que vous suivez :'
+        weekly: 'Voici les notifications de la semaine dernière, basées sur les ressources que vous suivez :'
+      outro: Vous avez reçu ces notifications parce que vous suivez ce contenu ou ses auteurs. Pour arrêter de les suivre, rendez-vous sur la page du contenu ou de l'auteur et cliquez sur "Ne plus suivre".
+      see_more: Voir plus de notifications
+      subject: Résumé de vos notifications mail
     notifications_settings:
       show:
         administrators: Administrateurs
         allow_public_contact: Permettre à quelqu'un de m'envoyer un message direct, même si je ne les suis pas.
+        allow_push_notifications: Recevez des notifications push pour savoir ce qui se passe lorsque vous n'êtes pas sur la plateforme. Vous pouvez les désactiver à tout moment.
         direct_messages: Recevoir des messages directs de n'importe qui
-        email_on_moderations: Je veux recevoir un email chaque fois que quelque chose est signalé pour modération.
-        email_on_notification: Je souhaite recevoir un email à chaque fois que je reçois une notification.
+        email_on_moderations: Je veux recevoir un email chaque fois que quelqu'un ou qu'une ressource a été signalé à des fins de modérations.
         everything_followed: Tout ce que je suis
         newsletter_notifications: Je souhaite recevoir une newsletter sur l'actualité de la plateforme
         newsletters: Newsletters
+        notification_settings:
+          close_meeting_reminder: Je veux recevoir des rappels par e-mail pour les comptes-rendus de réunions terminées que je n'ai pas encore publiés
+        notifications_sending_frequencies:
+          daily: Une fois par jour
+          none: Jamais
+          real_time: En temps réel
+          weekly: Une fois par semaine
+        notifications_sending_frequency: À quelle fréquence voulez-vous recevoir les notifications par e-mail ?
         own_activity: Ma propre activité, comme quand quelqu'un commente dans ma proposition ou me mentionne
+        push_notifications: Notifications push
+        push_notifications_reminder: Pour recevoir des notifications de la plateforme, vous devez d'abord les autoriser dans les paramètres de votre navigateur.
         receive_notifications_about: Je veux recevoir des notifications sur
-        send_notifications_by_email: Envoyer des notifications par email
         update_notifications_settings: Enregistrer les modifications
       update:
         error: Une erreur s'est produite lors de la mise à jour des paramètres de vos notifications.
         success: Vos paramètres de notifications ont été mis à jour avec succès.
+    offline:
+      show:
+        message: On dirait que vous êtes actuellement hors ligne. Veuillez réessayer plus tard.
+        retry: Réessayer
     open_data:
       not_available_yet: Les fichiers Open Data ne sont pas encore disponibles. Veuillez réessayer dans quelques minutes.
     own_user_groups:
@@ -1148,7 +1250,7 @@ fr-CA:
           agreement: J'accepte ces conditions d'utilisation
           legend: Accepter les conditions d'utilisation
         refuse:
-          modal_body: Si vous refusez, vous ne pourrez pas utiliser la plateforme. Vous pouvez <a href="%{data_portability_path}">télécharger vos données</a> et / ou <a href="%{delete_path}">supprimer votre compte</a>.
+          modal_body: Si vous refusez, vous ne pourrez pas utiliser la plateforme. Vous pouvez <a href="%{download_your_data_path}">télécharger vos données</a> ainsi que <a href="%{delete_path}">supprimer votre compte</a>.
           modal_btn_continue: Accepter les conditions et continuer
           modal_btn_exit: Je l'examinerai plus tard
           modal_button: Refuser les conditions d'utilisation
@@ -1160,6 +1262,10 @@ fr-CA:
           title: 'Obligatoire : consultez les conditions d''utilisation mises à jour'
     participatory_space_private_users:
       not_allowed: Vous n'êtes pas autorisé à voir ce contenu
+    passwords:
+      update:
+        error: Il y a eu un problème lors de la mise à jour de votre mot de passe
+        success: Mot de passe mis à jour avec succès
     profile:
       deleted: Utilisateur ayant supprimé son compte
       inaccessible_message: Ce profil est inaccessible en raison d'une violation des Conditions Générales d'Utilisation !
@@ -1304,6 +1410,8 @@ fr-CA:
         close_modal: Fermer la fenêtre modale
         please_sign_in: Veuillez vous connecter
         sign_up: S'inscrire
+      mentions_modal:
+        remove_recipient: Supprimer le destinataire %{name}
       participatory_space_filters:
         filters:
           areas: Zones d'application
@@ -1342,9 +1450,6 @@ fr-CA:
       help_text: "<strong>Attention :</strong> Le contenu peut être automatiquement traduit et ne pas être exact à 100%."
       show_original: Afficher le texte original
       show_translated: Afficher le texte automatiquement traduit
-    user_activity:
-      index:
-        no_activities_warning: Cet utilisateur n'a pas encore eu d'activité.
     user_contact_disabled: Cet utilisateur n'accepte pas les messages directs.
     user_conversations:
       create:
@@ -1391,6 +1496,7 @@ fr-CA:
       notify:
         body_1: L'utilisateur %{user} a été signalé par %{token}
         body_2: 'Motif : %{reason}'
+        details: Détails fournis par l'utilisateur
         greetings: Salutations,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Bonjour %{admin},
         subject: Un nouvel utilisateur a été signalé dans %{organization_name}
@@ -1451,7 +1557,7 @@ fr-CA:
     invitations:
       edit:
         header: Terminer la création de votre compte
-        nickname_help: Cet identifiant est public et unique sur la plateforme "%{organization}" ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne doit pas contenir d’espace ni de caractère spécial.
+        nickname_help: Cet identifiant est public et unique sur %{organization} ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne peut contenir que des lettres, des chiffres ainsi que les caractères "-" et "_".
         submit_button: Sauvegarder
         subtitle: Si vous acceptez l'invitation, veuillez indiquer votre pseudonyme et votre mot de passe.
       invitation_removed: Votre invitation a été supprimée.
@@ -1518,10 +1624,11 @@ fr-CA:
     passwords:
       edit:
         change_my_password: Changer mon mot de passe
-        change_your_password: changez votre mot de passe
         confirm_new_password: Confirmer le nouveau mot de passe
         new_password: Nouveau mot de passe
         password_help: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email."
+        password_help_admin: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email, ainsi que de vos précédents mots de passe."
+        title: Changement de mot de passe
       new:
         forgot_your_password: Mot de passe oublié?
         send_me_reset_password_instructions: Envoyez-moi les instructions de réinitialisation du mot de passe
@@ -1569,6 +1676,7 @@ fr-CA:
       public: Votre information publique
   errors:
     messages:
+      allowed_file_content_types: 'seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
       already_confirmed: était déjà confirmé, s'il vous plaît essayez de vous connecter
       confirmation_period_expired: doit être confirmé dans les %{period}, s'il vous plaît demander un nouveau
       content_type_allowlist_error: le type de fichier n'est pas valide
@@ -1600,14 +1708,60 @@ fr-CA:
     timestamp_error_message: Désolé, c'était trop rapide ! Veuillez le renvoyer.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Ce site utilise des cookies. En continuant à parcourir le site, vous acceptez notre utilisation des cookies. En savoir plus à ce sujet %{link}.
-        link_label: ici
-        ok: '"J''accepte"'
+      data_consent:
+        details:
+          columns:
+            description: Description
+            name: Nom
+            service: Service
+            type: Type
+          items:
+            _session_id:
+              description: Permet aux sites Web de se souvenir de l'utilisateur au sein d'un même site lorsqu'il navigue d'une page à l'autre.
+              service: Ce site web
+            decidim-consent:
+              description: Stocke des informations sur les cookies autorisés par l'utilisateur sur ce site web.
+              service: Ce site web
+            pwaInstallPromptSeen:
+              description: Stocke l'état si la notification d'installation de l'application web progressive (PWA) a déjà été vue par l'utilisateur.
+              service: Ce site web
+          types:
+            cookie: Cookie
+            local_storage: Sauvegarde Locale
+        dialog:
+          accept_all: Tout accepter
+          accept_only_essential: Accepter seulement l'essentiel
+          description: Nous utilisons des cookies sur notre site Web pour améliorer la performance et le contenu du site. Les cookies nous permettent de fournir une expérience utilisateur plus individuelle et les canaux de médias sociaux.
+          settings: Paramètres
+          title: Informations sur les cookies utilisés sur le site web
+        modal:
+          accept_all: Tout accepter
+          accept_only_essential: Accepter seulement l'essentiel
+          analytics:
+            description: Ces cookies sont utilisés pour mesurer et analyser le public du site afin de l'améliorer.
+            title: Analyses et statistiques
+          description: Nous utilisons des cookies pour assurer les fonctionnalités de base du site Web et pour améliorer votre expérience en ligne. Vous pouvez configurer et accepter l'utilisation des cookies et modifier vos options de consentement à tout moment.
+          essential:
+            description: Ces cookies permettent le fonctionnement essentiel du site Web et aident à sécuriser ses utilisateurs. Ils sont automatiquement enregistrés dans le navigateur et ne peuvent pas être désactivés.
+            title: Essentiels
+          marketing:
+            description: Ces cookies recueillent des informations sur la façon dont vous utilisez le site Web et peuvent être utilisés pour vous offrir un marketing plus personnalisé sur les différents sites Web que vous utilisez.
+            title: Marketing
+          preferences:
+            description: Ces cookies permettent au site Web de se souvenir des choix que vous avez faits par le passé sur ce site pour offrir une expérience plus personnalisée aux utilisateurs du site.
+            title: Préférences
+          save_settings: Enregistrer les paramètres
+          title: Paramètres des cookies
+          toggle: Activer/désactiver %{consent_category}
+        warning:
+          all_categories: tous les cookies
+          change_settings: Modifier les paramètres des cookies
+          consent_required: Vous devez activer %{categories} pour voir ce contenu.
       edit_link:
         edit: Modifier
       footer:
         cc_by_license: Licence Creative Commons
+        data_consent_settings: Paramètres des cookies
         decidim_logo: Logo Decidim
         download_open_data: Télécharger les fichiers Open Data
         made_with_open_source: Site réalisé grâce au <a target="_blank" href="https://github.com/decidim/decidim">logiciel libre Decidim</a>.
@@ -1627,6 +1781,8 @@ fr-CA:
       notifications_dashboard:
         mark_all_as_read: Marquer tout comme lu
         mark_as_read: Marquer comme lu
+      offline_banner:
+        cache_version_page: Oups ! Votre réseau est hors ligne. Vous visitez actuellement une version précédemment mise en cache de la page, peut-être que son contenu n'est pas à jour.
       social_media_links:
         facebook: "%{organization} sur Facebook"
         github: "%{organization} sur GitHub"
@@ -1638,6 +1794,8 @@ fr-CA:
         continue_session: Continuer la session
         sign_out: Se déconnecter
         title: Voulez-vous poursuivre votre session ?
+      upload_modal:
+        close_modal: Fermer la fenêtre
       user_menu:
         account: 'Compte utilisateur: %{name}'
         admin_dashboard: Tableau de bord des administrateurs
@@ -1670,6 +1828,7 @@ fr-CA:
     nickname_included_in_password: est trop similaire à votre surnom
     not_enough_unique_characters: n'a pas assez de caractères uniques
     password_not_allowed: n'est pas autorisé
+    password_repeated: impossible de réutiliser un ancien mot de passe
     password_too_common: est trop commun
     password_too_long: est trop long
     password_too_short: est trop court
diff --git a/decidim-core/config/locales/fr.yml b/decidim-core/config/locales/fr.yml
index ae4c0d52635f2..c158dd1e73167 100644
--- a/decidim-core/config/locales/fr.yml
+++ b/decidim-core/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -74,7 +75,8 @@ fr:
     'true': 'Oui'
   carrierwave:
     errors:
-      image_too_big: L'image est trop grande
+      file_resolution_too_large: La résolution du fichier est trop grande
+      file_size_too_large: Le fichier est trop volumineux
       not_inside_organization: Le fichier n'est relié à aucune organisation
   date:
     formats:
@@ -110,7 +112,6 @@ fr:
       x_seconds:
         one: Il y a 1 seconde
         other: "Il y a %{count} secondes"
-        zero: à l’instant
   decidim:
     accessibility:
       external_link: Lien externe
@@ -119,9 +120,6 @@ fr:
       skip_button: Passer au contenu principal
     account:
       blocked: Ce compte a été bloqué en raison d'une violation des Conditions Générales d'Utilisation
-      data_portability_export:
-        file_no_exists: Le fichier n'existe pas
-        notice: Votre export est actuellement en cours. Vous recevrez un email quand il sera complet.
       delete:
         alert: Cette action ne peut être annulée. Si vous supprimez votre compte, vous ne pourrez pas vous connecter avec vos identifiants. La suppression de votre compte entraînera l'anonymisation de vos contributions. Vous serez toujours en mesure de créer un nouveau compte, mais vos anciennes contributions n'y seront plus associées.
         confirm:
@@ -133,8 +131,21 @@ fr:
       destroy:
         error: Une erreur s'est produite lors de la suppression de votre compte.
         success: Votre compte a été supprimé avec succès.
+      download_your_data_export:
+        file_no_exists: Le fichier n'existe pas
+        notice: Votre export est actuellement en cours. Vous recevrez un email quand il sera complet.
+      email_change:
+        body1: Nous avons envoyé un e-mail à %{unconfirmed_email} pour vérifier votre nouvelle adresse e-mail.
+        body2: Envoyer à nouveau l'e-mail de vérification ? %{resend_link} ou %{cancel_link}.
+        cancel: annuler
+        cancel_error: Impossible d'annuler la modification de l'e-mail.
+        cancel_successfully: Modification de l'e-mail annulée.
+        resend_error: Impossible de renvoyer l'e-mail de confirmation.
+        resend_successfully: E-mail de confirmation renvoyé avec succès à %{unconfirmed_email}
+        send_again: Envoyer à nouveau
+        title: Vérification du changement d'adresse e-mail
       show:
-        available_locales_helper: Choisissez la langue que vous souhaitez utiliser pour naviguer et recevoir des notifications dans %{organization_name}
+        available_locales_helper: Choisissez la langue que vous souhaitez utiliser pour naviguer et recevoir des notifications sur la plateforme
         change_password: Changer de mot de passe
         update_account: Mettre à jour votre compte
       update:
@@ -144,16 +155,44 @@ fr:
     admin:
       actions:
         cancel: Annuler
+      password_change:
+        alert: Vous devez changer votre mot de passe pour continuer
+        notification: Les administrateurs doivent changer leur mot de passe tous les %{days} jours.
     admin_log:
       area:
         create: "%{user_name} a créé le périmètre d'assemblée %{resource_name}"
         delete: "%{user_name} a supprimé le périmètre d'assemblée %{resource_name}"
         update: "%{user_name} a mis à jour le périmètre d'assemblée %{resource_name}"
+      area_type:
+        create: "%{user_name} a créé le type de périmètre d'assemblée %{resource_name}"
+        delete: "%{user_name} a supprimé le type de périmètre d'assemblée %{resource_name}"
+        update: "%{user_name} a mis à jour le type de périmètre d'assemblée %{resource_name}"
+      attachment:
+        create: "%{user_name} a créé le document %{resource_name}"
+        delete: "%{user_name} a supprimé le document %{resource_name}"
+        update: "%{user_name} a mis à jour le document %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} a créé le fichier %{resource_name}"
+        delete: "%{user_name} a supprimé le fichier %{resource_name}"
+        update: "%{user_name} a mis à jour le fichier %{resource_name}"
+      category:
+        create: "%{user_name} a ajouté la catégorie %{resource_name} à l'espace %{space_name}"
+        delete: "%{user_name} a supprimé la catégorie %{resource_name} sur l'espace %{space_name}"
+        update: "%{user_name} a mis à jour la catégorie %{resource_name} dans l'espace %{space_name}"
       component:
         create: "%{user_name} a ajouté la fonctionnalité %{resource_name} à l'espace %{space_name}"
         delete: "%{user_name} a supprimé la fonctionnalité %{resource_name} de l'espace %{space_name}"
+        export_component: "%{user_name} a exporté le %{resource_name} %{component_name} dans %{space_name} en tant que %{format_name}"
         publish: "%{user_name} a publié la fonctionnalité %{resource_name} dans l'espace %{space_name}"
         unpublish: "%{user_name} a dépublié la fonctionnalité %{resource_name} de l'espace %{space_name}"
+        update_permissions_with_space: "%{user_name} a mis à jour les permissions de %{resource_name} dans %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} a mis à jour la section d'aide %{resource_name}"
+      helpers:
+        answers: réponses
+        comments: commentaires
+        projects: projets
+        results: résultats
       impersonation_log:
         manage: "%{user_name} a représenté %{resource_name} parce que %{reason}"
       moderation:
@@ -170,6 +209,7 @@ fr:
         update: "%{user_name} a mis à jour l'application OAuth %{resource_name}"
       organization:
         update: "%{user_name} a mis à jour les paramètres de l'organisation"
+        update_external_domain: "%{user_name} a mis à jour les domaines externes de l'organisation"
       participatory_space_private_user:
         create: "%{user_name} invité %{resource_name} pour être un utilisateur privé"
         create_via_csv: "%{user_name} a invité %{resource_name} via CSV à être un utilisateur privé"
@@ -181,6 +221,10 @@ fr:
         delete_with_parent: "%{user_name} a supprimé le périmètre d'application %{resource_name} à l'intérieur du périmètre d'application %{parent_scope}"
         update: "%{user_name} a mis à jour le périmètre d'application %{resource_name}"
         update_with_parent: "%{user_name} a mis à jour le périmètre d'application %{resource_name} à l'intérieur du périmètre d'application %{parent_scope}"
+      scope_type:
+        create: "%{user_name} a créé le type de secteur %{resource_name}"
+        delete: "%{user_name} a supprimé le type de secteur %{resource_name}"
+        update: "%{user_name} a mis à jour le type de secteur %{resource_name}"
       static_page:
         create: "%{user_name} a créé la page statique %{resource_name}"
         delete: "%{user_name} a supprimé la page statique %{resource_name}"
@@ -196,7 +240,9 @@ fr:
         unblock: "%{user_name} a débloqué l'utilisateur %{resource_name}"
         unofficialize: "%{user_name} a retiré l'officialisation de l'utilisateur %{resource_name}"
       user_group:
+        block: "%{user_name} a bloqué le groupe d'utilisateurs %{resource_name}"
         reject: "%{user_name} a rejeté la vérification du groupe d'utilisateurs %{resource_name}"
+        unblock: "%{user_name} a débloqué le groupe d'utilisateurs %{resource_name}"
         verify: "%{user_name} a vérifié le groupe d'utilisateurs %{resource_name}"
         verify_via_csv: "%{user_name} vérifié le groupe %{resource_name} utilisateur via un fichier CSV"
       user_moderation:
@@ -307,6 +353,7 @@ fr:
       endorsements:
         one: soutien
         other: soutiens
+      official_author: Officiel
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Obtenir une vérification en saisissant un numéro de passeport commençant par "A"
@@ -373,7 +420,7 @@ fr:
           request_confirmation_instructions: Demander des instructions de confirmation
           title: confirmez votre email
       show:
-        close_modal: Fermer la fenêtre de dialogue
+        close_modal: Fermer la fenêtre
     block_user_mailer:
       notify:
         body_1: Votre compte a été bloqué.
@@ -397,6 +444,7 @@ fr:
           debate: Débat
           initiative: Pétition
           meeting: Rencontre
+          order: Vote du budget
           post: Article
           proposal: Proposition
           question: Question
@@ -411,8 +459,8 @@ fr:
             amendments_enabled: Modifications activées
             comments_enabled: Activer le module de commentaire
             comments_max_length: Longueur maximale des commentaires
-            dummy_global_attribute_1: Attribut factice 1
-            dummy_global_attribute_2: Attribut factice 2
+            dummy_global_attribute1: Attribut factice 1
+            dummy_global_attribute2: Attribut factice 2
             dummy_global_translatable_text: Texte traduisible factice
             enable_pads_creation: Activer la création de pads
             resources_permissions_enabled: Autorisations de ressources activées
@@ -424,8 +472,8 @@ fr:
             amendment_reaction_enabled: Réaction d'amendement activée
             amendments_visibility: Visibilité des amendements
             comments_blocked: Bloquer la création de nouveaux commentaires
-            dummy_step_attribute_1: Attribut d'étape factice 1
-            dummy_step_attribute_2: Attribut d'étape factice 2
+            dummy_step_attribute1: Attribut d'étape factice 1
+            dummy_step_attribute2: Attribut d'étape factice 2
             dummy_step_translatable_text: Texte traduisible de l'étape factice
     contact: Contact
     content_blocks:
@@ -469,13 +517,6 @@ fr:
       actions:
         login_before_access: Veuillez vous connecter avec votre compte avant de réaliser cette action
         unauthorized: Vous n'êtes pas autorisé à effectuer cette action
-    data_portability:
-      export:
-        ready: Prêt
-      show:
-        download_data: Télécharger les données
-        download_data_description: Un fichier contenant toutes les informations associées à votre compte sera envoyé à <strong>%{user_email}</strong>. Cet e-mail contiendra un fichier .zip et un mot de passe pour l'ouvrir.<br/><br/>Pour décompresser le fichier, vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (pour Windows) ou <a href="https://www.keka.io/">Keka</a> (pour MacOS). Si vous utilisez Linux, la plupart du temps, vous l'aurez installé par défaut. Sinon, vous pouvez utiliser <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>.
-        request_data: Demander les données
     datepicker:
       help_text: 'Format attendu : %{datepicker_format}'
     devise:
@@ -494,7 +535,6 @@ fr:
           newsletter: Recevoir une newsletter sur l'actualité de la plateforme
           newsletter_title: Autorisation de contact
           nickname_help: Cet identifiant est public et unique sur %{organization} ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne doit pas contenir d’espace ni de caractère spécial.
-          password_help: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email."
           sign_in: S'identifier
           sign_up: Créer un compte
           sign_up_as:
@@ -538,6 +578,13 @@ fr:
           this_application_will_not_be_able_to: 'Cette application ne sera pas capable de :'
           update_profile: Mettre à jour votre profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> veut utiliser votre compte"
+    download_your_data:
+      export:
+        ready: Prêt
+      show:
+        download_data: Télécharger les données
+        download_data_description: Un fichier contenant toutes les informations associées à votre compte sera envoyé à <strong>%{user_email}</strong>. Cet e-mail contiendra un fichier .zip et un mot de passe pour l'ouvrir.<br/><br/>Pour décompresser le fichier, vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (pour Windows) ou <a href="https://www.keka.io/">Keka</a> (pour MacOS). Si vous utilisez Linux, la plupart du temps, vous l'aurez installé par défaut. Sinon, vous pouvez utiliser <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>.
+        request_data: Demander les données
     editor_images:
       create:
         error: Erreur lors du téléchargement de l'image
@@ -681,6 +728,8 @@ fr:
           email_outro: Vous avez reçu cette notification parce que vous êtes un administrateur de la plateforme. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte� > “Paramètres des notifications�.
           email_subject: Un groupe d'utilisateurs viens de mettre à jour son profil
           notification_title: Le groupe d'utilisateurs %{user_group_name} a mis à jour son profil, le laissant non vérifié. Vous pouvez maintenant le vérifier dans le <a href="%{groups_admin_path}">panneau d'administration</a>.
+      nickname_event:
+        notification_body: Nous avons corrigé la façon dont les pseudonymes sont utilisés pour qu'il n'y ait pas de doublons, quelque soit l'utilisation de majuscules et/ou de minuscules. <br/> Votre pseudonyme a été créé après un autre qui était identique, nous l'avons donc automatiquement renommé. Vous pouvez le modifier depuis <a href="%{link_to_account_settings}">les paramètres de votre compte</a>.
       notification_event:
         notification_title: Un événement a eu lieu à <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -708,7 +757,7 @@ fr:
           email_subject: "%{name} a été officialisé"
           notification_title: Le participant %{name} (%{nickname}) a été officialisé.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Cliquez sur le bouton suivant pour télécharger vos données.<br/>Le fichier sera disponible jusqu''au %{date}.<br/>Vous aurez besoin de <a href="https://www.7-zip.org/">7-Zip</a> (Windows), <a href="https://www.keka.io/en/">Keka</a> (MacOS) ou <a href="https://peazip.github.io">PeaZip</a> (Linux) pour l''ouvrir. Mot de passe : %{password}'
         download: Télécharger
       export:
@@ -748,7 +797,6 @@ fr:
         button: Ne plus suivre
         error: Une erreur s'est produite lors du traitement de votre demande de ne plus suivre ce contenu.
     forms:
-      current_file: Fichier actuel
       current_image: Image actuelle
       default_image: Image par défaut
       errors:
@@ -760,15 +808,41 @@ fr:
         file:
           explanation: 'Orientation pour le fichier :'
           message_1: Doit être une image ou un document.
-          message_2: Pour les images, utilisez de préférence des formats paysage, car le service recadre l'image. Pour les fichiers CSV, le séparateur entre les colonnes doit être une virgule (","). Pour pouvoir choisir le type de séparateur il recommander d'utiliser le logiciel "Libre Office"
+          message_2: Pour les images, utilisez de préférence des images en format paysage, le service rogne l'image.
+        icon:
+          explanation: 'Manuel pour l''image:'
+          message_1: Doit être une image carrée.
+          message_2: La taille recommandée pour cette image est de 512x512.
         image:
           explanation: 'Orientation pour l''image:'
           message_1: De préférence une image au format paysage qui n'a pas de texte.
           message_2: Le service recadre l'image.
       file_validation:
         allowed_file_extensions: 'Extensions de fichier autorisées : %{extensions}'
+        max_file_dimension: 'Dimensions de fichier maximales : %{resolution} pixels'
         max_file_size: 'Taille maximale du fichier : %{megabytes}Mo'
-      remove_this_file: Supprimer ce fichier
+      files:
+        extension_allowlist: 'Formats acceptés : %{extensions}'
+      upload:
+        labels:
+          add_attachment: Ajouter une pièce jointe
+          add_file: Ajouter un fichier
+          add_image: Ajouter une image
+          cancel: Annuler
+          edit_image: Modifier l'Image
+          error: Erreur !
+          file_size_too_large: 'Le fichier est trop volumineux ! Poids de fichier maximum : %{megabytes}Mo'
+          remove: Supprimer
+          replace: Remplacer
+          save: Sauvegarder
+          title: Titre
+          title_required: Le titre est requis !
+          uploaded: Téléchargé
+          validating: Validation en cours...
+          validation_error: Erreur de validation !
+      upload_help:
+        dropzone: Déposez les fichiers ici ou cliquez pour télécharger
+        explanation: Explication pour %{attribute}
     gamification:
       all_badges_link: Voir tous les badges disponibles.
       badges:
@@ -857,6 +931,7 @@ fr:
         success: Demande de jointure créée avec succès. Un administrateur examinera votre demande avant de vous accepter au groupe.
       leave:
         error: Il y a eu un problème pour quitter le groupe
+        last_admin: Vous ne pouvez pas vous retirer de ce groupe car vous êtes le dernier administrateur. Attribuez le rôle d'administrateur à un autre membre afin de pouvoir quitter le groupe.
         success: Le groupe est parti avec succès.
       members:
         accept_or_reject_join_requests: 'Les utilisateurs suivants ont demandé à rejoindre ce groupe. Accepter ou rejeter leurs demandes:'
@@ -869,7 +944,7 @@ fr:
       no_user_groups: N'appartient à aucun groupe pour l'instant.
       roles:
         admin: Administrateur
-        creator: Créateur
+        creator: Administrateur
         member: Membre
       update:
         error: Un problème est survenu lors de la mise à jour du groupe.
@@ -894,7 +969,7 @@ fr:
         body_1: Vous êtes sur le point de visiter un lien externe et nous aimerions que vous soyez prudent quant au contenu du site externe.
         body_2: Veuillez vérifier le lien que vous êtes sur le point de visiter et assurez-vous de le reconnaître comme un site sûr avant de poursuivre.
         cancel: Annuler
-        close_modal: Fermer la fenêtre de dialogue
+        close_modal: Fermer la fenêtre
         proceed: Continuer
         title: Ouvrir le lien externe
     log:
@@ -903,9 +978,12 @@ fr:
         create_with_space: "%{user_name} a créé %{resource_name} dans %{space_name}"
         delete: "%{user_name} a supprimé %{resource_name}"
         delete_with_space: "%{user_name} a supprimé %{resource_name} dans %{space_name}"
+        publish_with_space: "%{user_name} a publié %{resource_name} dans %{space_name}"
         unknown_action: "%{user_name} a effectué une action sur %{resource_name}"
         unknown_action_with_space: "%{user_name} a effectué une action sur %{resource_name} dans %{space_name}"
+        unpublish_with_space: "%{user_name} a dépublié %{resource_name} de %{space_name}"
         update: "%{user_name} a mis à jour %{resource_name}"
+        update_permissions_with_space: "%{user_name} a mis à jour les permissions de %{resource_name} dans %{space_name}"
         update_with_space: "%{user_name} a mis à jour %{resource_name} dans %{space_name}"
       value_types:
         area_presenter:
@@ -1078,23 +1156,47 @@ fr:
       no_notifications: Il n'y a pas encore de notifications.
       show:
         missing_event: Oups, cette notification est liée à un élément qui n'est plus disponible. Vous pouvez la supprimer.
+    notifications_digest_mailer:
+      header:
+        daily: Résumé quotidien des notifications
+        weekly: Résumé hebdomadaire des notifications
+      hello: Bonjour %{name},
+      intro:
+        daily: 'Voici les notifications de la veille, basées sur les ressources que vous suivez :'
+        weekly: 'Voici les notifications de la semaine dernière, basées sur les ressources que vous suivez :'
+      outro: Vous avez reçu ces notifications parce que vous suivez ce contenu ou ses auteurs. Pour arrêter de les suivre, rendez-vous sur la page du contenu ou de l'auteur et cliquez sur "Ne plus suivre".
+      see_more: Voir plus de notifications
+      subject: Résumé de vos notifications mail
     notifications_settings:
       show:
         administrators: Administrateurs
         allow_public_contact: Permettre à quelqu'un de m'envoyer un message direct, même si je ne les suis pas.
+        allow_push_notifications: Recevez des notifications push pour savoir ce qui se passe lorsque vous n'êtes pas sur la plateforme. Vous pouvez les désactiver à tout moment.
         direct_messages: Recevoir des messages directs de n'importe qui
-        email_on_moderations: Je veux recevoir un email chaque fois que quelque chose est signalé pour modération.
-        email_on_notification: Je souhaite recevoir un email à chaque fois que je reçois une notification.
+        email_on_moderations: Je veux recevoir un email chaque fois que quelqu'un ou qu'une ressource a été signalé à des fins de modérations.
         everything_followed: Tout ce que je suis
         newsletter_notifications: Je souhaite recevoir une newsletter sur l'actualité de la plateforme
         newsletters: Newsletters
+        notification_settings:
+          close_meeting_reminder: Je veux recevoir des rappels par e-mail pour les comptes-rendus de réunions terminées que je n'ai pas encore publiés
+        notifications_sending_frequencies:
+          daily: Une fois par jour
+          none: Jamais
+          real_time: En temps réel
+          weekly: Une fois par semaine
+        notifications_sending_frequency: À quelle fréquence voulez-vous recevoir les notifications par e-mail ?
         own_activity: Ma propre activité, comme quand quelqu'un commente dans ma proposition ou me mentionne
+        push_notifications: Notifications push
+        push_notifications_reminder: Pour recevoir des notifications de la plateforme, vous devez d'abord les autoriser dans les paramètres de votre navigateur.
         receive_notifications_about: Je veux recevoir des notifications sur
-        send_notifications_by_email: Envoyer des notifications par email
         update_notifications_settings: Enregistrer les modifications
       update:
         error: Une erreur s'est produite lors de la mise à jour des paramètres de vos notifications.
         success: Vos paramètres de notifications ont été mis à jour avec succès.
+    offline:
+      show:
+        message: On dirait que vous êtes actuellement hors ligne. Veuillez réessayer plus tard.
+        retry: Réessayer
     open_data:
       not_available_yet: Les fichiers Open Data ne sont pas encore disponibles. Veuillez réessayer dans quelques minutes.
     own_user_groups:
@@ -1148,7 +1250,7 @@ fr:
           agreement: J'accepte ces conditions d'utilisation
           legend: Accepter les conditions d'utilisation
         refuse:
-          modal_body: Si vous refusez, vous ne pourrez pas utiliser la plateforme. Vous pouvez <a href="%{data_portability_path}">télécharger vos données</a> et / ou <a href="%{delete_path}">supprimer votre compte</a>.
+          modal_body: Si vous refusez, vous ne pourrez pas utiliser la plateforme. Vous pouvez <a href="%{download_your_data_path}">télécharger vos données</a> ainsi que <a href="%{delete_path}">supprimer votre compte</a>.
           modal_btn_continue: Accepter les conditions et continuer
           modal_btn_exit: Je l'examinerai plus tard
           modal_button: Refuser les conditions d'utilisation
@@ -1160,6 +1262,10 @@ fr:
           title: 'Obligatoire : consultez les conditions d''utilisation mises à jour'
     participatory_space_private_users:
       not_allowed: Vous n'êtes pas autorisé à voir ce contenu
+    passwords:
+      update:
+        error: Il y a eu un problème lors de la mise à jour de votre mot de passe
+        success: Mot de passe mis à jour avec succès
     profile:
       deleted: Utilisateur ayant supprimé son compte
       inaccessible_message: Ce profil est inaccessible en raison d'une violation des Conditions Générales d'Utilisation !
@@ -1304,6 +1410,8 @@ fr:
         close_modal: Fermer la fenêtre de dialogue
         please_sign_in: Veuillez vous identifier
         sign_up: Créer un compte
+      mentions_modal:
+        remove_recipient: Supprimer le destinataire %{name}
       participatory_space_filters:
         filters:
           areas: Périmètres d'assemblée
@@ -1342,9 +1450,6 @@ fr:
       help_text: "<strong>Attention :</strong> Le contenu peut être automatiquement traduit et ne pas être exact à 100%."
       show_original: Afficher le texte original
       show_translated: Afficher le texte automatiquement traduit
-    user_activity:
-      index:
-        no_activities_warning: Cet utilisateur n'a pas encore eu d'activité.
     user_contact_disabled: Cet utilisateur n'accepte pas les messages directs.
     user_conversations:
       create:
@@ -1391,6 +1496,7 @@ fr:
       notify:
         body_1: L'utilisateur %{user} a été signalé par %{token}
         body_2: 'Motif : %{reason}'
+        details: Détails fournis par l'utilisateur
         greetings: Salutations,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Bonjour %{admin},
         subject: Un nouvel utilisateur a été signalé dans %{organization_name}
@@ -1451,7 +1557,7 @@ fr:
     invitations:
       edit:
         header: Terminer la création de votre compte
-        nickname_help: Cet identifiant est public et unique sur la plateforme "%{organization}" ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne doit pas contenir d’espace ni de caractère spécial.
+        nickname_help: Cet identifiant est public et unique sur %{organization} ; il permet aux autres utilisateurs de vous suivre, de vous contacter ou de vous mentionner dans leurs commentaires. Il s’affichera précédé d’un « @ » ; il ne peut contenir que des lettres, des chiffres ainsi que les caractères "-" et "_".
         submit_button: Sauvegarder
         subtitle: Si vous acceptez l'invitation, veuillez indiquer votre pseudonyme et votre mot de passe.
       invitation_removed: Votre invitation a été supprimée.
@@ -1518,10 +1624,11 @@ fr:
     passwords:
       edit:
         change_my_password: Changer mon mot de passe
-        change_your_password: changez votre mot de passe
         confirm_new_password: Confirmer le nouveau mot de passe
         new_password: Nouveau mot de passe
         password_help: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email."
+        password_help_admin: "%{minimun_characters} caractères minimum, ne doit pas être trop commun (par exemple 123456) et doit être différent de votre pseudo et de votre email, ainsi que de vos précédents mots de passe."
+        title: Changement de mot de passe
       new:
         forgot_your_password: Mot de passe oublié?
         send_me_reset_password_instructions: Envoyez-moi les instructions de réinitialisation du mot de passe
@@ -1569,6 +1676,7 @@ fr:
       public: Votre information publique
   errors:
     messages:
+      allowed_file_content_types: 'seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
       already_confirmed: était déjà confirmé, s'il vous plaît essayez de vous connecter
       confirmation_period_expired: doit être confirmé dans les %{period}, s'il vous plaît demander un nouveau
       content_type_allowlist_error: le type de fichier n'est pas valide
@@ -1600,14 +1708,60 @@ fr:
     timestamp_error_message: Désolé, c'était trop rapide ! Veuillez le renvoyer.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Ce site utilise des cookies. En continuant à parcourir le site, vous acceptez notre utilisation des cookies. En savoir plus à ce sujet %{link}.
-        link_label: ici
-        ok: '"J''accepte"'
+      data_consent:
+        details:
+          columns:
+            description: Description
+            name: Nom
+            service: Service
+            type: Type
+          items:
+            _session_id:
+              description: Permet aux sites Web de se souvenir de l'utilisateur au sein d'un même site lorsqu'il navigue d'une page à l'autre.
+              service: Ce site web
+            decidim-consent:
+              description: Stocke des informations sur les cookies autorisés par l'utilisateur sur ce site web.
+              service: Ce site web
+            pwaInstallPromptSeen:
+              description: Stocke l'état si la notification d'installation de l'application web progressive (PWA) a déjà été vue par l'utilisateur.
+              service: Ce site web
+          types:
+            cookie: Cookie
+            local_storage: Sauvegarde Locale
+        dialog:
+          accept_all: Tout accepter
+          accept_only_essential: Accepter seulement les cookies essentiels
+          description: Nous utilisons des cookies sur notre site Web pour améliorer la performance et les contenus du site. Les cookies nous permettent de fournir une expérience utilisateur et un contenu plus personnalisés à partir de nos canaux de médias sociaux.
+          settings: Paramètres
+          title: Informations sur les cookies utilisés sur le site web
+        modal:
+          accept_all: Tout accepter
+          accept_only_essential: Accepter seulement les cookies essentiels
+          analytics:
+            description: Ces cookies sont utilisés pour mesurer et analyser le public du site afin de l'améliorer.
+            title: Analyses et statistiques
+          description: Nous utilisons des cookies pour assurer les fonctionnalités de base du site Web et pour améliorer votre expérience en ligne. Vous pouvez configurer et accepter l'utilisation des cookies et modifier vos options de consentement à tout moment.
+          essential:
+            description: Ces cookies permettent le fonctionnement essentiel du site Web et aident à sécuriser ses utilisateurs. Ils sont automatiquement enregistrés dans le navigateur et ne peuvent pas être désactivés.
+            title: Essentiels
+          marketing:
+            description: Ces cookies recueillent des informations sur la façon dont vous utilisez le site Web et peuvent être utilisés pour vous offrir un marketing plus personnalisé sur les différents sites Web que vous utilisez.
+            title: Marketing
+          preferences:
+            description: Ces cookies permettent au site Web de se souvenir des choix que vous avez faits par le passé sur ce site pour offrir une expérience plus personnalisée aux utilisateurs du site.
+            title: Préférences
+          save_settings: Enregistrer les paramètres
+          title: Paramètres des cookies
+          toggle: Activer/désactiver %{consent_category}
+        warning:
+          all_categories: tous les cookies
+          change_settings: Modifier les paramètres des cookies
+          consent_required: Vous devez activer %{categories} pour voir ce contenu.
       edit_link:
         edit: Modifier
       footer:
         cc_by_license: Licence Creative Commons
+        data_consent_settings: Paramètres des cookies
         decidim_logo: Decidim.org (ouverture dans une nouvelle fenêtre)
         download_open_data: Télécharger les fichiers Open Data
         made_with_open_source: Site réalisé grâce au <a target="_blank" href="https://github.com/decidim/decidim">logiciel libre Decidim</a>.
@@ -1627,6 +1781,8 @@ fr:
       notifications_dashboard:
         mark_all_as_read: Marquer tout comme lu
         mark_as_read: Marquer comme lu
+      offline_banner:
+        cache_version_page: Oups ! Votre réseau est hors ligne. Vous visitez actuellement une version précédemment mise en cache de la page, peut-être que son contenu n'est pas à jour.
       social_media_links:
         facebook: "%{organization} sur Facebook"
         github: "%{organization} sur GitHub"
@@ -1638,6 +1794,8 @@ fr:
         continue_session: Continuer la session
         sign_out: Se déconnecter
         title: Voulez-vous poursuivre votre session ?
+      upload_modal:
+        close_modal: Fermer la fenêtre
       user_menu:
         account: 'Compte utilisateur: %{name}'
         admin_dashboard: Tableau de bord des administrateurs
@@ -1670,6 +1828,7 @@ fr:
     nickname_included_in_password: est trop similaire à votre surnom
     not_enough_unique_characters: n'a pas assez de caractères uniques
     password_not_allowed: n'est pas autorisé
+    password_repeated: impossible de réutiliser un ancien mot de passe
     password_too_common: est trop commun
     password_too_long: est trop long
     password_too_short: est trop court
diff --git a/decidim-core/config/locales/ga-IE.yml b/decidim-core/config/locales/ga-IE.yml
index fa90cdfd9ce84..f7864903941ad 100644
--- a/decidim-core/config/locales/ga-IE.yml
+++ b/decidim-core/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -109,9 +110,6 @@ ga:
           random: Randamach
       last_activity:
         view_all: Amharc ar uile
-    data_portability:
-      export:
-        ready: Réidh
     devise:
       registrations:
         new:
@@ -124,6 +122,9 @@ ga:
       authorizations:
         new:
           cancel: Cealaigh
+    download_your_data:
+      export:
+        ready: Réidh
     endorsable:
       endorsements: Formhuinithe
     endorsement_buttons_cell:
@@ -133,7 +134,7 @@ ga:
       identities:
         done: Críochnaithe
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: �oslódáil
     filters:
       linked_classes:
@@ -163,7 +164,6 @@ ga:
         reject_request: Diúltaigh
       roles:
         admin: Riarthóir
-        creator: Cruthaitheoir
         member: Ball
     last_activities:
       index:
@@ -333,8 +333,6 @@ ga:
         sign_up: Cláraigh
   layouts:
     decidim:
-      cookie_warning:
-        ok: Aontaím
       edit_link:
         edit: Eagar
       header:
diff --git a/decidim-core/config/locales/gl.yml b/decidim-core/config/locales/gl.yml
index 80bc70923d57c..95c57061d2633 100644
--- a/decidim-core/config/locales/gl.yml
+++ b/decidim-core/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -47,9 +48,6 @@ gl:
   booleans:
     'false': 'Non'
     'true': 'Si'
-  carrierwave:
-    errors:
-      image_too_big: A imaxe é demasiado grande
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -84,14 +82,10 @@ gl:
       x_seconds:
         one: hai 1 seg
         other: "hai %{count} seg"
-        zero: agora
   decidim:
     accessibility:
       front_page_link: Ir á páxina principal
     account:
-      data_portability_export:
-        file_no_exists: O ficheiro non existe
-        notice: Os teus datos están en progreso. Recibirás un correo electrónico cando finalice.
       delete:
         confirm:
           close: Pechar xanela
@@ -102,6 +96,9 @@ gl:
       destroy:
         error: Produciuse un erro ao eliminar a túa conta.
         success: A túa conta eliminouse correctamente.
+      download_your_data_export:
+        file_no_exists: O ficheiro non existe
+        notice: Os teus datos están en progreso. Recibirás un correo electrónico cando finalice.
       show:
         change_password: Cambie o contrasinal
         update_account: Actualizar a conta
@@ -282,6 +279,8 @@ gl:
           explanation_html: Para realizar esta acción necesitas estar autorizado, antes de facer isto necesitas confirmar o teu correo <strong>%{email}</strong>.
           request_confirmation_instructions: Solicitar instrucións de confirmación
           title: Confirma o teu correo electrónico
+      show:
+        close_modal: Pechar modal
     collapsible_list:
       hidden_elements_count:
         one: e %{count} máis
@@ -298,14 +297,14 @@ gl:
           global:
             amendments_enabled: Modificacións habilitadas
             comments_enabled: Comentarios habilitados
-            dummy_global_attribute_1: Atributo maniquí 1
-            dummy_global_attribute_2: Atributo maniquí 2
+            dummy_global_attribute1: Atributo maniquí 1
+            dummy_global_attribute2: Atributo maniquí 2
             enable_pads_creation: Habilita a creación de pastillas
             resources_permissions_enabled: Permisos de recursos habilitados
           step:
             comments_blocked: Comentarios bloqueados
-            dummy_step_attribute_1: Dummy Step Attribute 1
-            dummy_step_attribute_2: Dummy Step Attribute 2
+            dummy_step_attribute1: Dummy Step Attribute 1
+            dummy_step_attribute2: Dummy Step Attribute 2
     contact: Contacto
     content_blocks:
       footer_sub_hero:
@@ -332,12 +331,6 @@ gl:
     core:
       actions:
         unauthorized: Non estás autorizado para realizar esta acción
-    data_portability:
-      export:
-        ready: Listo
-      show:
-        download_data: Descarga os datos
-        request_data: Solicitar datos
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -399,6 +392,12 @@ gl:
           this_application_will_not_be_able_to: 'Esta aplicación non poderá:'
           update_profile: Actualiza o teu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quere usar a túa conta"
+    download_your_data:
+      export:
+        ready: Listo
+      show:
+        download_data: Descarga os datos
+        request_data: Solicitar datos
     editor_images:
       create:
         error: Erro ó subir a imaxe
@@ -538,7 +537,7 @@ gl:
           email_subject: "%{name} foi oficializado"
           notification_title: O participante %{name} (%{nickname}) foi oficializado.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Descarga
       export:
         ready: Atopa unha versión comprimida da túa exportación.
@@ -573,12 +572,29 @@ gl:
         button: Deixar de seguir
         error: Houbo un erro ao seguir este recurso.
     forms:
-      current_file: Arquivo actual
       current_image: Imaxe actual
       default_image: Imaxe predeterminada
       errors:
         error: Hai un erro neste campo.
-      remove_this_file: Elimina este ficheiro
+      upload:
+        labels:
+          add_attachment: Engadir ficheiro anexo
+          add_file: Engadir ficheiro
+          add_image: Engadir imaxe
+          cancel: Cancelar
+          edit_image: Editar imaxe
+          error: Erro!
+          remove: Eliminar
+          replace: Substituír
+          save: Gardar
+          title: Título
+          title_required: O título é obrigatorio!
+          uploaded: Cargado
+          validating: Validando...
+          validation_error: Erro de validación!
+      upload_help:
+        dropzone: Solta os ficheiros aquí ou preme para cargar
+        explanation: Guía para %{attribute}
     gamification:
       all_badges_link: Consulta todas as insignias dispoñibles.
       badges:
@@ -679,7 +695,6 @@ gl:
       no_user_groups: Aínda non pertence a ningún grupo.
       roles:
         admin: Administrador
-        creator: Creador
         member: Membro
       update:
         error: Produciuse un problema ao actualizar o grupo
@@ -776,7 +791,6 @@ gl:
     newsletter_mailer:
       newsletter:
         note: Recibiches este correo electrónico porque estás subscrito a boletíns en %{organization_name}. Podes cambiar a configuración nas túas <a href="%{link}"> notificacións páxina</a>.
-        see_on_website: Non se pode ver este correo electrónico correctamente? Vénseo no <a href="%{link}" target="_blank"> sitio web</a>.
         unsubscribe: Para desactivar a recepción deste tipo de correo electrónico, <a href="%{link}" target="_blank" class="unsubscribe">Subscribe</a>.
     newsletters:
       unsubscribe:
@@ -809,17 +823,19 @@ gl:
       no_notifications: Aínda non hai notificacións.
     notifications_settings:
       show:
-        email_on_notification: Quero recibir un correo electrónico cada vez que recibo unha notificación.
         everything_followed: Todo o que segue
         newsletter_notifications: Quero recibir boletíns
         newsletters: Boletíns informativos
         own_activity: A miña propia actividade, como cando alguén comenta na miña proposta ou me menciona
         receive_notifications_about: Quero recibir notificacións sobre
-        send_notifications_by_email: Envíe notificacións por correo electrónico
         update_notifications_settings: Gardar cambios
       update:
         error: Produciuse un erro ao actualizar a configuración das notificacións.
         success: A configuración das notificacións actualizouse correctamente.
+    offline:
+      show:
+        message: Semella que non tes conexión. Por favor, téntao de novo máis tarde.
+        retry: Tentar de novo
     open_data:
       not_available_yet: Os ficheiros Open Data aínda non están dispoñibles. Téntao de novo nuns minutos.
     own_user_groups:
@@ -872,7 +888,6 @@ gl:
         form:
           legend: Concorda cos termos e condicións de uso
         refuse:
-          modal_body: Rexeitar, non será capaz de utilizar a plataforma, pode <a href="%{data_portability_path}">Descargar seus datos</a> e / ou <a href="%{delete_path}">eliminar a súa conta</a>.
           modal_btn_continue: Aceptar termos e continuar
           modal_btn_exit: Vou revisalo máis tarde
           modal_button: Rexeitar os termos
@@ -984,6 +999,8 @@ gl:
       login_modal:
         please_sign_in: Inicia sesión
         sign_up: Rexistrarse
+      mentions_modal:
+        remove_recipient: Eliminar o destinatario %{name}
       participatory_space_filters:
         filters:
           areas: �mbitos
@@ -1014,9 +1031,6 @@ gl:
       pages_count: Páxinas
       participants_count: Participantes
       users_count: Participantes
-    user_activity:
-      index:
-        no_activities_warning: Este usuario aínda non tivo ningunha actividade.
     user_conversations:
       show:
         back: Amosar todas as conversas
@@ -1032,6 +1046,9 @@ gl:
       update:
         error: Produciuse un erro ao actualizar os teus intereses.
         success: Os teus intereses foron actualizados correctamente.
+    user_report_mailer:
+      notify:
+        details: Detalles fornecidos polo usuario
     version_author:
       show:
         deleted: Usuario eliminado
@@ -1060,7 +1077,6 @@ gl:
     invitations:
       edit:
         header: Acaba de crear a túa conta
-        nickname_help: O teu identificador único en %{organization}.
         submit_button: Gardar
         subtitle: Se aceptas a invitación, configure o teu alcume e contrasinal.
       invitation_removed: A túa invitación foi eliminada.
@@ -1127,7 +1143,6 @@ gl:
     passwords:
       edit:
         change_my_password: Cambiar o meu contrasinal
-        change_your_password: Cambia o teu contrasinal
         confirm_new_password: Confirma o contrasinal novo
         new_password: Novo contrasinal
       new:
@@ -1200,10 +1215,6 @@ gl:
     timestamp_error_message: Sentímolo, iso foi demasiado rápido. Reenvío de novo.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este sitio usa cookies. Ao continuar navegando polo sitio, acepta o noso uso das cookies. Máis información %{link}.
-        link_label: aquí
-        ok: Estou de acordo
       edit_link:
         edit: Editar
       footer:
@@ -1222,6 +1233,10 @@ gl:
         expire_time_html: A túa sesión caducará en <b><span class="minutes">%{minutes}</span> minutos</b>.
       notifications_dashboard:
         mark_all_as_read: Marca todo como lido
+      offline_banner:
+        cache_version_page: Vaites! A túa rede está desconectada. O que estás a ver é unha versión previa da páxina gardada na caché, é podería non estar actualizada.
+      upload_modal:
+        close_modal: Pechar modal
       user_menu:
         admin_dashboard: Taboleiro de administración
         conversations: Conversas
diff --git a/decidim-core/config/locales/hu.yml b/decidim-core/config/locales/hu.yml
index 021139824efe5..e98280c0f909a 100644
--- a/decidim-core/config/locales/hu.yml
+++ b/decidim-core/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -73,7 +74,8 @@ hu:
     'true': 'Igen'
   carrierwave:
     errors:
-      image_too_big: A kép mérete túl nagy
+      file_resolution_too_large: A fájl felbontása túl nagy
+      file_size_too_large: Túl nagy a fájl mérete
       not_inside_organization: A fájl nincs csatolva egyetlen szervezethez sem
   date:
     formats:
@@ -109,7 +111,6 @@ hu:
       x_seconds:
         one: 1 másodperce
         other: "%{count} másodperce"
-        zero: éppen most
   decidim:
     accessibility:
       external_link: Külső hivatkozás
@@ -118,9 +119,6 @@ hu:
       skip_button: Ugrás a fő tartalomra
     account:
       blocked: Ezt a fiókot az �ltalános Szerződési Feltételek megsértése miatt blokkoltuk
-      data_portability_export:
-        file_no_exists: Fájl nem létezik
-        notice: Az adatok letöltése jelenleg folyamatban van. Ha befejeződött, e-mailt fogsz kapni.
       delete:
         alert: Ez a művelet nem visszavonható. Ha törlöd a fiókjod, nem fogsz tudni bejelentkezni a hitelesítő adataiddal. Fiókod törlése a hozzájárulásaid anonimizálását eredményezi. Továbbra is létrehozhatsz új fiókot, de ezek a hozzájárulások nem fognak kapcsolódni hozzá.
         confirm:
@@ -132,8 +130,21 @@ hu:
       destroy:
         error: Hiba történt a fiók törlése során.
         success: Fiók törlése sikeres.
+      download_your_data_export:
+        file_no_exists: Fájl nem létezik
+        notice: Az adatok letöltése jelenleg folyamatban van. Ha befejeződött, e-mailt fogsz kapni.
+      email_change:
+        body1: '%{unconfirmed_email} címre kiküldtük az emailt, hogy az új emailcímed megerősítsd.'
+        body2: Újraküldjük a megerősítő emailt? %{resend_link} vagy %{cancel_link}.
+        cancel: mégse
+        cancel_error: Nem sikerült az email változást jóváhagyni.
+        cancel_successfully: Az email változtatása sikerült.
+        resend_error: Nem sikerült a megerősítő emailt újraküldeni.
+        resend_successfully: Sikeresen újraküldtük a megerősítő emailt a %{unconfirmed_email} címre
+        send_again: Újraküldés
+        title: Az email változtatás ellenőrzése
       show:
-        available_locales_helper: Válasszd ki a nyelvet, amelyet használni szeretnél a Decidim értesítéseinek böngészéshez és fogadásához
+        available_locales_helper: Válasszd ki a nyelvet, amelyet használni szeretnél a platform értesítéseinek böngészéshez és fogadásához
         change_password: Jelszó módosítása
         update_account: Fiók frissítése
       update:
@@ -143,16 +154,44 @@ hu:
     admin:
       actions:
         cancel: Mégse
+      password_change:
+        alert: A továbblépéshez a jelszó megváltoztatására van szükség
+        notification: Az admin felhasználóknak minden %{days} napon jelszót kell cserélniük.
     admin_log:
       area:
         create: "%{user_name} létrehozta a(z) %{resource_name} területet"
         delete: "%{user_name} törölte a(z) %{resource_name} területet"
         update: "%{user_name} frissítette a(z) %{resource_name} területet"
+      area_type:
+        create: "%{user_name} létrehozta a %{resource_name} terület típust"
+        delete: "%{user_name} törölte a %{resource_name} terület típust"
+        update: "%{user_name} frissíttette a %{resource_name} terület típust"
+      attachment:
+        create: "%{user_name} létrehozta a(z) %{resource_name} mellékletet"
+        delete: "%{user_name} törölte a %{resource_name} mellékletet"
+        update: "%{user_name} frissítette a %{resource_name} mellélkletet"
+      attachment_collection:
+        create: "%{user_name} létrehozta a(z) %{resource_name} melléklet gyűjteményt"
+        delete: "%{user_name} törölte a(z) %{resource_name} melléklet gyűjteményt"
+        update: "%{user_name} frissítette a(z) %{resource_name} melléklet gyűjteményt"
+      category:
+        create: "%{user_name} hozzáadta a(z) %{resource_name} kategóriát ehhez a térhez: %{space_name}"
+        delete: "%{user_name} törölte a(z) %{resource_name} kategóriát ebből a térből: %{space_name}"
+        update: "%{user_name} frissítette a(z) %{resource_name} kategóriát ebben a térben: %{space_name}"
       component:
         create: "%{user_name} hozzáadta a(z) %{resource_name} elemet ehhez: %{space_name}"
         delete: "%{user_name} eltávolította a(z) %{resource_name} elemet innen: %{space_name}"
+        export_component: "%{user_name} exportálta a %{resource_name}%{component_name} itt %{space_name} mint %{format_name}"
         publish: "%{user_name} közzétette a(z) %{resource_name} elemet itt: %{space_name}"
         unpublish: "%{user_name} visszavonta a(z) %{resource_name} elem közzétetelét innen: %{space_name}"
+        update_permissions_with_space: "%{user_name} frissítette a(z) %{resource_name} engedélyeit itt: %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} frissítette a(z) %{resource_name} segítség szekciót"
+      helpers:
+        answers: válaszok
+        comments: Hozzászólások
+        projects: projektek
+        results: eredmények
       impersonation_log:
         manage: "%{user_name} kezelte a %{resource_name} erőforrást ebből az okból %{reason}"
       moderation:
@@ -169,6 +208,7 @@ hu:
         update: "%{user_name} frissítette a(z) %{resource_name} OAuth alkalmazást"
       organization:
         update: "%{user_name} frissítette a szervezet beállításait"
+        update_external_domain: "%{user_name} frissítette a szervezet külső domainjeit"
       participatory_space_private_user:
         create: "%{user_name} meghívott %{resource_name} privát felhasználónak"
         create_via_csv: "%{user_name} meghívta %{resource_name} önt, hogy privát résztvevő legyen"
@@ -180,6 +220,10 @@ hu:
         delete_with_parent: "%{user_name} törölte a(z) %{resource_name} hatáskört ebből: %{parent_scope}"
         update: "%{user_name} frissítette a(z) %{resource_name} hatáskört"
         update_with_parent: "%{user_name} frissítette a(z) %{resource_name} hatáskört ezen belül: %{parent_scope}"
+      scope_type:
+        create: "%{user_name} létrehozta a %{resource_name} hatáskört"
+        delete: "%{user_name} törölte a %{resource_name} hatáskört"
+        update: "%{user_name} létrehozta a %{resource_name} hatáskört"
       static_page:
         create: "%{user_name} létrehozta a(z) %{resource_name} statikus oldalt"
         delete: "%{user_name} törölte a(z) %{resource_name} statikus oldalt"
@@ -305,6 +349,7 @@ hu:
       endorsements:
         one: jóváhagyás
         other: jóváhagyások
+      official_author: Hivatalos
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Ellenőriztesd magad egy "A" betűvel kezdődő útlevél számmal
@@ -371,7 +416,7 @@ hu:
           request_confirmation_instructions: Kérjen megerősítési utasítást
           title: Erősítsd meg az e-mail címed
       show:
-        close_modal: Felugró ablak bezárása
+        close_modal: Modal bezárása
     block_user_mailer:
       notify:
         body_1: A fiókod zárolva van.
@@ -409,8 +454,8 @@ hu:
             amendments_enabled: A módosítások engedélyezve vannak
             comments_enabled: Megjegyzések engedélyezve
             comments_max_length: A hozzászólások maximális hossza
-            dummy_global_attribute_1: Dummy tulajdonság 1
-            dummy_global_attribute_2: Dummy tulajdonság 2
+            dummy_global_attribute1: Dummy tulajdonság 1
+            dummy_global_attribute2: Dummy tulajdonság 2
             dummy_global_translatable_text: Kenyérszöveg - nem valódi fordítható szöveg
             enable_pads_creation: A közös dokumentum létrehozásának engedélyezése
             resources_permissions_enabled: Erőforrás-engedélyek biztosítva
@@ -422,8 +467,8 @@ hu:
             amendment_reaction_enabled: A módosító reakció engedélyezett
             amendments_visibility: A módosítás láthatósága
             comments_blocked: Megjegyzések letiltva
-            dummy_step_attribute_1: Dummy Lépés tulajdonság 1
-            dummy_step_attribute_2: Dummy Lépés tulajdonság 2
+            dummy_step_attribute1: Dummy Lépés tulajdonság 1
+            dummy_step_attribute2: Dummy Lépés tulajdonság 2
             dummy_step_translatable_text: Hamis Lépés Fordítható Szöveg
     contact: Kapcsolat
     content_blocks:
@@ -467,12 +512,6 @@ hu:
       actions:
         login_before_access: Kérlek jelentkezz be a fiókodba a hozzáféréshez
         unauthorized: Nem vagy jogosult a művelet végrehajtására
-    data_portability:
-      export:
-        ready: Kész
-      show:
-        download_data: Töltsd le az adatokat
-        request_data: Adatkérés
     datepicker:
       help_text: 'Várható formátum: %{datepicker_format}'
     devise:
@@ -491,7 +530,6 @@ hu:
           newsletter: Hírlevél fogadása a legfontosabb információkkal
           newsletter_title: Kapcsolatfelvételi engedély
           nickname_help: A beceneved itt %{organization} csak betűket, számokat '-' és '_' jeleket tartalmazhat.
-          password_help: "%{minimun_characters} karakter a minimum, nem lehet túl gyakori (pl. 123456), és különböznie kell a becenevétől és az e-mail címétől."
           sign_in: Belépés
           sign_up: Regisztráció
           sign_up_as:
@@ -539,6 +577,12 @@ hu:
           this_application_will_not_be_able_to: 'Ez az alkalmazás nem képes erre:'
           update_profile: Frissítsd a profilod
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> szeretné használni a fiókod"
+    download_your_data:
+      export:
+        ready: Kész
+      show:
+        download_data: Töltsd le az adatokat
+        request_data: Adatkérés
     editor_images:
       create:
         error: Hiba történt a kép feltöltése közben
@@ -694,7 +738,7 @@ hu:
         user_officialized:
           email_outro: Azért kapta ezt az értesítést, mert Ön a szervezet adminisztrátora.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Letöltés
       export:
         ready: Mellékelve találod az exportálás tömörített változatát.
@@ -728,7 +772,6 @@ hu:
         button: Követés törlése
         error: Hiba történt az erőforrás követésének visszavonásakor.
     forms:
-      current_file: Jelenlegi fájl
       current_image: Jelenlegi kép
       default_image: Alapértelmezett kép
       errors:
@@ -739,8 +782,29 @@ hu:
       file_help:
         file:
           message_1: Képnek vagy dokumentumnak kell lennie.
-          message_2: A képekhez lehetőleg fekvő képeket használjon, a szolgáltatás megvágja a képet. CSV-fájlok esetén az oszlopok közötti elválasztójelnek vesszőnek (",") kell lennie
-      remove_this_file: Töröld ezt a fájlt
+          message_2: Képeknél a fekvő elrendezés ajánlott, a kép szélei automatikusan levágásra kerülnek.
+        icon:
+          explanation: 'Útmutató:'
+          message_1: A képnek négyzet alakúnak kell lennie.
+          message_2: A javasolt képméret 512x512 px.
+      upload:
+        labels:
+          add_attachment: Melléklet hozzáadása
+          add_file: Fájl hozzáadása
+          add_image: Képek hozzáadása
+          cancel: Mégse
+          edit_image: Kép szerkesztése
+          error: Hiba!
+          remove: Eltávolítás
+          replace: Csere
+          save: Mentés
+          title: Cím
+          title_required: A cím megadása kötelező!
+          uploaded: Feltöltve
+          validating: Ellenőrzés...
+          validation_error: Hitelesítési hiba!
+      upload_help:
+        dropzone: Húzza ide fájlokat vagy kattintson a feltöltéshez
     gamification:
       all_badges_link: Az összes elérhető jelvény megtekintése.
       badges:
@@ -841,7 +905,6 @@ hu:
       no_user_groups: Még nem tartozik semmiféle csoporthoz.
       roles:
         admin: Adminisztrátor
-        creator: Teremtő
         member: Tag
       update:
         error: Probléma történt a csoport frissítésével
@@ -860,6 +923,9 @@ hu:
       index:
         last_activity: Utolsó bejelentkezés, utolsó használat
         resource_type: típus
+    links:
+      warning:
+        close_modal: Modal bezárása
     log:
       base_presenter:
         create: "%{user_name} létrehozta ezt: %{resource_name}"
@@ -869,6 +935,7 @@ hu:
         unknown_action: "%{user_name} módosította ezt: %{resource_name}"
         unknown_action_with_space: "%{user_name} valamilyen műveletet hajtott végre itt: %{resource_name} %{space_name}"
         update: "%{user_name} frissítette ezt: %{resource_name}"
+        update_permissions_with_space: "%{user_name} frissítette a(z) %{resource_name} engedélyeit itt: %{space_name}"
         update_with_space: "%{user_name} frissítette ezt: %{resource_name} a %{space_name}"
       value_types:
         area_presenter:
@@ -989,7 +1056,6 @@ hu:
     newsletter_mailer:
       newsletter:
         note: Ezt az emailt azért kapta meg, mert feliratkozott a(z) %{organization_name}hírlevelekre. Megváltoztathatja a beállításokat az <a href="%{link}">értesítések oldalon</a>.
-        see_on_website: Nem jelenik meg rendesen? Nézd meg a <a href="%{link}" target="_blank">honlapunkon</a>.
         unsubscribe: Az ilyen emailek fogadásának kikapcsolása, <a href="%{link}" target="_blank" class="unsubscribe">Leiratkozás</a>.
     newsletter_templates:
       basic_only_text:
@@ -1041,22 +1107,43 @@ hu:
       no_notifications: Még nincs értesítés.
       show:
         missing_event: Hopp, ez az értesítés egy olyan elemhez tartozik, ami már nem elérhető. Figyelmen kívül hagyhatod.
+    notifications_digest_mailer:
+      header:
+        daily: Napi értesítések
+        weekly: Heti értesítés összegző
+      hello: Helló %{name}
+      intro:
+        daily: 'A követett tevékenységek kapcsán az előző napok értesítései a következők:'
+        weekly: 'A követett tevékenységek kapcsán az elmúlt hét értesítései a következők:'
+      outro: 'Azért kapta ezt az értesítést, mert követi a következőt: %{author_name}. A profiloldalon visszavonhatja a felhasználó követését.'
+      see_more: Összes értesítés megjelenítése
+      subject: Ez az összegződ
     notifications_settings:
       show:
         administrators: Adminisztrátorok
         allow_public_contact: Megengedem, hogy bárki közvetlen üzenetet küldjön nekem, akkor is, ha nem követem őket.
         direct_messages: Közvetlen üzenetek fogadása bárkitől
-        email_on_notification: Mindig, amikor értesítést kapok, egy emailt is küldünk róla.
+        email_on_moderations: Szeretnék e-mailt kapni, valahányszor valamit vagy valakit jelentenek moderálás miatt.
         everything_followed: Minden, amit követek
         newsletter_notifications: Szeretnék hírleveleket kapni
         newsletters: Hírlevelek
+        notification_settings:
+          close_meeting_reminder: Szeretnék e-mailben emlékeztetőt kapni a zárt megbeszélésekről és nem nyilvános jelentésekről
+        notifications_sending_frequencies:
+          daily: Napi
+          real_time: Valósidejű
+          weekly: Heti
+        notifications_sending_frequency: Milyen gyakran szeretne e-mailt kapni az értesítésekről?
         own_activity: Saját tevékenységem - amikor valaki megjegyzést fűz a javaslatomhoz, vagy megemlíti a nevemet
         receive_notifications_about: Értesítést szeretnék kapni
-        send_notifications_by_email: Értesítések küldése e-mailben
         update_notifications_settings: Változások mentése
       update:
         error: Hiba történt az értesítési beállítások frissítése során.
         success: Az értesítési beállításaid frissítése sikeres volt.
+    offline:
+      show:
+        message: Úgy tűnik, nem kapcsolódik az internethez. Kérjük, próbálja meg újra később.
+        retry: Újra
     open_data:
       not_available_yet: Az Open Data fájlok még nem érhetők el, próbálkozzon újra pár perc múlva.
     own_user_groups:
@@ -1110,7 +1197,6 @@ hu:
           agreement: Elfogadom a feltételeket
           legend: Elfogadom a felhasználási feltételeket
         refuse:
-          modal_body: Ha elutasítod, akkor nem fogod tudni használi a platformot. <a href="%{data_portability_path}">Töltsd le az adataidat</a> és/vagy <a href="%{delete_path}">töröld a fiókod</a>.
           modal_btn_continue: Elfogadom és tovább lépek
           modal_btn_exit: Később átnézem
           modal_button: Elutasítom a feltételeket
@@ -1232,6 +1318,8 @@ hu:
       login_modal:
         please_sign_in: Jelentkezz be
         sign_up: Regisztrálj
+      mentions_modal:
+        remove_recipient: '%{name} címzett eltávolítása'
       participatory_space_filters:
         filters:
           areas: Területek
@@ -1261,9 +1349,6 @@ hu:
       help_text: "<strong>Figyelem:</strong> A tartalmat automatikusan fordíthatták, és nem 100% -ban pontos."
       show_original: Eredeti szöveg mutatása
       show_translated: Automatikusan lefordított szöveg mutatása
-    user_activity:
-      index:
-        no_activities_warning: Ez a résztvevő még nem végzett tevékenységet.
     user_contact_disabled: Ez a résztvevő nem fogad el közvetlen üzeneteket.
     user_conversations:
       create:
@@ -1305,6 +1390,7 @@ hu:
       notify:
         body_1: '%{user} felhasználót jelentette %{token}'
         body_2: 'Indok: %{reason}'
+        details: Felhasználó által megadott adatok
         greetings: Üdvözöljük, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hello %{admin},
         subject: 'Felhasználó jelentésre került itt: %{organization_name}'
@@ -1365,7 +1451,7 @@ hu:
     invitations:
       edit:
         header: Profil létrehozásának befejezése
-        nickname_help: 'Egyedi azonosítód ehhez: %{organization}.'
+        nickname_help: A beceneved itt %{organization} csak betűket, számokat '-' és '_' jeleket tartalmazhat.
         submit_button: Mentés
         subtitle: Ha elfogadod a meghívást, állítsd be a beceneved és a jelszavad.
       invitation_removed: Meghívása eltávolításra került.
@@ -1432,10 +1518,11 @@ hu:
     passwords:
       edit:
         change_my_password: A jelszó megváltoztatása
-        change_your_password: változtasd meg a jelszavadat
         confirm_new_password: Erősítse meg az új jelszót
         new_password: Új jelszó
         password_help: "%{minimun_characters} karakter a minimum, nem lehet túl gyakori (pl. 123456), és különböznie kell a becenevétől és az e-mail címétől."
+        password_help_admin: "%{minimun_characters} karakter a minimum, nem lehet túl gyakori (pl. 123456), és különböznie kell a becenevétől és az e-mail címétől és a régi jelszavaitól."
+        title: Jelszó módosítása
       new:
         forgot_your_password: Elfelejtette a jelszavát?
         send_me_reset_password_instructions: Küldje el a jelszavas utasítások visszaállítását
@@ -1513,14 +1600,49 @@ hu:
     timestamp_error_message: Sajnos ez túl gyors volt! Kérlek, küldd el újra.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: 'Ez az oldal cookie-kat használ. A böngészés folytatásával elfogadod a cookie-k használatát. Tudjon meg többet: %{link}.'
-        link_label: itt
-        ok: Elfogadom
+      data_consent:
+        details:
+          columns:
+            service: Szolgáltatás
+          items:
+            _session_id:
+              description: Lehetővé teszi a weboldalak számára, hogy emlékezzenek a felhasználóra a weboldalon belül, amikor az a weboldalak között mozog.
+              service: Ez a weboldal
+            decidim-consent:
+              description: Tárolja a felhasználó által a weboldalon engedélyezett sütikre vonatkozó információkat.
+              service: Ez a weboldal
+            pwaInstallPromptSeen:
+              service: Ez a weboldal
+          types:
+            cookie: Süti
+        dialog:
+          accept_all: Összes elfogadása
+          accept_only_essential: Csak a szükséges elfogadása
+          description: 'A jelenlegi angol nyelvű szöveg kissé zavaros. Talán így kellene olvasni: "Weboldalunkon sütiket használunk a weboldal teljesítményének és tartalmának javítása érdekében. A sütik lehetővé teszik számunkra, hogy személyre szabottabb felhasználói élményt és tartalmat nyújtsunk a közösségi média csatornáinkról.'
+          settings: Beállítások
+          title: Információ a weboldalon felhasznált sütikről
+        modal:
+          accept_all: Összes elfogadása
+          accept_only_essential: Csak a szükséges elfogadása
+          analytics:
+            title: Analitika & statisztika
+          essential:
+            title: Szükséges
+          marketing:
+            title: Marketing
+          preferences:
+            title: Preferenciák
+          save_settings: Beállítások mentése
+          title: Süti beállítások
+          toggle: Váltás %{consent_category}
+        warning:
+          all_categories: összes süti
+          change_settings: A süti beállítások módosítása
       edit_link:
         edit: Szerkesztés
       footer:
         cc_by_license: A Creative Commons licence
+        data_consent_settings: Süti beállítások
         decidim_logo: Decidim-logó
         download_open_data: Töltse le a Nyílt Adat fájlokat
         made_with_open_source: Az oldal <a target="_blank" href="https://github.com/decidim/decidim">nyílt forráskódú szoftverrel</a> készült.
@@ -1540,6 +1662,8 @@ hu:
       notifications_dashboard:
         mark_all_as_read: Összes megjelölése olvasottként
         mark_as_read: Megjelölés olvasottként
+      offline_banner:
+        cache_version_page: Upsz! Nem kapcsolódik az internetre. Most az oldal egy régebbi, eltárolt változatát látja, ami lehet, hogy nem teljesen friss.
       social_media_links:
         facebook: "%{organization} a Facebookon"
         github: "%{organization} a GitHubon"
@@ -1550,7 +1674,9 @@ hu:
         body: Ön %{minutes} percig inaktív volt. Ha továbbra is inaktív marad, a saját biztonsága érdekében automatikusan kijelentkeztetjük.
         continue_session: Munkamenet folytatása
         sign_out: Kijelentkezés
-        title: Folytatja a munkamenetet?
+        title: Folytatod a munkameneted?
+      upload_modal:
+        close_modal: Ablak bezárás
       user_menu:
         account: 'Felhasználói fiók: %{name}'
         admin_dashboard: Admin vezérlőpult
@@ -1583,6 +1709,7 @@ hu:
     nickname_included_in_password: túlságosan hasonlít a becenevéhez
     not_enough_unique_characters: nem tartalmaz elegendő egyedi karaktert
     password_not_allowed: nem engedélyezett
+    password_repeated: korábban már használt jelszó nem megfelelő
     password_too_common: túl gyakori
     password_too_long: túl hosszú
     password_too_short: túl rövid
diff --git a/decidim-core/config/locales/id-ID.yml b/decidim-core/config/locales/id-ID.yml
index 7288b7e5b7a7f..9785c0c874583 100644
--- a/decidim-core/config/locales/id-ID.yml
+++ b/decidim-core/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -44,9 +45,6 @@ id:
   booleans:
     'false': 'Tidak'
     'true': 'iya nih'
-  carrierwave:
-    errors:
-      image_too_big: Gambarnya terlalu besar
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -56,9 +54,6 @@ id:
       decidim_with_month_name_short: "%d %b"
   decidim:
     account:
-      data_portability_export:
-        file_no_exists: File tidak ada
-        notice: Data Anda sedang dalam proses. Anda akan menerima email setelah selesai.
       delete:
         confirm:
           close: Tutup jendela
@@ -69,6 +64,9 @@ id:
       destroy:
         error: Terjadi kesalahan saat menghapus akun Anda.
         success: Akun Anda berhasil dihapus.
+      download_your_data_export:
+        file_no_exists: File tidak ada
+        notice: Data Anda sedang dalam proses. Anda akan menerima email setelah selesai.
       show:
         change_password: Ganti kata sandi
         update_account: Perbaharui akun
@@ -243,6 +241,8 @@ id:
           explanation_html: Untuk melakukan tindakan ini Anda harus diotorisasi, sebelum melakukan itu Anda perlu mengkonfirmasi email Anda <strong>%{email}</strong>.
           request_confirmation_instructions: Meminta instruksi konfirmasi
           title: Konfirmasikan email Anda
+      show:
+        close_modal: Tutup modal
     collapsible_list:
       hidden_elements_count:
         other: dan %{count} lagi
@@ -258,14 +258,14 @@ id:
           global:
             amendments_enabled: Amandemen diaktifkan
             comments_enabled: Komentar diaktifkan
-            dummy_global_attribute_1: Atribut Dummy 1
-            dummy_global_attribute_2: Atribut Dummy 2
+            dummy_global_attribute1: Atribut Dummy 1
+            dummy_global_attribute2: Atribut Dummy 2
             enable_pads_creation: Aktifkan pembuatan bantalan
             resources_permissions_enabled: Izin sumber daya diaktifkan
           step:
             comments_blocked: Komentar diblokir
-            dummy_step_attribute_1: Atribut Langkah Dummy 1
-            dummy_step_attribute_2: Atribut Langkah Dummy 2
+            dummy_step_attribute1: Atribut Langkah Dummy 1
+            dummy_step_attribute2: Atribut Langkah Dummy 2
     contact: Kontak
     content_blocks:
       footer_sub_hero:
@@ -292,12 +292,6 @@ id:
     core:
       actions:
         unauthorized: Anda tidak berwenang untuk melakukan tindakan ini
-    data_portability:
-      export:
-        ready: Siap
-      show:
-        download_data: Unduh datanya
-        request_data: Meminta data
     datepicker:
       help_text: 'Format yang diharapkan: %{datepicker_format}'
     devise:
@@ -363,6 +357,12 @@ id:
           this_application_will_not_be_able_to: 'Aplikasi ini tidak akan dapat:'
           update_profile: Perbarui profil Anda
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> ingin menggunakan akun Anda"
+    download_your_data:
+      export:
+        ready: Siap
+      show:
+        download_data: Unduh datanya
+        request_data: Meminta data
     endorsable:
       endorsements: Endorsemen
     errors:
@@ -492,7 +492,7 @@ id:
           email_subject: "%{nickname} memperbarui profil mereka"
           notification_title: Halaman <a href="%{resource_path}">profil</a> dari %{name} (%{nickname}), yang Anda ikuti, telah diperbarui.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Unduh
       export:
         ready: Silakan temukan terlampir versi zip dari ekspor Anda.
@@ -526,12 +526,10 @@ id:
         button: Berhenti mengikuti
         error: Terjadi kesalahan saat berhenti mengikuti sumber daya ini.
     forms:
-      current_file: File saat ini
       current_image: Gambar saat ini
       default_image: Gambar default
       errors:
         error: Ada kesalahan di bidang ini.
-      remove_this_file: Hapus file ini
     gamification:
       all_badges_link: Lihat semua lencana yang tersedia.
       badges:
@@ -632,7 +630,6 @@ id:
       no_user_groups: Belum menjadi anggota grup apa pun.
       roles:
         admin: Administrator
-        creator: Pencipta
         member: Anggota
       update:
         error: Terjadi masalah saat memperbarui grup
@@ -651,6 +648,9 @@ id:
       index:
         last_activity: Aktivitas terakhir
         resource_type: Mengetik
+    links:
+      warning:
+        close_modal: Tutup modal
     log:
       base_presenter:
         create: "%{user_name} dibuat %{resource_name}"
@@ -718,7 +718,6 @@ id:
     newsletter_mailer:
       newsletter:
         note: Anda menerima email ini karena Anda berlangganan nawala pada %{organization_name}. Anda dapat mengubah pengaturan Anda pada <a href="%{link}">halaman pemberitahuan</a>.
-        see_on_website: Tidak bisa melihat email ini dengan benar? Lihat di situs web <a href="%{link}" target="_blank"></a>.
         unsubscribe: Untuk memilih tidak menerima jenis email ini, <a href="%{link}" target="_blank" class="unsubscribe">Berhenti Berlangganan</a>.
     newsletters:
       unsubscribe:
@@ -745,13 +744,11 @@ id:
       no_notifications: Belum ada pemberitahuan.
     notifications_settings:
       show:
-        email_on_notification: Saya ingin menerima email setiap kali saya menerima pemberitahuan.
         everything_followed: Semua yang saya ikuti
         newsletter_notifications: Saya ingin menerima buletin
         newsletters: Nawala
         own_activity: Aktivitas saya sendiri, seperti ketika seseorang berkomentar di proposal saya atau menyebut saya
         receive_notifications_about: Saya ingin mendapatkan pemberitahuan tentang
-        send_notifications_by_email: Kirim pemberitahuan melalui email
         update_notifications_settings: Simpan perubahan
       update:
         error: Terjadi kesalahan saat memperbarui pengaturan notifikasi Anda.
@@ -808,7 +805,6 @@ id:
         form:
           legend: Setujui persyaratan dan ketentuan penggunaan
         refuse:
-          modal_body: Jika Anda menolak, Anda tidak akan dapat menggunakan platform, Anda dapat <a href="%{data_portability_path}">mengunduh data Anda</a> dan / atau <a href="%{delete_path}">menghapus akun Anda</a>.
           modal_btn_continue: Terima persyaratan dan lanjutkan
           modal_btn_exit: Saya akan memeriksanya nanti
           modal_button: Menolak persyaratan
@@ -935,9 +931,6 @@ id:
         share_link: Membagikan tautan
     statistics:
       comments_count: Komentar
-    user_activity:
-      index:
-        no_activities_warning: Pengguna ini belum memiliki aktivitas apa pun.
     user_conversations:
       update:
         error: Pesan tidak terkirim. Coba lagi nanti
@@ -976,7 +969,6 @@ id:
     invitations:
       edit:
         header: Selesaikan membuat akun Anda
-        nickname_help: Pengenal unik Anda dalam %{organization}.
         submit_button: Menyimpan
         subtitle: Jika Anda menerima undangan, atur nama panggilan dan kata sandi Anda.
       invitation_removed: Undangan Anda telah dihapus.
@@ -1043,7 +1035,6 @@ id:
     passwords:
       edit:
         change_my_password: Ubah kata sandi saya
-        change_your_password: Ubah kata sandi Anda
         confirm_new_password: Konfirmasi password baru
         new_password: Kata sandi baru
       new:
@@ -1111,10 +1102,6 @@ id:
     timestamp_error_message: Maaf, itu terlalu cepat! Silakan kirim ulang.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Situs ini menggunakan cookie. Dengan melanjutkan menelusuri situs, Anda menyetujui penggunaan cookie kami. Cari tahu lebih banyak tentang itu %{link}.
-        link_label: sini
-        ok: saya setuju
       edit_link:
         edit: Edit
       footer:
diff --git a/decidim-core/config/locales/is-IS.yml b/decidim-core/config/locales/is-IS.yml
index 27d4ae1b25d6f..8cf7dbf665bb9 100644
--- a/decidim-core/config/locales/is-IS.yml
+++ b/decidim-core/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       account:
@@ -22,9 +23,6 @@ is-IS:
   booleans:
     'false': 'Nei'
     'true': 'Já'
-  carrierwave:
-    errors:
-      image_too_big: Myndin er of stór
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -120,12 +118,12 @@ is-IS:
         settings:
           global:
             comments_enabled: Athugasemdir virkt
-            dummy_global_attribute_1: Dummy Attribute 1
-            dummy_global_attribute_2: Dummy Attribute 2
+            dummy_global_attribute1: Dummy Attribute 1
+            dummy_global_attribute2: Dummy Attribute 2
           step:
             comments_blocked: Athugasemdir læst
-            dummy_step_attribute_1: Dummy Skref Attribute 1
-            dummy_step_attribute_2: Dummy Skref Attribute 2
+            dummy_step_attribute1: Dummy Skref Attribute 1
+            dummy_step_attribute2: Dummy Skref Attribute 2
     contact: Hafa samband
     core:
       actions:
@@ -223,12 +221,10 @@ is-IS:
       destroy:
         button: Hættu að fylgja
     forms:
-      current_file: Núverandi skrá
       current_image: Núverandi mynd
       default_image: Sjálfgefin mynd
       errors:
         error: Það er villa í þessu sviði.
-      remove_this_file: Fjarlægja þessa skrá
     log:
       base_presenter:
         create: "%{user_name} búið til %{resource_name}"
@@ -274,7 +270,6 @@ is-IS:
     newsletter_mailer:
       newsletter:
         note: Þú fékkst þennan tölvupóst vegna þess að þú ert áskrifandi að fréttabréfinu á %{organization_name}. Þú getur breytt stillingum þínum á <a href="%{link}">tilkynningarsíðunni þinni</a>.
-        see_on_website: Get ekki séð þetta netfang rétt? Skoðaðu það á <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Til að hætta við að fá þessa tegund af tölvupósti, <a href="%{link}" target="_blank" class="unsubscribe">Afskráðu</a>.
     newsletters:
       unsubscribe:
@@ -284,7 +279,6 @@ is-IS:
         unsubscribe: Afskráðu þig
     notifications_settings:
       show:
-        email_on_notification: Ég vil fá tölvupóst í hvert skipti sem ég fá tilkynningu.
         newsletter_notifications: Ég vil fá fréttabréf
         update_notifications_settings: Vista breytingar
     own_user_groups:
@@ -387,10 +381,6 @@ is-IS:
     timestamp_error_message: Því miður, það var of fljótt! Vinsamlegast sendu aftur inn.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Þessi síða notar smákökur. Með því að halda áfram að skoða síðuna samþykkirðu notkun okkar á smákökum. Finndu meira um það %{link}.
-        link_label: hér
-        ok: ég er sammála
       footer:
         made_with_open_source: Website gert með <a target="_blank" href="https://github.com/decidim/decidim">ókeypis hugbúnaði</a>.
       header:
diff --git a/decidim-core/config/locales/it.yml b/decidim-core/config/locales/it.yml
index 749275a8ebb50..31c1307dc4f53 100644
--- a/decidim-core/config/locales/it.yml
+++ b/decidim-core/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -67,7 +68,6 @@ it:
     'true': 'Si'
   carrierwave:
     errors:
-      image_too_big: L'immagine è troppo grande
       not_inside_organization: Il file non è collegato a nessuna organizzazione
   date:
     formats:
@@ -76,12 +76,6 @@ it:
       decidim_with_day_and_month_name: "%A %d %b %Y"
       decidim_with_month_name: "%d %B %Y"
       decidim_with_month_name_short: "%d %b"
-  datetime:
-    distance_in_words:
-      x_seconds:
-        one: 1 secondo fa
-        other: "%{count} secondi fa"
-        zero: adesso
   decidim:
     accessibility:
       external_link: Collegamento esterno
@@ -89,9 +83,6 @@ it:
       skip_button: Vai al contenuto principale
     account:
       blocked: Questo account è stato bloccato a causa della violazione di Termini e Condizioni
-      data_portability_export:
-        file_no_exists: Il file non esiste
-        notice: Il download dei tuoi dati è in corso. Riceverai un'email non appena completato.
       delete:
         alert: Questa azione non può essere annullata. Se elimini il tuo account non potrai accedere con le tue credenziali. La cancellazione del tuo account comporterà l'anonimizzazione dei tuoi contributi. Sarai ancora in grado di creare un nuovo account, ma questi contributi non saranno associati ad esso.
         confirm:
@@ -103,8 +94,10 @@ it:
       destroy:
         error: Si è verificato un errore durante l'eliminazione del tuo account.
         success: Il tuo account è stato eliminato correttamente.
+      download_your_data_export:
+        file_no_exists: Il file non esiste
+        notice: Il download dei tuoi dati è in corso. Riceverai un'email non appena completato.
       show:
-        available_locales_helper: Scegli la lingua che vuoi usare per navigare e ricevere notifiche in Decidim
         change_password: Cambia password
         update_account: Aggiorna l'account
       update:
@@ -381,8 +374,8 @@ it:
             amendments_enabled: Emendamenti abilitati
             comments_enabled: Commenti abilitati
             comments_max_length: Lunghezza massima dei commenti
-            dummy_global_attribute_1: Attributo fittizio 1
-            dummy_global_attribute_2: Attributo fittizio 2
+            dummy_global_attribute1: Attributo fittizio 1
+            dummy_global_attribute2: Attributo fittizio 2
             dummy_global_translatable_text: Testo traducibile Dummy
             enable_pads_creation: Abilita la creazione di pad
             resources_permissions_enabled: Permessi di risorse abilitati
@@ -394,8 +387,8 @@ it:
             amendment_reaction_enabled: Risposta all'emendamento abilitata
             amendments_visibility: Visibilità dell'emendamento
             comments_blocked: Commenti bloccati
-            dummy_step_attribute_1: Attributo Dummy Step 1
-            dummy_step_attribute_2: Attributo Dummy Step 2
+            dummy_step_attribute1: Attributo Dummy Step 1
+            dummy_step_attribute2: Attributo Dummy Step 2
             dummy_step_translatable_text: Testo traducibile Dummy
     contact: Contatto
     content_blocks:
@@ -439,13 +432,6 @@ it:
       actions:
         login_before_access: Per favore, fai login con il tuo account prima di accedere
         unauthorized: Non sei autorizzato a eseguire questa azione
-    data_portability:
-      export:
-        ready: Pronto
-      show:
-        download_data: Scarica i dati
-        download_data_description: Un file contenente tutte le informazioni associate al tuo account verrà inviato a <strong>%{user_email}</strong>. Questa email conterrà un file .zip e una password per aprirlo.<br/><br/>Per decomprimere il file, avrai bisogno di <a href="https://www.7-zip.org/">7-Zip</a> (per Windows) o <a href="https://www.keka.io/">Keka</a> (per MacOS). Se si utilizza Linux, la maggior parte delle volte il software predefinito è sufficiente. In caso contrario, è possibile utilizzare <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Richiedi dati
     datepicker:
       help_text: 'Formato previsto: %{datepicker_format}'
     devise:
@@ -464,7 +450,6 @@ it:
           newsletter: Ricevi una newsletter occasionale con informazioni pertinenti
           newsletter_title: Autorizzazione di contatto
           nickname_help: Il tuo alias in %{organization} può contenere solo lettere, numeri, '-' e '_'.
-          password_help: "%{minimun_characters} caratteri minimi, non deve essere troppo comune (ad esempio 123456) e deve essere diverso dal tuo nickname e dalla tua email."
           sign_in: Accedi
           sign_up: Registrati
           sign_up_as:
@@ -513,6 +498,13 @@ it:
           this_application_will_not_be_able_to: 'Questa applicazione non sarà in grado di:'
           update_profile: Aggiorna il tuo profilo
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> vuole utilizzare il tuo account"
+    download_your_data:
+      export:
+        ready: Pronto
+      show:
+        download_data: Scarica i dati
+        download_data_description: Un file contenente tutte le informazioni associate al tuo account verrà inviato a <strong>%{user_email}</strong>. Questa email conterrà un file .zip e una password per aprirlo.<br/><br/>Per decomprimere il file, avrai bisogno di <a href="https://www.7-zip.org/">7-Zip</a> (per Windows) o <a href="https://www.keka.io/">Keka</a> (per MacOS). Se si utilizza Linux, la maggior parte delle volte il software predefinito è sufficiente. In caso contrario, è possibile utilizzare <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> o <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Richiedi dati
     editor_images:
       create:
         error: Errore nel caricamento dell'immagine
@@ -678,7 +670,7 @@ it:
           email_subject: "%{nickname} ha aggiornato il proprio profilo"
           notification_title: La pagina <a href="%{resource_path}">profilo</a> di %{name} (%{nickname}), che stai seguendo, è stata aggiornata.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Clicca sul link per scaricare i tuoi dati.<br/>Il file sarà disponibile fino a %{date}.<br/>Avrai bisogno di <a href="https://www.7-zip.org/">7-Zip</a> (per Windows), <a href="https://www.keka.io/en/">Keka</a> (per MacOS) o <a href="https://peazip.github.io">PeaZip</a> (per Linux) per aprirlo. Password: %{password}'
         download: Scaricare
       export:
@@ -717,7 +709,6 @@ it:
         button: Smetti di seguire
         error: Si è verificato un errore ad smettere questa risorsa.
     forms:
-      current_file: File attuale
       current_image: Immagine attuale
       default_image: Immagine predefinita
       errors:
@@ -729,7 +720,6 @@ it:
         file:
           explanation: 'Orientamenti per il file:'
           message_1: Deve essere un'immagine o un documento.
-          message_2: Per le immagini, usare preferibilmente immagini orizzontali, il servizio ritaglia l'immagine. Per i file CSV, il separatore tra colonne deve essere una virgola (",")
         image:
           explanation: 'Orientamenti per il file:'
           message_1: Preferibilmente un'immagine orizzontale che non ha alcun testo.
@@ -737,7 +727,6 @@ it:
       file_validation:
         allowed_file_extensions: 'Estensioni file consentite: %{extensions}'
         max_file_size: 'Dimensione massima file: %{megabytes}MB'
-      remove_this_file: Rimuovere questo file
     gamification:
       all_badges_link: Vedi tutti i badge disponibili.
       badges:
@@ -838,7 +827,6 @@ it:
       no_user_groups: Non appartiene ancora a nessun gruppo.
       roles:
         admin: Amministratore
-        creator: Creatore
         member: Membro
       update:
         error: Si è verificato un problema durante l'aggiornamento del gruppo
@@ -863,7 +851,7 @@ it:
         body_1: Stai per visitare un collegamento esterno e vorremmo che tu sia cauto riguardo al contenuto del sito esterno.
         body_2: Per favore controlla il link che stai per visitare e assicurati di riconoscerlo come un sito sicuro prima di procedere.
         cancel: Annulla
-        close_modal: Chiudi finestra
+        close_modal: Chiudi modalità
         proceed: Procedi
         title: Apri collegamento esterno
     log:
@@ -994,7 +982,6 @@ it:
     newsletter_mailer:
       newsletter:
         note: Hai ricevuto questa email perché ti sei iscritto alla newsletter su %{organization_name}. Puoi modificare le impostazioni sulla tua <a href="%{link}">pagina di notifiche</a>.
-        see_on_website: Non riesci a vedere questa email correttamente? Visualizzala su <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Per disattivare la ricezione di questo tipo di email, <a href="%{link}" target="_blank" class="unsubscribe">Unsubscribe</a>.
     newsletter_templates:
       basic_only_text:
@@ -1046,18 +1033,19 @@ it:
         administrators: Amministratori
         allow_public_contact: Permetti a chiunque di inviarmi un messaggio diretto, anche se non lo seguo.
         direct_messages: Ricevi messaggi diretti da chiunque
-        email_on_moderations: Voglio ricevere un'email ogni volta che qualcosa viene segnalato per la moderazione.
-        email_on_notification: Voglio ricevere un'e-mail ogni volta che ricevo una notifica.
         everything_followed: Tutto ciò che seguo
         newsletter_notifications: Voglio ricevere le newsletter
         newsletters: Le Newsletter
         own_activity: La mia attività personale, come quando qualcuno commenta la mia proposta o mi menziona
         receive_notifications_about: Voglio ricevere le notifiche
-        send_notifications_by_email: Invia notifiche via email
         update_notifications_settings: Salva le modifiche
       update:
         error: Si è verificato un errore durante l'aggiornamento delle impostazioni di notifica.
         success: OK, le impostazioni per le notifiche sono state modificate.
+    offline:
+      show:
+        message: Sembra che tu sia attualmente offline. Per favore, riprova più tardi.
+        retry: Riprova
     open_data:
       not_available_yet: I file Open Data non sono ancora disponibili, riprova tra qualche minuto.
     own_user_groups:
@@ -1111,7 +1099,6 @@ it:
           agreement: Accetto le condizioni
           legend: Accetta i termini e le condizioni d'uso
         refuse:
-          modal_body: Se rifiuti, non sarai in grado di utilizzare la piattaforma, puoi <a href="%{data_portability_path}">scaricare i tuoi dati</a> e / o <a href="%{delete_path}">cancellare il tuo account</a>.
           modal_btn_continue: Accetta i termini e continua
           modal_btn_exit: Lo esaminerò più tardi
           modal_button: Rifiuta i termini
@@ -1305,9 +1292,6 @@ it:
       help_text: "<strong>Attenzione:</strong> Il contenuto potrebbe essere tradotto automaticamente e non essere accurato al 100%."
       show_original: Mostra testo originale
       show_translated: Mostra testo tradotto automaticamente
-    user_activity:
-      index:
-        no_activities_warning: Questo utente non ha ancora avuto alcuna attività.
     user_contact_disabled: Questo partecipante non accetta messaggi diretti.
     user_conversations:
       create:
@@ -1413,7 +1397,6 @@ it:
     invitations:
       edit:
         header: Completa la creazione del tuo account
-        nickname_help: Il tuo identificativo univoco in %{organization}.
         submit_button: Salva
         subtitle: Se accetti l'invito, imposta il tuo nickname e password.
       invitation_removed: Il tuo invito è stato rimosso
@@ -1480,7 +1463,6 @@ it:
     passwords:
       edit:
         change_my_password: Cambia la mia password
-        change_your_password: Cambia la tua password
         confirm_new_password: Conferma la nuova password
         new_password: Nuova password
         password_help: "%{minimun_characters} caratteri minimi, non deve essere troppo comune (ad esempio 123456) e deve essere diverso dal tuo nickname e dalla tua email."
@@ -1561,10 +1543,6 @@ it:
     timestamp_error_message: Mi dispiace, troppo veloce! Per favore, invia di nuovo.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Questo sito utilizza cookies. Se continui la navigazione significa che approvi i nostri termini di utilizzo di cookies. Per saperne di più, leggi %{link}.
-        link_label: qui
-        ok: OK, accetto
       edit_link:
         edit: Modifica
       footer:
@@ -1588,6 +1566,8 @@ it:
       notifications_dashboard:
         mark_all_as_read: Contrassegnare tutti come letti
         mark_as_read: Segna come già letto
+      offline_banner:
+        cache_version_page: Oooops! La tua rete è offline. Questa è una versione precedentemente memorizzata nella cache della pagina che stai visitando, forse il contenuto non è aggiornato.
       social_media_links:
         facebook: "%{organization} su Facebook"
         github: "%{organization} su GitHub"
diff --git a/decidim-core/config/locales/ja.yml b/decidim-core/config/locales/ja.yml
index d4748af371b49..6a443bc1648ee 100644
--- a/decidim-core/config/locales/ja.yml
+++ b/decidim-core/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -70,7 +71,8 @@ ja:
     'true': '��'
   carrierwave:
     errors:
-      image_too_big: 画��大�����
+      file_resolution_too_large: ファイル�解�度�値�大�����
+      file_size_too_large: ファイルサイズ�大�����
       not_inside_organization: ファイル���組織�も添付�れ����ん
   date:
     formats:
@@ -97,9 +99,7 @@ ja:
       x_minutes:
         other: "%{count} 分�"
       x_seconds:
-        one: 1 秒�
         other: "%{count} 秒�"
-        zero: ���今
   decidim:
     accessibility:
       external_link: 外部リンク
@@ -108,9 +108,6 @@ ja:
       skip_button: メインコンテンツ�スキップ
     account:
       blocked: ��アカウント�利用�約���よりブロック�れ����
-      data_portability_export:
-        file_no_exists: ファイル�存在���ん
-        notice: データ�ダウンロード��在進行中��。完了�る�メール�届���。
       delete:
         alert: ���作�元�戻���ん。アカウントを削除�る��ログイン�����り��。 アカウントを削除�る������貢献�匿�化�れ��。 引�続�新��アカウントを作��る����������れら�貢献�関連付�られ��ん。
         confirm:
@@ -122,8 +119,21 @@ ja:
       destroy:
         error: アカウント�削除中��題�発生����。
         success: アカウント�正常�削除�れ���。
+      download_your_data_export:
+        file_no_exists: ファイル�存在���ん
+        notice: データ�ダウンロード��在進行中��。完了�る�メール�届���。
+      email_change:
+        body1: 新��メールアドレスを確��る��� %{unconfirmed_email} �メールを�信����。
+        body2: 確�メールをも�一度�信�る必���り���？ %{resend_link} ��� %{cancel_link}
+        cancel: キャンセル
+        cancel_error: メール�変更をキャンセル����ん���。
+        cancel_successfully: メール�変更�正常�キャンセル�れ���。
+        resend_error: 確�メールを��信����ん���。
+        resend_successfully: '%{unconfirmed_email} �確�メール���信�れ���'
+        send_again: ��信
+        title: メールアドレス�変更確�
       show:
-        available_locales_helper: Decidim�ら�通知を閲覧�よ��信�る���使用�る言語を�択���
+        available_locales_helper: プラットフォーム上��通知�表示�使用�る言語を�択������
         change_password: パスワード�変更
         update_account: アカウントを更新
       update:
@@ -133,16 +143,44 @@ ja:
     admin:
       actions:
         cancel: キャンセル
+      password_change:
+        alert: 先�進む��パスワードを変更�る必���り��
+        notification: 管�者ユーザー�� %{days} 日���パスワードを変更�る必���り��。
     admin_log:
       area:
         create: "%{user_name} � %{resource_name} 領域を作�����"
         delete: "%{user_name} � %{resource_name} エリアを削除����"
         update: "%{user_name} � %{resource_name} エリアを更新����"
+      area_type:
+        create: "%{user_name} � %{resource_name} エリアタイプを作�����"
+        delete: "%{user_name} � %{resource_name} エリアタイプを削除����"
+        update: "%{user_name} � %{resource_name} エリアタイプを更新����"
+      attachment:
+        create: "%{user_name} � %{resource_name} 添付ファイルを作�����"
+        delete: "%{user_name} � %{resource_name} 添付ファイルを削除����"
+        update: "%{user_name} � %{resource_name} 添付ファイルを更新����"
+      attachment_collection:
+        create: "%{user_name} � %{resource_name} 添付ファイルコレクションを作�����"
+        delete: "%{user_name} � %{resource_name} 添付ファイルコレクションを削除����"
+        update: "%{user_name} � %{resource_name} 添付ファイルコレクションを更新����"
+      category:
+        create: "%{user_name} � %{resource_name} カテゴリを %{space_name} スペース�追加����"
+        delete: "%{user_name} � %{resource_name} スペース�ら %{space_name} カテゴリを削除����"
+        update: "%{user_name} � %{resource_name} スペース� %{space_name} カテゴリを更新����"
       component:
         create: "%{user_name} �� %{resource_name} コン�ー�ントを %{space_name} スペース�追加����"
         delete: "%{user_name} � %{resource_name} スペース�ら %{space_name} コン�ー�ントを削除����"
+        export_component: "%{user_name} �%{space_name} � %{resource_name} %{component_name} を %{format_name} ���エクス�ート����"
         publish: "%{user_name} � %{resource_name} スペース� %{space_name} コン�ー�ントを公開����"
         unpublish: "%{user_name} � %{resource_name} スペース�ら %{space_name} コン�ー�ントを�公開�����"
+        update_permissions_with_space: "%{user_name} � %{resource_name} � %{space_name} �権�を更新����"
+      contextual_help_section:
+        update: "%{user_name} � %{resource_name} ヘルプセクションを更新����"
+      helpers:
+        answers: 回答
+        comments: コメント
+        projects: プロジェクト
+        results: �果
       impersonation_log:
         manage: "%{user_name} � %{reason} �より %{resource_name} を管������。"
       moderation:
@@ -159,6 +197,7 @@ ja:
         update: "%{user_name} � %{resource_name} OAuth アプリケーションを更新����"
       organization:
         update: "%{user_name} �組織設定を更新����"
+        update_external_domain: "%{user_name} �組織�外部ドメインを更新����"
       participatory_space_private_user:
         create: "%{user_name} � %{resource_name} をプライベート�加者�招待����"
         create_via_csv: "%{user_name} � %{resource_name} をCSV経由�プライベート�加者�招待����"
@@ -170,6 +209,10 @@ ja:
         delete_with_parent: "%{user_name} � %{resource_name} スコープ内� %{parent_scope} スコープを削除����"
         update: "%{user_name} � %{resource_name} �スコープを更新����"
         update_with_parent: "%{user_name} � %{resource_name} スコープ内� %{parent_scope} スコープを更新����"
+      scope_type:
+        create: "%{user_name} � %{resource_name} スコープタイプを作�����"
+        delete: "%{user_name} � %{resource_name} �スコープタイプを削除����"
+        update: "%{user_name} � %{resource_name} スコープタイプを更新����"
       static_page:
         create: "%{user_name} � %{resource_name} ��的ページを作�����"
         delete: "%{user_name} � %{resource_name} ��的ページを削除����"
@@ -185,7 +228,9 @@ ja:
         unblock: "%{user_name} �ん� %{resource_name} �ん�ブロックを解除����"
         unofficialize: "%{user_name} ��加者 %{resource_name} を�公������"
       user_group:
+        block: "%{user_name} �ユーザーグループ %{resource_name} をブロック����"
         reject: "%{user_name} � %{resource_name} グループ�確�を拒�����"
+        unblock: "%{user_name} �ユーザーグループ %{resource_name} �ブロックを解除����"
         verify: "%{user_name} �グループ %{resource_name} を確�����"
         verify_via_csv: "%{user_name} �CSVファイルを介��グループ %{resource_name} を確�����"
       user_moderation:
@@ -293,6 +338,7 @@ ja:
         other: コメント
       endorsements:
         other: オススメ
+      official_author: 公�
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: '「A��始�るパス�ート番�を入力��確��る'
@@ -359,7 +405,7 @@ ja:
           request_confirmation_instructions: 確�手順をリクエスト�る
           title: メールアドレスを確�������
       show:
-        close_modal: ウィンドウを閉�る
+        close_modal: モーダルを閉�る
     block_user_mailer:
       notify:
         body_1: ����アカウント�ブロック�れ���。
@@ -382,6 +428,7 @@ ja:
           debate: ディベート
           initiative: イニシア�ブ
           meeting: ミーティング
+          order: 予算投票
           post: 投稿
           proposal: �案
           question: 質�
@@ -396,8 +443,8 @@ ja:
             amendments_enabled: 修正を有効��る
             comments_enabled: コメントを有効��る
             comments_max_length: コメント最大長
-            dummy_global_attribute_1: ダミーステータス１
-            dummy_global_attribute_2: ダミーステータス2
+            dummy_global_attribute1: ダミーステータス１
+            dummy_global_attribute2: ダミーステータス2
             dummy_global_translatable_text: ダミー翻訳�能�テキスト
             enable_pads_creation: パッド�作�を有効��る
             resources_permissions_enabled: リソース�権�を有効��る
@@ -409,8 +456,8 @@ ja:
             amendment_reaction_enabled: 修正�応�有効��
             amendments_visibility: 修正�表示
             comments_blocked: コメントをブロック
-            dummy_step_attribute_1: ダミーステップ属性１
-            dummy_step_attribute_2: ダミーステップ属性2
+            dummy_step_attribute1: ダミーステップ属性１
+            dummy_step_attribute2: ダミーステップ属性2
             dummy_step_translatable_text: ダミーステップ翻訳�能�テキスト
     contact: ������
     content_blocks:
@@ -454,13 +501,6 @@ ja:
       actions:
         login_before_access: アクセス�る��アカウント�ログイン������
         unauthorized: ���作を実行�る権���り��ん。
-    data_portability:
-      export:
-        ready: 準備完了
-      show:
-        download_data: データをダウンロード
-        download_data_description: ����アカウント�関連付�られ�����情報を�むファイルを<strong>%{user_email}</strong> ��信���。��メール�.zipファイル�パスワード�添付�れ����。<br/><br/>ファイルを展開�る��� <a href="https://www.7-zip.org/">7-Zip</a> (Windowsユーザー��) � <a href="https://www.keka.io/">Keka</a> (MacOSユーザー��)�必���。Linuxを�使��場�����ツール�インストール�れ��る����。インストール�れ����場�� <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> や <a href="https://peazip.github.io">PeaZip</a> �利用����。
-        request_data: データを�求�る
     datepicker:
       help_text: '期待�れるフォーマット: %{datepicker_format}'
     devise:
@@ -479,7 +519,6 @@ ja:
           newsletter: 関連�る�知ら�を���る
           newsletter_title: ニュースレターを���る
           nickname_help: '%{organization} ��ニック�ーム��。文字�数字�''-'' �よ� ''_'' ��を使用����。'
-          password_help: "�角英数字%{minimun_characters}文字以上�入力������。�純��������ん（例：123456）。アカウントIDやメールアドレス�異�る必���り��。"
           sign_in: ログイン
           sign_up: 新�登録
           sign_up_as:
@@ -528,6 +567,13 @@ ja:
           this_application_will_not_be_able_to: '��アプリケーション�次��������ん：'
           update_profile: プロフィールを更新
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> �����アカウントを使用�よ�������"
+    download_your_data:
+      export:
+        ready: 準備完了
+      show:
+        download_data: データをダウンロード
+        download_data_description: ����アカウント�関連付�られ�����情報を�むファイルを<strong>%{user_email}</strong> ��信���。��メール�.zipファイル�パスワード�添付�れ����。<br/><br/>ファイルを展開�る��� <a href="https://www.7-zip.org/">7-Zip</a> (Windowsユーザー��) � <a href="https://www.keka.io/">Keka</a> (MacOSユーザー��)�必���。Linuxを�使��場�����ツール�インストール�れ��る����。インストール�れ����場�� <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> や <a href="https://peazip.github.io">PeaZip</a> �利用����。
+        request_data: データを�求�る
     editor_images:
       create:
         error: アップロード画��エラー
@@ -671,6 +717,8 @@ ja:
           email_outro: ����プラットフォーム�管�者��る�����通知を���り���。
           email_subject: ユーザーグループ�プロファイルを更新����
           notification_title: '%{user_group_name} ユーザーグループ�プロファイルを更新��未検証��������。 <a href="%{groups_admin_path}">管�画�</a> �確���るよ���り���。'
+      nickname_event:
+        notification_body: ニック�ーム�使用方法を修正���複���よ�������大文字��文字�区別�ルールを������。<br/> ����ニック�ーム�������別�ニック�ーム�後�作��れ����自動的����変更�れ���。<a href="%{link_to_account_settings}">アカウント設定</a>�ら変更�る�������。
       notification_event:
         notification_title: <a href="%{resource_path}">%{resource_title}</a> �イベント�発生����。
       reports:
@@ -698,7 +746,7 @@ ja:
           email_subject: "%{name} �公�化�れ���"
           notification_title: �加者 %{name} (%{nickname}) �公�化�れ���。
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: '次�リンクをクリック�る�����データ�ダウンロード����。<br/>��ファイル� %{date} ��利用����。<br/>ファイルを開��� <a href="https://www.7-zip.org/">7-Zip</a> (Windowsユーザー��), <a href="https://www.keka.io/en/">Keka</a> (MacOSユーザー��) ��� <a href="https://peazip.github.io">PeaZip</a> (Linuxユーザー��)等�必���。パスワード:%{password}'
         download: ダウンロード
       export:
@@ -737,7 +785,6 @@ ja:
         button: フォローを�止
         error: リソース�フォローを解除�る際��題�発生����。
     forms:
-      current_file: �在�ファイル
       current_image: �在�画�
       default_image: デフォルト�画�
       errors:
@@ -749,15 +796,41 @@ ja:
         file:
           explanation: 'ファイル�ガイダンス:'
           message_1: 画����ドキュメント��る必���り��。
-          message_2: 画��場���横長画�を使用������。画��自動的�トリミング�れ��。CSV ファイル�場��列間�区切り文字�カンマ(",") ���れ��り��ん。
+          message_2: 画��場��ランドスケープ画��������。システム�画�を切り抜���。
+        icon:
+          explanation: 'アイコン�ガイド:'
+          message_1: 正方形�画����れ��り��ん。
+          message_2: ��画��推奨サイズ�512x512��。
         image:
           explanation: '画��ガイダンス:'
           message_1: テキストを����風景画��������。
           message_2: システム�画�を切り抜���。
       file_validation:
         allowed_file_extensions: 'アップロード�能�ファイル形�: %{extensions}'
+        max_file_dimension: '最大ファイルサイズ: %{resolution} ピクセル'
         max_file_size: '最大ファイルサイズ: %{megabytes}MB'
-      remove_this_file: ��ファイルを削除
+      files:
+        extension_allowlist: '対応���るフォーマット: %{extensions}'
+      upload:
+        labels:
+          add_attachment: 添付ファイルを追加
+          add_file: ファイルを追加
+          add_image: 画�を追加
+          cancel: キャンセル
+          edit_image: 画�を編集
+          error: エラー
+          file_size_too_large: 'ファイルサイズ�大������最大ファイルサイズ: %{megabytes}MB'
+          remove: 削除
+          replace: 置�
+          save: �存
+          title: タイトル
+          title_required: タイトル�必���
+          uploaded: アップロード済
+          validating: 検証中...
+          validation_error: 検証エラー
+      upload_help:
+        dropzone: ���ファイルをドロップ�る��クリック��アップロード���
+        explanation: '%{attribute} �ガイド'
     gamification:
       all_badges_link: 利用�能��ッジを���表示
       badges:
@@ -846,6 +919,7 @@ ja:
         success: �加リクエスト�正常�作��れ���。管�者����をグループ�承��る��リクエストを確����。
       leave:
         error: グループ�ら脱退中��題�発生����
+        last_admin: ����最後�管�者��る�����グループ�ら自分自身を削除�る�������ん。グループ�ら脱退�る�����別�メン�ーを管�者�������。
         success: グループを放棄����。
       members:
         accept_or_reject_join_requests: '次�ユーザー���グループ��加�る���申請����。リクエストを承����拒����。'
@@ -858,7 +932,7 @@ ja:
       no_user_groups: ����グループ�も属�����ん。
       roles:
         admin: 管�者
-        creator: 作�者
+        creator: 管�者
         member: メン�ー
       update:
         error: グループ�更新中��題�発生����
@@ -883,7 +957,7 @@ ja:
         body_1: ����外部リンク�アクセス�よ�������。外部サイト�内容���注�����。
         body_2: サイト�アクセス�る���訪��よ�����るリンクを�ェック��安全�サイト��る�確�������。
         cancel: キャンセル
-        close_modal: 閉�る
+        close_modal: モーダルを閉�る
         proceed: 続行
         title: 外部リンクを開�
     log:
@@ -892,9 +966,12 @@ ja:
         create_with_space: "%{user_name} � %{resource_name} � %{space_name} を作�����"
         delete: "%{user_name} � %{resource_name} を削除����"
         delete_with_space: "%{user_name} � %{resource_name} � %{space_name} を削除����"
+        publish_with_space: "%{user_name} � %{space_name} � %{resource_name} を公開����"
         unknown_action: "%{user_name} � %{resource_name} ������アクションを実行����"
         unknown_action_with_space: "%{user_name} � %{resource_name} � %{space_name} �アクションを実行����"
+        unpublish_with_space: "%{user_name} � %{space_name} � %{resource_name} を�公開�����"
         update: "%{user_name} � %{resource_name} を更新����"
+        update_permissions_with_space: "%{user_name} � %{space_name} � %{resource_name} �権�を更新����"
         update_with_space: "%{user_name} �ん� %{resource_name} � %{space_name} を更新����"
       value_types:
         area_presenter:
@@ -923,37 +1000,37 @@ ja:
       conversation_mailer:
         comanagers_new_conversation:
           admin_in_group: ���� %{group}�管�者��る����れを��������。
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{manager} � %{group}������新��会話を開始����。��らをクリック������:"
-          outro: �楽������!
+          outro: ' '
           subject: "%{manager} � %{group} ���新��会話を開始����"
         comanagers_new_message:
           admin_in_group: ���� %{group}�管�者��る����れを��������。
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{manager} �� %{group}������新��メッセージを会話�投稿����。�れらを表示�る����をクリック������："
-          outro: �楽������!
+          outro: ' '
           subject: "%{manager} � %{group} ���新��メッセージを�信����"
         new_conversation:
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{sender} �����新��会話を開始����。��らをクリック������:"
-          outro: �楽������!
+          outro: ' '
           subject: "%{sender} �����会話を開始����"
         new_group_conversation:
           admin_in_group: ���� %{group}�管�者��る����れを��������。
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{sender} �グループ %{group}��新��会話を開始����。��らをクリック������:"
-          outro: �楽������!
+          outro: ' '
           subject: "%{sender} � %{group} �会話を開始����"
         new_group_message:
           admin_in_group: ���� %{group}�管�者��る����れを��������。
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{sender} �グループ %{group}��会話�新��メッセージを投稿����。��らをクリック������:"
-          outro: �楽������!
+          outro: ' '
           subject: "%{group} � %{sender} �ら�新��メッセージ��り��"
         new_message:
-          greeting: Hi, %{recipient}!
+          greeting: �ん����%{recipient}。
           intro: "%{sender} �ん�����会話�新��メッセージを投稿����。��らをクリック������："
-          outro: �楽������!
+          outro: ' '
           subject: '%{sender} �ら�新��メッセージ��り��'
       conversations:
         add_conversation_users:
@@ -1015,7 +1092,7 @@ ja:
     newsletter_mailer:
       newsletter:
         note: '%{organization_name}�ニュースレターを購読���る�����メールを�信����。 <a href="%{link}">通知ページ</a> �設定を変更����。'
-        see_on_website: ��メール�正��表示�れ��ん�？ <a href="%{link}" target="_blank">ウェブサイト</a> �確�������。
+        see_on_website: ��メール�正��表示�れ����ん�？ <a href="%{link}" target="_blank" class="see-on-website">ウェブサイト</a> ��確�����。
         unsubscribe: ��種類�メール��信を拒��る��� <a href="%{link}" target="_blank" class="unsubscribe">購読解除</a>.
     newsletter_templates:
       basic_only_text:
@@ -1067,23 +1144,47 @@ ja:
       no_notifications: ��通知��り��ん。
       show:
         missing_event: ��通知�利用��������素�属�����。破棄������。
+    notifications_digest_mailer:
+      header:
+        daily: 日次�通知�ダイジェスト
+        weekly: 週次�通知�ダイジェスト
+      hello: �ん��� %{name} �ん�
+      intro:
+        daily: '����フォロー���るアクティビティ�基���最終日以��通知��:'
+        weekly: '�れら������フォロー���るアクティビティ�基���先週以��通知��:'
+      outro: ��コンテンツ���著者をフォロー���る����れら�通知を���り���。�れ�れ�ページ�らフォローを解除����。
+      see_more: 他�通知を見る
+      subject: ����メールダイジェスト��
     notifications_settings:
       show:
         administrators: 管�者
         allow_public_contact: フォロー�����人�らもダイレクトメッセージを�信�る
+        allow_push_notifications: プッシュ通知を�得���プラットフォーム�������動作を確����。���もオフ��る�������。
         direct_messages: ダイレクトメッセージを�信�る
-        email_on_moderations: モデレーション���何�報告�れる���メールを�信�����。
-        email_on_notification: 通知を毎回メール����る
+        email_on_moderations: ��モデレーション�報告���れ����毎回メールを���り����。
         everything_followed: 自分�フォロー���る���
         newsletter_notifications: ニュースレターを���る
         newsletters: ニュースレター
+        notification_settings:
+          close_meeting_reminder: レ�ートを未公開�閉��ミーティング�リマインドメールを�信���
+        notifications_sending_frequencies:
+          daily: 1日1回
+          none: ��
+          real_time: リアルタイム
+          weekly: 週1回
+        notifications_sending_frequency: 通知メールを�信�る頻度�？
         own_activity: 誰���案�コメント��り���言���り��時���自分自身�活動
+        push_notifications: プッシュ通知
+        push_notifications_reminder: プラットフォーム�ら通知を���る�����ブラウザ�設定�許��る必���り��。
         receive_notifications_about: 通知を���り��
-        send_notifications_by_email: 電�メール�通知を���る
         update_notifications_settings: 変更を�存
       update:
         error: 通知設定�更新中��題�発生����。
         success: 通知設定�正常�更新�れ���。
+    offline:
+      show:
+        message: �在オフライン�よ���。後�も�一度�試�����。
+        retry: �試行
     open_data:
       not_available_yet: オープンデータファイル���利用����ん。数分後�も�一度�試�����。
     own_user_groups:
@@ -1137,7 +1238,7 @@ ja:
           agreement: 上記��約����る
           legend: 利用�約����る
         refuse:
-          modal_body: 拒���場���プラットフォームを使用�����り��。 <a href="%{data_portability_path}">データをダウンロード</a> ��� <a href="%{delete_path}">アカウントを削除</a> �る�������。
+          modal_body: 拒��る場��プラットフォームを�利用�������り��。 <a href="%{download_your_data_path}">データをダウンロード</a> ��� <a href="%{delete_path}">アカウントを削除</a> �る�������。
           modal_btn_continue: 利用�約�����続�る
           modal_btn_exit: 後�確��る
           modal_button: �����
@@ -1149,6 +1250,10 @@ ja:
           title: '必須：サービス利用�約�更新を確��る'
     participatory_space_private_users:
       not_allowed: ��コンテンツを表示�る権���り��ん
+    passwords:
+      update:
+        error: パスワード�更新中��題�発生����
+        success: パスワード�正常�更新�れ���
     profile:
       deleted: �加者�削除�れ���
       inaccessible_message: ��プロファイル�利用�約���よりアクセス����ん
@@ -1292,6 +1397,8 @@ ja:
         close_modal: ウィンドウを閉�る
         please_sign_in: ログイン������
         sign_up: 新�登録
+      mentions_modal:
+        remove_recipient: �信者 %{name} を削除
       participatory_space_filters:
         filters:
           areas: エリア
@@ -1332,7 +1439,7 @@ ja:
       show_translated: 機械翻訳�れ�テキストを表示�る
     user_activity:
       index:
-        no_activities_warning: ���加者���アクティビティを行�����ん。
+        no_activities_warning: ���加者����アクティビティ��り��ん。
     user_contact_disabled: ���加者�ダイレクトメッセージを��付���ん。
     user_conversations:
       create:
@@ -1379,6 +1486,7 @@ ja:
       notify:
         body_1: ユーザー %{user} � %{token} �よ��報告�れ���
         body_2: '�由: %{reason}'
+        details: ユーザー��供��詳細
         greetings: よ����<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: �ん���� %{admin} �ん。
         subject: '%{organization_name} �新��ユーザー�報告�れ���'
@@ -1439,7 +1547,7 @@ ja:
     invitations:
       edit:
         header: アカウント�作�を完了�る
-        nickname_help: '%{organization} �ニック�ーム。'
+        nickname_help: ニック�ーム� %{organization} ��。英文字�数字�'-' �よ� '_' ��使用����。
         submit_button: �存
         subtitle: 招待を��入れる場���アカウントID�パスワードを設定������。
       invitation_removed: 招待�削除�れ���。
@@ -1506,10 +1614,11 @@ ja:
     passwords:
       edit:
         change_my_password: パスワードを変更�る
-        change_your_password: パスワードを変更�る
         confirm_new_password: 新��パスワードを確�
         new_password: 新��パスワード
         password_help: "�角英数字%{minimun_characters}文字以上�入力������。�純��������ん（例：123456）。アカウントIDやメールアドレス�異�る必���り��。"
+        password_help_admin: "%{minimun_characters} 文字以上��り��度�一般的����文字列 (例: 123456)����, ����ニック�ームや����電�メール����������パスワード�異�る文字列を指定������。"
+        title: パスワード�変更
       new:
         forgot_your_password: パスワードを�忘れ���？
         send_me_reset_password_instructions: パスワードリセット手順を�信������
@@ -1556,6 +1665,7 @@ ja:
       public: 公開情報
   errors:
     messages:
+      allowed_file_content_types: '次�拡張�を��ファイル���許��れ����: %{types}'
       already_confirmed: �確��れ���。ログイン��������
       confirmation_period_expired: '%{period}以内�確��る必���り��。新��も�をリクエスト������'
       content_type_allowlist_error: ファイル�種類�無効��
@@ -1585,14 +1695,60 @@ ja:
     timestamp_error_message: 申�訳�り��ん��早�������出������。
   layouts:
     decidim:
-      cookie_warning:
-        description_html: ��サイト�Cookieを使用�����。引�続�サイトを閲覧�る����Cookie�使用�����も�����れ��。 %{link}
-        link_label: Cookie �����詳細
-        ok: �����
+      data_consent:
+        details:
+          columns:
+            description: 説明
+            name: ��
+            service: サービス
+            type: 種別
+          items:
+            _session_id:
+              description: ウェブページ間を移動�����ウェブサイト内�ユーザーをウェブサイト�記憶��るよ�����。
+              service: ��ウェブサイト
+            decidim-consent:
+              description: ��ウェブサイト�ユーザー�許��るクッキー�関�る情報を�存���。
+              service: ��ウェブサイト
+            pwaInstallPromptSeen:
+              description: プログレッシブウェブアプリケーション(PWA) �インストール通知�ユーザー�よ��既�表示�れ��る場��ステータスを�存���。
+              service: ��ウェブサイト
+          types:
+            cookie: クッキー
+            local_storage: ローカルストレージ
+        dialog:
+          accept_all: �����入れる
+          accept_only_essential: 必須��を��入れる
+          description: 本サイト��サイト�パフォーマンス�コンテンツを�上��る����ウェブサイト上�クッキーを使用�����。 クッキー��より多��個々�ユーザーエクスペリエンス�ソーシャルメディア�ャ�ルを�供�る�������。
+          settings: 設定
+          title: ウェブサイト�使用�れるクッキー�関�る情報
+        modal:
+          accept_all: �����入れる
+          accept_only_essential: 必須��を��入れる
+          analytics:
+            description: �れら�クッキー��ウェブサイト�改善�役立�ウェブサイト�視�者を測定�よ�分��る���使用�れ��。
+            title: 分��統計
+          description: ��サイト��ウェブサイト�基本的�機能を確���ユーザー�オンライン体験を�上��る���クッキーを使用�����。 Cookie�使用を設定�よ�承���り���オプションを変更�る������も����。
+          essential:
+            description: �れら�クッキー��ウェブサイト�主��機能を�能���ユーザー�安全を�����使�れ��。 自動的�ブラウザ��存�れ�無効��る�������ん。
+            title: å¿…é ˆ
+          marketing:
+            description: �れら�クッキー���客様�ウェブサイトを��よ��使用�る��関�る情報を�集���客様�使用�る�����ウェブサイト�よりパーソナライズ�れ�マーケティングを�供�る���利用�る�������。
+            title: マーケティング
+          preferences:
+            description: �れら�クッキー��ウェブサイト上��去�行���択をウェブサイト�記憶��ユーザー�よりパーソナライズ�れ�体験を�供�る��を�能����。
+            title: 設定
+          save_settings: 設定を�存
+          title: Cookie�設定
+          toggle: '%{consent_category} �切り替�'
+        warning:
+          all_categories: ����クッキー
+          change_settings: Cookie �設定を変更�る
+          consent_required: ��コンテンツを表示�る�� %{categories} を有効��る必���り��。
       edit_link:
         edit: 編集
       footer:
         cc_by_license: クリエイティブコモンズライセンス
+        data_consent_settings: Cookie�設定
         decidim_logo: Decidim ロゴ
         download_open_data: オープンデータファイルをダウンロード
         made_with_open_source: ��サイト� <a target="_blank" href="https://github.com/decidim/decidim">フリーソフトウェア</a>�作られ����。
@@ -1612,6 +1768,8 @@ ja:
       notifications_dashboard:
         mark_all_as_read: ���既読��る
         mark_as_read: 既読��る
+      offline_banner:
+        cache_version_page: �����ットワーク�オフライン��。以��アクセス��ページ�キャッシュ�れ��ージョンを表示�����。コンテンツ�最新�����も�れ��ん。
       social_media_links:
         facebook: "Facebook � %{organization}"
         github: "GitHub � %{organization}"
@@ -1623,6 +1781,8 @@ ja:
         continue_session: セッションを続�る
         sign_out: ログアウト
         title: セッションを続行����？
+      upload_modal:
+        close_modal: モーダルを閉�る
       user_menu:
         account: 'ユーザーアカウント: %{name}'
         admin_dashboard: 管�ダッシュボード
@@ -1655,6 +1815,7 @@ ja:
     nickname_included_in_password: ニック�ーム�類似�������
     not_enough_unique_characters: ユニーク�文字��分���り��ん
     password_not_allowed: �許��れ����ん
+    password_repeated: ��パスワード��利用����ん
     password_too_common: ��り�も一般的��
     password_too_long: 長����
     password_too_short: 短����
diff --git a/decidim-core/config/locales/ka-GE.yml b/decidim-core/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-core/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-core/config/locales/lb.yml b/decidim-core/config/locales/lb.yml
index 4cd23746b6dc3..29007a6ea4fa1 100644
--- a/decidim-core/config/locales/lb.yml
+++ b/decidim-core/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -67,7 +68,6 @@ lb:
     'true': 'Jo'
   carrierwave:
     errors:
-      image_too_big: Bild ass ze grouss
       not_inside_organization: D'Datei ass net mat enger Organisatioun verbonnen
   date:
     formats:
@@ -83,9 +83,6 @@ lb:
       skip_button: Zum Haapt-Inhalt eriwwergoen
     account:
       blocked: Dësen Kont gouf gespaart wéinst dem Net-Respekt vun den allgemengen Bestëmmungen
-      data_portability_export:
-        file_no_exists: Datei existéiert net
-        notice: D'Eroflueden ass am Gaang. Du kriss en Email wann et vollstänneg ass.
       delete:
         alert: Dës Aktioun kann net réckgängeg gemaach ginn. Wann däin Kont geläscht ass, kanns du dech net méi mat de selwechten Donnéeën aloggen. Zukünfteg Beiträg sinn dann anonymiséiert. Du kanns nach ëmmer en neien Kont erstellen, mee anonym Beiträg sinn net mat engem Kont verknäppt.
         confirm:
@@ -97,8 +94,10 @@ lb:
       destroy:
         error: Et gouf e Problem beim Läschen vum Kont.
         success: De Kont gouf geläscht.
+      download_your_data_export:
+        file_no_exists: Datei existéiert net
+        notice: D'Eroflueden ass am Gaang. Du kriss en Email wann et vollstänneg ass.
       show:
-        available_locales_helper: Wiel eng Sprooch fir deng Sichfunktioun an deng Noriichten op der Decidim-Plattform
         change_password: Passwuert änneren
         update_account: Kont aktualiséieren
       update:
@@ -375,8 +374,8 @@ lb:
             amendments_enabled: Ännerungen aktivéiert
             comments_enabled: Kommentarer aktiv
             comments_max_length: Maximal Längt vun de Kommentären
-            dummy_global_attribute_1: Dummy Attribut 1
-            dummy_global_attribute_2: Dummy Attribut 2
+            dummy_global_attribute1: Dummy Attribut 1
+            dummy_global_attribute2: Dummy Attribut 2
             dummy_global_translatable_text: Dummy Text ze iwwersetzen
             enable_pads_creation: Erstellen vun Pads erméiglechen
             resources_permissions_enabled: Ressourcen-Berechtegung aktivéiert
@@ -388,8 +387,8 @@ lb:
             amendment_reaction_enabled: Reaktioun op Ännerungen aktivéiert
             amendments_visibility: Siichtbarkeet vun Ännerungen
             comments_blocked: Kommentare blockéiert
-            dummy_step_attribute_1: Dummy Schrëtt Attributer 1
-            dummy_step_attribute_2: Dummy Schrëtt Attributer 2
+            dummy_step_attribute1: Dummy Schrëtt Attributer 1
+            dummy_step_attribute2: Dummy Schrëtt Attributer 2
             dummy_step_translatable_text: Dummy Schrëtt ze iwwersetzenden Text
     contact: Kontakt
     content_blocks:
@@ -433,13 +432,6 @@ lb:
       actions:
         login_before_access: Bitte melden Sie sich mit Ihrem Konto an, um auf diese Seite zuzugreifen
         unauthorized: Du hues keng Berechtegung fir dës Aktioun
-    data_portability:
-      export:
-        ready: Fäerdeg
-      show:
-        download_data: Daten eroflueden
-        download_data_description: Eng Datei, déi all Informatiounen enthält, déi mat dengem Konto verknäppt sinn, gëtt an den <strong>%{user_email}</strong> geschéckt. Dës Mail enthält eng .zip-Datei an e Passwuert fir se opzemaachen .<br/><br/>Fir d'Datei auszepaken, brauchs du <a href="https://www.7-zip.org/">7-Zip</a> (fir Windows) oder <a href="https://www.keka.io/">Keka</a> (fir MacOS). Wann s'du mat Linux schaffs, gëtt ass et meeschtens als Standard mat installéiert. Wann net, kanns du <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> oder <a href="https://peazip.github.io">PeaZip</a> benotzen.
-        request_data: Daten ufroen
     datepicker:
       help_text: 'Format: %{datepicker_format}'
     devise:
@@ -458,7 +450,6 @@ lb:
           newsletter: Heiansdo en Newsletter mat relevanten Informatiounen zougeschéckt kréien
           newsletter_title: Erlabnis Kontakt opzehuelen
           nickname_help: Däin Pseudonym an %{organization}. Dierf nëmmen aus Buschtawen, Zuelen, _ an - bestoen.
-          password_help: "Muss op mannst aus %{minimun_characters} Zeechen bestoen, keng ze banal Zeechen (z.B. 123456) an et dierf weder däin Pseudonym nach deng Email-Adress enthalen."
           sign_in: Umelden
           sign_up: Registréieren
           sign_up_as:
@@ -507,6 +498,13 @@ lb:
           this_application_will_not_be_able_to: 'Diese Applikatioun kann net:'
           update_profile: Profil aktualiséieren
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> well däin Kont benotzen"
+    download_your_data:
+      export:
+        ready: Fäerdeg
+      show:
+        download_data: Daten eroflueden
+        download_data_description: Eng Datei, déi all Informatiounen enthält, déi mat dengem Konto verknäppt sinn, gëtt an den <strong>%{user_email}</strong> geschéckt. Dës Mail enthält eng .zip-Datei an e Passwuert fir se opzemaachen .<br/><br/>Fir d'Datei auszepaken, brauchs du <a href="https://www.7-zip.org/">7-Zip</a> (fir Windows) oder <a href="https://www.keka.io/">Keka</a> (fir MacOS). Wann s'du mat Linux schaffs, gëtt ass et meeschtens als Standard mat installéiert. Wann net, kanns du <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> oder <a href="https://peazip.github.io">PeaZip</a> benotzen.
+        request_data: Daten ufroen
     endorsable:
       endorsements: Ennerstëtzungen
       endorsements_count: Zuel vun den Ënnerstëtzer
@@ -666,7 +664,7 @@ lb:
           email_subject: "%{nickname} huet säin Profil aktualiséiert"
           notification_title: D' <a href="%{resource_path}">Profil-Säit</a> vum </a>%{name} (%{nickname}), där s'du nogees, gouf aktualiséiert.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Klick op den Link, fir den Daten erofzelueden.<br/>D''Datei steet bis den %{date} zur Verfügung.<br/>du brauchs <a href="https://www.7-zip.org/">7-Zip</a> (fir Windows), <a href="https://www.keka.io/en/">Keka</a> (fir MacOS) oder <a href="https://peazip.github.io">PeaZip</a> (fir Linux) fir d''Datei opzemaachen. Passwuert: %{password}'
         download: Eroflueden
       export:
@@ -702,7 +700,6 @@ lb:
         button: Net méi nogoen
         error: Et gouf e Problem beim Un-Followen vun dëser Ressource.
     forms:
-      current_file: Aktuell Datei
       current_image: Aktuellt Bild
       default_image: Standard-Bild
       errors:
@@ -714,7 +711,6 @@ lb:
         file:
           explanation: 'Uleedung fir dës Datei:'
           message_1: Soll eBild oder en Dokument sinn.
-          message_2: Biller sollen am beschten Landschaftsbiller sinn, den Programm passt d'Bild vum selwen un. Fir CSV-Dateien muss d'Trennung tëscht de Spalten e Komma (",") sinn
         image:
           explanation: 'Uleedung fir d''Bild:'
           message_1: Am beschten queesch Format ouni Text.
@@ -722,7 +718,6 @@ lb:
       file_validation:
         allowed_file_extensions: 'Erlaabten Datei-Endungen %{extensions}'
         max_file_size: 'Maximal Datei-Gréisst: %{megabytes}MB'
-      remove_this_file: Dës Datei läschen
     gamification:
       all_badges_link: Kuck der all méiglech Ofzeechen un.
       badges:
@@ -823,7 +818,6 @@ lb:
       no_user_groups: Gehéiert nach kengem Grupp un.
       roles:
         admin: Administrateur
-        creator: Ersteller
         member: Member
       update:
         error: Et gouf e Problem beim Aktualiséieren vum Grupp
@@ -978,7 +972,6 @@ lb:
     newsletter_mailer:
       newsletter:
         note: Du hues dës email kritt, well s'du den Newsletter vun %{organization_name} abonnéiert hues. Du kanns d'Astellungen op denger <a href="%{link}">Benachrichtigungen Seite</a> änneren.
-        see_on_website: Dës Email gëtt dir net richteg ugewisen? Klick w. e. g. hei dran <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Fir dës Zort Email ofzebestellen, <a href="%{link}" target="_blank" class="unsubscribe">Abbestellen</a>.
     newsletter_templates:
       basic_only_text:
@@ -1027,14 +1020,11 @@ lb:
         administrators: Administrateuren
         allow_public_contact: Allen erlaben, mir Direkt-Noriichten ze schécken, och vun deenen, deenen ech net nofollegen.
         direct_messages: Direkt-Noriichten vun jidderengem zougeschéckt kréien
-        email_on_moderations: Ech well en Email zougeschéckt kréien wann eppes gemellt gouf wat moderéiert soll ginn.
-        email_on_notification: Ech well all Kéiers enEmail zougeschéckt kréien, wann ech eng Noriicht kritt hunn.
         everything_followed: Vun jidderengem dem ech nofollegen
         newsletter_notifications: Ech well den Newsletter
         newsletters: Newsletter
         own_activity: Meng eegen Aktivitéit, sou wann een mäin Virschlag kommentéiert oder mech ernimmt
         receive_notifications_about: Ech well Noriichten zu
-        send_notifications_by_email: Noriichten via Email schécken
         update_notifications_settings: Ännerungen späicheren
       update:
         error: Et gouf e Problem beim Aktualiséieren vun Astellungen fir Noriichten.
@@ -1092,7 +1082,6 @@ lb:
           agreement: Ech sinn mat dësen Konditiounen averstane
           legend: Akzeptéier d'Konditiounen vum Benotzen
         refuse:
-          modal_body: Wann s'du refuséiers, wàert et dir net méiglech sinn dës Plattform ze benotzen, du kanns <a href="%{data_portability_path}">lDaten eroflueden</a> an / oder <a href="%{delete_path}">Konto läschen</a>.
           modal_btn_continue: Konditiounen akzeptéieren an weiderfueren
           modal_btn_exit: Ech iwwerpréiwen dat méi spéit
           modal_button: Konditiounen net unhuelen
@@ -1286,9 +1275,6 @@ lb:
       help_text: "<strong>Warnung:</strong> Inhalt kéint automatesch iwwersetzt sinn an net 100% korrekt sinn."
       show_original: Originaltext weisen
       show_translated: Automatesch iwwersaten Text uweisen
-    user_activity:
-      index:
-        no_activities_warning: Dësen Benotzer huet bis elo nach keng Aktivitéit.
     user_contact_disabled: Dësen Teilnehmer refuséiert direkt Noriichten.
     user_conversations:
       create:
@@ -1394,7 +1380,6 @@ lb:
     invitations:
       edit:
         header: D'Erstellen vun dengem Kont ass fäerdeg
-        nickname_help: Däin Pseudonym %{organization}.
         submit_button: Späicheren
         subtitle: Gëff w. e. g. däin Pseudonym an däin Passwuert an, fir dës Invitatioun unzehuelen.
       invitation_removed: Deng Invitatioun gouf geläscht.
@@ -1461,7 +1446,6 @@ lb:
     passwords:
       edit:
         change_my_password: Mäin Passwuert änneren
-        change_your_password: Ännert Äert Passwuert
         confirm_new_password: Neit Passwuert bestätegen
         new_password: Neit Passwuert
         password_help: "Muss op mannst aus %{minimun_characters} Zeechen bestoen, keng ze banal Zeechen (z.B. 123456) an et dierf weder däin Pseudonym nach deng Email-Adress enthalen."
@@ -1542,10 +1526,6 @@ lb:
     timestamp_error_message: Pardon dat wo ze séier! W. e. g. op en Neits areechen.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Dës Säit benotzt Cookies. Wann s'du hei weider sichs, stëmms du dem Benotzen vun Cookies zou. Méi heiriwwer %{link}.
-        link_label: Gëff méi gewuer iwwer Cookies
-        ok: Ech sinn averstanen
       edit_link:
         edit: Editéieren
       footer:
diff --git a/decidim-core/config/locales/lt.yml b/decidim-core/config/locales/lt.yml
index e6d98d162e8f8..37c8cda85f61a 100644
--- a/decidim-core/config/locales/lt.yml
+++ b/decidim-core/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -81,7 +82,8 @@ lt:
     'true': 'Taip'
   carrierwave:
     errors:
-      image_too_big: PaveikslÄ—lis per didelis
+      file_resolution_too_large: Dokumento rezoliucija per aukšta
+      file_size_too_large: Dokumento dydis per didelis
       not_inside_organization: Dokumentas nepririštas prie jokios organizacijos
   date:
     formats:
@@ -130,8 +132,9 @@ lt:
         other: "prieš %{count} min."
       x_seconds:
         one: prieš 1 sekundę
+        few: "prieš %{count} sekundes"
+        many: "prieš %{count} sekundes"
         other: "prieš %{count} sekundes"
-        zero: dabar
   decidim:
     accessibility:
       external_link: IÅ¡orinÄ— nuoroda
@@ -140,9 +143,6 @@ lt:
       skip_button: Perieti į pagrindinį turinį
     account:
       blocked: Ši paskyra užblokuota dėl sąlygų pažeidimų
-      data_portability_export:
-        file_no_exists: Failas neegzistuoja
-        notice: Parsisiun�iami jūsų duomenys. Kai procesas bus baigtas, gausite e. laišką.
       delete:
         alert: Šis veiksmas negali būti pakeistas vėliau. Jei ištrinate paskyrą nebegalėsite prie jos prisijungti. Paskyros ištrynis anonimizuos Jūsų indėlius. Galėsite susikurti naują paskyrą, ta�iau indėliai nebus jai priskirti.
         confirm:
@@ -154,6 +154,19 @@ lt:
       destroy:
         error: Ištrinant Jūsų paskyrą iškilo problema.
         success: Jūsų paskyra ištrinta.
+      download_your_data_export:
+        file_no_exists: Failas neegzistuoja
+        notice: Parsisiun�iami jūsų duomenys. Kai procesas bus baigtas, gausite e. laišką.
+      email_change:
+        body1: Išsiuntėme laišką į %{unconfirmed_email} el. pašto patvirtinimui.
+        body2: Ar reikėtų naujo el. pašto patvirtinimo laiško? %{resend_link} arba %{cancel_link}.
+        cancel: atšaukti
+        cancel_error: El. pašto pakeitimo nepavyko atšaukti.
+        cancel_successfully: El. pašto pakeitimas atšauktas sėkmingai.
+        resend_error: Neįmanoma išsiųsti patvirtinimo laiško.
+        resend_successfully: Patvirtinimo laiškas sėkmingai išsiųstas į %{unconfirmed_email}
+        send_again: Siųsti dar kartą
+        title: El. pašto pakeitimo patvirtinimas
       show:
         available_locales_helper: Pasirinkite kalbą, kuria norite naršyti platformą ir gauti pranešimus
         change_password: Pakeisti slaptažodį
@@ -165,16 +178,44 @@ lt:
     admin:
       actions:
         cancel: Atšaukti
+      password_change:
+        alert: Norėdami tęsti turite pasikeisti slaptažodį
+        notification: Administratoriai turi pakeisti savo slaptažodį kas %{days} dienas.
     admin_log:
       area:
         create: "%{user_name} sukūrė %{resource_name} erdvę"
         delete: "%{user_name} ištrynė %{resource_name} erdvę"
         update: "%{user_name} sukūrė %{resource_name} erdvę"
+      area_type:
+        create: "%{user_name} sukūrė %{resource_name} erdvės tipą"
+        delete: "%{user_name} ištrynė %{resource_name} aplinkos tipą"
+        update: "%{user_name} atnaujino %{resource_name} erdvÄ—s tipÄ…"
+      attachment:
+        create: "%{user_name} sukūrė %{resource_name} prisegimą"
+        delete: "%{user_name} ištrynė %{resource_name} prisegimą"
+        update: "%{user_name} atnaujino %{resource_name} prisegimÄ…"
+      attachment_collection:
+        create: "%{user_name} sukūrė %{resource_name} prisegimų kolekciją"
+        delete: "%{user_name} ištrynė %{resource_name} prisegimų kolekciją"
+        update: "%{user_name} atnaujino %{resource_name} prisegimų kolekciją"
+      category:
+        create: "%{user_name} pridėjo %{resource_name} kategoriją į %{space_name} erdvę"
+        delete: "%{user_name} ištrynė %{resource_name} kategoriją iš %{space_name} erdvės"
+        update: "%{user_name} atnaujino %{resource_name} kategorijÄ… %{space_name} erdvÄ—je"
       component:
         create: "%{user_name} pridÄ—jo %{resource_name} komponentÄ… %{space_name} erdvÄ—je"
         delete: "%{user_name} išėmė %{resource_name} komponentą iš %{space_name} erdvės"
+        export_component: "%{user_name} eksportavo %{resource_name}%{component_name} iš %{space_name} kaip %{format_name}"
         publish: "%{user_name} paskelbÄ— %{resource_name} komponentÄ… %{space_name} erdvÄ—je"
         unpublish: "%{user_name} depublikavo %{resource_name} komponentą iš %{space_name} erdvės"
+        update_permissions_with_space: "%{user_name} atnaujino %{resource_name} %{space_name} leidimus"
+      contextual_help_section:
+        update: "%{user_name} atnaujino %{resource_name} pagalbos dalį"
+      helpers:
+        answers: atsakymai
+        comments: komentarai
+        projects: projektai
+        results: rezultatai
       impersonation_log:
         manage: "%{user_name} tvarkÄ— %{resource_name} dÄ—l %{reason}"
       moderation:
@@ -191,6 +232,7 @@ lt:
         update: "%{user_name} atnaujino %{resource_name} „OAuth“ programą"
       organization:
         update: "%{user_name} atnaujino organizacijos nustatymus"
+        update_external_domain: "%{user_name} atnaujino organizacijos išorinius domenus"
       participatory_space_private_user:
         create: "%{user_name} pakvietė %{resource_name} būti priva�iu dalyviu"
         create_via_csv: "%{user_name} pakvietė %{resource_name} per CSV tapti priva�iu dalyviu"
@@ -202,6 +244,10 @@ lt:
         delete_with_parent: "%{user_name} pašalino %{resource_name} sritį %{parent_scope} srityje"
         update: "%{user_name} atnaujino %{resource_name} sritį"
         update_with_parent: "%{user_name} atnaujino %{resource_name} sritį %{parent_scope} srityje"
+      scope_type:
+        create: "%{user_name} sukūrė %{resource_name} srities tipą"
+        delete: "%{user_name} ištrynė %{resource_name} srities tipą"
+        update: "%{user_name} atnaujino %{resource_name} srities tipÄ…"
       static_page:
         create: "%{user_name} sukūrė %{resource_name} statinį puslapį"
         delete: "%{user_name} pašalino %{resource_name} statinį puslapį"
@@ -331,6 +377,7 @@ lt:
         few: palaikymai
         many: palaikymai
         other: palaikymai
+      official_author: Oficialus
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Patvirtinkite savo tapatybę įvesdami savo paso numerį po "A" raidės
@@ -423,6 +470,7 @@ lt:
           debate: Diskusija
           initiative: Iniciatyva
           meeting: Susitikimas
+          order: Biudžeto balsavimas
           post: Įrašas
           proposal: Pasiūlymas
           question: Klausimas
@@ -437,8 +485,8 @@ lt:
             amendments_enabled: Pataisos leidžiamos
             comments_enabled: Komentarai leidžiami
             comments_max_length: Komentarų maksimalus ilgis
-            dummy_global_attribute_1: Fiktyvus atributas 1
-            dummy_global_attribute_2: Fiktyvus atributas 2
+            dummy_global_attribute1: Fiktyvus atributas 1
+            dummy_global_attribute2: Fiktyvus atributas 2
             dummy_global_translatable_text: Testinis ver�iamas tekstas
             enable_pads_creation: Leisti bendrų dokumentų kūrimą
             resources_permissions_enabled: Išteklių leidimai įjungti
@@ -450,8 +498,8 @@ lt:
             amendment_reaction_enabled: Pataisų reakcijos įjungtos
             amendments_visibility: Pataisų matomumas
             comments_blocked: Komentarai užblokuoti
-            dummy_step_attribute_1: Fiktyvaus veiksmo atributas 1
-            dummy_step_attribute_2: Fiktyvaus veiksmo atributas 2
+            dummy_step_attribute1: Fiktyvaus veiksmo atributas 1
+            dummy_step_attribute2: Fiktyvaus veiksmo atributas 2
             dummy_step_translatable_text: Testinis Ver�iamas Tekstas
     contact: Kontaktas
     content_blocks:
@@ -495,13 +543,6 @@ lt:
       actions:
         login_before_access: Prašau prisijunkite prie savo paskyros
         unauthorized: JÅ«s neturite teisÄ—s atlikti Å¡io veiksmo
-    data_portability:
-      export:
-        ready: Pasirengęs
-      show:
-        download_data: Parsisiųsti duomenis
-        download_data_description: Rinkmena su visais su Jūsų paskyra susijusiais duomenimis bus išsiųsta į <strong>%{user_email}</strong>. Šis el. laiškas turės .zip rinkmeną ir slaptažodį, su kuriuo reikės jį atidaryti.<br/><br/>Norėdami jį atidaryti, Jums reikės <a href="https://www.7-zip.org/">7-Zip</a>(Windows) arba <a href="https://www.keka.io/">Keka</a>(MacOS). Jei naudojate Linux, dažniausiai viskas bus paruošta iš anksto. Jei ne, galite naudoti <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> arba <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Prašyti duomenų
     datepicker:
       help_text: 'Pageidaujamas formatas: %{datepicker_format}'
     devise:
@@ -520,7 +561,6 @@ lt:
           newsletter: Kartais gauti naujienlaiškį su aktualia informacija
           newsletter_title: Leidimas susisiekti
           nickname_help: Jūsų slapyvardis %{organization}. Gali būti tik raidės, skai�iai, „-“ ir „_“.
-          password_help: "%{minimun_characters} minimalus rašmenų skai�ius, rašmenys neturi būti pernelyg įprasti (pvz., 123456) ir turi skirtis nuo jūsų naudotojo vardo ir e. pašto adreso."
           sign_in: Prisijungti
           sign_up: Užsiregistruoti
           sign_up_as:
@@ -567,6 +607,13 @@ lt:
           this_application_will_not_be_able_to: 'Å i programa negalÄ—s:'
           update_profile: Atnaujinkite savo profilį
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> nori naudoti Jūsų paskyrą"
+    download_your_data:
+      export:
+        ready: Pasirengęs
+      show:
+        download_data: Parsisiųsti duomenis
+        download_data_description: Rinkmena su visais su Jūsų paskyra susijusiais duomenimis bus išsiųsta į <strong>%{user_email}</strong>. Šis el. laiškas turės .zip rinkmeną ir slaptažodį, su kuriuo reikės jį atidaryti.<br/><br/>Norėdami jį atidaryti, Jums reikės <a href="https://www.7-zip.org/">7-Zip</a>(Windows) arba <a href="https://www.keka.io/">Keka</a>(MacOS). Jei naudojate Linux, dažniausiai viskas bus paruošta iš anksto. Jei ne, galite naudoti <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> arba <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Prašyti duomenų
     editor_images:
       create:
         error: Klaida įkeliant paveikslėlį
@@ -710,6 +757,8 @@ lt:
           email_outro: Šį pranešimą gavote dėl to, kad esate platformos administratorius.
           email_subject: Naudotojų grupė atnaujino savo profilį
           notification_title: Naudotojų grupė pavadinimu %{user_group_name} atnaujino savo profilį, bet jo nepatvirtino. Galite jį patvirtinti <a href="%{groups_admin_path}">administratoriaus srityje</a>.
+      nickname_event:
+        notification_body: Pataisėme slapyvardžių naudojimo būdą, kad nebūtų dublikatų, todėl pašalinome didžiųjų ir mažųjų raidžių skyrimo taisyklę. <br/> Jūsų slapyvardis buvo sukurtas po kitu tokiu pa�iu pavadinimu, todėl jį automatiškai pervardijome. Jį galite pakeisti <a href="%{link_to_account_settings}">savo paskyros nustatymuose</a>.
       notification_event:
         notification_title: Kažkas įvyko <a href="%{resource_path}">%{resource_title}</a>.
       reports:
@@ -738,7 +787,7 @@ lt:
           email_subject: "%{name} buvo oficializuotas"
           notification_title: Dalyvis %{name} (%{nickname}) buvo oficializuotas.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Spustelėkite ant sekan�ios nuorodos, kad atsisiųsti prieigos kodų duomenis.<br/>Failas bus prieinamas iki %{date}.<br/>Jums reikės <a href="https://www.7-zip.org/">7-Zip</a> (Windows), <a href="https://www.keka.io/en/">Keka</a> (MacOS) arba <a href="https://peazip.github.io">PeaZip</a> (Linux) kad jį atverti. Slaptažodis: %{password}'
         download: Atsisiųsti
       export:
@@ -780,7 +829,6 @@ lt:
         button: Nebesekti
         error: Nutraukiant šio ištekliaus sekimą iškilo problema.
     forms:
-      current_file: Å i rinkmena
       current_image: Dabartinis paveikslÄ—lis
       default_image: Numatytas atvaizdas
       errors:
@@ -792,15 +840,39 @@ lt:
         file:
           explanation: 'Rinkmenai skirtos gairÄ—s:'
           message_1: Turi būti paveikslėlis arba dokumentas.
-          message_2: Paveikslėliams, rekomenduojame naudoti horizontalius formatus ir platforma juos apkirps. CSV rinkmenoms, atskyrimas tarp stulpelių turi būti kablelis
+          message_2: Paveikslėliams geriau naudokite horizontalųjį formatą, programa apkarpys paveikslėlį.
+        icon:
+          explanation: 'Piktogramai skirtos gairÄ—s:'
+          message_1: Paveikslėlis turi būti kvadrato formos.
+          message_2: Rekomenduojamas paveikslÄ—lio dydis yra 512x512.
         image:
           explanation: 'PaveikslÄ—liui skirtos gairÄ—s:'
           message_1: Pageidautinas horizontalaus formato paveikslÄ—lis be teksto.
           message_2: Programa apkarpo paveikslėlį.
       file_validation:
         allowed_file_extensions: 'Leidžiami rinkmenų plėtiniai: %{extensions}'
+        max_file_dimension: 'Maksimalūs rinkmenos matmenys: %{resolution} pikselių'
         max_file_size: 'Maksimalus rinkmenos dydis: %{megabytes} MB'
-      remove_this_file: Pašalinti šią rinkmeną
+      upload:
+        labels:
+          add_attachment: Prisegti priedÄ…
+          add_file: PridÄ—ti failÄ…
+          add_image: Pridėti paveikslėlį
+          cancel: Atšaukti
+          edit_image: Redaguoti atvaizdÄ…
+          error: Klaida!
+          file_size_too_large: 'Per didelė rinkemena! Didžiausias leistinas rinkemos dydis: %{megabytes} MB'
+          remove: Pašalinti
+          replace: Pakeisti
+          save: IÅ¡saugoti
+          title: Pavadinimas
+          title_required: Reikalingas pavadinimas!
+          uploaded: Įkelta
+          validating: Tvirtinama...
+          validation_error: Tvirtinimo klaida!
+      upload_help:
+        dropzone: Numeskite rinkmeną �ia arba spauskite įkėlimo mygtuką
+        explanation: Instrukcijos %{attribute}
     gamification:
       all_badges_link: Žiūrėti visus prieinamus ženklelius.
       badges:
@@ -889,6 +961,7 @@ lt:
         success: Prisijungimo prašymas sukurtas. Administratorius peržiūrės jūsų prašymą prieš priimdamas jus į grupę.
       leave:
         error: Paliekant šią grupę iškilo problema
+        last_admin: Negalite savęs pašalinti iš šios grupės, nes esate paskutinis jos administratorius. Norėdami palikti grupę, paskirkite kitą žmogų jos administratoriumi.
         success: GrupÄ— palikta.
       members:
         accept_or_reject_join_requests: 'Toliau nurodyti naudotojai pateikė prašymą prisijungti prie šios grupės. Priimkite arba atmeskite jų prašymus:'
@@ -901,7 +974,7 @@ lt:
       no_user_groups: Dar nepriklauso nÄ— vienai grupei.
       roles:
         admin: Administratorius
-        creator: KÅ«rÄ—jas
+        creator: Administratorius
         member: Narys
       update:
         error: Atnaujinant šią grupę iškilo problema
@@ -938,6 +1011,7 @@ lt:
         unknown_action: "%{user_name} atliko tam tikrus veiksmus %{resource_name}"
         unknown_action_with_space: "%{user_name} atliko tam tikrus veiksmus %{resource_name} %{space_name} erdvÄ—je"
         update: "%{user_name} atnaujino %{resource_name}"
+        update_permissions_with_space: "%{user_name} atnaujino %{resource_name} leidimus %{space_name} erdvÄ—je"
         update_with_space: "%{user_name} atnaujino %{resource_name} %{space_name} erdvÄ—je"
       value_types:
         area_presenter:
@@ -1058,7 +1132,6 @@ lt:
     newsletter_mailer:
       newsletter:
         note: Šį el. laišką gavote, nes užsiprenumeravote %{organization_name} naujienlaiškius. Galite pakeisti nuostatas savo <a href="%{link}">pranešimų puslapyje</a>.
-        see_on_website: Negalite teisingai matyti šio el. laiško? Peržiūrėkite jį <a href="%{link}" target="_blank">interneto svetainėje</a>.
         unsubscribe: Jei nenorite gauti tokio tipo el. laiško, <a href="%{link}" target="_blank" class="unsubscribe">Atsisakykite prenumeratos</a>.
     newsletter_templates:
       basic_only_text:
@@ -1110,23 +1183,47 @@ lt:
       no_notifications: Dar nėra pranešimų.
       show:
         missing_event: Oi, šis pranešimas priklauso elementui, kuris yra nebepasiekiamas. Galite jį ištrinti.
+    notifications_digest_mailer:
+      header:
+        daily: Kasdienė pranešimų santrauka
+        weekly: Savaitinė pranešimų santrauka
+      hello: Sveiki %{name},
+      intro:
+        daily: 'Tai yra paskutinės dienos pranešimai, pagrįsti jūsų stebima veikla:'
+        weekly: 'Tai yra paskutinės savaitės pranešimai, pagrįsti jūsų stebima veikla:'
+      outro: Šiuos pranešimus gavote, nes sekate šį turinį arba jo autorius. Galite atsisakyti juos sekti turinio ir autorių atitinkamuose puslapiuose.
+      see_more: Daugiau pranešimų
+      subject: Tai yra jūsų laiškų santrauka
     notifications_settings:
       show:
         administrators: Administratoriai
         allow_public_contact: Leiskite bet kam jums siųsti tiesiogines žinutes, net jeigu jų nesekate.
+        allow_push_notifications: Gaukite tiesioginius pranešimus, kad sužinotumėte, kas vyksta, kai nesate platformoje. Galite bet kada juos išjungti.
         direct_messages: Gauti tiesioginius pranešimus iš bet kurio asmens
         email_on_moderations: Noriu gauti el. laišką kiekvieną kartą kai kažkas (turinys ar naudotojas) raportuojami.
-        email_on_notification: Noriu gauti e. laišką kiekvieną kartą, kai gaunu pranešimą.
         everything_followed: Viskas, kÄ… seku
         newsletter_notifications: Noriu gauti naujienlaiškius
         newsletters: Naujienlaiškiai
+        notification_settings:
+          close_meeting_reminder: Noriu gauti el. pašto laiškus su priminimais dėl uždarytų susitikimų su nepublikuotomis ataskaitomis
+        notifications_sending_frequencies:
+          daily: Kasdien
+          none: Jokio
+          real_time: Realiu laiku
+          weekly: Kas savaitÄ™
+        notifications_sending_frequency: Kaip dažnai norite gauti pranešimus el. paštu?
         own_activity: Mano veikla, pvz., kai kas nors pakomentuoja mano pasiūlymą arba pamini mane
+        push_notifications: Pranešimai
+        push_notifications_reminder: Norėdami gauti pranešimus iš platformos, pirmiausia turėsite juos leisti naršyklės nustatymuose.
         receive_notifications_about: Aš noriu gauti pranešimus apie
-        send_notifications_by_email: Siųsti pranešimus el. paštu
         update_notifications_settings: IÅ¡saugoti pakeitimus
       update:
         error: Atnaujinant jūsų pranešimų nuostatas iškilo problema.
         success: Jūsų pranešimų nuostatos atnaujintos.
+    offline:
+      show:
+        message: Panašu, kad šiuo metu esate neprisijungę. Pabandykite dar kartą vėliau.
+        retry: Bandykite dar kartÄ…
     open_data:
       not_available_yet: Atvirųjų duomenų rinkmenomis dabar negalima naudotis. Bandykite dar kartą po kelių minu�ių.
     own_user_groups:
@@ -1180,7 +1277,7 @@ lt:
           agreement: AÅ¡ sutinku su Å¡iomis sÄ…lygomis
           legend: Sutikti su naudojimosi nuostatomis ir sÄ…lygomis
         refuse:
-          modal_body: Jeigu nesutiksite, negalėsite naudotis platforma, <a href="%{data_portability_path}">pasisiųsti savo duomenų</a> ir (arba) <a href="%{delete_path}">pašalinti savo paskyros</a>.
+          modal_body: Jeigu nesutiksite, negalėsite naudotis platforma. Galite <a href="%{data_portability_path}">pasisiųsti savo duomenis</a> ir (arba) <a href="%{delete_path}">pašalinti savo paskyrą</a>.
           modal_btn_continue: Sutikti su sąlygomis ir tęsti
           modal_btn_exit: Peržiūrėsiu vėliau
           modal_button: Nesutikti su sÄ…lygomis
@@ -1192,6 +1289,10 @@ lt:
           title: 'Būtina: Peržiūrėkite naudojimo sąlygų atnaujinimus'
     participatory_space_private_users:
       not_allowed: Jūs negalite peržiūrėti šio turinio
+    passwords:
+      update:
+        error: Atnaujinant slaptažodį iškilo problema
+        success: Slaptažodis buvo sėkmingai atnaujintas
     profile:
       deleted: Dalyvis pašalintas
       inaccessible_message: Profilis neprieinamas dėl naudojimo sąlygų pažeidimų!
@@ -1338,6 +1439,8 @@ lt:
         close_modal: Uždaryti modalinį langą
         please_sign_in: Prašome prisijungti
         sign_up: Užsiregistruoti
+      mentions_modal:
+        remove_recipient: IÅ¡imti gavÄ—jÄ… %{name}
       participatory_space_filters:
         filters:
           areas: ErdvÄ—s
@@ -1376,9 +1479,6 @@ lt:
       help_text: "<strong>Dėmesio:</strong> Turinys gali būti išverstas automatiškai, bet nebus visiškai tikslus."
       show_original: Rodyti teksto originalÄ…
       show_translated: Rodyti automatiškai išverstą tekstą
-    user_activity:
-      index:
-        no_activities_warning: Å is dalyvis dar nesiÄ—mÄ— jokios veiklos.
     user_contact_disabled: Šis dalyvis nepriima tiesioginių žinu�ių.
     user_conversations:
       create:
@@ -1425,6 +1525,7 @@ lt:
       notify:
         body_1: '%{token} pranešė apie naudotoją %{user}'
         body_2: 'Priežastis:%{reason}'
+        details: Naudotojo pateikta informacija
         greetings: Sveiki,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Sveiki %{admin},
         subject: Apie naują vartotoją pranešta %{organization_name}
@@ -1485,7 +1586,7 @@ lt:
     invitations:
       edit:
         header: Baikite kurti savo paskyrÄ…
-        nickname_help: Jūsų naudotojo vardas %{organization}.
+        nickname_help: Jūsų slapyvardis %{organization}. Gali būti tik raidės, skai�iai, „-“ ir „_“.
         submit_button: IÅ¡saugoti
         subtitle: Jei priimate kvietimą, nustatykite savo naudotojo vardą ir slaptažodį.
       invitation_removed: Jūsų kvietimas pašalintas.
@@ -1552,10 +1653,11 @@ lt:
     passwords:
       edit:
         change_my_password: Keisti slaptažodį
-        change_your_password: Pasikeiskite slaptažodį
         confirm_new_password: Patvirtinkite naują slaptažodį
         new_password: Naujas slaptažodis
         password_help: "%{minimun_characters} minimalus rašmenų skai�ius, rašmenys neturi būti pernelyg įprasti (pvz., 123456) ir turi skirtis nuo jūsų naudotojo vardo ir e. pašto adreso."
+        password_help_admin: "%{minimun_characters} minimalus rašmenų skai�ius, rašmenys neturi būti pernelyg įprasti (pvz., 123456) ir turi skirtis nuo jūsų naudotojo vardo ir el. pašto adreso bei turi skirtis nuo senųjų slaptažodžių."
+        title: Slaptažodžio keitimas
       new:
         forgot_your_password: Pamiršote savo slaptažodį?
         send_me_reset_password_instructions: Atsiųskite slaptažodžio atstatymo instrukciją
@@ -1639,14 +1741,60 @@ lt:
     timestamp_error_message: Atsiprašome, tai buvo per greitai! Pateikite iš naujo.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Šioje svetainėje naudojami slapukai. Toliau naršydami svetainėje sutinkate, kad būtų naudojami slapukai. %{link}.
-        link_label: Daugiau informacijos apie slapukus
-        ok: Sutinku
+      data_consent:
+        details:
+          columns:
+            description: Aprašymas
+            name: Pavadinimas
+            service: Paslauga
+            type: Tipas
+          items:
+            _session_id:
+              description: Leidžia svetainėms prisiminti vartotoją svetainėje, kai jie pereina iš vieno tinklalapio į kitą.
+              service: Å i svetainÄ—
+            decidim-consent:
+              description: Saugo informaciją apie vartotojo leidžiamus slapukus šioje svetainėje.
+              service: Å i svetainÄ—
+            pwaInstallPromptSeen:
+              description: Išsaugo būseną jei progresyvios web aplikacijos instaliacijos pranešimas jau buvo matytas naudotojo.
+              service: Å i svetainÄ—
+          types:
+            cookie: Slapukas
+            local_storage: VietinÄ— saugykla
+        dialog:
+          accept_all: Priimti visus
+          accept_only_essential: Sutikti tik su būtinaisiais slapukais
+          description: Savo svetainėje naudojame slapukus siekdami pagerinti svetainės veikimą ir turinį. Slapukai leidžia mums teikti labiau suasmenintą vartotojo patirtį ir turinį iš mūsų socialinės žiniasklaidos kanalų.
+          settings: Nustatymai
+          title: Informacija apie svetainÄ—je naudojamus slapukus
+        modal:
+          accept_all: Priimti visus
+          accept_only_essential: Sutikti tik su būtinaisiais slapukais
+          analytics:
+            description: Å ie slapukai naudojami svetainÄ—s auditorijai matuoti ir analizuoti, siekiant tobulinti svetainÄ™.
+            title: Analitika ir statistika
+          description: Naudojame slapukus siekdami užtikrinti pagrindines svetainės funkcijas ir pagerinti jūsų patirtį. Galite bet kada konfigūruoti ir sutikti su slapukų naudojimu bei keisti leidimų parinktis.
+          essential:
+            description: Šie slapukai užtikrina pagrindines svetainės funkcijas ir padeda užtikrinti jos naudotojų saugumą. Jie automatiškai išsaugomi naršyklėje ir negali būti išjungti.
+            title: Esminiai
+          marketing:
+            description: Šie slapukai renka informaciją apie tai, kaip naudojatės svetaine, ir gali būti naudojami siekiant teikti labiau suasmenintą rinkodarą įvairiose jūsų lankomose svetainėse.
+            title: Marketingas
+          preferences:
+            description: Šie slapukai leidžia svetainei prisiminti jūsų ankstesnius pasirinkimus, kad būtų galima labiau suasmeninti svetainės naudotojų patirtį.
+            title: Nuostatos
+          save_settings: IÅ¡saugoti nustatymus
+          title: Slapukų nustatymai
+          toggle: Įjungti %{consent_category}
+        warning:
+          all_categories: visi slapukai
+          change_settings: Keisti slapukų nuostatas
+          consent_required: Norėdami pamatyti šį turinį, turite įjungti %{categories}.
       edit_link:
         edit: Redaguoti
       footer:
         cc_by_license: '„Creative Commons“ licencija'
+        data_consent_settings: Slapukų nustatymai
         decidim_logo: '„Decidim“ logotipas'
         download_open_data: Parsisiųsti atvirųjų duomenų rinkmenas
         made_with_open_source: Interneto svetainė sukurta naudojant <a target="_blank" href="https://github.com/decidim/decidim">atvirą programinę įrangą</a>.
@@ -1666,6 +1814,8 @@ lt:
       notifications_dashboard:
         mark_all_as_read: Visus žymėti kaip skaitytus
         mark_as_read: Žymėti kaip skaitytą
+      offline_banner:
+        cache_version_page: Regis nebeturite prieigos prie interneto! Šis puslapis - anks�iau išsaugotas vaizdas, tad gali būti, kad jame nėra naujausių atnaujinimų.
       social_media_links:
         facebook: "%{organization} – „Facebook“"
         github: "%{organization} – „GitHub“"
@@ -1677,6 +1827,8 @@ lt:
         continue_session: Tęsti seansą
         sign_out: Atsijungti
         title: Ar norite tęsti seansą?
+      upload_modal:
+        close_modal: Uždaryti modalinį langą
       user_menu:
         account: 'Naudotojo paskyra: %{name}'
         admin_dashboard: Administratoriaus skydelis
@@ -1709,6 +1861,7 @@ lt:
     nickname_included_in_password: yra per daug panašus į jūsų slapyvardį
     not_enough_unique_characters: neturi pakankamai unikalių simbolių
     password_not_allowed: draudžiama
+    password_repeated: seno slaptažodžio naudoti negalima
     password_too_common: per daug įprastas
     password_too_long: per ilgas
     password_too_short: per trumpas
diff --git a/decidim-core/config/locales/lv.yml b/decidim-core/config/locales/lv.yml
index 4a911d37e12b4..2bbb5f27c5774 100644
--- a/decidim-core/config/locales/lv.yml
+++ b/decidim-core/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -62,9 +63,6 @@ lv:
   booleans:
     'false': 'NÄ“'
     'true': 'J�'
-  carrierwave:
-    errors:
-      image_too_big: Attēls ir p�r�k liels
   date:
     formats:
       decidim_short: "%d/%m/%G"
@@ -76,9 +74,6 @@ lv:
       logo: "%{organization} ofici�lais logotips"
       skip_button: P�riet uz galveno saturu
     account:
-      data_portability_export:
-        file_no_exists: Fails neeksistē
-        notice: Pašlaik notiek jūsu datu lejupiel�de. Kad t� būs pabeigta, jūs saņemsiet e-pastu.
       delete:
         confirm:
           close: Aizvērt logu
@@ -89,6 +84,9 @@ lv:
       destroy:
         error: Dzēšot jūsu kontu, rad�s problēma.
         success: Jūsu konts tika veiksmīgi dzēsts.
+      download_your_data_export:
+        file_no_exists: Fails neeksistē
+        notice: Pašlaik notiek jūsu datu lejupiel�de. Kad t� būs pabeigta, jūs saņemsiet e-pastu.
       show:
         change_password: Mainīt paroli
         update_account: Atjaunin�t kontu
@@ -300,6 +298,8 @@ lv:
           explanation_html: Lai veiktu šo darbību, jums j�būt autorizētam, bet pirms tam j�apstiprina savs e-pasts <strong>%{email}</strong>.
           request_confirmation_instructions: Pieprasīt apstiprin�šanas nor�dījumus
           title: Apstiprin�t e-pastu
+      show:
+        close_modal: Aizvērt modal
     collapsible_list:
       hidden_elements_count:
         zero: un %{count} vēl
@@ -327,8 +327,8 @@ lv:
           global:
             amendments_enabled: Grozījumi ir iespējoti
             comments_enabled: Koment�ri ir iespējoti
-            dummy_global_attribute_1: Viettura apzīmēt�js 1
-            dummy_global_attribute_2: Viettura apzīmēt�js 2
+            dummy_global_attribute1: Viettura apzīmēt�js 1
+            dummy_global_attribute2: Viettura apzīmēt�js 2
             dummy_global_translatable_text: Viettura tulkojamais teksts
             enable_pads_creation: Iespējot kopdokumentu izveidi
             resources_permissions_enabled: Vienumu atļaujas ir iespējotas
@@ -338,8 +338,8 @@ lv:
             amendment_reaction_enabled: Reaģēšana uz grozījumiem ir iespējota
             amendments_visibility: Grozījumu redzamība
             comments_blocked: Koment�ri ir bloķēti
-            dummy_step_attribute_1: 1. Viettura solis
-            dummy_step_attribute_2: 2. Viettura solis
+            dummy_step_attribute1: 1. Viettura solis
+            dummy_step_attribute2: 2. Viettura solis
             dummy_step_translatable_text: Viettura soļa tulkojamais teksts
     contact: Kontaktinform�cija
     content_blocks:
@@ -371,12 +371,6 @@ lv:
       actions:
         login_before_access: Pirms piekļuves, lūdzu, piesakieties sav� kont�
         unauthorized: Jūs neesat autorizēts veikt šo darbību
-    data_portability:
-      export:
-        ready: Gatavs
-      show:
-        download_data: Lejupiel�dēt datus
-        request_data: Pieprasīt datus
     datepicker:
       help_text: 'Paredzētais form�ts: %{datepicker_format}'
     devise:
@@ -393,7 +387,6 @@ lv:
           already_have_an_account?: Jums jau ir konts?
           newsletter: Saņemiet neregul�ru informatīvo biļetenu ar būtisko inform�ciju
           newsletter_title: Atļauja sazin�ties
-          password_help: "Vismaz %{minimun_characters} rakstzīmes, nedrīkst būt p�rlieku izplatītas (piem., 123456), un t�m j�atšķiras no jūsu segv�rda un e-pasta adreses."
           sign_in: Pieteikties
           sign_up: Reģistrēties
           sign_up_as:
@@ -439,6 +432,12 @@ lv:
           this_application_will_not_be_able_to: 'Lietojumprogramma nevarēs:'
           update_profile: Atjaunin�t profilu
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> vēlas izmantot jūsu kontu"
+    download_your_data:
+      export:
+        ready: Gatavs
+      show:
+        download_data: Lejupiel�dēt datus
+        request_data: Pieprasīt datus
     endorsable:
       endorsements: Atbalsts
     endorsement_buttons_cell:
@@ -590,7 +589,7 @@ lv:
           email_subject: "%{nickname} atjaunin�ja savu profilu"
           notification_title: '%{name} (%{nickname}) <a href="%{resource_path}">profila lapa</a>, kam jūs sekojat, ir atjaunin�ta.'
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Lejupiel�dēt
       export:
         ready: Lūdzu, jūsu eksportēto datu saspiest� versija.
@@ -623,7 +622,6 @@ lv:
         button: P�rtraukt sekot
         error: Neizdev�s p�rtraukt sekot šim vienumam.
     forms:
-      current_file: Pašreizējais fails
       current_image: Pašreizējais attēls
       default_image: Noklusējuma attēls
       errors:
@@ -631,7 +629,6 @@ lv:
           password: Parole ir p�r�k īsa.
           password_confirmation: Apstiprin�juma parolei j�sakrīt ar paroli.
         error: Šaj� lauk� ir kļūda.
-      remove_this_file: Noņemt šo failu
     gamification:
       all_badges_link: Skatīt visus pieejamos žetonus.
       badges:
@@ -732,7 +729,6 @@ lv:
       no_user_groups: Pagaid�m nepieder nevienai grupai.
       roles:
         admin: Administrators
-        creator: Izveidot�js
         member: Dalībnieks
       update:
         error: Šīs grupas atjaunin�šanas laik� rad�s problēma
@@ -751,6 +747,9 @@ lv:
       index:
         last_activity: Pēdēj� aktivit�te
         resource_type: Veids
+    links:
+      warning:
+        close_modal: Aizvērt modal
     log:
       base_presenter:
         create: "%{user_name} izveidoja %{resource_name}"
@@ -858,7 +857,6 @@ lv:
     newsletter_mailer:
       newsletter:
         note: Jūs saņēm�t šo e-pasta ziņojumu, jo esat abonējis informatīvos biļetenus vietnē %{organization_name}. Iestatījumus var mainīt jūsu <a href="%{link}"> paziņojumu lap� </a>.
-        see_on_website: Vai nevarat pareizi redzēt šo e-pastu? Skatiet to <a href="%{link}" target="_blank"> tīmekļvietnē </a>.
         unsubscribe: Lai atteiktos no š�da veida e-pasta saņemšanas, <a href="%{link}" target="_blank" class="unsubscribe"> Anulēt abonementu</a>.
     newsletter_templates:
       basic_only_text:
@@ -906,13 +904,11 @@ lv:
       show:
         allow_public_contact: Ļauj ikvienam nosūtīt man tiešu ziņojumu, pat ja es viņam nesekoju.
         direct_messages: Saņemiet tiešus ziņojumus no jebkuras personas
-        email_on_notification: Es vēlos saņemt e-pastu katrreiz, kad tiek saņemts paziņojums.
         everything_followed: Viss, kam es sekoju
         newsletter_notifications: Es gribu saņemt informatīvos biļetenus
         newsletters: Informatīvie biļeteni
         own_activity: Mana aktivit�te, piemēram, kad k�ds komentē manu priekšlikumu vai piemin mani
         receive_notifications_about: Es vēlos saņemt paziņojumus par
-        send_notifications_by_email: Sūtīt paziņojumus pa e-pastu
         update_notifications_settings: Saglab�t izmaiņas
       update:
         error: Atjauninot jūsu paziņojumu iestatījumus, rad�s problēma.
@@ -967,7 +963,6 @@ lv:
         form:
           legend: Piekrist lietošanas noteikumiem
         refuse:
-          modal_body: Ja atteiksieties, nevarēsiet izmantot platformu, varat <a href="%{data_portability_path}"> lejupiel�dēt savus datus </a> un/vai <a href="%{delete_path}"> izdzēst savu kontu </a>.
           modal_btn_continue: Pieņemt noteikumus un turpin�t
           modal_btn_exit: Es tos p�rskatīšu vēl�k
           modal_button: Atteikties no noteikumu pieņemšanas
@@ -1100,9 +1095,6 @@ lv:
         share_link: Kopīgot saiti
     statistics:
       comments_count: Koment�ri
-    user_activity:
-      index:
-        no_activities_warning: Šis dalībnieks vēl nav veicis nek�das aktivit�tes
     user_contact_disabled: Šis dalībnieks nepieņem tieš�s ziņas.
     user_conversations:
       create:
@@ -1197,7 +1189,6 @@ lv:
     invitations:
       edit:
         header: Pabeidziet sava konta izveidi
-        nickname_help: Jūsu segv�rds %{organization}.
         submit_button: Saglab�t
         subtitle: Ja pieņemat ielūgumu, lūdzu, izvēlieties savu segv�rdu un paroli.
       invitation_removed: Jūsu ielūgums tika noņemts.
@@ -1263,7 +1254,6 @@ lv:
     passwords:
       edit:
         change_my_password: Nomainīt manu paroli
-        change_your_password: Mainiet savu paroli
         confirm_new_password: Apstiprin�t jauno paroli
         new_password: Jaun� parole
         password_help: "Vismaz %{minimun_characters} rakstzīmes, nedrīkst būt p�rlieku izplatītas (piem., 123456), un t�m j�atšķiras no jūsu segv�rda un e-pasta adreses."
@@ -1338,8 +1328,6 @@ lv:
     timestamp_error_message: Diemžēl tas bija par �tru! Lūdzu, iesniedziet atk�rtoti.
   layouts:
     decidim:
-      cookie_warning:
-        ok: Es piekrītu
       edit_link:
         edit: Labot
       footer:
diff --git a/decidim-core/config/locales/nl.yml b/decidim-core/config/locales/nl.yml
index a3a44be18d828..2e0bd3ea4d29a 100644
--- a/decidim-core/config/locales/nl.yml
+++ b/decidim-core/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -65,9 +66,6 @@ nl:
   booleans:
     'false': 'Nee'
     'true': 'Ja'
-  carrierwave:
-    errors:
-      image_too_big: De afbeelding is te groot
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -99,6 +97,9 @@ nl:
       x_minutes:
         one: 1 minuut geleden
         other: "%{count} minuten geleden"
+      x_seconds:
+        one: 1 seconde geleden
+        other: "%{count} seconden geleden"
   decidim:
     accessibility:
       external_link: Externe link
@@ -106,9 +107,6 @@ nl:
       skip_button: Ga naar de hoofdinhoud
     account:
       blocked: Dit account is geblokkeerd vanwege schending van de Algemene Voorwaarden
-      data_portability_export:
-        file_no_exists: Bestand bestaat niet
-        notice: Uw gegevens worden momenteel verwerkt. Je ontvangt een e-mail als deze is voltooid.
       delete:
         alert: Deze actie kan niet ongedaan worden gemaakt. Als je je account verwijdert, kan je niet meer inloggen met je inloggegevens. Het verwijderen van je account zal leiden tot het anonimiseren van je bijdragen. Je kunt nog steeds een nieuw account aanmaken, maar eerdere bijdragen worden daar niet aan gekoppeld.
         confirm:
@@ -120,8 +118,10 @@ nl:
       destroy:
         error: Er is een fout opgetreden bij het verwijderen van uw account.
         success: Uw account is succesvol verwijderd.
+      download_your_data_export:
+        file_no_exists: Bestand bestaat niet
+        notice: Uw gegevens worden momenteel verwerkt. Je ontvangt een e-mail als deze is voltooid.
       show:
-        available_locales_helper: Kies de taal die je wil gebruiken om te surfen en om meldingen te ontvangen in Decidim
         change_password: Wachtwoord wijzigen
         update_account: Account bijwerken
       update:
@@ -389,8 +389,8 @@ nl:
             amendments_enabled: Wijzigingen toegestaan
             comments_enabled: Reacties ingeschakeld
             comments_max_length: Commentaar maximale lengte
-            dummy_global_attribute_1: Voorbeeld-kenmerk 1
-            dummy_global_attribute_2: Voorbeeld-kenmerk 2
+            dummy_global_attribute1: Voorbeeld-kenmerk 1
+            dummy_global_attribute2: Voorbeeld-kenmerk 2
             dummy_global_translatable_text: Vertaalbare tekst Dummy
             enable_pads_creation: Schakel het maken van notitieblokken in
             resources_permissions_enabled: Resources permissies ingeschakeld
@@ -402,8 +402,8 @@ nl:
             amendment_reaction_enabled: Reageren op amendementen ingeschakeld
             amendments_visibility: Zichtbaarheid van amendement
             comments_blocked: Reacties geblokkeerd
-            dummy_step_attribute_1: Voorbeeld-kenmerk 1
-            dummy_step_attribute_2: Voorbeeld-kenmerk 2
+            dummy_step_attribute1: Voorbeeld-kenmerk 1
+            dummy_step_attribute2: Voorbeeld-kenmerk 2
             dummy_step_translatable_text: Dummy Stap Vertaalbare tekst
     contact: Contact
     content_blocks:
@@ -447,13 +447,6 @@ nl:
       actions:
         login_before_access: Log in met uw account voor toegang
         unauthorized: U bent niet gemachtigd dit te doen
-    data_portability:
-      export:
-        ready: Klaar
-      show:
-        download_data: Download de gegevens
-        download_data_description: Een bestand met alle gegevens van uw account zal worden verzonden naar <strong>%{user_email}</strong>. Deze e-mail bevat een .zip-bestand en een wachtwoord om het te openen.<br/><br/>Om het bestand uit te pakken heeft u <a href="https://www.7-zip.org/">7-Zip</a> (voor Windows) of <a href="https://www.keka.io/">Keka</a> nodig (voor MacOS). Als u Linux gebruikt, zal deze meestal standaard geïnstalleerd worden. Als dit niet het geval is, kan je <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> of <a href="https://peazip.github.io">PeaZip</a> gebruiken).
-        request_data: Gegevens aanvragen
     datepicker:
       help_text: 'Verwacht formaat: %{datepicker_format}'
     devise:
@@ -472,7 +465,6 @@ nl:
           newsletter: Ontvang af en toe een nieuwsbrief met relevante informatie
           newsletter_title: Contact toestemming
           nickname_help: Je alias in %{organization}. Kan alleen letters, cijfers, '-' en '_' bevatten.
-          password_help: "gebruik minimaal %{minimun_characters} tekens, deze mogen niet te algemeen zijn (bijv. 123456) en moeten anders zijn dan je alias en je e-mail."
           sign_in: Aanmelden
           sign_up: Registratie
           sign_up_as:
@@ -519,6 +511,13 @@ nl:
           this_application_will_not_be_able_to: 'Deze applicatie krijgt geen toegang tot:'
           update_profile: update je profiel
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> wil toegang tot je account"
+    download_your_data:
+      export:
+        ready: Klaar
+      show:
+        download_data: Download de gegevens
+        download_data_description: Een bestand met alle gegevens van uw account zal worden verzonden naar <strong>%{user_email}</strong>. Deze e-mail bevat een .zip-bestand en een wachtwoord om het te openen.<br/><br/>Om het bestand uit te pakken heeft u <a href="https://www.7-zip.org/">7-Zip</a> (voor Windows) of <a href="https://www.keka.io/">Keka</a> nodig (voor MacOS). Als u Linux gebruikt, zal deze meestal standaard geïnstalleerd worden. Als dit niet het geval is, kan je <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> of <a href="https://peazip.github.io">PeaZip</a> gebruiken).
+        request_data: Gegevens aanvragen
     editor_images:
       create:
         error: Fout bij het uploaden van een afbeelding
@@ -676,7 +675,7 @@ nl:
           email_subject: "%{nickname} heeft zijn/haar profiel bijgewerkt"
           notification_title: De <a href="%{resource_path}">profile page</a> van %{name} (%{nickname}), die je volgt, is bijgewerkt.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Klik op de volgende link om je gegevens te downloaden. <br/> Het bestand is beschikbaar tot %{date}. <br/> Je hebt <a href="https://www.7-zip.org/">7-Zip</a>(for Windows), <a href="https://www.keka.io/en/">Keka</a> (for MacOS) or <a href="https://peazip.github.io">PeaZip</a> (for Linux) nodig om het te openen. Wachtwoord: %{password}'
         download: Download
       export:
@@ -716,7 +715,6 @@ nl:
         button: Stop met volgen
         error: Er is een fout opgetreden bij het stoppen met volgen van deze bron.
     forms:
-      current_file: Huidig ​​bestand
       current_image: Huidige afbeelding
       default_image: Standaard afbeelding
       errors:
@@ -735,7 +733,6 @@ nl:
       file_validation:
         allowed_file_extensions: 'Toegestane bestandsextensies: %{extensions}'
         max_file_size: 'Maximale bestandsgrootte: %{megabytes}MB'
-      remove_this_file: Verwijder dit bestand
     gamification:
       all_badges_link: Zie alle beschikbare badges.
       badges:
@@ -836,7 +833,6 @@ nl:
       no_user_groups: Behoort nog niet tot een groep.
       roles:
         admin: Beheerder
-        creator: Stichtend lid
         member: Lid
       update:
         error: Er is een probleem opgetreden bij het bijwerken van de groep
@@ -992,7 +988,6 @@ nl:
     newsletter_mailer:
       newsletter:
         note: U ontvangt deze e-mail omdat u bent geabonneerd op nieuwsbrieven van %{organization_name}. U kunt uw instellingen op uw <a href="%{link}">notificatiepagina</a> veranderen.
-        see_on_website: Wordt deze e-mail niet correct worden weergegeven? Bekijk hem via deze link <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Om je uit te schrijven, <a href="%{link}" target="_blank" class="unsubscribe">Uitschrijven</a>.
     newsletter_templates:
       basic_only_text:
@@ -1047,18 +1042,19 @@ nl:
         administrators: Beheerders
         allow_public_contact: Ledereen kan mij een persoonlijk bericht sturen, ook mensen die ik niet volg.
         direct_messages: Ontvang privéberichten van iedereen
-        email_on_moderations: Ik wil een e-mail ontvangen telkens wanneer iets wordt gerapporteerd voor moderatie.
-        email_on_notification: Ik wil een e-mail ontvangen telkens als ik een melding krijg.
         everything_followed: Alles wat ik volg
         newsletter_notifications: Ik wil de nieuwsbrief ontvangen
         newsletters: Nieuwsbrieven
         own_activity: Activiteiten gerelateerd aan mijn bijdragen, zoals wanneer iemand opmerkingen maakt in mijn voorstel of mij vermeldt
         receive_notifications_about: Ik wil meldingen ontvangen over
-        send_notifications_by_email: Verstuur meldingen per e-mail
         update_notifications_settings: Wijzigingen opslaan
       update:
         error: Er is een fout opgetreden bij het bijwerken van uw notificatie instellingen.
         success: Uw notificatie instellingen zijn bijgewerkt.
+    offline:
+      show:
+        message: Het lijkt erop dat je momenteel offline bent. Probeer het later opnieuw.
+        retry: Probeer opnieuw
     open_data:
       not_available_yet: De Open Data-bestanden zijn nog niet beschikbaar. Probeer het over een paar minuten opnieuw.
     own_user_groups:
@@ -1112,7 +1108,6 @@ nl:
           agreement: Ik ga akkoord met deze voorwaarden
           legend: Ga akkoord met de gebruiksvoorwaarden
         refuse:
-          modal_body: Als u weigert, kunt u het platform niet gebruiken, kunt u <a href="%{data_portability_path}">uw gegevens downloaden</a> en / of <a href="%{delete_path}">uw account verwijderen</a>.
           modal_btn_continue: Voorwaarden accepteren en doorgaan
           modal_btn_exit: Ik zal het later bekijken
           modal_button: Weigeren de voorwaarden
@@ -1292,9 +1287,6 @@ nl:
     tags:
       filter_results_for_category: 'Resultaten filteren voor categorie: %{resource}'
       filter_results_for_scope: 'Filter resultaten voor bereik: %{resource}'
-    user_activity:
-      index:
-        no_activities_warning: Deze deelnemer heeft nog geen activiteit gehad.
     user_contact_disabled: Deze gebruiker accepteert geen directe berichten.
     user_conversations:
       create:
@@ -1393,7 +1385,6 @@ nl:
     invitations:
       edit:
         header: Voltooi het aanmaken van je account
-        nickname_help: Je bijnaam in %{organization}.
         submit_button: Opslaan
         subtitle: Als u de uitnodiging accepteert, stelt u uw bijnaam en wachtwoord in.
       invitation_removed: Je uitnodiging is verwijderd.
@@ -1460,7 +1451,6 @@ nl:
     passwords:
       edit:
         change_my_password: Verander mijn wachtwoord
-        change_your_password: Verander uw wachtwoord
         confirm_new_password: Bevestig nieuw wachtwoord
         new_password: Nieuw wachtwoord
         password_help: "gebruik minimaal %{minimun_characters} tekens, deze mogen niet te algemeen zijn (bijv. 123456) en moeten anders zijn dan je alias en je e-mail."
@@ -1541,10 +1531,21 @@ nl:
     timestamp_error_message: Sorry, dat was te snel! Gelieve opnieuw in te dienen.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Deze website maakt gebruik van cookies. Door gebruik te blijven maken van de site gaat u hiermee akkoord. Meer informatie via %{link}.
-        link_label: hier
-        ok: Ik ga akkoord
+      data_consent:
+        details:
+          columns:
+            description: Beschrijving
+            name: Naam
+            type: Type
+          items:
+            pwaInstallPromptSeen:
+              description: Bewaart de status als de progressieve webapplicatie (PWA) installatiemelding al gezien is door de gebruiker.
+          types:
+            local_storage: Lokale opslag
+        modal:
+          analytics:
+            description: Deze cookies worden gebruikt om het gebruik van de website te meten en te analyseren en zo de website te verbeteren.
+          description: We gebruiken cookies om de basisfunctionaliteiten van de website te garanderen en jouw online-ervaring te verbeteren. Je kunt op elk gewenst moment het gebruik van de cookies configureren en accepteren of je toestemmingsopties wijzigen.
       edit_link:
         edit: Bewerk
       footer:
@@ -1568,6 +1569,8 @@ nl:
       notifications_dashboard:
         mark_all_as_read: Alles als gelezen markeren
         mark_as_read: Markeren als gelezen
+      offline_banner:
+        cache_version_page: Oeps! Je netwerk is offline. Dit is een eerdere gecachete versie van de pagina die je bezoekt, misschien is de inhoud niet up-to-date.
       social_media_links:
         facebook: "%{organization} op Facebook"
         github: "%{organization} op GitHub"
diff --git a/decidim-core/config/locales/no.yml b/decidim-core/config/locales/no.yml
index 2cb35aa24a426..90aac9547dcd9 100644
--- a/decidim-core/config/locales/no.yml
+++ b/decidim-core/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -67,7 +68,6 @@
     'true': 'Ja'
   carrierwave:
     errors:
-      image_too_big: Dette bilde er for stort
       not_inside_organization: Filen er ikke tilknyttet noen organisasjon
   date:
     formats:
@@ -101,9 +101,8 @@
         one: 1 minutt siden
         other: "%{count} minutter siden"
       x_seconds:
-        one: 1 sek. siden
-        other: "%{count} sek. siden"
-        zero: akkurat nå
+        one: 1 sekund siden
+        other: "%{count} sekunder siden"
   decidim:
     accessibility:
       external_link: Ekstern lenke
@@ -111,9 +110,6 @@
       skip_button: GÃ¥ til hovedinnhold
     account:
       blocked: Denne kontoen er sperret på grunn av brudd på vilkår og betingelser
-      data_portability_export:
-        file_no_exists: Filen finnes ikke
-        notice: Opplastingen av dataen din pågår. Du vil få en e-mail når den er ferdig.
       delete:
         alert: Denne handlingen kan ikke angres. Hvis du sletter kontoen din, vil du ikke kunne logge inn igjen med denne innloggingsinformasjonen. Slettingen av din konto vil resultere i at dine bidrag blir anonymisert. Du vil fortsatt kunne lage en ny konto, men disse bidragene vil ikke bli knyttet til den.
         confirm:
@@ -125,8 +121,10 @@
       destroy:
         error: Det oppsto et problem med å slette kontoen din.
         success: Kontoen din ble slettet.
+      download_your_data_export:
+        file_no_exists: Filen finnes ikke
+        notice: Opplastingen av dataen din pågår. Du vil få en e-mail når den er ferdig.
       show:
-        available_locales_helper: Velg språket du vil bruke til å bla gjennom og motta varsler
         change_password: Endre passord
         update_account: Oppdater konto
       update:
@@ -362,7 +360,7 @@
           request_confirmation_instructions: Be om bekreftels instruksjoner
           title: Bekreft e-posten din
       show:
-        close_modal: Lukk vinduet
+        close_modal: Lukk modal
     block_user_mailer:
       notify:
         body_1: Kontoen din ble blokkert.
@@ -400,8 +398,8 @@
             amendments_enabled: Endringer aktivert
             comments_enabled: Kommentarer aktivert
             comments_max_length: Maks lengde på kommentarer
-            dummy_global_attribute_1: Dummy Egenskap 1
-            dummy_global_attribute_2: Dummy Egenskap 2
+            dummy_global_attribute1: Dummy Egenskap 1
+            dummy_global_attribute2: Dummy Egenskap 2
             dummy_global_translatable_text: Dummy Oversettbar tekst
             enable_pads_creation: Aktiver oppretting av pads
             resources_permissions_enabled: Ressurs tillatelser aktivert
@@ -413,8 +411,8 @@
             amendment_reaction_enabled: Endrings reaksjon aktivert
             amendments_visibility: Endringens synlighet
             comments_blocked: Kommentarer blokkert
-            dummy_step_attribute_1: Dummy Steg Egenskap 1
-            dummy_step_attribute_2: Dummy Steg Egenskap 2
+            dummy_step_attribute1: Dummy Steg Egenskap 1
+            dummy_step_attribute2: Dummy Steg Egenskap 2
             dummy_step_translatable_text: Dummy Steg Oversettbar Tekst
     contact: Kontakt
     content_blocks:
@@ -458,13 +456,6 @@
       actions:
         login_before_access: Vennligst logg inn med kontoen din før tilgang
         unauthorized: Du er ikke autorisert til å utføre denne handlingen
-    data_portability:
-      export:
-        ready: Klar
-      show:
-        download_data: Last ned informasjonen
-        download_data_description: En fil som inneholder all informasjon tilknyttet kontoen din vil bli sendt til <strong>%{user_email}</strong>. Denne e-posten inneholder en .zip-fil og et passord for å åpne den.<br/><br/>For å pakke ut filen vil du trenge <a href="https://www.7-zip.org/">7-Zip</a> (for Windows) eller <a href="https://www.keka.io/">Keka</a> (for MacOS). Hvis du bruker Linux vil du i de fleste tilfeller ha den installert som standard. Dersom dette ikke stemmer, kan du bruke <a href="https://gitlab.gnome.org/GNOME/file-roller">filroller</a> eller <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Etterspør informasjonen
     datepicker:
       help_text: 'Forventet format: %{datepicker_format}'
     devise:
@@ -483,7 +474,6 @@
           newsletter: Motta et sporadisk nyhetsbrev med relevant informasjon
           newsletter_title: Kontakt tillatelse
           nickname_help: Ditt alias i %{organization}, kan bare inneholde bokstaver, tall, '-' og '_'.
-          password_help: "%{minimun_characters} tegn minimum, må ikke være for vanlig (f.eks. 123456) og må være forskjellig fra kallenavnet og e-postadressen din."
           sign_in: Logg inn
           sign_up: Registrer deg
           sign_up_as:
@@ -536,6 +526,13 @@
           this_application_will_not_be_able_to: 'Dette programmet vil ikke kunne:'
           update_profile: Oppdater profilen din
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> ønsker å bruke profilen din"
+    download_your_data:
+      export:
+        ready: Klar
+      show:
+        download_data: Last ned informasjonen
+        download_data_description: En fil som inneholder all informasjon tilknyttet kontoen din vil bli sendt til <strong>%{user_email}</strong>. Denne e-posten inneholder en .zip-fil og et passord for å åpne den.<br/><br/>For å pakke ut filen vil du trenge <a href="https://www.7-zip.org/">7-Zip</a> (for Windows) eller <a href="https://www.keka.io/">Keka</a> (for MacOS). Hvis du bruker Linux vil du i de fleste tilfeller ha den installert som standard. Dersom dette ikke stemmer, kan du bruke <a href="https://gitlab.gnome.org/GNOME/file-roller">filroller</a> eller <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Etterspør informasjonen
     editor_images:
       create:
         error: Feil ved opplasting av bilde
@@ -701,7 +698,7 @@
           email_subject: "%{nickname} oppdaterte profilens sin"
           notification_title: <a href="%{resource_path}">Profilsiden</a> til %{name} (%{nickname}), som du følger er blitt oppdatert.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Klikk på neste link for å laste ned dataen.<br/>Filen vil være tilgjengelig til %{date}.<br/>Du vil trenge <a href="https://www.7-zip.org/">7-Zip</a> (for Windows), <a href="https://www.keka.io/en/">Keka</a> (for MacOS) eller <a href="https://peazip.github.io">PeaZip</a> (for Linux) for å åpne den. Passord: %{password}'
         download: Last ned
       export:
@@ -741,7 +738,6 @@
         button: Stopp å følge
         error: Det oppstod et problem med å slutte å følge denne ressursen.
     forms:
-      current_file: Nåværende fil
       current_image: Nåværende bilde
       default_image: Standard bilde
       errors:
@@ -753,7 +749,6 @@
         file:
           explanation: 'Veiledning for fil:'
           message_1: Må være et bilde eller et dokument.
-          message_2: For bilder, bruk foretrekkes landskapsbilder, tjenesten beskjærer bildet. For CSV-filer, må skilletegnet mellom kolonner være en komma (",")
         image:
           explanation: 'Veiledning for bilde:'
           message_1: Et landskapsbilde uten tekst er å anbefale.
@@ -761,7 +756,6 @@
       file_validation:
         allowed_file_extensions: 'Tillatte filetternavn: %{extensions}'
         max_file_size: 'Maksimal filstørrelse: %{megabytes}MB'
-      remove_this_file: Fjern denne filen
     gamification:
       all_badges_link: Se alle tilgjengelige merker.
       badges:
@@ -862,7 +856,6 @@
       no_user_groups: Tilhører ikke en gruppe ennå.
       roles:
         admin: Administrator
-        creator: Forfatter
         member: Medlem
       update:
         error: Det oppstod et problem med å oppdatere gruppen
@@ -887,7 +880,7 @@
         body_1: Du er i ferd med å besøke en ekstern lenke, og vi vil at du skal være forsiktig med hensyn til innholdet på det eksterne nettstedet.
         body_2: Vennligst sjekk linken du er i ferd med å besøke og sørg for at du anser den som et sikkert nettsted før du fortsetter.
         cancel: Avbryt
-        close_modal: Lukk dialogboks
+        close_modal: Lukk modal
         proceed: Fortsett
         title: Ã…pne ekstern lenke
     log:
@@ -1019,7 +1012,6 @@
     newsletter_mailer:
       newsletter:
         note: Du mottok denne e-posten fordi du abonnerer på nyhetsbrev for %{organization_name}. Du kan endre innstillingene dine på <a href="%{link}">varslings siden din</a>.
-        see_on_website: Kan ikke se denne e-posten riktig? Se den på <a href="%{link}" target="_blank">nettsiden</a>.
         unsubscribe: For å velge bort å motta denne typen e-mailer, <a href="%{link}" target="_blank" class="unsubscribe">Avslutt abonnementet</a>.
     newsletter_templates:
       basic_only_text:
@@ -1074,18 +1066,19 @@
         administrators: Administratorer
         allow_public_contact: La hvem som helst sende meg direktemelding, selv om jeg ikke følger dem.
         direct_messages: Motta direktemeldinger fra alle
-        email_on_moderations: Jeg ønsker å få en e-post hver gang noe rapporteres til moderasjon.
-        email_on_notification: Jeg vil motta en e-post hver gang jeg mottar et varsel.
         everything_followed: Alt jeg følger
         newsletter_notifications: Jeg ønsker å motta nyhetsbrev
         newsletters: Nyhetsbrev
         own_activity: Min egen aktivitet, som når noen kommenterer på forslaget mitt eller omtaler meg
         receive_notifications_about: Jeg ønsker å få varslet om
-        send_notifications_by_email: Send varsler via email
         update_notifications_settings: Lagre endringer
       update:
         error: Det oppstod et problem med å oppdatere varslingsinnstillingene dine.
         success: Varslings innstillingene dine ble oppdatert.
+    offline:
+      show:
+        message: Det ser ut til at du er frakoblet. Vær så snill, prøv igjen senere.
+        retry: Prøv igjen
     open_data:
       not_available_yet: Open Data-filene er ikke tilgjengelige ennå, prøv igjen om noen minutter.
     own_user_groups:
@@ -1139,7 +1132,6 @@
           agreement: Jeg godtar vilkårene
           legend: Godta vilkårene for bruk
         refuse:
-          modal_body: Hvis du nekter, vil du ikke kunne bruke platformen, du kan <a href="%{data_portability_path}"> laste ned dataen din</a> og/eller <a href="%{delete_path}">slette brukeren din</a>.
           modal_btn_continue: Aksepter vilkår og fortsett
           modal_btn_exit: Jeg vil vurdere det senere
           modal_button: Avslå vilkårene
@@ -1333,9 +1325,6 @@
       help_text: "<strong>Advarsel:</strong> Innhold kan automatisk bli oversatt og ikke alltid være 100 % nøyaktig."
       show_original: Vis originaltekst
       show_translated: Vis automatisk oversatt tekst
-    user_activity:
-      index:
-        no_activities_warning: Denne deltakeren har ikke hatt noe aktivitet ennå.
     user_contact_disabled: Denne deltakeren godtar ikke direktemeldinger.
     user_conversations:
       create:
@@ -1442,7 +1431,6 @@
     invitations:
       edit:
         header: Fullfør oppretting av kontoen din
-        nickname_help: Kallenavnet ditt i %{organization}.
         submit_button: Lagre
         subtitle: Hvis du godtar invitasjonen, må du angi kallenavnet og passordet ditt.
       invitation_removed: Invitasjonen din ble fjernet.
@@ -1509,7 +1497,6 @@
     passwords:
       edit:
         change_my_password: Endre passordet mitt
-        change_your_password: Endre passordet ditt
         confirm_new_password: Bekreft nytt passord
         new_password: New password
         password_help: "%{minimun_characters} tegn minimum, må ikke være for vanlig (f.eks. 123456) og må være forskjellig fra kallenavnet og e-postadressen din."
@@ -1590,10 +1577,6 @@
     timestamp_error_message: Beklager, det var for raskt! Vennligst, send inn på nytt.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Denne siden bruker informasjonskapsler. Ved å fortsette å bla gjennom nettstedet, godtar du vår bruk av informasjonskapsler. Finn ut mer om det %{link}.
-        link_label: her
-        ok: Jeg er enig
       edit_link:
         edit: Rediger
       footer:
@@ -1617,6 +1600,8 @@
       notifications_dashboard:
         mark_all_as_read: Merk alt som lest
         mark_as_read: Merk som lest
+      offline_banner:
+        cache_version_page: Oooops! Nettverket ditt er frakoblet. Dette er en tidligere bufret versjon av siden du besøker, kanskje er innholdet ikke oppdatert.
       social_media_links:
         facebook: "%{organization} på Facebook"
         github: "%{organization} på GitHub"
diff --git a/decidim-core/config/locales/pl.yml b/decidim-core/config/locales/pl.yml
index 89ad7196054a9..f08621095f935 100644
--- a/decidim-core/config/locales/pl.yml
+++ b/decidim-core/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -81,7 +82,8 @@ pl:
     'true': 'Tak'
   carrierwave:
     errors:
-      image_too_big: Obraz jest zbyt duży
+      file_resolution_too_large: Rozdzielczość pliku jest zbyt duża
+      file_size_too_large: Rozmiar pliku jest zbyt duży
       not_inside_organization: Plik nie jest dołączony do żadnej organizacji
   date:
     formats:
@@ -129,9 +131,10 @@ pl:
         many: "%{count} min. temu"
         other: "%{count} min. temu"
       x_seconds:
-        one: 1 sekundÄ™ temu
-        other: "%{count} sekund temu"
-        zero: właśnie teraz
+        one: 1 sek. temu
+        few: "%{count} sek. temu"
+        many: "%{count} sek. temu"
+        other: "%{count} sek. temu"
   decidim:
     accessibility:
       external_link: Link zewnętrzny
@@ -140,9 +143,6 @@ pl:
       skip_button: Przejdź do głównej zawartości
     account:
       blocked: To konto zostało zablokowane z powodu naruszenia Regulaminu
-      data_portability_export:
-        file_no_exists: Plik nie istnieje
-        notice: Twoje dane są obecnie w trakcie procesowania w celu pobrania. Otrzymasz e-mail po zakończeniu.
       delete:
         alert: Tej czynności nie można cofnąć. Jeśli usuniesz swoje konto, nie będziesz mógł zalogować się za pomocą swoich danych. Usunięcie Twojego konta spowoduje, że cała Twoja aktywność w portalu stanie się anonimowa. Nadal będziesz mógł utworzyć nowe konto, ale Twoje dotychczasowe zasoby nie będą już z nim powiązane.
         confirm:
@@ -154,7 +154,21 @@ pl:
       destroy:
         error: Podczas usuwania Twojego konta wystąpił błąd.
         success: Twoje konto zostało pomyślnie usunięte.
+      download_your_data_export:
+        file_no_exists: Plik nie istnieje
+        notice: Twoje dane są obecnie w trakcie procesowania w celu pobrania. Otrzymasz e-mail po zakończeniu.
+      email_change:
+        body1: Wysłaliśmy wiadomość e-mail do %{unconfirmed_email}, aby zweryfikować Twój nowy adres e-mail.
+        body2: Wysłać e-mail weryfikacyjny ponownie? %{resend_link} lub %{cancel_link}.
+        cancel: anuluj
+        cancel_error: Nie można anulować zmiany adresu e-mail.
+        cancel_successfully: Zmiana adresu e-mail została anulowana.
+        resend_error: Nie można wysłać ponownie e-maila z potwierdzeniem.
+        resend_successfully: E-mail potwierdzający wysłany pomyślnie do %{unconfirmed_email}
+        send_again: Wyślij ponownie
+        title: Weryfikacja zmiany adresu e-mail
       show:
+        available_locales_helper: Wybierz język, którego chcesz używać do przeglądania i odbierania powiadomień na platformie
         change_password: Zmień hasło
         update_account: Zaktualizuj konto
       update:
@@ -169,11 +183,36 @@ pl:
         create: "%{user_name} utworzył(a) kategorię %{resource_name}"
         delete: "%{user_name} usunął/usunęła kategorię %{resource_name}"
         update: "%{user_name} zaktualizował(a) kategorię %{resource_name}"
+      area_type:
+        create: "%{user_name} utworzył typ obszaru %{resource_name}"
+        delete: "%{user_name} usunÄ…Å‚ typ obszaru %{resource_name}"
+        update: "%{user_name} zaktualizował typ obszaru %{resource_name}"
+      attachment:
+        create: "%{user_name} utworzył załącznik %{resource_name}"
+        delete: "%{user_name} usunął załącznik %{resource_name}"
+        update: "%{user_name} zaktualizował załącznik %{resource_name}"
+      attachment_collection:
+        create: "%{user_name} utworzył kolekcję załączników %{resource_name}"
+        delete: "%{user_name} usunął kolekcję załączników %{resource_name}"
+        update: "%{user_name} zaktualizował kolekcję załączników %{resource_name}"
+      category:
+        create: "%{user_name} dodał kategorię %{resource_name} do przestrzeni %{space_name}"
+        delete: "%{user_name} usunÄ…Å‚ kategoriÄ™ %{resource_name} z przestrzeni %{space_name}"
+        update: "%{user_name} zaktualizował kategorię %{resource_name} w przestrzeni %{space_name}"
       component:
         create: "%{user_name} dodał(a) komponent %{resource_name} do przestrzeni %{space_name}"
         delete: "%{user_name} usunął/usunęła komponent %{resource_name} z przestrzeni %{space_name}"
+        export_component: "%{user_name} wyeksportował %{resource_name} %{component_name} w %{space_name} jako %{format_name}"
         publish: "%{user_name} opublikował(a) komponent %{resource_name} w przestrzeni %{space_name}"
         unpublish: "%{user_name} cofnął/cofnęła publikację komponentu %{resource_name} w przestrzeni %{space_name}"
+        update_permissions_with_space: "%{user_name} zaktualizował uprawnienia %{resource_name} w %{space_name}"
+      contextual_help_section:
+        update: "%{user_name} zaktualizował %{resource_name} dział pomocy"
+      helpers:
+        answers: odpowiedzi
+        comments: komentarze
+        projects: projekty
+        results: wyniki
       impersonation_log:
         manage: "%{user_name} zarządził %{resource_name} ponieważ %{reason}"
       moderation:
@@ -190,6 +229,7 @@ pl:
         update: "%{user_name} zaktualizował(a) aplikację OAuth %{resource_name}"
       organization:
         update: "%{user_name} zaktualizował(a) ustawienia organizacji"
+        update_external_domain: "%{user_name} zaktualizował zewnętrzne domeny organizacji"
       participatory_space_private_user:
         create: "%{user_name} zaprosił(a) %{resource_name} jako użytkownika prywatnego"
         create_via_csv: "%{user_name} zaprosił(a) %{resource_name} jako prywatnego użytkownika poprzez CSV"
@@ -201,6 +241,9 @@ pl:
         delete_with_parent: "%{user_name} usunął/usunęła zakres podrzędny %{resource_name} w zakresie %{parent_scope}"
         update: "%{user_name} zaktualizował(a) zakres %{resource_name}"
         update_with_parent: "%{user_name} zaktualizował(a) zakres podrzędny %{resource_name} w zakresie %{parent_scope}"
+      scope_type:
+        create: "%{user_name} utworzył(a) zakres %{resource_name}"
+        delete: "%{user_name} usunął(ęła) zakres %{resource_name}"
       static_page:
         create: "%{user_name} stworzył(a) stronę statyczną %{resource_name}"
         delete: "%{user_name} usunął/usunęła stronę statyczną %{resource_name}"
@@ -421,6 +464,7 @@ pl:
           debate: Debata
           initiative: Inicjatywa
           meeting: Spotkanie
+          order: Głosy w budżecie
           post: Wpis
           proposal: Propozycja
           question: Pytanie
@@ -435,8 +479,8 @@ pl:
             amendments_enabled: Poprawki dozwolone
             comments_enabled: Komentarze włączone
             comments_max_length: Maksymalna długość komentarzy
-            dummy_global_attribute_1: Przykładowy atrybut 1
-            dummy_global_attribute_2: Przykładowy atrybut 2
+            dummy_global_attribute1: Przykładowy atrybut 1
+            dummy_global_attribute2: Przykładowy atrybut 2
             dummy_global_translatable_text: Przykładowy tekst do tłumaczenia
             enable_pads_creation: Włącz tworzenie padów
             resources_permissions_enabled: Włączono uprawnienia do zasobów
@@ -448,8 +492,8 @@ pl:
             amendment_reaction_enabled: Odpowiadanie na poprawki włączone
             amendments_visibility: Widoczność poprawek
             comments_blocked: Komentarze zablokowane
-            dummy_step_attribute_1: Przykładowy atrybut etapu 1
-            dummy_step_attribute_2: Przykładowy atrybut etapu 2
+            dummy_step_attribute1: Przykładowy atrybut etapu 1
+            dummy_step_attribute2: Przykładowy atrybut etapu 2
             dummy_step_translatable_text: Przykładowy tekst etapu do tłumaczenia
     contact: Kontakt
     content_blocks:
@@ -493,13 +537,6 @@ pl:
       actions:
         login_before_access: Zaloguj się na swoje konto, żeby mieć dostęp
         unauthorized: Nie masz uprawnień do wykonania tej czynności
-    data_portability:
-      export:
-        ready: Gotowy
-      show:
-        download_data: Pobierz dane
-        download_data_description: Plik zawierający wszystkie informacje związane z Twoim kontem zostanie wysłany do <strong>%{user_email}</strong>. E-mail będzie zawierał plik .zip i hasło, aby go otworzyć.<br/><br/>Aby rozpakować plik, będziesz potrzebował <a href="https://www.7-zip.org/">7-Zip</a> (Windows) lub <a href="https://www.keka.io/">Keka</a> (MacOS). Jeśli używasz systemu Linux, w większości przypadków program będziesz miał zainstalowany domyślnie. Jeśli nie, możesz użyć programów <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> lub <a href="https://peazip.github.io">PeaZip</a>.
-        request_data: PoproÅ› o dane
     datepicker:
       help_text: 'Oczekiwany format: %{datepicker_format}'
     devise:
@@ -518,7 +555,6 @@ pl:
           newsletter: Chcę otrzymywać okazjonalne newslettery z istotnymi informacjami
           newsletter_title: Zgoda na subskrybcjÄ™
           nickname_help: Twój pseudonim w %{organization}. Może zawierać tylko litery, cyfry, '-' i '_'.
-          password_help: "Minimalna liczba znaków: %{minimun_characters}; nie może być zbyt powszechne (np. 123456) i musi różnić się od Twojego pseudonimu i adresu e-mail."
           sign_in: Zaloguj siÄ™
           sign_up: Zarejestruj siÄ™
           sign_up_as:
@@ -567,6 +603,13 @@ pl:
           this_application_will_not_be_able_to: 'Ta aplikacja nie będzie mogła:'
           update_profile: Zaktualizuj swój profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> chce używać Twojego konta"
+    download_your_data:
+      export:
+        ready: Gotowy
+      show:
+        download_data: Pobierz dane
+        download_data_description: Plik zawierający wszystkie informacje związane z Twoim kontem zostanie wysłany do <strong>%{user_email}</strong>. E-mail będzie zawierał plik .zip i hasło, aby go otworzyć.<br/><br/>Aby rozpakować plik, będziesz potrzebował <a href="https://www.7-zip.org/">7-Zip</a> (Windows) lub <a href="https://www.keka.io/">Keka</a> (MacOS). Jeśli używasz systemu Linux, w większości przypadków program będziesz miał zainstalowany domyślnie. Jeśli nie, możesz użyć programów <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> lub <a href="https://peazip.github.io">PeaZip</a>.
+        request_data: PoproÅ› o dane
     endorsable:
       endorsements: Rekomendacje
       endorsements_count: Liczba rekomendacji
@@ -727,7 +770,7 @@ pl:
           email_subject: "%{nickname} zaktualizował(a) swój profil"
           notification_title: Zaktualizowano <a href="%{resource_path}">stronę profilową</a> użytkownika %{name} (%{nickname}), którego obserwujesz.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Kliknij poniższy przycisk, aby pobrać swoje dane. <br/>Plik będzie dostępny do %{date}. <br/>Będziesz potrzebował <a href=''''https://www.7-zip.org/''''>7-Zip</a> (Windows), <a href="https://www.keka.io/en/">Keka</a> (MacOS) lub <a href="https://peazip.github.io">PeaZip</a> (Linux) do otwarcia pliku. Hasło: %{password}'
         download: Pobieranie
       export:
@@ -763,12 +806,11 @@ pl:
       create:
         button: Obserwuj
         error: Wystąpił błąd podczas próby obserwowania tego zasobu.
-        participatory_space: Obserwujesz <span class="show-for-sr">%{resource_name}</span>
+        participatory_space: Obserwuj <span class="show-for-sr">%{resource_name}</span>
       destroy:
         button: Przestań obserwować
         error: Nastąpił błąd podczas cofania obserwowania tego zasobu.
     forms:
-      current_file: Bieżący plik
       current_image: Bieżący obraz
       default_image: Domyślny obraz
       errors:
@@ -780,7 +822,6 @@ pl:
         file:
           explanation: 'Wytyczne dotyczÄ…ce pliku:'
           message_1: Ma być obrazem lub dokumentem.
-          message_2: Jako obrazów używaj najlepiej krajobrazów, obraz jest docinany automatycznie. Dla plików CSV separatorem kolumn musi być przecinek (",")
         image:
           explanation: 'Wytyczne dotyczÄ…ce obrazu:'
           message_1: Preferowany obraz krajobrazu, który nie zawiera żadnego tekstu.
@@ -788,7 +829,6 @@ pl:
       file_validation:
         allowed_file_extensions: 'Dozwolone rozszerzenia plików: %{extensions}'
         max_file_size: 'Maksymalny rozmiar pliku: %{megabytes}MB'
-      remove_this_file: Usuń ten plik
     gamification:
       all_badges_link: Zobacz wszystkie dostępne odznaki.
       badges:
@@ -889,7 +929,6 @@ pl:
       no_user_groups: Nie należy jeszcze do żadnej grupy.
       roles:
         admin: Administrator
-        creator: Twórca
         member: Członek
       update:
         error: Wystąpił błąd podczas aktualizacji grupy
@@ -1040,7 +1079,6 @@ pl:
     newsletter_mailer:
       newsletter:
         note: Otrzymujesz ten e-mail, ponieważ subskrybujesz newslettery %{organization_name}. Możesz zmienić swoje ustawienia na <a href="%{link}">stronie powiadomień</a>.
-        see_on_website: Nie widzisz tego e-maila poprawnie? Wyświetl go w <a href="%{link}" target="_blank">przeglądarce</a>.
         unsubscribe: Aby zrezygnować z otrzymywania tego typu wiadomości e-mail, <a href="%{link}" target="_blank" class="unsubscribe">cofnij subskrypcję</a>.
     newsletter_templates:
       basic_only_text:
@@ -1084,19 +1122,20 @@ pl:
         subject: Czy chcesz nadal otrzymywać istotne informacje o %{organization_name}?
     notifications:
       no_notifications: Brak powiadomień.
+    notifications_digest_mailer:
+      header:
+        weekly: Podsumowanie Cotygodniowych Powiadomień
+      hello: Witaj %{name},
     notifications_settings:
       show:
         administrators: Administratorzy
         allow_public_contact: Każdy może wysłać mi prywatną wiadomość, nawet jeśli go nie obserwuję.
         direct_messages: Przyjmuj prywatne wiadomości od każdego
-        email_on_moderations: Chcę otrzymywać e-mail za każdym razem, gdy coś jest zgłaszane do moderacji.
-        email_on_notification: Chcę otrzymywać wiadomości e-mail za każdym razem gdy otrzymuję powiadomienie.
         everything_followed: DotyczÄ…ce wszystkiego, co obserwujÄ™
         newsletter_notifications: Chcę otrzymywać newslettery
         newsletters: Newslettery
         own_activity: Dotyczące moich własnych działań, np. kiedy ktoś komentuje moją propozycję lub wspomina o mnie
         receive_notifications_about: Chcę otrzymywać powiadomienia
-        send_notifications_by_email: Wysyłaj powiadomienia pocztą e-mail
         update_notifications_settings: Zapisz zmiany
       update:
         error: Podczas aktualizowania ustawień powiadomień wystąpił błąd.
@@ -1154,7 +1193,6 @@ pl:
           agreement: AkceptujÄ™ Regulamin
           legend: Zgadzam się z warunkami użytkowania
         refuse:
-          modal_body: Jeśli odmówisz, nie będziesz mógł korzystać z platformy, możesz <a href="%{data_portability_path}">pobrać swoje dane</a> i/lub <a href="%{delete_path}">usunąć konto</a>.
           modal_btn_continue: Zaakceptuj warunki i kontynuuj
           modal_btn_exit: Sprawdzę to później
           modal_button: Odrzuć warunki
@@ -1346,9 +1384,6 @@ pl:
       help_text: "<strong>Uwaga:</strong> Zawartość może być tłumaczeniem automatycznym i może nie być w 100% dokładna."
       show_original: Pokaż oryginalny tekst
       show_translated: Pokaż automatyczne tłumaczenie
-    user_activity:
-      index:
-        no_activities_warning: Ten użytkownik nie ma jeszcze żadnej aktywności.
     user_contact_disabled: Ten użytkownik nie przyjmuje bezpośrednich wiadomości.
     user_conversations:
       create:
@@ -1454,7 +1489,6 @@ pl:
     invitations:
       edit:
         header: Zakończ tworzenie konta
-        nickname_help: Twój unikalny identyfikator w %{organization}.
         submit_button: Zapisz
         subtitle: Jeśli akceptujesz zaproszenie, ustaw swój pseudonim i hasło.
       invitation_removed: Twoje zaproszenie zostało usunięte.
@@ -1521,7 +1555,6 @@ pl:
     passwords:
       edit:
         change_my_password: Zmień moje hasło
-        change_your_password: Zmień swoje hasło
         confirm_new_password: Potwierdź nowe hasło
         new_password: Nowe hasło
         password_help: "Minimalna liczba znaków: %{minimun_characters}; nie może być zbyt powszechne (np. 123456) i musi różnić się od Twojego pseudonimu i adresu e-mail."
@@ -1608,10 +1641,6 @@ pl:
     timestamp_error_message: Przepraszam, to było za szybkie! Proszę przesłać ponownie.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Ta strona używa plików cookie. Kontynuując przeglądanie witryny, zgadzasz się na korzystanie z plików cookie. Dowiedz się więcej o tym %{link}.
-        link_label: Dowiedz się więcej o plikach cookie
-        ok: Zgadzam siÄ™
       edit_link:
         edit: Edytuj
       footer:
@@ -1673,8 +1702,10 @@ pl:
     email_included_in_password: jest zbyt podobne do twojego adresu e-mail
     fallback: nie jest poprawne
     name_included_in_password: jest zbyt podobne do twojego imienia
+    nickname_included_in_password: jest zbyt podobne do twojego nicka
     not_enough_unique_characters: nie ma wystarczającej liczby unikalnych znaków
     password_not_allowed: nie jest dozwolone
+    password_repeated: nie można ustawić ponownie starego hasła
     password_too_common: jest zbyt powszechne
     password_too_long: jest zbyt długie
     password_too_short: jest za krótkie
diff --git a/decidim-core/config/locales/pt-BR.yml b/decidim-core/config/locales/pt-BR.yml
index c9dceb5f3e403..fd3adc736d1ce 100644
--- a/decidim-core/config/locales/pt-BR.yml
+++ b/decidim-core/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -67,7 +68,6 @@ pt-BR:
     'true': 'Sim'
   carrierwave:
     errors:
-      image_too_big: A imagem é muito grande
       not_inside_organization: O arquivo não está anexado a nenhuma organização
   date:
     formats:
@@ -83,9 +83,6 @@ pt-BR:
       skip_button: Pular para o conteúdo principal
     account:
       blocked: Esta conta foi bloqueada devido a violação de Termos e Condições
-      data_portability_export:
-        file_no_exists: O arquivo não existe
-        notice: Seus dados estão atualmente em andamento. Você receberá um e-mail quando estiver concluído.
       delete:
         alert: Esta ação não pode ser desfeita. Se você excluir sua conta, não poderá fazer login com suas credenciais. A exclusão da sua conta resultará em anonimato das suas contribuições. Você ainda poderá criar uma nova conta, mas estas contribuições não serão associadas a ela.
         confirm:
@@ -97,6 +94,9 @@ pt-BR:
       destroy:
         error: Ocorreu um erro ao cancelar a sua conta.
         success: Sua conta foi excluída.
+      download_your_data_export:
+        file_no_exists: O arquivo não existe
+        notice: Seus dados estão atualmente em andamento. Você receberá um e-mail quando estiver concluído.
       show:
         change_password: Mudar senha
         update_account: Atualizar conta
@@ -374,8 +374,8 @@ pt-BR:
             amendments_enabled: Alterações ativadas
             comments_enabled: Comentários ativados
             comments_max_length: Comprimento máximo de comentários
-            dummy_global_attribute_1: Dummy Atributo 1
-            dummy_global_attribute_2: Dummy Attribute 2
+            dummy_global_attribute1: Dummy Atributo 1
+            dummy_global_attribute2: Dummy Attribute 2
             dummy_global_translatable_text: Texto Tradutor Falso
             enable_pads_creation: Ativar criação de blocos
             resources_permissions_enabled: Permissões de recursos ativadas
@@ -387,8 +387,8 @@ pt-BR:
             amendment_reaction_enabled: Reação da alteração habilitada
             amendments_visibility: Visibilidade das alterações
             comments_blocked: Comentários bloqueados
-            dummy_step_attribute_1: Dummy Step Attribute 1
-            dummy_step_attribute_2: Dummy Step Attribute 2
+            dummy_step_attribute1: Dummy Step Attribute 1
+            dummy_step_attribute2: Dummy Step Attribute 2
             dummy_step_translatable_text: Texto traduzível de Etapa falso
     contact: Contato
     content_blocks:
@@ -432,13 +432,6 @@ pt-BR:
       actions:
         login_before_access: Faça o login com sua conta antes de acessar
         unauthorized: Não está autorizado a realizar esta ação
-    data_portability:
-      export:
-        ready: pronto
-      show:
-        download_data: Baixe os dados
-        download_data_description: Um arquivo contendo todas as informações associadas à sua conta será enviado para <strong>%{user_email}</strong>. Este e-mail conterá um arquivo .zip e uma senha para abri-lo.<br/><br/>Para descompactar o arquivo, você precisará de <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) ou <a href="https://www.keka.io/">Keka</a> (para MacOS). Se você usar Linux, a maior parte do tempo você o terá instalado por padrão. Se não, você pode usar <a href="https://gitlab.gnome.org/GNOME/file-roller">Rolagem de Arquivos</a> ou <a href="https://peazip.github.io">PeaZip</a>. ).
-        request_data: Solicitar dados
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -457,7 +450,6 @@ pt-BR:
           newsletter: Receba um boletim informativo ocasional com informações relevantes
           newsletter_title: Permissão de contato
           nickname_help: Seu alias em %{organization}. Só pode conter letras, números, '-' e '_'.
-          password_help: "O mínimo de %{minimun_characters} caracteres, não deve ser muito comum (por exemplo, 123456) e deve ser diferente do seu apelido e do seu email."
           sign_in: Iniciar sessão
           sign_up: Inscreva-se
           sign_up_as:
@@ -506,6 +498,13 @@ pt-BR:
           this_application_will_not_be_able_to: 'Esta aplicação não poderá:'
           update_profile: atualize seu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quer usar sua conta"
+    download_your_data:
+      export:
+        ready: pronto
+      show:
+        download_data: Baixe os dados
+        download_data_description: Um arquivo contendo todas as informações associadas à sua conta será enviado para <strong>%{user_email}</strong>. Este e-mail conterá um arquivo .zip e uma senha para abri-lo.<br/><br/>Para descompactar o arquivo, você precisará de <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) ou <a href="https://www.keka.io/">Keka</a> (para MacOS). Se você usar Linux, a maior parte do tempo você o terá instalado por padrão. Se não, você pode usar <a href="https://gitlab.gnome.org/GNOME/file-roller">Rolagem de Arquivos</a> ou <a href="https://peazip.github.io">PeaZip</a>. ).
+        request_data: Solicitar dados
     endorsable:
       endorsements: Avais
       endorsements_count: Contagem de endossos
@@ -666,7 +665,7 @@ pt-BR:
           email_subject: "%{nickname} atualizaram seu perfil"
           notification_title: O <a href="%{resource_path}">profile page</a> de %{name} (%{nickname}), quem você está seguindo, foi atualizado.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Clique no próximo link para baixar seus dados.<br/>O arquivo estará disponível até %{date}.<br/>Você vai precisar de <a href="https://www.7-zip.org/">7-Zip</a> (para Windows), <a href="https://www.keka.io/en/">Keka</a> (para MacOS) ou <a href="https://peazip.github.io">PeaZip</a> (para Linux) para abri-lo. Senha: %{password}'
         download: Download
       export:
@@ -705,7 +704,6 @@ pt-BR:
         button: Parar de seguir
         error: Ocorreu um erro ao seguir esse recurso.
     forms:
-      current_file: Ficheiro atual
       current_image: Imagem actual
       default_image: Imagem por defeito
       errors:
@@ -717,7 +715,6 @@ pt-BR:
         file:
           explanation: 'Orientação para o arquivo:'
           message_1: Tem que ser uma imagem ou um documento.
-          message_2: Para imagens, use de preferência imagens de paisagem, o serviço cultiva a imagem. Para arquivos CSV, o separador entre colunas deve ser uma vírgula (",")
         image:
           explanation: 'Orientação da imagem:'
           message_1: Preferencialmente, uma imagem de paisagem que não tem nenhum texto.
@@ -725,7 +722,6 @@ pt-BR:
       file_validation:
         allowed_file_extensions: 'Extensões de arquivo permitidas: %{extensions}'
         max_file_size: 'Tamanho máximo de arquivo: %{megabytes}MB'
-      remove_this_file: Remover este ficheiro
     gamification:
       all_badges_link: Veja todos os emblemas disponíveis.
       badges:
@@ -826,7 +822,6 @@ pt-BR:
       no_user_groups: Não pertence a nenhum grupo ainda.
       roles:
         admin: Administrador
-        creator: Autor
         member: Membro
       update:
         error: Houve um problema ao atualizar o grupo
@@ -981,7 +976,6 @@ pt-BR:
     newsletter_mailer:
       newsletter:
         note: Você recebeu este e-mail porque está inscrito em boletins informativos em %{organization_name}. Você pode alterar suas configurações em suas <a href="%{link}">notifications page</a>.
-        see_on_website: Não é possível ver este email corretamente? Visualize-o no <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Para optar por não receber esse tipo de email, <a href="%{link}" target="_blank" class="unsubscribe">Unsubscribe</a>.
     newsletter_templates:
       basic_only_text:
@@ -1030,14 +1024,11 @@ pt-BR:
         administrators: Administradores
         allow_public_contact: Permita que qualquer pessoa me envie uma mensagem direta, mesmo que eu não as siga.
         direct_messages: Receber mensagens diretas de qualquer pessoa
-        email_on_moderations: Quero receber um e-mail sempre que houver um relatório de moderação.
-        email_on_notification: Quero receber um email sempre que recebo uma notificação.
         everything_followed: Tudo que eu sigo
         newsletter_notifications: Quero receber boletins informativos
         newsletters: boletins informativos
         own_activity: Minha atividade, como quando alguém comenta minha proposta ou me menciona
         receive_notifications_about: Quero receber notificações sobre
-        send_notifications_by_email: Enviar notificações por email
         update_notifications_settings: Guardar alterações
       update:
         error: Ocorreu um erro ao atualizar suas configurações de notificações.
@@ -1095,7 +1086,6 @@ pt-BR:
           agreement: Concordo com estes termos
           legend: Concorde com os termos e condições de uso
         refuse:
-          modal_body: Se recusar, você não será capaz de usar a plataforma, você pode <a href="%{data_portability_path}">baixar seus dados</a> e / ou <a href="%{delete_path}">excluir sua conta</a>.
           modal_btn_continue: Aceite os termos e continue
           modal_btn_exit: Vou revisá-lo mais tarde
           modal_button: Recuse os termos
@@ -1289,9 +1279,6 @@ pt-BR:
       help_text: "<strong>Aviso:</strong> O conteúdo pode ser traduzido automaticamente e não está 100% correto."
       show_original: Exibir texto original
       show_translated: Mostrar texto traduzido automaticamente
-    user_activity:
-      index:
-        no_activities_warning: Este usuário ainda não possui nenhuma atividade.
     user_contact_disabled: Este usuário não aceita mensagens diretas.
     user_conversations:
       create:
@@ -1397,7 +1384,6 @@ pt-BR:
     invitations:
       edit:
         header: Termine de criar sua conta
-        nickname_help: Seu identificador exclusivo em %{organization}.
         submit_button: Salvar
         subtitle: Se você aceitar o convite, defina seu apelido e senha.
       invitation_removed: Seu convite foi removido.
@@ -1464,7 +1450,6 @@ pt-BR:
     passwords:
       edit:
         change_my_password: Mudar minha senha
-        change_your_password: Mude sua senha
         confirm_new_password: Confirme a nova senha
         new_password: Nova senha
         password_help: "O mínimo de %{minimun_characters} caracteres, não deve ser muito comum (por exemplo, 123456) e deve ser diferente do seu apelido e do seu email."
@@ -1545,10 +1530,6 @@ pt-BR:
     timestamp_error_message: Desculpe, isso foi muito rápido! Reenvie.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este site usa cookies. Ao continuar a navegar no site, você concorda com o uso de cookies. Saiba mais sobre isso %{link}.
-        link_label: aqui
-        ok: Concordo
       edit_link:
         edit: Editar
       footer:
diff --git a/decidim-core/config/locales/pt.yml b/decidim-core/config/locales/pt.yml
index 74cbba97e7c4e..b7fd4afaff277 100644
--- a/decidim-core/config/locales/pt.yml
+++ b/decidim-core/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -67,7 +68,6 @@ pt:
     'true': 'Sim'
   carrierwave:
     errors:
-      image_too_big: A imagem é demasiado grande
       not_inside_organization: O ficheiro não está anexado a nenhuma organização
   date:
     formats:
@@ -83,9 +83,6 @@ pt:
       skip_button: Avançar para o conteúdo principal
     account:
       blocked: Esta conta foi bloqueada por violação dos Termos e Condições
-      data_portability_export:
-        file_no_exists: Ficheiro não existente
-        notice: A transferência dos seus dados está atualmente em progresso. Receberá um e-mail quando estiver concluído.
       delete:
         alert: Esta acção não pode ser revertida. Se apagar a sua conta não poderá mais ligar-se com as suas credenciais. Apagar a sua conta resultará no anonimizar de todas as suas contribuições. Conseguirá criar uma nova conta, mas essas contribuições não serão associadas a ela.
         confirm:
@@ -97,8 +94,10 @@ pt:
       destroy:
         error: Ocorreu um problema ao eliminar a sua conta.
         success: A sua conta foi eliminada corretamente.
+      download_your_data_export:
+        file_no_exists: Ficheiro não existente
+        notice: A transferência dos seus dados está atualmente em progresso. Receberá um e-mail quando estiver concluído.
       show:
-        available_locales_helper: Escolha a linguagem que quer usar para navegar e receber notificações no Decidim
         change_password: Mudar senha
         update_account: Atualizar conta
       update:
@@ -374,8 +373,8 @@ pt:
             amendments_enabled: Modificações ativadas
             comments_enabled: Comentários ativados
             comments_max_length: Comprimento máximo dos comentários
-            dummy_global_attribute_1: Atributo Fictício 1
-            dummy_global_attribute_2: Atributo Fictício 2
+            dummy_global_attribute1: Atributo Fictício 1
+            dummy_global_attribute2: Atributo Fictício 2
             dummy_global_translatable_text: Texto Traduzível Fictício
             enable_pads_creation: Ativar criação de blocos
             resources_permissions_enabled: Permissões de recursos ativadas
@@ -387,8 +386,8 @@ pt:
             amendment_reaction_enabled: Reação a modificação ativada
             amendments_visibility: Visibilidade da modificação
             comments_blocked: Comentários bloqueados
-            dummy_step_attribute_1: Passo de Atributo Fictício 1
-            dummy_step_attribute_2: Passo de Atributo Fictício 2
+            dummy_step_attribute1: Passo de Atributo Fictício 1
+            dummy_step_attribute2: Passo de Atributo Fictício 2
             dummy_step_translatable_text: Passo de Texto Traduzível Fictício
     contact: Contacto
     content_blocks:
@@ -432,13 +431,6 @@ pt:
       actions:
         login_before_access: Por favor, inicie sessão na sua conta antes de aceder
         unauthorized: Não está autorizado a realizar esta ação
-    data_portability:
-      export:
-        ready: Pronto
-      show:
-        download_data: Transferir os dados
-        download_data_description: Um ficheiro contendo toda a informação associada com a sua conta será enviado a <strong>%{user_email}</strong>. Este e-mail irá conter um ficheiro .zip e uma password para o abrir. <Br/><br/>Para abrir o ficheiro zip irá precisar do <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) ou <a href="https://www.keka.io/">Keka</a> (para MacOS). Se utiliza Linux, provavelmente terá a ferramenta instalada por defeito. Se não, pode usar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Solicitar dados
     datepicker:
       help_text: 'Formato esperado: %{datepicker_format}'
     devise:
@@ -457,7 +449,6 @@ pt:
           newsletter: Receber um boletim informativo ocasional com informações relevantes
           newsletter_title: Permissão de contacto
           nickname_help: A sua alcunha em %{organization}. Só pode conter letras, números, “-�, e “_�
-          password_help: "%{minimun_characters} de caracteres no mínimo, não deverá ser muito comum (por ex. 123456) e deverá ser diferente da sua alcunha e do seu e-mail."
           sign_in: Entrar
           sign_up: Inscreva-se
           sign_up_as:
@@ -506,6 +497,13 @@ pt:
           this_application_will_not_be_able_to: 'Esta aplicação não poderá:'
           update_profile: Atualizar o seu perfil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> quer usar a sua conta"
+    download_your_data:
+      export:
+        ready: Pronto
+      show:
+        download_data: Transferir os dados
+        download_data_description: Um ficheiro contendo toda a informação associada com a sua conta será enviado a <strong>%{user_email}</strong>. Este e-mail irá conter um ficheiro .zip e uma password para o abrir. <Br/><br/>Para abrir o ficheiro zip irá precisar do <a href="https://www.7-zip.org/">7-Zip</a> (para Windows) ou <a href="https://www.keka.io/">Keka</a> (para MacOS). Se utiliza Linux, provavelmente terá a ferramenta instalada por defeito. Se não, pode usar <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> ou <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Solicitar dados
     endorsable:
       endorsements: Endossos
       endorsements_count: Contagem de apoios
@@ -666,7 +664,7 @@ pt:
           email_subject: "%{nickname} atualizaram seu perfil"
           notification_title: A <a href="%{resource_path}">página de perfil</a> de %{name} (%{nickname}), que você segue, foi atualizada.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Clique na ligação seguinta para descarregar os seus dados. <Br/> Irá precisar  de <a href="https://www.7-zip.org/">7-Zip</a> (para Windows), <a href="https://www.keka.io/en/">Keka</a> (para MacOS), ou <a href="https://peazip.github.io">PeaZip</a> (para Linux) para abrir o ficheiro. Palavra-chave: %{password}'
         download: Transferir
       export:
@@ -705,7 +703,6 @@ pt:
         button: Parar de seguir
         error: Ocorreu um problema ao seguir este recurso.
     forms:
-      current_file: Ficheiro atual
       current_image: Imagem actual
       default_image: Imagem por defeito
       errors:
@@ -717,7 +714,6 @@ pt:
         file:
           explanation: 'Orientação para o ficheiro:'
           message_1: Tem que ser uma imagem ou um documento.
-          message_2: Para imagens, use de preferência imagens em paisagem, o serviço corta a imagem. Para ficheiros CSV, o separador entre colunas deve ser uma vírgula (“,�)
         image:
           explanation: 'Orientação para a imagem:'
           message_1: Preferencialmente, uma imagem de paisagem que não tem nenhum texto.
@@ -725,7 +721,6 @@ pt:
       file_validation:
         allowed_file_extensions: 'Extensões de ficheiro permitidas: %{extensions}'
         max_file_size: 'Tamanho máximo do ficheiro: %{megabytes}MB'
-      remove_this_file: Remover este ficheiro
     gamification:
       all_badges_link: Ver todos os distintivos disponíveis.
       badges:
@@ -826,7 +821,6 @@ pt:
       no_user_groups: Ainda não pertence a nenhum grupo.
       roles:
         admin: Administrador
-        creator: Criador
         member: Membro
       update:
         error: Ocorreu um problema ao atualizar o grupo
@@ -981,7 +975,6 @@ pt:
     newsletter_mailer:
       newsletter:
         note: Recebeu este e-mail porque está inscrito em boletins informativos de %{organization_name}. Pode alterar as suas configurações na sua <a href="%{link}">página de notificações</a>.
-        see_on_website: Não consegue ver este e-mail corretamente? Visualize-o no <a href="%{link}" target="_blank">website</a>.
         unsubscribe: Para optar por não receber este tipo de e-mail, <a href="%{link}" target="_blank" class="unsubscribe">Cancele a subscrição</a>.
     newsletter_templates:
       basic_only_text:
@@ -1030,14 +1023,11 @@ pt:
         administrators: Administradores
         allow_public_contact: Permitir que qualquer pessoa me envie uma mensagem direta, mesmo que não a siga.
         direct_messages: Receber mensagens diretas de qualquer pessoa
-        email_on_moderations: Quero receber um e-mail sempre que alguma coisa for denunciada para moderação
-        email_on_notification: Quero receber um e-mail sempre que recebo uma notificação.
         everything_followed: Tudo o que eu sigo
         newsletter_notifications: Quero receber boletins informativos
         newsletters: Boletins informativos
         own_activity: A minha atividade, como quando alguém comenta a minha proposta ou me menciona
         receive_notifications_about: Quero receber notificações sobre
-        send_notifications_by_email: Enviar notificações por e-mail
         update_notifications_settings: Guardar alterações
       update:
         error: Ocorreu um problema ao atualizar as suas configurações de notificações.
@@ -1095,7 +1085,6 @@ pt:
           agreement: Concordo com estes termos
           legend: Concordo com os termos e condições de uso
         refuse:
-          modal_body: Se recusar, não será capaz de utilizar a plataforma, pode <a href="%{data_portability_path}">transferir os seus dados</a> e / ou <a href="%{delete_path}">eliminar a sua conta</a>.
           modal_btn_continue: Aceitar os termos e continuar
           modal_btn_exit: Irei revê-los mais tarde
           modal_button: Recusar os termos
@@ -1289,9 +1278,6 @@ pt:
       help_text: "<strong>Aviso:</strong> O conteúdo pode ser traduzido automaticamente e não ser 100% fidedigno."
       show_original: Mostrar texto original
       show_translated: Mostrar texto traduzido automaticamente
-    user_activity:
-      index:
-        no_activities_warning: Este participante ainda não possui nenhuma atividade.
     user_contact_disabled: Este participante não aceita mensagens diretas.
     user_conversations:
       create:
@@ -1397,7 +1383,6 @@ pt:
     invitations:
       edit:
         header: Termine a criação da sua conta
-        nickname_help: A sua alcunha em %{organization}.
         submit_button: Salvar
         subtitle: Se aceitar o convite, por favor defina a sua alcunha e palavra-passe.
       invitation_removed: O seu convite foi removido.
@@ -1464,7 +1449,6 @@ pt:
     passwords:
       edit:
         change_my_password: Modificar a minha palavra-passe
-        change_your_password: Modificar a sua palavra-passe
         confirm_new_password: Confirme a nova palavra-passe
         new_password: Nova palavra-passe
         password_help: "%{minimun_characters} de caracteres no mínimo, não deverá ser muito comum (por ex. 123456) e deverá ser diferente da sua alcunha e do seu e-mail."
@@ -1545,10 +1529,6 @@ pt:
     timestamp_error_message: Desculpe, isso foi muito rápido! Por favor reenvie.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Este sítio usa cookies. Ao continuar a navegar no sítio, está a concordar com o uso desses cookies. Saiba mais sobre isso %{link}.
-        link_label: aqui
-        ok: Concordo
       edit_link:
         edit: Editar
       footer:
diff --git a/decidim-core/config/locales/ro-RO.yml b/decidim-core/config/locales/ro-RO.yml
index 43612a43b0548..01ac5e026634f 100644
--- a/decidim-core/config/locales/ro-RO.yml
+++ b/decidim-core/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -40,6 +41,9 @@ ro:
       decidim/promote_to_admin: Promovat ca administrator
       decidim/removed_from_group: Eliminat din grup
       decidim/resource_endorsed_event: Resursă susținută
+      decidim/resource_hidden_event: Resursă ascunsă
+      decidim/user_group_created_event: Grup de utilizatori creat
+      decidim/welcome_notification_event: Mesaj de întâmpinare
   activerecord:
     attributes:
       decidim/user:
@@ -71,7 +75,8 @@ ro:
     'true': 'Da'
   carrierwave:
     errors:
-      image_too_big: Imaginea este prea mare
+      file_resolution_too_large: Rezoluția fișierului este prea mare
+      file_size_too_large: Mărimea fișierului este prea mare
       not_inside_organization: Fișierul nu este atașat niciunei organizații
   date:
     formats:
@@ -83,10 +88,6 @@ ro:
   datetime:
     distance_in_words:
       half_a_minute: jumătate de minut
-      x_seconds:
-        one: Acum 1 sec
-        other: "%{count} secunde în urmă"
-        zero: chiar acum
   decidim:
     accessibility:
       external_link: Link extern
@@ -94,9 +95,6 @@ ro:
       skip_button: Salt la conținutul principal
     account:
       blocked: Acest cont a fost blocat din cauza încălcării termenilor și condițiilor
-      data_portability_export:
-        file_no_exists: Fișierul nu există
-        notice: Descărcarea datelor dvs. este în curs de desfășurare. Veți primi un e-mail atunci când este completă.
       delete:
         alert: Această acțiune nu poate fi anulată. Dacă vă ștergeți contul, nu veți mai putea să vă autentificați cu datele de autentificare. Ștergerea contului dvs. va duce la anonimizarea contribuțiilor dvs. Veți putea crea în continuare un cont nou, dar aceste contribuții nu vor fi asociate cu acesta.
         confirm:
@@ -108,8 +106,13 @@ ro:
       destroy:
         error: A apărut o eroare la ștergerea contului tău.
         success: Contul tău a fost șters cu succes.
+      download_your_data_export:
+        file_no_exists: Fișierul nu există
+        notice: Descărcarea datelor dvs. este în curs de desfășurare. Veți primi un e-mail atunci când este completă.
+      email_change:
+        cancel: anulare
+        send_again: Trimite din nou
       show:
-        available_locales_helper: Alege limba pe care dorești să o utilizezi pentru a naviga și primi notificări în Decidim
         change_password: Schimbă parola
         update_account: Actualizați contul
       update:
@@ -129,6 +132,11 @@ ro:
         delete: "%{user_name} a eliminat componenta %{resource_name} din spațiul %{space_name}"
         publish: "%{user_name} a publicat componenta %{resource_name} în spațiul %{space_name}"
         unpublish: "%{user_name} a anulat publicarea componentei %{resource_name} din spațiul %{space_name}"
+      helpers:
+        answers: răspunsuri
+        comments: comentarii
+        projects: proiecte
+        results: rezultate
       impersonation_log:
         manage: "%{user_name} a gestionat %{resource_name} deoarece %{reason}"
       moderation:
@@ -285,6 +293,7 @@ ro:
         one: susținere
         few: susțineri
         other: susțineri
+      official_author: Oficial
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Verifică prin prin introducerea unui număr al pașaportului începând cu „A�
@@ -390,8 +399,8 @@ ro:
             amendments_enabled: Amendamente activate
             comments_enabled: Comentarii activate
             comments_max_length: Lungimea maximă a comentariilor
-            dummy_global_attribute_1: Mostră de atribut 1
-            dummy_global_attribute_2: Mostră de atribut 2
+            dummy_global_attribute1: Mostră de atribut 1
+            dummy_global_attribute2: Mostră de atribut 2
             dummy_global_translatable_text: Text-test traductibil
             enable_pads_creation: Activează crearea de pad-uri
             resources_permissions_enabled: Drepturi pentru resurse activate
@@ -403,8 +412,8 @@ ro:
             amendment_reaction_enabled: Reacția la amendamente activată
             amendments_visibility: Vizibilitatea amendamentului
             comments_blocked: Comentarii blocate
-            dummy_step_attribute_1: Atribut fictiv 1
-            dummy_step_attribute_2: Mostră de atribut 2 al etapei
+            dummy_step_attribute1: Atribut fictiv 1
+            dummy_step_attribute2: Mostră de atribut 2 al etapei
             dummy_step_translatable_text: Mostră de text traductibil pentru etapă
     contact: Contact
     content_blocks:
@@ -448,13 +457,6 @@ ro:
       actions:
         login_before_access: Te rugăm să te conectezi cu contul tău înainte de a accesa conținutul
         unauthorized: Nu sunteți autorizat să efectuați această acțiune
-    data_portability:
-      export:
-        ready: Gata
-      show:
-        download_data: Descarcă datele
-        download_data_description: Un fișier care conține toate informațiile asociate contului tău va fi trimis la <strong>%{user_email}</strong>. Acest e-mail va conține un fișier .zip și o parolă pentru a-l deschide.<br/><br/>Pentru a dezarhiva fişierul, aveţi nevoie de <a href="https://www.7-zip.org/">7-Zip</a> (pentru Windows) sau <a href="https://www.keka.io/">Keka</a> (pentru MacOS). Dacă utilizați Linux, de cele mai multe ori îl veți instala în mod implicit. Dacă nu, puteți utiliza <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> sau <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Cere date
     datepicker:
       help_text: 'Format preconizat: %{datepicker_format}'
     devise:
@@ -473,7 +475,6 @@ ro:
           newsletter: Primește un buletin informativ ocazional cu informații relevante
           newsletter_title: Drepturi privind contactele
           nickname_help: Pseudonimul tău în %{organization}. Poate conține doar litere, numere, '-' și '_'.
-          password_help: "minim %{minimun_characters} caractere, nu trebuie să fie prea comune (ex. 123456) și trebuie să fie diferite de porecla și adresa dvs. de e-mail."
           sign_in: Autentificare
           sign_up: ÃŽnscrie-te
           sign_up_as:
@@ -525,6 +526,13 @@ ro:
           this_application_will_not_be_able_to: 'Această aplicație nu va putea să:'
           update_profile: Actualizeză-ți profilul
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> vrea să folosească contul tău"
+    download_your_data:
+      export:
+        ready: Gata
+      show:
+        download_data: Descarcă datele
+        download_data_description: Un fișier care conține toate informațiile asociate contului tău va fi trimis la <strong>%{user_email}</strong>. Acest e-mail va conține un fișier .zip și o parolă pentru a-l deschide.<br/><br/>Pentru a dezarhiva fişierul, aveţi nevoie de <a href="https://www.7-zip.org/">7-Zip</a> (pentru Windows) sau <a href="https://www.keka.io/">Keka</a> (pentru MacOS). Dacă utilizați Linux, de cele mai multe ori îl veți instala în mod implicit. Dacă nu, puteți utiliza <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> sau <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Cere date
     editor_images:
       create:
         error: Eroare la încărcarea imaginii
@@ -690,7 +698,7 @@ ro:
           email_subject: "%{nickname} și-a actualizat profilul"
           notification_title: Pagina de profil <a href="%{resource_path}"></a> din %{name} (%{nickname}), pe care o urmărești, a fost actualizată.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Dă-i clic pe următorul link pentru a descărca datele.<br/>Fișierul va fi disponibil până la %{date}.<br/>Vei avea nevoie de <a href="https://www.7-zip.org/">7-Zip</a> (pentru Windows), <a href="https://www.keka.io/en/">Keka</a> (pentru MacOS) sau <a href="https://peazip.github.io">PeaZip</a> (pentru Linux) pentru a-l deschide. Parola: %{password}'
         download: Descărcare
       export:
@@ -731,7 +739,6 @@ ro:
         button: Nu doresc să mai urmăresc
         error: A apărut o problemă la anularea urmăririi acestei resurse.
     forms:
-      current_file: FiÅŸier curent
       current_image: Imaginea curentă
       default_image: Imagine implicită
       errors:
@@ -743,7 +750,8 @@ ro:
         file:
           explanation: 'Orientări pentru fișier:'
           message_1: Are o imagine sau un document.
-          message_2: Pentru imagini, utiilizează preferabil formatul landscape, serviciul va decupa imaginea. Pentru fișierele CSV, separatorul de coloane trebuie să fie virgula
+        icon:
+          explanation: 'ÃŽndrumare pentru imagine:'
         image:
           explanation: 'Orientări pentru imagine:'
           message_1: De preferință o imagine landscape care să nu conțină vreun text.
@@ -751,7 +759,21 @@ ro:
       file_validation:
         allowed_file_extensions: 'Extensii de fișiere permise: %{extensions}'
         max_file_size: 'Dimensiunea maximă a fișierului: %{megabytes}MB'
-      remove_this_file: Elimină acest fișier
+      upload:
+        labels:
+          add_attachment: Adaugă atașament
+          add_file: Adaugă fișier
+          add_image: Adaugă imagine
+          edit_image: Schimbă imaginea
+          error: Eroare!
+          remove: Șterge
+          replace: Înlocuiește
+          save: Salvează
+          title: Titlu
+          title_required: Titlul este obligatoriu!
+      upload_help:
+        dropzone: Trage fișierele aici sau apasă pe buton pentru a încărca
+        explanation: ÃŽndrumare pentru %{attribute}
     gamification:
       all_badges_link: Vezi toate insignele disponibile.
       badges:
@@ -852,7 +874,7 @@ ro:
       no_user_groups: Încă nu aparține niciunui grup.
       roles:
         admin: Administrator
-        creator: Creator
+        creator: Administrator
         member: Membru
       update:
         error: A apărut o eroare la actualizarea grupului
@@ -877,7 +899,7 @@ ro:
         body_1: Ești pe cale de a vizita un link extern și am dori să fii precaut în ceea ce privește conținutul de pe site-ul extern.
         body_2: Te rugăm să verifici link-ul pe care urmează să îl vizitezi și să te asiguri că îl este un site sigur înainte de a continua.
         cancel: Anulare
-        close_modal: ÃŽnchidere
+        close_modal: ÃŽnchide fereastra
         proceed: Continuă
         title: Deschide link-ul extern
     log:
@@ -1009,7 +1031,6 @@ ro:
     newsletter_mailer:
       newsletter:
         note: Ați primit acest e-mail deoarece sunteți abonat la buletinele informative de pe %{organization_name}. Puteți modifica setările de pe pagina <a href="%{link}">de notificări</a>.
-        see_on_website: Nu se poate vedea corect acest e-mail? Vizualizați-l pe <a href="%{link}" target="_blank">site-ul</a>.
         unsubscribe: Pentru a renunța la primirea acestui tip de e-mail, <a href="%{link}" target="_blank" class="unsubscribe">Dezabonați-vă</a>.
     newsletter_templates:
       basic_only_text:
@@ -1059,23 +1080,39 @@ ro:
         translated_text: 'Text tradus automat:'
     notifications:
       no_notifications: Nici o notificare încă.
+    notifications_digest_mailer:
+      header:
+        daily: Rezumat notificare zilnică
+        weekly: Rezumat notificări săptămânale
+      hello: Salut %{name},
+      intro:
+        daily: 'Acestea sunt notificările din ultima zi în funcție de activitatea pe care o dețineți:'
+      see_more: Vezi mai multe notificări
     notifications_settings:
       show:
         administrators: Administratori
         allow_public_contact: Permiteți oricui să îmi trimită un mesaj direct, chiar dacă nu-l urmăresc.
         direct_messages: Primește mesaje directe de la oricine
-        email_on_moderations: Vreau să primesc un e-mail de fiecare dată când se raportează ceva pentru moderare.
-        email_on_notification: Vreau să primesc un e-mail de fiecare dată când primesc o notificare.
         everything_followed: Tot ce urmăresc
         newsletter_notifications: Vreau să primesc buletine informative
         newsletters: Newslettere
+        notifications_sending_frequencies:
+          daily: Zilnic
+          none: Nimic
+          real_time: ÃŽn timp real
+          weekly: Săptămânal
         own_activity: Propria mea activitate, ca atunci când cineva comentează în propunerea mea sau mă menționează
+        push_notifications: Notificări Instant
+        push_notifications_reminder: Pentru a primi notificări de pe platformă, trebuie să le permiteți mai întâi în setările browser-ului.
         receive_notifications_about: Vreau să primesc notificări despre
-        send_notifications_by_email: Trimite notificări prin e-mail
         update_notifications_settings: Salvează modificările
       update:
         error: A apărut o eroare la actualizarea setărilor notificărilor.
         success: Setările de notificări au fost actualizate cu succes.
+    offline:
+      show:
+        message: Se pare că ești deconectat. Te rugăm să încerci din nou mai târziu.
+        retry: Încearcă din nou
     open_data:
       not_available_yet: Fişierele de date deschise nu sunt încă disponibile, vă rugăm să încercaţi din nou în câteva minute.
     own_user_groups:
@@ -1129,7 +1166,6 @@ ro:
           agreement: Sunt de acord cu acești termeni și condiţii
           legend: Sunt de acord cu termenii și condițiile de utilizare
         refuse:
-          modal_body: Dacă refuzați, nu veți putea utiliza platforma, puteți <a href="%{data_portability_path}">descărca datele</a> și/sau <a href="%{delete_path}">șterge contul dvs</a>.
           modal_btn_continue: Acceptați termenii și continuați
           modal_btn_exit: O voi revizui mai târziu
           modal_button: Refuza termenii
@@ -1326,7 +1362,7 @@ ro:
       show_translated: Arată textul tradus automat
     user_activity:
       index:
-        no_activities_warning: Acest participant nu a avut încă nicio activitate.
+        no_activities_warning: Acest participant nu are nicio activitate încă.
     user_contact_disabled: Acest participant nu acceptă mesaje directe.
     user_conversations:
       create:
@@ -1433,7 +1469,6 @@ ro:
     invitations:
       edit:
         header: Finalizează crearea contului tău
-        nickname_help: Pseudonimul tău în %{organization}.
         submit_button: Salvează
         subtitle: Dacă acceptați invitația, vă rugăm să vă setați porecla și parola.
       invitation_removed: Invitația ta a fost eliminată.
@@ -1500,7 +1535,6 @@ ro:
     passwords:
       edit:
         change_my_password: Schimbă-mi parola
-        change_your_password: Schimbă-ți parola
         confirm_new_password: Confirmare parolă nouă
         new_password: Parola nouă
         password_help: "minim %{minimun_characters} caractere, nu trebuie să fie prea comune (ex. 123456) și trebuie să fie diferite de porecla și adresa dvs. de e-mail."
@@ -1584,10 +1618,6 @@ ro:
     timestamp_error_message: Ne pare rău, acest lucru a fost prea rapid! Te rugăm să retrimiți.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Acest site folosește cookie-uri. Continuând să navigați pe site, sunteți de acord cu utilizarea cookie-urilor. Aflați mai multe despre el %{link}.
-        link_label: aici
-        ok: Sunt de acord
       edit_link:
         edit: Editare
       footer:
diff --git a/decidim-core/config/locales/ru.yml b/decidim-core/config/locales/ru.yml
index be9a39df620d1..7fcdae79af33a 100644
--- a/decidim-core/config/locales/ru.yml
+++ b/decidim-core/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -50,18 +51,12 @@ ru:
   booleans:
     'false': '�ет'
     'true': 'Да'
-  carrierwave:
-    errors:
-      image_too_big: Изображение �лишком велико
   date:
     formats:
       decidim_short: "%d.%m.%Y"
       decidim_with_month_name: "%d %B %Y"
   decidim:
     account:
-      data_portability_export:
-        file_no_exists: Файла не �уще�твует
-        notice: Идет �охранение в виде файла. Вы получите �лектронное пи�ьмо, когда оно будет завершено.
       delete:
         confirm:
           close: Закрыть окно
@@ -72,6 +67,9 @@ ru:
       destroy:
         error: При попытке удалить вашу учетную запи�ь произошла ошибка.
         success: Ваша учетна� запи�ь была у�пешно удалена.
+      download_your_data_export:
+        file_no_exists: Файла не �уще�твует
+        notice: Идет �охранение в виде файла. Вы получите �лектронное пи�ьмо, когда оно будет завершено.
       show:
         change_password: Помен�ть пароль
         update_account: Обновить учетную запи�ь
@@ -227,6 +225,8 @@ ru:
           title: �е подтвердили �вою лично�ть
         unconfirmed:
           title: Подтвердите вашу �лектронную почту
+      show:
+        close_modal: Закрыть окошко
     collapsible_list:
       hidden_elements_count:
         one: и еще %{count}
@@ -244,13 +244,13 @@ ru:
         settings:
           global:
             comments_enabled: Комментарии включены
-            dummy_global_attribute_1: Пример �вой�тва 1
-            dummy_global_attribute_2: Пример �вой�тва 2
+            dummy_global_attribute1: Пример �вой�тва 1
+            dummy_global_attribute2: Пример �вой�тва 2
             resources_permissions_enabled: Разрешени� ре�ур�ов включены
           step:
             comments_blocked: Комментарии отключены
-            dummy_step_attribute_1: Пример 1 �вой�тва шага
-            dummy_step_attribute_2: Пример 2 �вой�тва шага
+            dummy_step_attribute1: Пример 1 �вой�тва шага
+            dummy_step_attribute2: Пример 2 �вой�тва шага
     contact: Св�зать��
     content_blocks:
       footer_sub_hero:
@@ -278,12 +278,6 @@ ru:
       actions:
         login_before_access: Пожалуй�та, войдите под вашей учётной запи�ью перед получением до�тупа
         unauthorized: Вы не имеете прав дл� выполнени� �того дей�тви�
-    data_portability:
-      export:
-        ready: Готово
-      show:
-        download_data: Загрузить данные
-        request_data: Запро�ить данные
     datepicker:
       help_text: 'Ожидаемый формат: %{datepicker_format}'
     devise:
@@ -340,6 +334,12 @@ ru:
           this_application_will_not_be_able_to: 'Это приложение не �может:'
           update_profile: Обновить �вой профиль
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> желает и�пользовать вашу учетную запи�ь"
+    download_your_data:
+      export:
+        ready: Готово
+      show:
+        download_data: Загрузить данные
+        request_data: Запро�ить данные
     endorsable:
       endorsements: Выражений поддержки
     errors:
@@ -387,7 +387,7 @@ ru:
           email_subject: "%{nickname} обновил �вой профиль"
           notification_title: Страница <a href="%{resource_path}">профил�</a> уча�тника %{name} (%{nickname}), за которым вы �ледите, была обновлена.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Скачать
       export:
         ready: К на�то�щему прилагает�� в архивированном виде �охраненный вами файл.
@@ -420,12 +420,10 @@ ru:
         button: Пере�тать �ледить
         error: При попытке пере�тать �ледить за �тим ре�ур�ом произошла ошибка.
     forms:
-      current_file: Текущий файл
       current_image: Текущее изображение
       default_image: Изображение по умолчанию
       errors:
         error: В �том поле е�ть ошибка.
-      remove_this_file: Удалить �тот файл
     gamification:
       badges:
         index:
@@ -466,6 +464,9 @@ ru:
       all: В�е виды активно�ти
       index:
         last_activity: По�ледн�� активно�ть
+    links:
+      warning:
+        close_modal: Закрыть окошко
     log:
       base_presenter:
         create: "%{user_name} добавил %{resource_name}"
@@ -515,7 +516,6 @@ ru:
     newsletter_mailer:
       newsletter:
         note: Вы получили �то �лектронное пи�ьмо, потому что подпи�али�ь на ново�тные ра��ылки %{organization_name}. Вы можете изменить �вои на�тройки на �воей <a href="%{link}">�транице уведомлений</a>.
-        see_on_website: �е удает�� толком прочитать �то пи�ьмо? Прочитайте его на <a href="%{link}" target="_blank">�айте</a>.
         unsubscribe: Чтобы отказать�� от получени� таких �ообщений, кликните <a href="%{link}" target="_blank" class="unsubscribe">Отменить подпи�ку</a>.
     newsletters:
       unsubscribe:
@@ -542,7 +542,6 @@ ru:
       no_notifications: Пока нет уведомлений.
     notifications_settings:
       show:
-        email_on_notification: Я хочу получать �лектронное пи�ьмо каждый раз, когда приходит уведомление.
         newsletter_notifications: Я хочу получать ра��ылку ново�тей
         update_notifications_settings: Сохранить изменени�
       update:
@@ -582,7 +581,6 @@ ru:
         form:
           legend: Согла�ить�� � у�лови�ми уча�ти�
         refuse:
-          modal_body: Е�ли вы откажете�ь, вы не �можете и�пользовать площадку, вы можете <a href="%{data_portability_path}">загрузить �вои данные</a> и / или <a href="%{delete_path}">удалить �вою учетную запи�ь</a>.
           modal_btn_continue: Прин�ть у�лови� и продолжить
           modal_btn_exit: Я про�мотрю �то позже
           modal_button: Отказать�� от у�ловий уча�ти�
@@ -707,7 +705,6 @@ ru:
     invitations:
       edit:
         header: Завершите �оздание �воей учетной запи�и
-        nickname_help: Ваш уникальный п�евдоним в %{organization}.
         submit_button: Сохранить
         subtitle: Е�ли вы принимаете приглашение, укажите, пожалуй�та, �вой п�евдоним и пароль.
       invitation_removed: Ваше приглашение было удалено.
@@ -800,10 +797,6 @@ ru:
     timestamp_error_message: Извините, �то было �лишком бы�тро! Отправьте, пожалуй�та, еще раз.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: �а �том �айте и�пользуют�� файлы "куки". Продолжа� про�матривать �айт, вы �оглашаете�ь на и�пользование файлов "куки". Узнайте об �том больше %{link}.
-        link_label: зде�ь
-        ok: Я �огла�ен
       edit_link:
         edit: Редактировать
       footer:
diff --git a/decidim-core/config/locales/sk.yml b/decidim-core/config/locales/sk.yml
index 1685d14ff976a..c3b63f56d80e2 100644
--- a/decidim-core/config/locales/sk.yml
+++ b/decidim-core/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -66,9 +67,6 @@ sk:
   booleans:
     'false': 'Nie'
     'true': '�no'
-  carrierwave:
-    errors:
-      image_too_big: Obrázok je príliš veľký
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -81,9 +79,6 @@ sk:
       logo: "Oficiálne logo organizácie %{organization}"
       skip_button: Prejsť na hlavný obsah
     account:
-      data_portability_export:
-        file_no_exists: Súbor neexistuje
-        notice: Sťahovanie Vašich dát momentálne prebieha. Po dokon�ení dostanete e-mail.
       delete:
         confirm:
           close: Zavrieť okno
@@ -94,6 +89,9 @@ sk:
       destroy:
         error: Pri mazaní ú�tu došlo k chybe.
         success: Ú�et bol úspešne zmazaný.
+      download_your_data_export:
+        file_no_exists: Súbor neexistuje
+        notice: Sťahovanie Vašich dát momentálne prebieha. Po dokon�ení dostanete e-mail.
       show:
         change_password: Zmeniť heslo
         update_account: Aktualizovať ú�et
@@ -312,6 +310,8 @@ sk:
           explanation_html: Aby ste mohli vykonať túto akciu, musíte byť autorizovaní, pred tým musíte potvrdiť svoj email <strong>%{email} </strong>.
           request_confirmation_instructions: Požiadajte o pokyny pre potvrdenie
           title: Potvrdiť svoj email
+      show:
+        close_modal: Zatvoriť okno
     collapsible_list:
       hidden_elements_count:
         one: a %{count} �alších
@@ -343,8 +343,8 @@ sk:
           global:
             amendments_enabled: Zmeny povolené
             comments_enabled: Komentáre povolené
-            dummy_global_attribute_1: Zástupný atribút 1
-            dummy_global_attribute_2: Zástupný atribút 2
+            dummy_global_attribute1: Zástupný atribút 1
+            dummy_global_attribute2: Zástupný atribút 2
             dummy_global_translatable_text: Zástupný text k preloženie
             enable_pads_creation: Povoliť vytvorenie zdieľaného texte
             resources_permissions_enabled: Oprávnenie zdrojov povolené
@@ -354,8 +354,8 @@ sk:
             amendment_reaction_enabled: Reakcia na zmenu bola povolená
             amendments_visibility: Viditeľnosť pozmeňovacieho návrhu
             comments_blocked: Komentáre blokované
-            dummy_step_attribute_1: Atribút 1 zástupného kroku
-            dummy_step_attribute_2: Atribút 2 zástupného kroku
+            dummy_step_attribute1: Atribút 1 zástupného kroku
+            dummy_step_attribute2: Atribút 2 zástupného kroku
             dummy_step_translatable_text: Zástupný krok textu na preloženie
     contact: Kontakt
     content_blocks:
@@ -387,12 +387,6 @@ sk:
       actions:
         login_before_access: Prosím prihláste sa k ú�tu pred prístupom
         unauthorized: Nemáte povolenie na vykonanie tejto akcie
-    data_portability:
-      export:
-        ready: Pripravený
-      show:
-        download_data: Stiahnuť dáta
-        request_data: Vyžiadať dáta
     datepicker:
       help_text: 'O�akávaný formát:%{datepicker_format}'
     devise:
@@ -409,7 +403,6 @@ sk:
           already_have_an_account?: Už máte ú�et?
           newsletter: Dostávajte príležitostný spravodajca s relevantnými informáciami
           newsletter_title: Povolenie kontaktu
-          password_help: "%{minimun_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
           sign_in: Prihlásiť sa
           sign_up: Zaregistrovať sa
           sign_up_as:
@@ -450,6 +443,12 @@ sk:
           this_application_will_not_be_able_to: 'Táto aplikácia nebude môcť:'
           update_profile: Aktualizujte svoj profil
           wants_to_use_your_account_html: "<strong>%{application_name} </strong> chce používať váš ú�et"
+    download_your_data:
+      export:
+        ready: Pripravený
+      show:
+        download_data: Stiahnuť dáta
+        request_data: Vyžiadať dáta
     endorsable:
       endorsements: Potvrdenie
     endorsement_buttons_cell:
@@ -593,7 +592,7 @@ sk:
           email_subject: "%{nickname} aktualizoval svoj profil"
           notification_title: <a href="%{resource_path}"> profilová stránka </a> od%{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Stiahnutie
       export:
         ready: V prílohe nájdete exportovanú exportovanú verziu.
@@ -627,7 +626,6 @@ sk:
         button: Ukon�iť sledovanie
         error: Pri sledovaní tohto zdroja sa vyskytla chyba.
     forms:
-      current_file: Aktuálna súbor
       current_image: Aktuálna obrázok
       default_image: Predvolený obrázok
       errors:
@@ -635,7 +633,6 @@ sk:
           password: Heslo je príliš krátke.
           password_confirmation: Potvrdenie hesla sa musí zhodovať s vaším heslom.
         error: V tomto poli je chyba.
-      remove_this_file: Odstrániť tento súbor
     gamification:
       all_badges_link: Zobraziť všetky dostupné odznaky.
       badges:
@@ -736,7 +733,6 @@ sk:
       no_user_groups: Nepatří do žádné skupiny.
       roles:
         admin: Správca
-        creator: Tvorca
         member: ÄŒlen
       update:
         error: Pri aktualizácii skupiny došlo k problému
@@ -755,6 +751,9 @@ sk:
       index:
         last_activity: Posledná aktivita
         resource_type: Typ
+    links:
+      warning:
+        close_modal: Zatvoriť okno
     log:
       base_presenter:
         create: "%{user_name} vytvořeno %{resource_name}"
@@ -831,7 +830,6 @@ sk:
     newsletter_mailer:
       newsletter:
         note: Tento e-mail jste obdrželi, protože jste odběrateli bulletinů na %{organization_name}. Můžete změnit nastavení na <a href="%{link}">oznámení straně</a>.
-        see_on_website: Nelze vidět tento e-mail správně? Zobrazte jej na webu <a href="%{link}" target="_blank"></a>.
         unsubscribe: Chcete-li odhlásit přijímání tento typ e-mailů, <a href="%{link}" target="_blank" class="unsubscribe">Odhlásit</a>.
     newsletter_templates:
       basic_only_text:
@@ -879,13 +877,11 @@ sk:
       show:
         allow_public_contact: Povoliť komukoľvek posielať mi priame správy, aj ke� ho nesledujem.
         direct_messages: Povoliť priame správy od kohokoľvek
-        email_on_notification: Chcem dostávať e-mail zakaždým, ke� dostanem oznámenia.
         everything_followed: Všetko, �o sledujem
         newsletter_notifications: Chcem dostávať informa�né bulletiny
         newsletters: Správy
         own_activity: Moje vlastné �innosť, ako keby niekto komentoval vo svojom návrhu alebo ma zmienil
         receive_notifications_about: Chcem dostávať oznámenia
-        send_notifications_by_email: Poslať oznámenia emailom
         update_notifications_settings: Uložiť zmeny
       update:
         error: Pri aktualizácii nastavení oznámenia došlo k chybe.
@@ -942,7 +938,6 @@ sk:
         form:
           legend: Souhlasíte s podmínkami používání
         refuse:
-          modal_body: Ak odmietnete, nebudete môcť používať platformu, môžete <a href="%{data_portability_path}"> sťahovať dáta </a> a / alebo <a href="%{delete_path}"> zmazať svoj ú�et </a>.
           modal_btn_continue: Prijmite termíny a pokra�ujte
           modal_btn_exit: Neskôr to preskúmam
           modal_button: Odmietnite podmienky
@@ -1076,9 +1071,6 @@ sk:
         share_link: Zdieľať odkaz
     statistics:
       comments_count: Komentáre
-    user_activity:
-      index:
-        no_activities_warning: Tento ú�astník zatiaľ nemá žiadnu aktivitu.
     user_contact_disabled: Tento ú�astník nepovoľuje posielanie priamych správ.
     user_conversations:
       update:
@@ -1124,7 +1116,6 @@ sk:
     invitations:
       edit:
         header: Dokon�ite vytvorenie ú�tu
-        nickname_help: Vaša prezývka v %{organization}.
         submit_button: Uložiť
         subtitle: Ak prijmete pozvánku, nastavte svoju prezývku a heslo.
       invitation_removed: Vaša pozvánka bola odstránená.
@@ -1190,7 +1181,6 @@ sk:
     passwords:
       edit:
         change_my_password: Zmeňte heslo
-        change_your_password: Zmeňte si svoje heslo
         confirm_new_password: Potvr�te nové heslo
         new_password: Nové heslo
         password_help: "%{minimun_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
@@ -1269,10 +1259,6 @@ sk:
     timestamp_error_message: Prepá�te, bolo to príliš rýchle! Znovu odošlite.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Tento web používa cookies. Pokra�ovaním v prehliadaní webu súhlasíte s používaním súborov cookie. Zistite viac o tom %{link}.
-        link_label: tu
-        ok: súhlasím
       edit_link:
         edit: Upraviť
       footer:
diff --git a/decidim-core/config/locales/sl.yml b/decidim-core/config/locales/sl.yml
index 941633195a4e8..bb873eba91f0a 100644
--- a/decidim-core/config/locales/sl.yml
+++ b/decidim-core/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-core/config/locales/sr-CS.yml b/decidim-core/config/locales/sr-CS.yml
index 7ca9e3a1d2704..3bd5f65aad1ea 100644
--- a/decidim-core/config/locales/sr-CS.yml
+++ b/decidim-core/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   activerecord:
     models:
diff --git a/decidim-core/config/locales/sv.yml b/decidim-core/config/locales/sv.yml
index 602fcdf267609..916ca8bdd665e 100644
--- a/decidim-core/config/locales/sv.yml
+++ b/decidim-core/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -41,6 +42,7 @@ sv:
       decidim/promote_to_admin: Befordrad till gruppadministratör
       decidim/removed_from_group: Borttagen från gruppen
       decidim/resource_endorsed_event: Resurs instämd
+      decidim/user_group_created_event: Användargrupp skapad
       decidim/welcome_notification_event: Välkomstmeddelande
   activerecord:
     attributes:
@@ -69,7 +71,8 @@ sv:
     'true': 'Ja'
   carrierwave:
     errors:
-      image_too_big: Bilden är för stor
+      file_resolution_too_large: Filupplösningen är för stor
+      file_size_too_large: Filen är för stor
       not_inside_organization: Den här filen är inte bifogad till någon organisation
   date:
     formats:
@@ -105,7 +108,6 @@ sv:
       x_seconds:
         one: 1 sek. sedan
         other: "%{count} sek. sedan"
-        zero: just nu
   decidim:
     accessibility:
       external_link: Extern länk
@@ -114,9 +116,6 @@ sv:
       skip_button: Gå till innehåll
     account:
       blocked: Detta konto har blockerats på grund av överträdelse av användarvillkoren
-      data_portability_export:
-        file_no_exists: Filen finns inte
-        notice: Dina uppgifter hämtas för närvarande. Du får ett e-postmeddelande när det är klart.
       delete:
         alert: Denna åtgärd kan inte ångras. Om du tar bort ditt konto kommer du inte att kunna logga in med dina uppgifter. Raderingen av ditt konto kommer att resultera i anonymiseringen av dina bidrag. Du kommer fortfarande kunna skapa ett nytt konto, men dina gamla bidrag kommer inte förknippas med det.
         confirm:
@@ -128,8 +127,16 @@ sv:
       destroy:
         error: Det gick inte att radera ditt konto.
         success: Ditt konto har raderats.
+      download_your_data_export:
+        file_no_exists: Filen finns inte
+        notice: Dina uppgifter hämtas för närvarande. Du får ett e-postmeddelande när det är klart.
+      email_change:
+        body1: Vi har skickat ett e-postmeddelande till %{unconfirmed_email} för att bekräfta din nya e-postadress.
+        body2: Vill du att vi ska skicka verifieringsmailet igen? %{resend_link} eller %{cancel_link}.
+        cancel: avbryt
+        cancel_error: Kunde inte avbryta ändringen av e-postadressen.
       show:
-        available_locales_helper: Välj det språk du vill använda på plattformen och i de notiserna du får
+        available_locales_helper: Välj det språk du vill använda på plattformen och få i notiserna
         change_password: Ändra lösenord
         update_account: Uppdatera konto
       update:
@@ -139,6 +146,8 @@ sv:
     admin:
       actions:
         cancel: Avbryt
+      password_change:
+        alert: Du måste ändra ditt lösenord för att kunna fortsätta
     admin_log:
       area:
         create: "%{user_name} skapade området %{resource_name}"
@@ -149,6 +158,11 @@ sv:
         delete: "%{user_name} tog bort komponenten %{resource_name} från utrymmet %{space_name}"
         publish: "%{user_name} publicerade komponenten %{resource_name} i utrymmet %{space_name}"
         unpublish: "%{user_name} avpublicerade komponenten %{resource_name} från utrymmet %{space_name}"
+      helpers:
+        answers: svar
+        comments: kommentarer
+        projects: projekt
+        results: resultat
       impersonation_log:
         manage: "%{user_name} har hanterat %{resource_name} eftersom %{reason}"
       moderation:
@@ -301,6 +315,7 @@ sv:
       endorsements:
         one: instämmande
         other: instämmanden
+      official_author: Officiella
     authorization_handlers:
       another_dummy_authorization_handler:
         explanation: Bli bekräftad genom att ange ett passnummer som inleds med "A"
@@ -391,6 +406,7 @@ sv:
           debate: Debatt
           initiative: Initiativ
           meeting: Möte
+          order: Röster
           post: Inlägg
           proposal: Förslag
           question: Fråga
@@ -405,8 +421,8 @@ sv:
             amendments_enabled: Ändringsförslag är möjliga
             comments_enabled: Kommentarer på
             comments_max_length: Maximal längd på kommentarer
-            dummy_global_attribute_1: Dummy Attribut 1
-            dummy_global_attribute_2: Dummy Attribut 2
+            dummy_global_attribute1: Dummy Attribut 1
+            dummy_global_attribute2: Dummy Attribut 2
             dummy_global_translatable_text: Översättningsbar exempeltext
             enable_pads_creation: Aktivera skapande av memo
             resources_permissions_enabled: Resursbehörigheter på
@@ -418,8 +434,8 @@ sv:
             amendment_reaction_enabled: Tillåt reaktioner på ändringsförslag
             amendments_visibility: Synlighet för ändringsförslag
             comments_blocked: Kommentarer blockerade
-            dummy_step_attribute_1: Dummy Step Attribut 1
-            dummy_step_attribute_2: Dummy Step Attribut 2
+            dummy_step_attribute1: Dummy Step Attribut 1
+            dummy_step_attribute2: Dummy Step Attribut 2
             dummy_step_translatable_text: Översättningsbar text för exempelsteg
     contact: Kontakt
     content_blocks:
@@ -463,13 +479,6 @@ sv:
       actions:
         login_before_access: Logga in före åtkomst
         unauthorized: Du har inte behörighet att utföra denna åtgärd
-    data_portability:
-      export:
-        ready: Klar
-      show:
-        download_data: Hämta data
-        download_data_description: En fil som innehåller all information kopplad till ditt konto kommer att skickas till <strong>%{user_email}</strong>. Detta e-postmeddelande kommer att innehålla en .zip-fil och ett lösenord för att öppna den.<br/><br/>För att packa upp filen behöver du <a href="https://www.7-zip.org/">7-Zip</a> (för Windows) eller <a href="https://www.keka.io/">Keka</a> (för MacOS). Om du använder Linux, för det mesta kommer du att ha den installerad som standard. Om inte, kan du använda <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> eller <a href="https://peazip.github.io">PeaZip</a>).
-        request_data: Begär data
     datepicker:
       help_text: 'Förväntat format: %{datepicker_format}'
     devise:
@@ -488,7 +497,6 @@ sv:
           newsletter: FÃ¥ enstaka nyhetsbrev med relevant information
           newsletter_title: Kontakttillstånd
           nickname_help: Ditt alias i %{organization}. Kan bara innehålla bokstäver, siffror, '-' och '_'.
-          password_help: "Minst %{minimun_characters} tecken, får inte vara för vanligt (som 123456) och måste vara skilt från ditt användarnamn och din e-postadress."
           sign_in: Logga in
           sign_up: Registrera dig
           sign_up_as:
@@ -537,6 +545,13 @@ sv:
           this_application_will_not_be_able_to: 'Det här programmet kommer inte att kunna:'
           update_profile: Uppdatera din profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> vill använda ditt konto"
+    download_your_data:
+      export:
+        ready: Klar
+      show:
+        download_data: Hämta data
+        download_data_description: En fil som innehåller all information kopplad till ditt konto kommer att skickas till <strong>%{user_email}</strong>. Detta e-postmeddelande kommer att innehålla en .zip-fil och ett lösenord för att öppna den.<br/><br/>För att packa upp filen behöver du <a href="https://www.7-zip.org/">7-Zip</a> (för Windows) eller <a href="https://www.keka.io/">Keka</a> (för MacOS). Om du använder Linux, för det mesta kommer du att ha den installerad som standard. Om inte, kan du använda <a href="https://gitlab.gnome.org/GNOME/file-roller">File Roller</a> eller <a href="https://peazip.github.io">PeaZip</a>).
+        request_data: Begär data
     editor_images:
       create:
         error: Fel vid uppladdning av bild
@@ -703,7 +718,7 @@ sv:
           email_subject: "%{nickname} uppdaterade sin profil"
           notification_title: <a href="%{resource_path}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         click_button: 'Hämta dina data genom att klicka på Nästa.<br/>Filen kommer vara tillgänglig till och med %{date}.<br/>Du kan använda <a href="https://www.7-zip.org/">7-Zip</a> (för Windows), <a href="https://www.keka.io/en/">Keka</a> (för MacOS) eller <a href="https://peazip.github.io">PeaZip</a> (för Linux) för att öppna den. Lösenord: %{password}'
         download: Hämta
       export:
@@ -743,7 +758,6 @@ sv:
         button: Sluta följa
         error: Det gick inte att sluta följa den här resursen.
     forms:
-      current_file: Nuvarande fil
       current_image: Nuvarande bild
       default_image: Förvald bild
       errors:
@@ -755,7 +769,8 @@ sv:
         file:
           explanation: 'Vägledning för fil:'
           message_1: MÃ¥ste vara en bild eller ett dokument.
-          message_2: Använd helst landskapsbilder. Tjänsten beskär bilden. För CSV filer måste separatorn mellan kolumner vara ett kommatecken (",")
+        icon:
+          explanation: 'Vägledning för ikon:'
         image:
           explanation: 'Vägledning för bild:'
           message_1: Helst en landskapsbild som inte har någon text.
@@ -763,7 +778,22 @@ sv:
       file_validation:
         allowed_file_extensions: 'Tillåtna filtillägg: %{extensions}'
         max_file_size: 'Maximal filstorlek: %{megabytes}MB'
-      remove_this_file: Ta bort den här filen
+      upload:
+        labels:
+          add_attachment: Lägg till bilaga
+          add_file: Lägg till fil
+          add_image: Lägg till bild
+          cancel: Avbryta
+          edit_image: Redigera bild
+          error: Fel!
+          remove: Ta bort
+          replace: Ersätt
+          save: Spara
+          title: Titel
+          title_required: Titel krävs!
+          uploaded: Uppladdad
+          validating: Bekräftar...
+          validation_error: Valideringsfel!
     gamification:
       all_badges_link: Se alla tillgängliga märken.
       badges:
@@ -852,6 +882,7 @@ sv:
         success: Förfrågan att gå med har skickats. En administratör granskar din förfrågan innan du blir godkänd i gruppen.
       leave:
         error: Det gick inte att lämna gruppen
+        last_admin: Du kan inte ta bort dig själv från denna grupp eftersom du är den sista administratören. Gör en annan medlem till administratör för att lämna gruppen.
         success: Du har lämnat gruppen.
       members:
         accept_or_reject_join_requests: 'Följande användare har ansökt om att få gå med i den här gruppen. Godkänn eller avvisa deras förfrågningar:'
@@ -864,7 +895,7 @@ sv:
       no_user_groups: Tillhör inte någon grupp än.
       roles:
         admin: Administratör
-        creator: Skapare
+        creator: Administratör
         member: Medlem
       update:
         error: Det gick inte att uppdatera gruppen
@@ -889,7 +920,7 @@ sv:
         body_1: Du är på väg att besöka en extern länk och vi vill att du ska vara försiktig med innehållet på den externa webbplatsen.
         body_2: Kontrollera länken du är på väg att besöka och se till att den är säker innan du fortsätter.
         cancel: Avbryt
-        close_modal: Stäng fönster
+        close_modal: Stäng modal
         proceed: Fortsätt
         title: Öppna extern länk
     log:
@@ -1021,7 +1052,6 @@ sv:
     newsletter_mailer:
       newsletter:
         note: Du har fått det här e-brevet eftersom du prenumererar på nyhetsbrev från %{organization_name}. Du kan ändra dina inställningar på <a href="%{link}">meddelandesidan</a>.
-        see_on_website: Visa inte e-brevet som det ska? Läs det på <a href="%{link}" target="_blank">webbplatsen</a>.
         unsubscribe: Välj att <a href="%{link}" target="_blank" class="unsubscribe">Avprenumerera</a> om du inte vill få denna typ av brev.
     newsletter_templates:
       basic_only_text:
@@ -1071,23 +1101,31 @@ sv:
         translated_text: 'Maskinöversatt text:'
     notifications:
       no_notifications: Inga meddelanden ännu.
+    notifications_digest_mailer:
+      hello: Hej %{name},
     notifications_settings:
       show:
         administrators: Administratörer
         allow_public_contact: Tillåt alla att skicka direktmeddelanden till mig, även de som jag inte följer.
         direct_messages: Ta emot direktmeddelanden från alla
-        email_on_moderations: Jag vill få ett e-post varje gång något anmäls för moderering.
-        email_on_notification: Jag vill få ett e-post varje gång jag får en notis.
         everything_followed: Allt jag följer
         newsletter_notifications: Jag vill få nyhetsbrev
         newsletters: Nyhetsbrev
+        notifications_sending_frequencies:
+          daily: Dagligen
+          none: Ingen
+          weekly: Veckovis
         own_activity: Min egen verksamhet, som när någon kommenterar mitt förslag eller nämner mig
+        push_notifications: Push-meddelanden
         receive_notifications_about: Jag vill få notiser om
-        send_notifications_by_email: Skicka meddelanden via e-post
         update_notifications_settings: Spara ändringar
       update:
         error: Det gick inte att uppdatera dina meddelandeinställningar.
         success: Dina meddelandeinställningar har uppdaterats.
+    offline:
+      show:
+        message: Det verkar som om du är offline. Försök igen senare.
+        retry: Försök igen
     open_data:
       not_available_yet: De öppna datafilerna är ännu inte tillgängliga, var vänlig försök igen om några minuter.
     own_user_groups:
@@ -1141,7 +1179,6 @@ sv:
           agreement: Jag godkänner villkoren
           legend: Godkänn användarvillkoren
         refuse:
-          modal_body: Om du vägrar kan du inte använda plattformen, men du kan <a href="%{data_portability_path}">hämta dina data</a> eller <a href="%{delete_path}">radera ditt konto</a>.
           modal_btn_continue: Acceptera villkoren och fortsätt
           modal_btn_exit: Jag granskar dem senare
           modal_button: Avvisa villkoren
@@ -1335,9 +1372,6 @@ sv:
       help_text: "<strong>OBS:</strong> Innehåll översattes kanske automatiskt och inte är 100% korrekt."
       show_original: Visa originaltexten
       show_translated: Visa maskinöversatt texten
-    user_activity:
-      index:
-        no_activities_warning: Den här användaren har inte haft någon aktivitet än.
     user_contact_disabled: Deltagaren tar inte emot inte direktmeddelanden.
     user_conversations:
       create:
@@ -1384,6 +1418,7 @@ sv:
       notify:
         body_1: Användaren %{user} har rapporterats av %{token}
         body_2: 'Anledning: %{reason}'
+        details: Detaljer från användaren
         greetings: Hälsningar,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hej %{admin},
         subject: En ny användare har rapporterats på %{organization_name}
@@ -1444,7 +1479,6 @@ sv:
     invitations:
       edit:
         header: Slutför att skapa ditt konto
-        nickname_help: Ditt användarnamn i %{organization}.
         submit_button: Spara
         subtitle: Om du godkänner inbjudan väljer du ditt användarnamn och lösenord.
       invitation_removed: Din inbjudan har tagits bort.
@@ -1511,7 +1545,6 @@ sv:
     passwords:
       edit:
         change_my_password: Ändra mitt lösenord
-        change_your_password: Ändra ditt lösenord
         confirm_new_password: Bekräfta nytt lösenord
         new_password: Nytt lösenord
         password_help: "Minst %{minimun_characters} tecken, får inte vara för vanligt (som 123456) och måste vara skilt från ditt användarnamn och din e-postadress."
@@ -1592,10 +1625,28 @@ sv:
     timestamp_error_message: Det gick för snabbt! Försök igen.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Denna webbplats använder cookies. Genom att fortsätta att använda webbplatsen godkänner du vår användning av cookies. Läs mer %{link}.
-        link_label: här
-        ok: Jag godkänner
+      data_consent:
+        details:
+          columns:
+            name: Namn
+            service: Tjänst
+            type: Typ
+          items:
+            _session_id:
+              service: Denna webbplats
+            decidim-consent:
+              service: Denna webbplats
+            pwaInstallPromptSeen:
+              service: Denna webbplats
+          types:
+            cookie: Cookie
+            local_storage: Lokal lagring
+        dialog:
+          settings: Inställningar
+        modal:
+          save_settings: Spara inställningar
+        warning:
+          consent_required: Du måste aktivera %{categories} för att kunna se innehållet.
       edit_link:
         edit: Redigera
       footer:
@@ -1619,6 +1670,8 @@ sv:
       notifications_dashboard:
         mark_all_as_read: Markera allt som läst
         mark_as_read: Markera som läst
+      offline_banner:
+        cache_version_page: Hoppsan! Du är inte kopplat till Internet längre. Detta är en tidigare cachad version av sidan du besöker, innehållet kan ha ändrats.
       social_media_links:
         facebook: "%{organization} på Facebook"
         github: "%{organization} på GitHub"
@@ -1630,6 +1683,8 @@ sv:
         continue_session: Förtsätt med din session
         sign_out: Logga ut
         title: Vill du fortsätta med din session?
+      upload_modal:
+        close_modal: Stäng fönstret
       user_menu:
         account: 'Användarkonto: %{name}'
         admin_dashboard: Adminpanel
diff --git a/decidim-core/config/locales/tr-TR.yml b/decidim-core/config/locales/tr-TR.yml
index 03979c5d65233..665ee8769a679 100644
--- a/decidim-core/config/locales/tr-TR.yml
+++ b/decidim-core/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -62,7 +63,6 @@ tr:
     'true': 'Evet'
   carrierwave:
     errors:
-      image_too_big: Görüntü çok büyük
       not_inside_organization: Dosya herhangi bir kuruluÅŸa eklenmemiÅŸ
   date:
     formats:
@@ -78,9 +78,6 @@ tr:
       skip_button: Ana içeriğe geç
     account:
       blocked: Bu hesap, Åžartlar ve KoÅŸullar ihlali nedeniyle engellendi
-      data_portability_export:
-        file_no_exists: Dosya bulunmuyor
-        notice: Verilerinizin indirilmesi şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
       delete:
         confirm:
           close: Pencereyi kapat
@@ -91,6 +88,9 @@ tr:
       destroy:
         error: Hesabınız silinirken bir hata oluştu.
         success: Hesabınız başarıyla silindi.
+      download_your_data_export:
+        file_no_exists: Dosya bulunmuyor
+        notice: Verilerinizin indirilmesi şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
       show:
         change_password: Åžifre deÄŸiÅŸtir
         update_account: Hesabı güncelle
@@ -322,7 +322,7 @@ tr:
           request_confirmation_instructions: Onaylama talimatlarını tekrar gönder
           title: E-posta adresinizi doğrulayın
       show:
-        close_modal: Pencereyi kapat
+        close_modal: Yakın kalıcı
     block_user_mailer:
       notify:
         body_1: Hesabınız kilitlendi.
@@ -360,8 +360,8 @@ tr:
             amendments_enabled: DeÄŸiÅŸiklikler etkinleÅŸtirildi
             comments_enabled: Yorumlar etkin
             comments_max_length: Maksimum yorum uzunluÄŸu
-            dummy_global_attribute_1: Sahet Özellik 1
-            dummy_global_attribute_2: Sahte Özellik 2
+            dummy_global_attribute1: Sahet Özellik 1
+            dummy_global_attribute2: Sahte Özellik 2
             dummy_global_translatable_text: Sahte Çevrilebilir Metin
             enable_pads_creation: Altlık oluşturmayı etkinleştirin
             resources_permissions_enabled: Kaynak izinleri etkin
@@ -373,8 +373,8 @@ tr:
             amendment_reaction_enabled: DeÄŸiÅŸiklik tepkisi etkinleÅŸtirildi
             amendments_visibility: Değişiklik görünürlüğü
             comments_blocked: Yorumlar engellendi
-            dummy_step_attribute_1: Sahte Adım Niteliği 1
-            dummy_step_attribute_2: Sahte Adım Niteliği 2
+            dummy_step_attribute1: Sahte Adım Niteliği 1
+            dummy_step_attribute2: Sahte Adım Niteliği 2
             dummy_step_translatable_text: Sahte Çevrilebilir Metin
     contact: Ä°letiÅŸim
     content_blocks:
@@ -418,12 +418,6 @@ tr:
       actions:
         login_before_access: Lütfen, erişmeden önce hesabınızla giriş yapın
         unauthorized: Bu eylemi gerçekleştirmek için yetkiniz yok
-    data_portability:
-      export:
-        ready: Hazır
-      show:
-        download_data: Verileri indir
-        request_data: Veri talep et
     datepicker:
       help_text: 'Beklenen format: %{datepicker_format}'
     devise:
@@ -442,7 +436,6 @@ tr:
           newsletter: Ara sıra ilgili bilgileri içeren bir haber bülteni alın
           newsletter_title: Ä°letiÅŸim izni
           nickname_help: Takma adınız %{organization}. Yalnızca harf, rakam, "-" ve "_" içerebilir.
-          password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
           sign_in: Oturum aç
           sign_up: kaydol
           sign_up_as:
@@ -493,6 +486,12 @@ tr:
           this_application_will_not_be_able_to: 'Bu uygulama mümkün olmayacaktır:'
           update_profile: profilinizi güncelleyin
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> hesabınızı kullanmak istiyor"
+    download_your_data:
+      export:
+        ready: Hazır
+      show:
+        download_data: Verileri indir
+        request_data: Veri talep et
     endorsable:
       endorsements: Cirolar
       endorsements_count: Onay sayısı
@@ -653,7 +652,7 @@ tr:
           email_subject: "%{nickname} profilini güncelledi"
           notification_title: <a href="%{resource_path}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Ä°ndir
       export:
         ready: Lütfen dışa aktarımınızın sıkıştırılmış bir sürümünü ekte bulun.
@@ -690,7 +689,6 @@ tr:
         button: Takibi bırak
         error: Bu kaynağı takip etmekten bir hata oluştu.
     forms:
-      current_file: Mevcut dosya
       current_image: Geçerli resim
       default_image: Varsayılan görüntü
       errors:
@@ -702,7 +700,6 @@ tr:
         file:
           explanation: 'Dosya kılavuzu:'
           message_1: Bir resim veya bir belge olmalı.
-          message_2: Resimler için tercihen yatay resimleri kullanın, bu servis resmi kırpar. CSV dosyaları için, sütunlar arasındaki ayırıcı virgül (",") olmalıdır
         image:
           explanation: 'Dosya kılavuzu:'
           message_1: Tercihen herhangi bir metin içermeyen yatay bir resim.
@@ -710,7 +707,6 @@ tr:
       file_validation:
         allowed_file_extensions: 'İzin verilen dosya uzantıları: %{extensions}'
         max_file_size: 'Maksimum dosya boyutu: %{megabytes} MB'
-      remove_this_file: Bu dosyayı kaldır
     gamification:
       all_badges_link: Tüm mevcut rozetleri görün.
       badges:
@@ -811,7 +807,6 @@ tr:
       no_user_groups: Henüz herhangi bir gruba ait değil.
       roles:
         admin: Yönetici
-        creator: Kurucu
         member: Ãœye
       update:
         error: Grup güncellemede bir hata oluştu
@@ -830,6 +825,9 @@ tr:
       index:
         last_activity: Son Aktivite
         resource_type: Türü
+    links:
+      warning:
+        close_modal: Yakın kalıcı
     log:
       base_presenter:
         create: "%{user_name}, %{resource_name} oluÅŸturdu"
@@ -956,7 +954,6 @@ tr:
     newsletter_mailer:
       newsletter:
         note: Bu e-postayı, %{organization_name} bültenlere abone olduğunuz için aldınız. Eğer ayarlarınızı değiştirebilirsiniz <a href="%{link}">bildirimleri sayfa</a>.
-        see_on_website: Bu e-postayı doğru göremiyor musunuz? Onu <a href="%{link}" target="_blank">web sitesinde görüntüle</a>.
         unsubscribe: Bu tür bir e-posta almayı iptal etmek için, <a href="%{link}" target="_blank" class="unsubscribe">Abonelikten Ayrıl</a>.
     newsletter_templates:
       basic_only_text:
@@ -1004,13 +1001,11 @@ tr:
       show:
         allow_public_contact: Takip etmesem bile herkesin bana doğrudan mesaj göndermesine izin ver.
         direct_messages: Herkesten doğrudan mesaj alın
-        email_on_notification: Her bildirim aldığımda bir e-posta almak istiyorum.
         everything_followed: Takip ettiÄŸim her ÅŸey
         newsletter_notifications: Bülten almak istiyorum
         newsletters: Bültenler
         own_activity: Birisinin teklifime yorum yapması veya benden bahsetmesi gibi kendi faaliyetim
         receive_notifications_about: Hakkında bildirim almak istiyorum
-        send_notifications_by_email: Bildirimleri e-posta ile gönder
         update_notifications_settings: DeÄŸiÅŸiklikleri Kaydet
       update:
         error: Bildirim ayarlarınız güncellenirken bir hata oluştu.
@@ -1068,7 +1063,6 @@ tr:
           agreement: Bu koşulları kabul ediyorum
           legend: Kullanım şartlarını ve koşullarını kabul et
         refuse:
-          modal_body: Eğer kabul ederseniz, platformu kullanmak mümkün olmayacaktır şunları yapabilirsiniz <a href="%{data_portability_path}">verileri indirme</a> ve / veya <a href="%{delete_path}">Hesabınızı silmek</a>.
           modal_btn_continue: Şartları kabul et ve devam et
           modal_btn_exit: Daha sonra inceleyeceÄŸim
           modal_button: Şartları reddet
@@ -1247,9 +1241,6 @@ tr:
       help_text: "<strong> Uyarı: </strong> İçerik otomatik olarak çevrilebilir ve %100 doğru olmayabilir."
       show_original: Orijinal metni göster
       show_translated: Otomatik olarak çevrilmiş metni göster
-    user_activity:
-      index:
-        no_activities_warning: Bu kullanıcının henüz herhangi bir etkinliği olmadı.
     user_contact_disabled: Bu katılımcı doğrudan mesajları kabul etmiyor.
     user_conversations:
       create:
@@ -1353,7 +1344,6 @@ tr:
     invitations:
       edit:
         header: Hesabınızı oluşturmayı bitirin
-        nickname_help: Benzersiz tanımlayıcınız %{organization}.
         submit_button: Kayıt etmek
         subtitle: Davetiyeyi kabul ederseniz, lütfen takma adınızı ve şifrenizi ayarlayın.
       invitation_removed: Davetiniz kaldırıldı.
@@ -1420,7 +1410,6 @@ tr:
     passwords:
       edit:
         change_my_password: Åžifremi DeÄŸiÅŸtir
-        change_your_password: Åžifreni deÄŸiÅŸtir
         confirm_new_password: Yeni ÅŸifreyi onayla
         new_password: Yeni Åžifre
         password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
@@ -1497,10 +1486,6 @@ tr:
     timestamp_error_message: Üzgünüm, bu çok hızlıydı! Lütfen yeniden gönderin.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: Bu sitede çerezler kullanılıyor. Siteye göz atmaya devam ederek, çerezleri kullanmamızı kabul edersiniz. Hakkında daha fazla bilgi edinin %{link}.
-        link_label: Ä°ÅŸte
-        ok: katılıyorum
       edit_link:
         edit: Düzenle
       footer:
diff --git a/decidim-core/config/locales/uk.yml b/decidim-core/config/locales/uk.yml
index 902d508726341..4b2c7b10c0527 100644
--- a/decidim-core/config/locales/uk.yml
+++ b/decidim-core/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -35,18 +36,12 @@ uk:
   booleans:
     'false': '�і'
     'true': 'Так'
-  carrierwave:
-    errors:
-      image_too_big: Зображенн� завелике
   date:
     formats:
       decidim_short: "%d.%m.%Y"
       decidim_with_month_name: "%d %B %Y"
   decidim:
     account:
-      data_portability_export:
-        file_no_exists: Файл не і�нує
-        notice: Зараз відбуваєть�� збереженн� у вигл�ді файлу. Ви отримаєте електронного ли�та пі�л� його завершенн�.
       delete:
         confirm:
           close: Закрити вікно
@@ -57,6 +52,9 @@ uk:
       destroy:
         error: При �пробі видалити ваш обліковий запи� �тала�� помилка.
         success: Ваш обліковий запи� у�пішно видалено.
+      download_your_data_export:
+        file_no_exists: Файл не і�нує
+        notice: Зараз відбуваєть�� збереженн� у вигл�ді файлу. Ви отримаєте електронного ли�та пі�л� його завершенн�.
       show:
         change_password: Змінити пароль
         update_account: Оновити обліковий запи�
@@ -173,6 +171,8 @@ uk:
           invalid_field: "Дл� пол� %{field} значенн� %{value} неприпу�тиме."
           ok: Гаразд
           title: �едо�татньо прав через від�утні�ть підтвердженн� о�оби
+      show:
+        close_modal: Закрити віконце
     collapsible_list:
       see_less: "(читати менше)"
       see_more: "(читати далі)"
@@ -185,13 +185,13 @@ uk:
         settings:
           global:
             comments_enabled: Коментарі увімкнено
-            dummy_global_attribute_1: Приклад вла�тиво�ті 1
-            dummy_global_attribute_2: Приклад вла�тиво�ті 2
+            dummy_global_attribute1: Приклад вла�тиво�ті 1
+            dummy_global_attribute2: Приклад вла�тиво�ті 2
             resources_permissions_enabled: Дозволи ре�ур�ів увімкнуто
           step:
             comments_blocked: Коментарі вимкнено
-            dummy_step_attribute_1: Приклад 1 вла�тиво�ті кроку
-            dummy_step_attribute_2: Приклад 2 вла�тиво�ті кроку
+            dummy_step_attribute1: Приклад 1 вла�тиво�ті кроку
+            dummy_step_attribute2: Приклад 2 вла�тиво�ті кроку
     contact: Зв'�зати��
     content_blocks:
       footer_sub_hero:
@@ -209,12 +209,6 @@ uk:
     core:
       actions:
         unauthorized: Ви не маєте прав на виконанн� цієї дії
-    data_portability:
-      export:
-        ready: Готово
-      show:
-        download_data: Завантажити дані
-        request_data: Подати запит на дані
     devise:
       omniauth_registrations:
         create:
@@ -267,6 +261,12 @@ uk:
           this_application_will_not_be_able_to: 'Цей додаток не зможе:'
           update_profile: Оновлювати ваш профіль
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> бажає викори�товувати ваш обліковий запи�"
+    download_your_data:
+      export:
+        ready: Готово
+      show:
+        download_data: Завантажити дані
+        request_data: Подати запит на дані
     endorsable:
       endorsements: Про�вів підтримки
     errors:
@@ -304,7 +304,7 @@ uk:
           email_subject: "%{nickname} оновив �вій профіль"
           notification_title: Сторінка <a href="%{resource_path}">профілю</a> уча�ника %{name} (%{nickname}), за �ким ви �тежите, була оновлена.
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: Завантажити
       export:
         ready: �ижче додаєть�� �ти�нута в архів вер�і� вашого збереженого файлу.
@@ -337,12 +337,13 @@ uk:
         button: Припинити �тежити
         error: При �пробі припинити �тежити за цим ре�ур�ом �тала�� помилка.
     forms:
-      current_file: Поточний файл
       current_image: Поточне зображенн�
       default_image: Зображенн� за замовчуванн�м
       errors:
         error: У цьому полі є помилка.
-      remove_this_file: Видалити цей файл
+    links:
+      warning:
+        close_modal: Закрити віконце
     log:
       base_presenter:
         create: "%{user_name} �творив %{resource_name}"
@@ -391,7 +392,6 @@ uk:
     newsletter_mailer:
       newsletter:
         note: Ви отримали цього електронного ли�та, о�кільки ви підпи�али�� на новини щодо %{organization_name}. Ви можете змінити �вої налаштуванн� на <a href="%{link}">�торінці �повіщень</a>.
-        see_on_website: �е вдаєть�� до путт� перегл�нути це повідомленн�? Перегл�ньте його на �айті <a href="%{link}" target="_blank"></a>.
         unsubscribe: Щоб відмовити�� від отриманн� таких повідомлень, клацніть на <a href="%{link}" target="_blank" class="unsubscribe">Відмовити��</a>.
     newsletters:
       unsubscribe:
@@ -418,7 +418,6 @@ uk:
       no_notifications: Ще немає �повіщень.
     notifications_settings:
       show:
-        email_on_notification: Я хочу отримувати ли�та електронною поштою кожного разу, коли отримую �повіщенн�.
         newsletter_notifications: Я хочу отримувати роз�иланн�
         update_notifications_settings: Зберегти зміни
       update:
@@ -458,7 +457,6 @@ uk:
         form:
           legend: Погодити�� з умовами уча�ті
         refuse:
-          modal_body: Якщо ви відмовите��, ви не зможете викори�товувати майданчик, ви можете <a href="%{data_portability_path}">завантажити �вої дані</a> і / або <a href="%{delete_path}">видалити �вій обліковий запи�</a>.
           modal_btn_continue: Прийн�ти умови та продовжити
           modal_btn_exit: Я перегл�ну це пізніше
           modal_button: Відмовити�� від умов уча�ті
@@ -550,7 +548,6 @@ uk:
     invitations:
       edit:
         header: Завершіть �творенн� �вого облікового запи�у
-        nickname_help: Ваш унікальний п�евдонім в %{organization}.
         submit_button: Зберегти
         subtitle: Якщо ви приймаєте запрошенн�, в�тановіть, будь ла�ка, �вій п�евдонім та пароль.
     mailer:
@@ -597,10 +594,6 @@ uk:
     timestamp_error_message: Вибачте, це було занадто швидко! Будь ла�ка, подайте повідомленн� знову.
   layouts:
     decidim:
-      cookie_warning:
-        description_html: �а цьому �айті викори�товують�� реп'�шки (куки). Продовжуючи перегл�дати �айт, ви погоджуєте�� з нашим викори�танн�м реп'�шків. Дізнайте�� про це більше %{link}.
-        link_label: тут
-        ok: Я погоджую��
       edit_link:
         edit: Редагувати
       footer:
diff --git a/decidim-core/config/locales/zh-CN.yml b/decidim-core/config/locales/zh-CN.yml
index 6d6164adf4800..ef6732d89ef70 100644
--- a/decidim-core/config/locales/zh-CN.yml
+++ b/decidim-core/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -58,7 +59,6 @@ zh-CN:
     'true': '�'
   carrierwave:
     errors:
-      image_too_big: 图片过大
       not_inside_organization: 该文件没有附加到任何组织
   date:
     formats:
@@ -71,9 +71,6 @@ zh-CN:
       logo: "%{organization}的官方标志"
       skip_button: 跳转到主�内容
     account:
-      data_portability_export:
-        file_no_exists: 文件�存在
-        notice: 目�正在下载您的数�。完��，您将收到一�电�邮件。
       delete:
         confirm:
           close: 关闭窗�
@@ -84,6 +81,9 @@ zh-CN:
       destroy:
         error: 删除您的�户时出错。
         success: 您的�户已�功删除。
+      download_your_data_export:
+        file_no_exists: 文件�存在
+        notice: 目�正在下载您的数�。完��，您将收到一�电�邮件。
       show:
         change_password: 更改密�
         update_account: 更新�户
@@ -324,8 +324,8 @@ zh-CN:
             amendments_enabled: 修改已�用
             comments_enabled: 评论已�用
             comments_max_length: 评论最大长度
-            dummy_global_attribute_1: 虚拟属性 1
-            dummy_global_attribute_2: 虚拟属性 2
+            dummy_global_attribute1: 虚拟属性 1
+            dummy_global_attribute2: 虚拟属性 2
             dummy_global_translatable_text: 虚拟�翻译文本
             enable_pads_creation: �用页�创建
             resources_permissions_enabled: 资���已�用
@@ -337,8 +337,8 @@ zh-CN:
             amendment_reaction_enabled: 修正�应已�用
             amendments_visibility: 修正��性
             comments_blocked: 评论已阻止
-            dummy_step_attribute_1: 虚拟步骤属性 1
-            dummy_step_attribute_2: 虚拟步骤属性 2
+            dummy_step_attribute1: 虚拟步骤属性 1
+            dummy_step_attribute2: 虚拟步骤属性 2
             dummy_step_translatable_text: 虚拟步骤�翻译文本
     contact: �繫人
     content_blocks:
@@ -370,12 +370,6 @@ zh-CN:
       actions:
         login_before_access: 请在访问�使用您的�户登录
         unauthorized: 您无�执行此�作
-    data_portability:
-      export:
-        ready: 准备好
-      show:
-        download_data: 下载数�
-        request_data: 请求数�
     datepicker:
       help_text: '预期格�: %{datepicker_format}'
     devise:
@@ -392,7 +386,6 @@ zh-CN:
           already_have_an_account?: 已�有一个�户？
           newsletter: 接收附带相关信�的时事通讯
           newsletter_title: �系人��
-          password_help: "%{minimun_characters} 个字符，必须��太常�(例如，123456)，并且必须��于您的昵称和电�邮件。"
           sign_in: 登录
           sign_up: 注册
           sign_up_as:
@@ -432,6 +425,12 @@ zh-CN:
           this_application_will_not_be_able_to: '此应用程�将无法：'
           update_profile: 更新您的个人资料
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> 想�使用您的�户"
+    download_your_data:
+      export:
+        ready: 准备好
+      show:
+        download_data: 下载数�
+        request_data: 请求数�
     endorsable:
       endorsements: 授�
       endorsements_count: 批准次数
@@ -582,7 +581,7 @@ zh-CN:
           email_subject: "%{nickname} 更新了他们的个人资料"
           notification_title: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_path}">个人资料页�</a> 已�更新。
     export_mailer:
-      data_portability_export:
+      download_your_data_export:
         download: 下载
       export:
         ready: 请找到您导出的压缩版本。
@@ -618,7 +617,6 @@ zh-CN:
         button: �止关注
         error: 出现了一个�关注此资�的问题。
     forms:
-      current_file: 当�文件
       current_image: 当�图�
       default_image: 默认图�
       errors:
@@ -637,7 +635,6 @@ zh-CN:
       file_validation:
         allowed_file_extensions: '�许的文件扩展�: %{extensions}'
         max_file_size: '最大文件大�: %{megabytes}MB'
-      remove_this_file: 删除此文件
     gamification:
       all_badges_link: 查看所有�用的徽章。
       badges:
@@ -738,7 +735,6 @@ zh-CN:
       no_user_groups: 尚�属于任何群组。
       roles:
         admin: 管�员
-        creator: 创建者
         member: �员
       update:
         error: 更新群组时出错
@@ -757,6 +753,9 @@ zh-CN:
       index:
         last_activity: 上次活动
         resource_type: 类型
+    links:
+      warning:
+        close_modal: 关闭模�
     log:
       base_presenter:
         create: "%{user_name} 创建了 %{resource_name}"
@@ -881,7 +880,6 @@ zh-CN:
     newsletter_mailer:
       newsletter:
         note: 您收到这�邮件是因为您订阅了 %{organization_name}的新闻通讯。您�以在您的 <a href="%{link}">通知页�</a> 更改您的设置。
-        see_on_website: 找�到正确的电�邮件？在 <a href="%{link}" target="_blank">网站</a> 上查看。
         unsubscribe: 选择�接收这�类型的电�邮件， <a href="%{link}" target="_blank" class="unsubscribe">�消订阅</a>。
     newsletter_templates:
       basic_only_text:
@@ -929,13 +927,11 @@ zh-CN:
       show:
         allow_public_contact: �许任何人�我��一�直接消�，�使我没有关注它们。
         direct_messages: 从任何人接收�信
-        email_on_notification: �次我收到通知时，我都想收到一�电�邮件。
         everything_followed: 我关注的所有情况
         newsletter_notifications: 我想�收到新闻简报
         newsletters: 新闻通讯
         own_activity: 我自己的活动，例如当有人在我的建议中评论或�到我时
         receive_notifications_about: 我想�获�通知关于
-        send_notifications_by_email: 通过电�邮件��通知
         update_notifications_settings: �存更改
       update:
         error: 更新您的通知设置时出现问题。
@@ -993,7 +989,6 @@ zh-CN:
           agreement: 我��这些�款
           legend: ��使用�款
         refuse:
-          modal_body: 如果您拒�，您将无法使用平�，您�以 <a href="%{data_portability_path}">下载您的数�</a> 和/或 <a href="%{delete_path}">删除您的�户</a>。
           modal_btn_continue: 接�并继续
           modal_btn_exit: 我���查看
           modal_button: 拒��款
@@ -1158,9 +1153,6 @@ zh-CN:
       help_text: "<strong>警告：</strong> 内容�能会被自动翻译而�是100%的准确性。"
       show_original: 显示原始文本
       show_translated: 显示自动翻译的文本
-    user_activity:
-      index:
-        no_activities_warning: 此�与者尚未有任何活动。
     user_contact_disabled: 此�与者�接��信。
     user_conversations:
       create:
@@ -1257,7 +1249,6 @@ zh-CN:
     invitations:
       edit:
         header: 完�创建您的�户
-        nickname_help: 您在 %{organization} 中的昵称。
         submit_button: �存
         subtitle: 如果您接�邀请，请设置您的昵称和密�。
       invitation_removed: 您的邀请已被删除。
@@ -1324,7 +1315,6 @@ zh-CN:
     passwords:
       edit:
         change_my_password: 更改我的密�
-        change_your_password: 更改您的密�
         confirm_new_password: 确认新密�
         new_password: 新密�
         password_help: "%{minimun_characters} 个字符，必须��太常�(例如，123456)，并且必须��于您的昵称和电�邮件。"
@@ -1399,10 +1389,6 @@ zh-CN:
     timestamp_error_message: 对�起，这太快了�请�新�交。
   layouts:
     decidim:
-      cookie_warning:
-        description_html: 此网站使用 cookies。通过继续�览网站，您��我们使用 cookies。 %{link}。
-        link_label: 了解更多关于 cookie
-        ok: 我��
       edit_link:
         edit: 编辑
       footer:
diff --git a/decidim-core/config/routes.rb b/decidim-core/config/routes.rb
index 5501e8e7901a7..58aaa6dce15fd 100644
--- a/decidim-core/config/routes.rb
+++ b/decidim-core/config/routes.rb
@@ -3,6 +3,8 @@
 Decidim::Core::Engine.routes.draw do
   mount Decidim::Api::Engine => "/api"
 
+  get "/offline", to: "offline#show"
+
   devise_for :users,
              class_name: "Decidim::User",
              module: :devise,
@@ -47,6 +49,8 @@
     post "omniauth_registrations" => "devise/omniauth_registrations#create"
   end
 
+  resource :manifest, only: [:show]
+
   resource :locale, only: [:create]
 
   Decidim.participatory_space_manifests.each do |manifest|
@@ -61,9 +65,16 @@
   end
 
   authenticate(:user) do
+    devise_scope :user do
+      get "change_password" => "devise/passwords"
+      put "apply_password" => "devise/passwords"
+    end
+
     resource :account, only: [:show, :update, :destroy], controller: "account" do
       member do
         get :delete
+        post :resend_confirmation_instructions
+        post :cancel_email_change
       end
     end
     resources :conversations, only: [:new, :create, :index, :show, :update], controller: "messaging/conversations"
@@ -78,13 +89,14 @@
 
     get "/newsletters_opt_in/:token", to: "newsletters_opt_in#update", as: :newsletters_opt_in
 
-    resource :data_portability, only: [:show], controller: "data_portability" do
+    resource :download_your_data, only: [:show], controller: "download_your_data" do
       member do
         post :export
         get :download_file
       end
     end
 
+    resources :notifications_subscriptions, param: :auth, only: [:create, :destroy]
     resource :user_interests, only: [:show, :update]
 
     get "/authorization_modals/:authorization_action/f/:component_id(/:resource_name/:resource_id)", to: "authorization_modals#show", as: :authorization_modal
@@ -141,7 +153,6 @@
   get "/scopes/picker", to: "scopes#picker", as: :scopes_picker
 
   get "/static_map", to: "static_map#show", as: :static_map
-  get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
   put "/pages/terms-and-conditions/accept", to: "tos#accept_tos", as: :accept_tos
 
   match "/404", to: "errors#not_found", via: :all
@@ -184,8 +195,12 @@
     get :unsubscribe, on: :collection
   end
 
+  resources :upload_validations, only: [:create]
+
   resources :last_activities, only: [:index]
 
+  resources :short_links, only: [:index, :show], path: "s"
+
   use_doorkeeper do
     skip_controllers :applications, :authorized_applications
   end
diff --git a/decidim-core/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb b/decidim-core/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb
index b31ea8a31593a..e3f0caa5c3882 100644
--- a/decidim-core/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb
+++ b/decidim-core/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb
@@ -5,6 +5,7 @@ class Organization < ApplicationRecord
     self.table_name = :decidim_organizations
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
   end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
diff --git a/decidim-core/db/migrate/20181030090144_destroy_deleted_users_follows.rb b/decidim-core/db/migrate/20181030090144_destroy_deleted_users_follows.rb
index 68e81d21d78c5..3371f68501b9a 100644
--- a/decidim-core/db/migrate/20181030090144_destroy_deleted_users_follows.rb
+++ b/decidim-core/db/migrate/20181030090144_destroy_deleted_users_follows.rb
@@ -4,6 +4,7 @@ class DestroyDeletedUsersFollows < ActiveRecord::Migration[5.2]
   class Follow < ApplicationRecord
     self.table_name = "decidim_follows"
   end
+
   class User < ApplicationRecord
     self.table_name = "decidim_users"
   end
diff --git a/decidim-core/db/migrate/20190412131728_fix_user_names.rb b/decidim-core/db/migrate/20190412131728_fix_user_names.rb
index 76a18d7833c9e..359b9daf54f51 100644
--- a/decidim-core/db/migrate/20190412131728_fix_user_names.rb
+++ b/decidim-core/db/migrate/20190412131728_fix_user_names.rb
@@ -9,10 +9,10 @@ def change
 
     weird_characters.each do |character|
       Decidim::UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
-        Rails.logger.debug "detected character: #{character}"
-        Rails.logger.debug "UserBaseEntity ID: #{entity.id}"
-        Rails.logger.debug "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}"
-        Rails.logger.debug "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}"
+        Rails.logger.debug { "detected character: #{character}" }
+        Rails.logger.debug { "UserBaseEntity ID: #{entity.id}" }
+        Rails.logger.debug { "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}" }
+        Rails.logger.debug { "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}" }
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
diff --git a/decidim-core/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb b/decidim-core/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 0000000000000..6fbc00bb3195d
--- /dev/null
+++ b/decidim-core/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    return if column_exists?(:active_storage_blobs, :service_name)
+
+    add_column :active_storage_blobs, :service_name, :string
+    # rubocop:disable Lint/AssignmentInCondition
+    # rubocop:disable Rails/SkipsModelValidations
+    if configured_service = ActiveStorage::Blob.service.name
+      ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+    end
+    # rubocop:enable Lint/AssignmentInCondition
+    # rubocop:enable Rails/SkipsModelValidations
+    change_column :active_storage_blobs, :service_name, :string, null: false
+  end
+
+  def down
+    remove_column :active_storage_blobs, :service_name
+  end
+end
diff --git a/decidim-core/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb b/decidim-core/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 0000000000000..f6e011c1d8432
--- /dev/null
+++ b/decidim-core/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index [:blob_id, :variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end
diff --git a/decidim-core/db/migrate/20211208155453_create_decidim_reminders.rb b/decidim-core/db/migrate/20211208155453_create_decidim_reminders.rb
new file mode 100644
index 0000000000000..8b2f909accda4
--- /dev/null
+++ b/decidim-core/db/migrate/20211208155453_create_decidim_reminders.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminders do |t|
+      t.belongs_to :decidim_user, index: true, foreign_key: true, null: false
+      t.belongs_to :decidim_component, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/decidim-core/db/migrate/20211209121025_create_decidim_reminder_records.rb b/decidim-core/db/migrate/20211209121025_create_decidim_reminder_records.rb
new file mode 100644
index 0000000000000..9e6e2830122d5
--- /dev/null
+++ b/decidim-core/db/migrate/20211209121025_create_decidim_reminder_records.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminderRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_records do |t|
+      t.string :state, :string, index: true, default: "active"
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.belongs_to :remindable, polymorphic: true, null: false, index: { name: "index_decidim_reminder_records_remindable" }
+    end
+  end
+end
diff --git a/decidim-core/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb b/decidim-core/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb
new file mode 100644
index 0000000000000..6571ae0ac4700
--- /dev/null
+++ b/decidim-core/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminderDeliveries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_deliveries do |t|
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/decidim-core/db/migrate/20220118121921_change_required_description_categories.rb b/decidim-core/db/migrate/20220118121921_change_required_description_categories.rb
new file mode 100644
index 0000000000000..1654863378886
--- /dev/null
+++ b/decidim-core/db/migrate/20220118121921_change_required_description_categories.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeRequiredDescriptionCategories < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_categories, :description, true
+  end
+end
diff --git a/decidim-core/db/migrate/20220127113419_add_notification_settings_to_users.rb b/decidim-core/db/migrate/20220127113419_add_notification_settings_to_users.rb
new file mode 100755
index 0000000000000..a4ffa2ce2518e
--- /dev/null
+++ b/decidim-core/db/migrate/20220127113419_add_notification_settings_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotificationSettingsToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notification_settings, :jsonb, default: {}
+  end
+end
diff --git a/decidim-core/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb b/decidim-core/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb
new file mode 100644
index 0000000000000..4da3ed6f1941f
--- /dev/null
+++ b/decidim-core/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotificationsSendingFrequencyToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notifications_sending_frequency, :string, default: "daily", index: true
+  end
+end
diff --git a/decidim-core/db/migrate/20220215172439_add_digest_sent_at_to_users.rb b/decidim-core/db/migrate/20220215172439_add_digest_sent_at_to_users.rb
new file mode 100644
index 0000000000000..49363fec8ffc2
--- /dev/null
+++ b/decidim-core/db/migrate/20220215172439_add_digest_sent_at_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDigestSentAtToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :digest_sent_at, :datetime
+  end
+end
diff --git a/decidim-core/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb b/decidim-core/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb
new file mode 100644
index 0000000000000..a88cfc3a29915
--- /dev/null
+++ b/decidim-core/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexToDecidimUsersNotificationsSendingFrequency < ActiveRecord::Migration[6.0]
+  def change
+    add_index :decidim_users, :notifications_sending_frequency
+  end
+end
diff --git a/decidim-core/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb b/decidim-core/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb
new file mode 100644
index 0000000000000..fda66322480e3
--- /dev/null
+++ b/decidim-core/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class DropEmailsOnNotificationsFlagFromUser < ActiveRecord::Migration[5.1]
+  class DecidimUser < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    # rubocop:disable Rails/SkipsModelValidations
+    DecidimUser.where(email_on_notification: true).update_all(notifications_sending_frequency: "real_time")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    remove_column :decidim_users, :email_on_notification
+  end
+end
diff --git a/decidim-core/db/migrate/20220518094535_add_previous_passwords_to_users.rb b/decidim-core/db/migrate/20220518094535_add_previous_passwords_to_users.rb
new file mode 100644
index 0000000000000..2cdd34c181981
--- /dev/null
+++ b/decidim-core/db/migrate/20220518094535_add_previous_passwords_to_users.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddPreviousPasswordsToUsers < ActiveRecord::Migration[6.1]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    add_column :decidim_users, :password_updated_at, :datetime
+    add_column :decidim_users, :previous_passwords, :string, array: true, default: []
+
+    reversible do |direction|
+      direction.up do
+        # rubocop:disable Rails/SkipsModelValidations
+        User.update_all("password_updated_at = updated_at")
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end
diff --git a/decidim-core/db/migrate/20220524195530_create_decidim_short_links.rb b/decidim-core/db/migrate/20220524195530_create_decidim_short_links.rb
new file mode 100644
index 0000000000000..0435884ad27c4
--- /dev/null
+++ b/decidim-core/db/migrate/20220524195530_create_decidim_short_links.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateDecidimShortLinks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :decidim_short_links do |t|
+      t.references :decidim_organization, null: false, index: true
+      t.references :target, polymorphic: true, null: false, index: true
+      t.string :identifier, limit: 10, null: false
+      t.string :mounted_engine_name, index: true
+      t.string :route_name, index: true
+      t.jsonb :params
+
+      t.timestamps
+    end
+
+    add_index(
+      :decidim_short_links,
+      [:decidim_organization_id, :identifier],
+      unique: true,
+      name: "idx_decidim_short_links_organization_id_identifier"
+    )
+  end
+end
diff --git a/decidim-core/db/seeds.rb b/decidim-core/db/seeds.rb
index bc3a36b69e6f7..be5dc9bb45476 100644
--- a/decidim-core/db/seeds.rb
+++ b/decidim-core/db/seeds.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-core...\n" unless Rails.env.test?
 
   require "decidim/faker/localized"
@@ -17,8 +17,8 @@
     table.tr("_", "/").classify.safe_constantize
   end.compact.each(&:reset_column_information)
 
-  smtp_label = ENV["SMTP_FROM_LABEL"] || Faker::Twitter.unique.screen_name
-  smtp_email = ENV["SMTP_FROM_EMAIL"] || Faker::Internet.email
+  smtp_label = ENV.fetch("SMTP_FROM_LABEL", Faker::Twitter.unique.screen_name)
+  smtp_email = ENV.fetch("SMTP_FROM_EMAIL", Faker::Internet.email)
 
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
@@ -31,12 +31,12 @@
       from: "#{smtp_label} <#{smtp_email}>",
       from_email: smtp_email,
       from_label: smtp_label,
-      user_name: ENV["SMTP_USERNAME"] || Faker::Twitter.unique.screen_name,
-      encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV["SMTP_PASSWORD"] || Faker::Internet.password(min_length: 8)),
-      address: ENV["SMTP_ADDRESS"] || ENV["DECIDIM_HOST"] || "localhost",
-      port: ENV["SMTP_PORT"] || ENV["DECIDIM_SMTP_PORT"] || "25"
+      user_name: ENV.fetch("SMTP_USERNAME", Faker::Twitter.unique.screen_name),
+      encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV.fetch("SMTP_PASSWORD", Faker::Internet.password(min_length: 8))),
+      address: ENV.fetch("SMTP_ADDRESS", nil) || ENV.fetch("DECIDIM_HOST", "localhost"),
+      port: ENV.fetch("SMTP_PORT", nil) || ENV.fetch("DECIDIM_SMTP_PORT", "25")
     },
-    host: ENV["DECIDIM_HOST"] || "localhost",
+    host: ENV.fetch("DECIDIM_HOST", "localhost"),
     external_domain_whitelist: ["decidim.org", "github.com"],
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
       Decidim::Faker::Localized.sentence(word_count: 15)
@@ -115,12 +115,9 @@
   end
 
   admin = Decidim::User.find_or_initialize_by(email: "admin@example.org")
-
-  admin.update!(
+  admin_hash = {
     name: Faker::Name.name,
     nickname: Faker::Twitter.unique.screen_name,
-    password: "decidim123456",
-    password_confirmation: "decidim123456",
     organization: organization,
     confirmed_at: Time.current,
     locale: I18n.default_locale,
@@ -130,14 +127,16 @@
     about: Faker::Lorem.paragraph(sentence_count: 2),
     accepted_tos_version: organization.tos_version,
     admin_terms_accepted_at: Time.current
-  )
+  }
+  admin_hash.merge!(password: "decidim123456789", password_confirmation: "decidim123456789") if admin.encrypted_password.blank?
+  admin.update!(admin_hash)
 
   ["user@example.org", "user2@example.org"].each do |email|
     Decidim::User.find_or_initialize_by(email: email).update!(
       name: Faker::Name.name,
       nickname: Faker::Twitter.unique.screen_name,
-      password: "decidim123456",
-      password_confirmation: "decidim123456",
+      password: "decidim123456789",
+      password_confirmation: "decidim123456789",
       confirmed_at: Time.current,
       locale: I18n.default_locale,
       organization: organization,
@@ -155,8 +154,8 @@
   locked_user.update!(
     name: Faker::Name.name,
     nickname: Faker::Twitter.unique.screen_name,
-    password: "decidim123456",
-    password_confirmation: "decidim123456",
+    password: "decidim123456789",
+    password_confirmation: "decidim123456789",
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     organization: organization,
@@ -211,7 +210,7 @@
   Decidim::System::CreateDefaultContentBlocks.call(organization)
 
   hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope_name: :homepage)
-  hero_content_block.images_container.background_image = ActiveStorage::Blob.create_after_upload!(
+  hero_content_block.images_container.background_image = ActiveStorage::Blob.create_and_upload!(
     io: File.open(File.join(seeds_root, "homepage_image.jpg")),
     filename: "homepage_image.jpg",
     content_type: "image/jpeg",
diff --git a/decidim-core/decidim-core.gemspec b/decidim-core/decidim-core.gemspec
index 9330c03ab7ed3..4a3e4368c94db 100644
--- a/decidim-core/decidim-core.gemspec
+++ b/decidim-core/decidim-core.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.summary = "The core of the Decidim framework."
   s.description = "Adds core features so other engines can hook into the framework."
   s.license = "AGPL-3.0"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
@@ -27,16 +27,16 @@ Gem::Specification.new do |s|
   s.add_dependency "cells-erb", "~> 0.1.0"
   s.add_dependency "cells-rails", "~> 0.1.3"
   s.add_dependency "charlock_holmes", "~> 0.7"
-  s.add_dependency "date_validator", "~> 0.9.0"
+  s.add_dependency "date_validator", "~> 0.12.0"
   s.add_dependency "devise", "~> 4.7"
   s.add_dependency "devise-i18n", "~> 1.2"
   s.add_dependency "diffy", "~> 3.3"
   s.add_dependency "doorkeeper", "~> 5.1"
   s.add_dependency "doorkeeper-i18n", "~> 4.0"
-  s.add_dependency "file_validators", "~> 2.1"
+  s.add_dependency "file_validators", "~> 3.0"
   s.add_dependency "fog-local", "~> 0.6"
-  s.add_dependency "foundation_rails_helper"
-  s.add_dependency "geocoder", "~> 1.7.5"
+  s.add_dependency "foundation_rails_helper", "~> 4.0"
+  s.add_dependency "geocoder", "~> 1.8"
   s.add_dependency "hashdiff", ">= 0.4.0", "< 2.0.0"
   s.add_dependency "invisible_captcha", "~> 0.12"
   s.add_dependency "kaminari", "~> 1.2", ">= 1.2.1"
@@ -55,19 +55,18 @@ Gem::Specification.new do |s|
   s.add_dependency "premailer-rails", "~> 1.10"
   s.add_dependency "rack", "~> 2.2", ">= 2.2.3"
   s.add_dependency "rack-attack", "~> 6.0"
-  s.add_dependency "rails", "~> 6.0.4"
+  s.add_dependency "rails", "~> 6.1.0"
   s.add_dependency "rails-i18n", "~> 6.0"
   s.add_dependency "ransack", "~> 2.4.1"
-  s.add_dependency "rectify", "~> 0.13.0"
   s.add_dependency "redis", "~> 4.1"
   s.add_dependency "request_store", "~> 1.5.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
-  s.add_dependency "searchlight", "~> 4.1"
   s.add_dependency "seven_zip_ruby", "~> 1.3"
   s.add_dependency "social-share-button", "~> 1.2", ">= 1.2.1"
   s.add_dependency "valid_email2", "~> 2.1"
   s.add_dependency "webpacker", "= 6.0.0.rc.5"
+  s.add_dependency "webpush", "~> 1.1"
   s.add_dependency "wisper", "~> 2.0"
 
   s.add_dependency "decidim-api", Decidim::Core.version
diff --git a/decidim-core/lib/decidim/acts_as_tree.rb b/decidim-core/lib/decidim/acts_as_tree.rb
new file mode 100644
index 0000000000000..30eecf9d5a682
--- /dev/null
+++ b/decidim-core/lib/decidim/acts_as_tree.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActsAsTree
+    extend ActiveSupport::Concern
+
+    included do
+      @parent_item_foreign_key = :parent_id
+    end
+
+    class_methods do
+      def parent_item_foreign_key(name = nil)
+        return @parent_item_foreign_key unless name
+
+        @parent_item_foreign_key = name
+      end
+
+      def tree_for(item)
+        where(Arel.sql("#{table_name}.id IN (#{tree_sql_for(item)})")).order("#{table_name}.id")
+      end
+
+      def tree_sql_for(item)
+        <<-SQL.squish
+        WITH RECURSIVE search_tree(id, path) AS (
+          SELECT id, ARRAY[id]
+          FROM #{table_name}
+          WHERE id = #{item.id}
+            UNION ALL
+          SELECT #{table_name}.id, path || #{table_name}.id
+            FROM search_tree
+          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id
+            WHERE NOT #{table_name}.id = ANY(path)
+        )
+        SELECT id FROM search_tree ORDER BY path
+        SQL
+      end
+    end
+
+    def descendants
+      @descendants ||= self_and_descendants.where.not(id: id)
+    end
+
+    def self_and_descendants
+      @self_and_descendants ||= self.class.tree_for(self)
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/api/input_sorts/component_input_sort.rb b/decidim-core/lib/decidim/api/input_sorts/component_input_sort.rb
index 6c2d53667c846..907792b973f4c 100644
--- a/decidim-core/lib/decidim/api/input_sorts/component_input_sort.rb
+++ b/decidim-core/lib/decidim/api/input_sorts/component_input_sort.rb
@@ -23,7 +23,8 @@ class ComponentInputSort < BaseInputSort
                prepare: lambda { |direction, ctx|
                           lambda { |locale|
                             locale = ctx[:current_organization].default_locale if locale.blank?
-                            [Arel.sql("name->? #{direction.upcase}").to_s, locale]
+                            field = Arel::Nodes::InfixOperation.new("->", Arel.sql("name"), Arel::Nodes.build_quoted(locale))
+                            Arel::Nodes::InfixOperation.new("", field, Arel.sql(direction.upcase))
                           }
                         }
     end
diff --git a/decidim-core/lib/decidim/api/interfaces/authorable_interface.rb b/decidim-core/lib/decidim/api/interfaces/authorable_interface.rb
index 689da9c5a7d08..b1f88f95db620 100644
--- a/decidim-core/lib/decidim/api/interfaces/authorable_interface.rb
+++ b/decidim-core/lib/decidim/api/interfaces/authorable_interface.rb
@@ -12,11 +12,12 @@ module AuthorableInterface
       end
 
       def author
-        if object.respond_to?(:normalized_author)
-          object&.normalized_author
-        elsif object.respond_to?(:creator_identity)
-          object&.creator_identity
-        end
+        author = if object.respond_to?(:normalized_author)
+                   object&.normalized_author
+                 elsif object.respond_to?(:creator_identity)
+                   object&.creator_identity
+                 end
+        author if author.is_a?(Decidim::UserBaseEntity)
       end
     end
   end
diff --git a/decidim-core/lib/decidim/api/types/localized_string_type.rb b/decidim-core/lib/decidim/api/types/localized_string_type.rb
index 08b954a55488c..489554caea82d 100644
--- a/decidim-core/lib/decidim/api/types/localized_string_type.rb
+++ b/decidim-core/lib/decidim/api/types/localized_string_type.rb
@@ -8,6 +8,15 @@ class LocalizedStringType < Decidim::Api::Types::BaseObject
 
       field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
       field :text, GraphQL::Types::String, "The content of this translation.", null: true
+      field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
+
+      def machine_translated
+        if object.respond_to?(:machine_translated)
+          object.machine_translated.present?
+        else
+          false
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/lib/decidim/api/types/translated_field_type.rb b/decidim-core/lib/decidim/api/types/translated_field_type.rb
index b11d127628ee2..592a9377b92da 100644
--- a/decidim-core/lib/decidim/api/types/translated_field_type.rb
+++ b/decidim-core/lib/decidim/api/types/translated_field_type.rb
@@ -17,19 +17,34 @@ class TranslatedFieldType < Decidim::Api::Types::BaseObject
       end
 
       def locales
-        object.keys
+        (defined_translations.keys + machine_translations.keys).uniq
       end
 
       def translation(locale: "")
-        translations = object.stringify_keys
-        translations[locale]
+        display_translations[locale]
       end
 
       def translations(locales: [])
-        translations = object.stringify_keys
+        translations = display_translations
         translations = translations.slice(*locales) unless locales.empty?
 
-        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
+        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text, machine_translated: defined_translations[locale].blank?) }
+      end
+
+      private
+
+      def display_translations
+        @display_translations ||= locales.index_with do |locale|
+          defined_translations[locale].presence || machine_translations[locale]
+        end
+      end
+
+      def defined_translations
+        object.stringify_keys.except("machine_translations")
+      end
+
+      def machine_translations
+        object.stringify_keys["machine_translations"]&.stringify_keys || {}
       end
     end
   end
diff --git a/decidim-core/lib/decidim/asset_router.rb b/decidim-core/lib/decidim/asset_router.rb
new file mode 100644
index 0000000000000..fb3c77ccd1ca8
--- /dev/null
+++ b/decidim-core/lib/decidim/asset_router.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AssetRouter
+    autoload :Pipeline, "decidim/asset_router/pipeline"
+    autoload :Storage, "decidim/asset_router/storage"
+  end
+end
diff --git a/decidim-core/lib/decidim/asset_router/pipeline.rb b/decidim-core/lib/decidim/asset_router/pipeline.rb
new file mode 100644
index 0000000000000..e9bc74361b803
--- /dev/null
+++ b/decidim-core/lib/decidim/asset_router/pipeline.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AssetRouter
+    # The pipeline asset router provides global access to the asset routers for
+    # assets that are precompiled through the Rails assets pipeline (or webpack)
+    # and stored locally or in a remote CDN. This handles the configuration
+    # options for the asset routes so that they don't have to be always manually
+    # created.
+    class Pipeline
+      # Initializes the router.
+      #
+      # @param asset [String] The asset to route to
+      # @param model [ActiveRecord::Base, nil] The model that provides the
+      #   organizational context. When nil, the host will be included in the URL
+      #   when it is available through other configurations. Otherwise, the host
+      #   will not be part of the URL.
+      def initialize(asset, model: nil)
+        @asset = asset
+        @model = model
+      end
+
+      # Generates the correct URL to the asset with the provided options.
+      #
+      # @param options [Hash] The options for the URL that are the normal route
+      #   options Rails route helpers accept
+      # @return [String] The full URL to the asset or when host cannot be
+      #   resolved, the asset path.
+      def url(**options)
+        path = ActionController::Base.helpers.asset_pack_path(asset, **options)
+        "#{asset_host}#{path}"
+      end
+
+      private
+
+      attr_reader :asset, :model
+
+      # Fetches the organization from the model or returns the model itself if
+      # it is an organization.
+      #
+      # @return [Decidim::Organization]
+      def organization
+        @organization ||=
+          if model.is_a?(Decidim::Organization)
+            model
+          else
+            model.try(:organization)
+          end
+      end
+
+      # Resolves the full asset host with the resolved options and also adds the
+      # port at the end of the URL unless it is the default port 80 or 443.
+      #
+      # @return [String] The hostname with protocol and port or an empty string
+      #   when the host cannot be resolved.
+      def asset_host
+        return "" if default_options[:host].blank?
+
+        base_host = ActionController::Base.helpers.compute_asset_host("", **default_options)
+        return "" if base_host.blank?
+        return base_host if option_resolver.default_port?
+
+        "#{base_host}:#{option_resolver.port}"
+      end
+
+      # Determines the default options to be passed to the route helper.
+      #
+      # @return [Hash] The default options hash to pass to the route helper
+      def default_options
+        @default_options ||= option_resolver.options.tap do |opts|
+          opts[:host] = default_host if default_host
+        end
+      end
+
+      # Determines the default host for the pipeline assets. Either the
+      # configured assets host or the organization host when available. When the
+      # default host is not available, the host returned by the
+      # UrlOptionResolver will be used.
+      #
+      # @return [String, nil]
+      def default_host
+        @default_host ||= Rails.configuration.action_controller.asset_host || organization&.host
+      end
+
+      # Stores an instance of UrlOptionResolver for convenience.
+      #
+      # @return [Decidim::UrlOptionResolver]
+      def option_resolver
+        @option_resolver ||= UrlOptionResolver.new
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/asset_router/storage.rb b/decidim-core/lib/decidim/asset_router/storage.rb
new file mode 100644
index 0000000000000..f246ec037a324
--- /dev/null
+++ b/decidim-core/lib/decidim/asset_router/storage.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AssetRouter
+    # Storage asset router provides global access to the asset routes for assets
+    # saved through ActiveStorage. This handles the different cases for routing
+    # to the remote routes when using an assets CDN or to local routes when
+    # using the local disk storage driver.
+    class Storage
+      # Initializes the router.
+      #
+      # @param [ActiveStorage::Attached, ActiveStorage::Blob] The asset to route
+      #   to
+      def initialize(asset)
+        @asset = asset
+      end
+
+      # Generates the correct URL to the asset with the provided options.
+      #
+      # @param options The options for the URL that are the normal route options
+      #   Rails route helpers accept
+      def url(**options)
+        if asset.is_a? ActiveStorage::Attached
+          routes.rails_blob_url(asset.blob, **default_options.merge(options))
+        else
+          routes.rails_representation_url(asset, **default_options.merge(options))
+        end
+      end
+
+      private
+
+      attr_reader :asset
+
+      # Provides the route helpers depending on whether the URL is generated to
+      # the local host or an external CDN (remote).
+      #
+      # @return [Module, Decidim::EngineRouter] The correct route helpers based
+      #   on the configuration
+      def routes
+        @routes ||=
+          if remote?
+            Rails.application.routes.url_helpers
+          else
+            EngineRouter.new("main_app", {})
+          end
+      end
+
+      # Determines whether the assets call should be to a remote CDN or to the
+      # local server based on the storage options.
+      #
+      # @return [Boolean] A boolean indicating whether the assets are served
+      #   through a remote CDN
+      def remote?
+        remote_storage_options.present?
+      end
+
+      # Determines the default options to be passed to the route helper. For the
+      # remote storage, returns the remote storage options and for the local
+      # disk storage returns an empty hash.
+      #
+      # @return [Hash] The default options hash to pass to the route helper
+      def default_options
+        @default_options ||=
+          if remote?
+            remote_storage_options
+          else
+            {}
+          end
+      end
+
+      # The remote storage options when using a remote CDN. An empty hash in
+      # case using the local disk storage.
+      #
+      # @return [Hash] The remote storage options hash
+      def remote_storage_options
+        @remote_storage_options ||= {
+          host: Rails.application.secrets.dig(:storage, :cdn_host)
+        }.compact
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attachment_attributes.rb b/decidim-core/lib/decidim/attachment_attributes.rb
index c3857afe1789a..f86dca093654d 100644
--- a/decidim-core/lib/decidim/attachment_attributes.rb
+++ b/decidim-core/lib/decidim/attachment_attributes.rb
@@ -3,14 +3,14 @@
 require "active_support/concern"
 
 module Decidim
-  # A set of convenience methods to deal with attachment attributes for Virtus
+  # A set of convenience methods to deal with attachment attributes for
   # models that may set the attachment records through the original model
   # (Decidim::Attachment) or through the user submitted form data (String).
   module AttachmentAttributes
     extend ActiveSupport::Concern
 
     class_methods do
-      # Public: Mirrors Virtus' `attribute` interface to define attachment
+      # Public: Mirrors the `attribute` interface to define attachment
       # attributes for form objects.
       #
       # name - The attribute's name
@@ -20,14 +20,14 @@ module AttachmentAttributes
       #
       #   attachment_attribute :photos
       #   # This will create two attributes of the following types:
-      #   #   attribute :photos, Array[String]
+      #   #   attribute :photos, Array[Integer]
       #   #   attribute :add_photos, Array
       #   # In addition, it will generate the getter method for the attribute
       #   # returning an array of the Decidim::Attachment records.
       #
       # Returns nothing.
       def attachments_attribute(name)
-        attribute name, Array[String]
+        attribute name, Array[Integer]
         attribute "add_#{name}".to_sym, Array
 
         # Define the getter method that fetches the attachment records based on
@@ -37,13 +37,13 @@ def attachments_attribute(name)
         define_method name do
           return instance_variable_get(variable_name) if instance_variable_defined?(variable_name)
 
-          original = instance_variable_get("@#{name}")
-          return original unless original.is_a?(Array)
+          original = @attributes[name.to_s].value_before_type_cast
+          return original if original && !original.is_a?(Array)
 
           instance_variable_set(
             variable_name,
-            original.map do |attachment|
-              if attachment.is_a?(String) || attachment.is_a?(Integer)
+            super().map do |attachment|
+              if attachment.is_a?(Integer)
                 Decidim::Attachment.find_by(id: attachment)
               else
                 attachment
diff --git a/decidim-core/lib/decidim/attribute_object.rb b/decidim-core/lib/decidim/attribute_object.rb
new file mode 100644
index 0000000000000..6f5e001ebbbce
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This module provides functionality to create objects with attributes that
+  # are not attached to any database objects and have type coercions for the
+  # types of their objects. This is a similar concept as Virtus used to provide
+  # for the core objects, such as Forms and manifest classes. The programming
+  # API is backwards compatible with Virtus on most parts.
+  module AttributeObject
+    autoload :Form, "decidim/attribute_object/form"
+    autoload :Model, "decidim/attribute_object/model"
+    autoload :NestedValidator, "decidim/attribute_object/nested_validator"
+    autoload :TypeMap, "decidim/attribute_object/type_map"
+    autoload :TypeResolver, "decidim/attribute_object/type_resolver"
+
+    def self.types
+      @types ||= TypeResolver.new
+    end
+
+    def self.type(type, **options)
+      typedef = types.resolve(type, **options)
+
+      ActiveModel::Type.lookup(typedef[:type], **typedef[:options])
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attribute_object/form.rb b/decidim-core/lib/decidim/attribute_object/form.rb
new file mode 100644
index 0000000000000..883d3839ffd46
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object/form.rb
@@ -0,0 +1,183 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AttributeObject
+    # This is the main Form class that provides the functionality for all core
+    # forms that take in user input from the user interface forms and converts
+    # the inputs to expected formats.
+    #
+    # This replaces the Rectify::Form classes in Decidim which used to provide
+    # similar functionality. The API provided by this class is largely
+    # compatible with `Rectify::Form`.
+    class Form
+      include Decidim::AttributeObject::Model
+      include ActiveModel::Validations
+
+      attr_reader :context
+
+      def self.mimic(model_name)
+        @model_name = model_name.to_s.underscore.to_sym
+      end
+
+      def self.mimicked_model_name
+        @model_name || infer_model_name
+      end
+
+      def self.infer_model_name
+        return :form unless name
+
+        class_name = name.split("::").last
+        return :form if class_name == "Form"
+
+        class_name.chomp("Form").underscore.to_sym
+      end
+
+      # Converts the mimicked name to ActiveModel naming.
+      def self.model_name
+        ActiveModel::Name.new(self, nil, mimicked_model_name.to_s)
+      end
+
+      def self.from_model(model)
+        form_attributes = attribute_types.keys.each_with_object({}) do |key, attrs|
+          next unless model.respond_to?(key)
+
+          value = model.send(key)
+          attrs[key] =
+            case value
+            when ActiveStorage::Attached::One
+              value.attachment.try(:blob)
+            when ActiveStorage::Attached::Many
+              value.attachments.map(&:blob)
+            when ActiveRecord::Associations::CollectionProxy, ActiveRecord::Relation, Array
+              if attribute_types[key].type == :array
+                value
+              else
+                # This is a sub-form that needs to read the properties directly
+                # from the original model. We cannot pass an array here as it
+                # would be passed to the form constructor causing an error.
+                model
+              end
+            else
+              value
+            end
+        end
+
+        form = new(form_attributes)
+        form.map_model(model)
+
+        form
+      end
+
+      def self.from_params(params, additional_params = {})
+        params_hash = hash_from(params)
+        mimicked_params = ensure_hash(params_hash[mimicked_model_name])
+
+        attributes_hash = params_hash.merge(mimicked_params).merge(additional_params)
+
+        new(attributes_hash)
+      end
+
+      def self.hash_from(params)
+        params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
+        params.with_indifferent_access
+      end
+
+      def self.ensure_hash(object)
+        if object.is_a?(Hash)
+          object
+        else
+          {}
+        end
+      end
+
+      def persisted?
+        id.present? && id.to_i.positive?
+      end
+
+      def to_key
+        [id]
+      end
+
+      # Required for the active model naming to work correctly to form the HTML
+      # class attributes for the form elements (e.g. edit_account instead
+      # of edit_account_form).
+      def to_model
+        self
+      end
+
+      def to_param
+        id.to_s
+      end
+
+      # Use the map_model method within the form implementations to map any
+      # custom form-specific attributes from the model to the form.
+      def map_model(_model); end
+
+      def with_context(new_context)
+        @context = if new_context.is_a?(Hash)
+                     OpenStruct.new(new_context)
+                   else
+                     new_context
+                   end
+
+        attributes.each do |_name, value|
+          case value
+          when Array
+            value.each do |v|
+              next unless v.respond_to?(:with_context)
+
+              v.with_context(context)
+            end
+          else
+            next unless value.respond_to?(:with_context)
+
+            value.with_context(context)
+          end
+        end
+
+        self
+      end
+
+      # Although we are running the nested attributes validations through the
+      # NestedValidator, we still need to check for the errors in the nested
+      # attributes after the main validations are run in case the main
+      # validations are adding errors to some of the nested attributes.
+      #
+      # An example of such form is the Decidim::Budgets::Admin::ComponentForm
+      # which adds errors to the sub-attribute "settings" during its own
+      # validations. Because these errors are not added to the main form object,
+      # the main form object would be interpreted as valid without checking the
+      # sub-attribute validations.
+      #
+      # This preserves the backwards compatibility with Rectify::Form which
+      # did the validations in this order and fails the main record validation
+      # in case one of the nested attributes is not valid. This is needed e.g.
+      # for the customized component validations (e.g. Budgets component form).
+      def valid?(_context = nil)
+        super && self.class.attribute_types.none? do |name, type|
+          value = public_send(name)
+
+          if value.is_a?(Decidim::AttributeObject::Model) || (type.respond_to?(:validate_nested?) && type.validate_nested?)
+            _value_has_errors?(value)
+          else
+            false
+          end
+        end
+      end
+
+      private
+
+      def _value_has_errors?(value)
+        if value.is_a?(Array)
+          value.any? { |v| _value_has_errors?(v) }
+        elsif value.is_a?(Hash)
+          _value_has_errors?(value.values)
+        elsif value.respond_to?(:errors)
+          value.errors.any?
+        else
+          false
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attribute_object/model.rb b/decidim-core/lib/decidim/attribute_object/model.rb
new file mode 100644
index 0000000000000..69098a8910da3
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object/model.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+# Make sure the custom attributes are defined
+require "decidim/attributes"
+
+module Decidim
+  module AttributeObject
+    # This provides a dummy model implementation for replacing the Virtus models
+    # using ActiveModel. This class is a lightweight version of
+    # `ActiveModel::Model` with the `ActiveModel::Attributes` module and its
+    # overridden methods.
+    #
+    # The main purpose of this class is to provide a backwards compatible API
+    # for defining classes that hold attributes, such as the form classes.
+    #
+    # Usage:
+    #   Replace all instances of `Virtus.model` with `Decidim::AttributeObject::Model`.
+    module Model
+      extend ActiveSupport::Concern
+
+      include ActiveModel::AttributeAssignment
+      include ActiveModel::Attributes
+      include Decidim::AttributeObject::TypeMap
+
+      included do
+        extend ActiveModel::Naming
+        extend ActiveModel::Translation
+
+        # Default attributes for all models
+        attribute :id
+      end
+
+      class_methods do
+        def attribute(name, type = ActiveModel::Type::Value.new, **options)
+          typedef = AttributeObject.types.resolve(type, **options)
+
+          super(name, typedef[:type], **typedef[:options])
+
+          # Create the boolean method alias with the question mark at the end
+          # which is used in some places. This was a default behavior of
+          # Virtus but not a feature in ActiveModel::Attributes.
+          alias_method :"#{name}?", name if typedef[:type] == :boolean
+
+          # Add the nested validation in case validations module is loaded and
+          # the type reports it needs nested validations.
+          return unless include?(ActiveModel::Validations)
+
+          # The nested validator should be only added for those attributes that
+          # inherit from the AttributeObject::Model type. Otherwise this would
+          # be also added e.g. for ActiveRecord objects which would cause
+          # unexpected validation errors.
+          finaltype = attribute_types[name.to_s]
+          return unless finaltype.respond_to?(:validate_nested?)
+          return unless finaltype.validate_nested?
+
+          validates_with(
+            Decidim::AttributeObject::NestedValidator,
+            _merge_attributes([name])
+          )
+        end
+      end
+
+      def initialize(attributes = {})
+        # Parentheses needed not to pass the arguments.
+        super()
+
+        return unless attributes
+
+        # Make sure the attributes is a hash
+        base_attributes =
+          if attributes.is_a?(Hash)
+            attributes
+          else
+            attributes.to_h
+          end
+
+        # Only pass the existing attribute keys to assign_attributes
+        # The regular expression matching makes sure we also include the "multi"
+        # parameters, such as date fields passed from the view which are
+        # formatted as date(1i), date(2i), date(3i). These are converted to
+        # hashes below which are handled by the ActiveModel::Attributes types,
+        # such as :date.
+        correct_attributes = {}.tap do |attrs|
+          base_attributes.each do |k, v|
+            # Handle "multi" parameter attributes, such as date(1i), date(2i),
+            # date(3i). This converts these three attributes to a single hash
+            # attribute formatted as:
+            #   { "date" => { 1 => ..., 2 => ..., 3 => ...  } }
+            mp = k.to_s.match(/(.*)\(([0-9]+i)\)$/)
+            if mp
+              next unless attribute_names.include?(mp[1])
+
+              attrs[mp[1]] ||= {}
+              attrs[mp[1]][mp[2].to_i] = v
+            else
+              next unless attribute_names.include?(k.to_s)
+
+              attrs[k] = v
+            end
+          end
+        end
+
+        assign_attributes(correct_attributes)
+      end
+
+      # This provides backwards compatibility for accessing the attributes
+      # through symbols by calling `obj.attributes[:key]` or
+      # `obj.attributes.slice(:key1, :key2)`. In the legacy Virtus models, this
+      # returned a hash with symbol keys.
+      #
+      # Deprecated:
+      # Attributes access through symbols is deprecated and may be removed in
+      # future versions. Please refactor all your attributes calls to access the
+      # attributes through string keys.
+      def attributes
+        super.with_indifferent_access
+      end
+
+      # Convenience method for accessing the attributes through
+      # model[:attr_name] which is used in multiple places across the code.
+      def [](attribute_name)
+        public_send(attribute_name) if respond_to?(attribute_name)
+      end
+
+      # Convenience method for settings the attributes through
+      # model[:attr_name] = "foo" which is used in some places across the code.
+      def []=(attribute_name, value)
+        public_send("#{attribute_name}=", value) if respond_to?("#{attribute_name}=")
+      end
+
+      # Convenience method used in initiatives
+      def attributes_with_values
+        to_h.compact
+      end
+
+      def to_h
+        hash = attributes.to_h.symbolize_keys
+        hash.delete(:id) if hash.has_key?(:id) && hash[:id].blank?
+
+        hash
+      end
+
+      # The to_hash alias is needed for the as_json call which calls this method
+      # if defined.
+      alias to_hash to_h
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attribute_object/nested_validator.rb b/decidim-core/lib/decidim/attribute_object/nested_validator.rb
new file mode 100644
index 0000000000000..adfebe10ba93d
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object/nested_validator.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AttributeObject
+    class NestedValidator < ActiveModel::EachValidator # :nodoc:
+      def validate_each(record, attribute, value)
+        value = value.values if value.is_a?(Hash)
+        return unless Array(value).reject { |r| valid_object?(r) }.any?
+
+        record.errors.add(attribute, :invalid, **options.merge(value: value))
+      end
+
+      private
+
+      def valid_object?(record)
+        return true unless record.respond_to?(:valid?)
+
+        record.valid?
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attribute_object/type_map.rb b/decidim-core/lib/decidim/attribute_object/type_map.rb
new file mode 100644
index 0000000000000..578a8696600b6
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object/type_map.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AttributeObject
+    # Backwards compatibility for legacy types. Provides accessors for the
+    # legacy Virtus type classes that are mapped to ActiveModel types.
+    module TypeMap
+      # rubocop:disable Naming/ConstantName
+      Boolean = :boolean
+      Decimal = :decimal
+      # rubocop:enable Naming/ConstantName
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attribute_object/type_resolver.rb b/decidim-core/lib/decidim/attribute_object/type_resolver.rb
new file mode 100644
index 0000000000000..9d7025222b17a
--- /dev/null
+++ b/decidim-core/lib/decidim/attribute_object/type_resolver.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+# Make sure the custom attributes are defined
+require "decidim/attributes"
+
+module Decidim
+  module AttributeObject
+    # This resolves the ActiveModel::Attributes types from the Decidim's own
+    # type definitions format inspired by Virtus.
+    class TypeResolver
+      def resolve(type, **options)
+        case type
+        when Symbol, ActiveModel::Type::Value
+          {
+            type: type,
+            options: options
+          }
+        when Class
+          resolve_class(type, **options)
+        when Hash
+          resolve_hash(type, **options)
+        when Array
+          resolve_array(type, **options)
+        else
+          resolve_default(type, **options)
+        end
+      end
+
+      def exists?(type)
+        # This needs to be changed after upgrade to Rails 7.0 as follows:
+        # ActiveModel::Type.registry.send(:registrations).has_key?(type)
+        ActiveModel::Type.registry.send(:registrations).any? { |t| t.send(:name) == type }
+      end
+
+      private
+
+      def resolve_class(type, **options)
+        if type.include?(Decidim::AttributeObject::Model) || type <= ActiveRecord::Base
+          {
+            type: :model,
+            options: options.merge(primitive: type)
+          }
+        elsif type == Hash
+          resolve_hash({ Symbol => Object }, **options)
+        elsif type == Array
+          resolve_array(Array[Object], **options)
+        else
+          resolve_default(type, **options)
+        end
+      end
+
+      def resolve_hash(type, **options)
+        key_type = type.keys.first || Symbol
+        val_type = type.values.first || Object
+        options[:default] ||= {}
+
+        {
+          type: :hash,
+          options: options.merge(key_type: key_type, value_type: val_type)
+        }
+      end
+
+      def resolve_array(type, **options)
+        options[:default] ||= []
+
+        {
+          type: :array,
+          options: options.merge(value_type: type.first)
+        }
+      end
+
+      def resolve_default(type, **options)
+        type_symbol = type.to_s.underscore.to_sym
+
+        if exists?(type_symbol)
+          # Off the bat, this handles the basic types from:
+          # https://github.com/rails/rails/tree/main/activemodel/lib/active_model/type
+          {
+            type: type_symbol,
+            options: options
+          }
+        else
+          {
+            type: :object,
+            options: options.merge(primitive: type)
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes.rb b/decidim-core/lib/decidim/attributes.rb
index 89e8eaabf482b..53e665a2ab0cc 100644
--- a/decidim-core/lib/decidim/attributes.rb
+++ b/decidim-core/lib/decidim/attributes.rb
@@ -5,5 +5,34 @@ module Attributes
     autoload :TimeWithZone, "decidim/attributes/time_with_zone"
     autoload :LocalizedDate, "decidim/attributes/localized_date"
     autoload :CleanString, "decidim/attributes/clean_string"
+    autoload :Blob, "decidim/attributes/blob"
+    autoload :Array, "decidim/attributes/array"
+    autoload :Hash, "decidim/attributes/hash"
+    autoload :Object, "decidim/attributes/object"
+    autoload :Model, "decidim/attributes/model"
+    autoload :Symbol, "decidim/attributes/symbol"
+    autoload :Integer, "decidim/attributes/integer"
+
+    # Base types
+    ActiveModel::Type.register(:array, Decidim::Attributes::Array)
+    ActiveModel::Type.register(:hash, Decidim::Attributes::Hash)
+    ActiveModel::Type.register(:object, Decidim::Attributes::Object)
+    ActiveModel::Type.register(:model, Decidim::Attributes::Model)
+    ActiveModel::Type.register(:symbol, Decidim::Attributes::Symbol)
+
+    # Synonyms
+    ActiveModel::Type.register(:date_time, ActiveModel::Type::DateTime) # Synonym for :datetime
+
+    # Extra types
+    ActiveModel::Type.register(:"decidim/attributes/time_with_zone", Decidim::Attributes::TimeWithZone)
+    ActiveModel::Type.register(:"decidim/attributes/localized_date", Decidim::Attributes::LocalizedDate)
+    ActiveModel::Type.register(:"decidim/attributes/clean_string", Decidim::Attributes::CleanString)
+    ActiveModel::Type.register(:"decidim/attributes/blob", Decidim::Attributes::Blob)
+
+    # Overrides
+    # The overrides deletion can be omitted after upgrade to Rails 7.0 (delete this after upgrade)
+    ActiveModel::Type.registry.send(:registrations).delete_if { |r| r.send(:name) == :integer }
+
+    ActiveModel::Type.register(:integer, Decidim::Attributes::Integer)
   end
 end
diff --git a/decidim-core/lib/decidim/attributes/array.rb b/decidim-core/lib/decidim/attributes/array.rb
new file mode 100644
index 0000000000000..8c1d35839928e
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/array.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent an Array.
+    class Array < ActiveModel::Type::Value
+      attr_reader :value_type, :default
+
+      def initialize(value_type: ::Object, default: [])
+        @value_type = value_type
+        @default = default
+      end
+
+      def type # :nodoc:
+        :array
+      end
+
+      # The value would not be cast in case it is nil by default. We also want
+      # to cast the nil values to the default values.
+      def cast(value)
+        cast_value(value)
+      end
+
+      # The nested validator should be only added for those attributes that
+      # inherit from the AttributeObject::Model type. Otherwise this would be
+      # also added e.g. for ActiveRecord objects which would cause unexpected
+      # validation errors.
+      #
+      # The hash type inherits from the array type, so this covers both cases.
+      def validate_nested?
+        return false unless value_type.is_a?(Class)
+
+        (value_type < Decidim::AttributeObject::Model) == true
+      end
+
+      private
+
+      def cast_value(value)
+        value ||= default.dup
+
+        if value.is_a?(::Hash)
+          value = value.values
+        elsif !value.is_a?(::Array)
+          value =
+            if value.respond_to?(:to_a)
+              value.to_a
+            else
+              [value]
+            end
+        end
+
+        value.map { |v| primitive_value(v, value_type) }
+      end
+
+      def primitive_value(value, type)
+        return type.cast(value) if type.is_a?(ActiveModel::Type::Value)
+
+        Decidim::AttributeObject.type(type).cast(value)
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/blob.rb b/decidim-core/lib/decidim/attributes/blob.rb
new file mode 100644
index 0000000000000..c67129a32fa9d
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/blob.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to make conversion from signed id (String) to ActiveStorage::Blob easier.
+    class Blob < ActiveModel::Type::Value
+      def type
+        :"decidim/attributes/blob"
+      end
+
+      private
+
+      def cast_value(value)
+        return value unless value.is_a?(String)
+
+        ActiveStorage::Blob.find_signed(value)
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/clean_string.rb b/decidim-core/lib/decidim/attributes/clean_string.rb
index 725f52b42cf4c..2a600a0d3f454 100644
--- a/decidim-core/lib/decidim/attributes/clean_string.rb
+++ b/decidim-core/lib/decidim/attributes/clean_string.rb
@@ -2,16 +2,22 @@
 
 module Decidim
   module Attributes
-    # Custom Virtus value to "standardize" the newline characters within strings
-    # that are sent through user entered forms. This strips out the carriage
-    # return characters from the strings in order to avoid validation mismatches
-    # with the string lengths between the frontend and the backend.
+    # Custom attributes value to "standardize" the newline characters within
+    # strings that are sent through user entered forms. This strips out the
+    # carriage return characters from the strings in order to avoid validation
+    # mismatches with the string lengths between the frontend and the backend.
     #
     # This type should be used with forms that have:
     # - A user input defined with the <textarea> element
     # - The input element having the `maxlength` attribute defined for it
     # - The backend having a maximum length validation for the input
-    class CleanString < Virtus::Attribute
+    class CleanString < ActiveModel::Type::Value
+      def type # :nodoc:
+        :"decidim/attributes/clean_string"
+      end
+
+      private
+
       # When using Windows or copying texts from existing documents, the text
       # can contain the carriage return characters (\r) that the front-end
       # character counter does not consider as actual characters. This happens
@@ -27,7 +33,7 @@ class CleanString < Virtus::Attribute
       # are included in the data that gets sent to the server. In order to fix
       # this mismatch, remove the carriage return characters from the text
       # using this attribute type.
-      def coerce(value)
+      def cast_value(value)
         return value unless value.is_a?(String)
 
         value.gsub(/\r/, "")
diff --git a/decidim-core/lib/decidim/attributes/hash.rb b/decidim-core/lib/decidim/attributes/hash.rb
new file mode 100644
index 0000000000000..1415ae1a40ff1
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/hash.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent a Hash.
+    class Hash < Decidim::Attributes::Array
+      attr_reader :key_type
+
+      def initialize(key_type: ::Symbol, value_type: ::Object, default: {})
+        @key_type = key_type
+        @value_type = value_type
+        @default = default
+      end
+
+      def type # :nodoc:
+        :hash
+      end
+
+      private
+
+      def cast_value(value)
+        value ||= default.dup
+        value = value.to_h if !value.is_a?(::Hash) && value.respond_to?(:to_h)
+
+        # This preserves backwards compatibility for non-hash values e.g. with
+        # the admin hero content block which expects the images container object
+        # as the default value when building the admin form.
+        return value unless value.is_a?(::Hash)
+
+        value.to_h do |k, v|
+          [primitive_value(k, key_type), primitive_value(v, value_type)]
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/integer.rb b/decidim-core/lib/decidim/attributes/integer.rb
new file mode 100644
index 0000000000000..9ffd0222c2c2f
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/integer.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent an Integer that is customized from
+    # the parent class to also convert records to their ID representations.
+    class Integer < ActiveModel::Type::Integer
+      private
+
+      def cast_value(value)
+        return cast_value(value.id) if value.respond_to?(:id)
+
+        super
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/localized_date.rb b/decidim-core/lib/decidim/attributes/localized_date.rb
index 9abc5f67c44bb..99dd7e5cf9343 100644
--- a/decidim-core/lib/decidim/attributes/localized_date.rb
+++ b/decidim-core/lib/decidim/attributes/localized_date.rb
@@ -2,27 +2,21 @@
 
 module Decidim
   module Attributes
-    # Custom Virtus value to parse a String representing a Date using
+    # Custom attributes value to parse a String representing a Date using
     # the app localization format.
-    class LocalizedDate < Virtus::Attribute
-      def coerce(value)
-        return value unless value.is_a?(String)
-
-        Date.strptime(value, I18n.t("date.formats.decidim_short"))
-      rescue ArgumentError
-        coerce_fallback(value)
-      end
-
+    class LocalizedDate < ActiveModel::Type::Date
       def type
-        Axiom::Types::Date
+        :"decidim/attributes/localized_date"
       end
 
       private
 
-      def coerce_fallback(value)
-        coercer.coercers[DateTime].public_send(type.coercion_method, value)
-      rescue Date::Error
-        nil
+      def cast_value(value)
+        return value unless value.is_a?(String)
+
+        Date.strptime(value, I18n.t("date.formats.decidim_short"))
+      rescue ArgumentError
+        super
       end
     end
   end
diff --git a/decidim-core/lib/decidim/attributes/model.rb b/decidim-core/lib/decidim/attributes/model.rb
new file mode 100644
index 0000000000000..1b72840acc010
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/model.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent a Model.
+    class Model < Decidim::Attributes::Object
+      def type # :nodoc:
+        :model
+      end
+
+      private
+
+      def cast_value(value)
+        return value if value.is_a?(primitive)
+        return value if value.is_a?(Decidim::AttributeObject::Model)
+        return primitive.new(value) if value.is_a?(::Hash)
+        return primitive.new(value.to_h) if value.respond_to?(:to_h)
+
+        if value.respond_to?(:attributes)
+          # In case the primitive is a form object, we also need to call the
+          # `map_model` method in case the target form object defines it for
+          # nested forms to work properly.
+          converted = primitive.new(value.attributes)
+          converted.map_model(value) if converted.respond_to?(:map_model)
+          return converted
+        end
+
+        value
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/object.rb b/decidim-core/lib/decidim/attributes/object.rb
new file mode 100644
index 0000000000000..c19c8e5f102d7
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/object.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent an Object.
+    class Object < ActiveModel::Type::Value
+      attr_reader :primitive
+
+      def initialize(primitive: ::Object)
+        @primitive = primitive
+      end
+
+      def type # :nodoc:
+        :object
+      end
+
+      # The nested validator should be only added for those attributes that
+      # inherit from the AttributeObject::Model type. Otherwise this would be
+      # also added e.g. for ActiveRecord objects which would cause unexpected
+      # validation errors.
+      def validate_nested?
+        return false unless primitive.is_a?(Class)
+
+        (primitive < Decidim::AttributeObject::Model) == true
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/symbol.rb b/decidim-core/lib/decidim/attributes/symbol.rb
new file mode 100644
index 0000000000000..412917d4b3efb
--- /dev/null
+++ b/decidim-core/lib/decidim/attributes/symbol.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent a Symbol.
+    class Symbol < ActiveModel::Type::Value
+      def type # :nodoc:
+        :symbol
+      end
+
+      private
+
+      def cast_value(value)
+        return value if value.is_a?(::Symbol)
+
+        value = value.to_s if !value.respond_to?(:to_sym) && value.respond_to?(:to_s)
+        return unless value.respond_to?(:to_sym)
+
+        value.to_sym
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/attributes/time_with_zone.rb b/decidim-core/lib/decidim/attributes/time_with_zone.rb
index 55beb7d9d5825..140d83c15dc3e 100644
--- a/decidim-core/lib/decidim/attributes/time_with_zone.rb
+++ b/decidim-core/lib/decidim/attributes/time_with_zone.rb
@@ -2,31 +2,24 @@
 
 module Decidim
   module Attributes
-    # Custom Virtus value to parse a String representing a Time using
+    # Custom attributes value to parse a String representing a Time using
     # the app TimeZone.
-    class TimeWithZone < Virtus::Attribute
-      def coerce(value)
-        return value unless value.is_a?(String)
-
-        Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
-      rescue ArgumentError
-        coerce_fallback(value)
-      end
-
+    class TimeWithZone < ActiveModel::Type::DateTime
       def type
-        Axiom::Types::Time
+        :"decidim/attributes/time_with_zone"
       end
 
       private
 
-      def coerce_fallback(value)
-        fallback = coercer.coercers[Time].public_send(type.coercion_method, value)
-        return Time.zone.strptime(fallback.split(".").first, "%FT%R:%S") if fallback.is_a?(String)
-        return nil unless fallback.is_a?(Time)
+      def cast_value(value)
+        return value unless value.is_a?(String)
+
+        Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
+      rescue ArgumentError
+        fallback = super
+        return fallback unless fallback.is_a?(Time)
 
         ActiveSupport::TimeWithZone.new(fallback, Time.zone)
-      rescue ArgumentError, TypeError
-        nil
       end
     end
   end
diff --git a/decidim-core/lib/decidim/authorable.rb b/decidim-core/lib/decidim/authorable.rb
index 9dd23146ebf38..57aa451d83436 100644
--- a/decidim-core/lib/decidim/authorable.rb
+++ b/decidim-core/lib/decidim/authorable.rb
@@ -12,21 +12,36 @@ module Authorable
       belongs_to :author, polymorphic: true, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type"
       belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
-      scope :official_origin, lambda {
+      scope :with_official_origin, lambda {
         where(decidim_author_type: "Decidim::Organization")
       }
 
-      scope :user_group_origin, lambda {
+      scope :with_user_group_origin, lambda {
         where(decidim_author_type: "Decidim::UserBaseEntity")
           .where.not(decidim_user_group_id: nil)
       }
 
-      scope :citizens_origin, lambda {
+      scope :with_participants_origin, lambda {
         where(decidim_author_type: "Decidim::UserBaseEntity")
           .where(decidim_user_group_id: nil)
       }
 
-      validates :author, presence: true
+      scope :with_any_origin, lambda { |*origin_keys|
+        search_values = origin_keys.compact.compact_blank
+
+        conditions = [:official, :participants, :user_group].map do |key|
+          search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
+        end.compact
+        return self unless conditions.any?
+
+        scoped_query = where(id: conditions.shift)
+        conditions.each do |condition|
+          scoped_query = scoped_query.or(where(id: condition))
+        end
+
+        scoped_query
+      }
+
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
@@ -35,7 +50,7 @@ module Authorable
       #
       # user - the user to check for authorship
       def authored_by?(other_author)
-        other_author == author || other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group)
+        other_author == author || (other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group))
       end
 
       # Returns the normalized author, whether it's a user group or a user. Ideally this should be
@@ -70,7 +85,7 @@ def user_group_membership
       def author_belongs_to_organization
         return if !author || !organization
 
-        errors.add(:author, :invalid) unless author == organization || author.respond_to?(:organization) && author.organization == organization
+        errors.add(:author, :invalid) unless author == organization || (author.respond_to?(:organization) && author.organization == organization)
       end
     end
   end
diff --git a/decidim-core/lib/decidim/authorization_form_builder.rb b/decidim-core/lib/decidim/authorization_form_builder.rb
index b7aa0f1209fbe..343a13732f9f4 100644
--- a/decidim-core/lib/decidim/authorization_form_builder.rb
+++ b/decidim-core/lib/decidim/authorization_form_builder.rb
@@ -39,8 +39,8 @@ def input_field(name, type)
       return hidden_field(name) if name.to_s == "handler_name"
       return scopes_selector if name.to_s == "scope_id"
 
-      case type.name
-      when "Date", "Time"
+      case type
+      when :date, :datetime, :time, :"decidim/attributes/localized_date"
         date_field name
       else
         text_field name
@@ -54,24 +54,22 @@ def scopes_selector
     end
 
     def find_input_type(name)
-      found_attribute = object.class.attribute_set.detect do |attribute|
-        attribute.name.to_s == name
-      end
+      value_type = object.class.attribute_types[name]
 
-      raise "Could not find attribute #{name} in #{object.class.name}" unless found_attribute
+      raise "Could not find attribute #{name} in #{object.class.name}" unless value_type
 
-      found_attribute.type.primitive
+      value_type.type
     end
 
     def public_attributes
-      form_attributes.inject({}) do |all, attribute|
-        all.update(attribute.name => attribute.type.primitive)
+      form_attributes.inject({}) do |all, (name, value_type)|
+        all.update(name => value_type.type)
       end
     end
 
     def form_attributes
-      object.class.attribute_set.select do |attribute|
-        object.form_attributes.include?(attribute.name)
+      object.class.attribute_types.select do |key, _|
+        object.form_attributes.include?(key) || object.form_attributes.include?(key.to_sym)
       end
     end
   end
diff --git a/decidim-core/lib/decidim/carrier_wave_migrator_service.rb b/decidim-core/lib/decidim/carrier_wave_migrator_service.rb
index ac4b3be9c2185..5caf75d356b10 100644
--- a/decidim-core/lib/decidim/carrier_wave_migrator_service.rb
+++ b/decidim-core/lib/decidim/carrier_wave_migrator_service.rb
@@ -85,16 +85,16 @@ def self.check_content_blocks_attachments(logger:)
             as_checksum = destination.blob.checksum
 
             logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-              " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
-              " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
+                        " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
+                        " from CW attribute #{image_config[:name]} to AS" \
+                        " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
           else
             logger.info "[SKIP] Pending migration of Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
+                        " from CW attribute #{image_config[:name]} to AS" \
           end
         rescue StandardError
           logger.info "[ERROR] Exception checking Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
+                      " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
         end
       end
     end
@@ -108,8 +108,8 @@ def self.migrate_content_blocks_attachments!(logger:, routes_mappings: [])
 
           if destination.attached?
             logger.info "[SKIP] Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
-              " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
+                        " from CW attribute #{image_config[:name]} to AS" \
+                        " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
             next
           end
 
@@ -132,9 +132,9 @@ def self.migrate_content_blocks_attachments!(logger:, routes_mappings: [])
           as_checksum = destination.blob.checksum
 
           logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-            " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS" \
-            " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
+                      " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
+                      " from CW attribute #{image_config[:name]} to AS" \
+                      " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
 
           routes_mappings << { instance: "Decidim::ContentBlock##{block.id}",
                                attachment_origin_attribute: image_config[:name],
@@ -142,7 +142,7 @@ def self.migrate_content_blocks_attachments!(logger:, routes_mappings: [])
                                destination_path: Rails.application.routes.url_helpers.rails_blob_url(destination.blob, only_path: true) }
         rescue StandardError
           logger.info "[ERROR] Exception migrating Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
+                      " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
         end
       end
     end
@@ -177,7 +177,7 @@ def self.migrate_attachment!(klass:, cw_attribute:, cw_uploader:, logger:, as_at
         as_checksum = copy.send(as_attribute).blob.checksum
 
         logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-          " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
+                    " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
 
         routes_mappings << {
           instance: "#{klass}##{item.id}",
@@ -208,8 +208,8 @@ def self.check_migration(klass:, cw_attribute:, cw_uploader:, logger:, as_attrib
           as_checksum = copy.send(as_attribute).blob.checksum
 
           logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-            " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
-            " to AS #{as_attribute} attribute"
+                      " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
+                      " to AS #{as_attribute} attribute"
         else
           logger.info "[SKIP] Pending migration of #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
         end
@@ -286,7 +286,7 @@ def self.downloaded_file_checksum(file)
 
     def self.cw_file(attachment)
       if attachment.file.is_a?(CarrierWave::Storage::Fog::File)
-        URI.open(URI.parse(attachment.url))
+        URI.parse(attachment.url).open
       else
         File.open(attachment.file.file)
       end
diff --git a/decidim-core/lib/decidim/coauthorable.rb b/decidim-core/lib/decidim/coauthorable.rb
index c5a0294986801..de099472d87af 100644
--- a/decidim-core/lib/decidim/coauthorable.rb
+++ b/decidim-core/lib/decidim/coauthorable.rb
@@ -23,29 +23,47 @@ module Coauthorable
       scope :from_author, ->(author) { from_all_author_identities(author).where("decidim_coauthorships.decidim_user_group_id": nil) }
       # retrieves models from the given UserGroup.
       scope :from_user_group, ->(user_group) { joins(:coauthorships).where("decidim_coauthorships.decidim_user_group_id": user_group.id) }
-      scope :official_origin, lambda {
+      scope :with_official_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
       }
-      scope :citizens_origin, lambda {
+      scope :with_participants_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
              .where(decidim_coauthorships: { decidim_user_group_id: nil })
       }
-      scope :user_group_origin, lambda {
+      scope :with_user_group_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
              .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
       }
-      scope :meeting_origin, lambda {
+      scope :with_meeting_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
       }
 
+      scope :with_any_origin, lambda { |*origin_keys|
+        search_values = origin_keys.compact.compact_blank
+
+        conditions = [:official, :participants, :user_group, :meeting].map do |key|
+          search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
+        end.compact
+        return self unless conditions.any?
+
+        scoped_query = where(id: conditions.shift)
+        conditions.each do |condition|
+          scoped_query = scoped_query.or(where(id: condition))
+        end
+
+        scoped_query
+      }
+
+      scope :coauthored_by, ->(author) { where.not(coauthorships_count: 0).from_all_author_identities(author) }
+
       validates :coauthorships, presence: true
 
       # Overwrite default reload method to unset the instance variables so reloading works as expected.
diff --git a/decidim-core/lib/decidim/command.rb b/decidim-core/lib/decidim/command.rb
new file mode 100644
index 0000000000000..658f2bab7f233
--- /dev/null
+++ b/decidim-core/lib/decidim/command.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/command.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  class Command
+    include ::Wisper::Publisher
+
+    def self.call(*args, **kwargs, &block)
+      event_recorder = Decidim::EventRecorder.new
+
+      command = new(*args, **kwargs)
+      command.subscribe(event_recorder)
+      command.evaluate(&block) if block_given?
+      command.call
+
+      event_recorder.events
+    end
+
+    def evaluate(&block)
+      @caller = eval("self", block.binding, __FILE__, __LINE__)
+      instance_eval(&block)
+    end
+
+    def transaction(&block)
+      ActiveRecord::Base.transaction(&block) if block_given?
+    end
+
+    def method_missing(method_name, ...)
+      if @caller.respond_to?(method_name, true)
+        @caller.send(method_name, ...)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      @caller.respond_to?(method_name, include_private)
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/common_passwords.rb b/decidim-core/lib/decidim/common_passwords.rb
index af793e21dea1b..f00f958f0c683 100644
--- a/decidim-core/lib/decidim/common_passwords.rb
+++ b/decidim-core/lib/decidim/common_passwords.rb
@@ -30,7 +30,7 @@ def self.common_password_list
       @common_password_list ||= begin
         list = []
         URLS.each do |url|
-          URI.open(url) do |data|
+          URI.parse(url).open do |data|
             data.read.split.each do |line|
               list << line if line.length >= min_length
             end
diff --git a/decidim-core/lib/decidim/component_manifest.rb b/decidim-core/lib/decidim/component_manifest.rb
index c48657c4b649b..16d825b255f57 100644
--- a/decidim-core/lib/decidim/component_manifest.rb
+++ b/decidim-core/lib/decidim/component_manifest.rb
@@ -12,18 +12,18 @@ module Decidim
   # `Decidim.register_component`.
   class ComponentManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
-    attribute :admin_engine, Rails::Engine
-    attribute :engine, Rails::Engine
+    attribute :admin_engine, Rails::Engine, **{}
+    attribute :engine, Rails::Engine, **{}
 
     attribute :name, Symbol
-    attribute :hooks, Hash[Symbol => Array[Proc]], default: {}
+    attribute(:hooks, { Symbol => Array[Proc] }, default: {})
 
     attribute :query_type, String, default: "Decidim::Core::ComponentType"
 
     # An array with the name of the classes that will be exported with
-    # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
+    # the download your data feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
     attribute :data_portable_entities, Array, default: []
 
     # An array with the name of the classes to know the participants
diff --git a/decidim-core/lib/decidim/component_validator.rb b/decidim-core/lib/decidim/component_validator.rb
index 816299759e3de..369f02c59ad61 100644
--- a/decidim-core/lib/decidim/component_validator.rb
+++ b/decidim-core/lib/decidim/component_validator.rb
@@ -13,10 +13,10 @@ def check_validity!
   # over all the validators.
   def validate_each(record, attribute, component)
     unless component
-      record.errors[attribute] << :blank
+      record.errors.add(attribute, :blank)
       return
     end
 
-    record.errors[attribute] << :invalid if component.manifest_name.to_s != options[:manifest].to_s
+    record.errors.add(attribute, :invalid) if component.manifest_name.to_s != options[:manifest].to_s
   end
 end
diff --git a/decidim-core/lib/decidim/content_block_manifest.rb b/decidim-core/lib/decidim/content_block_manifest.rb
index d1ef5f6846acb..181cdc8f1cbab 100644
--- a/decidim-core/lib/decidim/content_block_manifest.rb
+++ b/decidim-core/lib/decidim/content_block_manifest.rb
@@ -20,7 +20,7 @@ module Decidim
   # be unique per scope.
   class ContentBlockManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :name, Symbol
     attribute :public_name_key, String
diff --git a/decidim-core/lib/decidim/content_parsers/hashtag_parser.rb b/decidim-core/lib/decidim/content_parsers/hashtag_parser.rb
index 478ca6a912d21..eedc2035b9322 100644
--- a/decidim-core/lib/decidim/content_parsers/hashtag_parser.rb
+++ b/decidim-core/lib/decidim/content_parsers/hashtag_parser.rb
@@ -18,14 +18,14 @@ class HashtagParser < BaseParser
 
       # Matches a hashtag if it starts with a letter or number
       # and only contains letters, numbers or underscores.
-      HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
+      HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i
 
       # Replaces hashtags name with new or existing hashtags models global ids.
       #
       # @return [String] the content with the hashtags replaced by global ids
       def rewrite
         content.gsub(HASHTAG_REGEX) do |match|
-          "#{hashtag(match[1..-1]).to_global_id}/#{(extra_hashtags? ? "_" : "")}#{match[1..-1]}"
+          "#{hashtag(match[1..-1]).to_global_id}/#{extra_hashtags? ? "_" : ""}#{match[1..-1]}"
         end
       end
 
diff --git a/decidim-core/lib/decidim/content_parsers/resource_parser.rb b/decidim-core/lib/decidim/content_parsers/resource_parser.rb
index f5d903cce373d..1f23c421419f8 100644
--- a/decidim-core/lib/decidim/content_parsers/resource_parser.rb
+++ b/decidim-core/lib/decidim/content_parsers/resource_parser.rb
@@ -11,7 +11,7 @@ class ResourceParser < BaseParser
       URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
       URL_REGEX_END_CHAR = '[\d]'
       # Matches a mentioned resource ID (~(d)+ expression)
-      ID_REGEX = /~(\d+)/.freeze
+      ID_REGEX = /~(\d+)/
 
       # Replaces found mentions matching an existing
       # Resource with a global id for that Resource. Other mentions found that doesn't
diff --git a/decidim-core/lib/decidim/content_parsers/user_group_parser.rb b/decidim-core/lib/decidim/content_parsers/user_group_parser.rb
index f2290a12fad3e..97a6ae906bc5c 100644
--- a/decidim-core/lib/decidim/content_parsers/user_group_parser.rb
+++ b/decidim-core/lib/decidim/content_parsers/user_group_parser.rb
@@ -16,7 +16,7 @@ class UserGroupParser < BaseParser
       Metadata = Struct.new(:groups)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # group in the current organization with a global id. Other
diff --git a/decidim-core/lib/decidim/content_parsers/user_parser.rb b/decidim-core/lib/decidim/content_parsers/user_parser.rb
index e200b92839eda..bb60e530ec45e 100644
--- a/decidim-core/lib/decidim/content_parsers/user_parser.rb
+++ b/decidim-core/lib/decidim/content_parsers/user_parser.rb
@@ -16,7 +16,7 @@ class UserParser < BaseParser
       Metadata = Struct.new(:users)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # user in the current organization with a global id. Other
@@ -26,7 +26,7 @@ class UserParser < BaseParser
       # @return [String] the content with the valid mentions replaced by a global id
       def rewrite
         content.gsub(MENTION_REGEX) do |match|
-          users[match[1..-1]]&.to_global_id&.to_s || match
+          users[match[1..-1].downcase]&.to_global_id&.to_s || match
         end
       end
 
@@ -43,11 +43,11 @@ def users
       end
 
       def existing_users
-        @existing_users ||= Decidim::User.where(organization: current_organization, nickname: content_nicknames)
+        @existing_users ||= Decidim::User.where("decidim_organization_id = ? AND LOWER(nickname) IN (?)", current_organization.id, content_nicknames)
       end
 
       def content_nicknames
-        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq
+        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq.map!(&:downcase)
       end
 
       def current_organization
diff --git a/decidim-core/lib/decidim/content_renderers/hashtag_renderer.rb b/decidim-core/lib/decidim/content_renderers/hashtag_renderer.rb
index c521fef03fa73..8caa39f783f10 100644
--- a/decidim-core/lib/decidim/content_renderers/hashtag_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/hashtag_renderer.rb
@@ -10,7 +10,7 @@ module ContentRenderers
     # @see BaseRenderer Examples of how to use a content renderer
     class HashtagRenderer < BaseRenderer
       # Matches a global id representing a Decidim::Hashtag
-      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}
 
       # Replaces found Global IDs matching an existing hashtag with
       # a link to their detail page. The Global IDs representing an
diff --git a/decidim-core/lib/decidim/content_renderers/link_renderer.rb b/decidim-core/lib/decidim/content_renderers/link_renderer.rb
index cf16e33ca43b1..73957a94542b2 100644
--- a/decidim-core/lib/decidim/content_renderers/link_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/link_renderer.rb
@@ -45,12 +45,12 @@ def remove_target_if_local(href, domain, options)
 
       private
 
-      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix.freeze
+      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix
 
       # # regexps for determining context, used high-volume
       AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, %r{</a>}i].freeze
 
-      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}.freeze
+      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}
 
       BRACKETS = { "]" => "[", ")" => "(", "}" => "{" }.freeze
 
diff --git a/decidim-core/lib/decidim/content_renderers/user_group_renderer.rb b/decidim-core/lib/decidim/content_renderers/user_group_renderer.rb
index d5d1cafd41d69..6a830aac1485c 100644
--- a/decidim-core/lib/decidim/content_renderers/user_group_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/user_group_renderer.rb
@@ -10,7 +10,7 @@ module ContentRenderers
     # @see BaseRenderer Examples of how to use a content renderer
     class UserGroupRenderer < BaseRenderer
       # Matches a global id representing a Decidim::UserGroup
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an
diff --git a/decidim-core/lib/decidim/content_renderers/user_renderer.rb b/decidim-core/lib/decidim/content_renderers/user_renderer.rb
index 5e94794b9acee..fb7986340d9af 100644
--- a/decidim-core/lib/decidim/content_renderers/user_renderer.rb
+++ b/decidim-core/lib/decidim/content_renderers/user_renderer.rb
@@ -10,7 +10,7 @@ module ContentRenderers
     # @see BaseRenderer Examples of how to use a content renderer
     class UserRenderer < BaseRenderer
       # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an
diff --git a/decidim-core/lib/decidim/controller_helpers.rb b/decidim-core/lib/decidim/controller_helpers.rb
new file mode 100644
index 0000000000000..526d3ff6e4788
--- /dev/null
+++ b/decidim-core/lib/decidim/controller_helpers.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/controller_helpers.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  module ControllerHelpers
+    def self.included(base_class)
+      base_class.helper_method(:presenter)
+    end
+
+    def present(presenter, options = {})
+      presenter_type = options.fetch(:for, :template)
+
+      presenter.attach_controller(self)
+      rectify_presenters[presenter_type] = presenter
+    end
+
+    def presenter(presenter_type = :template)
+      rectify_presenters[presenter_type]
+    end
+
+    def expose(presentation_data)
+      presentation_data.each do |attribute, value|
+        if presenter.respond_to?("#{attribute}=")
+          presenter.public_send("#{attribute}=", value)
+        else
+          instance_variable_set("@#{attribute}", value)
+        end
+      end
+    end
+
+    private
+
+    def rectify_presenters
+      @rectify_presenters ||= {}
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/core.rb b/decidim-core/lib/decidim/core.rb
index ad682b0afa00f..c04ffcea27245 100644
--- a/decidim-core/lib/decidim/core.rb
+++ b/decidim-core/lib/decidim/core.rb
@@ -3,10 +3,13 @@
 require "decidim/core/engine"
 require "decidim/core/api"
 require "decidim/core/version"
+
 # Decidim configuration.
 module Decidim
+  autoload :Env, "decidim/env"
   autoload :Deprecations, "decidim/deprecations"
   autoload :ActsAsAuthor, "decidim/acts_as_author"
+  autoload :ActsAsTree, "decidim/acts_as_tree"
   autoload :TranslatableAttributes, "decidim/translatable_attributes"
   autoload :TranslatableResource, "decidim/translatable_resource"
   autoload :JsonbAttributes, "decidim/jsonb_attributes"
@@ -14,6 +17,7 @@ module Decidim
   autoload :AuthorizationFormBuilder, "decidim/authorization_form_builder"
   autoload :FilterFormBuilder, "decidim/filter_form_builder"
   autoload :ComponentManifest, "decidim/component_manifest"
+  autoload :NotificationSettingManifest, "decidim/notification_setting_manifest"
   autoload :ParticipatorySpaceManifest, "decidim/participatory_space_manifest"
   autoload :ResourceManifest, "decidim/resource_manifest"
   autoload :Resourceable, "decidim/resourceable"
@@ -43,7 +47,6 @@ module Decidim
   autoload :FriendlyDates, "decidim/friendly_dates"
   autoload :Nicknamizable, "decidim/nicknamizable"
   autoload :HasReference, "decidim/has_reference"
-  autoload :Attributes, "decidim/attributes"
   autoload :StatsRegistry, "decidim/stats_registry"
   autoload :Exporters, "decidim/exporters"
   autoload :FileZipper, "decidim/file_zipper"
@@ -51,7 +54,9 @@ module Decidim
   autoload :MenuItem, "decidim/menu_item"
   autoload :MenuRegistry, "decidim/menu_registry"
   autoload :ManifestRegistry, "decidim/manifest_registry"
+  autoload :AssetRouter, "decidim/asset_router"
   autoload :EngineRouter, "decidim/engine_router"
+  autoload :UrlOptionResolver, "decidim/url_option_resolver"
   autoload :Events, "decidim/events"
   autoload :ViewHooks, "decidim/view_hooks"
   autoload :ContentBlockRegistry, "decidim/content_block_registry"
@@ -64,6 +69,7 @@ module Decidim
   autoload :NewsletterEncryptor, "decidim/newsletter_encryptor"
   autoload :NewsletterParticipant, "decidim/newsletter_participant"
   autoload :Searchable, "decidim/searchable"
+  autoload :FilterableResource, "decidim/filterable_resource"
   autoload :SearchResourceFieldsMapper, "decidim/search_resource_fields_mapper"
   autoload :QueryExtensions, "decidim/query_extensions"
   autoload :ParticipatorySpaceResourceable, "decidim/participatory_space_resourceable"
@@ -71,9 +77,9 @@ module Decidim
   autoload :ViewModel, "decidim/view_model"
   autoload :FingerprintCalculator, "decidim/fingerprint_calculator"
   autoload :Fingerprintable, "decidim/fingerprintable"
-  autoload :DataPortability, "decidim/data_portability"
-  autoload :DataPortabilitySerializers, "decidim/data_portability_serializers"
-  autoload :DataPortabilityExporter, "decidim/data_portability_exporter"
+  autoload :DownloadYourData, "decidim/download_your_data"
+  autoload :DownloadYourDataSerializers, "decidim/download_your_data_serializers"
+  autoload :DownloadYourDataExporter, "decidim/download_your_data_exporter"
   autoload :Amendable, "decidim/amendable"
   autoload :Gamification, "decidim/gamification"
   autoload :Hashtag, "decidim/hashtag"
@@ -96,7 +102,18 @@ module Decidim
   autoload :RecordEncryptor, "decidim/record_encryptor"
   autoload :AttachmentAttributes, "decidim/attachment_attributes"
   autoload :CarrierWaveMigratorService, "decidim/carrier_wave_migrator_service"
+  autoload :ReminderRegistry, "decidim/reminder_registry"
+  autoload :ReminderManifest, "decidim/reminder_manifest"
+  autoload :ManifestMessages, "decidim/manifest_messages"
   autoload :CommonPasswords, "decidim/common_passwords"
+  autoload :HasArea, "decidim/has_area"
+  autoload :AttributeObject, "decidim/attribute_object"
+  autoload :Query, "decidim/query"
+  autoload :Command, "decidim/command"
+  autoload :EventRecorder, "decidim/event_recorder"
+  autoload :ControllerHelpers, "decidim/controller_helpers"
+  autoload :ProcessesFileLocally, "decidim/processes_file_locally"
+  autoload :DependencyResolver, "decidim/dependency_resolver"
 
   include ActiveSupport::Configurable
   # Loads seeds from all engines.
@@ -259,8 +276,8 @@ def self.seed!
     true
   end
 
-  # Time that data portability files are available in server
-  config_accessor :data_portability_expiry_time do
+  # Time that download your data files are available in server
+  config_accessor :download_your_data_expiry_time do
     7.days
   end
 
@@ -380,10 +397,51 @@ def self.seed!
     1_000
   end
 
-  # Defines the name of the cookie used to check if the user allows Decidim to
-  # set cookies.
+  # Defines the name of the cookie used to check if the user has given consent
+  # to store local data in their browser.
   config_accessor :consent_cookie_name do
-    "decidim-cc"
+    "decidim-consent"
+  end
+
+  # Defines data consent categories. Note that when adding an item you need to
+  # add following i18n entries also (change 'foo' with the name of the data
+  # which can be a cookie for instance).
+  #
+  # layouts.decidim.data_consent.details.items.foo.service
+  # layouts.decidim.data_consent.details.items.foo.description
+  config_accessor :consent_categories do
+    [
+      {
+        slug: "essential",
+        mandatory: true,
+        items: [
+          {
+            type: "cookie",
+            name: "_session_id"
+          },
+          {
+            type: "cookie",
+            name: Decidim.consent_cookie_name
+          },
+          {
+            type: "local_storage",
+            name: "pwaInstallPromptSeen"
+          }
+        ]
+      },
+      {
+        slug: "preferences",
+        mandatory: false
+      },
+      {
+        slug: "analytics",
+        mandatory: false
+      },
+      {
+        slug: "marketing",
+        mandatory: false
+      }
+    ]
   end
 
   # Blacklisted passwords. Array may contain strings and regex entries.
@@ -391,6 +449,23 @@ def self.seed!
     []
   end
 
+  # Defines if admins are required to have stronger passwords than other users
+  config_accessor :admin_password_strong do
+    true
+  end
+
+  config_accessor :admin_password_expiration_days do
+    90
+  end
+
+  config_accessor :admin_password_min_length do
+    15
+  end
+
+  config_accessor :admin_password_repetition_times do
+    5
+  end
+
   # This is an internal key that allow us to properly configure the caching key separator. This is useful for redis cache store
   # as it creates some namespaces within the cached data.
   # use `config.cache_key_separator = ":"` in your initializer to have namespaced data
@@ -398,6 +473,11 @@ def self.seed!
     "/"
   end
 
+  # Enable/Disable the service worker
+  config_accessor :service_worker_enabled do
+    Rails.env.exclude?("development")
+  end
+
   # Public: Registers a global engine. This method is intended to be used
   # by component engines that also offer unscoped functionality
   #
@@ -471,6 +551,10 @@ def self.register_resource(name, &block)
     resource_registry.register(name, &block)
   end
 
+  def self.notification_settings(name, &block)
+    notification_settings_registry.register(name, &block)
+  end
+
   # Public: Finds all registered resource manifests via the `register_component`
   # method.
   #
@@ -534,11 +618,19 @@ def self.participatory_space_registry
     @participatory_space_registry ||= ManifestRegistry.new(:participatory_spaces)
   end
 
+  def self.reminders_registry
+    @reminders_registry ||= ReminderRegistry.new
+  end
+
   # Public: Stores the registry of resource spaces
   def self.resource_registry
     @resource_registry ||= ManifestRegistry.new(:resources)
   end
 
+  def self.notification_settings_registry
+    @notification_settings_registry ||= ManifestRegistry.new(:notification_settings)
+  end
+
   # Public: Stores the registry for user permissions
   def self.permissions_registry
     @permissions_registry ||= PermissionsRegistry.new
@@ -594,13 +686,12 @@ def self.metrics_operation
   #         organization or a model responding to the `organization` method.
   #
   def self.organization_settings(model)
-    organization = begin
-      if model.is_a?(Decidim::Organization)
-        model
-      elsif model.respond_to?(:organization) && model.organization.present?
-        model.organization
-      end
-    end
+    organization = if model.is_a?(Decidim::Organization)
+                     model
+                   elsif model.respond_to?(:organization) && model.organization.present?
+                     model.organization
+                   end
+
     return Decidim::OrganizationSettings.defaults unless organization
 
     Decidim::OrganizationSettings.for(organization)
@@ -625,4 +716,46 @@ def self.machine_translation_service_klass
   def self.register_assets_path(path)
     Rails.autoloaders.main.ignore(path) if Rails.configuration.autoloader == :zeitwerk
   end
+
+  # Checks if a particular decidim gem is installed and needed by this
+  # particular instance. Preferrably this happens through bundler by inspecting
+  # the Gemfile of the instance but when Decidim is used without bundler, this
+  # will check:
+  # 1. If the gem is globally available or not in the loaded specs, i.e. the
+  #    gems available in the gem install directory/directories.
+  # 2. If the gem has been required through `require "decidim/foo"`.
+  #
+  # Using bundler is suggested as it will provide more accurate results
+  # regarding what is actually needed. It will resolve all the gems listed in
+  # the Gemfile and also their dependencies which provides us accurate
+  # information whether a gem is needed by the instance or not.
+  #
+  # Note that using something like defined?(Decidim::Foo) will not work because
+  # the way the Decidim handles version definitions for each gem. After the gems
+  # are loaded, this would always return true because the version definition
+  # files of each module define that module which means it is available at
+  # runtime if the gem is installed in the gem load path. In some situations it
+  # can be installed there through other projects or through the command line
+  # even if the instance does not require that module or even through
+  # installing gems from git sources or from file paths.
+  #
+  # When a gem is reported as "needed" by the dependency resolver, this will
+  # also require that module ensuring its availability for the initialization
+  # code.
+  #
+  # @param mod [Symbol, String] The module name to check, e.g. `:proposals`.
+  # @return [Boolean] A boolean indicating whether the module is installed.
+  def self.module_installed?(mod)
+    return false unless Decidim::DependencyResolver.instance.needed?("decidim-#{mod}")
+
+    # The dependency may not be automatically loaded through the Gemfile if the
+    # user lists e.g. "decidim-core" and "decidim-budgets" in it. In this
+    # situation, "decidim-comments" is also needed because it is a dependency
+    # for "decidim-budgets".
+    require "decidim/#{mod}"
+
+    true
+  rescue LoadError
+    false
+  end
 end
diff --git a/decidim-core/lib/decidim/core/engine.rb b/decidim-core/lib/decidim/core/engine.rb
index e8371b55a53f4..647b78a52464c 100644
--- a/decidim-core/lib/decidim/core/engine.rb
+++ b/decidim-core/lib/decidim/core/engine.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails"
+require "decidim/rails"
 require "active_support/all"
 require "action_view/railtie"
 
@@ -13,7 +13,6 @@
 require "devise_invitable"
 require "foundation_rails_helper"
 require "active_link_to"
-require "rectify"
 require "carrierwave"
 require "rails-i18n"
 require "date_validator"
@@ -39,7 +38,7 @@
 require "diffy"
 require "social-share-button"
 require "ransack"
-require "searchlight"
+require "wisper"
 require "webpacker"
 
 # Needed for the assets:precompile task, for configuring webpacker instance
@@ -49,9 +48,6 @@
 require "decidim/middleware/strip_x_forwarded_host"
 require "decidim/middleware/current_organization"
 
-# Backport cookie handling extensions for Rails 6.0
-require "decidim/middleware/rails_cookies"
-
 module Decidim
   module Core
     # Decidim's core Rails Engine.
@@ -67,6 +63,10 @@ class Engine < ::Rails::Engine
         end
       end
 
+      initializer "decidim.action_mailer" do |app|
+        app.config.action_mailer.deliver_later_queue_name = :mailers
+      end
+
       initializer "decidim.middleware" do |app|
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::CurrentOrganization
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::StripXForwardedHost
@@ -92,6 +92,17 @@ class Engine < ::Rails::Engine
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
       end
 
+      initializer "decidim.ransack" do
+        Ransack.configure do |config|
+          # Avoid turning parameter values such as user_id[]=1&user_id[]=2 into
+          # { user_id: [true, "2"] }. This option allows us to handle the type
+          # convertions manually instead for each case.
+          # See: https://github.com/activerecord-hackery/ransack/issues/593
+          # See: https://github.com/activerecord-hackery/ransack/pull/742
+          config.sanitize_custom_scope_booleans = false
+        end
+      end
+
       initializer "decidim.i18n_exceptions" do
         ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
       end
@@ -122,16 +133,15 @@ class Engine < ::Rails::Engine
         next if Decidim.maps.present?
         next if Decidim.geocoder.blank?
 
-        legacy_api_key ||= begin
-          if Decidim.geocoder[:here_api_key].present?
-            Decidim.geocoder.fetch(:here_api_key)
-          elsif Decidim.geocoder[:here_app_id].present?
-            [
-              Decidim.geocoder.fetch(:here_app_id),
-              Decidim.geocoder.fetch(:here_app_code)
-            ]
-          end
-        end
+        legacy_api_key ||= if Decidim.geocoder[:here_api_key].present?
+                             Decidim.geocoder.fetch(:here_api_key)
+                           elsif Decidim.geocoder[:here_app_id].present?
+                             [
+                               Decidim.geocoder.fetch(:here_app_id),
+                               Decidim.geocoder.fetch(:here_app_code)
+                             ]
+                           end
+
         next unless legacy_api_key
 
         ActiveSupport::Deprecation.warn(
@@ -167,6 +177,7 @@ class Engine < ::Rails::Engine
 
         Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
           processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
+
           processes = processes.where("created_at >= ?", start_at) if start_at.present?
           processes = processes.where("created_at <= ?", end_at) if end_at.present?
           processes.count
@@ -221,9 +232,9 @@ class Engine < ::Rails::Engine
                         decidim.user_interests_path,
                         position: 1.4
 
-          menu.add_item :data_portability,
+          menu.add_item :download_your_data,
                         t("my_data", scope: "layouts.decidim.user_profile"),
-                        decidim.data_portability_path,
+                        decidim.download_your_data_path,
                         position: 1.5
 
           menu.add_item :delete_account,
@@ -242,6 +253,13 @@ class Engine < ::Rails::Engine
         end
       end
 
+      initializer "decidim.validators" do
+        config.to_prepare do
+          # Decidim overrides to the file content type validator
+          require "file_content_type_validator"
+        end
+      end
+
       initializer "decidim.content_processors" do |_app|
         Decidim.configure do |config|
           config.content_processors += [:user, :user_group, :hashtag, :link]
diff --git a/decidim-core/lib/decidim/core/test.rb b/decidim-core/lib/decidim/core/test.rb
index cca64f97b4d8c..a902e632f3616 100644
--- a/decidim-core/lib/decidim/core/test.rb
+++ b/decidim-core/lib/decidim/core/test.rb
@@ -4,6 +4,7 @@
 require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
+require "decidim/core/test/shared_examples/editor_shared_examples"
 require "decidim/core/test/shared_examples/endorsable"
 require "decidim/core/test/shared_examples/publicable"
 require "decidim/core/test/shared_examples/localised_email"
@@ -72,6 +73,6 @@
 require "decidim/core/test/shared_examples/assembly_announcements_examples"
 require "decidim/core/test/shared_examples/translated_event_examples"
 require "decidim/core/test/shared_examples/conversations_examples"
-require "decidim/core/test/shared_examples/versions_controller_examples"
 require "decidim/core/test/shared_examples/resource_endorsed_event_examples"
+require "decidim/core/test/shared_examples/versions_controller_examples"
 require "decidim/core/test/shared_examples/mcell_examples"
diff --git a/decidim-core/lib/decidim/core/test/factories.rb b/decidim-core/lib/decidim/core/test/factories.rb
index 479ef6d5e7ea5..2afcfe479fc56 100644
--- a/decidim-core/lib/decidim/core/test/factories.rb
+++ b/decidim-core/lib/decidim/core/test/factories.rb
@@ -17,8 +17,8 @@ def generate_localized_title
     "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
   end
 
-  sequence(:name) do |n|
-    "#{Faker::Name.name} #{n}".delete("'")
+  sequence(:name) do |_|
+    Faker::Name.name.delete("'")
   end
 
   sequence(:nickname) do |n|
@@ -125,8 +125,6 @@ def generate_localized_title
 
   factory :user, class: "Decidim::User" do
     email { generate(:email) }
-    password { "decidim123456" }
-    password_confirmation { password }
     name { generate(:name) }
     nickname { generate(:nickname) }
     organization
@@ -137,8 +135,10 @@ def generate_localized_title
     about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     confirmation_sent_at { Time.current }
     accepted_tos_version { organization.tos_version }
-    email_on_notification { true }
+    notifications_sending_frequency { "real_time" }
     email_on_moderations { true }
+    password_updated_at { Time.current }
+    previous_passwords { [] }
     extended_data { {} }
 
     trait :confirmed do
@@ -148,7 +148,7 @@ def generate_localized_title
     trait :blocked do
       blocked { true }
       blocked_at { Time.current }
-      extended_data { { "user_name": generate(:name) } }
+      extended_data { { user_name: generate(:name) } }
       name { "Blocked user" }
     end
 
@@ -183,6 +183,14 @@ def generate_localized_title
       officialized_at { Time.current }
       officialized_as { generate_localized_title }
     end
+
+    after(:build) do |user, evaluator|
+      # We have specs that call e.g. `create(:user, admin: true)` where we need
+      # to do this to ensure the user creation does not fail due to the short
+      # password.
+      user.password ||= evaluator.password || "decidim123456789"
+      user.password_confirmation ||= evaluator.password_confirmation || user.password
+    end
   end
 
   factory :participatory_space_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
@@ -226,13 +234,20 @@ def generate_localized_title
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { user_name: generate(:name) } }
+      name { "Blocked user group" }
+    end
+
     after(:build) do |user_group, evaluator|
-      user_group.extended_data = {
-        document_number: evaluator.document_number,
-        phone: evaluator.phone,
-        rejected_at: evaluator.rejected_at,
-        verified_at: evaluator.verified_at
-      }
+      user_group.extended_data = user_group.extended_data.merge({
+                                                                  document_number: evaluator.document_number,
+                                                                  phone: evaluator.phone,
+                                                                  rejected_at: evaluator.rejected_at,
+                                                                  verified_at: evaluator.verified_at
+                                                                })
     end
 
     after(:create) do |user_group, evaluator|
@@ -714,8 +729,8 @@ def generate_localized_title
 
   factory :user_report, class: "Decidim::UserReport" do
     reason { "spam" }
-    moderation { build(:user_moderation) }
-    user { build(:user, organization: moderation.organization) }
+    moderation { create(:user_moderation, user: user) }
+    user { build(:user) }
   end
 
   factory :user_moderation, class: "Decidim::UserModeration" do
@@ -756,4 +771,36 @@ def generate_localized_title
     author { create(:user, :admin, :confirmed, organization: organization) }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
   end
+
+  factory :reminder, class: "Decidim::Reminder" do
+    user { build(:user) }
+    component { build(:dummy_component, organization: user.organization) }
+  end
+
+  factory :reminder_record, class: "Decidim::ReminderRecord" do
+    reminder { create(:reminder) }
+    remindable { build(:dummy_resource) }
+  end
+
+  factory :reminder_delivery, class: "Decidim::ReminderDelivery" do
+    reminder { create(:reminder) }
+  end
+
+  factory :short_link, class: "Decidim::ShortLink" do
+    target { create(:component, manifest_name: "dummy") }
+    route_name { nil }
+    params { {} }
+
+    before(:create) do |object|
+      object.organization ||= object.target if object.target.is_a?(Decidim::Organization)
+      object.organization ||= object.target.try(:organization) || create(:organization)
+      object.identifier ||= Decidim::ShortLink.unique_identifier_within(object.organization)
+      object.mounted_engine_name ||=
+        if object.target.respond_to?(:participatory_space)
+          "decidim_#{object.target.participatory_space.underscored_name}_dummy"
+        else
+          "decidim"
+        end
+    end
+  end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
index c365915fef17c..d4e6d65c70091 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb
@@ -4,8 +4,14 @@
   context "when uploading images" do
     let(:uploaded_photos) do
       [
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+        {
+          title: "Picture of the city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
+        },
+        {
+          title: "Picture of another city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
+        }
       ]
     end
     let(:photos) { [] }
@@ -33,8 +39,14 @@
   context "when managing images" do
     let(:uploaded_photos) do
       [
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+        {
+          title: "Picture of the city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
+        },
+        {
+          title: "Picture of another city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
+        }
       ]
     end
     let(:photos) { [] }
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb
index 45b854cfa7b0d..83f504779bb80 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb
@@ -21,7 +21,7 @@
 
     it "only adds errors to this field" do
       subject.valid?
-      expect(subject.errors.keys).to eq [:title]
+      expect(subject.errors.attribute_names).to eq [:title]
     end
   end
 
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb
index 8201989fdbf1d..9780034a193d8 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb
@@ -25,7 +25,7 @@
         model.update(author: author, user_group: nil)
       end
 
-      it "includes the user's ID" do
+      it "includes the user's name" do
         expect(response["author"]["name"]).to eq(author.name)
       end
     end
@@ -38,9 +38,22 @@
         model.update(user_group: user_group, author: nil)
       end
 
-      it "includes the user's ID" do
+      it "includes the user group's name" do
         expect(response["author"]["name"]).to eq(user_group.name)
       end
     end
+
+    describe "with an organization" do
+      let(:organization) { model.participatory_space.organization }
+      let(:query) { "{ author { name } }" }
+
+      before do
+        model.update(author: organization, user_group: nil)
+      end
+
+      it "does not return a main author" do
+        expect(response["author"]).to eq(nil)
+      end
+    end
   end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb
index 22868bee4033b..24b191b0874b8 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb
@@ -65,7 +65,7 @@
           expect(response["authors"]).to include("name" => coauthor.name)
         end
 
-        it "do not return a main author" do
+        it "does not return a main author" do
           expect(response["author"]).to eq(nil)
         end
       end
@@ -82,7 +82,7 @@
           expect(response["authors"]).to include("name" => coauthor.name)
         end
 
-        it "do not return a main author" do
+        it "does not return a main author" do
           expect(response["author"]).to eq(nil)
         end
       end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
index 15a1673450ea0..f04d3f61dcb4f 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb
@@ -121,6 +121,209 @@
         end
       end
 
+      it "updates the numbers of characters left correctly" do
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment."
+          expect(page).to have_content("1978 characters left")
+        end
+      end
+
+      context "when working with the screen reader character counter" do
+        let(:field_id) { "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}" }
+        let(:field) { page.find("##{field_id}") }
+
+        before do
+          # Make sure the focus stays in the comment form during these tests
+          # because only then the screen reader
+          page.execute_script("document.getElementById('#{field_id}').focus()")
+        end
+
+        it "updates the numbers of characters left correctly for screen reader" do
+          within ".add-comment form" do
+            fill_in field_id, with: "This is a new comment."
+
+            # The screen reader character counter should update only when the user
+            # reaches 10% interval of the total characters available not to
+            # announce the remaining characters after every keystroke.
+            field.native.send_keys " Sending some new text."
+            within ".remaining-character-count" do
+              expect(page).to have_content("1955 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("2000 characters left") # Screen reader
+            end
+
+            # After 10% of the total characters is reached, it should be updated
+            # to the screen reader section to announce it.
+            field.native.send_keys "a" * 155
+            within ".remaining-character-count" do
+              expect(page).to have_content("1800 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("1800 characters left") # Screen reader
+            end
+
+            # After continuing typing after the announcement, the screen reader
+            # characters should stay the same (announced on the next 10%
+            # interval).
+            field.native.send_keys "b"
+            within ".remaining-character-count" do
+              expect(page).to have_content("1799 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("1800 characters left") # Screen reader
+            end
+
+            # When text is removed at the interval, the screen reader should
+            # update back to the previous interval.
+            field.native.send_keys [:backspace, :backspace, :backspace, :backspace]
+            within ".remaining-character-count" do
+              expect(page).to have_content("1803 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("1800 characters left") # Screen reader
+            end
+
+            # After continuing typing after the removal of characters, we should
+            # stay in the "latest announcement" not to confuse the user as
+            # - "1800 characters left" (actual 1803)
+            # - Type in one character
+            # - "1900 characters left" (actual 1802)
+            field.native.send_keys "b"
+            within ".remaining-character-count" do
+              expect(page).to have_content("1802 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("1800 characters left") # Screen reader
+            end
+
+            # After the input is blurred, the screen reader character counter
+            # should show the actual amount of characters left.
+            page.execute_script("document.getElementById('#{field_id}').blur()")
+            within ".remaining-character-count" do
+              expect(page).to have_content("1802 characters left") # Normal
+            end
+            within ".remaining-character-count-sr" do
+              expect(page).to have_content("1802 characters left") # Screen reader
+            end
+          end
+        end
+
+        context "when reaching the announce after every threshold" do
+          it "updates the numbers of characters left correctly for screen reader" do
+            within ".add-comment form" do
+              # Test that when reaching the "announce after every" threshold, the
+              # characters are announced after every keystroke.
+              fill_in field_id, with: "a" * 1989
+              within ".remaining-character-count" do
+                expect(page).to have_content("11 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+
+              (2..10).reverse_each do |remaining|
+                field.native.send_keys "b"
+                within ".remaining-character-count-sr" do
+                  expect(page).to have_content("#{remaining} characters left")
+                end
+              end
+
+              field.native.send_keys "b"
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("1 character left")
+              end
+
+              field.native.send_keys "c"
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("0 characters left")
+              end
+
+              # Test that the SR counter will stick at the last announced
+              # threshold if the next threshold is not hit and text is removed.
+              # This prevents weird announcements such as:
+              # - 0 characters left
+              # - Remove 10 characters
+              # - 10 characters left
+              # - Remove 1 character
+              # - 200 characters left
+              page.execute_script("document.getElementById('#{field_id}').setSelectionRange(1850, 2000)")
+              field.native.send_keys [:backspace]
+              within ".remaining-character-count" do
+                expect(page).to have_content("150 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("0 characters left") # Screen reader
+              end
+
+              field.native.send_keys "d"
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("0 characters left")
+              end
+            end
+          end
+        end
+
+        context "when deleting text the announce after every threshold" do
+          it "updates the numbers of characters left correctly for screen reader" do
+            within ".add-comment form" do
+              fill_in field_id, with: "a" * 2000
+              within ".remaining-character-count" do
+                expect(page).to have_content("0 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("0 characters left") # Screen reader
+              end
+
+              # Test that the SR counter updates correctly after hitting the
+              # next threshold.
+              page.execute_script("document.getElementById('#{field_id}').setSelectionRange(1800, 2000)")
+              field.native.send_keys [:backspace]
+              within ".remaining-character-count" do
+                expect(page).to have_content("200 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+
+              # The SR counter should stay at the correct boundary.
+              field.native.send_keys [:backspace, :backspace]
+              within ".remaining-character-count" do
+                expect(page).to have_content("202 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+
+              # It stays at the correct boundary when starting to type again.
+              field.native.send_keys "b"
+              within ".remaining-character-count" do
+                expect(page).to have_content("201 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+
+              field.native.send_keys "c"
+              within ".remaining-character-count" do
+                expect(page).to have_content("200 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+
+              field.native.send_keys "d"
+              within ".remaining-character-count" do
+                expect(page).to have_content("199 characters left") # Normal
+              end
+              within ".remaining-character-count-sr" do
+                expect(page).to have_content("200 characters left") # Screen reader
+              end
+            end
+          end
+        end
+      end
+
       context "when component is present and has a default comments length params" do
         it "displays the numbers of characters left" do
           if component.present?
@@ -558,7 +761,7 @@
 
         it "replaces the mention with a link to the user's profile" do
           expect(page).to have_comment_from(user, "A valid user mention: @#{mentioned_user.nickname}", wait: 20)
-          expect(page).to have_link "@#{mentioned_user.nickname}", href: "http://#{mentioned_user.organization.host}/profiles/#{mentioned_user.nickname}"
+          expect(page).to have_link "@#{mentioned_user.nickname}", href: "http://#{mentioned_user.organization.host}:#{Capybara.server_port}/profiles/#{mentioned_user.nickname}"
         end
       end
 
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/editor_shared_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/editor_shared_examples.rb
new file mode 100644
index 0000000000000..e54c4490f3747
--- /dev/null
+++ b/decidim-core/lib/decidim/core/test/shared_examples/editor_shared_examples.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+shared_examples_for "has embedded video in description" do |description_attribute_name|
+  let(description_attribute_name) { { en: %(Description <iframe class="ql-video" allowfullscreen="true" src="#{iframe_src}" frameborder="0"></iframe>) } }
+  let(:iframe_src) { "http://www.example.org" }
+
+  context "when cookies are rejected" do
+    before do
+      click_link "Cookie settings"
+      click_button "Accept only essential"
+    end
+
+    it "disables iframe" do
+      expect(page).to have_content("You need to enable all cookies in order to see this content")
+      expect(page).not_to have_selector("iframe")
+    end
+  end
+
+  context "when cookies are accepted" do
+    before do
+      click_link "Cookie settings"
+      click_button "Accept all"
+    end
+
+    it "shows iframe" do
+      expect(page).not_to have_content("You need to enable all cookies in order to see this content")
+      expect(page).to have_selector("iframe", count: 1)
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/localised_email.rb b/decidim-core/lib/decidim/core/test/shared_examples/localised_email.rb
index 75b27025ad46c..30214b45e1ab9 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/localised_email.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/localised_email.rb
@@ -9,7 +9,7 @@
     let(:locale) { "ca" }
 
     it "uses the user's locale" do
-      expect(mail.subject).to eq(subject)
+      expect(mail.subject).to eq(mail_subject)
       expect(mail.body.encoded).to match(body)
     end
   end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/logo_email.rb b/decidim-core/lib/decidim/core/test/shared_examples/logo_email.rb
index 0d3c8fba1e605..84318d300ebdf 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/logo_email.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/logo_email.rb
@@ -15,7 +15,7 @@
 
     it "includes organization logo with full link" do
       expect(mail.body).to include("alt=\"#{organization.name}\"")
-      expect(mail.body).to match(%r{https{0,1}://#{organization.host}#{logo_path}})
+      expect(mail.body).to match(%r{https{0,1}://#{organization.host}:#{Capybara.server_port}#{logo_path}})
     end
   end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/map_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/map_examples.rb
index 00b9d2e7c0d45..f7ad82a3fe3b0 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/map_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/map_examples.rb
@@ -24,7 +24,7 @@ def snippets
     end
   end
   let(:organization) { create(:organization) }
-  let(:template) { template_class.new(ActionView::LookupContext.new(nil)) }
+  let(:template) { template_class.new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
   let(:options) { {} }
   let(:js_options) { options.transform_keys { |k| k.to_s.camelize(:lower) }.to_h }
 
@@ -103,6 +103,7 @@ def snippets
     final_html = html_document
     Rails.application.routes.draw do
       get "test_dynamic_map", to: ->(_) { [200, {}, [final_html]] }
+      get "offline", to: ->(_) { [200, {}, [""]] }
     end
 
     visit "/test_dynamic_map"
@@ -180,7 +181,6 @@ def snippets
   it "calls the front-end geocoder when an address is written", :slow do
     within view_options[:within_selector] do
       fill_in_geocoding view_options[:address_field], with: geocoded_address_value
-      find(".tribute-container ul#results li", match: :first).click
       find("*[type=submit]").click
     end
 
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb
index 4b2dae7992a0f..d84e18a38be7e 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb
@@ -15,9 +15,7 @@
 
       it "does not allow visiting component" do
         expect(page).to have_content "You are not authorized"
-        # rubocop:disable Capybara/CurrentPathExpectation
         expect(page.current_path).not_to match main_component_path(component)
-        # rubocop:enable Capybara/CurrentPathExpectation
       end
     end
 
@@ -34,9 +32,7 @@
       context "when a valid share_token is provided" do
         it "allows visiting component" do
           expect(page).not_to have_content "You are not authorized"
-          # rubocop:disable Capybara/CurrentPathExpectation
           expect(page.current_path).to match main_component_path(component)
-          # rubocop:enable Capybara/CurrentPathExpectation
         end
       end
 
@@ -45,9 +41,7 @@
 
         it "does not allow visiting component" do
           expect(page).to have_content "You are not authorized"
-          # rubocop:disable Capybara/CurrentPathExpectation
           expect(page.current_path).not_to match main_component_path(component)
-          # rubocop:enable Capybara/CurrentPathExpectation
         end
       end
     end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/resource_search_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/resource_search_examples.rb
index 767a870057348..586e76b0d262d 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/resource_search_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/resource_search_examples.rb
@@ -3,19 +3,18 @@
 require "spec_helper"
 
 shared_examples_for "a resource search" do |factory_name|
-  context "when no component is passed" do
-    let(:params) { default_params.merge(component: nil) }
-
-    it "raises an error" do
-      expect { subject }.to raise_error(StandardError, "Missing component")
+  describe "component_id" do
+    before do
+      get(
+        request_path,
+        headers: { "HOST" => component.organization.host }
+      )
     end
-  end
 
-  describe "component_id" do
     it "only returns resources from the given component" do
       external_resource = create(factory_name)
 
-      expect(subject).not_to include(external_resource)
+      expect(subject).not_to have_escaped_html(translated(external_resource.try(:title) || external_resource.try(:name)))
     end
   end
 end
@@ -28,7 +27,7 @@
   end
 
   describe "scope_id filter" do
-    let(:params) { default_params.merge(scope_id: scope_ids) }
+    let(:filter_params) { { with_any_scope: scope_ids } }
 
     let(:scope1) { create :scope, organization: component.organization }
     let(:scope2) { create :scope, organization: component.organization }
@@ -38,11 +37,21 @@
     let!(:resource2) { create(factory_name, { component: component, scope: scope2 }.merge(factory_params)) }
     let!(:resource3) { create(factory_name, { component: component, scope: subscope1 }.merge(factory_params)) }
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when a parent scope id is being sent" do
       let(:scope_ids) { [scope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to match_array [resource, resource3]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -50,7 +59,9 @@
       let(:scope_ids) { [subscope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to eq [resource3]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -58,7 +69,9 @@
       let(:scope_ids) { [scope2.id, scope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to match_array [resource, resource2, resource3]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -66,8 +79,19 @@
       let!(:resource_without_scope) { create(factory_name, { component: component, scope: nil }.merge(factory_params)) }
       let(:scope_ids) { ["global"] }
 
+      before do
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
       it "returns resources without a scope" do
-        expect(subject).to match_array [resource_without_scope]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource_without_scope.try(:title) || resource_without_scope.try(:name)))
       end
     end
 
@@ -75,16 +99,34 @@
       let!(:resource_without_scope) { create(factory_name, { component: component, scope: nil }.merge(factory_params)) }
       let(:scope_ids) { ["global", scope2.id, scope1.id] }
 
+      before do
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
       it "returns resources without a scope and with selected scopes" do
-        expect(subject).to match_array [resource_without_scope, resource, resource2, resource3]
+        expect(subject).to have_escaped_html(translated(resource_without_scope.try(:title) || resource_without_scope.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
   end
 end
 
-shared_examples_for "a resource search with categories" do |factory_name|
-  let(:participatory_process) { component.participatory_space }
-  let(:params) { default_params.merge(category_id: category_ids) }
+shared_examples_for "a resource search with categories" do |factory_name, category_mode = :multi|
+  let(:participatory_space) { component.participatory_space }
+  let(:filter_params) do
+    case category_mode
+    when :single
+      { with_category: category_ids }
+    else
+      { with_any_category: category_ids }
+    end
+  end
   let(:factory_params) do
     resource_params
   rescue StandardError
@@ -92,19 +134,30 @@
   end
 
   describe "results" do
-    let(:category1) { create :category, participatory_space: participatory_process }
-    let(:category2) { create :category, participatory_space: participatory_process }
-    let(:child_category) { create :category, participatory_space: participatory_process, parent: category2 }
+    let(:category1) { create :category, participatory_space: participatory_space }
+    let(:category2) { create :category, participatory_space: participatory_space }
+    let(:child_category) { create :category, participatory_space: participatory_space, parent: category2 }
     let!(:resource) { create(factory_name, { component: component }.merge(factory_params)) }
     let!(:resource2) { create(factory_name, { component: component, category: category1 }.merge(factory_params)) }
     let!(:resource3) { create(factory_name, { component: component, category: category2 }.merge(factory_params)) }
     let!(:resource4) { create(factory_name, { component: component, category: child_category }.merge(factory_params)) }
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when no category filter is present" do
       let(:category_ids) { nil }
 
       it "includes all resources" do
-        expect(subject).to match_array [resource, resource2, resource3, resource4]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -112,7 +165,10 @@
       let(:category_ids) { [category2.id] }
 
       it "includes only resources for that category and its children" do
-        expect(subject).to match_array [resource3, resource4]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -120,7 +176,10 @@
       let(:category_ids) { [child_category.id] }
 
       it "includes only resources for that category" do
-        expect(subject).to eq [resource4]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -128,15 +187,23 @@
       let(:category_ids) { ["without"] }
 
       it "returns resources without a category" do
-        expect(subject).to eq [resource]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
-    context "when `without` and some category id is being sent" do
-      let(:category_ids) { ["without", category1.id] }
+    if category_mode == :multi
+      context "when `without` and some category id is being sent" do
+        let(:category_ids) { ["without", category1.id] }
 
-      it "returns resources without a category and with the selected category" do
-        expect(subject).to match_array [resource, resource2]
+        it "returns resources without a category and with the selected category" do
+          expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+          expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
+        end
       end
     end
   end
@@ -148,32 +215,42 @@
   rescue StandardError
     {}
   end
-  let(:params) { default_params.merge(origin: origins) }
+  let(:filter_params) { { with_any_origin: origins } }
 
   describe "results" do
     let!(:official_resource) { create(factory_name, :official, { component: component }.merge(factory_params)) }
     let!(:user_group_resource) { create(factory_name, :user_group_author, { component: component }.merge(factory_params)) }
-    let!(:citizen_resource) { create(factory_name, :citizen_author, { component: component }.merge(factory_params)) }
+    let!(:participant_resource) { create(factory_name, :participant_author, { component: component }.merge(factory_params)) }
 
     if FactoryBot.factory_by_name(factory_name).defined_traits.map(&:name).include?(:meeting_resource)
       let!(:meeting_resource) { create(factory_name, :official_meeting, { component: component }.merge(factory_params)) }
     end
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when filtering official resources" do
       let(:origins) { %w(official) }
 
       it "returns only official resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(official_resource)
+        expect(subject).to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
-    context "when filtering citizen resources" do
-      let(:origins) { %w(citizens) }
+    context "when filtering participants resources" do
+      let(:origins) { %w(participants) }
 
       it "returns only citizen resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(citizen_resource)
+        expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
@@ -181,8 +258,9 @@
       let(:origins) { %w(user_group) }
 
       it "returns only user groups resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(user_group_resource)
+        expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
@@ -191,8 +269,10 @@
         let(:origins) { %w(meeting) }
 
         it "returns only meeting resources" do
-          expect(subject.size).to eq(1)
-          expect(subject).to include(meeting_resource)
+          expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
+          expect(subject).to have_escaped_html(translated(meeting_resource.try(:title) || meeting_resource.try(:name)))
         end
       end
     end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/resourceable.rb b/decidim-core/lib/decidim/core/test/shared_examples/resourceable.rb
index 15cecf119b41a..a5132e340b350 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/resourceable.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/resourceable.rb
@@ -8,10 +8,4 @@
       expect(subject.resource_title).to be_present
     end
   end
-
-  describe "resource_description" do
-    it "is defined" do
-      expect(subject.resource_title).to be_present
-    end
-  end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb
index 2bce86d2b8751..f5afc57e203f6 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb
@@ -83,7 +83,7 @@
   describe "Search" do
     # trick to force creating participatory_space2 declared in users of this shared_examples
     let!(:spaces) { [participatory_space, participatory_space2] }
-    let(:description_2) do
+    let(:description2) do
       msg = "Chewie, I'll be waiting for your signal. Take care, you two. May the Force be with you. Ow!"
       { ca: "CA:#{msg}", en: "EN:#{msg}", es: "ES:#{msg}" }
     end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb b/decidim-core/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb
index 03fb8d0af933c..195504384ba8d 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb
@@ -6,7 +6,7 @@
   let!(:scope1) { create :scope, organization: organization }
 
   let(:test_locales) { [:ca, :en, :es] }
-  let(:description_1) do
+  let(:description1) do
     Decidim::Faker::Localized.prefixed("Poemes als terrats de l'Empordà, Ow!", test_locales)
   end
 end
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb
index d7fb92a5d7d46..3b2425fb5d673 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb
@@ -6,11 +6,11 @@
   include_context "with a component"
 
   # Should be overriden and create one main resource
-  let!(:resource) {}
+  let!(:resource) { nil }
   # the name of the resource to be clicked from the component view
-  let(:resource_name) {}
+  let(:resource_name) { nil }
   # Should be overriden and create 3 extra resources in the current component
-  let!(:resources) {}
+  let!(:resources) { nil }
 end
 
 shared_examples "Endorse resource system specs" do
diff --git a/decidim-core/lib/decidim/core/test/shared_examples/translated_event_examples.rb b/decidim-core/lib/decidim/core/test/shared_examples/translated_event_examples.rb
index 16293182531b7..47a9a6b6a7b0f 100644
--- a/decidim-core/lib/decidim/core/test/shared_examples/translated_event_examples.rb
+++ b/decidim-core/lib/decidim/core/test/shared_examples/translated_event_examples.rb
@@ -56,7 +56,7 @@
       end
 
       context "when translation is not available" do
-        let(:body) { { "en": en_body } }
+        let(:body) { { en: en_body } }
 
         it "does perform translation" do
           expect(subject.perform_translation?).to eq(translatable)
@@ -104,7 +104,7 @@
       end
 
       context "when translation is not available" do
-        let(:body) { { "en": en_body } }
+        let(:body) { { en: en_body } }
 
         it "does perform translation" do
           expect(subject.perform_translation?).to eq(translatable)
diff --git a/decidim-core/lib/decidim/core/version.rb b/decidim-core/lib/decidim/core/version.rb
index 8aae5a2b5a243..e0e7a0ed3e510 100644
--- a/decidim-core/lib/decidim/core/version.rb
+++ b/decidim-core/lib/decidim/core/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-core/lib/decidim/data_portability_serializers.rb b/decidim-core/lib/decidim/data_portability_serializers.rb
deleted file mode 100644
index b1a9c2c5b1aee..0000000000000
--- a/decidim-core/lib/decidim/data_portability_serializers.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DataPortabilitySerializers
-    autoload :DataPortabilityUserSerializer, "decidim/data_portability_serializers/data_portability_user_serializer"
-    autoload :DataPortabilityUserGroupSerializer, "decidim/data_portability_serializers/data_portability_user_group_serializer"
-    autoload :DataPortabilityConversationSerializer, "decidim/data_portability_serializers/data_portability_conversation_serializer"
-    autoload :DataPortabilityReportSerializer, "decidim/data_portability_serializers/data_portability_report_serializer"
-    autoload :DataPortabilityFollowSerializer, "decidim/data_portability_serializers/data_portability_follow_serializer"
-    autoload :DataPortabilityNotificationSerializer, "decidim/data_portability_serializers/data_portability_notification_serializer"
-    autoload :DataPortabilityIdentitySerializer, "decidim/data_portability_serializers/data_portability_identity_serializer"
-    autoload :DataPortabilityParticipatorySpacePrivateUserSerializer, "decidim/data_portability_serializers/data_portability_participatory_space_private_user_serializer"
-
-    def self.data_entities
-      ["Decidim::Follow", "Decidim::Identity",
-       "Decidim::Messaging::Conversation", "Decidim::Notification",
-       "Decidim::ParticipatorySpacePrivateUser", "Decidim::Report", "Decidim::User", "Decidim::UserGroup"] |
-        Decidim.component_manifests.map(&:data_portable_entities).flatten |
-        Decidim.participatory_space_manifests.map(&:data_portable_entities).flatten |
-        (Decidim::Comments.data_portable_entities.flatten if defined?(Decidim::Comments))
-    end
-  end
-end
diff --git a/decidim-core/lib/decidim/dependency_resolver.rb b/decidim-core/lib/decidim/dependency_resolver.rb
new file mode 100644
index 0000000000000..f9c8f3c4d2cb4
--- /dev/null
+++ b/decidim-core/lib/decidim/dependency_resolver.rb
@@ -0,0 +1,278 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The dependency resolver provides information about the Decidim module
+  # dependencies. For instance, it can be used to check if a particular Decidim
+  # module is needed by the instance or not.
+  #
+  # This is a singleton utility in order to make it perform better when it is
+  # called from different places throughout the application.
+  #
+  # @example Checking whether a module is needed by the instance
+  #   Decidim::DependencyResolver.instance.needed?("decidim-proposals")
+  class DependencyResolver
+    include Singleton
+
+    def initialize
+      @cache = []
+    end
+
+    # Finds a gem specification for the gem with the name provided as the
+    # argument.
+    #
+    # When bundler is available, searches whether the gem is listed in the
+    # Gemfile or required as a dependency for one of the gems in the Gemfile or
+    # their dependencies.
+    #
+    # When bundler is not available, gets the gem specification from the loaded
+    # specs which means any gems available in the gem install folder.
+    #
+    # @param gem [String] The name for the gem to be looked up.
+    # @return [Gem::Specification, nil] Returns the gem specification for the
+    #   given gem name. The specification implements the necessary methods for
+    #   the other checks. In both cases returns nil if the gem is not found.
+    def lookup(gem)
+      # In case the lookup method is called with a spec definition, return the
+      # definition itself.
+      return gem unless gem.is_a?(String)
+
+      if bundler?
+        lookup = Lookup.new
+        return lookup.spec(gem) if cache.include?(gem)
+
+        # Keep a local cache of the already processed gems in order to avoid
+        # double lookups.
+        lookup.find(Bundler.definition.dependencies, gem) do |dependency|
+          if potential_module?(dependency.name)
+            cache_miss = cache.exclude?(dependency.name)
+            cache << dependency.name if cache_miss
+            cache_miss
+          else
+            false
+          end
+        end
+      else
+        return unless potential_module?(gem)
+
+        Gem.loaded_specs[gem]
+      end
+    end
+
+    # Resolves the main load file path for module defined by the gem
+    # specification.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [String] A string pointing the path to the module's main load
+    #   file.
+    def module_path(spec)
+      spec = lookup(spec)
+      return unless spec
+
+      "#{spec.full_gem_path}/lib/#{spec.name.gsub("-", "/")}.rb"
+    end
+
+    # Resolves whether the module for the gem specification defines the main
+    # load file.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   available for loading.
+    def available?(spec)
+      path = module_path(spec)
+      return false unless path
+
+      File.exist?(path)
+    end
+
+    # Checks if the module for the gem speficiation has been loaded through
+    # `require "decidim/foo"`.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   loaded.
+    def loaded?(spec)
+      return false unless available?(spec)
+
+      $LOADED_FEATURES.include?(module_path(spec))
+    end
+
+    # Resolves whether the target gem is needed or not, i.e. does it need to be
+    # loaded.
+    #
+    # When bundler is available, the dependencies are resolved based on the
+    # modules defined in the Gemfile which means that the gem is always needed
+    # when it is reported as available by the resolver (i.e. defined as a
+    # dependency in the Gemfile itself or one of those gems depend on it).
+    #
+    # When bundler is not available, this will check whether the Decidim module
+    # provided by the gem has been already required/loaded or not. In this
+    # situation, it is impossible to know whether the implementer has intended
+    # the gem to be used or not, so we assume in these situations implementers
+    # will load all the gems they want before running any initializers. This
+    # means that the `require "decidim/foo"` statements have to be listed for
+    # all modules before the initialization process.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   needed.
+    def needed?(spec)
+      spec = lookup(spec)
+      return false unless spec
+
+      if bundler?
+        available?(spec)
+      else
+        loaded?(spec)
+      end
+    end
+
+    private
+
+    attr_accessor :cache
+
+    # Reports whether bundler is available.
+    #
+    # @return [Boolean] A boolean indicating if bundler is available or not.
+    def bundler?
+      defined?(Bundler)
+    end
+
+    # Only match the decidim gems. Skip the decidim-dev gem because it has
+    # "decidim" as a runtime dependency which would cause all the default
+    # gems to be always reported as available.
+    #
+    # @return [Boolean] A boolean indicating if the given gem name is a
+    #   potential Decidim module to be processed.
+    def potential_module?(name)
+      name != "decidim-dev" && name =~ /decidim(-.*)?/
+    end
+
+    # The lookup class takes care of the individual recursive lookups over a
+    # dependency tree.
+    class Lookup
+      # @param debug [Boolean] A boolean indicating if the debug mode is enabled
+      #   or not. False by default.
+      def initialize(debug: false)
+        @current_level = 0
+        return unless debug
+
+        formatter = proc do |_severity, _datetime, _progname, msg|
+          "#{msg}\n"
+        end
+        @logger = Logger.new($stdout, formatter: formatter)
+        logger.debug!
+      end
+
+      # Iterates recursively through the runtime dependencies array and their
+      # sub-dependencies to find whether the provided gem is included. This
+      # always iterates through the whole dependency tree even when the gem is
+      # already found in order not to process the same dependencies multiple
+      # times and to make the cache work correctly when calling this.
+      #
+      # @param dependencies [Array] An array of the dependencies to iterate
+      #   through.
+      # @param gem [String] The name of the gem to find.
+      # @yield [dependency] Yields each dependency to be processed to the
+      #   provided block to check if that dependency needs to be processed or
+      #   not.
+      # @yieldparam [Gem::Dependency] The runtime dependency being processed.
+      # @yieldreturn [Boolean] A boolean indicating whether this dependency
+      #   needs to be processed or not. True indicates it needs to be processed
+      #   and false indicates processing is not needed.
+      # @return [Bundler::LazySpecification, nil] The specification for the gem
+      #   or nil when it is not found.
+      def find(dependencies, gem, &block)
+        found = nil
+        dependencies.each do |dependency|
+          next unless process?(dependency, &block)
+
+          spec = spec(dependency.name)
+          next unless spec # E.g. the "bundler" gem is not in the locked gems
+
+          log(dependency)
+
+          found ||= spec if spec.name == gem
+
+          @current_level += 1
+          # Do not se the found value directly here because otherwise the
+          # recursive call would not be made if the target gem is already found.
+          sub_spec = find(spec.dependencies, gem, &block)
+          @current_level -= 1
+          found ||= sub_spec
+        end
+
+        found
+      end
+
+      # Finds a gem specification from the locked gems of the instance.
+      #
+      # Note that this does not resolve if the module is needed or not. This may
+      # also return the gem specification even when it is not listed in the
+      # Gemfile, e.g. when the Decidim gems are installed through git.
+      #
+      # @param name [String] The name of the gem to find.
+      # @return [Gem::Specification, nil] The specification for the gem
+      #   or nil if the gem is not listed in the locked gems or nil when the
+      #   returned spec is not installed in the current gem environment.
+      def spec(name)
+        sp = Bundler.definition.locked_gems.specs.find { |s| s.name == name }
+
+        # Fetching the gem through Gem.loaded_specs ensures we are not returning
+        # a lazy specification which does not respond to `#full_gem_path` which
+        # is needed for the resolver.
+        return Gem.loaded_specs[sp.name] if sp
+
+        nil
+      end
+
+      private
+
+      attr_reader :logger, :current_level
+
+      # Decides whether a dependency needs to be processed, i.e. compared
+      # whether it is the gem to be found.
+      #
+      # @param dependency [Gem::Dependency] The dependency being processed.
+      # @yield [dependency] Yields each dependency to be processed to the
+      #   provided block to check if that dependency needs to be processed or
+      #   not.
+      # @yieldparam [Gem::Dependency] The runtime dependency being processed.
+      # @yieldreturn [Boolean] A boolean indicating whether this dependency
+      #   needs to be processed or not. True indicates it needs to be processed
+      #   and false indicates processing is not needed.
+      # @return [Boolean] A boolean indicating whether the dependency needs to
+      #   be processed, i.e. compared whether it is the gem to be found.
+      def process?(dependency)
+        return false unless dependency.type == :runtime
+        return true unless block_given?
+
+        yield(dependency)
+      end
+
+      # Writes a log message for the given dependency at the current level of
+      # processing. When debugging is enabled, will produce the following kind
+      # of log output indicating the lookup tree.
+      #
+      # @example
+      #   decidim-admin
+      #   --decidim-core
+      #   ----decidim-api
+      #   decidim-assemblies
+      #   decidim-blogs
+      #   --decidim-comments
+      #
+      # @param dependency [Gem::Dependency] The dependency to be logged at the
+      #   current level of processing.
+      # @return [Boolean] A boolean indicating whether logging happened or not.
+      def log(dependency)
+        return false unless logger
+
+        logger.debug("#{"--" * current_level}#{dependency.name}")
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/data_portability.rb b/decidim-core/lib/decidim/download_your_data.rb
similarity index 83%
rename from decidim-core/lib/decidim/data_portability.rb
rename to decidim-core/lib/decidim/download_your_data.rb
index 7355873fdb64f..382ec7138a1d5 100644
--- a/decidim-core/lib/decidim/data_portability.rb
+++ b/decidim-core/lib/decidim/download_your_data.rb
@@ -3,8 +3,8 @@
 require "active_support/concern"
 
 module Decidim
-  # This concern contains the logic related to data portability.
-  module DataPortability
+  # This concern contains the logic related to download your data.
+  module DownloadYourData
     extend ActiveSupport::Concern
 
     included do
@@ -23,7 +23,7 @@ def self.export_serializer
 
       # Returns a collection of images scoped by User.
       # Returns nil for default.
-      def self.data_portability_images(_user)
+      def self.download_your_data_images(_user)
         nil
       end
     end
diff --git a/decidim-core/lib/decidim/download_your_data_serializers.rb b/decidim-core/lib/decidim/download_your_data_serializers.rb
new file mode 100644
index 0000000000000..f12a5cb91ba7a
--- /dev/null
+++ b/decidim-core/lib/decidim/download_your_data_serializers.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DownloadYourDataSerializers
+    autoload :DownloadYourDataUserSerializer, "decidim/download_your_data_serializers/download_your_data_user_serializer"
+    autoload :DownloadYourDataUserGroupSerializer, "decidim/download_your_data_serializers/download_your_data_user_group_serializer"
+    autoload :DownloadYourDataConversationSerializer, "decidim/download_your_data_serializers/download_your_data_conversation_serializer"
+    autoload :DownloadYourDataReportSerializer, "decidim/download_your_data_serializers/download_your_data_report_serializer"
+    autoload :DownloadYourDataFollowSerializer, "decidim/download_your_data_serializers/download_your_data_follow_serializer"
+    autoload :DownloadYourDataNotificationSerializer, "decidim/download_your_data_serializers/download_your_data_notification_serializer"
+    autoload :DownloadYourDataIdentitySerializer, "decidim/download_your_data_serializers/download_your_data_identity_serializer"
+    autoload :DownloadYourDataParticipatorySpacePrivateUserSerializer, "decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer"
+
+    def self.data_entities
+      ["Decidim::Follow", "Decidim::Identity",
+       "Decidim::Messaging::Conversation", "Decidim::Notification",
+       "Decidim::ParticipatorySpacePrivateUser", "Decidim::Report", "Decidim::User", "Decidim::UserGroup"] |
+        Decidim.component_manifests.map(&:data_portable_entities).flatten |
+        Decidim.participatory_space_manifests.map(&:data_portable_entities).flatten |
+        (Decidim::Comments.data_portable_entities.flatten if defined?(Decidim::Comments))
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_conversation_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_conversation_serializer.rb
similarity index 89%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_conversation_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_conversation_serializer.rb
index 7fcb6d27d9d9b..171cd01210c25 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_conversation_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_conversation_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a Message so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityConversationSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataConversationSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Initializes the serializer with a conversation.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_follow_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_follow_serializer.rb
similarity index 82%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_follow_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_follow_serializer.rb
index f2da248682acc..26288da91231e 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_follow_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_follow_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a Follow so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityFollowSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataFollowSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for follow.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_identity_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_identity_serializer.rb
similarity index 83%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_identity_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_identity_serializer.rb
index 54645f1d10173..24557033b5fd7 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_identity_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_identity_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a Identity so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityIdentitySerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataIdentitySerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this identities.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_notification_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_notification_serializer.rb
similarity index 84%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_notification_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_notification_serializer.rb
index 9b53074ef5713..088e8d9c07aa8 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_notification_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_notification_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a Follow so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityNotificationSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataNotificationSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for follow.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb
similarity index 82%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb
index 7285bc8a2e473..997d3879912fa 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a User so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityParticipatorySpacePrivateUserSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataParticipatorySpacePrivateUserSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this user.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_report_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_report_serializer.rb
similarity index 91%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_report_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_report_serializer.rb
index 2be88337489fb..428395a212be3 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_report_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_report_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a Report so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityReportSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataReportSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this conversation.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_user_group_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_group_serializer.rb
similarity index 80%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_user_group_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_group_serializer.rb
index afc96837f0305..a17c76b2f0881 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_user_group_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_group_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a User so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityUserGroupSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataUserGroupSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this user.
diff --git a/decidim-core/lib/decidim/data_portability_serializers/data_portability_user_serializer.rb b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb
similarity index 91%
rename from decidim-core/lib/decidim/data_portability_serializers/data_portability_user_serializer.rb
rename to decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb
index 91c5f258861f4..ec8048065db63 100644
--- a/decidim-core/lib/decidim/data_portability_serializers/data_portability_user_serializer.rb
+++ b/decidim-core/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   # This class serializes a User so can be exported to CSV
-  module DataPortabilitySerializers
-    class DataPortabilityUserSerializer < Decidim::Exporters::Serializer
+  module DownloadYourDataSerializers
+    class DownloadYourDataUserSerializer < Decidim::Exporters::Serializer
       include Decidim::ResourceHelper
 
       # Public: Exports a hash with the serialized data for this user.
@@ -19,7 +19,7 @@ def serialize
             name: resource.organization.try(:name)
           },
           newsletter_notifications_at: resource.newsletter_notifications_at,
-          email_on_notification: resource.email_on_notification,
+          notifications_sending_frequency: resource.notifications_sending_frequency,
           admin: resource.admin,
           personal_url: resource.personal_url,
           about: resource.about,
diff --git a/decidim-core/lib/decidim/engine_router.rb b/decidim-core/lib/decidim/engine_router.rb
index d9b61aeb3fb24..69e2aa1e82a25 100644
--- a/decidim-core/lib/decidim/engine_router.rb
+++ b/decidim-core/lib/decidim/engine_router.rb
@@ -34,7 +34,7 @@ def initialize(engine, default_url_options)
     end
 
     def default_url_options
-      @default_url_options.reverse_merge(ActionMailer::Base.default_url_options)
+      @default_url_options.reverse_merge(configured_default_url_options)
     end
 
     def respond_to_missing?(method_name, include_private = false)
@@ -52,5 +52,11 @@ def method_missing(method_name, *args)
     def route_helper?(method_name)
       method_name.to_s.match?(/_(url|path)$/)
     end
+
+    def configured_default_url_options
+      @configured_default_url_options ||=
+        ActionMailer::Base.default_url_options.presence ||
+        UrlOptionResolver.new.options
+    end
   end
 end
diff --git a/decidim-core/lib/decidim/env.rb b/decidim-core/lib/decidim/env.rb
new file mode 100644
index 0000000000000..fab874fbab631
--- /dev/null
+++ b/decidim-core/lib/decidim/env.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class can be used to parse ENV variables to a set of predefined values
+  # For instance, "", nil, "false" or 0 will all translate into false using valid?
+  class Env
+    FALSE_VALUES = %w(0 false no).freeze
+
+    def initialize(name, default = nil)
+      @name = name
+      @value = ENV.fetch(name, nil)
+      @default = default
+    end
+
+    def value
+      @value.presence || @default
+    end
+
+    delegate :to_s, :to_json, to: :value
+
+    def blank?
+      value.blank? || FALSE_VALUES.include?(value.to_s.downcase)
+    end
+
+    # rubocop:disable Rails/Present
+    def present?
+      !blank?
+    end
+    # rubocop:enable Rails/Present
+
+    def to_boolean_string
+      present?.to_s
+    end
+
+    def to_i
+      str = blank? ? @default : value
+      str.to_s.to_i
+    end
+
+    def to_f
+      str = blank? ? @default : value
+      str.to_s.to_f
+    end
+
+    def default_or_present_if_exists
+      return @default unless ENV.has_key?(@name)
+
+      @value.present? && FALSE_VALUES.exclude?(@value.to_s.downcase)
+    end
+
+    def to_array(separator: ",")
+      str = blank? ? @default : value
+      str.to_s.split(separator).map(&:strip)
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/event_recorder.rb b/decidim-core/lib/decidim/event_recorder.rb
new file mode 100644
index 0000000000000..18ac72779faa0
--- /dev/null
+++ b/decidim-core/lib/decidim/event_recorder.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/command.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  class EventRecorder
+    attr_reader :events
+
+    def initialize
+      @events = {}
+    end
+
+    def method_missing(method_name, *args, &_block)
+      args = args.first if args.size == 1
+      @events[method_name] = args
+    end
+
+    def respond_to_missing?(_method_name, _include_private = false)
+      true
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/events/base_event.rb b/decidim-core/lib/decidim/events/base_event.rb
index b4342c44ed4e8..aae1a9a83f7a4 100644
--- a/decidim-core/lib/decidim/events/base_event.rb
+++ b/decidim-core/lib/decidim/events/base_event.rb
@@ -59,24 +59,20 @@ def resource_locator
 
       # Caches the path for the given resource.
       def resource_path
-        @resource_path ||= begin
-          if resource&.respond_to?(:polymorphic_resource_path)
-            resource.polymorphic_resource_path(resource_url_params)
-          else
-            resource_locator.path(resource_url_params)
-          end
-        end
+        @resource_path ||= if resource.respond_to?(:polymorphic_resource_path)
+                             resource.polymorphic_resource_path(resource_url_params)
+                           else
+                             resource_locator.path(resource_url_params)
+                           end
       end
 
       # Caches the URL for the given resource.
       def resource_url
-        @resource_url ||= begin
-          if resource&.respond_to?(:polymorphic_resource_url)
-            resource.polymorphic_resource_url(resource_url_params)
-          else
-            resource_locator.url(resource_url_params)
-          end
-        end
+        @resource_url ||= if resource.respond_to?(:polymorphic_resource_url)
+                            resource.polymorphic_resource_url(resource_url_params)
+                          else
+                            resource_locator.url(resource_url_params)
+                          end
       end
 
       def resource_text; end
diff --git a/decidim-core/lib/decidim/events/simple_event.rb b/decidim-core/lib/decidim/events/simple_event.rb
index 7c3b82c6ce1e5..0974ab393e103 100644
--- a/decidim-core/lib/decidim/events/simple_event.rb
+++ b/decidim-core/lib/decidim/events/simple_event.rb
@@ -13,6 +13,8 @@ class SimpleEvent < BaseEvent
       include Decidim::ComponentPathHelper
       include Decidim::SanitizeHelper
 
+      delegate :created_at, to: :resource
+
       class_attribute :i18n_interpolations
       self.i18n_interpolations = []
 
@@ -32,7 +34,7 @@ def self.i18n_attributes(*attributes)
       end
 
       def email_subject
-        I18n.t("email_subject", email_subject_i18n_options).html_safe
+        I18n.t("email_subject", **email_subject_i18n_options).html_safe
       end
 
       def email_subject_i18n_options
@@ -43,15 +45,15 @@ def email_subject_i18n_options
       end
 
       def email_intro
-        I18n.t("email_intro", i18n_options).html_safe
+        I18n.t("email_intro", **i18n_options).html_safe
       end
 
       def email_outro
-        I18n.t("email_outro", i18n_options).html_safe
+        I18n.t("email_outro", **i18n_options).html_safe
       end
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       # Public: The String to use as scope to search for the keys
diff --git a/decidim-core/lib/decidim/exporters/export_data.rb b/decidim-core/lib/decidim/exporters/export_data.rb
index 767644f96c02b..8212a1e32ad9e 100644
--- a/decidim-core/lib/decidim/exporters/export_data.rb
+++ b/decidim-core/lib/decidim/exporters/export_data.rb
@@ -27,7 +27,7 @@ def read
       #
       # Returns a String with the filename of the export.
       def filename(prefix = "export", options = {})
-        options[:extension] = !options[:extension].nil? ? options[:extension] : true
+        options[:extension] = options[:extension].nil? ? true : options[:extension]
         result = "#{prefix}-#{I18n.l(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
         result += ".#{extension}" if options[:extension]
         result
diff --git a/decidim-core/lib/decidim/exporters/export_manifest.rb b/decidim-core/lib/decidim/exporters/export_manifest.rb
index 82d44be16a174..7b77b295d7ed3 100644
--- a/decidim-core/lib/decidim/exporters/export_manifest.rb
+++ b/decidim-core/lib/decidim/exporters/export_manifest.rb
@@ -10,7 +10,7 @@ module Exporters
     #
     class ExportManifest
       include ActiveModel::Model
-      include Virtus.model
+      include Decidim::AttributeObject::Model
 
       # A setting to choose if the collection exported by this manifest should
       # be included in the open data export available for all users.
@@ -26,6 +26,7 @@ class ExportManifest
       # manifest - The parent manifest where this export manifest belongs to.
       #
       def initialize(name, manifest)
+        super()
         @name = name.to_sym
         @manifest = manifest
       end
diff --git a/decidim-core/lib/decidim/file_validator_humanizer.rb b/decidim-core/lib/decidim/file_validator_humanizer.rb
index b1a02787cd531..e74277f14892a 100644
--- a/decidim-core/lib/decidim/file_validator_humanizer.rb
+++ b/decidim-core/lib/decidim/file_validator_humanizer.rb
@@ -12,6 +12,8 @@ module Decidim
   # another object in case the PassthruValidator is in charge of the
   # validations.
   class FileValidatorHumanizer
+    # record - Form object (e.g. Decidim::AccountForm)
+    # attribute - Form field (e.g. :avatar)
     def initialize(record, attribute)
       @record = record
       @attribute = attribute
@@ -21,7 +23,7 @@ def initialize(record, attribute)
     end
 
     def uploader
-      @uploader ||= passthru_uploader || record.attached_uploader(attribute) || record.send(attribute)
+      @uploader ||= fetch_uploader
     end
 
     def messages
@@ -36,10 +38,18 @@ def messages
         )
       end
 
+      if (file_dimensions = max_file_dimensions)
+        messages << I18n.t(
+          "max_file_dimension",
+          resolution: file_dimensions,
+          scope: "decidim.forms.file_validation"
+        )
+      end
+
       if (extensions = extension_allowlist)
         messages << I18n.t(
           "allowed_file_extensions",
-          extensions: extensions.join(" "),
+          extensions: extensions.sort.join(" "),
           scope: "decidim.forms.file_validation"
         )
       end
@@ -73,6 +83,12 @@ def max_file_size
     end
     # rubocop: enable Metrics/CyclomaticComplexity
 
+    def max_file_dimensions
+      return unless uploader.respond_to?(:max_image_height_or_width)
+
+      "#{uploader.max_image_height_or_width}x#{uploader.max_image_height_or_width}"
+    end
+
     def extension_allowlist
       return unless uploader.respond_to?(:extension_allowlist, true)
 
@@ -85,6 +101,13 @@ def extension_allowlist
 
     attr_reader :record, :attribute, :passthru_validator
 
+    def fetch_uploader
+      return passthru_uploader if passthru_uploader.present?
+      return record.attached_uploader(attribute) if record.respond_to?(:attached_uploader) && record.attached_uploader(attribute).present?
+
+      record.send(attribute)
+    end
+
     def passthru_record
       return unless passthru_validator
 
diff --git a/decidim-core/lib/decidim/filterable_resource.rb b/decidim-core/lib/decidim/filterable_resource.rb
new file mode 100644
index 0000000000000..ed526b9001133
--- /dev/null
+++ b/decidim-core/lib/decidim/filterable_resource.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A concern that adds extra search helpers for the models for Ransack
+  # searches.
+  module FilterableResource
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def ransacker_i18n(field_name, attr_name = nil)
+        ransacker field_name do |parent|
+          Arel::Nodes::InfixOperation.new("->>", parent.table[attr_name || field_name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+        end
+      end
+
+      def ransacker_i18n_multi(field_name, attrs)
+        raise "The second argument needs to be an array" unless attrs.is_a?(Array)
+        raise "You need to define at least one field in the second argument" if attrs.count < 1
+        return ransacker_i18n(field_name, attrs.first) if attrs.count < 2
+
+        # Create an i18n ransacker search for each of the provided attributes.
+        attrs.each { |attr_name| ransacker_i18n(attr_name) }
+
+        # Create the field name search alias for the attributes
+        ransacker_text_multi(field_name, attrs)
+      end
+
+      def ransacker_text_multi(field_name, attrs)
+        raise "The second argument needs to be an array" unless attrs.is_a?(Array)
+        raise "You need to define at least two fields in the second argument" if attrs.count < 1
+
+        # Alias the field_name as an OR query with all the provided fields.
+        ransack_alias field_name, attrs.join("_or_").to_sym
+      end
+
+      def scope_search_multi(scope_key, possible_scopes)
+        scope scope_key, lambda { |*value_keys|
+          search_values = value_keys.compact.compact_blank
+
+          conditions = possible_scopes.map do |scope|
+            search_values.member?(scope.to_s) ? try(scope) : nil
+          end.compact
+          return self unless conditions.any?
+
+          scoped_query = where(id: conditions.shift)
+          conditions.each do |condition|
+            scoped_query = scoped_query.or(where(id: condition))
+          end
+
+          scoped_query
+        }
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/fingerprint_calculator.rb b/decidim-core/lib/decidim/fingerprint_calculator.rb
index e993f490410a9..afaaecf36af5a 100644
--- a/decidim-core/lib/decidim/fingerprint_calculator.rb
+++ b/decidim-core/lib/decidim/fingerprint_calculator.rb
@@ -33,10 +33,8 @@ def source
     def sort_hash(hash)
       return hash unless hash.is_a?(Hash)
 
-      Hash[
-        hash.map { |key, value| [key, sort_hash(value)] }
-            .sort_by { |key, _value| key }
-      ]
+      hash.map { |key, value| [key, sort_hash(value)] }
+          .sort_by { |key, _value| key }.to_h
     end
   end
 end
diff --git a/decidim-core/lib/decidim/form_builder.rb b/decidim-core/lib/decidim/form_builder.rb
index 78786548e6335..2aed26a68287d 100644
--- a/decidim-core/lib/decidim/form_builder.rb
+++ b/decidim-core/lib/decidim/form_builder.rb
@@ -67,7 +67,7 @@ def translated(type, name, options = {})
       tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
 
       label_tabs = content_tag(:div, class: "label--tabs") do
-        field_label = label_i18n(name, options[:label] || label_for(name))
+        field_label = label_i18n(name, options[:label] || label_for(name), required: options[:required])
 
         language_selector = "".html_safe
         language_selector = create_language_selector(locales, tabs_id, name) if options[:label] != false
@@ -94,6 +94,13 @@ def translated(type, name, options = {})
       safe_join [label_tabs, tabs_content]
     end
 
+    def password_field(attribute, options = {})
+      field attribute, options do |opts|
+        opts[:autocomplete] ||= :off
+        method(__method__).super_method.super_method.call(attribute, opts)
+      end
+    end
+
     def translated_one_locale(type, name, locale, options = {})
       return hashtaggable_text_field(type, name, locale, options) if options.delete(:hashtaggable)
 
@@ -135,7 +142,7 @@ def social_field(type, name, handlers, options = {})
       tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
 
       label_tabs = content_tag(:div, class: "label--tabs") do
-        field_label = label_i18n(name, options[:label] || label_for(name))
+        field_label = label_i18n(name, options[:label] || label_for(name), required: options[:required])
 
         tabs_panels = "".html_safe
         if options[:label] != false
@@ -400,97 +407,117 @@ def datetime_field(attribute, options = {})
       template.html_safe
     end
 
+    # Public: Generates a file upload field for Decidim::Attachment type of attachment.
+    # It is similar to upload method, but it changes some options so that attachment can
+    # have title and different upload validations.
+    #
+    # attribute    - The String name of the attribute to build the field.
+    # options      - A Hash with options to build the field. See upload method for
+    # more detailed information.
+    def attachment(attribute, options = {})
+      object_attachment = object.attachment.present?
+      record = object_attachment ? object.attachment : object
+      options = {
+        titled: true,
+        resource_class: "Decidim::Attachment",
+        show_current: false,
+        max_file_size: max_file_size(record, :file),
+        label: I18n.t("decidim.forms.upload.labels.add_attachment"),
+        button_edit_label: I18n.t("decidim.forms.upload.labels.edit_image"),
+        extension_allowlist: Decidim.organization_settings(record).upload_allowed_file_extensions
+      }.merge(options)
+
+      # Upload help uses extension allowlist from the options so we need to call this AFTER setting the defaults.
+      options[:help] = upload_help(record, attribute, options) if options[:help].blank?
+
+      upload(attribute, options)
+    end
+
     # Public: Generates a file upload field and sets the form as multipart.
     # If the file is an image it displays the default image if present or the current one.
-    # By default it also generates a checkbox to delete the file. This checkbox can
-    # be hidden if `options[:optional]` is passed as `false`.
+    # By default it also generates a button to replace the file.
     #
-    # attribute    - The String name of the attribute to buidl the field.
+    # attribute    - The String name of the attribute to build the field.
     # options      - A Hash with options to build the field.
+    #              * max_file_size: Maximum size for the file (If you really want to change max
+    #                 file size you should probably change it in validator).
+    #              * resouce_name: Name of the resource (e.g. user)
+    #              * resource_class: Attribute's resource class (e.g. Decidim::User)
+    #              * resouce_class: Class of the resource (e.g. user)
     #              * optional: Whether the file can be optional or not.
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
+    #              * titled: Whether the file can have title or not.
+    #              * show_current: Whether the current file is displayed next to the button.
+    #              * help: Array of help messages which are displayed inside of the upload modal.
+    #              * dimensions_info: Hash about resize dimensions (e.g. {:medium=>{:processor=>:resize_to_fit, :dimensions=>[600, 160]}})
+    #                 produces 'Resized to fit 600 x 160 px.'
+    #              * extension_allowlist: Array of allowed file extensions (e.g. %w(jpeg jpg png))
+    #              * label: Label for the attribute
+    #              * button_label: Label for the button
+    #              * button_edit_label: Button label when file is already selected.
     def upload(attribute, options = {})
       self.multipart = true
-      options[:optional] = options[:optional].nil? ? true : options[:optional]
-      label_text = options[:label] || label_for(attribute)
-      alt_text = label_text
+      max_file_size = options[:max_file_size] || max_file_size(object, attribute)
+      button_label = options[:button_label] || choose_button_label(attribute)
+      help_messages = options[:help] || upload_help(object, attribute, options)
 
-      file = object.send attribute
-      template = ""
-      template += label(attribute, label_text + required_for_attribute(attribute))
-      template += upload_help(attribute, options)
-      template += @template.file_field @object_name, attribute
+      options = {
+        attribute: attribute,
+        resource_name: @object_name,
+        resource_class: options[:resource_class]&.to_s || resource_class(attribute),
+        optional: true,
+        titled: false,
+        show_current: true,
+        max_file_size: max_file_size,
+        help: help_messages,
+        label: label_for(attribute),
+        button_label: button_label,
+        button_edit_label: I18n.t("decidim.forms.upload.labels.replace")
+      }.merge(options)
 
-      template += extension_allowlist_help(options[:extension_allowlist]) if options[:extension_allowlist].present?
-      template += image_dimensions_help(options[:dimensions_info]) if options[:dimensions_info].present?
+      ::Decidim::ViewModel.cell(
+        "decidim/upload_modal",
+        self,
+        options
+      ).call
+    end
 
-      default_image_path = uploader_default_image_path(attribute)
-      file_path = file_attachment_path(file)
+    def max_file_size(record, attribute)
+      Decidim::FileValidatorHumanizer.new(record, attribute).max_file_size
+    end
 
-      if file_path.present? && file.attachment.image? || default_image_path.present?
-        if file_path.present?
-          template += @template.content_tag :label, I18n.t("current_image", scope: "decidim.forms")
-          template += @template.link_to @template.image_tag(file_path, alt: alt_text), file_path, target: "_blank", rel: "noopener"
+    def choose_button_label(attribute)
+      @choose_button_label ||= begin
+        if resource_class(attribute).attached_config[attribute].uploader <= Decidim::ImageUploader
+          I18n.t("decidim.forms.upload.labels.add_image")
         else
-          template += @template.content_tag :label, I18n.t("default_image", scope: "decidim.forms")
-          template += @template.link_to @template.image_tag(default_image_path, alt: alt_text), default_image_path, target: "_blank", rel: "noopener"
-        end
-      elsif file_path.present?
-        template += @template.label_tag I18n.t("current_file", scope: "decidim.forms")
-        template += @template.link_to file.filename, file_path, target: "_blank", rel: "noopener"
-      end
-
-      if file_path.present? && options[:optional]
-        template += content_tag :div, class: "field" do
-          safe_join([
-                      @template.check_box(@object_name, "remove_#{attribute}"),
-                      label("remove_#{attribute}", I18n.t("remove_this_file", scope: "decidim.forms"))
-                    ])
+          I18n.t("decidim.forms.upload.labels.add_file")
         end
+      rescue NoMethodError
+        I18n.t("decidim.forms.upload.labels.add_file")
       end
-
-      if object.errors[attribute].any?
-        template += content_tag :p, class: "is-invalid-label" do
-          safe_join object.errors[attribute], "<br/>".html_safe
-        end
-      end
-
-      template.html_safe
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/PerceivedComplexity
-
-    def upload_help(attribute, options = {})
-      humanizer = FileValidatorHumanizer.new(object, attribute)
 
-      help_scope = begin
-        if options[:help_i18n_scope].present?
-          options[:help_i18n_scope]
-        elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
-          "decidim.forms.file_help.image"
-        else
-          "decidim.forms.file_help.file"
-        end
-      end
+    def upload_help(record, attribute, options = {})
+      humanizer = FileValidatorHumanizer.new(record, attribute)
 
-      help_messages = begin
-        if options[:help_i18n_messages].present?
-          Array(options[:help_i18n_messages])
-        else
-          %w(message_1 message_2)
-        end
-      end
+      help_scope = if options[:help_i18n_scope].present?
+                     options[:help_i18n_scope]
+                   elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
+                     "decidim.forms.file_help.image"
+                   else
+                     "decidim.forms.file_help.file"
+                   end
 
-      content_tag(:div, class: "help-text") do
-        inner = "<p>#{I18n.t("explanation", scope: help_scope)}</p>".html_safe
-        inner + content_tag(:ul) do
-          messages = help_messages.each.map { |msg| I18n.t(msg, scope: help_scope) }
-          messages += humanizer.messages
+      help_messages = if options[:help_i18n_messages].present?
+                        Array(options[:help_i18n_messages])
+                      else
+                        %w(message_1 message_2)
+                      end
 
-          messages.map { |msg| content_tag(:li, msg) }.join("\n").html_safe
-        end.html_safe
-      end
+      help_messages = help_messages.each.map { |msg| I18n.t(msg, scope: help_scope) } + humanizer.messages
+      help_messages += extension_allowlist_help(options[:extension_allowlist]) if options[:extension_allowlist]
+      help_messages += image_dimensions_help(options[:dimensions_info]) if options[:dimensions_info]
+      help_messages
     end
 
     # Public: Returns the translated name for the given attribute.
@@ -531,15 +558,15 @@ def text_area(attribute, options = {})
     # inputs inside the label and to automatically inject validations
     # from the object.
     #
-    # attribute    - The String name of the attribute to buidl the field.
+    # attribute    - The String name of the attribute to build the field.
     # options      - A Hash with options to build the field.
     # html_options - An optional Hash with options to pass to the html element.
     #
     # Returns a String
     def field(attribute, options, html_options = nil, &block)
       label = options.delete(:label)
-      label_options = options.delete(:label_options)
-      custom_label(attribute, label, label_options) do
+      label_options = options.delete(:label_options) || {}
+      custom_label(attribute, label, { required: options[:required] }.merge(label_options)) do
         field_with_validations(attribute, options, html_options, &block)
       end
     end
@@ -654,7 +681,7 @@ def length_for_attribute(attribute, type)
     def find_validator(attribute, klass)
       return unless object.respond_to?(:_validators)
 
-      object._validators[attribute.to_sym].find { |validator| validator.class == klass }
+      object._validators[attribute.to_sym].find { |validator| validator.instance_of?(klass) }
     end
 
     # Private: Override method from FoundationRailsHelper to render the text of the
@@ -670,8 +697,16 @@ def find_validator(attribute, klass)
     def custom_label(attribute, text, options, field_before_label: false, show_required: true)
       return block_given? ? yield.html_safe : "".html_safe if text == false
 
+      required = options.is_a?(Hash) && options.delete(:required)
       text = default_label_text(object, attribute) if text.nil? || text == true
-      text += required_for_attribute(attribute) if show_required
+      if show_required
+        text +=
+          if required
+            required_indicator
+          else
+            required_for_attribute(attribute)
+          end
+      end
 
       text = if field_before_label && block_given?
                safe_join([yield, text.html_safe])
@@ -753,45 +788,36 @@ def label_i18n(attribute, text = nil, options = {})
         options[:class] ||= ""
         options[:class] += " is-invalid-label"
       end
-      text += required_for_attribute(attribute)
+      text +=
+        if options.delete(:required)
+          required_indicator
+        else
+          required_for_attribute(attribute)
+        end
 
       label(attribute, (text || "").html_safe, options)
     end
 
-    # Private: Returns default url for attribute when uploader is an
-    # image and has defined a default url
-    def uploader_default_image_path(attribute)
-      uploader = FileValidatorHumanizer.new(object, attribute).uploader
-      return if uploader.blank?
-      return unless uploader.is_a?(Decidim::ImageUploader)
-
-      uploader.try(:default_url)
-    end
-
-    # Private: Returns blob path when file is attached
-    def file_attachment_path(file)
-      return unless file && file.try(:attached?)
+    def required_for_attribute(attribute)
+      return required_indicator if attribute_required?(attribute)
 
-      Rails.application.routes.url_helpers.rails_blob_url(file.blob, only_path: true)
+      "".html_safe
     end
 
-    def required_for_attribute(attribute)
-      if attribute_required?(attribute)
-        visible_title = content_tag(:span, "*", "aria-hidden": true)
-        screenreader_title = content_tag(
-          :span,
-          I18n.t("required", scope: "forms"),
-          class: "show-for-sr"
-        )
-        return content_tag(
-          :span,
-          visible_title + screenreader_title,
-          title: I18n.t("required", scope: "forms"),
-          data: { tooltip: true, disable_hover: false, keep_on_hover: true },
-          class: "label-required"
-        ).html_safe
-      end
-      "".html_safe
+    def required_indicator
+      visible_title = content_tag(:span, "*", "aria-hidden": true)
+      screenreader_title = content_tag(
+        :span,
+        I18n.t("required", scope: "forms"),
+        class: "show-for-sr"
+      )
+      content_tag(
+        :span,
+        visible_title + screenreader_title,
+        title: I18n.t("required", scope: "forms"),
+        data: { tooltip: true, disable_hover: false, keep_on_hover: true },
+        class: "label-required"
+      ).html_safe
     end
 
     # Private: Returns an array of scopes related to object attribute
@@ -825,28 +851,17 @@ def sanitize_for_dom_selector(name)
     end
 
     def extension_allowlist_help(extension_allowlist)
-      content_tag :p, class: "extensions-help help-text" do
-        safe_join([
-                    content_tag(:span, I18n.t("extension_allowlist", scope: "decidim.forms.files")),
-                    " ",
-                    safe_join(extension_allowlist.map { |ext| content_tag(:b, ext) }, ", ")
-                  ])
-      end
+      [I18n.t("extension_allowlist", scope: "decidim.forms.files", extensions: extension_allowlist.map { |ext| ext }.join(", "))]
     end
 
     def image_dimensions_help(dimensions_info)
-      content_tag :p, class: "image-dimensions-help help-text" do
-        safe_join([
-                    content_tag(:span, I18n.t("dimensions_info", scope: "decidim.forms.images")),
-                    " ",
-                    content_tag(:span) do
-                      safe_join(dimensions_info.map do |_version, info|
-                        processor = @template.content_tag(:span, I18n.t("processors.#{info[:processor]}", scope: "decidim.forms.images"))
-                        dimensions = @template.content_tag(:b, I18n.t("dimensions", scope: "decidim.forms.images", width: info[:dimensions].first, height: info[:dimensions].last))
-                        safe_join([processor, "  ", dimensions, ". ".html_safe])
-                      end)
-                    end
-                  ])
+      dimensions_info.map do |_version, info|
+        dimensions = I18n.t("dimensions", scope: "decidim.forms.images", width: info[:dimensions].first, height: info[:dimensions].last)
+        I18n.t(
+          "processors.#{info[:processor]}",
+          scope: "decidim.forms.images",
+          dimensions: dimensions
+        ).html_safe
       end
     end
 
@@ -918,5 +933,18 @@ def editor_images_options(options)
         drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
       }
     end
+
+    # Private: Determines the correct resource class for validators from the
+    # object or its PassthruValidator.
+    def resource_class(attribute)
+      if object._validators[attribute].is_a?(Array) && object._validators[attribute].size.positive?
+        passthru = object._validators[attribute].find { |v| v.is_a?(PassthruValidator) }
+        return passthru.options[:to] if passthru && passthru.options[:to].present?
+      end
+      klass = object.send(attribute)
+      return object.send(attribute).record.class if klass.respond_to?(:record) && klass.record.present?
+
+      object.class
+    end
   end
 end
diff --git a/decidim-core/lib/decidim/gamification/badge.rb b/decidim-core/lib/decidim/gamification/badge.rb
index 9daa4d2357705..c228fa0c611f7 100644
--- a/decidim-core/lib/decidim/gamification/badge.rb
+++ b/decidim-core/lib/decidim/gamification/badge.rb
@@ -5,7 +5,7 @@ module Gamification
     # This class represents an abstract badge. Instances of this class can define
     # different badge types with different rules such as gaining new levels, etc.
     class Badge
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       # The name of the badge.
@@ -14,7 +14,7 @@ class Badge
       # An array of scores needed to reach a new level. For example, the array
       # [1, 5, 10] represents 1 point to get to Level 1, 5 points to get to level 2,
       # 10 points to get to level 3.
-      attribute :levels, Array, default: []
+      attribute :levels, Array[Integer], default: []
 
       # An array of types for which this badge is valid for.
       attribute :valid_for, Array[Symbol], default: [:user]
@@ -27,7 +27,6 @@ class Badge
       attribute :reset, Proc
 
       validates :name, :levels, presence: true
-      validates :levels, empty: false
 
       validate do
         errors.add(:levels, "level thresholds should be ordered") if levels.sort != levels
diff --git a/decidim-core/lib/decidim/gamification/badge_scorer.rb b/decidim-core/lib/decidim/gamification/badge_scorer.rb
index aae99904c1ca7..a6521163da1bd 100644
--- a/decidim-core/lib/decidim/gamification/badge_scorer.rb
+++ b/decidim-core/lib/decidim/gamification/badge_scorer.rb
@@ -74,6 +74,7 @@ def set(score)
       private
 
       class NegativeScoreException < StandardError; end
+
       class InvalidAmountException < StandardError; end
 
       def with_level_tracking
diff --git a/decidim-core/lib/decidim/has_area.rb b/decidim-core/lib/decidim/has_area.rb
new file mode 100644
index 0000000000000..d04a6c9fdd6e7
--- /dev/null
+++ b/decidim-core/lib/decidim/has_area.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A concern with the components needed when you want a model to belong to an
+  # area.
+  module HasArea
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :area,
+                 foreign_key: "decidim_area_id",
+                 class_name: "Decidim::Area",
+                 optional: true
+
+      scope :with_area, ->(area_id) { where(decidim_area_id: area_id) }
+
+      scope :with_any_area, lambda { |*original_area_ids|
+        area_ids = original_area_ids.map { |id| id.to_s.split("_") }.flatten.uniq
+        return self if area_ids.include?("all")
+
+        where(decidim_area_id: area_ids)
+      }
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/has_attachments.rb b/decidim-core/lib/decidim/has_attachments.rb
index 860800333668d..0e3f6521dab80 100644
--- a/decidim-core/lib/decidim/has_attachments.rb
+++ b/decidim-core/lib/decidim/has_attachments.rb
@@ -26,14 +26,14 @@ def photo
       #
       # Returns an Array<Attachment>
       def photos
-        @photos ||= attachments.select(&:photo?)
+        @photos ||= attachments.with_attached_file.order(:weight).select(&:photo?)
       end
 
       # All the attachments that are documents for this model.
       #
       # Returns an Array<Attachment>
       def documents
-        @documents ||= attachments.includes(:attachment_collection).select(&:document?)
+        @documents ||= attachments.with_attached_file.order(:weight).includes(:attachment_collection).select(&:document?)
       end
 
       # All the attachments that are documents for this model that has a collection.
diff --git a/decidim-core/lib/decidim/has_category.rb b/decidim-core/lib/decidim/has_category.rb
index 43a6f4dd69b4f..74736d2b1881f 100644
--- a/decidim-core/lib/decidim/has_category.rb
+++ b/decidim-core/lib/decidim/has_category.rb
@@ -11,6 +11,42 @@ module HasCategory
       has_one :categorization, as: :categorizable
       has_one :category, through: :categorization
 
+      scope :with_category, lambda { |category|
+        return includes(:category).where(decidim_categories: { id: nil }) if category == "without" || category.nil?
+
+        includes(:category).where(decidim_categories: { id: category }).or(
+          includes(:category).where(decidim_categories: { parent_id: category })
+        )
+      }
+
+      scope :with_any_category, lambda { |*categories|
+        return self if categories.include?("all")
+
+        parent_ids = categories.without("without")
+        cat_ids = parent_ids.dup
+        cat_ids.prepend(nil) if categories.include?("without")
+
+        subquery = includes(:category).where(decidim_categories: { id: cat_ids })
+        return subquery if parent_ids.none?
+
+        subquery.or(
+          includes(:category).where(decidim_categories: { parent_id: parent_ids })
+        )
+      }
+
+      scope :with_any_global_category, lambda { |*categories|
+        return self if categories.include?("all")
+
+        cat_ids = categories.without("without")
+
+        additional_ids = cat_ids.grep(/Decidim__/)
+        additional_ids = additional_ids.map { |a| a.gsub("__", "::").gsub(/(\d+)/, '.\1').split(".") }
+        additional_ids = additional_ids.map { |v| v.first.safe_constantize.send(:find, v.last.to_i).category_ids }
+        additional_ids = additional_ids.flatten
+
+        with_any_category(*(categories + additional_ids))
+      }
+
       validate :category_belongs_to_organization
 
       def previous_category
diff --git a/decidim-core/lib/decidim/importers/import_manifest.rb b/decidim-core/lib/decidim/importers/import_manifest.rb
index 17d6263243c60..e31f6e9e060b3 100644
--- a/decidim-core/lib/decidim/importers/import_manifest.rb
+++ b/decidim-core/lib/decidim/importers/import_manifest.rb
@@ -6,7 +6,7 @@ module Importers
     # specify it's own creator, which will be responsible for producing (creating)
     # and finishing (saving) the imported resource.
     class ImportManifest
-      include Virtus.model
+      include Decidim::AttributeObject::Model
 
       attr_reader :name, :manifest
 
@@ -24,7 +24,7 @@ def initialize(name, manifest)
         super()
         @name = name.to_sym
         @manifest = manifest
-        @messages = Messages.new
+        @messages = ImportManifestMessages.new
       end
 
       # Public: Sets the creator when an argument is provided, returns the
@@ -112,25 +112,7 @@ def has_example?
         @example.present?
       end
 
-      class Messages
-        def initialize
-          @store = {}
-        end
-
-        def has?(key)
-          @store.has_key?(key)
-        end
-
-        def set(key, &block)
-          raise ArgumentError, "You need to provide a block for the message." unless block_given?
-
-          @store[key] = block
-        end
-
-        def render(key, context = nil, **extra)
-          context.instance_exec(**extra, &@store[key]) if @store[key]
-        end
-      end
+      class ImportManifestMessages < Decidim::ManifestMessages; end
     end
   end
 end
diff --git a/decidim-core/lib/decidim/jsonb_attributes.rb b/decidim-core/lib/decidim/jsonb_attributes.rb
index c1b7c3cb5fc36..b21a521dd2868 100644
--- a/decidim-core/lib/decidim/jsonb_attributes.rb
+++ b/decidim-core/lib/decidim/jsonb_attributes.rb
@@ -4,13 +4,13 @@
 
 module Decidim
   # A set of convenient methods to generate dynamic jsonb objects in a way is
-  # compatilbe with Virtus and ActiveModel thus making it easy to integrate
-  # into Rails forms and similar workflows.
+  # compatible with AttirubteObject and ActiveModel thus making it easy to
+  # integrate into Rails forms and similar workflows.
   module JsonbAttributes
     extend ActiveSupport::Concern
 
     class_methods do
-      # Public: Mirrors Virtus `attribute` interface to define attributes in
+      # Public: Mirrors the `attribute` interface to define attributes in
       # custom jsonb objects.
       #
       # name - Attribute's name
@@ -25,7 +25,7 @@ module JsonbAttributes
       #
       # Returns nothing.
       def jsonb_attribute(name, fields, *options)
-        attribute name, Hash, default: {}
+        attribute(name, { String => Object }, default: {})
 
         fields.each do |f, type|
           attribute f, type, *options
@@ -36,6 +36,8 @@ def jsonb_attribute(name, fields, *options)
 
           define_method "#{f}=" do |value|
             field = public_send(name) || {}
+            value_type = self.class.attribute_types[f.to_s]
+            value = value_type.cast(value) if value_type
             public_send("#{name}=", field.merge(f => super(value)))
           end
         end
diff --git a/decidim-core/lib/decidim/manifest_messages.rb b/decidim-core/lib/decidim/manifest_messages.rb
new file mode 100644
index 0000000000000..46f62092524e6
--- /dev/null
+++ b/decidim-core/lib/decidim/manifest_messages.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ManifestMessages
+    def initialize
+      @store = {}
+    end
+
+    def has?(key)
+      @store.has_key?(key)
+    end
+
+    def set(key, &block)
+      raise ArgumentError, "You need to provide a block for the message." unless block_given?
+
+      @store[key] = block
+    end
+
+    def render(key, context = nil, **extra)
+      context.instance_exec(**extra, &@store[key]) if @store[key]
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/map.rb b/decidim-core/lib/decidim/map.rb
index 8e394391ef6e6..e958c7f65429c 100644
--- a/decidim-core/lib/decidim/map.rb
+++ b/decidim-core/lib/decidim/map.rb
@@ -51,7 +51,7 @@ def self.utility(category, options)
 
       config = utility_configuration(category)
       options[:config] = config.except(:provider)
-      klass.new(options)
+      klass.new(**options)
     end
 
     # Public: Returns the utility class module namespace for each category of
@@ -75,9 +75,9 @@ def self.register_category(category, mod)
 
       # Dynamically define the category method.
       module_eval %{
-        def self.#{category}(options)
-          utility(:#{category}, options)
-        end
+        def self.#{category}(options)    # def self.dynamic(options)
+          utility(:#{category}, options) #  utility(:dynamic, options)
+        end                              # end
       }, __FILE__, __LINE__ - 4
 
       mod
diff --git a/decidim-core/lib/decidim/map/autocomplete.rb b/decidim-core/lib/decidim/map/autocomplete.rb
index 408a854bf2042..901cc9616a207 100644
--- a/decidim-core/lib/decidim/map/autocomplete.rb
+++ b/decidim-core/lib/decidim/map/autocomplete.rb
@@ -49,12 +49,14 @@ def geocoding_field(attribute, options = {}, geocoding_options = {})
             geocoding_options
           )
 
-          unless @template.snippets.any?(:geocoding)
-            @template.snippets.add(:geocoding, builder.stylesheet_snippets)
-            @template.snippets.add(:geocoding, builder.javascript_snippets)
+          unless @template.snippets.any?(:geocoding_styles) || @template.snippets.any?(:geocoding_scripts)
+            @template.snippets.add(:geocoding_styles, builder.stylesheet_snippets)
+            @template.snippets.add(:geocoding_scripts, builder.javascript_snippets)
 
             # This will display the snippets in the <head> part of the page.
-            @template.snippets.add(:head, @template.snippets.for(:geocoding))
+            @template.snippets.add(:head, @template.snippets.for(:geocoding_styles))
+            # This will display the snippets in the bottom part of the page.
+            @template.snippets.add(:foot, @template.snippets.for(:geocoding_scripts))
           end
 
           options = merge_geocoding_options(attribute, options)
diff --git a/decidim-core/lib/decidim/map/frontend.rb b/decidim-core/lib/decidim/map/frontend.rb
index cfbdd016c10d2..e54dc6fd4c54d 100644
--- a/decidim-core/lib/decidim/map/frontend.rb
+++ b/decidim-core/lib/decidim/map/frontend.rb
@@ -84,12 +84,12 @@ def view_options
         # @return [Hash] The resulting hash with JS-style hash keys in camelCase
         #   format.
         def hash_to_js(hash)
-          hash.map do |key, value|
+          hash.to_h do |key, value|
             value = hash_to_js(value) if value.is_a?(Hash)
             value = value.call(self) if value.respond_to?(:call)
 
             [key.to_s.camelize(:lower), value]
-          end.to_h
+          end
         end
       end
     end
diff --git a/decidim-core/lib/decidim/map/provider/geocoding/here.rb b/decidim-core/lib/decidim/map/provider/geocoding/here.rb
index d763f0a59a78e..191125e7d5f5e 100644
--- a/decidim-core/lib/decidim/map/provider/geocoding/here.rb
+++ b/decidim-core/lib/decidim/map/provider/geocoding/here.rb
@@ -22,15 +22,15 @@ def address(coordinates, options = {})
             # Always prioritize house number results, even if they are not as
             # close as street level matches.
             hn_result = results.find do |r|
-              r.data["MatchLevel"] == "houseNumber"
+              r.data["resultType"] == "houseNumber"
             end
             return hn_result.address if hn_result
 
-            # Some of the matches that have "MatchLevel" == "street" do not even
-            # contain the street name unless they also have the "Street" key in
-            # the "MatchQuality" attribute defined.
+            # Some of the matches that have "resultType" == "street" do not even
+            # contain the street name unless they also have the "streets" key in
+            # the "scoring" -> "fieldScore" attribute defined.
             street_result = results.find do |r|
-              r.data["MatchQuality"].has_key?("Street")
+              r.data["scoring"]["fieldScore"].has_key?("streets")
             end
             return street_result.address if street_result
 
diff --git a/decidim-core/lib/decidim/map/provider/here.rb b/decidim-core/lib/decidim/map/provider/here.rb
index 2b4d536ee3b47..71107de14005e 100644
--- a/decidim-core/lib/decidim/map/provider/here.rb
+++ b/decidim-core/lib/decidim/map/provider/here.rb
@@ -7,12 +7,15 @@ module Provider
       module Autocomplete
         autoload :Here, "decidim/map/provider/autocomplete/here"
       end
+
       module Geocoding
         autoload :Here, "decidim/map/provider/geocoding/here"
       end
+
       module DynamicMap
         autoload :Here, "decidim/map/provider/dynamic_map/here"
       end
+
       module StaticMap
         autoload :Here, "decidim/map/provider/static_map/here"
       end
diff --git a/decidim-core/lib/decidim/map/provider/osm.rb b/decidim-core/lib/decidim/map/provider/osm.rb
index a3b99db12d565..69edb45270810 100644
--- a/decidim-core/lib/decidim/map/provider/osm.rb
+++ b/decidim-core/lib/decidim/map/provider/osm.rb
@@ -8,12 +8,15 @@ module Provider
       module Autocomplete
         autoload :Osm, "decidim/map/provider/autocomplete/osm"
       end
+
       module Geocoding
         autoload :Osm, "decidim/map/provider/geocoding/osm"
       end
+
       module DynamicMap
         autoload :Osm, "decidim/map/provider/dynamic_map/osm"
       end
+
       module StaticMap
         autoload :Osm, "decidim/map/provider/static_map/osm"
       end
diff --git a/decidim-core/lib/decidim/menu.rb b/decidim-core/lib/decidim/menu.rb
index c5379aada72ba..1482e7dcb9e75 100644
--- a/decidim-core/lib/decidim/menu.rb
+++ b/decidim-core/lib/decidim/menu.rb
@@ -102,7 +102,7 @@ def remove_item(item)
     #
     def items
       @items.reject! { |item| @removed_items.include?(item.identifier) }
-      @ordered_elements.each { |item| move_element(item) }
+      @ordered_elements.each { |item| move_element(**item) }
       @items.select(&:visible?).sort_by(&:position)
     end
 
diff --git a/decidim-core/lib/decidim/metric_manifest.rb b/decidim-core/lib/decidim/metric_manifest.rb
index bf78c48572874..f09d35f6f926d 100644
--- a/decidim-core/lib/decidim/metric_manifest.rb
+++ b/decidim-core/lib/decidim/metric_manifest.rb
@@ -4,11 +4,11 @@ module Decidim
   # This class acts as a manifest for metrics.
   #
   # This manifest is a simple object that holds and stores currently available
-  # metrics and his managers, for calculations purpose
+  # metrics and its managers, for calculations purpose
   #
   class MetricManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :metric_name, String
     attribute :manager_class, String
diff --git a/decidim-core/lib/decidim/middleware/rails_cookies.rb b/decidim-core/lib/decidim/middleware/rails_cookies.rb
deleted file mode 100644
index 6fb7a2deb8346..0000000000000
--- a/decidim-core/lib/decidim/middleware/rails_cookies.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# This is a backport for Rails 6.0 for the Same-Site option for the cookies
-# because this option was added in Rails 6.1.
-#
-# See:
-# https://github.com/decidim/decidim/pull/9051
-# https://github.com/rails/rails/issues/35822
-# https://github.com/rails/rails/commit/7ccaa125ba396d418aad1b217b63653d06044680
-module ActionDispatch
-  class Cookies
-    class CookieJar #:nodoc:
-      alias handle_options_original handle_options
-
-      def handle_options(options)
-        handle_options_original(options)
-
-        options[:same_site] ||= Rails.application.config.action_dispatch.cookies_same_site_protection || :lax
-        options[:same_site] = false if options[:same_site] == :none
-      end
-    end
-  end
-end
diff --git a/decidim-core/lib/decidim/notification_setting_manifest.rb b/decidim-core/lib/decidim/notification_setting_manifest.rb
new file mode 100644
index 0000000000000..d857683aae692
--- /dev/null
+++ b/decidim-core/lib/decidim/notification_setting_manifest.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class holds the configuration for notification settings at component level.
+  #
+  # This manifest is a simple object that holds and stores current attributes
+  # and their specific validators
+  class NotificationSettingManifest
+    include ActiveModel::Model
+    include Decidim::AttributeObject::Model
+
+    attribute :name, Symbol
+    attribute :settings_area, Symbol
+    attribute :default_value, Boolean, default: true
+
+    validates :default_value, inclusion: { in: [true, false] }
+    validates :settings_area, inclusion: { in: [:global, :administrators] }
+  end
+end
diff --git a/decidim-core/lib/decidim/organization_settings.rb b/decidim-core/lib/decidim/organization_settings.rb
index b44e323c06ea4..dada025fccc56 100644
--- a/decidim-core/lib/decidim/organization_settings.rb
+++ b/decidim-core/lib/decidim/organization_settings.rb
@@ -106,7 +106,8 @@ def defaults_hash
             "allowed_file_extensions" => {
               "default" => %w(jpg jpeg gif png bmp pdf rtf txt),
               "admin" => %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
-              "image" => %w(jpg jpeg gif png bmp ico)
+              "image" => %w(jpg jpeg gif png bmp),
+              "favicon" => %w(png)
             },
             "allowed_content_types" => {
               "default" => %w(
@@ -129,8 +130,8 @@ def defaults_hash
               )
             },
             "maximum_file_size" => {
-              "default" => 10,
-              "avatar" => 5
+              "default" => 10.0,
+              "avatar" => 5.0
             }
           }
         }
@@ -148,7 +149,7 @@ def initialize(organization)
       # all configurations have values even when the organization settings do
       # not define them.
       super(
-        keys_map.map do |config, method|
+        keys_map.to_h do |config, method|
           [
             config.to_s,
             generate_config(
@@ -156,7 +157,7 @@ def initialize(organization)
               self.class.default(config)
             )
           ]
-        end.to_h
+        end
       )
 
       keys_map.keys.each do |config|
@@ -190,10 +191,10 @@ def wrap_upload_allowed_content_types_admin(value)
     # @return [OpenStruct] The configuration struct.
     def generate_config(hash, default = {})
       OpenStruct.new(
-        default.deep_merge(hash).map do |key, value|
+        default.deep_merge(hash).to_h do |key, value|
           value = generate_config(value) if value.is_a?(Hash)
           [key, value]
-        end.to_h
+        end
       )
     end
 
diff --git a/decidim-core/lib/decidim/participatory_space_context_manifest.rb b/decidim-core/lib/decidim/participatory_space_context_manifest.rb
index 39f83dd5af61c..f2e2f7ae87672 100644
--- a/decidim-core/lib/decidim/participatory_space_context_manifest.rb
+++ b/decidim-core/lib/decidim/participatory_space_context_manifest.rb
@@ -5,9 +5,9 @@ module Decidim
   # engine, a layout and a set of helpers (usually used by the layout itself).
   class ParticipatorySpaceContextManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
-    attribute :engine, Rails::Engine
+    attribute :engine, Rails::Engine, **{}
     attribute :helper
     attribute :layout
   end
diff --git a/decidim-core/lib/decidim/participatory_space_manifest.rb b/decidim-core/lib/decidim/participatory_space_manifest.rb
index 69cba413f64c0..90049485daf2c 100644
--- a/decidim-core/lib/decidim/participatory_space_manifest.rb
+++ b/decidim-core/lib/decidim/participatory_space_manifest.rb
@@ -12,7 +12,7 @@ module Decidim
   # `Decidim.register_participatory_space`.
   class ParticipatorySpaceManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :name, Symbol
 
@@ -28,7 +28,7 @@ class ParticipatorySpaceManifest
     attribute :query_list, String, default: "Decidim::Core::ParticipatorySpaceList"
 
     # An array with the name of the classes that will be exported with
-    # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
+    # the download your data feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
     attribute :data_portable_entities, Array, default: []
 
     # A String with the component's icon. The icon must be stored in the
diff --git a/decidim-core/lib/decidim/participatory_space_resourceable.rb b/decidim-core/lib/decidim/participatory_space_resourceable.rb
index 533a38a81528e..1c0e72be08356 100644
--- a/decidim-core/lib/decidim/participatory_space_resourceable.rb
+++ b/decidim-core/lib/decidim/participatory_space_resourceable.rb
@@ -47,7 +47,13 @@ def linked_participatory_space_resources(resource_name, link_name)
              .joins(:participatory_space_resource_links_to)
              .where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
 
-        klass.where(id: from).or(klass.where(id: to))
+        query = klass.where(id: from).or(klass.where(id: to)).published
+
+        if klass.column_names.include?("weight")
+          query.order(:weight)
+        else
+          query.order(created_at: :desc)
+        end
       end
 
       def participatory_space_sibling_scope(participatory_space_name)
diff --git a/decidim-core/lib/decidim/processes_file_locally.rb b/decidim-core/lib/decidim/processes_file_locally.rb
new file mode 100644
index 0000000000000..365035007694e
--- /dev/null
+++ b/decidim-core/lib/decidim/processes_file_locally.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A concern to help when the file needs to be available locally.
+  # For example, we need to download file first if it's in AWS S3 bucket
+  # or somewhere else than locally in the server.
+  module ProcessesFileLocally
+    extend ActiveSupport::Concern
+
+    private
+
+    def process_file_locally(blob)
+      if ActiveStorage::Blob.service.respond_to? :path_for
+        yield ActiveStorage::Blob.service.path_for(blob.key)
+      else
+        begin
+          tempfile = Tempfile.new
+          tempfile.binmode
+          blob.download { |chunk| tempfile.write(chunk) }
+          tempfile.flush
+          tempfile.rewind
+          yield tempfile.path
+        ensure
+          tempfile.close!
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/query.rb b/decidim-core/lib/decidim/query.rb
new file mode 100644
index 0000000000000..fd8d640a1e3a3
--- /dev/null
+++ b/decidim-core/lib/decidim/query.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/query.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  class UnableToComposeQueriesException < StandardError
+    def initialize(query, other)
+      super(
+        "Unable to composite queries #{query.class.name} and " \
+        "#{other.class.name}. You cannot compose queries where #query " \
+        "returns an ActiveRecord::Relation in one and an array in the other."
+      )
+    end
+  end
+
+  class Query
+    include Enumerable
+
+    def self.merge(*queries)
+      queries.reduce(Decidim::Query.new([])) { |a, e| a.merge(e) }
+    end
+
+    def initialize(scope = ActiveRecord::NullRelation)
+      @scope = scope
+    end
+
+    def query
+      @scope
+    end
+
+    def |(other)
+      return other if @scope.is_a?(Array) && @scope == []
+
+      if relation? && other.relation?
+        Decidim::Query.new(cached_query.merge(other.cached_query))
+      elsif eager? && other.eager?
+        Decidim::Query.new(cached_query | other.cached_query)
+      else
+        raise Decidim::UnableToComposeQueriesException.new(self, other)
+      end
+    end
+
+    alias merge |
+
+    delegate :count, to: :cached_query
+
+    alias size count
+
+    delegate :first, to: :cached_query
+
+    def each(&block)
+      cached_query.each(&block)
+    end
+
+    def exists?
+      return cached_query.exists? if relation?
+
+      cached_query.present?
+    end
+
+    def none?
+      !exists?
+    end
+
+    delegate :to_a, to: :cached_query
+
+    alias to_ary to_a
+
+    def relation?
+      cached_query.is_a?(ActiveRecord::Relation)
+    end
+
+    def eager?
+      cached_query.is_a?(Array)
+    end
+
+    def cached_query
+      @cached_query ||= query
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/record_encryptor.rb b/decidim-core/lib/decidim/record_encryptor.rb
index 9642dc16a3294..396339899acc1 100644
--- a/decidim-core/lib/decidim/record_encryptor.rb
+++ b/decidim-core/lib/decidim/record_encryptor.rb
@@ -35,14 +35,12 @@ def encrypt_attribute(attribute, type:)
         # the `type` is `:hash`, method `decrypt_hash_values` would be called
         # for decryption and `encrypt_hash_values` would be called for
         # encryption.
-        method_suffix = begin
-          case type
-          when :hash
-            "hash_values"
-          else
-            "value"
-          end
-        end
+        method_suffix = case type
+                        when :hash
+                          "hash_values"
+                        else
+                          "value"
+                        end
 
         # Dynamically defines the getter and setter for the encrypted attribute.
         # E.g. when called as `encrypt_attribute :name, type: :string`, this
@@ -56,6 +54,19 @@ def encrypt_attribute(attribute, type:)
         #     super(encrypt_value(value))
         #   end
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
+
+          # def full_name
+          #   return @full_name_decrypted if instance_variable_defined?(:@full_name_decrypted)
+          #
+          #   encrypted_value = begin
+          #     if defined?(super)
+          #       super
+          #     elsif instance_variable_defined?(:@full_name)
+          #       @full_name
+          #     end
+          #   end
+          #   @full_name_decrypted = decrypt_value(encrypted_value)
+          # end
           def #{attribute}
             return @#{attribute}_decrypted if instance_variable_defined?(:@#{attribute}_decrypted)
 
@@ -69,6 +80,16 @@ def #{attribute}
             @#{attribute}_decrypted = decrypt_#{method_suffix}(encrypted_value)
           end
 
+          # def full_name=(value)
+          #   remove_instance_variable(:@full_name_decrypted) if instance_variable_defined?(:@full_name_decrypted)
+          #   encrypted_value = encrypt_value(value)
+          #
+          #   if defined?(super)
+          #     super(encrypted_value)
+          #   else
+          #     @full_name = encrypted_value
+          #   end
+          # end
           def #{attribute}=(value)
             remove_instance_variable(:@#{attribute}_decrypted) if instance_variable_defined?(:@#{attribute}_decrypted)
             encrypted_value = encrypt_#{method_suffix}(value)
diff --git a/decidim-core/lib/decidim/reminder_manifest.rb b/decidim-core/lib/decidim/reminder_manifest.rb
new file mode 100644
index 0000000000000..d8355709f1f8d
--- /dev/null
+++ b/decidim-core/lib/decidim/reminder_manifest.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class acts as a manifest for reminders.
+  #
+  # This manifest is a simple object that holds and stores reminder
+  # and it's generator class.
+  class ReminderManifest
+    include ActiveModel::Model
+    include Decidim::AttributeObject::Model
+
+    attribute :generator_class_name, String
+    attribute :form_class_name, String
+    attribute :command_class_name, String
+
+    validates :generator_class, presence: true
+
+    attr_reader :name
+
+    def initialize(name:)
+      super()
+      @name = name
+      @messages = ReminderManifestMessages.new
+    end
+
+    def generator_class
+      generator_class_name.constantize
+    end
+
+    def form_class
+      form_class_name.constantize
+    end
+
+    def command_class
+      command_class_name.constantize
+    end
+
+    def has_settings?
+      settings.attributes.any?
+    end
+
+    def settings(&block)
+      @settings ||= SettingsManifest.new
+      yield(@settings) if block
+      @settings
+    end
+
+    # Fetch the messages object or yield it for the block when a block is
+    # given.
+    def messages
+      if block_given?
+        yield @messages
+      else
+        @messages
+      end
+    end
+
+    def message(key, context = nil, **extra, &block)
+      extra = context if extra.empty? && context.is_a?(Hash)
+
+      if block_given?
+        messages.set(key, &block)
+      else
+        messages.render(key, context, **extra)
+      end
+    end
+
+    # Returns a boolean indicating whether the message exists with the given key.
+    def has_message?(key)
+      messages.has?(key)
+    end
+
+    class ReminderManifestMessages < Decidim::ManifestMessages; end
+  end
+end
diff --git a/decidim-core/lib/decidim/reminder_registry.rb b/decidim-core/lib/decidim/reminder_registry.rb
new file mode 100644
index 0000000000000..91ba17ef22df1
--- /dev/null
+++ b/decidim-core/lib/decidim/reminder_registry.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class acts as a registry for reminders. Each reminder needs a name,
+  # and a generator class, that will be used for generating the actual sendable reminders.
+  # Reminder times could be used to define intervals between reminders, so that user
+  # isn't reminded too often. In addition, you can register form and command classes
+  # for additional features, such as order reminders can be sent manually from the admin panel.
+  # Notice that if you implement admin panel functionality, you should add 118n messages too.
+  #
+  # In order to register a reminder, you can follow this example:
+  #
+  #     Decidim.reminders_registry.register(:orders) do |reminder_registry|
+  #       reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
+  #       reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
+  #       reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+  #
+  #       reminder_registry.settings do |settings|
+  #         settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+  #       end
+  #
+  #       reminder_registry.messages do |msg|
+  #         msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
+  #         msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+  #       end
+  #     end
+  #
+  # Reminders need to be registered in the `engine.rb` file of each module.
+  class ReminderRegistry
+    def register(reminder_name)
+      reminder_name = reminder_name.to_s
+      if reminder_exists?(reminder_name)
+        raise(
+          ReminderAlreadyRegistered,
+          "There's a reminder already registered with the name `:#{reminder_name}`, must be unique"
+        )
+      end
+
+      reminder_manifest = ::Decidim::ReminderManifest.new(name: reminder_name)
+      yield(reminder_manifest)
+      reminder_manifest.validate!
+
+      reminder_manifests << reminder_manifest
+    end
+
+    def for(reminder_name, list = nil)
+      list ||= all
+      list.find { |manifest| manifest.name == reminder_name.to_s }
+    end
+
+    def all
+      reminder_manifests
+    end
+
+    class ReminderAlreadyRegistered < StandardError; end
+
+    private
+
+    def reminder_exists?(reminder_name)
+      self.for(reminder_name).present?
+    end
+
+    def reminder_manifests
+      @reminder_manifests ||= []
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/resource_manifest.rb b/decidim-core/lib/decidim/resource_manifest.rb
index a289652eb319f..b9587a6de542b 100644
--- a/decidim-core/lib/decidim/resource_manifest.rb
+++ b/decidim-core/lib/decidim/resource_manifest.rb
@@ -15,7 +15,7 @@ module Decidim
   #
   class ResourceManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     # The name of the resource we are exposing.
     attribute :name, String
diff --git a/decidim-core/lib/decidim/resourceable.rb b/decidim-core/lib/decidim/resourceable.rb
index c05553b90a7ad..a2bf52d5e7e85 100644
--- a/decidim-core/lib/decidim/resourceable.rb
+++ b/decidim-core/lib/decidim/resourceable.rb
@@ -18,6 +18,17 @@ module Resourceable
       # An association with the permissions settings for the resource
       has_one :resource_permission, as: :resource, class_name: "Decidim::ResourcePermission"
 
+      scope :related_to, lambda { |related_to_key|
+        from = joins(:resource_links_from).where(
+          decidim_resource_links: { to_type: related_to_key.camelcase }
+        )
+        to = joins(:resource_links_to).where(
+          decidim_resource_links: { from_type: related_to_key.camelcase }
+        )
+
+        where(id: from).or(where(id: to))
+      }
+
       # Finds all the linked resources to or from this model for a given resource
       # name and link name.
       #
diff --git a/decidim-core/lib/decidim/scopable.rb b/decidim-core/lib/decidim/scopable.rb
index 9dab038a168d0..2362a2efed5cc 100644
--- a/decidim-core/lib/decidim/scopable.rb
+++ b/decidim-core/lib/decidim/scopable.rb
@@ -26,6 +26,21 @@ module Scopable
       delegate :scopes, to: :organization
 
       validate :scope_belongs_to_organization
+
+      scope :with_scope, ->(scope_id) { includes(:scope).references(:decidim_scopes).where("? = ANY(decidim_scopes.part_of)", scope_id) }
+
+      scope :with_any_scope, lambda { |*original_scope_ids|
+        scope_ids = original_scope_ids.flatten
+        return self if scope_ids.include?("all")
+
+        clean_scope_ids = scope_ids
+
+        conditions = []
+        conditions << "#{table_name}.decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
+        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+        includes(:scope).references(:decidim_scopes).where(Arel.sql(conditions.join(" OR ")).to_s, *clean_scope_ids.map(&:to_i))
+      }
     end
 
     # Whether the resource has scopes enabled or not.
diff --git a/decidim-core/lib/decidim/settings_manifest.rb b/decidim-core/lib/decidim/settings_manifest.rb
index 92f1efcfcf759..861dd6bb84fd0 100644
--- a/decidim-core/lib/decidim/settings_manifest.rb
+++ b/decidim-core/lib/decidim/settings_manifest.rb
@@ -38,14 +38,14 @@ def schema
       manifest = self
 
       @schema = Class.new do
-        include Virtus.model
+        include Decidim::AttributeObject::Model
         include ActiveModel::Validations
         include TranslatableAttributes
 
         cattr_accessor :manifest
         attr_reader :default_locale
 
-        # Overwrites Virtus::InstanceMethods::Constructor#initialize to allow
+        # Overwrites Decidim::AttributeObject::Model#initialize to allow
         # passing a default_locale needed to validate translatable attributes.
         # See TranslatablePresenceValidator#default_locale_for(record).
         def initialize(attributes = nil, default_locale = nil)
@@ -85,7 +85,7 @@ def required_attributes_for_authorization
     # to encapsulate behavior related to each individual settings field. Shouldn't
     # be used from the outside.
     class Attribute
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       TYPES = {
diff --git a/decidim-core/lib/decidim/spring.rb b/decidim-core/lib/decidim/spring.rb
new file mode 100644
index 0000000000000..fdd051769c560
--- /dev/null
+++ b/decidim-core/lib/decidim/spring.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A special Spring watcher for Decidim to ignore specific paths from the
+  # watching causing excessive use of inodes, issues with CPU usage and with
+  # startup/stop. This should be loaded at the application's config/spring.rb
+  # file.
+  module SpringWatcher
+    def start
+      super
+      listener.ignore(/^(node_modules|storage|tmp)/)
+    end
+  end
+end
+
+Spring::Watcher::Listen.prepend Decidim::SpringWatcher
diff --git a/decidim-core/lib/decidim/translatable_attributes.rb b/decidim-core/lib/decidim/translatable_attributes.rb
index 13901f6a6fd50..67bb5eb2ed80b 100644
--- a/decidim-core/lib/decidim/translatable_attributes.rb
+++ b/decidim-core/lib/decidim/translatable_attributes.rb
@@ -4,13 +4,13 @@
 
 module Decidim
   # A set of convenience methods to deal with I18n attributes and validations
-  # in a way that's compatible with Virtus and ActiveModel, thus making it easy
-  # to integrate into Rails' forms and similar workflows.
+  # in a way that's compatible with AttributeObject and ActiveModel, thus making
+  # it easy to integrate into Rails' forms and similar workflows.
   module TranslatableAttributes
     extend ActiveSupport::Concern
 
     class_methods do
-      # Public: Mirrors Virtus' `attribute` interface to define attributes in
+      # Public: Mirrors the `attribute` interface to define attributes in
       # multiple locales.
       #
       # name - The attribute's name
@@ -34,12 +34,12 @@ module TranslatableAttributes
       #   end
       #
       # Returns nothing.
-      def translatable_attribute(name, type, *options)
-        attribute name, Hash, default: {}
+      def translatable_attribute(name, type, **options)
+        attribute(name, { String => Object }, default: {})
 
         locales.each do |locale|
           attribute_name = "#{name}_#{locale}".gsub("-", "__")
-          attribute attribute_name, type, *options
+          attribute attribute_name, type, **options
 
           define_method attribute_name do
             field = public_send(name) || {}
@@ -51,12 +51,16 @@ def translatable_attribute(name, type, *options)
                 # changed and the old value is still stored against the record.
                 field
               end
-            attribute_set[attribute_name].coerce(value)
+            value_type = self.class.attribute_types[attribute_name.to_s]
+            value_type ? value_type.cast(value) : value
           end
 
           define_method "#{attribute_name}=" do |value|
             field = public_send(name) || {}
-            public_send("#{name}=", field.merge(locale => super(value)))
+            final = super(value)
+            return unless final # Do not set the `nil` values for the parent hash
+
+            public_send("#{name}=", field.merge(locale => final))
           end
 
           yield(attribute_name, locale) if block_given?
diff --git a/decidim-core/lib/decidim/url_option_resolver.rb b/decidim-core/lib/decidim/url_option_resolver.rb
new file mode 100644
index 0000000000000..f10c64576f057
--- /dev/null
+++ b/decidim-core/lib/decidim/url_option_resolver.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A class for resolving the default URL options.
+  class UrlOptionResolver
+    def options
+      {}.tap do |opts|
+        opts[:host] = host if host
+        opts[:port] = port unless default_port?
+        opts[:protocol] = protocol if protocol == "https"
+      end
+    end
+
+    def protocol
+      return "https" if Rails.application.config.force_ssl || port == 443
+
+      "http"
+    end
+
+    def host
+      @host ||= begin
+        default_host = nil
+        default_host = "localhost" if Rails.env.development? || Rails.env.test?
+
+        ENV.fetch("HOSTNAME", default_host)
+      end
+    end
+
+    def port
+      @port ||= begin
+        default_port =
+          if Rails.env.development?
+            3000
+          elsif Rails.env.test?
+            Capybara.server_port
+          elsif Rails.application.config.force_ssl
+            443
+          else
+            80
+          end
+
+        ENV.fetch("HTTP_PORT", default_port).to_i
+      end
+    end
+
+    def default_port?
+      [443, 80].include?(port)
+    end
+  end
+end
diff --git a/decidim-core/lib/decidim/view_hooks.rb b/decidim-core/lib/decidim/view_hooks.rb
index 4fb313903258f..9dfc486393f21 100644
--- a/decidim-core/lib/decidim/view_hooks.rb
+++ b/decidim-core/lib/decidim/view_hooks.rb
@@ -77,7 +77,7 @@ def register(name, priority: LOW_PRIORITY, &block)
     def render(name, view_context)
       hooks[name].map do |hook|
         hook.render(view_context)
-      end.join("").html_safe
+      end.join.html_safe
     end
 
     private
diff --git a/decidim-core/lib/decidim/view_model.rb b/decidim-core/lib/decidim/view_model.rb
index 07d7b3f0ac321..67e269aca37fe 100644
--- a/decidim-core/lib/decidim/view_model.rb
+++ b/decidim-core/lib/decidim/view_model.rb
@@ -19,7 +19,7 @@ class ViewModel < Cell::ViewModel
 
     delegate :current_organization, to: :controller
 
-    cache :show, if: :perform_caching? do
+    cache :show, if: :perform_caching?, expires_in: :cache_expiry_time do
       cache_hash
     end
 
@@ -60,6 +60,10 @@ def cache_hash
       nil
     end
 
+    def cache_expiry_time
+      nil
+    end
+
     def decidim
       Decidim::Core::Engine.routes.url_helpers
     end
diff --git a/decidim-core/lib/decidim/webpacker.rb b/decidim-core/lib/decidim/webpacker.rb
index 2ca360d949f5e..70c1fbff32d13 100644
--- a/decidim-core/lib/decidim/webpacker.rb
+++ b/decidim-core/lib/decidim/webpacker.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/webpacker/thread_safe_compiler"
+
 module Decidim
   module Webpacker
     autoload :Configuration, "decidim/webpacker/configuration"
diff --git a/decidim-core/lib/decidim/webpacker/thread_safe_compiler.rb b/decidim-core/lib/decidim/webpacker/thread_safe_compiler.rb
new file mode 100644
index 0000000000000..f3d54ad4b7b6f
--- /dev/null
+++ b/decidim-core/lib/decidim/webpacker/thread_safe_compiler.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# This fixes a thread safety issue with the Webpacker compiler explained here:
+# https://github.com/rails/webpacker/issues/2801
+#
+# The fix is partly from the issue and partly from this commit at Shakapacker:
+# https://github.com/shakacode/shakapacker/commit/f2dc437ecd9914f394780d4c3150fc4a70d40f9d
+
+require "webpacker/compiler"
+
+module Decidim
+  module Webpacker
+    module ThreadSafeCompiler
+      private
+
+      def watched_files_digest
+        warn "Webpacker::Compiler.watched_paths has been deprecated. Set additional_paths in webpacker.yml instead." unless watched_paths.empty?
+        root_path = Pathname.new(File.expand_path(config.root_path))
+        expanded_paths = [*default_watched_paths, *watched_paths].map do |path|
+          root_path.join(path)
+        end
+        files = Dir[*expanded_paths].reject { |f| File.directory?(f) }
+        file_ids = files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
+        Digest::SHA1.hexdigest(file_ids.join("/"))
+      end
+    end
+  end
+end
+
+Webpacker::Compiler.prepend(Decidim::Webpacker::ThreadSafeCompiler)
diff --git a/decidim-core/lib/decidim/webpacker/webpack/custom.js b/decidim-core/lib/decidim/webpacker/webpack/custom.js
index 6c37a831b9019..cac081d39e7ac 100644
--- a/decidim-core/lib/decidim/webpacker/webpack/custom.js
+++ b/decidim-core/lib/decidim/webpacker/webpack/custom.js
@@ -1,7 +1,6 @@
 /* eslint-disable */
-
-const path = require("path");
 const { config } = require("@rails/webpacker");
+const { InjectManifest } = require("workbox-webpack-plugin");
 
 module.exports = {
   module: {
@@ -93,5 +92,18 @@ module.exports = {
   optimization: {
     runtimeChunk: false
   },
-  entry: config.entrypoints
+  entry: config.entrypoints,
+  plugins: [
+    new InjectManifest({
+      swSrc: "src/decidim/sw/sw.js",
+
+      /**
+       * NOTE:
+       * @rails/webpacker outputs to '/packs',
+       * in order to make the SW run properly
+       * they must be put at the project's root folder '/'
+       */
+      swDest: "../sw.js"
+    })
+  ]
 }
diff --git a/decidim-core/lib/decidim/webpacker/webpacker.yml b/decidim-core/lib/decidim/webpacker/webpacker.yml
index 6a1a41f9fc719..34b1e9121e9f7 100644
--- a/decidim-core/lib/decidim/webpacker/webpacker.yml
+++ b/decidim-core/lib/decidim/webpacker/webpacker.yml
@@ -33,7 +33,7 @@ development:
     hmr: false
     client:
       # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
-      overlay: true
+      overlay: false
       # May also be a string
       # webSocketURL:
       #  hostname: "0.0.0.0"
diff --git a/decidim-core/lib/devise/models/decidim_validatable.rb b/decidim-core/lib/devise/models/decidim_validatable.rb
index 1b8a87c44fd1e..3b2a4b3e82eb6 100644
--- a/decidim-core/lib/devise/models/decidim_validatable.rb
+++ b/decidim-core/lib/devise/models/decidim_validatable.rb
@@ -37,7 +37,7 @@ def self.included(base)
         end
       end
 
-      def self.assert_validations_api!(base) #:nodoc:
+      def self.assert_validations_api!(base) # :nodoc:
         unavailable_validations = VALIDATIONS.reject { |v| base.respond_to?(v) }
 
         unless unavailable_validations.empty?
diff --git a/decidim-core/lib/tasks/decidim_active_storage_migration_tasks.rake b/decidim-core/lib/tasks/decidim_active_storage_migration_tasks.rake
index d2cc43146e1de..520d3d31c59b3 100644
--- a/decidim-core/lib/tasks/decidim_active_storage_migration_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_active_storage_migration_tasks.rake
@@ -21,9 +21,7 @@ namespace :decidim do
       path = Rails.root.join("tmp/attachment_mappings.csv")
       dirname = File.dirname(path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      File.open(path, "wb") do |file|
-        file.write(Decidim::Exporters::CSV.new(routes_mappings).export.read)
-      end
+      File.binwrite(path, Decidim::Exporters::CSV.new(routes_mappings).export.read)
     end
 
     desc "Checks attachments migrated from Carrierwave to ActiveStorage"
diff --git a/decidim-core/lib/tasks/decidim_data_portability_tasks.rake b/decidim-core/lib/tasks/decidim_download_your_data_tasks.rake
similarity index 85%
rename from decidim-core/lib/tasks/decidim_data_portability_tasks.rake
rename to decidim-core/lib/tasks/decidim_download_your_data_tasks.rake
index 950657a6d5444..91ec2f5cafb90 100644
--- a/decidim-core/lib/tasks/decidim_data_portability_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_download_your_data_tasks.rake
@@ -55,7 +55,7 @@ namespace :decidim do
     end
   end
 
-  desc "Check and notify users to update her newsletter notifications settings"
+  desc "Check and notify users to update their newsletter notifications settings"
   task check_users_newsletter_opt_in: :environment do
     print %(
 > This will send an email to all the users that have marked the newsletter by default. This should only be run if you were using Decidim before v0.11
@@ -70,22 +70,22 @@ namespace :decidim do
     end
   end
 
-  desc "Deletes all data portability files previous to `Decidim.data_portability_expiry_time` from now."
-  task delete_data_portability_files: :environment do
-    puts "DELETE DATA PORTABILITY FILES: -------------- START"
+  desc "Deletes all download your data files previous to `Decidim.download_your_data_expiry_time` from now."
+  task delete_download_your_data_files: :environment do
+    puts "DELETE DOWNLOAD YOUR DATA FILES: -------------- START"
     attachments = ActiveStorage::Attachment.joins(:blob).where(
-      name: "data_portability_file",
+      name: "download_your_data_file",
       record_type: "Decidim::UserBaseEntity"
     ).where(
-      "active_storage_blobs.created_at < ?", Decidim.data_portability_expiry_time.ago
+      "active_storage_blobs.created_at < ?", Decidim.download_your_data_expiry_time.ago
     )
     attachments.each do |attachment|
-      delete_data_portability_file attachment
+      delete_download_your_data_file attachment
     end
-    puts "DELETE DATA PORTABILITY FILES: --------------- END"
+    puts "DELETE DOWNLOAD YOUR DATA FILES: --------------- END"
   end
 
-  def delete_data_portability_file(attachment)
+  def delete_download_your_data_file(attachment)
     puts "------"
     puts "!! deleting: #{attachment.filename}"
     attachment.purge
diff --git a/decidim-core/lib/tasks/decidim_mailers_tasks.rake b/decidim-core/lib/tasks/decidim_mailers_tasks.rake
new file mode 100644
index 0000000000000..ac8e20507ff67
--- /dev/null
+++ b/decidim-core/lib/tasks/decidim_mailers_tasks.rake
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :mailers do
+    desc "Task to send the notification digest email with the daily report"
+    task notifications_digest_daily: :environment do
+      notifications_digest(:daily)
+    end
+
+    desc "Task to send the notification digest email with the weekly report"
+    task notifications_digest_weekly: :environment do
+      notifications_digest(:weekly)
+    end
+  end
+
+  def notifications_digest(frequency)
+    target_users = Decidim::User.where(notifications_sending_frequency: frequency)
+    time = Time.now.utc
+    target_users.find_each do |user|
+      Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user.id, frequency, time: time)
+    end
+  end
+end
diff --git a/decidim-core/lib/tasks/decidim_metrics_tasks.rake b/decidim-core/lib/tasks/decidim_metrics_tasks.rake
index fa1ddd343d8e5..c87b64298b65a 100644
--- a/decidim-core/lib/tasks/decidim_metrics_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_metrics_tasks.rake
@@ -4,7 +4,7 @@ namespace :decidim do
   namespace :metrics do
     # All ------
     #
-    # Get all metrics entities and execute his own rake task.
+    # Get all metrics entities and execute its own rake task.
     # It admits a date-string parameter, in a 'YYYY-MM-DD' format from
     # today to all past dates
     desc "Execute all metrics calculation methods"
diff --git a/decidim-core/lib/tasks/decidim_pwa_tasks.rake b/decidim-core/lib/tasks/decidim_pwa_tasks.rake
new file mode 100644
index 0000000000000..662d5dd00197f
--- /dev/null
+++ b/decidim-core/lib/tasks/decidim_pwa_tasks.rake
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "webpush"
+
+namespace :decidim do
+  namespace :pwa do
+    desc "Generates VAPID keys for push notifications"
+    task :generate_vapid_keys do
+      vapid_key = Webpush.generate_key
+
+      puts("VAPID keys correctly generated.")
+      puts("*******************************")
+      puts("You have to set the following env vars:\n\n")
+      puts("VAPID_PUBLIC_KEY=#{vapid_key.public_key}")
+      puts("VAPID_PRIVATE_KEY=#{vapid_key.private_key}")
+    end
+  end
+end
diff --git a/decidim-core/lib/tasks/decidim_reminders_tasks.rake b/decidim-core/lib/tasks/decidim_reminders_tasks.rake
new file mode 100644
index 0000000000000..c6e4b0b632aa9
--- /dev/null
+++ b/decidim-core/lib/tasks/decidim_reminders_tasks.rake
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :reminders do
+    task :all, [] => :environment do
+      Decidim.reminders_registry.all.each do |reminder_manifest|
+        call_reminder_job(reminder_manifest)
+      end
+    end
+  end
+
+  def call_reminder_job(reminder_manifest)
+    Decidim::ReminderGeneratorJob.perform_later(
+      reminder_manifest.generator_class_name
+    )
+  end
+end
diff --git a/decidim-core/lib/tasks/decidim_tasks.rake b/decidim-core/lib/tasks/decidim_tasks.rake
index 498d0abcde330..a06c02e551f51 100644
--- a/decidim-core/lib/tasks/decidim_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_tasks.rake
@@ -2,7 +2,12 @@
 
 namespace :decidim do
   desc "Install migrations from Decidim to the app."
-  task upgrade: [:choose_target_plugins, :"railties:install:migrations", :"decidim:webpacker:upgrade"]
+  task upgrade: [
+    :choose_target_plugins,
+    :"railties:install:migrations",
+    :"decidim:webpacker:upgrade",
+    :"decidim_api:generate_docs"
+  ]
 
   desc "Setup environment so that only decidim migrations are installed."
   task :choose_target_plugins do
diff --git a/decidim-core/lib/tasks/decidim_webpacker_tasks.rake b/decidim-core/lib/tasks/decidim_webpacker_tasks.rake
index 6ca15d6bf760d..d37d2d9bf9fc8 100644
--- a/decidim-core/lib/tasks/decidim_webpacker_tasks.rake
+++ b/decidim-core/lib/tasks/decidim_webpacker_tasks.rake
@@ -89,7 +89,7 @@ namespace :decidim do
         gem_path = Pathname(decidim_gemspec.full_gem_path)
       else
         gem_path = decidim_gemspec.source.path
-        gem_path = Pathname(ENV["BUNDLE_GEMFILE"]).dirname.join(gem_path) if gem_path.relative?
+        gem_path = Pathname(ENV.fetch("BUNDLE_GEMFILE", nil)).dirname.join(gem_path) if gem_path.relative?
       end
 
       gem_path
diff --git a/decidim-core/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake b/decidim-core/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake
new file mode 100644
index 0000000000000..38f5adca34461
--- /dev/null
+++ b/decidim-core/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Modify nicknames with random numbers when exists similar ones case insensitively"
+    task fix_nickname_uniqueness: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Updating conflicting user nicknames...")
+
+      # list of users already changed in the process
+      has_changed = []
+
+      Decidim::User.not_deleted.find_each do |user|
+        next if has_changed.include? user.id
+
+        Decidim::User.where(organization: user.organization)
+                     .where("nickname ILIKE ?", user.nickname.downcase)
+                     .where.not(id: has_changed + [user.id])
+                     .not_deleted
+                     .order(:created_at)
+                     .each do |similar_user|
+          # change her nickname to the lowercased one with numbers if needed
+          begin
+            update_user_nickname(similar_user, Decidim::UserBaseEntity.nicknamize(similar_user.nickname, organization: similar_user.organization))
+          rescue ActiveRecord::RecordInvalid => e
+            logger.warn("User ID (#{similar_user.id}) : #{e}")
+          end
+          has_changed.append(similar_user.id)
+        end
+      end
+      logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")
+    end
+
+    private
+
+    def send_notification_to(user)
+      Decidim::EventsManager.publish(
+        event: "decidim.events.nickname_event",
+        event_class: Decidim::ChangeNicknameEvent,
+        affected_users: [user],
+        resource: user
+      )
+    end
+
+    def update_user_nickname(user, new_nickname)
+      user.update!(nickname: new_nickname)
+      send_notification_to(user)
+      user
+    end
+  end
+end
diff --git a/decidim-core/spec/cells/decidim/content_blocks/hero_cell_spec.rb b/decidim-core/spec/cells/decidim/content_blocks/hero_cell_spec.rb
index 42ff6b0249286..89470c41dcaa5 100644
--- a/decidim-core/spec/cells/decidim/content_blocks/hero_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/content_blocks/hero_cell_spec.rb
@@ -31,7 +31,7 @@
 
   context "when the content block has a background image" do
     let(:background_image) do
-      ActiveStorage::Blob.create_after_upload!(
+      ActiveStorage::Blob.create_and_upload!(
         io: File.open(Decidim::Dev.asset("city.jpeg")),
         filename: "city.jpeg",
         content_type: "image/jpeg"
@@ -50,6 +50,7 @@
 
   describe "#cache_hash" do
     it "generate a unique hash" do
+      content_block.reload
       old_hash = cell(content_block.cell, content_block).send(:cache_hash)
       content_block.reload
 
diff --git a/decidim-core/spec/cells/decidim/content_blocks/last_activity_cell_spec.rb b/decidim-core/spec/cells/decidim/content_blocks/last_activity_cell_spec.rb
index f823a61e1cd10..973921e49e33c 100644
--- a/decidim-core/spec/cells/decidim/content_blocks/last_activity_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/content_blocks/last_activity_cell_spec.rb
@@ -15,15 +15,14 @@
 
   controller Decidim::PagesController
 
-  Decidim::HomeActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-
   before do
+    allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
+      %w(Decidim::DummyResources::DummyResource)
+    )
+    allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
+      %w(Decidim::DummyResources::DummyResource)
+    )
+
     allow(cell).to receive(:controller).and_return(controller)
   end
 
diff --git a/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb b/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
index c43f662fe8cc3..bab76033024d5 100644
--- a/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/newsletter_templates/basic_only_text_cell_spec.rb
@@ -22,13 +22,13 @@
 
   controller Decidim::PagesController
 
-  context "when the organization has no logo setted" do
+  context "when the organization has no logo set" do
     it "shows the custom body" do
       expect(subject).to have_text(body)
     end
   end
 
-  context "when the organization has a logo setted" do
+  context "when the organization has a logo set" do
     let(:logo) do
       Rack::Test::UploadedFile.new(
         Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
@@ -44,5 +44,26 @@
     it "renders the organization logo" do
       expect(subject.to_s).to include(logo_url)
     end
+
+    it "renders an anchor URL with the logo before the newsletter is sent" do
+      expect(subject).to have_css(".decidim-bar a[href='#'] img[class='float-right']")
+    end
+
+    context "when the newsletter is sent" do
+      let(:newsletter) { create :newsletter, :sent, organization: organization }
+
+      it "renders the organization's official URL" do
+        expect(subject).to have_css(".decidim-bar a[href='#{organization.official_url}'] img[class='float-right']")
+      end
+
+      context "when the organization does not have an official URL" do
+        let(:organization) { create(:organization, official_url: nil) }
+        let(:newsletter) { create :newsletter, :sent, organization: organization }
+
+        it "renders the URL to Decidim instead" do
+          expect(subject).to have_css(".decidim-bar a[href='http://#{organization.host}:#{Capybara.server_port}/'] img[class='float-right']")
+        end
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/cells/decidim/pad_iframe_cell_spec.rb b/decidim-core/spec/cells/decidim/pad_iframe_cell_spec.rb
index 8105a18e212b2..630ab820ded7b 100644
--- a/decidim-core/spec/cells/decidim/pad_iframe_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/pad_iframe_cell_spec.rb
@@ -32,7 +32,7 @@
 
     context "when the pad is not visible" do
       before do
-        expect(model).to receive(:pad_is_visible?).and_return(false)
+        allow(model).to receive(:pad_is_visible?).and_return(false)
       end
 
       it "renders nothing" do
@@ -69,7 +69,7 @@
   describe "iframe_url" do
     context "when the pad is writable" do
       before do
-        expect(model).to receive(:pad_is_writable?).and_return(true)
+        allow(model).to receive(:pad_is_writable?).and_return(true)
       end
 
       it "includes the writable url" do
@@ -79,7 +79,7 @@
 
     context "when the pad is only readable" do
       before do
-        expect(model).to receive(:pad_is_writable?).and_return(false)
+        allow(model).to receive(:pad_is_writable?).and_return(false)
       end
 
       it "includes the read only url" do
diff --git a/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb b/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb
new file mode 100644
index 0000000000000..0cd4cb7e4fe1a
--- /dev/null
+++ b/decidim-core/spec/cells/decidim/upload_modal_cell_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::UploadModal, type: :cell do
+  subject { my_cell.call }
+
+  let(:my_cell) { cell("decidim/upload_modal", form, options) }
+  let(:form) do
+    double(
+      object: object,
+      object_name: "object",
+      file_field: file_field,
+      abide_error_element: "",
+      error_and_help_text: ""
+    )
+  end
+  let(:object) do
+    double
+  end
+  let(:file_field) { double }
+  let(:file_validation_humanizer) do
+    double(
+      uploader: double
+    )
+  end
+  let(:options) do
+    {
+      attribute: attribute,
+      resource_name: resource_name,
+      attachments: attachments,
+      optional: optional,
+      titled: titled
+    }
+  end
+  let(:attribute) { "dummy_attribute" }
+  let(:resource_name) { "dummy" }
+  let(:attachments) { [] }
+  let(:optional) { true }
+  let(:titled) { false }
+
+  before do
+    allow(Decidim::FileValidatorHumanizer).to receive(:new).and_return(file_validation_humanizer)
+  end
+
+  it "renders the open button" do
+    expect(subject).to have_css(".add-file[type='button']")
+  end
+
+  it "renders modal" do
+    expect(subject).to have_css(".upload-modal")
+  end
+
+  it "renders dropzone" do
+    expect(subject).to have_css(".dropzone")
+  end
+
+  context "when file is required" do
+    let(:optional) { false }
+    let(:object) do
+      double(
+        model_name: double(
+          param_key: param_key
+        )
+      )
+    end
+    let(:param_key) { "dummy_param_key" }
+
+    it "renders hidden checkbox" do
+      expect(subject).to have_css("input[name='#{param_key}[#{attribute}_validation]']")
+    end
+  end
+
+  context "when attachment is present" do
+    let(:filename) { "Exampledocument.pdf" }
+    let(:file) { Decidim::Dev.test_file(filename, "application/pdf") }
+    let(:attachments) { [upload_test_file(file)] }
+
+    it "renders the attachments" do
+      expect(subject).to have_css(".attachment-details")
+      expect(subject).to have_selector("[data-filename='#{filename}']")
+    end
+
+    context "when attachment is image" do
+      let(:filename) { "city.jpeg" }
+
+      it "renders preview" do
+        expect(subject).to have_selector("img[alt='#{attribute}']")
+      end
+    end
+
+    context "when attachment is titled" do
+      let(:attachments) { [create(:attachment, file: file)] }
+      let(:titled) { true }
+
+      before do
+        allow(form).to receive(:hidden_field).and_return(
+          %(<input type="hidden" name="#{attribute}[]" value="#{attachments[0].id}">)
+        )
+      end
+
+      it "renders the attachments" do
+        expect(subject).to have_css(".attachment-details")
+        expect(subject).to have_selector("[data-filename='#{filename}']")
+
+        details = subject.find(".attachment-details")
+        expect(details).to have_content("#{attachments[0].title["en"]} (#{filename})")
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
index ba3e91c3ac369..e938b5a2f8e66 100644
--- a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
@@ -39,13 +39,13 @@
   let(:commentable) { create(:dummy_resource, component: component, published_at: Time.current) }
   let(:comments) { create_list(:comment, 15, author: model, commentable: commentable) }
   let(:activities) do
-    Decidim::ActivitySearch.new(
-      organization: component.organization,
+    Decidim::PublicActivities.new(
+      component.organization,
       user: model,
       current_user: current_user,
       resource_type: "all",
       resource_name: filter.resource_type
-    ).run.page(current_page).per(10)
+    ).query.page(current_page).per(10)
   end
   let(:current_page) { 1 }
   let!(:logs) do
diff --git a/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb b/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
index c0babd5473e50..4d1e36ec26a8e 100644
--- a/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_dummy_resource_spec.rb
@@ -67,8 +67,8 @@ module Decidim
       context "when uploading images" do
         let(:uploaded_images) do
           [
-            Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-            Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+            { file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg") },
+            { file: upload_test_file(Decidim::Dev.asset("city2.jpeg"), content_type: "image/jpeg") }
           ]
         end
 
diff --git a/decidim-core/spec/commands/decidim/create_editor_image_spec.rb b/decidim-core/spec/commands/decidim/create_editor_image_spec.rb
index fd64af9bfdc44..6880aa8aa732b 100644
--- a/decidim-core/spec/commands/decidim/create_editor_image_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_editor_image_spec.rb
@@ -37,7 +37,7 @@ module Decidim
       end
 
       it "doesn't create an editor image" do
-        expect { subject.call }.not_to(change { Decidim::EditorImage.count })
+        expect { subject.call }.not_to(change(Decidim::EditorImage, :count))
       end
     end
 
@@ -47,7 +47,7 @@ module Decidim
       end
 
       it "creates an editor image" do
-        expect { subject.call }.to change { Decidim::EditorImage.count }.by(1)
+        expect { subject.call }.to change(Decidim::EditorImage, :count).by(1)
       end
     end
   end
diff --git a/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb b/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
index 47c3f5e7b8919..023bdc637460a 100644
--- a/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_omniauth_registration_spec.rb
@@ -50,7 +50,7 @@ module Comments
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -70,7 +70,7 @@ module Comments
           end
 
           it "creates a new user" do
-            expect(SecureRandom).to receive(:hex).and_return("decidim123456")
+            allow(SecureRandom).to receive(:hex).and_return("decidim123456789")
 
             expect do
               command.call
@@ -81,15 +81,14 @@ module Comments
             expect(user.email).to eq(form.email)
             expect(user.organization).to eq(organization)
             expect(user.newsletter_notifications_at).to be_nil
-            expect(user.email_on_notification).to eq(true)
             expect(user).to be_confirmed
-            expect(user.valid_password?("decidim123456")).to eq(true)
+            expect(user.valid_password?("decidim123456789")).to be(true)
           end
 
           it "notifies about registration with oauth data" do
             user = create(:user, email: email, organization: organization)
             identity = Decidim::Identity.new(id: 1234)
-            expect(command).to receive(:create_identity).and_return(identity)
+            allow(command).to receive(:create_identity).and_return(identity)
 
             expect(ActiveSupport::Notifications)
               .to receive(:publish)
@@ -114,14 +113,14 @@ module Comments
 
               it "links a previously existing user" do
                 user = create(:user, email: email, organization: organization)
-                expect { command.call }.to change(User, :count).by(0)
+                expect { command.call }.not_to change(User, :count)
 
                 expect(user.identities.length).to eq(1)
               end
 
               it "confirms a previously existing user" do
                 create(:user, email: email, organization: organization)
-                expect { command.call }.to change(User, :count).by(0)
+                expect { command.call }.not_to change(User, :count)
 
                 user = User.find_by(email: email)
                 expect(user).to be_confirmed
diff --git a/decidim-core/spec/commands/decidim/create_registration_spec.rb b/decidim-core/spec/commands/decidim/create_registration_spec.rb
index 12302b8d7c4a8..e283048468c4a 100644
--- a/decidim-core/spec/commands/decidim/create_registration_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_registration_spec.rb
@@ -42,7 +42,7 @@ module Comments
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -64,13 +64,13 @@ module Comments
             end
 
             it "receives the invitation email again" do
+              expect { command.call }.not_to change(User, :count)
               expect do
                 command.call
                 user.reload
-              end.to change(User, :count).by(0)
-                                         .and broadcast(:invalid)
+              end.to broadcast(:invalid)
                 .and change(user.reload, :invitation_token)
-              expect(ActionMailer::MailDeliveryJob).to have_been_enqueued.on_queue("mailers")
+              expect(ActionMailer::MailDeliveryJob).to have_been_enqueued.on_queue("mailers").twice
             end
           end
         end
@@ -89,7 +89,6 @@ module Comments
               password_confirmation: form.password_confirmation,
               tos_agreement: form.tos_agreement,
               newsletter_notifications_at: form.newsletter_at,
-              email_on_notification: true,
               organization: organization,
               accepted_tos_version: organization.tos_version,
               locale: form.current_locale
@@ -104,7 +103,7 @@ module Comments
             it "creates a user with no newsletter notifications" do
               expect do
                 command.call
-                expect(User.last.newsletter_notifications_at).to eq(nil)
+                expect(User.last.newsletter_notifications_at).to be_nil
               end.to change(User, :count).by(1)
             end
           end
diff --git a/decidim-core/spec/commands/decidim/create_report_spec.rb b/decidim-core/spec/commands/decidim/create_report_spec.rb
index 77a74e06133c6..10baaa097c0e8 100644
--- a/decidim-core/spec/commands/decidim/create_report_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_report_spec.rb
@@ -22,7 +22,7 @@ module Decidim
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -36,7 +36,7 @@ module Decidim
 
       describe "when the form is valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(false)
+          allow(form).to receive(:invalid?).and_return(false)
         end
 
         it "broadcasts ok" do
diff --git a/decidim-core/spec/commands/decidim/create_user_group_spec.rb b/decidim-core/spec/commands/decidim/create_user_group_spec.rb
index 1ce5d41fe6120..b385a8f08c865 100644
--- a/decidim-core/spec/commands/decidim/create_user_group_spec.rb
+++ b/decidim-core/spec/commands/decidim/create_user_group_spec.rb
@@ -15,7 +15,7 @@ module Comments
         let(:phone) { "Y1fERVzL2F" }
         let(:document_number) { "123456780X" }
         let(:about) { "This is us." }
-        let(:avatar) { fixture_file_upload(File.open("spec/assets/avatar.jpg"), "image/jpeg") }
+        let(:avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
 
         let(:form_params) do
           {
@@ -42,7 +42,7 @@ module Comments
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-core/spec/commands/decidim/create_user_report_spec.rb b/decidim-core/spec/commands/decidim/create_user_report_spec.rb
new file mode 100644
index 0000000000000..d2653bdb908f5
--- /dev/null
+++ b/decidim-core/spec/commands/decidim/create_user_report_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe CreateUserReport do
+    describe "call" do
+      let(:current_organization) { create(:organization) }
+      let(:component) { create(:component, organization: current_organization) }
+      let!(:reported_user) { create(:user, :confirmed, organization: current_organization) }
+      let(:reportable) { reported_user }
+      let!(:admin) { create(:user, :admin, :confirmed, organization: current_organization) }
+      let!(:admin_no_moderation_mail) { create(:user, :admin, :confirmed, organization: current_organization, email_on_moderations: false) }
+      let(:user) { create(:user, :confirmed, organization: current_organization) }
+      let(:form) { ReportForm.from_params(form_params) }
+      let(:form_params) do
+        {
+          reason: "spam",
+          details: "some details about the report"
+        }
+      end
+
+      let(:command) { described_class.new(form, reportable, user) }
+
+      describe "when the form is not valid" do
+        before do
+          allow(form).to receive(:invalid?).and_return(true)
+        end
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid)
+        end
+
+        it "doesn't create the report" do
+          expect { command.call }.not_to change(UserReport, :count)
+        end
+      end
+
+      describe "when the form is valid" do
+        before do
+          allow(form).to receive(:invalid?).and_return(false)
+        end
+
+        it "broadcasts ok" do
+          expect { command.call }.to broadcast(:ok)
+        end
+
+        it "creates a report" do
+          command.call
+          last_report = UserReport.last
+          expect(last_report.user).to eq(user)
+        end
+
+        it "creates a moderation" do
+          command.call
+          last_moderation = UserModeration.last
+
+          expect(last_moderation.user).to eq(reportable)
+          expect(last_moderation.reports.count).to eq(1)
+        end
+
+        it "stores the details to the report" do
+          command.call
+          last_report = UserReport.last
+          expect(last_report.details).to eq("some details about the report")
+        end
+
+        it "calls the report job in order to send the emails" do
+          allow(UserReportJob).to receive(:perform_later).and_call_original
+          command.call
+          last_report = UserReport.last
+          expect(UserReportJob).to have_received(:perform_later).with(admin, last_report)
+        end
+
+        context "when having multiple admins" do
+          let!(:another_admin) { create(:user, :admin, :confirmed, organization: current_organization) }
+
+          it "calls twice the report job in order to send the emails and ingore the admin_no_moderation_mail" do
+            expect(UserReportJob).to receive(:perform_later).twice.with(a_kind_of(Decidim::User), a_kind_of(Decidim::UserReport))
+
+            command.call
+          end
+        end
+
+        it "doesnt send an email to the admin when he/she doesnt allow it" do
+          allow(UserReportJob).to receive(:perform_later).and_call_original
+          command.call
+          expect(UserReportJob).not_to have_received(:perform_later).with(admin_no_moderation_mail, a_kind_of(Decidim::UserReport))
+        end
+
+        context "and the reportable has been already reported two times" do
+          before do
+            expect(form).to receive(:invalid?).at_least(:once).and_return(false)
+            (Decidim.max_reports_before_hiding - 1).times do
+              described_class.new(form, reportable, create(:user, organization: current_organization)).call
+            end
+          end
+
+          it "doesn't create an additional moderation" do
+            expect { command.call }.not_to change(UserModeration, :count)
+
+            last_moderation = UserModeration.last
+            expect(last_moderation.report_count).to eq(3)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/commands/decidim/leave_user_group_spec.rb b/decidim-core/spec/commands/decidim/leave_user_group_spec.rb
index 295faa6b7bb61..339cd4af09c60 100644
--- a/decidim-core/spec/commands/decidim/leave_user_group_spec.rb
+++ b/decidim-core/spec/commands/decidim/leave_user_group_spec.rb
@@ -7,17 +7,34 @@ module Comments
     describe LeaveUserGroup do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:membership) { create :user_group_membership, role: :admin }
+        let(:membership) { create :user_group_membership, role: role }
+        let(:role) { :admin }
         let(:user) { membership.user }
         let(:user_group) { membership.user_group }
 
         let(:command) { described_class.new(user, user_group) }
 
         context "when the user is the creator" do
-          let(:membership) { create :user_group_membership, role: :creator }
+          let(:role) { :creator }
 
-          it "broadcasts invalid" do
-            expect { command.call }.to broadcast(:invalid)
+          it "broadcasts last admin cant leave group" do
+            expect { command.call }.to broadcast(:last_admin)
+          end
+
+          context "and there is another admin in the group" do
+            let!(:another_membership) { create(:user_group_membership, user_group: user_group, role: :admin) }
+
+            it "broadcasts ok" do
+              expect { command.call }.to broadcast(:ok)
+            end
+          end
+
+          context "and there is another member in the group" do
+            let!(:another_membership) { create(:user_group_membership, user_group: user_group, role: :member) }
+
+            it "doesnt allow last admin to leave the group" do
+              expect { command.call }.to broadcast(:last_admin)
+            end
           end
         end
 
@@ -31,6 +48,8 @@ module Comments
         end
 
         context "when the data is valid" do
+          let(:role) { :member }
+
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)
           end
diff --git a/decidim-core/spec/commands/decidim/search_spec.rb b/decidim-core/spec/commands/decidim/search_spec.rb
index ab9c8ddf86a97..51fb136b4295d 100644
--- a/decidim-core/spec/commands/decidim/search_spec.rb
+++ b/decidim-core/spec/commands/decidim/search_spec.rb
@@ -33,7 +33,7 @@
 
     it "only returns searchable results" do
       expect(Decidim::Searchable.searchable_resources).not_to have_key(fake_type)
-      described_class.call(term, current_organization, "resource_type" => "") do
+      described_class.call(term, current_organization, "with_resource_type" => "") do
         on(:ok) do |results_by_type|
           expect(results_by_type).not_to have_key(fake_type)
         end
@@ -138,8 +138,8 @@
     let(:term) { "black" }
 
     context "when searchables are from the future" do
-      let(:datetime1) { Time.current + 10.seconds }
-      let(:datetime2) { Time.current + 20.seconds }
+      let(:datetime1) { 10.seconds.from_now }
+      let(:datetime2) { 20.seconds.from_now }
 
       it "returns matches sorted by date descendently" do
         described_class.call(term, current_organization) do
@@ -153,8 +153,8 @@
     end
 
     context "when searchables are from the past" do
-      let(:datetime1) { Time.current - 1.day }
-      let(:datetime2) { Time.current - 2.days }
+      let(:datetime1) { 1.day.ago }
+      let(:datetime2) { 2.days.ago }
 
       it "returns matches sorted by date descendently" do
         described_class.call(term, current_organization) do
@@ -168,8 +168,8 @@
     end
 
     context "when searchables are from the future and the past" do
-      let(:datetime1) { Time.current + 1.day }
-      let(:datetime2) { Time.current - 1.day }
+      let(:datetime1) { 1.day.from_now }
+      let(:datetime2) { 1.day.ago }
 
       it "returns matches sorted by date descendently" do
         described_class.call(term, current_organization) do
@@ -193,7 +193,7 @@
       before do
         create_list(:searchable_resource, 5, organization: current_organization, resource_type: resource_type, content_a: "Where's your crown king nothing?")
 
-        # rubocop:disable FactoryBot/CreateList
+        # rubocop:disable RSpec/FactoryBot/CreateList
         3.times do
           create(
             :searchable_resource,
@@ -204,12 +204,12 @@
             content_a: "Where's your crown king nothing?"
           )
         end
-        # rubocop:enable FactoryBot/CreateList
+        # rubocop:enable RSpec/FactoryBot/CreateList
       end
 
       context "when resource_type is setted" do
         it "only return resources of the given type" do
-          described_class.call(term, current_organization, "resource_type" => resource_type) do
+          described_class.call(term, current_organization, "with_resource_type" => resource_type) do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:results].count).to eq 5
@@ -224,7 +224,7 @@
         end
 
         it "can paginate the resources" do
-          described_class.call(term, current_organization, { "resource_type" => resource_type }, per_page: 2) do
+          described_class.call(term, current_organization, { "with_resource_type" => resource_type }, per_page: 2) do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:results].count).to eq 2
@@ -241,7 +241,7 @@
 
       context "when resource_type is blank" do
         it "only returns up to 4 resources of each type" do
-          described_class.call(term, current_organization, "resource_type" => "") do
+          described_class.call(term, current_organization, "with_resource_type" => "") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:results].count).to eq 4
@@ -256,7 +256,7 @@
         end
 
         it "ignores pagination" do
-          described_class.call(term, current_organization, { "resource_type" => "" }, per_page: 2) do
+          described_class.call(term, current_organization, { "with_resource_type" => "" }, per_page: 2) do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:results].count).to eq 4
@@ -283,7 +283,7 @@
 
       context "when scope is setted" do
         it "only return resources in the given scope" do
-          described_class.call(term, current_organization, "decidim_scope_id" => scope.id.to_s) do
+          described_class.call(term, current_organization, "decidim_scope_id_eq" => scope.id.to_s) do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:count]).to eq 1
@@ -296,7 +296,7 @@
 
       context "when scope is blank" do
         it "does not apply scope filter" do
-          described_class.call(term, current_organization, "decidim_scope_id" => "") do
+          described_class.call(term, current_organization, "decidim_scope_id_eq" => "") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:results]).not_to be_empty
@@ -336,7 +336,7 @@
 
       describe "when selecting active spaces" do
         it "returns data from active spaces" do
-          described_class.call(term, current_organization, "space_state" => "active") do
+          described_class.call(term, current_organization, "with_space_state" => "active") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:count]).to eq 1
@@ -349,7 +349,7 @@
 
       describe "when selecting future spaces" do
         it "returns data from future spaces" do
-          described_class.call(term, current_organization, "space_state" => "future") do
+          described_class.call(term, current_organization, "with_space_state" => "future") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:count]).to eq 1
@@ -362,7 +362,7 @@
 
       describe "when selecting past spaces" do
         it "returns data from past spaces" do
-          described_class.call(term, current_organization, "space_state" => "past") do
+          described_class.call(term, current_organization, "with_space_state" => "past") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:count]).to eq 1
@@ -375,7 +375,7 @@
 
       describe "when no state is selected" do
         it "returns data from all spaces" do
-          described_class.call(term, current_organization, "space_state" => "") do
+          described_class.call(term, current_organization, "with_space_state" => "") do
             on(:ok) do |results_by_type|
               results = results_by_type["Decidim::DummyResources::DummyResource"]
               expect(results[:count]).to eq 3
diff --git a/decidim-core/spec/commands/decidim/update_account_spec.rb b/decidim-core/spec/commands/decidim/update_account_spec.rb
index 889e259210dbe..b2a939850714b 100644
--- a/decidim-core/spec/commands/decidim/update_account_spec.rb
+++ b/decidim-core/spec/commands/decidim/update_account_spec.rb
@@ -96,7 +96,7 @@ module Decidim
 
       describe "avatar" do
         before do
-          form.avatar = fixture_file_upload(File.open("spec/assets/avatar.jpg"))
+          form.avatar = upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg"))
         end
 
         it "updates the avatar" do
@@ -106,7 +106,7 @@ module Decidim
       end
 
       describe "remove_avatar" do
-        let(:user) { create(:user, avatar: fixture_file_upload(File.open("spec/assets/avatar.jpg"))) }
+        let(:user) { create(:user, avatar: upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg"))) }
 
         before do
           form.remove_avatar = true
@@ -126,7 +126,7 @@ module Decidim
 
         it "updates the password" do
           expect { command.call }.to broadcast(:ok)
-          expect(user.reload.valid_password?("pNY6h9crVtVHZbdE")).to eq(true)
+          expect(user.reload.valid_password?("pNY6h9crVtVHZbdE")).to be(true)
         end
       end
 
diff --git a/decidim-core/spec/commands/decidim/update_notifications_settings_spec.rb b/decidim-core/spec/commands/decidim/update_notifications_settings_spec.rb
index 4f2aba5231c53..19e86bfe312cf 100644
--- a/decidim-core/spec/commands/decidim/update_notifications_settings_spec.rb
+++ b/decidim-core/spec/commands/decidim/update_notifications_settings_spec.rb
@@ -9,20 +9,22 @@ module Decidim
     let(:valid) { true }
     let(:data) do
       {
-        email_on_notification: true,
         email_on_moderations: true,
         newsletter_notifications_at: Time.current,
-        direct_message_types: "followed-only"
+        direct_message_types: "followed-only",
+        notification_settings: { close_meeting_reminder: "0" },
+        notifications_sending_frequency: "weekly"
       }
     end
 
     let(:form) do
       double(
         notification_types: "none",
-        email_on_notification: data[:email_on_notification],
         email_on_moderations: data[:email_on_moderations],
         newsletter_notifications_at: data[:newsletter_notifications_at],
         direct_message_types: data[:direct_message_types],
+        notification_settings: data[:notification_settings],
+        notifications_sending_frequency: data[:notifications_sending_frequency],
         valid?: valid
       )
     end
@@ -41,10 +43,11 @@ module Decidim
       it "updates the users's notifications settings" do
         expect { command.call }.to broadcast(:ok)
         user.reload
-        expect(user.email_on_notification).to be_truthy
         expect(user.newsletter_notifications_at).not_to be_nil
         expect(user.notification_types).to eq "none"
         expect(user.direct_message_types).to eq "followed-only"
+        expect(user.notification_settings["close_meeting_reminder"]).to eq "0"
+        expect(user.notifications_sending_frequency).to eq "weekly"
       end
     end
   end
diff --git a/decidim-core/spec/commands/decidim/update_user_group_spec.rb b/decidim-core/spec/commands/decidim/update_user_group_spec.rb
index 3dbf4de1215bd..c4e3a5f7f58e6 100644
--- a/decidim-core/spec/commands/decidim/update_user_group_spec.rb
+++ b/decidim-core/spec/commands/decidim/update_user_group_spec.rb
@@ -16,7 +16,7 @@ module Comments
         let(:phone) { "Y1fERVzL2F" }
         let(:document_number) { "123456780X" }
         let(:about) { "This is us." }
-        let(:avatar) { fixture_file_upload(File.open("spec/assets/avatar.jpg"), "image/jpeg") }
+        let(:avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
 
         let(:form_params) do
           {
@@ -43,7 +43,7 @@ module Comments
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-core/spec/commands/decidim/update_user_interests_spec.rb b/decidim-core/spec/commands/decidim/update_user_interests_spec.rb
index b03c38247909c..cf26b32eb687b 100644
--- a/decidim-core/spec/commands/decidim/update_user_interests_spec.rb
+++ b/decidim-core/spec/commands/decidim/update_user_interests_spec.rb
@@ -13,12 +13,12 @@ module Decidim
       {
         scopes: {
           ignored_scope.id.to_s => {
-            "checked": "0",
-            "id": ignored_scope.id.to_s
+            checked: "0",
+            id: ignored_scope.id.to_s
           },
           interested_scope.id.to_s => {
-            "checked": "1",
-            "id": interested_scope.id.to_s
+            checked: "1",
+            id: interested_scope.id.to_s
           }
         }
       }
diff --git a/decidim-core/spec/commands/decidim/validate_upload_spec.rb b/decidim-core/spec/commands/decidim/validate_upload_spec.rb
new file mode 100644
index 0000000000000..dbe2f347b05e9
--- /dev/null
+++ b/decidim-core/spec/commands/decidim/validate_upload_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ValidateUpload do
+    describe "call" do
+      let(:command) { described_class.new(form) }
+      let(:form) do
+        double(
+          invalid?: invalid,
+          errors: errors
+        )
+      end
+      let(:invalid) { false }
+      let(:errors) { [] }
+
+      describe "when form is valid" do
+        it "broadcasts ok" do
+          expect { command.call }.to broadcast(:ok)
+        end
+      end
+
+      describe "when the form is not valid" do
+        let(:invalid) { true }
+        let(:errors) { ["File too dummy"] }
+
+        it "broadcasts invalid" do
+          expect { command.call }.to broadcast(:invalid, errors)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/content_parsers/decidim/user_parser_spec.rb b/decidim-core/spec/content_parsers/decidim/user_parser_spec.rb
index 524dd9768905c..39151e7b165e9 100644
--- a/decidim-core/spec/content_parsers/decidim/user_parser_spec.rb
+++ b/decidim-core/spec/content_parsers/decidim/user_parser_spec.rb
@@ -62,5 +62,18 @@ module Decidim
         expect(parser.metadata.users).to eq([])
       end
     end
+
+    context "when mentioning a user with a wrong case" do
+      let(:content) { "This text mentions a user with wrong case : @#{user.nickname.upcase}" }
+
+      it "rewrite the good user" do
+        expect(parser.rewrite).to eq("This text mentions a user with wrong case : #{user.to_global_id}")
+      end
+
+      it "returns the correct metadata" do
+        expect(parser.metadata).to be_a(Decidim::ContentParsers::UserParser::Metadata)
+        expect(parser.metadata.users).to eq([user])
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/content_renderers/decidim/link_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/link_renderer_spec.rb
index d841b5f88eccb..6765474bfa83a 100644
--- a/decidim-core/spec/content_renderers/decidim/link_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/link_renderer_spec.rb
@@ -96,7 +96,7 @@ module Decidim
             before_text = ::Faker::Lorem.sentence
             after_text = ::Faker::Lorem.paragraph
             rendered = described_class.new("#{before_text}#{url}#{after_text}").render
-            expect(rendered).to eq("#{before_text}<a href=\"#{url + after_text.split(" ").first}\" target=\"_blank\" rel=\"nofollow noopener noreferrer ugc\">#{url + after_text.split(" ").first}</a> #{after_text.split(" ").drop(1).join(" ")}")
+            expect(rendered).to eq("#{before_text}<a href=\"#{url + after_text.split.first}\" target=\"_blank\" rel=\"nofollow noopener noreferrer ugc\">#{url + after_text.split.first}</a> #{after_text.split.drop(1).join(" ")}")
           end
         end
       end
diff --git a/decidim-core/spec/content_renderers/decidim/user_group_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/user_group_renderer_spec.rb
index e94a2405806f5..1e7613552eb40 100644
--- a/decidim-core/spec/content_renderers/decidim/user_group_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/user_group_renderer_spec.rb
@@ -7,7 +7,7 @@ module Decidim
     let(:user_group) { create(:user_group, :confirmed) }
     let(:renderer) { described_class.new(content) }
     let(:presenter) { Decidim::UserGroupPresenter.new(user_group) }
-    let(:profile_url) { "http://#{user_group.organization.host}/profiles/#{user_group.nickname}" }
+    let(:profile_url) { "http://#{user_group.organization.host}:#{Capybara.server_port}/profiles/#{user_group.nickname}" }
 
     context "when content has a valid Decidim::UserGroup Global ID" do
       let(:content) { "This text contains a valid Decidim::UserGroup Global ID: #{user_group.to_global_id}" }
@@ -49,7 +49,7 @@ module Decidim
       end
     end
 
-    context "when markdown is rendered " do
+    context "when markdown is rendered" do
       let(:content) { "<p>#{user_group.to_global_id}</p><p>#{user_group.to_global_id}</p>" }
 
       it "ensure regex does not match across multiple gids" do
diff --git a/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb b/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
index 3cca9f6b8f2ba..f417b7914c5cc 100644
--- a/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
+++ b/decidim-core/spec/content_renderers/decidim/user_renderer_spec.rb
@@ -7,7 +7,7 @@ module Decidim
     let(:user) { create(:user, :confirmed) }
     let(:renderer) { described_class.new(content) }
     let(:presenter) { Decidim::UserPresenter.new(user) }
-    let(:profile_url) { "http://#{user.organization.host}/profiles/#{user.nickname}" }
+    let(:profile_url) { "http://#{user.organization.host}:#{Capybara.server_port}/profiles/#{user.nickname}" }
 
     context "when content has a valid Decidim::User Global ID" do
       let(:content) { "This text contains a valid Decidim::User Global ID: #{user.to_global_id}" }
@@ -49,7 +49,7 @@ module Decidim
       end
     end
 
-    context "when markdown is rendered " do
+    context "when markdown is rendered" do
       let(:content) { "<p>#{user.to_global_id}</p><p>#{user.to_global_id}</p>" }
 
       it "ensure regex does not match across multiple gids" do
diff --git a/decidim-core/spec/controllers/application_controller_spec.rb b/decidim-core/spec/controllers/application_controller_spec.rb
index 396a21a0ac3c2..c4641178cf971 100644
--- a/decidim-core/spec/controllers/application_controller_spec.rb
+++ b/decidim-core/spec/controllers/application_controller_spec.rb
@@ -59,7 +59,7 @@ def unauthorized
       it "doesn't allow other URLs" do
         get :show, params: { redirect_url: "http://www.example.org" }
 
-        expect(controller.helpers.redirect_url).to eq(nil)
+        expect(controller.helpers.redirect_url).to be_nil
       end
     end
 
diff --git a/decidim-core/spec/controllers/concerns/http_caching_disabler_spec.rb b/decidim-core/spec/controllers/concerns/http_caching_disabler_spec.rb
index 859268caa08e7..5e1f6911ad39d 100644
--- a/decidim-core/spec/controllers/concerns/http_caching_disabler_spec.rb
+++ b/decidim-core/spec/controllers/concerns/http_caching_disabler_spec.rb
@@ -8,7 +8,7 @@ module Decidim
     let!(:user) { create :user, :confirmed, organization: organization }
 
     controller do
-      include HttpCachingDisabler
+      include Decidim::HttpCachingDisabler
 
       def show
         render plain: "Hello World"
@@ -22,7 +22,6 @@ def show
 
     it "sets the appropiate headers" do
       get :show
-
       expect(response.headers["Cache-Control"]).to eq("no-cache, no-store")
       expect(response.headers["Pragma"]).to eq("no-cache")
       expect(response.headers["Expires"]).to eq("Fri, 01 Jan 1990 00:00:00 GMT")
diff --git a/decidim-core/spec/controllers/concerns/orderable.rb b/decidim-core/spec/controllers/concerns/orderable_spec.rb
similarity index 100%
rename from decidim-core/spec/controllers/concerns/orderable.rb
rename to decidim-core/spec/controllers/concerns/orderable_spec.rb
diff --git a/decidim-core/spec/controllers/cookie_policy_controller_spec.rb b/decidim-core/spec/controllers/cookie_policy_controller_spec.rb
deleted file mode 100644
index 3921c0e1c07ef..0000000000000
--- a/decidim-core/spec/controllers/cookie_policy_controller_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  describe CookiePolicyController, type: :controller do
-    routes { Decidim::Core::Engine.routes }
-
-    let(:organization) { create(:organization) }
-    let(:extra_session_options) { {} }
-    let(:session_options) { request.session_options.merge(extra_session_options) }
-
-    before do
-      request.env["decidim.current_organization"] = organization
-      default_session_options session_options
-    end
-
-    after do
-      default_session_options Rack::Session::Abstract::Persisted::DEFAULT_OPTIONS
-    end
-
-    describe "GET /accept" do
-      it "sets the consent cookie for the user" do
-        get :accept
-
-        expect(response.cookies[Decidim.config.consent_cookie_name]).to eq("true")
-        expect(response["Set-Cookie"]).to match(%r{^decidim-cc=true; path=/; expires=[^;]+; HttpOnly$})
-      end
-
-      context "when the session options define the secure flag" do
-        let(:extra_session_options) { { secure: true } }
-
-        it "sets the consent cookie for the user as secure" do
-          get :accept
-
-          expect(response.cookies[Decidim.config.consent_cookie_name]).to eq("true")
-          expect(response["Set-Cookie"]).to match(%r{^decidim-cc=true; path=/; expires=[^;]+; secure; HttpOnly$})
-        end
-      end
-    end
-
-    private
-
-    # Hack because there is no way to provide the session options through the
-    # environment.
-    #
-    # See: https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_controller/test_case.rb
-    def default_session_options(options)
-      ActionController::TestSession.send(:remove_const, :DEFAULT_OPTIONS)
-      ActionController::TestSession.const_set(:DEFAULT_OPTIONS, options)
-    end
-  end
-end
diff --git a/decidim-core/spec/controllers/decidim/profiles_controller_spec.rb b/decidim-core/spec/controllers/decidim/profiles_controller_spec.rb
new file mode 100644
index 0000000000000..86e924dc3713b
--- /dev/null
+++ b/decidim-core/spec/controllers/decidim/profiles_controller_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ProfilesController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:organization) { create(:organization) }
+    let!(:user) { create(:user, nickname: "Nick", organization: organization) }
+
+    before do
+      request.env["decidim.current_organization"] = organization
+    end
+
+    describe "#badges" do
+      context "with an user with uppercase" do
+        it "returns the lowercased user" do
+          get :badges, params: { nickname: "NICK" }
+          expect(response).to render_template(:show)
+        end
+      end
+    end
+
+    describe "#show" do
+      context "with a normal user" do
+        it "redirects to the correct page" do
+          get :show, params: { nickname: "Nick" }
+          expect(response).to redirect_to("/profiles/Nick/activity")
+        end
+      end
+
+      context "with a blocked user" do
+        let!(:user) { create(:user, :confirmed, :blocked, nickname: "Nick", organization: organization) }
+
+        it "doesn't return the page" do
+          expect { get :show, params: { nickname: "Nick" } }.to raise_error(ActionController::RoutingError)
+        end
+      end
+
+      context "with a normal user group" do
+        let!(:user) { create(:user_group, nickname: "acme", organization: organization) }
+
+        it "redirects to the correct page" do
+          get :show, params: { nickname: "acme" }
+
+          expect(response).to redirect_to("/profiles/acme/members")
+        end
+      end
+
+      context "with a blocked user group" do
+        let!(:user) { create(:user_group, nickname: "acme", organization: organization) }
+
+        it "doesn't return the page" do
+          expect { get :show, params: { nickname: "blocked" } }.to raise_error(ActionController::RoutingError)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/decidim/searches_controller_spec.rb b/decidim-core/spec/controllers/decidim/searches_controller_spec.rb
index 441e81433f5a0..1df05efff209d 100644
--- a/decidim-core/spec/controllers/decidim/searches_controller_spec.rb
+++ b/decidim-core/spec/controllers/decidim/searches_controller_spec.rb
@@ -48,9 +48,9 @@ module Decidim
       before { allow(Decidim::Search).to receive(:call) }
 
       it "takes the resource_type filter into account" do
-        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(resource_type: resource_type), a_kind_of(Hash))
+        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(with_resource_type: resource_type), a_kind_of(Hash))
 
-        get :index, params: { term: "Blues", "filter[resource_type]" => resource_type }
+        get :index, params: { term: "Blues", "filter[with_resource_type]" => resource_type }
       end
     end
 
@@ -61,9 +61,9 @@ module Decidim
       before { allow(Decidim::Search).to receive(:call) }
 
       it "takes the scope filter into account" do
-        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(scope_id: scope_id), a_kind_of(Hash))
+        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(decidim_scope_id_eq: scope_id), a_kind_of(Hash))
 
-        get :index, params: { term: "Blues", "filter[scope_id]" => scope_id }
+        get :index, params: { term: "Blues", "filter[decidim_scope_id_eq]" => scope_id }
       end
     end
 
@@ -73,10 +73,10 @@ module Decidim
 
       before { allow(Decidim::Search).to receive(:call) }
 
-      it "takes the scope filter into account" do
-        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(space_state: space_state), a_kind_of(Hash))
+      it "takes the space filter into account" do
+        expect(Decidim::Search).to receive(:call).with(any_args, hash_including(with_space_state: space_state), a_kind_of(Hash))
 
-        get :index, params: { term: "Blues", "filter[space_state]" => space_state }
+        get :index, params: { term: "Blues", "filter[with_space_state]" => space_state }
       end
     end
   end
diff --git a/decidim-core/spec/controllers/decidim/upload_validations_controller_spec.rb b/decidim-core/spec/controllers/decidim/upload_validations_controller_spec.rb
new file mode 100644
index 0000000000000..24dbad5a6807b
--- /dev/null
+++ b/decidim-core/spec/controllers/decidim/upload_validations_controller_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe UploadValidationsController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:params) do
+      {
+        resource_class: resource_class,
+        property: property,
+        blob: blob,
+        form_class: form_class
+      }
+    end
+
+    let(:resource_class) { "Decidim::DummyResources::DummyResource" }
+    let(:property) { "avatar" }
+    let(:blob) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+    let(:form_class) { "Decidim::DummyResources::DummyForm" }
+
+    let(:parsed_response) { JSON.parse(response.body) }
+
+    describe "#create" do
+      it "validates" do
+        post :create, params: params
+
+        expect(response.status).to eq(200)
+        expect(parsed_response).to eq([])
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/decidim/user_activities_controller_spec.rb b/decidim-core/spec/controllers/decidim/user_activities_controller_spec.rb
index 7a1211684d6e0..b346add726426 100644
--- a/decidim-core/spec/controllers/decidim/user_activities_controller_spec.rb
+++ b/decidim-core/spec/controllers/decidim/user_activities_controller_spec.rb
@@ -7,6 +7,7 @@ module Decidim
     routes { Decidim::Core::Engine.routes }
 
     let(:organization) { create(:organization) }
+    let!(:user) { create(:user, nickname: "Nick", organization: organization) }
 
     before do
       request.env["decidim.current_organization"] = organization
@@ -20,6 +21,13 @@ module Decidim
           end.to raise_error(ActionController::RoutingError, "Missing user: foobar")
         end
       end
+
+      context "with an user with uppercase" do
+        it "returns the lowercased user" do
+          get :index, params: { nickname: "NICK" }
+          expect(response).to render_template(:index)
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/spec/controllers/decidim/user_timeline_controller_spec.rb b/decidim-core/spec/controllers/decidim/user_timeline_controller_spec.rb
new file mode 100644
index 0000000000000..4a14279010298
--- /dev/null
+++ b/decidim-core/spec/controllers/decidim/user_timeline_controller_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe UserTimelineController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:organization) { create(:organization) }
+    let!(:user) { create(:user, :confirmed, nickname: "Nick", organization: organization) }
+
+    before do
+      request.env["decidim.current_organization"] = organization
+      sign_in user
+    end
+
+    describe "#index" do
+      context "with a different user than me" do
+        it "raises an ActionController::RoutingError" do
+          expect do
+            get :index, params: { nickname: "foobar" }
+          end.to raise_error(ActionController::RoutingError, "Not Found")
+        end
+      end
+
+      context "with my user with uppercase" do
+        it "returns the lowercased user" do
+          get :index, params: { nickname: "NICK" }
+          expect(response).to render_template(:index)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/editor_images_controller_spec.rb b/decidim-core/spec/controllers/editor_images_controller_spec.rb
index fd21c7dcaf6d9..1846a8cd6202f 100644
--- a/decidim-core/spec/controllers/editor_images_controller_spec.rb
+++ b/decidim-core/spec/controllers/editor_images_controller_spec.rb
@@ -10,18 +10,8 @@ module Decidim
     let(:editor_images_path) { Rails.application.routes.url_helpers.editor_images_url(organization.open_data_file.blob, only_path: true) }
     let(:user) { create(:user, :confirmed, organization: organization) }
     let(:admin) { create(:user, :confirmed, :admin, organization: organization) }
-    let(:image) do
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
-    end
-    let(:invalid_image) do
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("invalid.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
-    end
+    let(:image) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+    let(:invalid_image) { upload_test_file(Decidim::Dev.test_file("invalid.jpeg", "image/jpeg")) }
     let(:valid_params) { { image: image } }
     let(:invalid_params) { { image: invalid_image } }
 
@@ -34,7 +24,7 @@ module Decidim
         it "doesn't create an editor image" do
           expect do
             post :create, params: valid_params
-          end.not_to(change { Decidim::EditorImage.count })
+          end.not_to(change(Decidim::EditorImage, :count))
 
           expect(response).to have_http_status(:redirect)
         end
@@ -48,7 +38,7 @@ module Decidim
         it "doesn't create an editor image" do
           expect do
             post :create, params: valid_params
-          end.not_to(change { Decidim::EditorImage.count })
+          end.not_to(change(Decidim::EditorImage, :count))
 
           expect(response).to have_http_status(:redirect)
         end
@@ -62,7 +52,7 @@ module Decidim
         it "creates an editor image" do
           expect do
             post :create, params: valid_params
-          end.to change { Decidim::EditorImage.count }.by(1)
+          end.to change(Decidim::EditorImage, :count).by(1)
 
           expect(response).to have_http_status(:ok)
         end
@@ -71,7 +61,7 @@ module Decidim
           it "doesn't create an editor image and returns an error message" do
             expect do
               post :create, params: invalid_params
-            end.not_to(change { Decidim::EditorImage.count })
+            end.not_to(change(Decidim::EditorImage, :count))
 
             expect(response).to have_http_status(:unprocessable_entity)
             expect(response.body).to include("Error uploading image")
diff --git a/decidim-core/spec/controllers/manifests_controller_spec.rb b/decidim-core/spec/controllers/manifests_controller_spec.rb
new file mode 100644
index 0000000000000..8a066d9546339
--- /dev/null
+++ b/decidim-core/spec/controllers/manifests_controller_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ManifestsController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:organization) { create(:organization, name: "Organization's name", colors: { "theme" => "#f0f0f0" }) }
+
+    before do
+      Decidim::Organization.destroy_all
+      request.env["decidim.current_organization"] = organization
+    end
+
+    describe "GET /manifest.json" do
+      render_views
+
+      it "returns the manifest" do
+        get :show, format: :json
+
+        expect(response).to be_successful
+
+        manifest = JSON.parse(response.body)
+        expect(manifest["name"]).to eq(organization.name)
+        expect(manifest["lang"]).to eq(organization.default_locale)
+        expect(manifest["description"]).to eq(ActionView::Base.full_sanitizer.sanitize(organization.description["en"]))
+        expect(manifest["background_color"]).to eq("#f0f0f0")
+        expect(manifest["theme_color"]).to eq("#f0f0f0")
+        expect(manifest["display"]).to eq("standalone")
+        expect(manifest["start_url"]).to eq("/")
+        expect(manifest["icons"]).to match(
+          [
+            a_hash_including("src" => a_string_starting_with("/"), "sizes" => "32x32", "type" => "image/png"),
+            a_hash_including("src" => a_string_starting_with("/"), "sizes" => "180x180", "type" => "image/png"),
+            a_hash_including("src" => a_string_starting_with("/"), "sizes" => "192x192", "type" => "image/png"),
+            a_hash_including("src" => a_string_starting_with("/"), "sizes" => "512x512", "type" => "image/png")
+          ]
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/newsletters_controller_spec.rb b/decidim-core/spec/controllers/newsletters_controller_spec.rb
index e46f9ca2092e7..8c5dffeaf71e9 100644
--- a/decidim-core/spec/controllers/newsletters_controller_spec.rb
+++ b/decidim-core/spec/controllers/newsletters_controller_spec.rb
@@ -60,7 +60,7 @@ module Decidim
 
         describe "when sent_at is between 15 days and today" do
           let(:decrypted_string) { encryptor.sent_at_decrypted(params[:u]) }
-          let(:time) { (Time.current - 2.days).to_i }
+          let(:time) { 2.days.ago.to_i }
           let(:sent_at_time) { Time.zone.at(decrypted_string.split("-").second.to_i) }
 
           context "and newsletter notifications is true" do
@@ -88,7 +88,7 @@ module Decidim
 
         describe "when sent_at is before than 15 days" do
           let(:decrypted_string) { encryptor.sent_at_decrypted(params[:u]) }
-          let(:time) { (Time.current - 17.days).to_i }
+          let(:time) { 17.days.ago.to_i }
           let(:sent_at_time) { Time.zone.at(decrypted_string.split("-").second.to_i) }
 
           it "say token has expired" do
diff --git a/decidim-core/spec/controllers/offline_controller_spec.rb b/decidim-core/spec/controllers/offline_controller_spec.rb
new file mode 100644
index 0000000000000..5dbfc6568e995
--- /dev/null
+++ b/decidim-core/spec/controllers/offline_controller_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe OfflineController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:organization) { create(:organization) }
+
+    before do
+      request.env["decidim.current_organization"] = organization
+    end
+
+    describe "GET /offline" do
+      it "returns the offline content" do
+        get :show
+
+        expect(response).to be_successful
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/short_links_controller_spec.rb b/decidim-core/spec/controllers/short_links_controller_spec.rb
new file mode 100644
index 0000000000000..433fb76489b0c
--- /dev/null
+++ b/decidim-core/spec/controllers/short_links_controller_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ShortLinksController, type: :controller do
+    routes { Decidim::Core::Engine.routes }
+
+    let(:organization) { create(:organization) }
+    let(:component) { create(:component, organization: organization) }
+
+    before do
+      request.env["decidim.current_organization"] = organization
+    end
+
+    describe "GET /s" do
+      it "returns to the organization root path" do
+        get :index
+
+        expect(response).to redirect_to("/")
+      end
+    end
+
+    describe "GET /s/:id" do
+      let(:short_link) { create(:short_link, target: component) }
+
+      let(:params) { { id: short_link.identifier } }
+
+      it "redirects to the full URL of the short link" do
+        get :show, params: params
+
+        expect(response).to redirect_to(short_link.target_url)
+      end
+
+      context "when the link does not exist with the given identifier" do
+        let(:params) { { id: "thI5Do3SNotEx1st" } }
+
+        it "returns a 404" do
+          expect { get :show, params: params }.to raise_error(ActionController::RoutingError)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/controllers/static_map_controller_spec.rb b/decidim-core/spec/controllers/static_map_controller_spec.rb
index 724477ff97a2e..d7eff2cfdb49a 100644
--- a/decidim-core/spec/controllers/static_map_controller_spec.rb
+++ b/decidim-core/spec/controllers/static_map_controller_spec.rb
@@ -26,9 +26,9 @@ module Decidim
       it "generates a static map image data using the StaticMapGenerator" do
         generator = double
 
-        expect(StaticMapGenerator).to receive(:new).with(resource).and_return(generator)
-        expect(generator).to receive(:data).and_return(data)
-        expect(controller).to receive(:send_data).with(data, type: "image/jpeg", disposition: "inline")
+        allow(StaticMapGenerator).to receive(:new).with(resource).and_return(generator)
+        allow(generator).to receive(:data).and_return(data)
+        allow(controller).to receive(:send_data).with(data, type: "image/jpeg", disposition: "inline")
         expect(controller).not_to receive(:store_current_location)
 
         get :show, format: "image/jpeg", params: params
diff --git a/decidim-core/spec/db/migrate/fix_blocked_user_names_in_action_log_spec.rb b/decidim-core/spec/db/migrate/fix_blocked_user_names_in_action_log_spec.rb
index a6ac130f8c54e..604f61ba3549e 100644
--- a/decidim-core/spec/db/migrate/fix_blocked_user_names_in_action_log_spec.rb
+++ b/decidim-core/spec/db/migrate/fix_blocked_user_names_in_action_log_spec.rb
@@ -60,16 +60,16 @@
       it "updates the correct resource titles" do
         subject
 
-        block_logs = Decidim::ActionLog.where(resource_type: "Decidim::User", action: "block").map do |log|
+        block_logs = Decidim::ActionLog.where(resource_type: "Decidim::User", action: "block").to_h do |log|
           [log.resource_id, log.extra["resource"]["title"]]
-        end.to_h
-        expected_logs = users.map do |user|
+        end
+        expected_logs = users.to_h do |user|
           if direction == :up
             [user.id, user.extended_data["user_name"]]
           else
             [user.id, "Blocked user"]
           end
-        end.to_h
+        end
         expect(block_logs).to match(expected_logs)
       end
 
@@ -88,16 +88,16 @@
         it "updates the log entries with the expected user names" do
           subject
 
-          block_logs = Decidim::ActionLog.where(resource_type: "Decidim::User", action: "block").map do |log|
+          block_logs = Decidim::ActionLog.where(resource_type: "Decidim::User", action: "block").to_h do |log|
             [log.resource_id, log.extra["resource"]["title"]]
-          end.to_h
-          expected_logs = users.map do |user|
+          end
+          expected_logs = users.to_h do |user|
             if direction == :up
               [user.id, user.name]
             else
               [user.id, "Blocked user"]
             end
-          end.to_h
+          end
           expect(block_logs).to match(expected_logs)
         end
       end
diff --git a/decidim-core/spec/events/decidim/author_event_spec.rb b/decidim-core/spec/events/decidim/author_event_spec.rb
index 2043369821662..d549dda1a6eae 100644
--- a/decidim-core/spec/events/decidim/author_event_spec.rb
+++ b/decidim-core/spec/events/decidim/author_event_spec.rb
@@ -100,7 +100,7 @@ def default_i18n_options
         let(:resource) { OpenStruct.new }
 
         it "ignores it" do
-          expect(subject.author).to eq(nil)
+          expect(subject.author).to be_nil
         end
       end
     end
diff --git a/decidim-core/spec/events/decidim/change_nickname_event_spec.rb b/decidim-core/spec/events/decidim/change_nickname_event_spec.rb
new file mode 100644
index 0000000000000..9f5f35743aeb4
--- /dev/null
+++ b/decidim-core/spec/events/decidim/change_nickname_event_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::ChangeNicknameEvent do
+  include_context "when a simple event"
+
+  let(:event_name) { "decidim.events.change_nickname_event" }
+  let(:resource) { create :user }
+  let(:author) { resource }
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title).to include("We have corrected the way nicknames are used so that there are no duplicates, and that's why we have removed the case sensitive rule. <br/> Your nickname was created after another one with the same name, so we have automatically renamed it. You can change it from <a href=\"/account\">your account settings</a>.")
+    end
+  end
+end
diff --git a/decidim-core/spec/events/decidim/user_group_created_event_spec.rb b/decidim-core/spec/events/decidim/user_group_created_event_spec.rb
index 760f3b6795733..9e5bb40ce9133 100644
--- a/decidim-core/spec/events/decidim/user_group_created_event_spec.rb
+++ b/decidim-core/spec/events/decidim/user_group_created_event_spec.rb
@@ -7,7 +7,7 @@
 
   let(:event_name) { "decidim.events.groups.user_group_created" }
   let(:resource) { create :user_group }
-  let(:user_group_name) { CGI.escapeHTML(resource.name) }
+  let(:user_group_name) { escaped_html(resource.name) }
   let(:admin_panel_url) { "http://#{organization.host}/admin/user_groups" }
 
   it_behaves_like "a simple event", true
diff --git a/decidim-core/spec/events/decidim/user_group_updated_event_spec.rb b/decidim-core/spec/events/decidim/user_group_updated_event_spec.rb
index 9b361041f3f29..81044ed355ae7 100644
--- a/decidim-core/spec/events/decidim/user_group_updated_event_spec.rb
+++ b/decidim-core/spec/events/decidim/user_group_updated_event_spec.rb
@@ -7,7 +7,7 @@
 
   let(:event_name) { "decidim.events.groups.user_group_updated" }
   let(:resource) { create :user_group }
-  let(:user_group_name) { CGI.escapeHTML(resource.name) }
+  let(:user_group_name) { escaped_html(resource.name) }
   let(:admin_panel_url) { "http://#{organization.host}/admin/user_groups" }
 
   it_behaves_like "a simple event", true
diff --git a/decidim-core/spec/forms/account_form_spec.rb b/decidim-core/spec/forms/account_form_spec.rb
index a10d8e8d3dc2c..e99d42495038c 100644
--- a/decidim-core/spec/forms/account_form_spec.rb
+++ b/decidim-core/spec/forms/account_form_spec.rb
@@ -30,7 +30,7 @@ module Decidim
     let(:nickname) { "foo_bar" }
     let(:password) { "Rf9kWTqQfyqkwseH" }
     let(:password_confirmation) { password }
-    let(:avatar) { File.open("spec/assets/avatar.jpg") }
+    let(:avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
     let(:remove_avatar) { false }
     let(:personal_url) { "http://example.org" }
     let(:about) { "This is a description about me" }
diff --git a/decidim-core/spec/forms/decidim/password_form_spec.rb b/decidim-core/spec/forms/decidim/password_form_spec.rb
new file mode 100644
index 0000000000000..250aa341087a3
--- /dev/null
+++ b/decidim-core/spec/forms/decidim/password_form_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::PasswordForm do
+  subject do
+    described_class.new(
+      password: password,
+      password_confirmation: password_confirmation
+    )
+  end
+
+  let(:password) { Faker::Internet.password(min_length: 17) }
+
+  context "when passwords match" do
+    let(:password_confirmation) { password }
+
+    it "is valid" do
+      expect(subject).to be_valid
+    end
+  end
+
+  context "when passwords doesnt match" do
+    let(:password_confirmation) { Faker::Internet.password(min_length: 15, max_length: 16) }
+
+    it "is not valid" do
+      expect(subject).not_to be_valid
+    end
+  end
+end
diff --git a/decidim-core/spec/forms/notifications_settings_form_spec.rb b/decidim-core/spec/forms/notifications_settings_form_spec.rb
index 7451bbbda473c..d625c8e455978 100644
--- a/decidim-core/spec/forms/notifications_settings_form_spec.rb
+++ b/decidim-core/spec/forms/notifications_settings_form_spec.rb
@@ -8,7 +8,7 @@ module Decidim
       described_class.from_params(
         notifications_from_followed: notifications_from_followed,
         notifications_from_own_activity: notifications_from_own_activity,
-        email_on_notification: email_on_notification,
+        notifications_sending_frequency: notifications_sending_frequency,
         email_on_moderations: email_on_moderations,
         newsletter_notifications: newsletter_notifications,
         allow_public_contact: allow_public_contact
@@ -21,10 +21,10 @@ module Decidim
 
     let(:notifications_from_followed) { "1" }
     let(:notifications_from_own_activity) { "1" }
-    let(:email_on_notification) { "1" }
     let(:email_on_moderations) { "1" }
     let(:newsletter_notifications) { "1" }
     let(:allow_public_contact) { "1" }
+    let(:notifications_sending_frequency) { "real_time" }
 
     context "with correct data" do
       it "is valid" do
@@ -88,8 +88,8 @@ module Decidim
         let(:user) { create :user, notification_types: :all }
 
         it "maps the fields correctly" do
-          expect(subject.notifications_from_followed).to eq true
-          expect(subject.notifications_from_own_activity).to eq true
+          expect(subject.notifications_from_followed).to be true
+          expect(subject.notifications_from_own_activity).to be true
         end
       end
 
@@ -97,8 +97,8 @@ module Decidim
         let(:user) { create :user, notification_types: "followed-only" }
 
         it "maps the fields correctly" do
-          expect(subject.notifications_from_followed).to eq true
-          expect(subject.notifications_from_own_activity).to eq false
+          expect(subject.notifications_from_followed).to be true
+          expect(subject.notifications_from_own_activity).to be false
         end
       end
 
@@ -106,8 +106,8 @@ module Decidim
         let(:user) { create :user, notification_types: "own-only" }
 
         it "maps the fields correctly" do
-          expect(subject.notifications_from_followed).to eq false
-          expect(subject.notifications_from_own_activity).to eq true
+          expect(subject.notifications_from_followed).to be false
+          expect(subject.notifications_from_own_activity).to be true
         end
       end
 
@@ -115,8 +115,8 @@ module Decidim
         let(:user) { create :user, notification_types: :none }
 
         it "maps the fields correctly" do
-          expect(subject.notifications_from_followed).to eq false
-          expect(subject.notifications_from_own_activity).to eq false
+          expect(subject.notifications_from_followed).to be false
+          expect(subject.notifications_from_own_activity).to be false
         end
       end
 
@@ -124,7 +124,7 @@ module Decidim
         let(:user) { create :user, newsletter_notifications_at: Time.current }
 
         it "maps the fields correctly" do
-          expect(subject.newsletter_notifications).to eq true
+          expect(subject.newsletter_notifications).to be true
         end
       end
 
@@ -132,7 +132,7 @@ module Decidim
         let(:user) { create :user, newsletter_notifications_at: nil }
 
         it "maps the fields correctly" do
-          expect(subject.newsletter_notifications).to eq false
+          expect(subject.newsletter_notifications).to be false
         end
       end
 
@@ -140,7 +140,7 @@ module Decidim
         let(:user) { create :user, direct_message_types: "all" }
 
         it "maps the fields correctly" do
-          expect(subject.allow_public_contact).to eq true
+          expect(subject.allow_public_contact).to be true
         end
       end
 
@@ -148,13 +148,21 @@ module Decidim
         let(:user) { create :user, direct_message_types: "followed-only" }
 
         it "maps the fields correctly" do
-          expect(subject.allow_public_contact).to eq false
+          expect(subject.allow_public_contact).to be false
+        end
+      end
+
+      context "with notifications_sending_frequency present" do
+        let(:user) { create :user, notifications_sending_frequency: "real_time" }
+
+        it "maps the fields correctly" do
+          expect(subject.notifications_sending_frequency).to eq "real_time"
         end
       end
     end
 
     describe "#user_is_moderator?" do
-      context "when an organization has a moderator and a regular user " do
+      context "when an organization has a moderator and a regular user" do
         let(:organization) { create :organization, available_locales: [:en] }
         let(:participatory_space) { create :participatory_process, organization: organization }
         let(:moderator) do
@@ -168,11 +176,33 @@ module Decidim
         let(:user) { create :user, organization: organization }
 
         it "returns false when user isnt a moderator" do
-          expect(subject.user_is_moderator?(user)).to eq false
+          expect(subject.user_is_moderator?(user)).to be false
         end
 
         it "returns true when user is a moderator" do
-          expect(subject.user_is_moderator?(moderator)).to eq true
+          expect(subject.user_is_moderator?(moderator)).to be true
+        end
+      end
+    end
+
+    describe "#meet_push_notifications_requirements?" do
+      context "when the notifications requirements are met" do
+        before do
+          allow(Rails.application.secrets).to receive("vapid").and_return({ enabled: true })
+        end
+
+        it "returns true" do
+          expect(subject.meet_push_notifications_requirements?).to be true
+        end
+      end
+
+      context "when the notifications requirements aren't met" do
+        before do
+          allow(Rails.application.secrets).to receive("vapid").and_return({ enabled: false })
+        end
+
+        it "returns false" do
+          expect(subject.meet_push_notifications_requirements?).to be false
         end
       end
     end
diff --git a/decidim-core/spec/forms/translatable_presence_validator_spec.rb b/decidim-core/spec/forms/translatable_presence_validator_spec.rb
index 8080e66dbc653..138a4019517b8 100644
--- a/decidim-core/spec/forms/translatable_presence_validator_spec.rb
+++ b/decidim-core/spec/forms/translatable_presence_validator_spec.rb
@@ -69,5 +69,32 @@ module Decidim
         expect(record.errors[:description_en]).to eq ["can't be blank"]
       end
     end
+
+    context "when translation name is hyphenated" do
+      let(:available_locales) { ["en", "ca", "es-MX"] }
+      let(:default_locale) { :"es-MX" }
+      let(:description) do
+        {
+          "es-MX": "Descripción"
+        }
+      end
+
+      before { allow(Decidim).to receive(:available_locales).and_return(available_locales) }
+
+      it "validates the record" do
+        subject
+        expect(record).to be_valid
+      end
+    end
+
+    context "when organization is blank" do
+      let(:organization) { nil }
+
+      it "does not validate the record" do
+        subject
+        expect(record.errors).not_to be_empty
+        expect(record.errors[:current_organization]).to eq ["can't be blank"]
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/forms/upload_validation_form_spec.rb b/decidim-core/spec/forms/upload_validation_form_spec.rb
new file mode 100644
index 0000000000000..7feb871fe3348
--- /dev/null
+++ b/decidim-core/spec/forms/upload_validation_form_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe UploadValidationForm do
+    subject { form }
+
+    let(:params) do
+      {
+        resource_class: resource_class,
+        property: property,
+        blob: blob,
+        form_class: form_class
+      }
+    end
+    let(:form) do
+      described_class.from_params(params)
+    end
+
+    let(:resource_class) { "Decidim::DummyResources::DummyResource" }
+    let(:property) { "avatar" }
+    let(:blob) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
+    let(:form_class) { "Decidim::DummyResources::DummyForm" }
+
+    let(:passthru_validator) do
+      double(
+        validate_each: validate_each
+      )
+    end
+    let(:validate_each) { double }
+
+    before do
+      allow(PassthruValidator).to receive(:new).and_return(passthru_validator)
+    end
+
+    context "when everything is OK" do
+      it { is_expected.to be_valid }
+    end
+
+    context "when property is missing" do
+      let(:property) { nil }
+
+      it "is invalid" do
+        expect(subject.invalid?).to be(true)
+      end
+    end
+
+    context "when blob is missing" do
+      let(:blob) { nil }
+
+      it "is invalid" do
+        expect(subject.invalid?).to be(true)
+      end
+    end
+
+    context "when resouce class is missing" do
+      let(:resource_class) { nil }
+
+      it "is invalid" do
+        expect(subject.invalid?).to be(true)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/forms/user_group_form_spec.rb b/decidim-core/spec/forms/user_group_form_spec.rb
index 7c6d6b80b1923..f276b044e2a1a 100644
--- a/decidim-core/spec/forms/user_group_form_spec.rb
+++ b/decidim-core/spec/forms/user_group_form_spec.rb
@@ -29,7 +29,7 @@ module Decidim
     let(:nickname) { "foo_bar" }
     let(:phone) { "987654321" }
     let(:document_number) { "12345678X" }
-    let(:avatar) { File.open("spec/assets/avatar.jpg") }
+    let(:avatar) { upload_test_file(Decidim::Dev.test_file("avatar.jpg", "image/jpeg")) }
     let(:about) { "This is a description about me" }
 
     context "with correct data" do
diff --git a/decidim-core/spec/helpers/decidim/authorization_form_helper_spec.rb b/decidim-core/spec/helpers/decidim/authorization_form_helper_spec.rb
index b09ab768bdefe..1b80a56697f33 100644
--- a/decidim-core/spec/helpers/decidim/authorization_form_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/authorization_form_helper_spec.rb
@@ -22,7 +22,9 @@ module Decidim
 
         expect(helper).to receive(:decidim_form_for).with(record, options)
 
-        helper.authorization_form_for(record) { |f| }
+        helper.authorization_form_for(record) do
+          # empty block to invoke the helper
+        end
       end
 
       it "allows custom options" do
@@ -37,7 +39,9 @@ module Decidim
 
         expect(helper).to receive(:decidim_form_for).with(record, options)
 
-        helper.authorization_form_for(record, html: { class: "custom_form" }) { |f| }
+        helper.authorization_form_for(record, html: { class: "custom_form" }) do
+          # empty block to invoke the helper
+        end
       end
     end
   end
diff --git a/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb b/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
index 711fd9f84f4a5..b61b9f4d83e4b 100644
--- a/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
@@ -8,7 +8,7 @@ module Decidim
       Class.new(ActionView::Base) do
         include CheckBoxesTreeHelper
         include TranslatableAttributes
-      end.new(ActionView::LookupContext.new(nil))
+      end.new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, [])
     end
 
     let!(:organization) { create(:organization) }
diff --git a/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb b/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
index afaf0283ee005..1147545ca5e10 100644
--- a/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
@@ -31,7 +31,9 @@ module Decidim
           form = Form.new
           form.errors.add(:base, "Arbitrary error")
 
-          output = helper.decidim_form_for(form, url: "#") {}
+          output = helper.decidim_form_for(form, url: "#") do
+            # empty block
+          end
           expect(output).to include("callout")
           expect(output).to include("Arbitrary error")
         end
diff --git a/decidim-core/spec/helpers/decidim/filters_helper_spec.rb b/decidim-core/spec/helpers/decidim/filters_helper_spec.rb
index c230ddebed964..38eed83a16a5a 100644
--- a/decidim-core/spec/helpers/decidim/filters_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/filters_helper_spec.rb
@@ -30,6 +30,7 @@ def self.model_name
           .and_call_original
 
         helper.filter_form_for(filter) do
+          # invoke the helper
         end
       end
 
@@ -39,6 +40,7 @@ def self.model_name
           .with(filter, { namespace: match(/^filters_[a-z0-9-]+$/), builder: FilterFormBuilder, url: helper.url_for, as: :filter, method: :get, remote: true, html: { id: nil } }, any_args)
 
         helper.filter_form_for(filter) do
+          # empty block
         end
       end
 
@@ -54,7 +56,7 @@ def self.model_name
           helper.filter_form_for(filter) do |form|
             form.text_field :test_attribute
           end
-        end.join("")
+        end.join
 
         expect(dom).to have_tag(
           "input",
diff --git a/decidim-core/spec/helpers/decidim/icon_helper_spec.rb b/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
index 6a4195e8be6a1..d0ee676668060 100644
--- a/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
@@ -78,6 +78,30 @@ module Decidim
           end
         end
 
+        context "when the resource component and manifest are nil" do
+          let(:resource) { build :dummy_resource }
+
+          before do
+            allow(resource).to receive(:component).and_return(nil)
+          end
+
+          it "renders a generic icon" do
+            expect(result).to include("svg#icon-bell")
+          end
+        end
+
+        context "when the manifest icon is nil" do
+          let(:resource) { build(:component, manifest_name: :dummy) }
+
+          before do
+            allow(resource.manifest).to receive(:icon).and_return(nil)
+          end
+
+          it "renders a generic icon" do
+            expect(result).to include("svg#icon-question-mark")
+          end
+        end
+
         context "and in other cases" do
           let(:resource) { "Something" }
 
diff --git a/decidim-core/spec/helpers/decidim/layout_helper_spec.rb b/decidim-core/spec/helpers/decidim/layout_helper_spec.rb
new file mode 100644
index 0000000000000..90ab05553059f
--- /dev/null
+++ b/decidim-core/spec/helpers/decidim/layout_helper_spec.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe LayoutHelper do
+    describe "#external_icon" do
+      subject { helper.external_icon(path) }
+
+      context "when the icon exists" do
+        let(:path) { "media/images/google.svg" }
+
+        it "returns the SVG element" do
+          expect(subject).to match(/^<svg.*/)
+        end
+      end
+
+      context "when the icon does not exist" do
+        let(:path) { "media/images/hooli.svg" }
+
+        it "returns nil" do
+          expect(subject).to be_nil
+        end
+      end
+
+      context "when using a custom host" do
+        let(:path) { "media/images/google.svg" }
+
+        before do
+          allow(helper.config).to receive(:asset_host).and_return("https://assets.example.org")
+        end
+
+        # Ensures the asset_path_pack would normally return the asset host in
+        # case there are any API changes in Rails.
+        it "works expectedly" do
+          expect(helper.asset_pack_path(path)).to match(%r{^https://assets.example.org/packs-test})
+        end
+
+        it "returns the SVG element" do
+          expect(subject).to match(/^<svg.*/)
+        end
+      end
+    end
+
+    describe "#application_path" do
+      subject { helper.application_path(path) }
+
+      context "when the icon exists" do
+        let(:path) { "media/images/google.svg" }
+
+        it "returns the file path to the asset" do
+          expect(subject.to_s).to match(
+            %r{^#{Rails.public_path}/packs-test/media/images/google-[a-z0-9]+\.svg}
+          )
+        end
+      end
+
+      context "when the icon does not exist" do
+        let(:path) { "media/images/hooli.svg" }
+
+        it "returns nil" do
+          expect(subject).to be_nil
+        end
+      end
+
+      context "when using a custom host" do
+        let(:path) { "media/images/google.svg" }
+
+        before do
+          allow(helper.config).to receive(:asset_host).and_return("https://assets.example.org")
+        end
+
+        # Ensures the asset_path_pack would normally return the asset host in
+        # case there are any API changes in Rails.
+        it "works expectedly" do
+          expect(helper.asset_pack_path(path)).to match(%r{^https://assets.example.org/packs-test})
+        end
+
+        it "returns the file path to the asset" do
+          expect(subject.to_s).to match(
+            %r{^#{Rails.public_path}/packs-test/media/images/google-[a-z0-9]+\.svg}
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb b/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
index fb4cca394fb8c..5b566327012ad 100644
--- a/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/newsletters_helper_spec.rb
@@ -36,13 +36,13 @@ module Decidim
 
         let(:newsletter) { create(:newsletter) }
 
-        it { is_expected.to eq(decidim.root_url(host: organization.host) + utm_codes(organization.host, newsletter.id.to_s)) }
+        it { is_expected.to eq(decidim.root_url(host: organization.host, port: Capybara.server_port) + utm_codes(organization.host, newsletter.id.to_s)) }
       end
 
       describe "when newsletter not present" do
         subject { helper.custom_url_for_mail_root(organization) }
 
-        it { is_expected.to eq(decidim.root_url(host: organization.host)) }
+        it { is_expected.to eq(decidim.root_url(host: organization.host, port: Capybara.server_port)) }
       end
     end
   end
diff --git a/decidim-core/spec/helpers/decidim/short_link_helper_spec.rb b/decidim-core/spec/helpers/decidim/short_link_helper_spec.rb
new file mode 100644
index 0000000000000..ed724183d977d
--- /dev/null
+++ b/decidim-core/spec/helpers/decidim/short_link_helper_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ShortLinkHelper do
+    describe "#short_url" do
+      subject { helper.short_url(**kwargs) }
+
+      let(:kwargs) { { route_name: route_name, params: params }.compact }
+      let(:route_name) { nil }
+      let(:params) { nil }
+      let(:target) { create(:dummy_resource) }
+      let(:organization) { target.organization }
+
+      let(:current_routes) { mounted_helpers.public_send(mounted_engine_name).routes }
+      let(:mounted_helpers) do
+        Class.new { include Rails.application.routes.mounted_helpers }.new
+      end
+      let(:mounted_engine_name) { :decidim }
+
+      before do
+        allow(helper).to receive(:_routes).and_return(current_routes)
+      end
+
+      shared_examples "working short link" do |target_route_name|
+        let(:organization_url) { "http://#{organization.host}:#{Capybara.server_port}" }
+        let(:expected_url_pattern) { %r{^#{organization_url}/s/[a-zA-Z0-9]{10}$} }
+        let(:short_link) { Decidim::ShortLink.order(:id).last }
+
+        before do
+          expect { subject }.to change(Decidim::ShortLink, :count).by(1)
+        end
+
+        it "returns the short URL to a resource" do
+          expect(subject).to match(expected_url_pattern)
+        end
+
+        it "maps the correct attributes to the short link" do
+          expect(short_link.target).to eq(expected_target)
+          expect(short_link.organization).to eq(organization)
+          expect(short_link.mounted_engine_name).to eq(mounted_engine_name.to_s)
+          expect(short_link.route_name).to eq("root")
+          expect(short_link.params).to eq({})
+        end
+
+        context "and a route name" do
+          let(:route_name) { target_route_name }
+
+          it "maps the correct route name attribute to the short link" do
+            expect(short_link.route_name).to eq(target_route_name.to_s)
+          end
+
+          it "generates the correct target URL" do
+            expect(short_link.target_url).to eq(expected_resource_url)
+          end
+        end
+
+        context "and parameters" do
+          let(:params) { { foo: "bar", baz: "biz" } }
+
+          it "maps the correct params attribute to the short link" do
+            expect(short_link.params).to eq("baz" => "biz", "foo" => "bar")
+          end
+        end
+      end
+
+      context "with a component" do
+        let(:mounted_engine_name) { :decidim_participatory_process_dummy }
+        let(:expected_target) { target.component }
+
+        before do
+          allow(helper).to receive(:current_component).and_return(target.component)
+        end
+
+        it_behaves_like "working short link", :dummy_resources do
+          let(:expected_resource_url) { "#{organization_url}/processes/#{target.participatory_space.slug}/f/#{target.component.id}/dummy_resources" }
+        end
+      end
+
+      context "with a participatory space" do
+        let(:mounted_engine_name) { :decidim_participatory_processes }
+        let(:expected_target) { target.participatory_space }
+
+        before do
+          allow(helper).to receive(:current_participatory_space).and_return(target.participatory_space)
+        end
+
+        it_behaves_like "working short link", :participatory_process do
+          let(:expected_resource_url) { "#{organization_url}/processes/#{target.participatory_space.slug}" }
+        end
+      end
+
+      context "with an organization" do
+        let(:organization) { create(:organization) }
+        let(:target) { organization }
+        let(:expected_target) { organization }
+
+        before do
+          allow(helper).to receive(:current_organization).and_return(target)
+        end
+
+        it_behaves_like "working short link", :pages do
+          let(:expected_resource_url) { "#{organization_url}/pages" }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/helpers/decidim/translations_helper_spec.rb b/decidim-core/spec/helpers/decidim/translations_helper_spec.rb
index b3000cc2b18c4..705041591e640 100644
--- a/decidim-core/spec/helpers/decidim/translations_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/translations_helper_spec.rb
@@ -15,7 +15,7 @@ module Decidim
       it "translates the attribute against the current locale" do
         attribute = { "ca" => "Hola", "zh-CN" => "你好" }
 
-        I18n.with_locale(:'zh-CN') do
+        I18n.with_locale(:"zh-CN") do
           expect(helper.translated_attribute(attribute)).to eq("你好")
         end
       end
@@ -25,7 +25,7 @@ module Decidim
           it "uses the default locale" do
             attribute = { "ca" => "Hola", "en" => "Hello" }
 
-            I18n.with_locale(:'zh-CN') do
+            I18n.with_locale(:"zh-CN") do
               expect(helper.translated_attribute(attribute)).to eq("Hello")
             end
           end
@@ -35,7 +35,7 @@ module Decidim
           it "returns the first available string" do
             attribute = { "ca" => "Hola" }
 
-            I18n.with_locale(:'zh-CN') do
+            I18n.with_locale(:"zh-CN") do
               expect(helper.translated_attribute(attribute)).to eq("Hola")
             end
           end
@@ -48,7 +48,7 @@ module Decidim
         it "uses the given organization default locale" do
           attribute = { "ca" => "Hola", "en" => "Hello" }
 
-          I18n.with_locale(:'zh-CN') do
+          I18n.with_locale(:"zh-CN") do
             expect(helper.translated_attribute(attribute, other_organization)).to eq("Hola")
           end
         end
diff --git a/decidim-core/spec/jobs/decidim/data_portability_export_job_spec.rb b/decidim-core/spec/jobs/decidim/download_your_data_export_job_spec.rb
similarity index 81%
rename from decidim-core/spec/jobs/decidim/data_portability_export_job_spec.rb
rename to decidim-core/spec/jobs/decidim/download_your_data_export_job_spec.rb
index c287cae7cd9b1..a167c0ffb4ccd 100644
--- a/decidim-core/spec/jobs/decidim/data_portability_export_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/download_your_data_export_job_spec.rb
@@ -3,13 +3,13 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilityExportJob do
+  describe DownloadYourDataExportJob do
     let(:organization) { create :organization }
     let!(:user) { create(:user, organization: organization) }
 
     it "sends an email with the result of the export" do
       perform_enqueued_jobs do
-        DataPortabilityExportJob.perform_now(user, "CSV")
+        DownloadYourDataExportJob.perform_now(user, "CSV")
       end
 
       email = last_email
diff --git a/decidim-core/spec/jobs/decidim/email_notification_generator_job_spec.rb b/decidim-core/spec/jobs/decidim/email_notification_generator_job_spec.rb
index 932e49b8441ad..d1da9ba9c4bd2 100644
--- a/decidim-core/spec/jobs/decidim/email_notification_generator_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/email_notification_generator_job_spec.rb
@@ -24,7 +24,7 @@
     let(:extra) { double }
 
     it "delegates the work to the class" do
-      expect(Decidim::EmailNotificationGenerator)
+      allow(Decidim::EmailNotificationGenerator)
         .to receive(:new)
         .with(event, event_class, resource, followers, affected_users, extra)
         .and_return(generator)
diff --git a/decidim-core/spec/jobs/decidim/machine_translation_resource_job_spec.rb b/decidim-core/spec/jobs/decidim/machine_translation_resource_job_spec.rb
index 5149804238c79..431c908b827fa 100644
--- a/decidim-core/spec/jobs/decidim/machine_translation_resource_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/machine_translation_resource_job_spec.rb
@@ -13,7 +13,7 @@ module Decidim
       allow(Decidim).to receive(:machine_translation_service_klass).and_return(Decidim::Dev::DummyTranslator)
     end
 
-    context "when the  default locale of translatable field changes" do
+    context "when the default locale of translatable field changes" do
       before do
         updated_title = { en: "Updated Title" }
         process.update(title: updated_title)
diff --git a/decidim-core/spec/jobs/decidim/metric_job_spec.rb b/decidim-core/spec/jobs/decidim/metric_job_spec.rb
index b68e03ea11049..947a2e10cdf2e 100644
--- a/decidim-core/spec/jobs/decidim/metric_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/metric_job_spec.rb
@@ -20,12 +20,12 @@
     let(:manager_object) { double :manager_object }
 
     it "executes manager actions" do
-      expect(manager_class)
+      allow(manager_class)
         .to receive(:new)
         .with(day, organization)
         .and_return(manager_object)
 
-      expect(manager_object)
+      allow(manager_object)
         .to receive(:valid?)
         .and_return(true)
 
diff --git a/decidim-core/spec/jobs/decidim/newsletters_opt_in_job_spec.rb b/decidim-core/spec/jobs/decidim/newsletters_opt_in_job_spec.rb
index 4fc5ee1b23cf8..bd353eb29f2a2 100644
--- a/decidim-core/spec/jobs/decidim/newsletters_opt_in_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/newsletters_opt_in_job_spec.rb
@@ -18,7 +18,7 @@
     let(:mailer) { double :mailer }
 
     it "send an email to user" do
-      expect(Decidim::NewslettersOptInMailer)
+      allow(Decidim::NewslettersOptInMailer)
         .to receive(:notify)
         .with(user, token)
         .and_return(mailer)
diff --git a/decidim-core/spec/jobs/decidim/notification_generator_for_recipient_job_spec.rb b/decidim-core/spec/jobs/decidim/notification_generator_for_recipient_job_spec.rb
index 4b8cf7692d39e..f4a419e8f3a8b 100644
--- a/decidim-core/spec/jobs/decidim/notification_generator_for_recipient_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/notification_generator_for_recipient_job_spec.rb
@@ -19,14 +19,24 @@
     let(:recipient) { double :recipient }
     let(:extra) { double }
     let(:generator) { double :generator }
+    let(:notification) { double :notification }
+    let(:notification_sender) { double :notification_sender }
 
     it "delegates the work to the class" do
-      expect(Decidim::NotificationGeneratorForRecipient)
+      allow(Decidim::NotificationGeneratorForRecipient)
         .to receive(:new)
         .with(event, event_class, resource, recipient, :follower, extra)
         .and_return(generator)
-      expect(generator)
+      allow(generator)
         .to receive(:generate)
+        .and_return(notification)
+
+      allow(Decidim::SendPushNotification)
+        .to receive(:new)
+        .and_return(notification_sender)
+      expect(notification_sender)
+        .to receive(:perform)
+        .with(notification)
 
       subject.perform_now(event, event_class_name, resource, recipient, :follower, extra)
     end
diff --git a/decidim-core/spec/jobs/decidim/notification_generator_job_spec.rb b/decidim-core/spec/jobs/decidim/notification_generator_job_spec.rb
index d7ead04dd3b0b..1cec85f8aa823 100644
--- a/decidim-core/spec/jobs/decidim/notification_generator_job_spec.rb
+++ b/decidim-core/spec/jobs/decidim/notification_generator_job_spec.rb
@@ -24,7 +24,7 @@
     let(:extra) { double }
 
     it "delegates the work to the class" do
-      expect(Decidim::NotificationGenerator)
+      allow(Decidim::NotificationGenerator)
         .to receive(:new)
         .with(event, event_class, resource, followers, affected_users, extra)
         .and_return(generator)
diff --git a/decidim-core/spec/jobs/decidim/reminder_generator_job_spec.rb b/decidim-core/spec/jobs/decidim/reminder_generator_job_spec.rb
new file mode 100644
index 0000000000000..e3dfe1eee55b9
--- /dev/null
+++ b/decidim-core/spec/jobs/decidim/reminder_generator_job_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::ReminderGeneratorJob do
+  subject { described_class.perform_now(generator_class) }
+
+  let(:generator_class) do
+    double(
+      constantize: constantized_class,
+      generate: double
+    )
+  end
+
+  let(:constantized_class) do
+    double(
+      new: generator
+    )
+  end
+
+  let(:generator) { double }
+
+  context "when there is generator class" do
+    describe "#perform" do
+      it "creates generator and calls generate" do
+        expect(generator).to receive(:generate)
+
+        subject
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/asset_router/pipeline_spec.rb b/decidim-core/spec/lib/asset_router/pipeline_spec.rb
new file mode 100644
index 0000000000000..edd3feedacf9b
--- /dev/null
+++ b/decidim-core/spec/lib/asset_router/pipeline_spec.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::AssetRouter
+  describe Pipeline do
+    subject { router }
+
+    let(:router) { described_class.new(asset, model: model) }
+    let(:asset) { "media/images/decidim-logo.svg" }
+    let(:model) { nil }
+
+    let(:correct_asset_path) { ActionController::Base.helpers.asset_pack_path(asset) }
+
+    describe "#url" do
+      subject { router.url }
+
+      it { is_expected.to eq("//localhost:#{Capybara.server_port}#{correct_asset_path}") }
+
+      context "when using the default HTTP port" do
+        before do
+          allow(ENV).to receive(:fetch).and_call_original
+          allow(ENV).to receive(:fetch).with("PORT", Capybara.server_port).and_return(80)
+        end
+
+        it { is_expected.to eq("//localhost:#{Capybara.server_port}#{correct_asset_path}") }
+      end
+
+      context "when the system is configured to be served over HTTPS" do
+        before do
+          allow(Rails.application.config).to receive(:force_ssl).and_return(true)
+        end
+
+        it { is_expected.to eq("https://localhost:#{Capybara.server_port}#{correct_asset_path}") }
+
+        context "and using the default HTTPS port" do
+          before do
+            allow(ENV).to receive(:fetch).and_call_original
+            allow(ENV).to receive(:fetch).with("PORT", Capybara.server_port).and_return(443)
+          end
+
+          it { is_expected.to eq("https://localhost:#{Capybara.server_port}#{correct_asset_path}") }
+        end
+      end
+
+      context "when the host cannot be resolved" do
+        before do
+          allow(Rails.env).to receive(:test?).and_return(false)
+        end
+
+        it { is_expected.to eq(correct_asset_path) }
+      end
+
+      context "with custom host configuration" do
+        before do
+          allow(ENV).to receive(:fetch).and_call_original
+          allow(ENV).to receive(:fetch).with("HOSTNAME", "localhost").and_return("example.org")
+        end
+
+        it { is_expected.to eq("//example.org:#{Capybara.server_port}#{correct_asset_path}") }
+      end
+
+      context "with a custom asset host configured for the Rails application" do
+        before do
+          allow(Rails.configuration.action_controller).to receive(:asset_host).and_return("cdn.example.org")
+        end
+
+        it { is_expected.to eq("//cdn.example.org:#{Capybara.server_port}#{correct_asset_path}") }
+      end
+
+      context "with a model" do
+        let(:model) { create(:user) }
+
+        it { is_expected.to eq("//#{model.organization.host}:#{Capybara.server_port}#{correct_asset_path}") }
+
+        context "and a custom assets host configured for the Rails application" do
+          before do
+            allow(Rails.configuration.action_controller).to receive(:asset_host).and_return("cdn.example.org")
+          end
+
+          it { is_expected.to eq("//cdn.example.org:#{Capybara.server_port}#{correct_asset_path}") }
+        end
+
+        context "when given an organization as the model" do
+          let(:model) { create(:organization) }
+
+          it { is_expected.to eq("//#{model.host}:#{Capybara.server_port}#{correct_asset_path}") }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/asset_router/storage_spec.rb b/decidim-core/spec/lib/asset_router/storage_spec.rb
new file mode 100644
index 0000000000000..f378554f1c235
--- /dev/null
+++ b/decidim-core/spec/lib/asset_router/storage_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::AssetRouter
+  describe Storage do
+    subject { router }
+
+    let(:router) { described_class.new(asset) }
+    let(:asset) { organization.official_img_header }
+    let(:organization) { create(:organization) }
+
+    describe "#url" do
+      subject { router.url(**options) }
+
+      let(:options) { {} }
+      let(:default_port) { Capybara.server_port }
+
+      context "with an ActiveStorage::Attached" do
+        it "creates the route to the blob" do
+          expect(subject).to match(%r{^http://localhost:#{default_port}/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+        end
+
+        context "with extra URL options" do
+          let(:options) { { port: nil, host: "custom.host", utm_source: "website", utm_medium: "email", utm_campaign: "testing" } }
+
+          it "handles the extra URL options correctly" do
+            expect(subject).to match(%r{^http://custom.host/rails/active_storage/blobs/redirect/.*/avatar.jpg\?utm_campaign=testing&utm_medium=email&utm_source=website$})
+          end
+        end
+      end
+
+      context "with a variant" do
+        let(:asset) { organization.official_img_header.variant(resize_to_fit: [160, 160]) }
+
+        it "creates the route to the variant" do
+          expect(subject).to match(%r{^http://localhost:#{default_port}/rails/active_storage/representations/redirect/.*/avatar.jpg$})
+        end
+      end
+
+      context "when the CDN host is defined" do
+        before do
+          allow(Rails.application.secrets).to receive(:dig).and_call_original
+          allow(Rails.application.secrets).to receive(:dig).with(:storage, :cdn_host).and_return("https://cdn.example.org")
+        end
+
+        it "creates the route to the CDN blob" do
+          expect(subject).to match(%r{^https://cdn.example.org/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+        end
+
+        context "with extra URL options" do
+          let(:options) { { utm_source: "website", utm_medium: "email", utm_campaign: "testing" } }
+
+          it "handles the extra URL options correctly" do
+            expect(subject).to match(%r{^https://cdn.example.org/rails/active_storage/blobs/redirect/.*/avatar.jpg\?utm_campaign=testing&utm_medium=email&utm_source=website$})
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attachment_attributes_spec.rb b/decidim-core/spec/lib/attachment_attributes_spec.rb
index d839b69491c82..d49e0515164dd 100644
--- a/decidim-core/spec/lib/attachment_attributes_spec.rb
+++ b/decidim-core/spec/lib/attachment_attributes_spec.rb
@@ -11,7 +11,7 @@ def self.model_name
         end
 
         include ActiveModel::Model
-        include Virtus.model
+        include Decidim::AttributeObject::Model
         include AttachmentAttributes
       end
     end
@@ -19,8 +19,8 @@ def self.model_name
     let(:model) { klass.new }
 
     describe ".attachments_attribute do" do
-      let(:attachments) { create_list(:attachment, 10) }
-      let(:attachment_ids) { attachments.map(&:id).map(&:to_s) }
+      let(:photos) { create_list(:attachment, 10) }
+      let(:photos_ids) { photos.map(&:id).map(&:to_s) }
 
       before do
         klass.class_eval do
@@ -29,21 +29,47 @@ def self.model_name
       end
 
       it "creates the photos and add_photos array arguments" do
-        expect(klass.attribute_set[:photos].type.primitive).to be(Array)
-        expect(klass.attribute_set[:photos].type.member_type.primitive).to be(String)
-        expect(klass.attribute_set[:add_photos].type.primitive).to be(Array)
-        expect(klass.attribute_set[:add_photos].type.member_type.primitive).to be(BasicObject)
+        expect(klass.attribute_types["photos"]).to be_a(Decidim::Attributes::Array)
+        expect(klass.attribute_types["photos"].value_type).to be(Integer)
+        expect(klass.attribute_types["add_photos"]).to be_a(Decidim::Attributes::Array)
+        expect(klass.attribute_types["add_photos"].value_type).to be(Object)
       end
 
       it "adds the argument reader method that converts the IDs to attachments" do
-        model.photos = attachment_ids
-        expect(model.photos).to match_array(attachments)
+        model.photos = photos_ids
+        expect(model.photos).to match_array(photos)
       end
 
       it "returns the original value if the original value is not an array" do
-        model.instance_variable_set(:@photos, "test")
+        model.photos = "test"
         expect(model.photos).to eq("test")
       end
+
+      context "with two attachments attributes" do
+        let(:documents) { create_list(:attachment, 10) }
+        let(:documents_ids) { documents.map(&:id).map(&:to_s) }
+
+        before do
+          klass.class_eval do
+            attachments_attribute :documents
+          end
+        end
+
+        it "creates the documents and add_documents array arguments" do
+          expect(klass.attribute_types["documents"]).to be_a(Decidim::Attributes::Array)
+          expect(klass.attribute_types["documents"].value_type).to be(Integer)
+          expect(klass.attribute_types["add_documents"]).to be_a(Decidim::Attributes::Array)
+          expect(klass.attribute_types["add_documents"].value_type).to be(Object)
+        end
+
+        it "adds the argument reader method that converts the IDs to attachments" do
+          model.photos = photos_ids
+          expect(model.photos).to match_array(photos)
+
+          model.documents = documents_ids
+          expect(model.documents).to match_array(documents)
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/spec/lib/attribute_encryptor_spec.rb b/decidim-core/spec/lib/attribute_encryptor_spec.rb
index 21c1b35d1a44d..8ede7eaa9a9f0 100644
--- a/decidim-core/spec/lib/attribute_encryptor_spec.rb
+++ b/decidim-core/spec/lib/attribute_encryptor_spec.rb
@@ -9,7 +9,7 @@ module Decidim
         let(:value) { "" }
 
         it "returns nil" do
-          expect(described_class.decrypt(value)).to eq(nil)
+          expect(described_class.decrypt(value)).to be_nil
         end
       end
 
diff --git a/decidim-core/spec/lib/attribute_object/form_spec.rb b/decidim-core/spec/lib/attribute_object/form_spec.rb
new file mode 100644
index 0000000000000..75bd80603edb8
--- /dev/null
+++ b/decidim-core/spec/lib/attribute_object/form_spec.rb
@@ -0,0 +1,514 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AttributeObject::Form do
+    subject { form.new(attributes) }
+
+    let(:form) do
+      c = Class.new(described_class) do
+        mimic :person
+
+        attribute :name, String
+        attribute :email, String
+        attribute :boss, const_get(:Boolean), default: false
+
+        attribute :any
+
+        validates :name, presence: true
+        validates :email, presence: true
+      end
+
+      c.attribute :drinks, Array[drinkform]
+      c.attribute(:foods, { Symbol => foodform })
+      c.attribute :gadgets, Array[gadgetmodel]
+      c.attribute :attachables, attachablesform
+
+      c
+    end
+    let(:drinkform) do
+      Class.new(described_class) do
+        mimic :drink
+
+        attribute :name, String
+
+        validates :name, presence: true
+
+        attr_reader :secret_sauce
+
+        def map_model(model)
+          @secret_sauce = model.custom_sauce
+        end
+      end
+    end
+    let(:foodform) do
+      # Extends drinkform
+      Class.new(drinkform) do
+        mimic :food
+
+        attribute :vegan, const_get(:Boolean), default: false
+      end
+    end
+    let(:gadgetmodel) do
+      Class.new do
+        include ActiveModel::Model
+
+        attr_accessor :brand, :name
+
+        validates :brand, presence: true
+        validates :name, presence: true
+
+        def self.model_name
+          ActiveModel::Name.new(self, nil, "Gadget")
+        end
+      end
+    end
+    let(:attachablesform) do
+      Class.new(described_class) do
+        mimic :attachables
+
+        attribute :attachments, Array, default: []
+      end
+    end
+    let(:attributes) { valid_attributes }
+    let(:valid_attributes) do
+      {
+        id: 1,
+        name: "John",
+        email: "john@example.org",
+        boss: true,
+        drinks: [{ name: "Water" }, { name: "Cola" }, { name: "Beer" }],
+        foods: { meatballs: { name: "Meatballs" }, voner: { name: "Vöner", vegan: true } },
+        gadgets: [gadgetmodel.new(brand: "Pear", name: "myFone"), gadgetmodel.new(brand: "Sahara", name: "Quench")]
+      }
+    end
+
+    describe ".mimic" do
+      subject do
+        c = Class.new(described_class)
+        c.mimic(mimicked_name)
+        c
+      end
+
+      let(:mimicked_name) { :foo }
+
+      it "sets the mimicked model name correctly" do
+        expect(subject.mimicked_model_name).to be(:foo)
+      end
+
+      context "with a String" do
+        let(:mimicked_name) { "Test::FooBar" }
+
+        it "converts the mimicked model name correctly" do
+          expect(subject.mimicked_model_name).to be(:"test/foo_bar")
+        end
+      end
+
+      context "with a constant" do
+        let(:mimicked_name) { Decidim::DummyResources::DummyResource }
+
+        it "converts the mimicked model name correctly" do
+          expect(subject.mimicked_model_name).to be(:"decidim/dummy_resources/dummy_resource")
+        end
+      end
+    end
+
+    describe ".mimicked_model_name" do
+      subject { Class.new(described_class) }
+
+      it "calls infer_model_name when the mimicked name is not set" do
+        name = double
+        allow(subject).to receive(:infer_model_name).and_return(name)
+        expect(subject.mimicked_model_name).to eq(name)
+      end
+
+      it "returns the mimicked name when it is set" do
+        name = double
+        subject.instance_variable_set(:@model_name, name)
+        expect(subject.mimicked_model_name).to eq(name)
+      end
+    end
+
+    describe ".infer_model_name" do
+      subject { Class.new(described_class) }
+
+      it "returns :form when the name is not set" do
+        expect(subject.infer_model_name).to be(:form)
+      end
+
+      it "returns the converted name when it is set" do
+        expect(subject).to receive(:name).twice.and_return("FooBar::Baz")
+        expect(subject.infer_model_name).to be(:baz)
+      end
+
+      it "returns :form when the class name is Form" do
+        expect(subject).to receive(:name).twice.and_return("Form")
+        expect(subject.infer_model_name).to be(:form)
+      end
+
+      it "strips the ending Form of the name when the class name ends with the Form suffix" do
+        expect(subject).to receive(:name).twice.and_return("FooBar::BazForm")
+        expect(subject.infer_model_name).to be(:baz)
+      end
+    end
+
+    describe ".model_name" do
+      subject { Class.new(described_class) }
+
+      before do
+        allow(subject).to receive(:name).and_return("FooBar::Baz")
+      end
+
+      it "returns an instance of ActiveModel::Name correctly initialized" do
+        expect(subject.model_name).to be_a(ActiveModel::Name)
+        expect(subject.model_name.singular).to eq("baz")
+        expect(subject.model_name.plural).to eq("bazs")
+      end
+    end
+
+    describe ".from_model" do
+      subject { form.from_model(model) }
+
+      let(:model) do
+        OpenStruct.new(
+          id: 1,
+          name: "John",
+          email: "john@example.org",
+          boss: "0",
+          drinks: [{ name: "Water" }],
+          foods: { voner: { name: "Vöner", vegan: true } },
+          attachments: attachments,
+          attachables: attachables
+        )
+      end
+      let(:attachments) { create_list(:attachment, 5) }
+      let(:attachables) { [] }
+
+      it "initiates the form and the sub-forms correctly" do
+        expect(subject).to be_a(form)
+        expect(subject.id).to eq(1)
+        expect(subject.name).to eq("John")
+        expect(subject.email).to eq("john@example.org")
+        expect(subject.boss).to be(false)
+        expect(subject.drinks.count).to eq(1)
+        expect(subject.drinks[0].name).to eq("Water")
+        expect(subject.foods.count).to eq(1)
+        expect(subject.foods[:voner].name).to eq("Vöner")
+        expect(subject.foods[:voner].vegan).to be(true)
+        expect(subject.gadgets.empty?).to be(true)
+        expect(subject.attachables.attachments).to eq(attachments)
+      end
+
+      context "when Active Record objects are provided as nested attribute values" do
+        let(:drink_class) do
+          Class.new(ApplicationRecord) do
+            self.table_name = :decidim_dummy_resources_dummy_resources
+
+            def custom_sauce
+              "foobar"
+            end
+          end
+        end
+        let(:drink) { drink_class.new }
+
+        let(:model) do
+          OpenStruct.new(id: 1, drinks: [drink])
+        end
+
+        it "calls the map_model method on the created nested form object" do
+          expect(subject.drinks.first.secret_sauce).to eq("foobar")
+        end
+      end
+
+      context "when Active Record Relation is provided as nested attribute value for a non-array type attribute" do
+        let(:attachables) { Decidim::DummyResources::DummyResource.where(id: dummy_resources.map(&:id)) }
+        let(:component) { create(:component) }
+        let(:dummy_resources) { create_list(:dummy_resource, 4, component: component) }
+
+        it "maps the nested attributes correctly" do
+          expect(subject.attachables.attachments).to eq(attachments)
+        end
+      end
+
+      context "when Active Record CollectionProxy is provided as nested attribute value for a non-array type attribute" do
+        let(:component) { create(:component) }
+        let(:reportable) { create(:dummy_resource, component: component) }
+        let(:moderation) { create(:moderation, reportable: reportable, report_count: 1) }
+        let!(:reports) { create_list(:report, 4, moderation: moderation) }
+
+        let(:attachables) { reportable.reports }
+
+        it "maps the nested attributes correctly" do
+          expect(subject.attachables.attachments).to eq(attachments)
+        end
+      end
+    end
+
+    describe ".from_params" do
+      subject { form.from_params(params) }
+
+      let(:base_params) { valid_attributes.except(:gadgets).merge(boss: "1") }
+      let(:params) { base_params }
+
+      shared_examples "a valid record" do
+        it "initiates the form and the sub-form correctly" do
+          expect(subject).to be_a(form)
+          expect(subject.id).to eq(1)
+          expect(subject.name).to eq("John")
+          expect(subject.email).to eq("john@example.org")
+          expect(subject.boss).to be(true)
+          expect(subject.drinks.count).to eq(3)
+          expect(subject.drinks[0].name).to eq("Water")
+          expect(subject.drinks[1].name).to eq("Cola")
+          expect(subject.drinks[2].name).to eq("Beer")
+          expect(subject.foods.count).to eq(2)
+          expect(subject.foods[:meatballs].name).to eq("Meatballs")
+          expect(subject.foods[:meatballs].vegan).to be(false)
+          expect(subject.foods[:voner].name).to eq("Vöner")
+          expect(subject.foods[:voner].vegan).to be(true)
+          expect(subject.gadgets.empty?).to be(true)
+        end
+      end
+
+      it_behaves_like "a valid record"
+
+      context "when the parameters are provided through the mimicked model name" do
+        let(:params) { { person: base_params } }
+
+        it_behaves_like "a valid record"
+      end
+
+      context "when the parameters are provided as ActionController::Parameters" do
+        let(:params) { ActionController::Parameters.new(base_params) }
+
+        it_behaves_like "a valid record"
+      end
+
+      context "with additional params" do
+        subject { form.from_params(params, additional) }
+
+        let(:additional) { { name: "Joanna" } }
+
+        it "overrides the base parameters with the additional parameters" do
+          expect(subject.name).to eq("Joanna")
+        end
+      end
+    end
+
+    describe ".hash_from" do
+      subject { described_class.hash_from(value) }
+
+      let(:hash) { { foo: "bar", "baz" => "biz" } }
+
+      shared_examples "a valid hash" do
+        it "returns the hash with indifferent access" do
+          expect(subject).to be_a(Hash)
+          expect(subject[:foo]).to eq("bar")
+          expect(subject["foo"]).to eq("bar")
+          expect(subject[:baz]).to eq("biz")
+          expect(subject["baz"]).to eq("biz")
+        end
+      end
+
+      context "with a hash" do
+        let(:value) { hash }
+
+        it_behaves_like "a valid hash"
+      end
+
+      context "with ActionController::Parameters" do
+        let(:value) { ActionController::Parameters.new(hash) }
+
+        it_behaves_like "a valid hash"
+      end
+    end
+
+    describe ".ensure_hash" do
+      subject { described_class.ensure_hash(value) }
+
+      context "when the value is not a hash" do
+        let(:value) { double }
+
+        it "returns an empty hash" do
+          expect(subject).to eq({})
+        end
+      end
+
+      context "when the value is a hash" do
+        let(:value) { { foo: "bar" } }
+
+        it "returns an empty hash" do
+          expect(subject).to be(value)
+        end
+      end
+    end
+
+    describe "#persisted?" do
+      context "when ID is not present" do
+        let(:attributes) { {} }
+
+        it "returns false" do
+          expect(subject.persisted?).to be(false)
+        end
+      end
+
+      context "when ID is present" do
+        context "and zero" do
+          let(:attributes) { { id: 0 } }
+
+          it "returns false" do
+            expect(subject.persisted?).to be(false)
+          end
+        end
+
+        context "and negative" do
+          let(:attributes) { { id: -1 } }
+
+          it "returns false" do
+            expect(subject.persisted?).to be(false)
+          end
+        end
+
+        context "and positive" do
+          let(:attributes) { { id: 1 } }
+
+          it "returns true" do
+            expect(subject.persisted?).to be(true)
+          end
+        end
+      end
+    end
+
+    describe "#to_key" do
+      it "converts the ID to an array" do
+        expect(subject.to_key).to eq([1])
+      end
+    end
+
+    describe "#to_model" do
+      it "returns itself" do
+        expect(subject.to_model).to be(subject)
+      end
+    end
+
+    describe "#to_param" do
+      it "converts the ID to string" do
+        expect(subject.to_param).to eq("1")
+      end
+    end
+
+    describe "#with_context" do
+      let(:context) { { foo: "bar", baz: "biz" } }
+
+      it "returns the model itself" do
+        expect(subject.with_context(context)).to be(subject)
+      end
+
+      it "sets the correct context values" do
+        subject.with_context(context)
+        expect(subject.context).to be_a(OpenStruct)
+        expect(subject.context.foo).to eq("bar")
+        expect(subject.context.baz).to eq("biz")
+      end
+    end
+
+    describe "#valid?" do
+      context "with valid attributes" do
+        it { is_expected.to be_valid }
+      end
+
+      context "when one of the attributes is not valid" do
+        let(:attributes) { valid_attributes.except(:email) }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when one of the sub-attributes is not valid" do
+        let(:attributes) { valid_attributes.merge(drinks: [{ name: "Water" }, {}]) }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when one of the extending sub-attributes is not valid" do
+        let(:attributes) { valid_attributes.merge(foods: { meatballs: { name: "Meatballs" }, voner: { vegan: true } }) }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context "when one of the unspecified attribute types is a Decidim::AttributeObject::Model" do
+        let(:attributes) { valid_attributes.merge(any: subrecord) }
+        let(:subklass) do
+          Class.new do
+            include Decidim::AttributeObject::Model
+            include ActiveModel::Validations
+
+            attribute :foo, String
+
+            def self.model_name
+              ActiveModel::Name.new(self, nil, "Sub")
+            end
+          end
+        end
+        let(:subrecord) { subklass.new(subattributes) }
+        let(:subattributes) { { foo: "bar" } }
+
+        context "when the attribute is valid" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when the attribute is not valid" do
+          before do
+            # Manually add an error to the sub-record
+            subrecord.errors.add(:foo, :invalid)
+          end
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      context "when one of the unspecified attribute types is a Decidim::AttributeObject::Form" do
+        let(:attributes) { valid_attributes.merge(any: subrecord) }
+        let(:subklass) do
+          Class.new(Decidim::AttributeObject::Form) do
+            attribute :foo, String
+
+            validates :foo, presence: true
+          end
+        end
+        let(:subrecord) { subklass.new(subattributes) }
+
+        before do
+          # Run the validations so that the errors are added to the subrecord
+          subrecord.valid?
+        end
+
+        context "when the attribute is valid" do
+          let(:subattributes) { { foo: "bar" } }
+
+          it { is_expected.to be_valid }
+        end
+
+        context "when the attribute is not valid" do
+          let(:subattributes) { {} }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+
+      context "when one of the ActiveModel records is not valid" do
+        before do
+          subject.gadgets[1].brand = nil
+        end
+
+        # It is correct that the ActiveModel or ActiveRecord records should not
+        # be checked against their validations.
+        it "does not care if these records are invalid" do
+          expect(subject.gadgets[1].valid?).to be(false)
+
+          expect(subject).to be_valid
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attribute_object/model_spec.rb b/decidim-core/spec/lib/attribute_object/model_spec.rb
new file mode 100644
index 0000000000000..32c0a6c438082
--- /dev/null
+++ b/decidim-core/spec/lib/attribute_object/model_spec.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AttributeObject::Model do
+    subject { model.new(attributes) }
+
+    let(:model) do
+      c = Class.new do
+        include Decidim::AttributeObject::Model
+
+        attribute :any
+        attribute :str, String
+        attribute :int, Integer
+        attribute :flt, Float
+        attribute :eng, Rails::Engine, **{}
+        attribute :arr, Array[OpenStruct]
+        attribute(:hsh, { String => OpenStruct })
+      end
+
+      c.attribute :sub, submodel
+      c.attribute :sar, Array[submodel]
+      c.attribute(:shs, { String => submodel })
+
+      c
+    end
+    let(:submodel) do
+      Class.new do
+        include Decidim::AttributeObject::Model
+
+        attribute :name, String
+        attribute :role, String
+      end
+    end
+    let(:attributes) do
+      {
+        any: double,
+        str: "string",
+        int: 1,
+        flt: 1.1,
+        eng: Decidim::Core::Engine.instance,
+        arr: [OpenStruct.new(foo: "bar"), OpenStruct.new(foo: "baz")],
+        hsh: { foo: OpenStruct.new(foo: "bar"), bar: OpenStruct.new(foo: "baz") },
+        sub: { id: 1, name: "John", role: "Dough" },
+        sar: [{ id: 1, name: "John", role: "Dough" }, { id: 2, name: "Joanna", role: "Donut" }],
+        shs: { foo: { id: 1, name: "John", role: "Dough" }, bar: { id: 2, name: "Joanna", role: "Donut" } }
+      }
+    end
+
+    it "defines all attribute methods and casts their values correctly" do
+      expect(subject.any).to eq(attributes[:any])
+      expect(subject.str).to eq("string")
+      expect(subject.int).to eq(1)
+      expect(subject.flt).to eq(1.1)
+      expect(subject.eng).to be(Decidim::Core::Engine.instance)
+      expect(subject.arr.all? { |i| i.is_a?(OpenStruct) }).to be(true)
+      expect(subject.arr[0].foo).to eq("bar")
+      expect(subject.arr[1].foo).to eq("baz")
+
+      expect(subject.sub).to be_a(submodel)
+      expect(subject.sub.id).to eq(1)
+      expect(subject.sub.name).to eq("John")
+      expect(subject.sub.role).to eq("Dough")
+
+      expect(subject.sar).to be_a(Array)
+      expect(subject.sar.all? { |i| i.is_a?(submodel) }).to be(true)
+      expect(subject.sar[0].id).to eq(1)
+      expect(subject.sar[0].name).to eq("John")
+      expect(subject.sar[0].role).to eq("Dough")
+      expect(subject.sar[1].id).to eq(2)
+      expect(subject.sar[1].name).to eq("Joanna")
+      expect(subject.sar[1].role).to eq("Donut")
+
+      expect(subject.shs).to be_a(Hash)
+      expect(subject.shs.all? { |k, i| k.is_a?(String) && i.is_a?(submodel) }).to be(true)
+      expect(subject.shs["foo"].id).to eq(1)
+      expect(subject.shs["foo"].name).to eq("John")
+      expect(subject.shs["foo"].role).to eq("Dough")
+      expect(subject.shs["bar"].id).to eq(2)
+      expect(subject.shs["bar"].name).to eq("Joanna")
+      expect(subject.shs["bar"].role).to eq("Donut")
+    end
+
+    context "with multi-dimension form attributes" do
+      let(:model) do
+        Class.new do
+          include Decidim::AttributeObject::Model
+
+          attribute(:date, { Integer => String })
+        end
+      end
+      let(:attributes) do
+        {
+          "date(1i)" => "2022",
+          "date(2i)" => "01",
+          "date(3i)" => "02"
+        }
+      end
+
+      it "converts the provided multi-attributes correctly to hashes" do
+        expect(subject.date).to eq(1 => "2022", 2 => "01", 3 => "02")
+      end
+    end
+
+    describe "#attributes" do
+      it "responds to string keys" do
+        expect(subject.attributes["any"]).to eq(attributes[:any])
+        expect(subject.attributes["str"]).to eq("string")
+        expect(subject.attributes["int"]).to eq(1)
+        expect(subject.attributes["flt"]).to eq(1.1)
+      end
+
+      it "allows slicing the attributes with string keys" do
+        expect(subject.attributes.slice("any", "str", "int", "flt")).to eq(
+          "any" => attributes[:any],
+          "str" => "string",
+          "int" => 1,
+          "flt" => 1.1
+        )
+      end
+
+      context "with deprecated keys access" do
+        it "responds to symbol keys" do
+          expect(subject.attributes[:any]).to eq(attributes[:any])
+          expect(subject.attributes[:str]).to eq("string")
+          expect(subject.attributes[:int]).to eq(1)
+          expect(subject.attributes[:flt]).to eq(1.1)
+        end
+
+        it "allows slicing the attributes with symbol keys" do
+          expect(subject.attributes.slice(:any, :str, :int, :flt)).to eq(
+            "any" => attributes[:any],
+            "str" => "string",
+            "int" => 1,
+            "flt" => 1.1
+          )
+        end
+      end
+    end
+
+    describe "#[]" do
+      it "returns the attribute value for existing attributes when accessing through #[]" do
+        expect(subject[:str]).to eq("string")
+      end
+
+      it "returns nil when the provided attribute does not exist" do
+        expect(subject[:unexisting]).to be_nil
+      end
+    end
+
+    describe "#[]=" do
+      it "assigns attribute value for existing attributes when assigning through #[]=" do
+        subject[:str] = "foo"
+        expect(subject.str).to eq("foo")
+      end
+
+      it "does nothing when trying to assign an unexisting attribute through #[]=" do
+        subject[:unexisting] = "foo"
+        expect(subject[:unexisting]).to be_nil
+      end
+    end
+
+    describe "#attributes_with_values" do
+      let(:attributes) do
+        {
+          str: "string",
+          int: 1
+        }
+      end
+
+      it "returns only the defined attributes and attributes with defaults" do
+        expect(subject.attributes_with_values).to eq(
+          str: "string",
+          int: 1,
+          arr: [],
+          hsh: {},
+          sar: [],
+          shs: {}
+        )
+      end
+    end
+
+    describe "#to_h" do
+      let(:attributes) do
+        {
+          str: "string",
+          int: 1
+        }
+      end
+
+      it "returns all attributes excluding :id in a hash with symbol keys" do
+        expect(subject.to_h).to eq(
+          any: nil,
+          str: "string",
+          int: 1,
+          flt: nil,
+          eng: nil,
+          arr: [],
+          hsh: {},
+          sub: nil,
+          sar: [],
+          shs: {}
+        )
+      end
+
+      context "with the :id attribute defined" do
+        let(:attributes) do
+          {
+            id: 123,
+            str: "string",
+            int: 1
+          }
+        end
+
+        it "returns all attributes in a hash with symbol keys" do
+          expect(subject.to_h).to eq(
+            id: 123,
+            any: nil,
+            str: "string",
+            int: 1,
+            flt: nil,
+            eng: nil,
+            arr: [],
+            hsh: {},
+            sub: nil,
+            sar: [],
+            shs: {}
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attribute_object/nested_validator_spec.rb b/decidim-core/spec/lib/attribute_object/nested_validator_spec.rb
new file mode 100644
index 0000000000000..8757e2f822f36
--- /dev/null
+++ b/decidim-core/spec/lib/attribute_object/nested_validator_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AttributeObject::NestedValidator do
+    subject { validatable.new(nested: nested) }
+
+    let(:validatable) do
+      Class.new do
+        def self.model_name
+          ActiveModel::Name.new(self, nil, "Validatable")
+        end
+
+        include Decidim::AttributeObject::Model
+        include ActiveModel::Validations
+
+        attribute :nested
+
+        validates_with Decidim::AttributeObject::NestedValidator, attributes: [:nested]
+      end
+    end
+    let(:nested) { double }
+
+    context "with an object that does not respond to #valid?" do
+      it { is_expected.to be_valid }
+    end
+
+    context "with an object that responds to #valid?" do
+      let(:nested) { double(valid?: validity) }
+      let(:validity) { true }
+
+      it { is_expected.to be_valid }
+
+      context "when the object is not valid" do
+        let(:validity) { false }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    context "with an array of objects that do not respond to #valid?" do
+      let(:nested) { [double, double] }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with an array of objects that respond to #valid?" do
+      let(:nested) { [value1, value2] }
+      let(:value1) { double(valid?: true) }
+      let(:value2) { double(valid?: true) }
+
+      it { is_expected.to be_valid }
+
+      context "when one of the objects is not valid" do
+        let(:value2) { double(valid?: false) }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    context "with a value hash of objects that do not respond to #valid?" do
+      let(:nested) { { foo: double, bar: double } }
+
+      it { is_expected.to be_valid }
+    end
+
+    context "with a value hash of objects that respond to #valid?" do
+      let(:nested) { { foo: value1, bar: value2 } }
+      let(:value1) { double(valid?: true) }
+      let(:value2) { double(valid?: true) }
+
+      it { is_expected.to be_valid }
+
+      context "when one of the objects is not valid" do
+        let(:value2) { double(valid?: false) }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attribute_object/type_map_spec.rb b/decidim-core/spec/lib/attribute_object/type_map_spec.rb
new file mode 100644
index 0000000000000..2867ccdb5d617
--- /dev/null
+++ b/decidim-core/spec/lib/attribute_object/type_map_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AttributeObject::TypeMap do
+    subject do
+      c = Class.new
+      c.include(described_class)
+
+      c
+    end
+
+    describe "Boolean" do
+      it "returns the :boolean type" do
+        expect(subject.const_get(:Boolean)).to be(:boolean)
+      end
+    end
+
+    describe "Decimal" do
+      it "returns the :decimal type" do
+        expect(subject.const_get(:Decimal)).to be(:decimal)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attribute_object/type_resolver_spec.rb b/decidim-core/spec/lib/attribute_object/type_resolver_spec.rb
new file mode 100644
index 0000000000000..80b5a0663749a
--- /dev/null
+++ b/decidim-core/spec/lib/attribute_object/type_resolver_spec.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AttributeObject::TypeResolver do
+    let(:resolver) { described_class.new }
+
+    describe "#resolve" do
+      subject { resolver.resolve(type, **options) }
+
+      let(:type) { double }
+      let(:options) { { foo: "bar" } }
+
+      context "with a Symbol type" do
+        let(:type) { :foo }
+
+        it "returns the same exact type with the provided options" do
+          expect(subject).to eq(type: type, options: options)
+        end
+      end
+
+      context "with an ActiveModel::Type::Value type" do
+        let(:type) { ActiveModel::Type::Value.new }
+
+        it "returns the same exact type with the provided options" do
+          expect(subject).to eq(type: type, options: options)
+        end
+      end
+
+      context "with a Class type" do
+        context "when implementing Decidim::AttributeObject::Model" do
+          let(:type) do
+            Class.new do
+              include Decidim::AttributeObject::Model
+            end
+          end
+
+          it "returns a :model type with the correct primitive option" do
+            expect(subject).to eq(type: :model, options: { primitive: type, foo: "bar" })
+          end
+        end
+
+        context "when ActiveRecord::Base" do
+          let(:type) { ActiveRecord::Base }
+
+          it "returns a :model type with the correct primitive option" do
+            expect(subject).to eq(type: :model, options: { primitive: type, foo: "bar" })
+          end
+        end
+
+        context "when subclass of ActiveRecord::Base" do
+          let(:type) { Decidim::User }
+
+          it "returns a :model type with the correct primitive option" do
+            expect(subject).to eq(type: :model, options: { primitive: type, foo: "bar" })
+          end
+        end
+
+        context "when Hash" do
+          let(:type) { Hash }
+
+          it "returns a :hash type with correct default key_type and value_type options" do
+            expect(subject).to eq(type: :hash, options: { key_type: Symbol, value_type: Object, default: {}, foo: "bar" })
+          end
+        end
+
+        context "when Array" do
+          let(:type) { Array }
+
+          it "returns an :array type with correct value_type option" do
+            expect(subject).to eq(type: :array, options: { value_type: Object, default: [], foo: "bar" })
+          end
+        end
+
+        context "when existing default type" do
+          let(:type) { Integer }
+
+          it "returns an :integer type with correct options" do
+            expect(subject).to eq(type: :integer, options: { foo: "bar" })
+          end
+        end
+
+        context "with a custom class without defined ActiveModel::Type" do
+          let(:type) { OpenStruct }
+
+          it "returns an :object type with the correct primitive option" do
+            expect(subject).to eq(type: :object, options: { primitive: type, foo: "bar" })
+          end
+        end
+      end
+
+      context "with a Hash type" do
+        let(:type) { { String => OpenStruct } }
+
+        it "returns a :hash type with correct key_type and value_type options" do
+          expect(subject).to eq(type: :hash, options: { key_type: String, value_type: OpenStruct, default: {}, foo: "bar" })
+        end
+
+        context "with custom default option" do
+          let(:options) { { default: { "a" => OpenStruct.new } } }
+
+          it "returns a :hash type with correct value_type and defautl options" do
+            expect(subject).to eq(type: :hash, options: { key_type: String, value_type: OpenStruct, default: options[:default] })
+          end
+        end
+      end
+
+      context "with an Array type" do
+        let(:type) { Array[OpenStruct] }
+
+        it "returns a :hash type with correct value_type option" do
+          expect(subject).to eq(type: :array, options: { value_type: OpenStruct, default: [], foo: "bar" })
+        end
+
+        context "with custom default option" do
+          let(:options) { { default: [OpenStruct.new] } }
+
+          it "returns a :hash type with correct value_type and defautl options" do
+            expect(subject).to eq(type: :array, options: { value_type: OpenStruct, default: options[:default] })
+          end
+        end
+      end
+
+      # Test the default resolver
+      context "with a String type" do
+        let(:type) { "Integer" }
+
+        context "when existing default type" do
+          let(:type) { "Integer" }
+
+          it "returns an :integer type with correct options" do
+            expect(subject).to eq(type: :integer, options: { foo: "bar" })
+          end
+        end
+
+        context "with a custom class" do
+          let(:type) { "OpenStruct" }
+
+          it "returns an :object type with the correct primitive option" do
+            expect(subject).to eq(type: :object, options: { primitive: type, foo: "bar" })
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/array_spec.rb b/decidim-core/spec/lib/attributes/array_spec.rb
new file mode 100644
index 0000000000000..f88a40bbb89aa
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/array_spec.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Array do
+    subject { type }
+
+    let(:type) { described_class.new(value_type: value_type, default: default) }
+    let(:value_type) { ::Object }
+    let(:default) { [] }
+
+    describe "#type" do
+      it "returns :array" do
+        expect(subject.type).to be(:array)
+      end
+    end
+
+    describe "#value_type" do
+      let(:value_type) { double }
+
+      it "returns the defined value type" do
+        expect(type.value_type).to be(value_type)
+      end
+    end
+
+    describe "#validate_nested?" do
+      let(:value_type) { double }
+
+      it "returns false for non-object type values" do
+        expect(subject.validate_nested?).to be(false)
+      end
+
+      context "when a module value type is provided" do
+        let(:value_type) { Decidim::AttributeObject::Model }
+
+        it "returns false because it is not a class" do
+          expect(subject.validate_nested?).to be(false)
+        end
+      end
+
+      context "when a class value type is provided" do
+        context "with a class that implements Decidim::AttributeObject::Model" do
+          let(:value_type) { Class.new { include Decidim::AttributeObject::Model } }
+
+          it "returns true" do
+            expect(subject.validate_nested?).to be(true)
+          end
+        end
+
+        context "without a class that implements Decidim::AttributeObject::Model" do
+          let(:value_type) { Class.new }
+
+          it "returns false" do
+            expect(subject.validate_nested?).to be(false)
+          end
+        end
+      end
+    end
+
+    describe "#default" do
+      let(:default) { double }
+
+      it "returns the default value" do
+        expect(type.default).to be(default)
+      end
+    end
+
+    describe "#cast" do
+      subject { type.cast(value) }
+
+      let(:value) { nil }
+
+      it "returns the default value for the provided nil value" do
+        expect(subject).to eq([])
+      end
+
+      it "does not allow editing the returned default value" do
+        subject << "foo"
+
+        expect(type.default).to eq([])
+      end
+
+      context "with custom default value" do
+        let(:default) { %w(foo bar) }
+
+        it "returns the default value for the provided nil value" do
+          expect(subject).to eq(%w(foo bar))
+        end
+
+        it "does not return the same instance of the default value" do
+          expect(subject).not_to be(default)
+        end
+      end
+
+      context "with correct value types" do
+        let(:value) { [:foo, :bar] }
+        let(:value_type) { ::Symbol }
+
+        it "returns the correct value types" do
+          expect(subject).to eq([:foo, :bar])
+        end
+      end
+
+      context "with incorrect value types" do
+        let(:value) { %w(foo bar) }
+        let(:value_type) { ::Symbol }
+
+        it "converts the correct value types" do
+          expect(subject).to eq([:foo, :bar])
+        end
+      end
+
+      context "with an object responding to to_a" do
+        let(:value) { double }
+        let(:converted_value) { %w(foo bar) }
+
+        before do
+          allow(value).to receive(:to_a).and_return(converted_value)
+        end
+
+        it "returns the value returned by the to_a method" do
+          expect(subject).to eq(converted_value)
+        end
+      end
+
+      context "with an object not responding to_a" do
+        let(:value) { "foo" }
+
+        it "returns the value wrapped in an array" do
+          expect(subject).to eq(%w(foo))
+        end
+      end
+
+      context "with a hash value" do
+        let(:value) { { a: "foo", b: "bar" } }
+
+        it "returns values of the hash" do
+          expect(subject).to eq(%w(foo bar))
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/clean_string_spec.rb b/decidim-core/spec/lib/attributes/clean_string_spec.rb
index f4ae2c48642a0..c67207359ef61 100644
--- a/decidim-core/spec/lib/attributes/clean_string_spec.rb
+++ b/decidim-core/spec/lib/attributes/clean_string_spec.rb
@@ -4,8 +4,14 @@
 
 module Decidim
   describe Attributes::CleanString do
-    describe "#coerce" do
-      subject { described_class.build(Attributes::CleanString, {}).coerce(value) }
+    describe "#type" do
+      it "returns :\"decidim/attributes/clean_string\"" do
+        expect(subject.type).to be(:"decidim/attributes/clean_string")
+      end
+    end
+
+    describe "#cast" do
+      subject { described_class.new.cast(value) }
 
       context "with long string with carriage returns" do
         let(:value) do
diff --git a/decidim-core/spec/lib/attributes/hash_spec.rb b/decidim-core/spec/lib/attributes/hash_spec.rb
new file mode 100644
index 0000000000000..2d72fcd376792
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/hash_spec.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Hash do
+    subject { type }
+
+    let(:type) { described_class.new(key_type: key_type, value_type: value_type, default: default) }
+    let(:key_type) { ::Symbol }
+    let(:value_type) { ::Object }
+    let(:default) { {} }
+
+    describe "#type" do
+      it "returns :hash" do
+        expect(subject.type).to be(:hash)
+      end
+    end
+
+    describe "#key_type" do
+      let(:key_type) { double }
+
+      it "returns the defined key type" do
+        expect(type.key_type).to be(key_type)
+      end
+    end
+
+    describe "#value_type" do
+      let(:value_type) { double }
+
+      it "returns the defined value type" do
+        expect(type.value_type).to be(value_type)
+      end
+    end
+
+    describe "#default" do
+      let(:default) { double }
+
+      it "returns the default value" do
+        expect(type.default).to be(default)
+      end
+    end
+
+    describe "#cast" do
+      subject { type.cast(value) }
+
+      let(:value) { nil }
+
+      it "returns the default value for the provided nil value" do
+        expect(subject).to eq({})
+      end
+
+      it "does not allow editing the returned default value" do
+        subject[:foo] = "bar"
+
+        expect(type.default).to eq({})
+      end
+
+      context "with custom default value" do
+        let(:default) { { foo: "bar", baz: "biz" } }
+
+        it "returns the default value for the provided nil value" do
+          expect(subject).to eq(foo: "bar", baz: "biz")
+        end
+
+        it "does not return the same instance of the default value" do
+          expect(subject).not_to be(default)
+        end
+      end
+
+      context "with correct key types" do
+        let(:value) { { foo: "bar", baz: "biz" } }
+
+        it "returns the correct key types" do
+          expect(subject).to eq(foo: "bar", baz: "biz")
+        end
+      end
+
+      context "with incorrect key types" do
+        let(:value) { { "foo" => "bar", "baz" => "biz" } }
+
+        it "converts the correct key types" do
+          expect(subject).to eq(foo: "bar", baz: "biz")
+        end
+      end
+
+      context "with correct value types" do
+        let(:value) { { foo: :bar, baz: :biz } }
+        let(:value_type) { ::Symbol }
+
+        it "returns the correct value types" do
+          expect(subject).to eq(foo: :bar, baz: :biz)
+        end
+      end
+
+      context "with incorrect value types" do
+        let(:value) { { foo: "bar", baz: "biz" } }
+        let(:value_type) { ::Symbol }
+
+        it "converts the correct value types" do
+          expect(subject).to eq(foo: :bar, baz: :biz)
+        end
+      end
+
+      context "with an object responding to to_h" do
+        let(:value) { double }
+        let(:converted_value) { { foo: "bar", baz: "biz" } }
+
+        before do
+          allow(value).to receive(:to_h).and_return(converted_value)
+        end
+
+        it "returns the value returned by the to_h method" do
+          expect(subject).to eq(converted_value)
+        end
+      end
+
+      context "with a non-hash value that does not respond to to_h" do
+        let(:value) { double }
+
+        it "returns the value itself" do
+          expect(subject).to be(value)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/integer_spec.rb b/decidim-core/spec/lib/attributes/integer_spec.rb
new file mode 100644
index 0000000000000..e6535a1645d0e
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/integer_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Integer do
+    describe "#cast" do
+      subject { described_class.new.cast(value) }
+
+      context "with a value responding to :id" do
+        let(:value) { double }
+        let(:id_value) { 123 }
+
+        before do
+          allow(value).to receive(:id).and_return(id_value)
+        end
+
+        it "returns the id of the value" do
+          expect(subject).to eq(123)
+        end
+
+        context "when the id method returns a string" do
+          let(:id_value) { "abc-123" }
+
+          it "returns the id of the value converted to integer" do
+            expect(subject).to eq(0)
+          end
+
+          context "and the string can be converted to integer" do
+            let(:id_value) { "123" }
+
+            it "returns the id of the value converted to integer" do
+              expect(subject).to eq(123)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/localized_date_spec.rb b/decidim-core/spec/lib/attributes/localized_date_spec.rb
index fc4a25e24b844..bfb75fca8f40b 100644
--- a/decidim-core/spec/lib/attributes/localized_date_spec.rb
+++ b/decidim-core/spec/lib/attributes/localized_date_spec.rb
@@ -4,8 +4,14 @@
 
 module Decidim
   describe Attributes::LocalizedDate do
-    describe "coerce" do
-      subject { described_class.build(Attributes::LocalizedDate, {}).coerce(value) }
+    describe "#type" do
+      it "returns :\"decidim/attributes/localized_date\"" do
+        expect(subject.type).to be(:"decidim/attributes/localized_date")
+      end
+    end
+
+    describe "#cast" do
+      subject { described_class.new.cast(value) }
 
       context "when given a Date" do
         let(:value) { Date.current }
@@ -40,7 +46,7 @@ module Decidim
           let(:value) { "foo" }
 
           it "returns nil" do
-            expect(subject).to eq(nil)
+            expect(subject).to be_nil
           end
         end
 
diff --git a/decidim-core/spec/lib/attributes/model_spec.rb b/decidim-core/spec/lib/attributes/model_spec.rb
new file mode 100644
index 0000000000000..04684db4bdea6
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/model_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Model do
+    subject { type }
+
+    let(:type) { described_class.new(primitive: primitive) }
+    let(:primitive) { ::Object }
+
+    describe "#type" do
+      it "returns :model" do
+        expect(subject.type).to be(:model)
+      end
+    end
+
+    describe "#cast" do
+      subject { type.cast(value) }
+
+      context "when the value is an instance of the primitive type" do
+        let(:value) { Object.new }
+
+        it "returns the value itself" do
+          expect(subject).to be(value)
+        end
+      end
+
+      context "when the value implements Decidim::AttributeObject::Model" do
+        let(:value_type) { Class.new { include Decidim::AttributeObject::Model } }
+        let(:value) { value_type.new }
+
+        it "returns the value itself" do
+          expect(subject).to be(value)
+        end
+      end
+
+      context "when the value is a hash and the primitive can be initialized with a hash" do
+        let(:primitive) do
+          Class.new do
+            include Decidim::AttributeObject::Model
+
+            attribute :name
+          end
+        end
+        let(:value) { { name: "John Doe" } }
+
+        it "returns a new instance of the primitive with the correct values" do
+          expect(subject).to be_a(primitive)
+          expect(subject.name).to eq("John Doe")
+        end
+      end
+
+      context "when the value responds to_h and the primitive can be initialized with a hash" do
+        let(:primitive) do
+          Class.new do
+            include Decidim::AttributeObject::Model
+
+            attribute :name
+          end
+        end
+        let(:value) { double }
+        let(:value_hash) { { name: "John Doe" } }
+
+        before do
+          allow(value).to receive(:to_h).and_return(value_hash)
+        end
+
+        it "returns a new instance of the primitive with the correct values" do
+          expect(subject).to be_a(primitive)
+          expect(subject.name).to eq("John Doe")
+        end
+      end
+
+      context "when the value responds attributes and the primitive can be initialized with a hash" do
+        let(:primitive) do
+          Class.new do
+            include Decidim::AttributeObject::Model
+
+            attribute :name
+          end
+        end
+        let(:value) { double }
+        let(:attributes) { { name: "John Doe" } }
+
+        before do
+          allow(value).to receive(:attributes).and_return(attributes)
+        end
+
+        it "returns a new instance of the primitive with the correct values" do
+          expect(subject).to be_a(primitive)
+          expect(subject.name).to eq("John Doe")
+        end
+      end
+
+      context "when the value is an Active Record object and the primitive is a form" do
+        let(:primitive) do
+          Class.new(Decidim::Form) do
+            attr_reader :provided_model
+
+            def map_model(model)
+              @provided_model = model
+            end
+          end
+        end
+        let(:value) { create(:organization) }
+
+        it "calls the map_model method on the created primitive record" do
+          expect(subject).to be_a(primitive)
+          expect(subject.provided_model).to be(value)
+        end
+      end
+
+      context "when the value does not match any of the expected value conditions" do
+        let(:value) { double }
+
+        it "returns the value itself" do
+          expect(subject).to be(value)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/object_spec.rb b/decidim-core/spec/lib/attributes/object_spec.rb
new file mode 100644
index 0000000000000..491f3a2eac2d5
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/object_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Object do
+    subject { type }
+
+    let(:type) { described_class.new(primitive: primitive) }
+    let(:primitive) { ::Object }
+
+    describe "#type" do
+      it "returns :object" do
+        expect(subject.type).to be(:object)
+      end
+    end
+
+    describe "#primitive" do
+      let(:primitive) { double }
+
+      it "returns the defined primitive type" do
+        expect(type.primitive).to be(primitive)
+      end
+    end
+
+    describe "#validate_nested?" do
+      let(:primitive) { double }
+
+      it "returns false for non-object type primitives" do
+        expect(subject.validate_nested?).to be(false)
+      end
+
+      context "when a module primitive is provided" do
+        let(:primitive) { Decidim::AttributeObject::Model }
+
+        it "returns false because it is not a class" do
+          expect(subject.validate_nested?).to be(false)
+        end
+      end
+
+      context "when a class primitive is provided" do
+        context "with a class that implements Decidim::AttributeObject::Model" do
+          let(:primitive) { Class.new { include Decidim::AttributeObject::Model } }
+
+          it "returns true" do
+            expect(subject.validate_nested?).to be(true)
+          end
+        end
+
+        context "without a class that implements Decidim::AttributeObject::Model" do
+          let(:primitive) { Class.new }
+
+          it "returns false" do
+            expect(subject.validate_nested?).to be(false)
+          end
+        end
+      end
+    end
+
+    describe "#cast" do
+      subject { type.cast(value) }
+
+      let(:value) { double }
+
+      it "returns the value itself" do
+        expect(subject).to be(value)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/symbol_spec.rb b/decidim-core/spec/lib/attributes/symbol_spec.rb
new file mode 100644
index 0000000000000..88800f931ad7d
--- /dev/null
+++ b/decidim-core/spec/lib/attributes/symbol_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Attributes::Symbol do
+    describe "#type" do
+      it "returns :symbol" do
+        expect(subject.type).to be(:symbol)
+      end
+    end
+
+    describe "#cast" do
+      subject { described_class.new.cast(value) }
+
+      context "with a string value" do
+        let(:value) { "foo" }
+
+        it "returns the value cast to symbol" do
+          expect(subject).to be(:foo)
+        end
+      end
+
+      context "with a constant value" do
+        let(:value) { OpenStruct }
+
+        it "returns the value cast to string and then to symbol" do
+          expect(subject).to be(:OpenStruct)
+        end
+      end
+
+      context "with a value that cannot be converted to string or to symbol" do
+        let(:value) { double }
+
+        before do
+          allow(value).to receive(:respond_to?).with(:to_sym).and_return(false)
+          allow(value).to receive(:respond_to?).with(:to_s).and_return(false)
+        end
+
+        it "returns nil" do
+          expect(subject).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/attributes/time_with_timezone_spec.rb b/decidim-core/spec/lib/attributes/time_with_timezone_spec.rb
index edeb5916faa0b..318566b89645f 100644
--- a/decidim-core/spec/lib/attributes/time_with_timezone_spec.rb
+++ b/decidim-core/spec/lib/attributes/time_with_timezone_spec.rb
@@ -4,14 +4,20 @@
 
 module Decidim
   describe Attributes::TimeWithZone do
-    describe "coerce" do
-      subject { described_class.build(Attributes::TimeWithZone, {}).coerce(value) }
+    describe "#type" do
+      it "returns :\"decidim/attributes/time_with_zone\"" do
+        expect(subject.type).to be(:"decidim/attributes/time_with_zone")
+      end
+    end
+
+    describe "#cast" do
+      subject { described_class.new.cast(value) }
 
       context "when given a Time" do
         let(:value) { Time.current }
 
         it "returns the time" do
-          expect(subject).to eq(value)
+          expect(subject).to be(value)
         end
       end
 
@@ -50,7 +56,7 @@ module Decidim
           let(:value) { "foo" }
 
           it "returns nil" do
-            expect(subject).to eq(nil)
+            expect(subject).to be_nil
           end
         end
 
diff --git a/decidim-core/spec/lib/authorization_form_builder_spec.rb b/decidim-core/spec/lib/authorization_form_builder_spec.rb
index 510b3d59258a0..36496d25fe188 100644
--- a/decidim-core/spec/lib/authorization_form_builder_spec.rb
+++ b/decidim-core/spec/lib/authorization_form_builder_spec.rb
@@ -8,7 +8,7 @@ module Decidim
     let(:record) do
       DummyAuthorizationHandler.new({})
     end
-    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(nil)) }
+    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
     let(:builder) { described_class.new(:authorization_handler, record, helper, {}) }
 
     before do
@@ -34,8 +34,8 @@ def find(selector)
       end
 
       it "does not include other handler attributes" do
-        expect(find("input#authorization_handler_id")).to eq(nil)
-        expect(find("input#authorization_handler_user")).to eq(nil)
+        expect(find("input#authorization_handler_id")).to be_nil
+        expect(find("input#authorization_handler_user")).to be_nil
       end
 
       context "when there are scopes" do
@@ -77,12 +77,12 @@ def find(selector)
 
       let(:public_attributes) do
         {
-          handler_name: String,
-          document_number: String,
-          postal_code: String,
-          birthday: Date,
-          scope_id: Integer,
-          name_and_surname: String
+          "handler_name" => :string,
+          "document_number" => :string,
+          "postal_code" => :string,
+          "birthday" => :"decidim/attributes/localized_date",
+          "scope_id" => :integer,
+          "name_and_surname" => :string
         }
       end
 
diff --git a/decidim-core/spec/lib/common_passwords_spec.rb b/decidim-core/spec/lib/common_passwords_spec.rb
index b8567ab7c7d42..80e8c5b30305d 100644
--- a/decidim-core/spec/lib/common_passwords_spec.rb
+++ b/decidim-core/spec/lib/common_passwords_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe CommonPasswords do
-    let(:subject) do
+    subject do
       Class.new(described_class) do
         def self.common_passwords_path
           Rails.root.join("tmp/common-passwords.txt")
diff --git a/decidim-core/spec/lib/component_manifest_spec.rb b/decidim-core/spec/lib/component_manifest_spec.rb
index 43ecab988637d..e6ed50121cd4e 100644
--- a/decidim-core/spec/lib/component_manifest_spec.rb
+++ b/decidim-core/spec/lib/component_manifest_spec.rb
@@ -24,13 +24,13 @@ module Decidim
       describe "run_hooks" do
         it "runs all registered hooks" do
           subject.on(:foo) do |context|
-            context[:foo_1] ||= 0
-            context[:foo_1] += 1
+            context[:foo1] ||= 0
+            context[:foo1] += 1
           end
 
           subject.on(:foo) do |context|
-            context[:foo_2] ||= 0
-            context[:foo_2] += 1
+            context[:foo2] ||= 0
+            context[:foo2] += 1
           end
 
           subject.on(:bar) do
@@ -40,8 +40,8 @@ module Decidim
 
           context = {}
           subject.run_hooks(:foo, context)
-          expect(context[:foo_1]).to eq(1)
-          expect(context[:foo_2]).to eq(1)
+          expect(context[:foo1]).to eq(1)
+          expect(context[:foo2]).to eq(1)
           expect(context[:bar]).to be_nil
         end
       end
@@ -109,8 +109,7 @@ module Decidim
     describe "permissions_class" do
       context "when permissions_class_name is set" do
         it "finds the permissions class from its name" do
-          class ::TestPermissions
-          end
+          class ::TestPermissions < Object; end
           subject.permissions_class_name = "TestPermissions"
 
           expect(subject.permissions_class).to eq(TestPermissions)
@@ -137,8 +136,7 @@ class ::TestPermissions
     describe "serializes_specific_data" do
       context "when specific_data_serializer_class_name is set" do
         it "finds the serializer class from its name" do
-          class ::TestSerializer
-          end
+          class ::TestSerializer < Object; end
           subject.specific_data_serializer_class_name = "TestSerializer"
 
           expect(subject.specific_data_serializer_class).to eq(TestSerializer)
@@ -163,8 +161,7 @@ class ::TestSerializer
 
       context "when specific_data_importer_class_name is set" do
         it "finds the serializer class from its name" do
-          class ::TestImporter
-          end
+          class ::TestImporter < Object; end
           subject.specific_data_importer_class_name = "TestImporter"
 
           expect(subject.specific_data_importer_class).to eq(TestImporter)
diff --git a/decidim-core/spec/lib/components/current_component_spec.rb b/decidim-core/spec/lib/components/current_component_spec.rb
index 46512ba82bd3d..98d5c8aa65e06 100644
--- a/decidim-core/spec/lib/components/current_component_spec.rb
+++ b/decidim-core/spec/lib/components/current_component_spec.rb
@@ -5,17 +5,18 @@
 module Decidim
   describe CurrentComponent do
     let(:request) { double(params: params, env: env) }
-    let(:subject) { described_class.new(manifest) }
     let(:params) { {} }
     let(:manifest) { Decidim.find_component_manifest("dummy") }
 
+    subject { described_class.new(manifest) }
+
     context "when the env does not contain a current organization" do
       let(:env) do
         {}
       end
 
       it "matches" do
-        expect(subject.matches?(request)).to eq(false)
+        expect(subject.matches?(request)).to be(false)
       end
     end
 
@@ -41,7 +42,7 @@ module Decidim
 
         context "when there's no component" do
           it "doesn't match" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -53,7 +54,7 @@ module Decidim
           let(:component) { create(:component) }
 
           it "matches" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -65,14 +66,14 @@ module Decidim
           let(:component) { create(:component, participatory_space: current_participatory_process) }
 
           it "matches" do
-            expect(subject.matches?(request)).to eq(true)
+            expect(subject.matches?(request)).to be(true)
           end
         end
       end
 
       context "when the env doesn't contain a current participatory space" do
         it "doesn't match" do
-          expect(subject.matches?(request)).to eq(false)
+          expect(subject.matches?(request)).to be(false)
         end
       end
     end
diff --git a/decidim-core/spec/lib/content_block_manifest_spec.rb b/decidim-core/spec/lib/content_block_manifest_spec.rb
index 4af74b202ede1..0265ddb0abab4 100644
--- a/decidim-core/spec/lib/content_block_manifest_spec.rb
+++ b/decidim-core/spec/lib/content_block_manifest_spec.rb
@@ -70,11 +70,11 @@ module Decidim
         setup = proc do |content_block|
           content_block.images = [
             {
-              name: :image_1,
+              name: :image1,
               uploader: "Decidim::ImageUploader"
             },
             {
-              name: :image_2,
+              name: :image2,
               uploader: "Decidim::ImageUploader"
             }
           ]
@@ -88,7 +88,7 @@ module Decidim
         expect(subject.cell).to eq cell
         expect(subject.name).to eq name
         image_names = subject.images.pluck(:name)
-        expect(image_names).to match_array [:image_1, :image_2]
+        expect(image_names).to match_array [:image1, :image2]
       end
     end
 
@@ -109,8 +109,8 @@ module Decidim
 
         expect(subject).to be_valid
         expect(subject.settings.attributes).to have_key(:name)
-        expect(subject.settings.attributes[:name].translated).to eq true
-        expect(subject.settings.attributes[:name].editor).to eq true
+        expect(subject.settings.attributes[:name].translated).to be true
+        expect(subject.settings.attributes[:name].editor).to be true
         expect(subject.settings.attributes[:name].type).to eq :text
       end
     end
diff --git a/decidim-core/spec/lib/decidim_spec.rb b/decidim-core/spec/lib/decidim_spec.rb
index 66d60841fd3f6..d1ded7de0fd28 100644
--- a/decidim-core/spec/lib/decidim_spec.rb
+++ b/decidim-core/spec/lib/decidim_spec.rb
@@ -4,7 +4,7 @@
 
 describe Decidim do
   it "has a version number" do
-    expect(described_class.version).not_to be nil
+    expect(described_class.version).not_to be_nil
   end
 
   describe ".seed!" do
@@ -27,12 +27,12 @@
       expect(other_railties).not_to include(receive(:load_seed))
 
       manifests = [double(name: "Component A"), double(name: "Component B")]
-      expect(described_class).to receive(:participatory_space_manifests).and_return(manifests)
+      allow(described_class).to receive(:participatory_space_manifests).and_return(manifests)
 
       expect(manifests).to all(receive(:seed!).once)
 
       application = double(railties: (decidim_railties + other_railties))
-      expect(Rails).to receive(:application).and_return application
+      allow(Rails).to receive(:application).and_return application
 
       described_class.seed!
     end
@@ -53,14 +53,14 @@
     end
 
     it "returns false for the test environment" do
-      expect(described_class.force_ssl).to eq(false)
+      expect(described_class.force_ssl).to be(false)
     end
 
     context "when the Rails.env is set to production" do
       let(:rails_env) { "production" }
 
       it "returns true" do
-        expect(described_class.force_ssl).to eq(true)
+        expect(described_class.force_ssl).to be(true)
       end
     end
 
@@ -68,7 +68,7 @@
       let(:rails_env) { "production_foo" }
 
       it "returns true" do
-        expect(described_class.force_ssl).to eq(true)
+        expect(described_class.force_ssl).to be(true)
       end
     end
 
@@ -76,7 +76,7 @@
       let(:rails_env) { "staging" }
 
       it "returns true" do
-        expect(described_class.force_ssl).to eq(true)
+        expect(described_class.force_ssl).to be(true)
       end
     end
 
@@ -84,7 +84,60 @@
       let(:rails_env) { "staging_foo" }
 
       it "returns true" do
-        expect(described_class.force_ssl).to eq(true)
+        expect(described_class.force_ssl).to be(true)
+      end
+    end
+  end
+
+  describe ".module_installed?" do
+    subject { described_class.module_installed?(mod) }
+
+    context "with default configurations" do
+      %w(
+        accountability
+        admin
+        api
+        assemblies
+        blogs
+        budgets
+        comments
+        core
+        debates
+        forms
+        generators
+        meetings
+        pages
+        participatory_processes
+        proposals
+        sortitions
+        surveys
+        system
+        templates
+        verifications
+        conferences
+        consultations
+        elections
+        initiatives
+        templates
+      ).each do |decidim_gem|
+        context decidim_gem do
+          let(:mod) { decidim_gem }
+
+          it { is_expected.to be(true) }
+        end
+      end
+    end
+
+    context "when the module is needed but does not define a module load file" do
+      let(:mod) { :foo }
+
+      before do
+        allow(Decidim::DependencyResolver.instance).to receive(:needed?).with("decidim-#{mod}").and_return(true)
+      end
+
+      it "does not raise an exception and returns false" do
+        expect { subject }.not_to raise_error
+        expect(subject).to be(false)
       end
     end
   end
diff --git a/decidim-core/spec/lib/dependency_resolver_spec.rb b/decidim-core/spec/lib/dependency_resolver_spec.rb
new file mode 100644
index 0000000000000..9d37ef44ce0aa
--- /dev/null
+++ b/decidim-core/spec/lib/dependency_resolver_spec.rb
@@ -0,0 +1,285 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "bundler/lockfile_generator"
+
+module Decidim
+  describe DependencyResolver do
+    subject { resolver }
+
+    let(:resolver) { Decidim::DependencyResolver.instance }
+    let(:root_path) { File.dirname(ENV.fetch("ENGINE_ROOT")) }
+
+    # Make sure the resolver cache won't be messed up during these tests
+    around do |example|
+      original_cache = resolver.instance_variable_get(:@cache)
+      resolver.instance_variable_set(:@cache, [])
+      example.run
+      resolver.instance_variable_set(:@cache, original_cache)
+    end
+
+    shared_examples "existing module" do
+      describe "#module_path" do
+        subject { resolver.module_path(gem) }
+
+        let(:gem_path) { gem == "decidim" ? root_path : "#{root_path}/#{gem}" }
+
+        it "returns the correct path" do
+          expect(subject).to eq("#{gem_path}/lib/#{gem.gsub("-", "/")}.rb")
+        end
+      end
+
+      describe "#available?" do
+        subject { resolver.available?(gem) }
+
+        it { is_expected.to be(true) }
+      end
+
+      describe "#loaded?" do
+        subject { resolver.loaded?(gem) }
+
+        it { is_expected.to be(true) }
+      end
+
+      describe "#needed?" do
+        subject { resolver.needed?(gem) }
+
+        it { is_expected.to be(true) }
+      end
+    end
+
+    shared_examples "unexisting module" do
+      describe "#lookup" do
+        subject { resolver.lookup(gem) }
+
+        it { is_expected.to be_nil }
+      end
+
+      describe "#module_path" do
+        subject { resolver.module_path(gem) }
+
+        it { is_expected.to be_nil }
+      end
+
+      describe "#available?" do
+        subject { resolver.available?(gem) }
+
+        it { is_expected.to be(false) }
+      end
+
+      describe "#loaded?" do
+        subject { resolver.loaded?(gem) }
+
+        it { is_expected.to be(false) }
+      end
+
+      describe "#needed?" do
+        subject { resolver.needed?(gem) }
+
+        it { is_expected.to be(false) }
+      end
+    end
+
+    describe "#available?" do
+      subject { resolver.available?("decidim-core") }
+
+      context "when the gem is available but the file does not exist" do
+        before do
+          allow(File).to receive(:exist?).and_return(false)
+        end
+
+        it { is_expected.to be(false) }
+      end
+    end
+
+    describe "#loaded?" do
+      subject { resolver.loaded?("decidim-core") }
+
+      context "when the gem is available but not loaded" do
+        before do
+          allow($LOADED_FEATURES).to receive(:include?).and_return(false)
+        end
+
+        it { is_expected.to be(false) }
+      end
+    end
+
+    %w(
+      decidim
+      decidim-accountability
+      decidim-admin
+      decidim-api
+      decidim-assemblies
+      decidim-blogs
+      decidim-budgets
+      decidim-comments
+      decidim-core
+      decidim-debates
+      decidim-forms
+      decidim-generators
+      decidim-meetings
+      decidim-pages
+      decidim-participatory_processes
+      decidim-proposals
+      decidim-sortitions
+      decidim-surveys
+      decidim-system
+      decidim-templates
+      decidim-verifications
+      decidim-conferences
+      decidim-consultations
+      decidim-elections
+      decidim-initiatives
+      decidim-templates
+    ).each do |decidim_gem|
+      context "with #{decidim_gem}" do
+        let(:gem) { decidim_gem }
+
+        describe "#lookup" do
+          subject { resolver.lookup(gem) }
+
+          it "returns Gem::Specification" do
+            expect(subject).to be_instance_of(Gem::Specification)
+            expect(subject.name).to eq(gem)
+          end
+        end
+
+        it_behaves_like "existing module"
+      end
+    end
+
+    context "with an unexisting module" do
+      let(:gem) { "decidim-foo" }
+
+      it_behaves_like "unexisting module"
+    end
+
+    context "with a gem that is not a Decidim module" do
+      let(:gem) { "rails" }
+
+      it_behaves_like "unexisting module"
+
+      context "when bundler is not available" do
+        before do
+          allow(resolver).to receive(:bundler?).and_return(false)
+        end
+
+        it_behaves_like "unexisting module"
+      end
+    end
+
+    context "with a custom Gemfile" do
+      let(:builder) do
+        b = Bundler::Dsl.new
+        b.eval_gemfile("TestGemfile", gemfile)
+        b
+      end
+      let(:definition) do
+        bd = nil
+        builder.instance_eval do
+          bd = Bundler::Definition.new("TestGemfile.lock", @dependencies, @sources, {})
+        end
+        bd
+      end
+      let(:gemfile) do
+        <<~GEMFILE
+          source "https://rubygems.org"
+
+          #{gems.map { |gem| %(gem "#{gem}", path: "#{root_path}") }.join("\n")}
+        GEMFILE
+      end
+      let(:lockfile) do
+        dummy_definition = builder.to_definition("Dummy.lock", {})
+        Bundler::LockfileGenerator.generate(dummy_definition)
+      end
+      let(:gems) { %w(decidim-core decidim-budgets) }
+
+      before do
+        # In CI the default bundle is frozen which would cause the dummy
+        # lockfile generation not to work properly as it would skip the local
+        # gemspecs. Locally you can try this running the specs with
+        # `BUNDLE_FROZEN=true`.
+        allow(Bundler).to receive(:frozen_bundle?).and_return(false)
+
+        # Silence the bundler output
+        allow(Bundler.ui).to receive(:info)
+
+        # Bundler specific to be able to pass it the TestGemfile.lock contents
+        allow(File).to receive(:exist?).and_call_original
+        allow(File).to receive(:exist?).with("TestGemfile.lock").and_return(true)
+        allow(Bundler).to receive(:read_file).and_call_original
+        allow(Bundler).to receive(:read_file).with("TestGemfile.lock").and_return(lockfile)
+
+        # Return the mocked definition instead of the actual one for the resolver
+        definition.specs_for([:default]) # Materializes the spec
+        allow(Bundler).to receive(:definition).and_return(definition)
+      end
+
+      context "with decidim-core" do
+        let(:gem) { "decidim-core" }
+
+        it_behaves_like "existing module"
+      end
+
+      context "with decidim-budgets" do
+        let(:gem) { "decidim-budgets" }
+
+        it_behaves_like "existing module"
+      end
+
+      # Dependency for decidim-core
+      context "with decidim-api" do
+        let(:gem) { "decidim-api" }
+
+        it_behaves_like "existing module"
+      end
+
+      # Dependency for decidim-budgets
+      context "with decidim-comments" do
+        let(:gem) { "decidim-comments" }
+
+        it_behaves_like "existing module"
+      end
+
+      # Not listed in the Gemfile and not a dependency
+      context "with decidim-proposals" do
+        let(:gem) { "decidim-proposals" }
+
+        it_behaves_like "unexisting module"
+      end
+    end
+
+    context "when bundler is not available" do
+      let(:gem) { "decidim-core" }
+
+      before do
+        allow(resolver).to receive(:bundler?).and_return(false)
+      end
+
+      describe "#lookup" do
+        subject { resolver.lookup(gem) }
+
+        it "returns Gem::Specification" do
+          expect(subject).to be_instance_of(Gem::Specification)
+          expect(subject.name).to eq(gem)
+        end
+      end
+
+      describe "#needed?" do
+        subject { resolver.needed?(gem) }
+
+        it { is_expected.to be(true) }
+
+        context "when the gem is not loaded" do
+          before do
+            allow($LOADED_FEATURES).to receive(:include?).and_return(false)
+          end
+
+          it { is_expected.to be(false) }
+        end
+      end
+
+      it_behaves_like "existing module"
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_conversation_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_conversation_serializer_spec.rb
similarity index 91%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_conversation_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_conversation_serializer_spec.rb
index 06a1805277353..fce67e94c3bfb 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_conversation_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_conversation_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityConversationSerializer do
-    let(:subject) { described_class.new(conversation) }
+  describe DownloadYourDataSerializers::DownloadYourDataConversationSerializer do
+    subject { described_class.new(conversation) }
 
     let(:organization) { create(:organization) }
     let(:user) { create :user, :confirmed, organization: organization }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_follow_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_follow_serializer_spec.rb
similarity index 86%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_follow_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_follow_serializer_spec.rb
index 613a966207fc3..8f7a31fa7136f 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_follow_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_follow_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityFollowSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataFollowSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { build(:follow) }
 
     let(:serialized) { subject.serialize }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_identity_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_identity_serializer_spec.rb
similarity index 90%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_identity_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_identity_serializer_spec.rb
index 632983958b4f4..ba123e85710bb 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_identity_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_identity_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityIdentitySerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataIdentitySerializer do
+    subject { described_class.new(resource) }
     let(:user) { create(:user) }
     let(:organization) { user&.organization }
     let(:provider) { "facebook" }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_notification_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_notification_serializer_spec.rb
similarity index 89%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_notification_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_notification_serializer_spec.rb
index 733304fb2b5ae..bd30ea0f6409b 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_notification_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_notification_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityNotificationSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataNotificationSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { build(:notification) }
 
     let(:serialized) { subject.serialize }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_participatory_space_private_user_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb
similarity index 87%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_participatory_space_private_user_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb
index 982ac5c45adbb..8f49ad459cf8c 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_participatory_space_private_user_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityParticipatorySpacePrivateUserSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataParticipatorySpacePrivateUserSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { build(:participatory_space_private_user) }
 
     let(:serialized) { subject.serialize }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_report_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_report_serializer_spec.rb
similarity index 95%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_report_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_report_serializer_spec.rb
index 1001be0a46cd6..b61818807c5c5 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_report_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_report_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityReportSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataReportSerializer do
+    subject { described_class.new(resource) }
 
     let(:organization) { create(:organization) }
     let(:user) { create(:user, organization: organization) }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_user_group_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_group_serializer_spec.rb
similarity index 85%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_user_group_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_group_serializer_spec.rb
index e3d808b1a20db..ebd8f86ffd4d7 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_user_group_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_group_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityUserGroupSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataUserGroupSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { create(:user_group) }
 
     let(:serialized) { subject.serialize }
diff --git a/decidim-core/spec/lib/data_portability_serializers/data_portability_user_serializer_spec.rb b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_serializer_spec.rb
similarity index 95%
rename from decidim-core/spec/lib/data_portability_serializers/data_portability_user_serializer_spec.rb
rename to decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_serializer_spec.rb
index 0b1f2dfb05ce0..cfe6021832a27 100644
--- a/decidim-core/spec/lib/data_portability_serializers/data_portability_user_serializer_spec.rb
+++ b/decidim-core/spec/lib/download_your_data_serializers/download_your_data_user_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilitySerializers::DataPortabilityUserSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe DownloadYourDataSerializers::DownloadYourDataUserSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { create(:user) }
 
     let(:serialized) { subject.serialize }
@@ -44,7 +44,7 @@ module Decidim
       end
 
       it "includes the email on notification" do
-        expect(serialized).to include(email_on_notification: resource.email_on_notification)
+        expect(serialized).to include(notifications_sending_frequency: resource.notifications_sending_frequency)
       end
 
       it "includes the admin" do
diff --git a/decidim-core/spec/lib/env_spec.rb b/decidim-core/spec/lib/env_spec.rb
new file mode 100644
index 0000000000000..37220ea96920c
--- /dev/null
+++ b/decidim-core/spec/lib/env_spec.rb
@@ -0,0 +1,214 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe Env do
+    subject { described_class.new(name, default) }
+    let(:name) { "TEST_ENV_VAR" }
+    let(:value) { nil }
+    let(:default) { nil }
+
+    before do
+      ENV[name] = value.to_s if name.present?
+    end
+
+    after do
+      ENV.delete(name) if name.present?
+    end
+
+    shared_examples "a nil value" do
+      it "returns nil" do
+        expect(subject.value).to be_nil
+        expect(subject.to_s).to eq("")
+        expect(subject.to_i).to eq(0)
+        expect(subject.to_json).to eq("null")
+        expect(subject.blank?).to be(true)
+        expect(subject.present?).to be(false)
+        expect(subject.to_array).to eq([])
+      end
+
+      context "and has a default" do
+        let(:default) { 42 }
+
+        it "returns the default" do
+          expect(subject.value).to eq(42)
+          expect(subject.to_s).to eq("42")
+          expect(subject.to_i).to eq(42)
+          expect(subject.to_json).to eq("42")
+          expect(subject.blank?).to be(false)
+          expect(subject.present?).to be(true)
+          expect(subject.to_array).to eq(["42"])
+        end
+      end
+    end
+
+    shared_examples "a defined value" do
+      it "returns the value" do
+        expect(subject.value).not_to be_nil
+        expect(subject.value).to eq(value)
+        expect(subject.to_s).not_to eq("")
+        expect(subject.to_s).to eq(value.to_s)
+        expect(subject.to_i).to eq(value.to_s.to_i)
+        expect(subject.to_json).not_to eq("null")
+        expect(subject.to_json).to eq(value.to_json)
+        expect(subject.present?).to be(true)
+        expect(subject.blank?).to be(false)
+        expect(subject.to_array).to eq([value.to_s])
+      end
+
+      context "and has a default" do
+        let(:default) { 42 }
+
+        it "returns the default" do
+          expect(subject.value).not_to eq(42)
+          expect(subject.value).to eq(value)
+          expect(subject.to_i).to eq(value.to_s.to_i)
+          expect(subject.to_array).to eq([value.to_s])
+        end
+      end
+    end
+
+    shared_examples "a false value" do
+      it "returns false" do
+        expect(subject.value).to eq(value)
+        expect(subject.to_s).to eq(value)
+        expect(subject.to_i).to eq(0)
+        expect(subject.to_json).to eq(value.to_json)
+        expect(subject.blank?).to be(true)
+        expect(subject.present?).to be(false)
+      end
+
+      context "and has a default" do
+        let(:default) { 42 }
+
+        it "the default is ignored" do
+          expect(subject.value).to eq(value)
+          expect(subject.to_s).to eq(value)
+          expect(subject.to_json).to eq(value.to_json)
+        end
+
+        it "the default is applied" do
+          expect(subject.to_i).to eq(42)
+          expect(subject.blank?).to be(true)
+          expect(subject.present?).to be(false)
+        end
+      end
+    end
+
+    shared_examples "default_or_present as boolean" do |present|
+      it "behaves as present" do
+        expect(subject.default_or_present_if_exists).to eq(present)
+      end
+
+      context "and has a default" do
+        let(:default) { 42 }
+
+        it "behaves as present" do
+          expect(subject.default_or_present_if_exists).to eq(present)
+        end
+      end
+    end
+
+    shared_examples "default_or_present as default" do
+      it "behaves as default" do
+        expect(subject.default_or_present_if_exists).to be_nil
+      end
+
+      context "and has a default" do
+        let(:default) { 42 }
+
+        it "behaves as present" do
+          expect(subject.default_or_present_if_exists).to eq(default)
+        end
+      end
+    end
+
+    shared_examples "empty array or default" do
+      it "returns empty array" do
+        expect(subject.to_array).to eq([])
+      end
+
+      context "and has a default" do
+        let(:default) { "en,ca" }
+
+        it "returns default as array" do
+          expect(subject.to_array).to eq(%w(en ca))
+        end
+      end
+    end
+
+    describe "value" do
+      context "when empty" do
+        it_behaves_like "a nil value"
+        it_behaves_like "default_or_present as boolean", false
+      end
+
+      context "when undefined" do
+        let(:name) { "" }
+
+        it_behaves_like "a nil value"
+        it_behaves_like "default_or_present as default"
+      end
+    end
+
+    context "when value" do
+      let(:value) { "I know what I'm doing" }
+
+      it_behaves_like "a defined value"
+      it_behaves_like "default_or_present as boolean", true
+    end
+
+    context "when value is falsey" do
+      describe "false" do
+        let(:value) { "false" }
+
+        it_behaves_like "a false value"
+        it_behaves_like "default_or_present as boolean", false
+      end
+
+      describe "False" do
+        let(:value) { "False" }
+
+        it_behaves_like "a false value"
+        it_behaves_like "default_or_present as boolean", false
+      end
+
+      describe "no" do
+        let(:value) { "no" }
+
+        it_behaves_like "a false value"
+        it_behaves_like "default_or_present as boolean", false
+      end
+
+      describe "0" do
+        let(:value) { "0" }
+
+        it_behaves_like "a false value"
+        it_behaves_like "default_or_present as boolean", false
+      end
+    end
+
+    context "when value is an array" do
+      let(:value) { "en, es, fr " }
+
+      it "can convert to array using default separator" do
+        expect(subject.to_array).to eq(%w(en es fr))
+      end
+
+      context "and customize separator" do
+        let(:value) { "en,es, fr , ca " }
+
+        it "can convert to array" do
+          expect(subject.to_array(separator: ", ")).to eq(["en,es", "fr", "ca"])
+        end
+      end
+
+      context "and value is falsey" do
+        let(:value) { "False" }
+
+        it_behaves_like "empty array or default"
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/exporters/serializer_spec.rb b/decidim-core/spec/lib/exporters/serializer_spec.rb
index ebfefa2d77a23..c733156e4c4ef 100644
--- a/decidim-core/spec/lib/exporters/serializer_spec.rb
+++ b/decidim-core/spec/lib/exporters/serializer_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe Exporters::Serializer do
-    let(:subject) { described_class.new(resource) }
+    subject { described_class.new(resource) }
     let(:resource) { OpenStruct.new(id: 1, name: "John") }
 
     describe "#serialize" do
diff --git a/decidim-core/spec/lib/faker_localized_spec.rb b/decidim-core/spec/lib/faker_localized_spec.rb
index 7f944236910e6..91bb2fc391373 100644
--- a/decidim-core/spec/lib/faker_localized_spec.rb
+++ b/decidim-core/spec/lib/faker_localized_spec.rb
@@ -166,7 +166,7 @@ module Faker
           end
 
           it "does not generate machine translations" do
-            expect(subject[:machine_translations]).to be nil
+            expect(subject[:machine_translations]).to be_nil
           end
         end
 
@@ -178,7 +178,7 @@ module Faker
           end
 
           it "does not generate machine translations" do
-            expect(subject[:machine_translations]).to be nil
+            expect(subject[:machine_translations]).to be_nil
           end
         end
       end
diff --git a/decidim-core/spec/lib/filter_form_builder_spec.rb b/decidim-core/spec/lib/filter_form_builder_spec.rb
index b407ff57ae2dc..de419e9e31985 100644
--- a/decidim-core/spec/lib/filter_form_builder_spec.rb
+++ b/decidim-core/spec/lib/filter_form_builder_spec.rb
@@ -5,7 +5,7 @@
 
 module Decidim
   describe FilterFormBuilder do
-    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(nil)) }
+    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
     let(:categories) do
       create_list(:category, 3)
       Category.all
diff --git a/decidim-core/spec/lib/fingerprintable_spec.rb b/decidim-core/spec/lib/fingerprintable_spec.rb
index 22cfb64f8d739..464e26fc43bb6 100644
--- a/decidim-core/spec/lib/fingerprintable_spec.rb
+++ b/decidim-core/spec/lib/fingerprintable_spec.rb
@@ -18,9 +18,7 @@ def body
       end
     end
 
-    let(:subject) do
-      klass.new
-    end
+    subject { klass.new }
 
     context "when provided with fields" do
       before do
diff --git a/decidim-core/spec/lib/form_builder_spec.rb b/decidim-core/spec/lib/form_builder_spec.rb
index d0c7324cb0e56..6dced253a9b71 100644
--- a/decidim-core/spec/lib/form_builder_spec.rb
+++ b/decidim-core/spec/lib/form_builder_spec.rb
@@ -5,22 +5,30 @@
 
 module Decidim
   describe FormBuilder do
-    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(nil)) }
+    let(:helper) { Class.new(ActionView::Base).new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
     let(:available_locales) { %w(ca en de-CH) }
     let(:uploader) { Decidim::ApplicationUploader }
     let(:organization) { create(:organization) }
 
     let(:resource) do
-      klass = Class.new do
+      class DummyClass
         cattr_accessor :current_organization
 
         def self.model_name
           ActiveModel::Name.new(self, nil, "dummy")
         end
 
+        def self.attached_config
+          attached_config = OpenStruct.new
+          attached_config.uploader = Decidim::ImageUploader
+          {
+            image: attached_config
+          }
+        end
+
         extend ActiveModel::Translation
         include ActiveModel::Model
-        include Virtus.model
+        include Decidim::AttributeObject::Model
         include TranslatableAttributes
         include Decidim::HasUploadValidations
 
@@ -59,8 +67,10 @@ def organization
           current_organization
         end
       end
+
+      klass = DummyClass.new
       klass.current_organization = organization
-      klass.new
+      klass
     end
 
     let(:builder) { FormBuilder.new(:resource, resource, helper, {}) }
@@ -329,13 +339,32 @@ def organization
 
       it "renders the checkbox before the label text" do
         expect(output).to eq(
-          '<label for="resource_name"><input name="resource[name]" type="hidden" value="0" />' \
-            '<input type="checkbox" value="1" name="resource[name]" id="resource_name" />Name' \
+          '<label for="resource_name"><input name="resource[name]" type="hidden" value="0" autocomplete="off" />' \
+          '<input type="checkbox" value="1" name="resource[name]" id="resource_name" />Name' \
           "</label>"
         )
       end
     end
 
+    describe "#password_field" do
+      let(:output) do
+        builder.password_field :password, options
+      end
+      let(:options) { {} }
+
+      it "renders the input type password" do
+        expect(output).to eq('<label for="resource_password">Password<input autocomplete="off" type="password" name="resource[password]" id="resource_password" /></label>')
+      end
+
+      context "when autocomplete attribute is defined" do
+        let(:options) { { autocomplete: "new-password" } }
+
+        it "renders the input type password with given autocomplete attribute" do
+          expect(output).to eq('<label for="resource_password">Password<input autocomplete="new-password" type="password" name="resource[password]" id="resource_password" /></label>')
+        end
+      end
+    end
+
     describe "date_field" do
       context "when the resource has errors" do
         before do
@@ -378,12 +407,10 @@ def organization
 
       context "when the start_time is set as Time" do
         before do
-          # rubocop:disable Rails/TimeZone
           resource.start_time = Time.parse("2017-02-01T15:00:00.000Z")
-          # rubocop:enable Rails/TimeZone
         end
 
-        it { expect(resource.start_time).to be_a(DateTime) }
+        it { expect(resource.start_time).to be_a(Time) }
 
         it "formats the start date correctly" do
           expect(parsed.css("input").first.attr("data-startdate")).to eq("01/02/2017 15:00")
@@ -605,7 +632,7 @@ def organization
           end
         end
 
-        context "with min and max length " do
+        context "with min and max length" do
           let(:output) do
             builder.text_field :number
           end
@@ -619,7 +646,7 @@ def organization
           end
         end
 
-        context "with min length " do
+        context "with min length" do
           let(:output) do
             builder.text_field :min_number
           end
@@ -629,7 +656,7 @@ def organization
           end
         end
 
-        context "with max length " do
+        context "with max length" do
           let(:output) do
             builder.text_field :max_number
           end
@@ -646,7 +673,7 @@ def organization
       let(:filename) { "my_image.jpg" }
       let(:image?) { false }
       let(:blob) do
-        ActiveStorage::Blob.create_after_upload!(
+        ActiveStorage::Blob.create_and_upload!(
           io: File.open(Decidim::Dev.asset("city.jpeg")),
           filename: filename
         )
@@ -670,7 +697,7 @@ def organization
         }
       end
       let(:output) do
-        builder.upload :image, attributes
+        builder.upload(:image, attributes)
       end
 
       before do
@@ -692,6 +719,7 @@ def organization
         let(:image?) { true }
 
         context "and it is not present but uploader has default url" do
+          let(:file) { nil }
           let(:uploader) { Decidim::AvatarUploader }
 
           it "renders the 'Default image' label" do
@@ -714,12 +742,18 @@ def organization
 
       context "when it is not an image" do
         let(:filename) { "my_file.pdf" }
+        let(:blob) do
+          ActiveStorage::Blob.create_and_upload!(
+            io: File.open(Decidim::Dev.asset("Exampledocument.pdf")),
+            filename: filename
+          )
+        end
 
         context "and it is present" do
           let(:present?) { true }
 
-          it "renders the 'Current file' label" do
-            expect(output).to include("Current file")
+          it "renders the filename" do
+            expect(output).to include(%(<a href="#{url}">#{filename}</a>))
           end
 
           it "doesn't render an image tag" do
@@ -735,16 +769,8 @@ def organization
       context "when the file is present" do
         let(:present?) { true }
 
-        it "renders the delete checkbox" do
-          expect(parsed.css('input[type="checkbox"]')).not_to be_empty
-        end
-
-        context "when the optional argument is false" do
-          let(:optional) { false }
-
-          it "doesn't render the delete checkbox" do
-            expect(parsed.css('input[type="checkbox"]')).to be_empty
-          end
+        it "renders the add file button" do
+          expect(parsed.css("button.add-file")).not_to be_empty
         end
       end
 
@@ -754,10 +780,7 @@ def organization
 
         it "renders help message" do
           html = output
-          expect(html).to include("<span>This image will be:</span>")
-          expect(html).to include("<span>Resized to fit</span>")
-          expect(html).to include("<b>100 x 100 px</b>")
-          expect(parsed.css("p.help-text")).not_to be_empty
+          expect(html).to include("<li>This image will be resized to fit 100 x 100 px.</li>")
         end
       end
 
@@ -767,7 +790,10 @@ def organization
 
         it "renders calls I18n.t() with the correct scope" do
           # Upload help messages
-          expect(I18n).to receive(:t).with("explanation", scope: "custom.scope")
+          allow(I18n).to receive(:t).with(:image, scope: "activemodel.attributes.dummy").and_return("Image")
+          expect(I18n).to receive(:t).with("explanation", scope: "custom.scope", attribute: "Image")
+          expect(I18n).to receive(:t).with("decidim.forms.upload.labels.add_image")
+          expect(I18n).to receive(:t).with("decidim.forms.upload.labels.replace")
           expect(I18n).to receive(:t).with("message_1", scope: "custom.scope")
           expect(I18n).to receive(:t).with("message_2", scope: "custom.scope")
           output
@@ -780,7 +806,10 @@ def organization
 
         it "renders calls I18n.t() with the correct messages" do
           # Upload help messages
-          expect(I18n).to receive(:t).with("explanation", scope: "decidim.forms.file_help.file")
+          expect(I18n).to receive(:t).with("decidim.forms.upload.labels.add_image")
+          expect(I18n).to receive(:t).with("decidim.forms.upload.labels.replace")
+          allow(I18n).to receive(:t).with(:image, scope: "activemodel.attributes.dummy").and_return("Image")
+          expect(I18n).to receive(:t).with("explanation", scope: "decidim.forms.upload_help", attribute: "Image")
           expect(I18n).to receive(:t).with("message_1", scope: "decidim.forms.file_help.file")
           expect(I18n).to receive(:t).with("message_2", scope: "decidim.forms.file_help.file")
           expect(I18n).to receive(:t).with("message_3", scope: "decidim.forms.file_help.file")
@@ -793,7 +822,9 @@ def organization
 
           it "renders calls I18n.t() with the correct messages" do
             # Upload help messages
-            expect(I18n).to receive(:t).with("explanation", scope: "decidim.forms.file_help.file")
+
+            allow(I18n).to receive(:t).with(:image, scope: "activemodel.attributes.dummy").and_return("Image")
+            expect(I18n).to receive(:t).with("explanation", scope: "decidim.forms.upload_help", attribute: "Image")
             expect(I18n).to receive(:t).with("message_1", scope: "decidim.forms.file_help.file")
             expect(I18n).not_to receive(:t).with("message_2", scope: "decidim.forms.file_help.file")
             output
@@ -811,7 +842,7 @@ def organization
         end
 
         before do
-          expect(helper).to receive(:render).and_return("[rendering]")
+          allow(helper).to receive(:render).and_return("[rendering]")
         end
 
         it "renders a hidden field and a container for the editor" do
diff --git a/decidim-core/spec/lib/friendly_dates_spec.rb b/decidim-core/spec/lib/friendly_dates_spec.rb
index 144bd0df57ba3..9a58f67ae6a45 100644
--- a/decidim-core/spec/lib/friendly_dates_spec.rb
+++ b/decidim-core/spec/lib/friendly_dates_spec.rb
@@ -52,7 +52,7 @@ def initialize(date)
       end
 
       describe "when in previous years" do
-        let(:date) { Time.current - 1.year }
+        let(:date) { 1.year.ago }
 
         it "returns the full date" do
           expect(enhanced_instance.friendly_created_at).to eq("06.02.44")
diff --git a/decidim-core/spec/lib/gamification/badge_spec.rb b/decidim-core/spec/lib/gamification/badge_spec.rb
index c032f1f35f23b..014aaf9fbb7a3 100644
--- a/decidim-core/spec/lib/gamification/badge_spec.rb
+++ b/decidim-core/spec/lib/gamification/badge_spec.rb
@@ -16,7 +16,7 @@ module Gamification
       end
 
       context "without a name" do
-        it "isn't valid " do
+        it "isn't valid" do
           badge = described_class.new
           badge.name = nil
           badge.valid?
diff --git a/decidim-core/spec/lib/importers/import_manifest_spec.rb b/decidim-core/spec/lib/importers/import_manifest_spec.rb
index 3695dcd6edee0..ebd7b9baf8f84 100644
--- a/decidim-core/spec/lib/importers/import_manifest_spec.rb
+++ b/decidim-core/spec/lib/importers/import_manifest_spec.rb
@@ -58,7 +58,7 @@ module Decidim
           expect(msg.render(:baz)).to eq("Biz")
         end
 
-        expect(subject.messages).to be_a(described_class::Messages)
+        expect(subject.messages).to be_a(described_class::ImportManifestMessages)
         expect(subject.messages.has?(:foo)).to be(true)
         expect(subject.messages.render(:foo)).to be("Bar")
       end
diff --git a/decidim-core/spec/lib/io_encoder_spec.rb b/decidim-core/spec/lib/io_encoder_spec.rb
index 75a43b8d2ff92..6beae559a871d 100644
--- a/decidim-core/spec/lib/io_encoder_spec.rb
+++ b/decidim-core/spec/lib/io_encoder_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe IoEncoder do
-    let(:input) { IO.read(Decidim::Dev.asset(file_name)) }
+    let(:input) { File.read(Decidim::Dev.asset(file_name)) }
 
     describe "to_standard_encoding" do
       context "when input is in utf-8" do
diff --git a/decidim-core/spec/lib/jsonb_attributes_spec.rb b/decidim-core/spec/lib/jsonb_attributes_spec.rb
index dbe0d3b467c0e..4b1f4dd2cb397 100644
--- a/decidim-core/spec/lib/jsonb_attributes_spec.rb
+++ b/decidim-core/spec/lib/jsonb_attributes_spec.rb
@@ -11,7 +11,7 @@ def self.model_name
         end
 
         include ActiveModel::Model
-        include Virtus.model
+        include Decidim::AttributeObject::Model
         include JsonbAttributes
       end
     end
@@ -39,8 +39,8 @@ def self.model_name
         model.custom_setting = "new setting"
         model.another_setting = "random setting"
 
-        expect(model.settings).to include(custom_setting: "new setting")
-        expect(model.settings).to include(another_setting: "random setting")
+        expect(model.settings).to include("custom_setting" => "new setting")
+        expect(model.settings).to include("another_setting" => "random setting")
       end
 
       it "coerces values" do
diff --git a/decidim-core/spec/lib/map/autocomplete_spec.rb b/decidim-core/spec/lib/map/autocomplete_spec.rb
index 2465498b9aa88..a7c436e806251 100644
--- a/decidim-core/spec/lib/map/autocomplete_spec.rb
+++ b/decidim-core/spec/lib/map/autocomplete_spec.rb
@@ -51,7 +51,7 @@ module Map
       end
 
       it "creates the geocoding field markup" do
-        config = CGI.escapeHTML(
+        config = escaped_html(
           { url: "/photon_api" }.to_json
         )
         expect(form_markup).to include(%(
diff --git a/decidim-core/spec/lib/map/dynamic_map_spec.rb b/decidim-core/spec/lib/map/dynamic_map_spec.rb
index bf5a3d5f09b3f..f360acdcc9878 100644
--- a/decidim-core/spec/lib/map/dynamic_map_spec.rb
+++ b/decidim-core/spec/lib/map/dynamic_map_spec.rb
@@ -16,8 +16,8 @@ module Map
         it "creates a new builder instance" do
           expect(Decidim::Map::DynamicMap::Builder).to receive(:new).with(
             template,
-            marker_color: "#ef604d",
-            tile_layer: { url: nil, options: {} }
+            { marker_color: "#ef604d",
+              tile_layer: { url: nil, options: {} } }
           ).and_call_original
 
           builder = subject.create_builder(template, options)
diff --git a/decidim-core/spec/lib/map/geocoding_spec.rb b/decidim-core/spec/lib/map/geocoding_spec.rb
index 5b338b4777d7d..e03eeb463639a 100644
--- a/decidim-core/spec/lib/map/geocoding_spec.rb
+++ b/decidim-core/spec/lib/map/geocoding_spec.rb
@@ -78,7 +78,7 @@ class Test < ::Decidim::Map::Geocoding; end
         let(:options) { { foo: "bar" } }
 
         it "calls the Geocoder.search method with correct arguments" do
-          expect(Geocoder).to receive(:search).with(
+          allow(Geocoder).to receive(:search).with(
             query,
             { lookup: :test, language: "en" }.merge(options)
           ).and_return([])
diff --git a/decidim-core/spec/lib/map/provider/geocoding/here_spec.rb b/decidim-core/spec/lib/map/provider/geocoding/here_spec.rb
index 81ba7a88ae31a..c0561ceea1147 100644
--- a/decidim-core/spec/lib/map/provider/geocoding/here_spec.rb
+++ b/decidim-core/spec/lib/map/provider/geocoding/here_spec.rb
@@ -20,7 +20,7 @@ module Geocoding
           end
 
           context "with geocoder request stubs" do
-            let(:response) { IO.read(Decidim::Dev.asset("geocoder_result_here.json")) }
+            let(:response) { File.read(Decidim::Dev.asset("geocoder_result_here.json")) }
 
             before do
               stub_request(:get, request_url).with(
@@ -29,24 +29,24 @@ module Geocoding
             end
 
             describe "#coordinates" do
-              let(:request_url) { "https://geocoder.ls.hereapi.com/6.2/geocode.json?apikey=key1234&gen=9&language=en&searchtext=#{CGI.escape(query)}" }
-              let(:query) { "Madison Square Garden, 4 Penn Plaza, New York, NY" }
+              let(:request_url) { "https://geocode.search.hereapi.com/v1/geocode?apiKey=key1234&lang=en&q=5%20Rue%20Daunou,%2075000%20Paris,%20France" }
+              let(:query) { "5 Rue Daunou, 75000 Paris, France" }
 
               it "requests the nominatim API with correct parameters" do
                 expect(
                   subject.coordinates(query)
-                ).to eq([40.7504692, -73.9933777])
+                ).to eq([48.86926, 2.3321])
               end
             end
 
             describe "#address" do
-              let(:request_url) { "https://reverse.geocoder.ls.hereapi.com/6.2/reversegeocode.json?apikey=key1234&gen=9&language=en&maxresults=5&mode=retrieveAddresses&prox=#{query[0]},#{query[1]},50&sortby=distance" }
-              let(:query) { [40.7504692, -73.9933777] }
+              let(:request_url) { "https://revgeocode.search.hereapi.com/v1/revgeocode?apiKey=key1234&at=48.86926,2.3321,50&lang=en&maxresults=5&sortby=distance" }
+              let(:query) { [48.86926, 2.3321] }
 
               it "requests the nominatim API with correct parameters" do
                 expect(
                   subject.address(query)
-                ).to eq("4 Penn Plz, New York, NY 10001, United States")
+                ).to eq("5 Rue Daunou, 75002 Paris, France")
               end
             end
           end
diff --git a/decidim-core/spec/lib/map/provider/geocoding/osm_spec.rb b/decidim-core/spec/lib/map/provider/geocoding/osm_spec.rb
index b5531fd656bce..54452f5898565 100644
--- a/decidim-core/spec/lib/map/provider/geocoding/osm_spec.rb
+++ b/decidim-core/spec/lib/map/provider/geocoding/osm_spec.rb
@@ -38,7 +38,7 @@ module Geocoding
           end
 
           context "with geocoder request stubs" do
-            let(:response) { IO.read(Decidim::Dev.asset("geocoder_result_osm.json")) }
+            let(:response) { File.read(Decidim::Dev.asset("geocoder_result_osm.json")) }
 
             before do
               stub_request(:get, request_url).with(
diff --git a/decidim-core/spec/lib/map/static_map_spec.rb b/decidim-core/spec/lib/map/static_map_spec.rb
index 337c673351b44..be9bc901eb6e0 100644
--- a/decidim-core/spec/lib/map/static_map_spec.rb
+++ b/decidim-core/spec/lib/map/static_map_spec.rb
@@ -51,7 +51,7 @@ module Map
 
       describe "#url" do
         it "returns nil when the url has not been configured" do
-          expect(subject.url(latitude: latitude, longitude: longitude)).to be(nil)
+          expect(subject.url(latitude: latitude, longitude: longitude)).to be_nil
         end
 
         context "with configured url" do
@@ -94,7 +94,7 @@ module Map
 
           it "calls the callable object and returns the correct URL" do
             url_result = double
-            expect(url_result).to receive(:to_s).and_return(final_url)
+            allow(url_result).to receive(:to_s).and_return(final_url)
 
             url = lambda do |config|
               expect(config[:latitude]).to be(latitude)
diff --git a/decidim-core/spec/lib/map_spec.rb b/decidim-core/spec/lib/map_spec.rb
index f201cdb7a1c42..9b2e00b19dcda 100644
--- a/decidim-core/spec/lib/map_spec.rb
+++ b/decidim-core/spec/lib/map_spec.rb
@@ -98,9 +98,9 @@ module Decidim
       let(:options) { { organization: create(:organization), locale: "en" } }
 
       it "returns a new instance of the configured utility" do
-        expect(subject.utility(:dynamic, options)).to be_a(Decidim::Map::Provider::DynamicMap::Osm)
-        expect(subject.utility(:static, options)).to be_a(Decidim::Map::Provider::StaticMap::Osm)
-        expect(subject.utility(:geocoding, options)).to be_a(Decidim::Map::Provider::Geocoding::Osm)
+        expect(subject.utility(:dynamic, **options)).to be_a(Decidim::Map::Provider::DynamicMap::Osm)
+        expect(subject.utility(:static, **options)).to be_a(Decidim::Map::Provider::StaticMap::Osm)
+        expect(subject.utility(:geocoding, **options)).to be_a(Decidim::Map::Provider::Geocoding::Osm)
       end
 
       context "when the categories are unregistered" do
@@ -109,9 +109,9 @@ module Decidim
           subject.unregister_category(:static)
           subject.unregister_category(:geocoding)
 
-          expect(subject.utility(:dynamic, options)).to be(nil)
-          expect(subject.utility(:static, options)).to be(nil)
-          expect(subject.utility(:geocoding, options)).to be(nil)
+          expect(subject.utility(:dynamic, options)).to be_nil
+          expect(subject.utility(:static, options)).to be_nil
+          expect(subject.utility(:geocoding, options)).to be_nil
         end
       end
 
@@ -119,9 +119,9 @@ module Decidim
         let(:config) { {} }
 
         it "returns nil for the registered utilities" do
-          expect(subject.utility(:dynamic, options)).to be(nil)
-          expect(subject.utility(:static, options)).to be(nil)
-          expect(subject.utility(:geocoding, options)).to be(nil)
+          expect(subject.utility(:dynamic, options)).to be_nil
+          expect(subject.utility(:static, options)).to be_nil
+          expect(subject.utility(:geocoding, options)).to be_nil
         end
       end
 
@@ -129,7 +129,7 @@ module Decidim
         let(:config) { { provider: :osm, dynamic: false } }
 
         it "returns a new instance for all the non-disabled utilities and nil for the dynamic utility" do
-          expect(subject.utility(:dynamic, options)).to be(nil)
+          expect(subject.utility(:dynamic, options)).to be_nil
           expect(subject.utility(:static, options)).to be_a(Decidim::Map::Provider::StaticMap::Osm)
           expect(subject.utility(:geocoding, options)).to be_a(Decidim::Map::Provider::Geocoding::Osm)
         end
@@ -363,7 +363,7 @@ module Decidim
 
       context "when the utility has not been registered" do
         it "returns nil" do
-          expect(subject.utility_class(:foobar)).to be(nil)
+          expect(subject.utility_class(:foobar)).to be_nil
         end
       end
 
@@ -371,7 +371,7 @@ module Decidim
         let(:config) { {} }
 
         it "returns nil" do
-          expect(subject.utility_class(:dynamic)).to be(nil)
+          expect(subject.utility_class(:dynamic)).to be_nil
         end
       end
 
@@ -379,7 +379,7 @@ module Decidim
         let(:config) { { provider: :osm, dynamic: { provider: :foobar } } }
 
         it "returns nil" do
-          expect(subject.utility_class(:dynamic)).to be(nil)
+          expect(subject.utility_class(:dynamic)).to be_nil
           expect(subject.utility_class(:static)).to be(Decidim::Map::Provider::StaticMap::Osm)
           expect(subject.utility_class(:geocoding)).to be(Decidim::Map::Provider::Geocoding::Osm)
           expect(subject.utility_class(:autocomplete)).to be(Decidim::Map::Provider::Autocomplete::Osm)
diff --git a/decidim-core/spec/lib/metric_manifest_spec.rb b/decidim-core/spec/lib/metric_manifest_spec.rb
index ee134070c32f3..aaa293e43503a 100644
--- a/decidim-core/spec/lib/metric_manifest_spec.rb
+++ b/decidim-core/spec/lib/metric_manifest_spec.rb
@@ -51,7 +51,7 @@ module Decidim
 
         expect(subject).to be_valid
         expect(subject.settings.attributes).to have_key(:highlighted)
-        expect(subject.settings.attributes[:highlighted].default).to eq true
+        expect(subject.settings.attributes[:highlighted].default).to be true
         expect(subject.settings.attributes).to have_key(:scopes)
         expect(subject.settings.attributes[:scopes].default).to eq %w(home)
         expect(subject.settings.attributes).to have_key(:weight)
diff --git a/decidim-core/spec/lib/metric_operation_registry_spec.rb b/decidim-core/spec/lib/metric_operation_registry_spec.rb
index b8cd05a585b63..988b60c96c164 100644
--- a/decidim-core/spec/lib/metric_operation_registry_spec.rb
+++ b/decidim-core/spec/lib/metric_operation_registry_spec.rb
@@ -25,7 +25,7 @@ module Decidim
       it "returns all metrics for that scope" do
         register_metric(:dummy_operation, :users)
         register_metric(:dummy_operation, :more_users)
-        register_metric(:dummy_operation_2, :no_users)
+        register_metric(:dummy_operation2, :no_users)
 
         expect(subject.for(:dummy_operation).map(&:metric_name)).to eq %w(users more_users)
       end
diff --git a/decidim-core/spec/lib/middleware/strip_x_forwarded_host_spec.rb b/decidim-core/spec/lib/middleware/strip_x_forwarded_host_spec.rb
index 74796d6a55150..5a62d54fed718 100644
--- a/decidim-core/spec/lib/middleware/strip_x_forwarded_host_spec.rb
+++ b/decidim-core/spec/lib/middleware/strip_x_forwarded_host_spec.rb
@@ -13,7 +13,7 @@ module Decidim
     it "strips the header" do
       _code, new_env = middleware.call(env)
 
-      expect(new_env["HTTP_X_FORWARDED_HOST"]).to eq(nil)
+      expect(new_env["HTTP_X_FORWARDED_HOST"]).to be_nil
     end
 
     context "when the follow_http_x_forwarded_host param is set to true" do
diff --git a/decidim-core/spec/lib/notification_setting_manifest_spec.rb b/decidim-core/spec/lib/notification_setting_manifest_spec.rb
new file mode 100644
index 0000000000000..2daa8808f7b1d
--- /dev/null
+++ b/decidim-core/spec/lib/notification_setting_manifest_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe NotificationSettingManifest do
+    subject { described_class.new }
+
+    context "when all the values are correct" do
+      before do
+        subject.name = "component_notif_manifest"
+        subject.settings_area = "administrators"
+      end
+
+      it { is_expected.to be_valid }
+    end
+
+    context "without a name" do
+      before do
+        subject.name = nil
+        subject.settings_area = "administrators"
+      end
+
+      it { is_expected.to be_valid }
+    end
+
+    context "without an area" do
+      before do
+        subject.settings_area = nil
+      end
+
+      it { is_expected.to be_invalid }
+    end
+
+    context "with an invalid area" do
+      before do
+        subject.settings_area = "admin"
+      end
+
+      it { is_expected.to be_invalid }
+    end
+
+    context "with an invalid default value" do
+      before do
+        subject.settings_area = "administrators"
+        subject.default_value = nil
+      end
+
+      it { is_expected.to be_invalid }
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/organization_settings_spec.rb b/decidim-core/spec/lib/organization_settings_spec.rb
index b8adca24dfd4d..a80373b1cb510 100644
--- a/decidim-core/spec/lib/organization_settings_spec.rb
+++ b/decidim-core/spec/lib/organization_settings_spec.rb
@@ -13,7 +13,8 @@ module Decidim
         "allowed_file_extensions" => {
           "default" => %w(jpg jpeg gif png bmp pdf rtf txt),
           "admin" => %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
-          "image" => %w(jpg jpeg gif png bmp ico)
+          "image" => %w(jpg jpeg gif png bmp),
+          "favicon" => %w(png)
         },
         "allowed_content_types" => {
           "default" => %w(
@@ -72,7 +73,8 @@ module Decidim
           "allowed_file_extensions" => {
             "default" => %w(jpg jpeg pdf),
             "admin" => %w(jpg jpeg pdf docx),
-            "image" => %w(jpg jpeg)
+            "image" => %w(jpg jpeg),
+            "favicon" => %w(png)
           },
           "allowed_content_types" => {
             "default" => %w(
@@ -103,6 +105,7 @@ module Decidim
         # updated settings after the reload method is called.
         organization.file_upload_settings = updated_settings
         described_class.reload(organization)
+
         expect(struct_to_hash(subject)).to eq("upload" => updated_settings)
       end
 
@@ -185,10 +188,10 @@ module Decidim
     private
 
     def struct_to_hash(struct)
-      struct.to_h.map do |key, value|
+      struct.to_h.to_h do |key, value|
         value = struct_to_hash(value) if value.is_a?(OpenStruct)
         [key.to_s, value]
-      end.to_h
+      end
     end
   end
 end
diff --git a/decidim-core/spec/lib/participatory_space_manifest_spec.rb b/decidim-core/spec/lib/participatory_space_manifest_spec.rb
index e606e4113e5fe..10b1d65d3ad1d 100644
--- a/decidim-core/spec/lib/participatory_space_manifest_spec.rb
+++ b/decidim-core/spec/lib/participatory_space_manifest_spec.rb
@@ -2,8 +2,7 @@
 
 require "spec_helper"
 
-class ::TestPermissions
-end
+class ::TestPermissions < Object; end
 
 module Decidim
   describe ParticipatorySpaceManifest do
diff --git a/decidim-core/spec/lib/record_encryptor_spec.rb b/decidim-core/spec/lib/record_encryptor_spec.rb
index e13749a050b9e..c90a2c346fdc3 100644
--- a/decidim-core/spec/lib/record_encryptor_spec.rb
+++ b/decidim-core/spec/lib/record_encryptor_spec.rb
@@ -196,10 +196,10 @@ def original_metadata
       end
 
       it "returns nil for all getters" do
-        expect(subject.name).to be(nil)
-        expect(subject.year).to be(nil)
-        expect(subject.coverage).to be(nil)
-        expect(subject.metadata).to be(nil)
+        expect(subject.name).to be_nil
+        expect(subject.year).to be_nil
+        expect(subject.coverage).to be_nil
+        expect(subject.metadata).to be_nil
       end
     end
 
diff --git a/decidim-core/spec/lib/reminder_registry_spec.rb b/decidim-core/spec/lib/reminder_registry_spec.rb
new file mode 100644
index 0000000000000..b88061f3a2cf3
--- /dev/null
+++ b/decidim-core/spec/lib/reminder_registry_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ReminderRegistry do
+    subject { described_class.new }
+
+    describe "#register" do
+      before { register_reminder(:dummies) }
+
+      it "registers a reminder" do
+        expect(subject.for(:dummies).try(:name)).to eq "dummies"
+      end
+
+      it "raises an error if the reminder is already registered" do
+        expect { register_reminder(:dummies) }
+          .to raise_error(described_class::ReminderAlreadyRegistered)
+      end
+    end
+
+    describe "#all" do
+      before do
+        register_reminder(:dummies)
+        register_reminder(:dummies2, "Decidim::DummyGenerator2")
+      end
+
+      it "returns manifests" do
+        expect(subject.all).to be_kind_of(Array)
+        expect(subject.all.count).to eq(2)
+      end
+    end
+
+    def register_reminder(name, generator_class_name = "Decidim::DummyGenerator")
+      subject.register(name) do |reminder_registry|
+        reminder_registry.generator_class_name = generator_class_name
+      end
+    end
+  end
+
+  class DummyGenerator < Object; end
+
+  class DummyGenerator2 < Object; end
+end
diff --git a/decidim-core/spec/lib/resourceable_spec.rb b/decidim-core/spec/lib/resourceable_spec.rb
index b8fb886c05ab3..1dff21cd43316 100644
--- a/decidim-core/spec/lib/resourceable_spec.rb
+++ b/decidim-core/spec/lib/resourceable_spec.rb
@@ -125,22 +125,22 @@ module Decidim
     describe "#linked_classes_for" do
       subject { Decidim::Proposals::Proposal }
 
-      let(:proposals_component_1) { create :component, manifest_name: "proposals" }
-      let(:proposals_component_2) { create :component, manifest_name: "proposals" }
-      let(:meetings_component) { create :component, manifest_name: "meetings", participatory_space: proposals_component_1.participatory_space }
-      let(:dummy_component) { create :component, manifest_name: "dummy", participatory_space: proposals_component_2.participatory_space }
-      let(:proposal_1) { create :proposal, component: proposals_component_1 }
-      let(:proposal_2) { create :proposal, component: proposals_component_2 }
+      let(:proposals_component1) { create :component, manifest_name: "proposals" }
+      let(:proposals_component2) { create :component, manifest_name: "proposals" }
+      let(:meetings_component) { create :component, manifest_name: "meetings", participatory_space: proposals_component1.participatory_space }
+      let(:dummy_component) { create :component, manifest_name: "dummy", participatory_space: proposals_component2.participatory_space }
+      let(:proposal1) { create :proposal, component: proposals_component1 }
+      let(:proposal2) { create :proposal, component: proposals_component2 }
       let(:meeting) { create :meeting, component: meetings_component }
       let(:dummy_resource) { create :dummy_resource, component: dummy_component }
 
       before do
-        proposal_1.link_resources([meeting], "proposals_from_meeting")
-        proposal_2.link_resources([dummy_resource], "included_proposals")
+        proposal1.link_resources([meeting], "proposals_from_meeting")
+        proposal2.link_resources([dummy_resource], "included_proposals")
       end
 
       it "finds the linked classes for a given component" do
-        expect(subject.linked_classes_for(proposals_component_1)).to eq ["Decidim::Meetings::Meeting"]
+        expect(subject.linked_classes_for(proposals_component1)).to eq ["Decidim::Meetings::Meeting"]
       end
     end
 
diff --git a/decidim-core/spec/lib/searchable_spec.rb b/decidim-core/spec/lib/searchable_spec.rb
index 7ab4d12d9be73..6d7fe83ebc634 100644
--- a/decidim-core/spec/lib/searchable_spec.rb
+++ b/decidim-core/spec/lib/searchable_spec.rb
@@ -9,35 +9,35 @@ module Decidim
     let(:component) { create(:component, manifest_name: "dummy") }
 
     context "when having searchables of different kinds indexed" do
-      let(:organization_1) { create(:organization) }
-      let(:component_1) { create(:component, organization: organization_1) }
-      let(:organization_2) { create(:organization) }
-      let(:component_2) { create(:component, organization: organization_2) }
+      let(:organization1) { create(:organization) }
+      let(:component1) { create(:component, organization: organization1) }
+      let(:organization2) { create(:organization) }
+      let(:component2) { create(:component, organization: organization2) }
 
-      let!(:dummy_resource_1) do
+      let!(:dummy_resource1) do
         Decidim::DummyResources::DummyResource.create!(
           id: COMMON_ID,
-          component: component_1,
+          component: component1,
           published_at: Time.current,
-          author: organization_1
+          author: organization1
         )
       end
-      let!(:dummy_resource_2) do
+      let!(:dummy_resource2) do
         Decidim::DummyResources::DummyResource.create!(
           id: COMMON_ID + 1,
-          component: component_2,
+          component: component2,
           published_at: Time.current,
-          author: organization_2
+          author: organization2
         )
       end
-      let!(:user_1) { create(:user, id: COMMON_ID, organization: organization_1) }
-      let!(:user_2) { create(:user, id: COMMON_ID + 1, organization: organization_2) }
+      let!(:user1) { create(:user, id: COMMON_ID, organization: organization1) }
+      let!(:user2) { create(:user, id: COMMON_ID + 1, organization: organization2) }
 
       it "each searchable should link to its own searchable_resources" do
-        org = user_1.organization
+        org = user1.organization
         num_locales = org.available_locales.size
-        expect(dummy_resource_1.searchable_resources.by_organization(org.id).pluck(:resource_id, :resource_type)).to eq([[COMMON_ID, "Decidim::DummyResources::DummyResource"]] * num_locales)
-        expect(user_1.searchable_resources.by_organization(org.id).pluck(:resource_id, :resource_type)).to eq([[COMMON_ID, "Decidim::User"]] * num_locales)
+        expect(dummy_resource1.searchable_resources.by_organization(org.id).pluck(:resource_id, :resource_type)).to eq([[COMMON_ID, "Decidim::DummyResources::DummyResource"]] * num_locales)
+        expect(user1.searchable_resources.by_organization(org.id).pluck(:resource_id, :resource_type)).to eq([[COMMON_ID, "Decidim::User"]] * num_locales)
       end
     end
 
diff --git a/decidim-core/spec/lib/settings_manifest_spec.rb b/decidim-core/spec/lib/settings_manifest_spec.rb
index f344d1ac76471..072df599fb50a 100644
--- a/decidim-core/spec/lib/settings_manifest_spec.rb
+++ b/decidim-core/spec/lib/settings_manifest_spec.rb
@@ -18,69 +18,69 @@ module Decidim
       end
 
       it "coerces options" do
-        subject.attribute "something", "type" => "boolean", "default" => true
+        subject.attribute "something", "type" => :boolean, "default" => true
         expect(subject.attributes[:something].type).to eq(:boolean)
-        expect(subject.attributes[:something].default_value).to eq(true)
+        expect(subject.attributes[:something].default_value).to be(true)
       end
 
       it "stores presenceness" do
         subject.attribute :something # default: false
-        expect(subject.attributes[:something].required).to eq(false)
+        expect(subject.attributes[:something].required).to be(false)
 
         subject.attribute :something, required: true
-        expect(subject.attributes[:something].required).to eq(true)
+        expect(subject.attributes[:something].required).to be(true)
 
         subject.attribute :something, required: false
-        expect(subject.attributes[:something].required).to eq(false)
+        expect(subject.attributes[:something].required).to be(false)
       end
 
       it "stores `translated`" do
         subject.attribute :something # default: false
-        expect(subject.attributes[:something].translated).to eq(false)
+        expect(subject.attributes[:something].translated).to be(false)
 
         subject.attribute :something, translated: true
-        expect(subject.attributes[:something].translated).to eq(true)
+        expect(subject.attributes[:something].translated).to be(true)
 
         subject.attribute :something, translated: false
-        expect(subject.attributes[:something].translated).to eq(false)
+        expect(subject.attributes[:something].translated).to be(false)
       end
 
       it "stores `editor`" do
         subject.attribute :something # default: false
-        expect(subject.attributes[:something].editor).to eq(false)
+        expect(subject.attributes[:something].editor).to be(false)
 
         subject.attribute :something, editor: true
-        expect(subject.attributes[:something].editor).to eq(true)
+        expect(subject.attributes[:something].editor).to be(true)
 
         subject.attribute :something, editor: false
-        expect(subject.attributes[:something].editor).to eq(false)
+        expect(subject.attributes[:something].editor).to be(false)
       end
 
       it "stores `required_for_authorization`" do
         subject.attribute :something # default: false
-        expect(subject.attributes[:something].required_for_authorization).to eq(false)
+        expect(subject.attributes[:something].required_for_authorization).to be(false)
 
         subject.attribute :something, required_for_authorization: true
-        expect(subject.attributes[:something].required_for_authorization).to eq(true)
+        expect(subject.attributes[:something].required_for_authorization).to be(true)
 
         subject.attribute :something, required_for_authorization: false
-        expect(subject.attributes[:something].required_for_authorization).to eq(false)
+        expect(subject.attributes[:something].required_for_authorization).to be(false)
       end
 
       it "stores `readonly`" do
         subject.attribute :something
-        expect(subject.attributes[:something].readonly?({})).to eq(nil)
+        expect(subject.attributes[:something].readonly?({})).to be_nil
 
         subject.attribute :something, readonly: ->(_context) { true }
-        expect(subject.attributes[:something].readonly?({})).to eq(true)
+        expect(subject.attributes[:something].readonly?({})).to be(true)
 
         subject.attribute :something, readonly: ->(_context) { false }
-        expect(subject.attributes[:something].readonly?({})).to eq(false)
+        expect(subject.attributes[:something].readonly?({})).to be(false)
       end
 
       it "stores `choices`" do
         subject.attribute :something
-        expect(subject.attributes[:something].build_choices).to eq(nil)
+        expect(subject.attributes[:something].build_choices).to be_nil
 
         subject.attribute :something, choices: %w(a b c)
         expect(subject.attributes[:something].build_choices).to eq(%w(a b c))
@@ -92,8 +92,8 @@ module Decidim
       describe "supported types" do
         it "supports booleans" do
           attribute = SettingsManifest::Attribute.new(type: :boolean)
-          expect(attribute.type_class).to eq(Virtus::Attribute::Boolean)
-          expect(attribute.default_value).to eq(false)
+          expect(attribute.type_class).to eq(:boolean)
+          expect(attribute.default_value).to be(false)
         end
 
         it "supports integers" do
@@ -105,13 +105,13 @@ module Decidim
         it "supports strings" do
           attribute = SettingsManifest::Attribute.new(type: :string)
           expect(attribute.type_class).to eq(String)
-          expect(attribute.default_value).to eq(nil)
+          expect(attribute.default_value).to be_nil
         end
 
         it "supports texts" do
           attribute = SettingsManifest::Attribute.new(type: :text)
           expect(attribute.type_class).to eq(String)
-          expect(attribute.default_value).to eq(nil)
+          expect(attribute.default_value).to be_nil
         end
 
         it "supports arrays" do
@@ -123,19 +123,19 @@ module Decidim
         it "supports enums" do
           attribute = SettingsManifest::Attribute.new(type: :enum)
           expect(attribute.type_class).to eq(String)
-          expect(attribute.default_value).to eq(nil)
+          expect(attribute.default_value).to be_nil
         end
 
         it "supports select" do
           attribute = SettingsManifest::Attribute.new(type: :select)
           expect(attribute.type_class).to eq(String)
-          expect(attribute.default_value).to eq(nil)
+          expect(attribute.default_value).to be_nil
         end
 
         it "supports scopes" do
           attribute = SettingsManifest::Attribute.new(type: :scope)
           expect(attribute.type_class).to eq(Integer)
-          expect(attribute.default_value).to eq(nil)
+          expect(attribute.default_value).to be_nil
         end
       end
 
@@ -157,12 +157,12 @@ module Decidim
           invalid_option: true
         )
 
-        expect(settings.something_enabled).to eq(true)
-        expect(settings.comments_enabled).to eq(false)
+        expect(settings.something_enabled).to be(true)
+        expect(settings.comments_enabled).to be(false)
 
-        expect(settings.attributes).to include(something_enabled: true)
-        expect(settings.attributes).to include(comments_enabled: false)
-        expect(settings.attributes).not_to include(invalid_option: true)
+        expect(settings.attributes).to include("something_enabled" => true)
+        expect(settings.attributes).to include("comments_enabled" => false)
+        expect(settings.attributes).not_to include("invalid_option" => true)
       end
 
       it "adds presence validation to the model according the presenceness of the setting" do
@@ -181,7 +181,7 @@ module Decidim
         expect(settings.default_locale).to eq("en")
 
         settings = subject.schema.new({})
-        expect(settings.default_locale).to eq(nil)
+        expect(settings.default_locale).to be_nil
       end
 
       context "when adding presence validation to the model from a translated setting" do
diff --git a/decidim-core/spec/lib/snippets_spec.rb b/decidim-core/spec/lib/snippets_spec.rb
index 71a3308d2f51b..420b4b4d49bb0 100644
--- a/decidim-core/spec/lib/snippets_spec.rb
+++ b/decidim-core/spec/lib/snippets_spec.rb
@@ -22,7 +22,7 @@ module Decidim
 
     describe "#for" do
       it "returns nil when there are no snippets" do
-        expect(subject.for(:foo)).to be(nil)
+        expect(subject.for(:foo)).to be_nil
       end
 
       it "returns the snippets when they exist" do
@@ -44,7 +44,7 @@ module Decidim
 
     describe "#display" do
       it "returns nil when there are no snippets" do
-        expect(subject.display(:foo)).to be(nil)
+        expect(subject.display(:foo)).to be_nil
       end
 
       it "returns the snippets joined with a new line when they exist" do
diff --git a/decidim-core/spec/lib/translatable_attributes_spec.rb b/decidim-core/spec/lib/translatable_attributes_spec.rb
index dd4e87e272535..f06ce4a20c765 100644
--- a/decidim-core/spec/lib/translatable_attributes_spec.rb
+++ b/decidim-core/spec/lib/translatable_attributes_spec.rb
@@ -11,7 +11,7 @@ def self.model_name
         end
 
         include ActiveModel::Model
-        include Virtus.model
+        include Decidim::AttributeObject::Model
         include TranslatableAttributes
       end
     end
diff --git a/decidim-core/spec/lib/url_option_resolver.rb b/decidim-core/spec/lib/url_option_resolver.rb
new file mode 100644
index 0000000000000..4d960a0694590
--- /dev/null
+++ b/decidim-core/spec/lib/url_option_resolver.rb
@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe UrlOptionResolver do
+    let(:resolver) { described_class.new }
+
+    describe "#protocol" do
+      subject { resolver.protocol }
+
+      it { is_expected.to eq("http") }
+
+      context "when force_ssl is enabled for the application" do
+        before { allow(Rails.application.config).to receive(:force_ssl).and_return(true) }
+
+        it { is_expected.to eq("https") }
+      end
+
+      context "when the port is configured as 443" do
+        before { allow(resolver).to receive(:port).and_return(443) }
+
+        it { is_expected.to eq("https") }
+      end
+    end
+
+    describe "#host" do
+      subject { resolver.host }
+
+      it { is_expected.to eq("localhost") }
+
+      context "when the environment is development" do
+        before { allow(Rails.env).to receive(:development?).and_return(true) }
+
+        it { is_expected.to eq("localhost") }
+      end
+
+      context "when the environment is not development or test" do
+        before do
+          allow(Rails.env).to receive(:development?).and_return(false)
+          allow(Rails.env).to receive(:test?).and_return(false)
+        end
+
+        it { is_expected.to be_nil }
+      end
+
+      context "when the host is defined in the HOSTNAME environment variable" do
+        before { allow(ENV).to receive(:fetch).with("HOSTNAME", "localhost").and_return("custom.host") }
+
+        it { is_expected.to eq("custom.host") }
+      end
+    end
+
+    describe "#port" do
+      subject { resolver.port }
+
+      it { is_expected.to eq(Capybara.server_port) }
+
+      context "when the environment is development" do
+        before { allow(Rails.env).to receive(:development?).and_return(true) }
+
+        it { is_expected.to eq(3000) }
+      end
+
+      context "when the port is defined in the PORT environment variable" do
+        before { allow(ENV).to receive(:fetch).with("HTTP_PORT", instance_of(Integer)).and_return("8080") }
+
+        it { is_expected.to eq(8080) }
+      end
+
+      context "with production configuration" do
+        before do
+          allow(Rails.env).to receive(:development?).and_return(false)
+          allow(Rails.env).to receive(:test?).and_return(false)
+        end
+
+        it { is_expected.to eq(80) }
+
+        context "and force_ssl is enabled for the application" do
+          before { allow(Rails.application.config).to receive(:force_ssl).and_return(true) }
+
+          it { is_expected.to eq(443) }
+        end
+      end
+    end
+
+    describe "#default_port?" do
+      subject { resolver.default_port? }
+
+      it { is_expected.to be(false) }
+
+      context "when the port is 80" do
+        before { allow(resolver).to receive(:port).and_return(80) }
+
+        it { is_expected.to be(true) }
+      end
+
+      context "when the port is 443" do
+        before { allow(resolver).to receive(:port).and_return(443) }
+
+        it { is_expected.to be(true) }
+      end
+    end
+
+    describe "#options" do
+      subject { resolver.options }
+
+      it { is_expected.to eq(host: "localhost", port: Capybara.server_port) }
+
+      context "when the protocol is https" do
+        before { allow(resolver).to receive(:protocol).and_return("https") }
+
+        it { is_expected.to eq(host: "localhost", port: Capybara.server_port, protocol: "https") }
+      end
+
+      context "when the port is 80" do
+        before { allow(resolver).to receive(:port).and_return(80) }
+
+        it { is_expected.to eq(host: "localhost") }
+      end
+
+      context "when the port is 443" do
+        before { allow(resolver).to receive(:port).and_return(443) }
+
+        it { is_expected.to eq(host: "localhost", protocol: "https") }
+      end
+
+      context "when the host is not defined" do
+        before { allow(resolver).to receive(:host).and_return(nil) }
+
+        it { is_expected.to eq(port: Capybara.server_port) }
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/user_acts_as_author_spec.rb b/decidim-core/spec/lib/user_acts_as_author_spec.rb
index 4fba888d7c268..6fd4de2169ba6 100644
--- a/decidim-core/spec/lib/user_acts_as_author_spec.rb
+++ b/decidim-core/spec/lib/user_acts_as_author_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe User do
-    let(:subject) { create(:user) }
+    subject { create(:user) }
 
     it_behaves_like "acts as author"
   end
diff --git a/decidim-core/spec/lib/user_group_acts_as_author_spec.rb b/decidim-core/spec/lib/user_group_acts_as_author_spec.rb
index 9ed4972a48afd..93681113a4b1d 100644
--- a/decidim-core/spec/lib/user_group_acts_as_author_spec.rb
+++ b/decidim-core/spec/lib/user_group_acts_as_author_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe User do
-    let(:subject) { create(:user_group) }
+    subject { create(:user_group) }
 
     it_behaves_like "acts as author"
   end
diff --git a/decidim-core/spec/lib/webpacker/compiler_spec.rb b/decidim-core/spec/lib/webpacker/compiler_spec.rb
new file mode 100644
index 0000000000000..2c2eecafd1491
--- /dev/null
+++ b/decidim-core/spec/lib/webpacker/compiler_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Webpacker
+  describe Compiler do
+    subject { described_class.new(webpacker) }
+
+    let(:webpacker) { Webpacker.instance }
+
+    describe "#fresh?" do
+      before { subject.compile }
+
+      it "allows multiple threads to fetch the status at the same time" do
+        threads = []
+        results = []
+        10.times { threads << Thread.new { results << subject.fresh? } }
+        threads.each(&:join)
+
+        expect(results.length).to eq(10)
+        expect(results.uniq).to match_array([true])
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/lib/webpacker/configuration_spec.rb b/decidim-core/spec/lib/webpacker/configuration_spec.rb
index 8d0bb5c7f77d5..ef2765ec15710 100644
--- a/decidim-core/spec/lib/webpacker/configuration_spec.rb
+++ b/decidim-core/spec/lib/webpacker/configuration_spec.rb
@@ -36,6 +36,7 @@ module Webpacker
         it "adds the core entrypoints to the webpacker runtime configuration" do
           expect(runtime_config["default"]["entrypoints"]).to include(
             "decidim_core" => "#{core_path}/app/packs/entrypoints/decidim_core.js",
+            "decidim_sw" => "#{core_path}/app/packs/entrypoints/decidim_sw.js",
             "decidim_conference_diploma" => "#{core_path}/app/packs/entrypoints/decidim_conference_diploma.js",
             "decidim_email" => "#{core_path}/app/packs/entrypoints/decidim_email.js",
             "decidim_map" => "#{core_path}/app/packs/entrypoints/decidim_map.js",
diff --git a/decidim-core/spec/lib/webpacker/runner_spec.rb b/decidim-core/spec/lib/webpacker/runner_spec.rb
index d05220a28fd38..d96a5defd5d1e 100644
--- a/decidim-core/spec/lib/webpacker/runner_spec.rb
+++ b/decidim-core/spec/lib/webpacker/runner_spec.rb
@@ -33,6 +33,7 @@ module Webpacker
         expect(runtime_config["default"]["additional_paths"]).to include("#{core_path}/app/packs")
         expect(runtime_config["default"]["entrypoints"]).to include(
           "decidim_core" => "#{core_path}/app/packs/entrypoints/decidim_core.js",
+          "decidim_sw" => "#{core_path}/app/packs/entrypoints/decidim_sw.js",
           "decidim_conference_diploma" => "#{core_path}/app/packs/entrypoints/decidim_conference_diploma.js",
           "decidim_email" => "#{core_path}/app/packs/entrypoints/decidim_email.js",
           "decidim_map" => "#{core_path}/app/packs/entrypoints/decidim_map.js",
diff --git a/decidim-core/spec/lib/welcome_notification_event_spec.rb b/decidim-core/spec/lib/welcome_notification_event_spec.rb
index 97cbb1badeabc..c6e559c3f44b2 100644
--- a/decidim-core/spec/lib/welcome_notification_event_spec.rb
+++ b/decidim-core/spec/lib/welcome_notification_event_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe WelcomeNotificationEvent do
-    let(:subject) { described_class.new(resource: user, event_name: "test", user: user) }
+    subject { described_class.new(resource: user, event_name: "test", user: user) }
     let(:user) { create(:user, organization: organization, name: "James") }
     let(:organization) { create(:organization, name: "Awesome Town") }
 
diff --git a/decidim-core/spec/mailers/application_mailer_spec.rb b/decidim-core/spec/mailers/application_mailer_spec.rb
index e82f20ef41c60..10159c55e89fa 100644
--- a/decidim-core/spec/mailers/application_mailer_spec.rb
+++ b/decidim-core/spec/mailers/application_mailer_spec.rb
@@ -18,10 +18,10 @@ module Decidim
           "from" => from
         }
       end
-      let(:mail) { described_class.send_email(user, organization, subject, reply_to) }
+      let(:mail) { described_class.send_email(user, organization, mail_subject, reply_to) }
       let(:from) { "" }
       let(:reply_to) { nil }
-      let(:subject) { "Test subject" }
+      let(:mail_subject) { "Test subject" }
 
       it "update correctly mail.delivery_method.settings" do
         expect(mail.delivery_method.settings[:address]).to eq("mail.gotham.gov")
@@ -31,12 +31,12 @@ module Decidim
       end
 
       context "when there is no organization at all" do
-        let(:mail) { described_class.send_email(user, nil, subject, reply_to) }
+        let(:mail) { described_class.send_email(user, nil, mail_subject, reply_to) }
 
         it "returns default values" do
           expect(mail.from).to eq(["change-me@example.org"])
-          expect(mail.reply_to).to eq(nil)
-          expect(mail.subject).to eq(subject)
+          expect(mail.reply_to).to be_nil
+          expect(mail.subject).to eq(mail_subject)
         end
       end
 
@@ -80,7 +80,7 @@ module Decidim
       end
 
       context "when subject is set" do
-        let(:subject) { "Custom subject" }
+        let(:mail_subject) { "Custom subject" }
 
         it "sets subject" do
           expect(mail.subject).to eq("Custom subject")
diff --git a/decidim-core/spec/mailers/decidim_devise_mailer_spec.rb b/decidim-core/spec/mailers/decidim_devise_mailer_spec.rb
index a109e60fdfae7..a8b1bb05b4a57 100644
--- a/decidim-core/spec/mailers/decidim_devise_mailer_spec.rb
+++ b/decidim-core/spec/mailers/decidim_devise_mailer_spec.rb
@@ -7,7 +7,7 @@ module Decidim
     describe "confirmation_instructions" do
       let(:mail) { described_class.confirmation_instructions(user, "foo", {}) }
 
-      let(:subject) { "Instruccions de confirmació" }
+      let(:mail_subject) { "Instruccions de confirmació" }
       let(:body) { "Pots confirmar el correu electrònic del teu compte" }
       let(:default_subject) { "Confirmation instructions" }
       let(:default_body) { "You can confirm your email account through the link below" }
@@ -18,7 +18,7 @@ module Decidim
     describe "reset_password_instructions" do
       let(:mail) { described_class.reset_password_instructions(user, "foo", {}) }
 
-      let(:subject) { "Instruccions de regeneració de contrasenya" }
+      let(:mail_subject) { "Instruccions de regeneració de contrasenya" }
       let(:body) { "Algú ha demanat un enllaç per canviar la teva contrasenya" }
       let(:default_subject) { "Reset password instructions" }
       let(:default_body) { "Someone has requested a link to change your password" }
@@ -29,7 +29,7 @@ module Decidim
     describe "password_change" do
       let(:mail) { described_class.password_change(user, {}) }
 
-      let(:subject) { "Contrasenya modificada" }
+      let(:mail_subject) { "Contrasenya modificada" }
       let(:body) { "Ens posem en contacte amb tu per notificar-te que la teva contrasenya ha estat canviada correctament" }
       let(:default_subject) { "Password changed" }
       let(:default_body) { "contacting you to notify you that your password has been changed" }
@@ -43,7 +43,7 @@ module Decidim
         described_class.invitation_instructions(user, "foo", invitation_instructions: "organization_admin_invitation_instructions")
       end
 
-      let(:subject) { "Has estat convidada a gestionar #{user.organization.name}" }
+      let(:mail_subject) { "Has estat convidada a gestionar #{user.organization.name}" }
       let(:body) { "Acceptar invitaci" }
       let(:default_subject) { "You've been invited to manage #{user.organization.name}" }
       let(:default_body) { "Accept invitation" }
diff --git a/decidim-core/spec/mailers/export_mailer_spec.rb b/decidim-core/spec/mailers/export_mailer_spec.rb
index 9a6e99442e670..fd7329570e03b 100644
--- a/decidim-core/spec/mailers/export_mailer_spec.rb
+++ b/decidim-core/spec/mailers/export_mailer_spec.rb
@@ -37,12 +37,12 @@ module Decidim
       end
     end
 
-    describe "data portability export " do
+    describe "download your data export" do
       object = "Decidim::DummyResources::DummyResource"
       klass = Object.const_get(object)
       let(:export_data) { [[klass.model_name.name.parameterize.pluralize, Decidim::Exporters.find_exporter("CSV").new(klass.user_collection(user), klass.export_serializer).export]] }
       let(:images) { [] }
-      let(:mail) { described_class.data_portability_export(user, export_data, images) }
+      let(:mail) { described_class.download_your_data_export(user, export_data, images) }
 
       it "sets a subject" do
         expect(mail.subject).to include("Sarah Connor", "ready")
diff --git a/decidim-core/spec/mailers/notification_digest_mailer_spec.rb b/decidim-core/spec/mailers/notification_digest_mailer_spec.rb
new file mode 100644
index 0000000000000..ecf960ba86b67
--- /dev/null
+++ b/decidim-core/spec/mailers/notification_digest_mailer_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe NotificationsDigestMailer, type: :mailer do
+    let(:organization) { create(:organization, name: "O'Connor") }
+    let(:user) { create(:user, name: "Sarah Connor", organization: organization) }
+    let(:notification_ids) { [notification.id] }
+    let(:notification) { create :notification, user: user, resource: resource }
+    let(:component) { create(:component, manifest_name: "dummy", organization: organization) }
+    let(:resource) { create(:dummy_resource, title: { en: %(Testing <a href="/resource">resource</a>) }, component: component) }
+
+    describe "digest_mail" do
+      subject { described_class.digest_mail(user, notification_ids) }
+
+      it "includes the link to the resource" do
+        expect(subject.body).to include(
+          %(<a href="#{::Decidim::ResourceLocatorPresenter.new(resource).url}">Testing resource</a>)
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/mailers/reported_mailer_spec.rb b/decidim-core/spec/mailers/reported_mailer_spec.rb
index f42db242b8f96..66d5b953cc658 100644
--- a/decidim-core/spec/mailers/reported_mailer_spec.rb
+++ b/decidim-core/spec/mailers/reported_mailer_spec.rb
@@ -17,7 +17,7 @@ module Decidim
       let(:mail) { described_class.report(user, report) }
 
       describe "localisation" do
-        let(:subject) { "Un contingut ha estat denunciat" }
+        let(:mail_subject) { "Un contingut ha estat denunciat" }
         let(:default_subject) { "A resource has been reported" }
 
         let(:body) { "ha estat reportat" }
@@ -90,7 +90,7 @@ module Decidim
             author.save!
           end
 
-          it "includes the name of the author but no link to his profile" do
+          it "includes the name of the author but no link to their profile" do
             expect(mail).not_to have_link(author.name)
           end
         end
@@ -128,7 +128,7 @@ module Decidim
     describe "#hide" do
       let(:mail) { described_class.hide(user, report) }
 
-      let(:subject) { "Un contingut s'ha ocultat automàticament" }
+      let(:mail_subject) { "Un contingut s'ha ocultat automàticament" }
       let(:default_subject) { "A resource has been hidden automatically" }
 
       let(:body) { "ocultat automàticament" }
diff --git a/decidim-core/spec/mailers/user_report_mailer_spec.rb b/decidim-core/spec/mailers/user_report_mailer_spec.rb
index ef15589297737..30cf89f0ec8ea 100644
--- a/decidim-core/spec/mailers/user_report_mailer_spec.rb
+++ b/decidim-core/spec/mailers/user_report_mailer_spec.rb
@@ -7,11 +7,13 @@ module Decidim
     let(:organization) { create(:organization, name: "Test Organization") }
     let(:admin) { create(:user, :admin, organization: organization) }
     let(:reporter) { create(:user, :confirmed, organization: organization) }
+    let(:moderation) { create(:user_moderation, user: user) }
+    let(:user_report) { create(:user_report, user: reporter, reason: reason, details: "Lorem ipsum", moderation: moderation) }
     let(:user) { create(:user, :confirmed, organization: organization) }
     let(:reason) { "spam" }
 
     describe "#notify" do
-      let(:mail) { described_class.notify(admin, reporter, reason, user) }
+      let(:mail) { described_class.notify(admin, user_report) }
 
       describe "email body" do
         it "includes the reported user name" do
@@ -23,7 +25,7 @@ module Decidim
         end
 
         it "includes the reason" do
-          expect(email_body(mail)).to include(reason)
+          expect(email_body(mail)).to include(I18n.t(reason, scope: "decidim.shared.flag_user_modal"))
         end
 
         context "when the user is already blocked" do
@@ -31,8 +33,9 @@ module Decidim
 
           it "includes the reported user's original name" do
             # The `user.name` is set to "Blocked user"
-            expect(email_body(mail)).not_to include(user.name)
-            expect(email_body(mail)).to include(user.user_name)
+            expect(email_body(mail)).to include(user.name)
+            expect(email_body(mail)).to include(reporter.name)
+            expect(email_body(mail)).to include(admin.name)
           end
         end
       end
diff --git a/decidim-core/spec/models/decidim/attachment_spec.rb b/decidim-core/spec/models/decidim/attachment_spec.rb
index 7bf0d8d79381c..e26cb32365c5d 100644
--- a/decidim-core/spec/models/decidim/attachment_spec.rb
+++ b/decidim-core/spec/models/decidim/attachment_spec.rb
@@ -26,7 +26,7 @@ module Decidim
         subject do
           build(
             :attachment,
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(attachment_path),
               filename: "image.jpeg",
               content_type: "image/jpeg"
@@ -59,13 +59,13 @@ module Decidim
 
       describe "photo?" do
         it "returns true" do
-          expect(subject.photo?).to eq(true)
+          expect(subject.photo?).to be(true)
         end
       end
 
       describe "document?" do
         it "returns false" do
-          expect(subject.document?).to eq(false)
+          expect(subject.document?).to be(false)
         end
       end
     end
@@ -83,13 +83,13 @@ module Decidim
 
       describe "photo?" do
         it "returns false" do
-          expect(subject.photo?).to eq(false)
+          expect(subject.photo?).to be(false)
         end
       end
 
       describe "document?" do
         it "returns true" do
-          expect(subject.document?).to eq(true)
+          expect(subject.document?).to be(true)
         end
       end
     end
diff --git a/decidim-core/spec/models/decidim/component_spec.rb b/decidim-core/spec/models/decidim/component_spec.rb
index 6a12b3cac2ccf..63a815ac2bed4 100644
--- a/decidim-core/spec/models/decidim/component_spec.rb
+++ b/decidim-core/spec/models/decidim/component_spec.rb
@@ -71,7 +71,7 @@ module Decidim
       end
 
       it "returns true for participatory_space scopes_enabled" do
-        expect(participatory_space.scopes_enabled).to eq true
+        expect(participatory_space.scopes_enabled).to be true
       end
 
       it "returns the participatory_space scope" do
@@ -108,7 +108,7 @@ module Decidim
         let!(:component_subscope) { create(:scope, parent: component_scope, organization: organization) }
 
         it "returns true for component scopes_enabled" do
-          expect(subject.scopes_enabled).to eq true
+          expect(subject.scopes_enabled).to be true
         end
 
         it "returns the component scope" do
@@ -128,7 +128,7 @@ module Decidim
         let(:component_scope) { nil }
 
         it "returns false for component scopes_enabled" do
-          expect(subject.scopes_enabled).to eq false
+          expect(subject.scopes_enabled).to be false
         end
 
         it "returns the space's scope" do
@@ -144,13 +144,13 @@ module Decidim
         let(:component_scope) { nil }
 
         it "scopes_enabled returns false" do
-          expect(subject.scopes_enabled).to eq false
-          expect(participatory_space.scopes_enabled).to eq false
+          expect(subject.scopes_enabled).to be false
+          expect(participatory_space.scopes_enabled).to be false
         end
 
         it "returns no scope" do
-          expect(subject.scope).to eq nil
-          expect(participatory_space.scope).to eq nil
+          expect(subject.scope).to be_nil
+          expect(participatory_space.scope).to be_nil
         end
       end
 
@@ -162,16 +162,16 @@ module Decidim
         let!(:component_subscope) { create(:scope, parent: component_scope) }
 
         it "returns true for component scopes_enabled" do
-          expect(subject.scopes_enabled).to eq true
+          expect(subject.scopes_enabled).to be true
         end
 
         it "returns falsey for space scopes_enabled" do
-          expect(participatory_space.scopes_enabled).to eq false
+          expect(participatory_space.scopes_enabled).to be false
         end
 
         it "returns the component scope" do
           expect(subject.scope).to eq component_scope
-          expect(participatory_space.scope).to eq nil
+          expect(participatory_space.scope).to be_nil
         end
 
         it "returns true for the component subscopes" do
diff --git a/decidim-core/spec/models/decidim/editor_image_spec.rb b/decidim-core/spec/models/decidim/editor_image_spec.rb
index d15ab06e2fe8a..6110d0cb243a0 100644
--- a/decidim-core/spec/models/decidim/editor_image_spec.rb
+++ b/decidim-core/spec/models/decidim/editor_image_spec.rb
@@ -27,7 +27,7 @@
       subject do
         build(
           :editor_image,
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(Decidim::Dev.asset("malicious.jpg")),
             filename: "image.jpeg",
             content_type: "image/jpeg"
diff --git a/decidim-core/spec/models/decidim/endorsement_spec.rb b/decidim-core/spec/models/decidim/endorsement_spec.rb
index ea29d07345ba2..af18ba5cae15b 100644
--- a/decidim-core/spec/models/decidim/endorsement_spec.rb
+++ b/decidim-core/spec/models/decidim/endorsement_spec.rb
@@ -77,17 +77,17 @@ module Decidim
       end
 
       let!(:other_user_group) { create(:user_group, verified_at: Time.current, organization: author.organization, users: [author]) }
-      let!(:other_endorsement_1) do
+      let!(:other_endorsement1) do
         create(:endorsement, resource: resource, author: author)
       end
-      let!(:other_endorsement_2) do
+      let!(:other_endorsement2) do
         create(:endorsement, resource: resource, author: author, user_group: other_user_group)
       end
 
       it "sorts user_grup endorsements first and then by created_at" do
         expected_sorting = [
-          endorsement.id, other_endorsement_2.id,
-          other_endorsement_1.id
+          endorsement.id, other_endorsement2.id,
+          other_endorsement1.id
         ]
         expect(resource.endorsements.for_listing.pluck(:id)).to eq(expected_sorting)
       end
diff --git a/decidim-core/spec/models/decidim/messaging/conversation_spec.rb b/decidim-core/spec/models/decidim/messaging/conversation_spec.rb
index 898d401d48f61..d220682457eac 100644
--- a/decidim-core/spec/models/decidim/messaging/conversation_spec.rb
+++ b/decidim-core/spec/models/decidim/messaging/conversation_spec.rb
@@ -39,13 +39,13 @@
         end
 
         it "accept_user? returns false" do
-          expect(conversation.accept_user?(originator)).to eq(false)
+          expect(conversation.accept_user?(originator)).to be(false)
         end
       end
 
       context "and all the interlocutor accept the originator" do
         it "accept_user? returns true" do
-          expect(conversation.accept_user?(originator)).to eq(true)
+          expect(conversation.accept_user?(originator)).to be(true)
         end
       end
 
@@ -56,7 +56,7 @@
         end
 
         it "with_deleted_users? returns true" do
-          expect(conversation.with_deleted_users?(originator)).to eq(true)
+          expect(conversation.with_deleted_users?(originator)).to be(true)
         end
       end
 
@@ -66,7 +66,7 @@
         end
 
         it "with_deleted_users? returns false" do
-          expect(conversation.with_deleted_users?(originator)).to eq(false)
+          expect(conversation.with_deleted_users?(originator)).to be(false)
         end
       end
     end
diff --git a/decidim-core/spec/models/decidim/newsletter_spec.rb b/decidim-core/spec/models/decidim/newsletter_spec.rb
index 6a0fcd800b99e..54da87657521b 100644
--- a/decidim-core/spec/models/decidim/newsletter_spec.rb
+++ b/decidim-core/spec/models/decidim/newsletter_spec.rb
@@ -33,5 +33,71 @@ module Decidim
         expect(newsletter).not_to be_valid
       end
     end
+
+    describe "#url" do
+      subject { newsletter.url }
+
+      let(:newsletter) { create(:newsletter, :sent) }
+      let(:organization) { newsletter.organization }
+
+      it { is_expected.to eq("http://#{organization.host}:#{Capybara.server_port}/newsletters/#{newsletter.id}") }
+
+      context "when the newsletter is not sent" do
+        let(:newsletter) { create(:newsletter) }
+
+        it { is_expected.to eq("#") }
+      end
+    end
+
+    describe "#notifications_settings_url" do
+      subject { newsletter.notifications_settings_url }
+
+      let(:newsletter) { create(:newsletter, :sent) }
+      let(:organization) { newsletter.organization }
+
+      it { is_expected.to eq("http://#{organization.host}:#{Capybara.server_port}/notifications_settings") }
+
+      context "when the newsletter is not sent" do
+        let(:newsletter) { create(:newsletter) }
+
+        it { is_expected.to eq("#") }
+      end
+    end
+
+    describe "#unsubscribe_newsletters_url" do
+      subject { newsletter.unsubscribe_newsletters_url }
+
+      let(:newsletter) { create(:newsletter, :sent) }
+      let(:organization) { newsletter.organization }
+
+      it { is_expected.to eq("http://#{organization.host}:#{Capybara.server_port}/newsletters/unsubscribe") }
+
+      context "when the newsletter is not sent" do
+        let(:newsletter) { create(:newsletter) }
+
+        it { is_expected.to eq("#") }
+      end
+    end
+
+    describe "#organization_official_url" do
+      subject { newsletter.organization_official_url }
+
+      let(:newsletter) { create(:newsletter, :sent, organization: organization) }
+      let(:organization) { create(:organization, official_url: "https://example.org") }
+
+      it { is_expected.to eq("https://example.org") }
+
+      context "when the newsletter is not sent" do
+        let(:newsletter) { create(:newsletter) }
+
+        it { is_expected.to eq("#") }
+      end
+
+      context "when the official URL is not set for the organization" do
+        let(:organization) { create(:organization, official_url: nil) }
+
+        it { is_expected.to eq("http://#{organization.host}:#{Capybara.server_port}/") }
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/models/decidim/notification_spec.rb b/decidim-core/spec/models/decidim/notification_spec.rb
index 2ce9567806610..54f5e089f0936 100644
--- a/decidim-core/spec/models/decidim/notification_spec.rb
+++ b/decidim-core/spec/models/decidim/notification_spec.rb
@@ -23,5 +23,61 @@ module Decidim
         it { is_expected.not_to be_valid }
       end
     end
+
+    describe ".daily" do
+      subject { described_class.daily(time: time).order(:id) }
+
+      let(:time) { Time.now.utc }
+      let(:resource) { create(:dummy_resource) }
+      let!(:correct_notifications) do
+        Array.new(5) do
+          create(:notification, resource: resource, created_at: (time - 1.day).beginning_of_day + rand(1..23).hours)
+        end + [
+          create(:notification, resource: resource, created_at: (time - 1.day).beginning_of_day),
+          create(:notification, resource: resource, created_at: (time - 1.day).end_of_day)
+        ]
+      end
+      let!(:incorrect_notifications) do
+        Array.new(20) do
+          modifier = rand(2..365).days
+          create(:notification, resource: resource, created_at: (time - modifier).beginning_of_day + rand(1..23).hours)
+        end + [
+          create(:notification, resource: resource, created_at: (time - 2.days).end_of_day),
+          create(:notification, resource: resource, created_at: time.beginning_of_day)
+        ]
+      end
+
+      it "returns only the notifications within the whole previous day" do
+        expect(subject).to eq(correct_notifications)
+      end
+    end
+
+    describe ".weekly" do
+      subject { described_class.weekly(time: time).order(:id) }
+
+      let(:time) { Time.now.utc }
+      let(:resource) { create(:dummy_resource) }
+      let!(:correct_notifications) do
+        Array.new(5) do
+          create(:notification, resource: resource, created_at: (time - 1.day - 1.week).beginning_of_day + rand(1..7).days)
+        end + [
+          create(:notification, resource: resource, created_at: (time - 1.day - 1.week).beginning_of_day),
+          create(:notification, resource: resource, created_at: (time - 1.day).end_of_day)
+        ]
+      end
+      let!(:incorrect_notifications) do
+        Array.new(20) do
+          modifier = rand(8..365).days
+          create(:notification, resource: resource, created_at: (time - modifier).beginning_of_day + rand(1..23).hours)
+        end + [
+          create(:notification, resource: resource, created_at: (time - 1.week - 2.days).end_of_day),
+          create(:notification, resource: resource, created_at: time.beginning_of_day)
+        ]
+      end
+
+      it "returns only the notifications within the whole previous week" do
+        expect(subject).to eq(correct_notifications)
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/models/decidim/organization_spec.rb b/decidim-core/spec/models/decidim/organization_spec.rb
index 9f26d5c749086..d95ac30fe6fa2 100644
--- a/decidim-core/spec/models/decidim/organization_spec.rb
+++ b/decidim-core/spec/models/decidim/organization_spec.rb
@@ -103,7 +103,7 @@ module Decidim
 
         it "returns only the enabled settings" do
           expect(subject[:facebook][:app_id]).to eq("overriden-app-id")
-          expect(subject[:twitter]).to be(nil)
+          expect(subject[:twitter]).to be_nil
           expect(subject[:google_oauth2][:client_id]).to eq("overriden-client-id")
         end
       end
diff --git a/decidim-core/spec/models/decidim/share_token_spec.rb b/decidim-core/spec/models/decidim/share_token_spec.rb
index cd284b2153ee0..c2439291ece97 100644
--- a/decidim-core/spec/models/decidim/share_token_spec.rb
+++ b/decidim-core/spec/models/decidim/share_token_spec.rb
@@ -94,7 +94,7 @@ module Decidim
     describe "#expired?" do
       context "when share_token has not expired" do
         it "returns true" do
-          expect(subject.expired?).to eq false
+          expect(subject.expired?).to be false
         end
       end
 
@@ -102,7 +102,7 @@ module Decidim
         let(:share_token) { expired_token }
 
         it "returns true" do
-          expect(subject.expired?).to eq true
+          expect(subject.expired?).to be true
         end
       end
     end
diff --git a/decidim-core/spec/models/decidim/short_link_spec.rb b/decidim-core/spec/models/decidim/short_link_spec.rb
new file mode 100644
index 0000000000000..47f6b65dddbcf
--- /dev/null
+++ b/decidim-core/spec/models/decidim/short_link_spec.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ShortLink do
+    subject { short_link }
+
+    let(:short_link) do
+      create(
+        :short_link,
+        target: target,
+        mounted_engine_name: engine_name,
+        route_name: route_name,
+        params: params
+      )
+    end
+    let(:target) { create(:dummy_resource) }
+    let(:engine_name) { "decidim_participatory_process_dummy" }
+    let(:route_name) { "dummy_resource" }
+    let(:params) { {} }
+
+    describe ".to" do
+      subject { described_class.to(target, engine_name, route_name: route_name, params: params) }
+
+      it "creates a unique short link within the target organization" do
+        expect(subject).to be_a(described_class)
+        expect(subject.organization).to be(target.organization)
+        expect(subject.target).to be(target)
+        expect(subject.mounted_engine_name).to eq(engine_name)
+        expect(subject.route_name).to eq(route_name)
+        expect(subject.params).to eq(params)
+      end
+
+      context "with link existing for the same parameters" do
+        let(:params) { { foo: "bar" } }
+
+        # Make sure the link exists
+        before { short_link }
+
+        it "returns the existing link" do
+          expect(subject).to eq(short_link)
+        end
+      end
+    end
+
+    describe ".unique_identifier_within" do
+      subject { described_class.unique_identifier_within(organization) }
+
+      let(:organization) { create(:organization) }
+
+      it "returns a 10 character long alphanumeric string" do
+        expect(subject).to match(/[a-zA-Z0-9]{10}/)
+      end
+
+      context "when the first two identifiers are taken" do
+        let(:taken_identifier1) { "abcDEF1234" }
+        let(:taken_identifier2) { "GHIjkl5678" }
+        let!(:existing_link1) { create(:short_link, target: organization, identifier: taken_identifier1) }
+        let!(:existing_link2) { create(:short_link, target: organization, identifier: taken_identifier2) }
+
+        it "generates an available identifier" do
+          expect(SecureRandom).to receive(:alphanumeric).with(10).once.ordered.and_return(taken_identifier1)
+          expect(SecureRandom).to receive(:alphanumeric).with(10).once.ordered.and_return(taken_identifier2)
+          expect(SecureRandom).to receive(:alphanumeric).with(10).once.ordered.and_call_original
+
+          expect(subject).to match(/[a-zA-Z0-9]{10}/)
+          expect(subject).not_to eq(taken_identifier1)
+          expect(subject).not_to eq(taken_identifier2)
+        end
+
+        context "and the link is created for another organization" do
+          subject { described_class.unique_identifier_within(another_organization) }
+
+          let(:another_organization) { create(:organization) }
+
+          it "returns the identifier already in use in the other organization" do
+            expect(SecureRandom).to receive(:alphanumeric).with(10).once.and_return(taken_identifier1)
+
+            expect(subject).to eq(taken_identifier1)
+          end
+        end
+      end
+    end
+
+    describe "#route_name" do
+      it "returns the defined route name" do
+        expect(subject.route_name).to eq(route_name)
+      end
+
+      context "when the route name is not defined" do
+        let(:route_name) { nil }
+
+        it "returns the root route name" do
+          expect(subject.route_name).to eq("root")
+        end
+      end
+    end
+
+    describe "#short_url" do
+      it "returns the short URL" do
+        expect(subject.short_url).to eq("http://#{target.organization.host}:#{Capybara.server_port}/s/#{subject.identifier}")
+      end
+    end
+
+    describe "#target_url" do
+      let(:resource_url) do
+        Decidim::ResourceLocatorPresenter.new(target).url
+      end
+
+      it "returns the target URL" do
+        expect(subject.target_url).to eq(resource_url)
+      end
+
+      context "with extra parameters" do
+        let(:params) { { foo: "bar", baz: "biz" } }
+
+        it "returns the target URL with the parameters" do
+          expect(subject.target_url).to eq("#{resource_url}?baz=biz&foo=bar")
+        end
+      end
+
+      context "when the target is a participatory space" do
+        let(:target) { create(:participatory_process) }
+        let(:engine_name) { "decidim_participatory_processes" }
+        let(:route_name) { "participatory_process" }
+
+        it "returns the target URL" do
+          expect(subject.target_url).to eq("http://#{target.organization.host}:#{Capybara.server_port}/processes/#{target.slug}")
+        end
+      end
+
+      context "when the target is an organization" do
+        let(:target) { create(:organization) }
+        let(:engine_name) { "decidim" }
+        let(:route_name) { "pages" }
+
+        it "returns the target URL" do
+          expect(subject.target_url).to eq("http://#{target.host}:#{Capybara.server_port}/pages")
+        end
+      end
+
+      context "when the target is a static page" do
+        let(:target) { create(:static_page) }
+        let(:engine_name) { "decidim" }
+        let(:route_name) { "page" }
+
+        it "returns the target URL" do
+          expect(subject.target_url).to eq("http://#{target.organization.host}:#{Capybara.server_port}/pages/#{target.slug}")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/models/decidim/static_page_spec.rb b/decidim-core/spec/models/decidim/static_page_spec.rb
index 8350e84334ac8..cc70cffcb0372 100644
--- a/decidim-core/spec/models/decidim/static_page_spec.rb
+++ b/decidim-core/spec/models/decidim/static_page_spec.rb
@@ -92,7 +92,7 @@ module Decidim
 
         context "when destroying" do
           it "cannot be destroyed" do
-            expect(page.destroy).to eq(false)
+            expect(page.destroy).to be(false)
             expect(page).not_to be_destroyed
           end
         end
diff --git a/decidim-core/spec/models/decidim/user_group_spec.rb b/decidim-core/spec/models/decidim/user_group_spec.rb
index cab325fc7412f..96ac839f6f046 100644
--- a/decidim-core/spec/models/decidim/user_group_spec.rb
+++ b/decidim-core/spec/models/decidim/user_group_spec.rb
@@ -64,6 +64,28 @@ module Decidim
         it { is_expected.not_to be_valid }
       end
 
+      context "when the name is taken" do
+        subject { another_user_group }
+
+        let(:another_user_group) { build :user_group, name: user_group.name, organization: user_group.organization }
+
+        it { is_expected.not_to be_valid }
+
+        context "when the user group is blocked" do
+          before do
+            user_group.name = "Blocked user"
+            user_group.blocked_at = Time.zone.now
+            user_group.save!
+          end
+
+          it "can use the same name" do
+            expect do
+              create(:user_group, :blocked, name: "Blocked user", organization: user_group.organization)
+            end.not_to raise_error
+          end
+        end
+      end
+
       context "when the file is too big" do
         before do
           expect(subject.avatar.blob).to receive(:byte_size).at_least(:once).and_return(11.megabytes)
@@ -77,7 +99,7 @@ module Decidim
         let(:user_group) do
           build(
             :user_group,
-            avatar: ActiveStorage::Blob.create_after_upload!(
+            avatar: ActiveStorage::Blob.create_and_upload!(
               io: File.open(avatar_path),
               filename: "malicious.jpeg",
               content_type: "image/jpeg"
@@ -90,7 +112,7 @@ module Decidim
 
       context "with weird characters" do
         let(:weird_characters) do
-          %w(< > ? % & ^ * # @ ( ) [ ] = + : ; " { } \ |)
+          ["<", ">", "?", "%", "&", "^", "*", "#", "@", "(", ")", "[", "]", "=", "+", ":", ";", '"', "{", "}", " |"]
         end
 
         it "doesn't allow them" do
diff --git a/decidim-core/spec/models/decidim/user_spec.rb b/decidim-core/spec/models/decidim/user_spec.rb
index 970b3e19e8b26..c309efb8b8f11 100644
--- a/decidim-core/spec/models/decidim/user_spec.rb
+++ b/decidim-core/spec/models/decidim/user_spec.rb
@@ -50,7 +50,7 @@ module Decidim
       end
 
       context "when the user is blocked and extended_data has user_name" do
-        let(:user) { build(:user, name: "Blocked user", blocked: true, extended_data: { "user_name": "Test" }) }
+        let(:user) { build(:user, name: "Blocked user", blocked: true, extended_data: { user_name: "Test" }) }
 
         it "returns user name" do
           expect(user.user_name).to eq("Test")
@@ -136,7 +136,7 @@ module Decidim
         end
 
         it "can be created" do
-          expect(user.save).to eq(true)
+          expect(user.save).to be(true)
         end
 
         it "can't have duplicates even when skipping validations" do
@@ -162,7 +162,7 @@ module Decidim
         let(:user) do
           build(
             :user,
-            avatar: ActiveStorage::Blob.create_after_upload!(
+            avatar: ActiveStorage::Blob.create_and_upload!(
               io: File.open(avatar_path),
               filename: "malicious.jpeg",
               content_type: "image/jpeg"
@@ -175,7 +175,7 @@ module Decidim
 
       context "with weird characters" do
         let(:weird_characters) do
-          %w(< > ? % & ^ * # @ ( ) [ ] = + : ; " { } \ |)
+          ["<", ">", "?", "%", "&", "^", "*", "#", "@", "(", ")", "[", "]", "=", "+", ":", ";", '"', "{", "}", " |"]
         end
 
         it "doesn't allow them" do
@@ -286,9 +286,9 @@ module Decidim
       let(:scope4) { create(:scope, organization: organization) }
       let(:scope5) { create(:scope, organization: organization) }
 
-      let(:users_scope1) { create_list(:user, 10, organization: organization, extended_data: { "interested_scopes": scope1.id }) }
-      let(:users_scope2) { create_list(:user, 10, organization: organization, extended_data: { "interested_scopes": [scope2.id] }) }
-      let(:users_multiscope) { create_list(:user, 10, organization: organization, extended_data: { "interested_scopes": [scope1.id, scope2.id, scope3.id] }) }
+      let(:users_scope1) { create_list(:user, 10, organization: organization, extended_data: { interested_scopes: scope1.id }) }
+      let(:users_scope2) { create_list(:user, 10, organization: organization, extended_data: { interested_scopes: [scope2.id] }) }
+      let(:users_multiscope) { create_list(:user, 10, organization: organization, extended_data: { interested_scopes: [scope1.id, scope2.id, scope3.id] }) }
 
       # It needs to be controlled when the users are created which is why this
       # needs to be separated to its own method instead of using the bang
@@ -361,7 +361,7 @@ def create_users_and_scopes
       context "when there are scopes with matching numbers in their IDs" do
         let(:scopes) { [scope1.id] }
         let(:extra_scopes) { create_list(:scope, 15, organization: organization) }
-        let(:users_scope11) { create_list(:user, 10, organization: organization, extended_data: { "interested_scopes": [11] }) }
+        let(:users_scope11) { create_list(:user, 10, organization: organization, extended_data: { interested_scopes: [11] }) }
 
         before do
           # Reset the scope IDs to start from 1 in order to get possibly
diff --git a/decidim-core/spec/permissions/decidim/permissions_spec.rb b/decidim-core/spec/permissions/decidim/permissions_spec.rb
index d5648d435bcd5..5357b53c41017 100644
--- a/decidim-core/spec/permissions/decidim/permissions_spec.rb
+++ b/decidim-core/spec/permissions/decidim/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:context) do
     {}
   end
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:action_name) { :foo }
   let(:action_subject) { :bar }
   let(:action) do
@@ -21,7 +21,7 @@
       { scope: :public, action: :read, subject: :public_page }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when action is on a locale" do
@@ -29,7 +29,7 @@
       { scope: :public, action: :foo, subject: :locales }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when reporting a resource" do
@@ -37,7 +37,7 @@
       { scope: :public, action: :create, subject: :moderation }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when reading a component" do
@@ -50,7 +50,7 @@
     context "when the component is published" do
       let(:component) { create :component, :published }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when the component is not published" do
@@ -61,37 +61,37 @@
           let(:share_token) { create :share_token, token_for: component, organization: component.organization }
           let(:context) { { share_token: share_token.token, current_component: component } }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when an invalid share token is provided" do
           let(:share_token) { create :share_token, :expired, token_for: component, organization: component.organization }
           let(:context) { { share_token: share_token.token, current_component: component } }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when no share token is provided" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
       context "when the user has no admin access" do
         let(:user) { create :user, organization: organization }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when the user is an admin" do
         let(:user) { create :user, :admin, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the space gives the user admin access" do
         let(:user) { create :process_admin, participatory_process: component.participatory_space }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -102,19 +102,19 @@
     context "when picking" do
       let(:action_name) { :pick }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when searching" do
       let(:action_name) { :search }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when any other action" do
       let(:action_name) { :foo }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -138,7 +138,7 @@
       let(:authorization) { build(:authorization) }
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "with an update action" do
@@ -147,13 +147,13 @@
       context "and the authorization is granted" do
         let(:authorization) { create(:authorization, :granted) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "and the authorization is pending" do
         let(:authorization) { create(:authorization, :pending) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -163,13 +163,13 @@
       context "and the authorization is granted" do
         let(:authorization) { create(:authorization, :granted) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "and the authorization is pending" do
         let(:authorization) { create(:authorization, :pending) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -183,13 +183,13 @@
       context "and the authorization is granted" do
         let(:authorization) { create(:authorization, :granted) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "and the authorization is pending" do
         let(:authorization) { create(:authorization, :pending) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
@@ -211,25 +211,25 @@
       context "with a create action" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "with a accept action" do
         let(:action_name) { :accept }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "with a reject action" do
         let(:action_name) { :reject }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "with a promote action" do
         let(:action_name) { :promote }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -239,25 +239,25 @@
       context "with a create action" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "with a accept action" do
         let(:action_name) { :accept }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "with a reject action" do
         let(:action_name) { :reject }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "with a promote action" do
         let(:action_name) { :promote }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
@@ -275,7 +275,7 @@
           { scope: :public, action: :read, subject: :admin_dashboard }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when impersonating a managed user" do
@@ -283,7 +283,7 @@
           { scope: :public, action: :impersonate, subject: :managed_user }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -294,13 +294,13 @@
       context "when user is self" do
         let(:current_user) { user }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user is not self" do
         let(:current_user) { create :user }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -310,7 +310,7 @@
       context "when following a resource" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when any other action on a follow" do
@@ -320,13 +320,13 @@
         context "when the author of the follow is the user" do
           let(:follow) { create :follow, user: user }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when the author of the follow is another user" do
           let(:follow) { create :follow }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
@@ -339,7 +339,7 @@
       context "when reading a notification" do
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when any other action on a notification" do
@@ -349,13 +349,13 @@
         context "when the notification is sent to the user" do
           let(:notification) { build :notification, user: user }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when the notification is sent to another user" do
           let(:notification) { build :notification }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
@@ -367,7 +367,7 @@
       context "when listing conversations" do
         let(:action_name) { :list }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when creating a conversation" do
@@ -395,13 +395,13 @@
       context "when creating user groups" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when joining user groups" do
         let(:action_name) { :join }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when leaving a user group" do
@@ -413,11 +413,11 @@
         context "when the user does not belong to the user group" do
           let!(:user_group) { create :user_group, organization: user.organization }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user is the creator" do
-          it { is_expected.to eq false }
+          it { is_expected.to be true }
         end
 
         context "when the user belongs to the group" do
@@ -427,7 +427,7 @@
             membership.save
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -438,7 +438,7 @@
         let(:context) { { user_group: user_group } }
 
         context "when the user is the creator" do
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when the user is an admin" do
@@ -448,7 +448,7 @@
             membership.save
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when the user is a basic member" do
@@ -458,7 +458,7 @@
             membership.save
           end
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
@@ -469,13 +469,13 @@
       context "when action is create" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is reject" do
         let(:action_name) { :reject }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
diff --git a/decidim-core/spec/presenters/decidim/admin_log/user_moderation_presenter_spec.rb b/decidim-core/spec/presenters/decidim/admin_log/user_moderation_presenter_spec.rb
new file mode 100644
index 0000000000000..cd8ac1d9ea5bd
--- /dev/null
+++ b/decidim-core/spec/presenters/decidim/admin_log/user_moderation_presenter_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminLog::UserModerationPresenter, type: :helper do
+  context "with user" do
+    include_examples "present admin log entry" do
+      let(:reportable) { create(:user, :blocked, organization: organization) }
+      let(:moderation) { create(:user_moderation, user: reportable) }
+      let(:admin_log_resource) { reportable }
+      let(:admin_log_extra_data) { { extra: { user_id: reportable.id } } }
+      let(:action) { "report" }
+    end
+  end
+
+  context "with user group" do
+    include_examples "present admin log entry" do
+      let(:reportable) { create(:user_group, :blocked, organization: organization) }
+      let(:moderation) { create(:user_moderation, user: reportable) }
+      let(:admin_log_resource) { reportable }
+      let(:admin_log_extra_data) { { extra: { user_id: reportable.id } } }
+      let(:action) { "report" }
+    end
+  end
+end
diff --git a/decidim-core/spec/presenters/decidim/log/value_types/area_presenter_spec.rb b/decidim-core/spec/presenters/decidim/log/value_types/area_presenter_spec.rb
index ab34e66f9b31e..8fa3063647ede 100644
--- a/decidim-core/spec/presenters/decidim/log/value_types/area_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/log/value_types/area_presenter_spec.rb
@@ -22,7 +22,7 @@
       end
     end
 
-    context "when the area is found" do
+    context "when the area isn't found" do
       let(:value) { area.id + 1 }
 
       it "shows a string explaining the problem" do
diff --git a/decidim-core/spec/presenters/decidim/log/value_types/scope_presenter_spec.rb b/decidim-core/spec/presenters/decidim/log/value_types/scope_presenter_spec.rb
index 907bb6384cbf5..aadeb0f125873 100644
--- a/decidim-core/spec/presenters/decidim/log/value_types/scope_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/log/value_types/scope_presenter_spec.rb
@@ -22,7 +22,7 @@
       end
     end
 
-    context "when the scope is found" do
+    context "when the scope isn't found" do
       let(:value) { scope.id + 1 }
 
       it "shows a string explaining the problem" do
diff --git a/decidim-core/spec/presenters/decidim/nil_presenter_spec.rb b/decidim-core/spec/presenters/decidim/nil_presenter_spec.rb
index e7ff082323732..be29f06a8ae85 100644
--- a/decidim-core/spec/presenters/decidim/nil_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/nil_presenter_spec.rb
@@ -16,7 +16,7 @@ module Decidim
       let(:method) { :avatar_url }
 
       it "returns the default avatar url" do
-        expect(subject).to eq(::Webpacker.instance.manifest.lookup("media/images/default-avatar.svg"))
+        expect(subject).to eq("//localhost:#{Capybara.server_port}#{::Webpacker.instance.manifest.lookup("media/images/default-avatar.svg")}")
         expect(subject.ends_with?(".svg")).to be true
       end
     end
@@ -71,14 +71,6 @@ module Decidim
       end
     end
 
-    describe "with metrics related methods" do
-      [:highlighted, :not_highlighted, :highlighted_metrics, :not_highlighted_metrics].each do |method|
-        let(:method) { method }
-
-        it { is_expected.to eq("") }
-      end
-    end
-
     describe "with hashtag related methods" do
       [:name, :hashtag_path, :display_hashtag, :display_hashtag_name].each do |method|
         let(:method) { method }
diff --git a/decidim-core/spec/presenters/decidim/notification_presenter_spec.rb b/decidim-core/spec/presenters/decidim/notification_presenter_spec.rb
index 558ccf07b0d53..584c6aff4dcc6 100644
--- a/decidim-core/spec/presenters/decidim/notification_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/notification_presenter_spec.rb
@@ -7,7 +7,8 @@ module Decidim
     include ActiveSupport::Testing::TimeHelpers
     let(:creating_date) { Time.parse("Wed, 1 Sep 2021 21:00:00 UTC +00:00").in_time_zone }
     let(:notification) { create(:notification, created_at: creating_date) }
-    let(:subject) { described_class.new(notification) }
+
+    subject { described_class.new(notification) }
 
     context "with a valid notification" do
       describe "#created_at_in_words" do
@@ -61,7 +62,7 @@ module Decidim
 
       describe "#display_resource_text?" do
         it "returns false if the notification hasn't to display the content of the comment" do
-          expect(subject.display_resource_text?).to eq(false)
+          expect(subject.display_resource_text?).to be(false)
         end
       end
     end
@@ -72,11 +73,12 @@ module Decidim
       let(:extra) { { comment_id: create(:comment).id } }
 
       let(:notification) { create(:notification, event_class: event_class, event_name: event_name, extra: extra) }
-      let(:subject) { described_class.new(notification) }
+
+      subject { described_class.new(notification) }
 
       describe "#display_resource_text?" do
         it "returns true if the notification has to display the content of the comment" do
-          expect(subject.display_resource_text?).to eq(true)
+          expect(subject.display_resource_text?).to be(true)
         end
       end
     end
diff --git a/decidim-core/spec/presenters/decidim/notification_to_mailer_presenter_spec.rb b/decidim-core/spec/presenters/decidim/notification_to_mailer_presenter_spec.rb
new file mode 100644
index 0000000000000..8382f8bff518b
--- /dev/null
+++ b/decidim-core/spec/presenters/decidim/notification_to_mailer_presenter_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe NotificationToMailerPresenter, type: :presenter do
+    let(:creating_date) { Time.parse("Wed, 1 Sep 2021 21:00:00 UTC +00:00").in_time_zone }
+    let(:notification) { create(:notification, created_at: creating_date) }
+
+    subject { described_class.new(notification) }
+
+    context "with a daily frequency" do
+      describe "#date_time" do
+        it "returns the hour formated" do
+          allow(subject).to receive(:frequency).and_return(:daily)
+          expect(subject.date_time).to eq("21:00")
+        end
+      end
+    end
+
+    context "with a weekly frequency" do
+      describe "#date_time" do
+        it "returns the date formated" do
+          allow(subject).to receive(:frequency).and_return(:weekly)
+          expect(subject.date_time).to eq("01/09/2021 21:00")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/presenters/decidim/notifications_digest_presenter_spec.rb b/decidim-core/spec/presenters/decidim/notifications_digest_presenter_spec.rb
new file mode 100644
index 0000000000000..0668f5fee0cc3
--- /dev/null
+++ b/decidim-core/spec/presenters/decidim/notifications_digest_presenter_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe NotificationsDigestPresenter, type: :presenter do
+    subject { described_class.new(user) }
+
+    context "with a user with daily sending frequency" do
+      let(:user) { create(:user, notifications_sending_frequency: :daily) }
+
+      describe "the methods needed in the mail" do
+        it "returns the strings formated according to the daily frequency" do
+          expect(subject.subject).to eq("This is your mail digest")
+          expect(subject.header).to eq("Daily Notification Digest")
+          expect(subject.formated_date(Time.parse("Wed, 1 Sep 2021 21:00:00 UTC +00:00").in_time_zone)).to eq("September 01, 2021 21:00")
+          expect(subject.greeting).to eq("Hello #{user.name},")
+          expect(subject.intro).to eq("These are the notifications from the last day based on the activity you are following:")
+          expect(subject.outro).to eq("You have received these notifications because you are following this content or its authors. You can unfollow them from their respective pages.")
+          expect(subject.see_more).to eq("See more notifications")
+        end
+      end
+    end
+
+    context "with a user with weekly sending frequency" do
+      let(:user) { create(:user, notifications_sending_frequency: :weekly) }
+
+      describe "#date_time" do
+        it "returns the strings formated according to the daily frequency" do
+          expect(subject.subject).to eq("This is your mail digest")
+          expect(subject.header).to eq("Weekly Notification Digest")
+          expect(subject.formated_date(Time.parse("Wed, 1 Sep 2021 21:00:00 UTC +00:00").in_time_zone)).to eq("September 01, 2021 21:00")
+          expect(subject.greeting).to eq("Hello #{user.name},")
+          expect(subject.intro).to eq("These are the notifications from the last week based on the activity you are following:")
+          expect(subject.outro).to eq("You have received these notifications because you are following this content or its authors. You can unfollow them from their respective pages.")
+          expect(subject.see_more).to eq("See more notifications")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb b/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb
new file mode 100644
index 0000000000000..f5bdd3ec705d2
--- /dev/null
+++ b/decidim-core/spec/presenters/decidim/organization_presenter_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe OrganizationPresenter, type: :helper do
+    let(:description) { { "en" => "<p>A necessitatibus quo. 1</p>" } }
+    let(:organization) { create(:organization, name: "Organization's name", description: description) }
+
+    subject { described_class.new(organization) }
+
+    context "with an organization" do
+      describe "#html_name" do
+        it "returns the description translated and without any html tag" do
+          expect(subject.html_name).to eq("Organization's name")
+        end
+      end
+
+      describe "#translated_description" do
+        it "returns the description translated and without any html tag" do
+          expect(subject.translated_description).to eq("A necessitatibus quo. 1")
+        end
+      end
+
+      describe "#start_url" do
+        it "returns the url that opens when the installed pwa is launched" do
+          expect(subject.start_url).to eq("/")
+        end
+      end
+
+      describe "#pwa_display" do
+        it "returns the pwa_display value" do
+          expect(subject.pwa_display).to eq("standalone")
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/presenters/decidim/push_notification_presenter_spec.rb b/decidim-core/spec/presenters/decidim/push_notification_presenter_spec.rb
new file mode 100644
index 0000000000000..c1e835a89ca7d
--- /dev/null
+++ b/decidim-core/spec/presenters/decidim/push_notification_presenter_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe PushNotificationPresenter, type: :presenter do
+    let(:notification) { create(:notification) }
+
+    subject { described_class.new(notification) }
+
+    context "with a valid notification" do
+      let(:event_class) { Decidim::Comments::CommentCreatedEvent }
+      let(:event_name) { "decidim.events.comments.comment_created" }
+      let(:extra) { { comment_id: create(:comment).id } }
+      let(:notification) { create(:notification, event_class: event_class, event_name: event_name, extra: extra) }
+
+      describe "#body" do
+        it "returns text without links and with HTML entities unescaped" do
+          # rubocop:disable RSpec/AnyInstance
+          allow_any_instance_of(event_class).to receive(:notification_title).and_return(
+            "There is a new comment from <a href='/path/to/profile'>Foo & Bar 1 < 2 & 2 > 3</a>"
+          )
+
+          expect(subject.body).to eq("There is a new comment from Foo & Bar 1 < 2 & 2 > 3")
+          # rubocop:enable RSpec/AnyInstance
+        end
+      end
+
+      describe "#url" do
+        it "returns the url to the comment" do
+          # comment urls are anchors from the resource page to the comment
+          expect(subject.url).to include("#comment_#{extra[:comment_id]}")
+        end
+      end
+    end
+
+    context "when it's a blog post" do
+      let(:event_class) { Decidim::Blogs::CreatePostEvent }
+      let(:event_name) { "decidim.events.blogs.post_created" }
+      let(:resource) { create(:post) }
+      let(:notification) { create(:notification, event_class: event_class, event_name: event_name, resource: resource) }
+
+      describe "#body" do
+        it "returns text without links and with HTML entities unescaped" do
+          expect(subject.body).to eq("The post #{translated(resource.title)} has been published in #{translated(resource.component.participatory_space.title)}")
+        end
+      end
+
+      describe "#url" do
+        it "returns the url to the post" do
+          expect(subject.url).to eq(resource_locator(resource).url)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/presenters/decidim/resource_locator_presenter_spec.rb b/decidim-core/spec/presenters/decidim/resource_locator_presenter_spec.rb
index d3c31da54c6cb..05a43cfe562bd 100644
--- a/decidim-core/spec/presenters/decidim/resource_locator_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/resource_locator_presenter_spec.rb
@@ -22,7 +22,7 @@ module Decidim
       describe "#url" do
         subject { described_class.new(resource).url }
 
-        it { is_expected.to eq("http://1.lvh.me/processes/my-process/f/1/dummy_resources/1") }
+        it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/processes/my-process/f/1/dummy_resources/1") }
 
         context "when specific port configured" do
           before do
@@ -62,7 +62,7 @@ module Decidim
       describe "#url" do
         subject { described_class.new([resource, nested_resource]).url }
 
-        it { is_expected.to eq("http://1.lvh.me/processes/my-process/f/1/dummy_resources/1/nested_dummy_resources/1") }
+        it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/processes/my-process/f/1/dummy_resources/1/nested_dummy_resources/1") }
 
         context "when specific port configured" do
           before do
@@ -110,7 +110,7 @@ module Decidim
       describe "#url" do
         subject { described_class.new(participatory_process).url }
 
-        it { is_expected.to start_with("http://1.lvh.me/processes/my-process") }
+        it { is_expected.to start_with("http://1.lvh.me:#{Capybara.server_port}/processes/my-process") }
       end
 
       describe "#path" do
diff --git a/decidim-core/spec/presenters/decidim/user_presenter_spec.rb b/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
index 8d6b3cfef7986..966dd803e1a99 100644
--- a/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
+++ b/decidim-core/spec/presenters/decidim/user_presenter_spec.rb
@@ -25,13 +25,13 @@ module Decidim
     describe "#profile_url" do
       subject { described_class.new(user).profile_url }
 
-      it { is_expected.to eq("http://#{user.organization.host}/profiles/#{user.nickname}") }
+      it { is_expected.to eq("http://#{user.organization.host}:#{Capybara.server_port}/profiles/#{user.nickname}") }
     end
 
     describe "#default_avatar_url" do
       subject { described_class.new(user).default_avatar_url }
 
-      it { is_expected.to eq(ActionController::Base.helpers.asset_pack_path("media/images/default-avatar.svg")) }
+      it { is_expected.to eq("//#{user.organization.host}:#{Capybara.server_port}#{ActionController::Base.helpers.asset_pack_path("media/images/default-avatar.svg")}") }
     end
 
     context "when user is not officialized" do
@@ -73,7 +73,7 @@ module Decidim
 
       it do
         expect(subject).to \
-          have_link(user.nickname, href: "http://#{user.organization.host}/profiles/#{user.nickname}") &
+          have_link(user.nickname, href: "http://#{user.organization.host}:#{Capybara.server_port}/profiles/#{user.nickname}") &
           have_selector(".user-mention")
       end
     end
@@ -92,7 +92,7 @@ module Decidim
 
         let(:host) { user.organization.host }
 
-        it { is_expected.to eq("http://#{host}/profiles/#{user.nickname}") }
+        it { is_expected.to eq("http://#{host}:#{Capybara.server_port}/profiles/#{user.nickname}") }
       end
     end
   end
diff --git a/decidim-core/spec/queries/decidim/public_activities_spec.rb b/decidim-core/spec/queries/decidim/public_activities_spec.rb
new file mode 100644
index 0000000000000..021a1554cff5c
--- /dev/null
+++ b/decidim-core/spec/queries/decidim/public_activities_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::PublicActivities do
+  let(:query) { described_class.new(organization, options) }
+  let(:options) { { user: user, current_user: current_user } }
+
+  let(:organization) { create(:organization) }
+  let(:current_user) { create(:user, :confirmed, organization: organization) }
+  let(:user) { create(:user, :confirmed, organization: organization) }
+  let(:process) { create(:participatory_process, organization: organization) }
+  let(:assembly) { create(:assembly, organization: organization) }
+  let(:private_process) { create(:participatory_process, :private, organization: organization) }
+  let(:private_assembly) { create(:assembly, :private, organization: organization) }
+
+  before do
+    # Note that it is possible to add private users also to public processes
+    # and assemblies, there is no programming logic forbidding that to happen.
+    [process, assembly, private_process, private_assembly].each do |space|
+      10.times { create(:participatory_space_private_user, user: build(:user, :confirmed, organization: organization), privatable_to: space) } # rubocop:disable RSpec/FactoryBot/CreateList
+    end
+
+    # Add the user to both private spaces
+    create(:participatory_space_private_user, user: user, privatable_to: private_process)
+    create(:participatory_space_private_user, user: user, privatable_to: private_assembly)
+  end
+
+  describe "#query" do
+    subject { query.query }
+
+    let(:component) { create(:component, manifest_name: "dummy", participatory_space: process) }
+    let(:comment) { create(:comment, author: user, commentable: build(:dummy_resource, component: component)) }
+    let!(:log) { create(:action_log, action: "create", visibility: "public-only", resource: comment, participatory_space: process, user: user) }
+
+    let(:private_component) { create(:component, manifest_name: "dummy", participatory_space: private_process) }
+    let(:private_comment) { create(:comment, author: user, commentable: build(:dummy_resource, component: private_component)) }
+    let!(:private_log) { create(:action_log, action: "create", visibility: "public-only", resource: private_comment, participatory_space: private_process, user: user) }
+
+    it "does not return duplicates" do
+      expect(subject.count).to eq(1)
+    end
+
+    context "when the current user has access to the private space" do
+      before do
+        create(:participatory_space_private_user, user: current_user, privatable_to: private_process)
+      end
+
+      it "returns also the private comment without duplicates" do
+        expect(subject.count).to eq(2)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/queries/decidim/stats_users_count_spec.rb b/decidim-core/spec/queries/decidim/stats_users_count_spec.rb
index 80efe66a57b35..f5329919a3d83 100644
--- a/decidim-core/spec/queries/decidim/stats_users_count_spec.rb
+++ b/decidim-core/spec/queries/decidim/stats_users_count_spec.rb
@@ -44,7 +44,7 @@
   context "with blocked and deleted users" do
     it "will exclude all the users blocked or with deleted account" do
       create(:user, :confirmed, organization: organization, blocked: true)
-      create(:user, :confirmed, organization: organization, deleted_at: Time.current - 1.day)
+      create(:user, :confirmed, organization: organization, deleted_at: 1.day.ago)
       create(:user, :confirmed, organization: organization)
 
       expect(subject.query).to eq(1)
diff --git a/decidim-core/spec/requests/session_spec.rb b/decidim-core/spec/requests/session_spec.rb
index 66e2243971b5a..11b4f048fb4c3 100644
--- a/decidim-core/spec/requests/session_spec.rb
+++ b/decidim-core/spec/requests/session_spec.rb
@@ -8,12 +8,12 @@
   let(:request_path) { Decidim::Core::Engine.routes.url_helpers.user_session_path }
 
   let(:organization) { create(:organization) }
-  let(:user) { create(:user, :confirmed, email: "user@example.org", password: "decidim123456", organization: organization) }
+  let(:user) { create(:user, :confirmed, email: "user@example.org", password: "decidim123456789", organization: organization) }
 
   it "sets the correct SameSite flag for the cookie" do
     post(
       request_path,
-      params: { user: { email: "user@example.org", password: "decidim123456" } },
+      params: { user: { email: "user@example.org", password: "decidim123456789" } },
       headers: { "HOST" => organization.host }
     )
 
diff --git a/decidim-core/spec/scrubbers/decidim/admin_input_scrubber_spec.rb b/decidim-core/spec/scrubbers/decidim/admin_input_scrubber_spec.rb
new file mode 100644
index 0000000000000..965de68e44a96
--- /dev/null
+++ b/decidim-core/spec/scrubbers/decidim/admin_input_scrubber_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::AdminInputScrubber do
+  subject { described_class.new }
+
+  def scrub(html)
+    Loofah.scrub_fragment(html, subject).to_s
+  end
+
+  RSpec::Matchers.define :be_scrubbed do
+    match do |actual|
+      expect(scrub(actual)).to eq actual
+    end
+
+    failure_message do |actual|
+      "expected \"#{actual}\" to eq \"#{scrub(actual)}\" after scrubbing"
+    end
+  end
+
+  RSpec::Matchers.define :be_scrubbed_as do |expected|
+    match do |actual|
+      expect(scrub(actual)).to eq expected
+    end
+
+    failure_message do |actual|
+      "expected \"#{actual}\" to eq \"#{expected}\" after scrubbing, scrubbed as \"#{scrub(actual)}\" instead"
+    end
+  end
+
+  it "allows iframes to embed videos" do
+    html = "<iframe frameborder=\"0\" allowfullscreen=\"true\" src=\"url\"></iframe>"
+    expect(html).to be_scrubbed
+  end
+
+  it "allows disabled iframes" do
+    html = %(<div class="disabled-iframe"><!-- <iframe src="url"></iframe> --></div>)
+    expect(html).to be_scrubbed
+  end
+
+  it "allows most basic tags" do
+    html = "<a></a><b></b><strong></strong><em></em><i></i><p></p><br>"
+    expect(html).to be_scrubbed
+  end
+
+  it "does not allow scripts" do
+    html = "<script></script>"
+    expect(html).to be_scrubbed_as("")
+  end
+
+  it "does not allow onerror attributes" do
+    html = "<img src=x onerror=alert(1)>"
+    expect(html).to be_scrubbed_as("<img src=\"x\">")
+  end
+end
diff --git a/decidim-core/spec/scrubbers/decidim/user_input_scrubber_spec.rb b/decidim-core/spec/scrubbers/decidim/user_input_scrubber_spec.rb
index add55579fafca..5e0ec0371f130 100644
--- a/decidim-core/spec/scrubbers/decidim/user_input_scrubber_spec.rb
+++ b/decidim-core/spec/scrubbers/decidim/user_input_scrubber_spec.rb
@@ -29,9 +29,19 @@ def scrub(html)
     end
   end
 
-  it "allows iframes to embed videos" do
+  it "does not allow iframes" do
     html = "<iframe frameborder=\"0\" allowfullscreen=\"true\" src=\"url\"></iframe>"
-    expect(html).to be_scrubbed
+    expect(html).to be_scrubbed_as("")
+  end
+
+  it "does not allow comments" do
+    html = "<p>Hello, <!-- world! --></p>"
+    expect(html).to be_scrubbed_as("<p>Hello, </p>")
+  end
+
+  it "does not allow disabled iframes" do
+    html = %(<div class="disabled-iframe"><!-- <iframe src="url"></iframe> --></div>)
+    expect(html).to be_scrubbed_as(%(<div class="disabled-iframe"></div>))
   end
 
   it "allows most basic tags" do
diff --git a/decidim-core/spec/serializers/decidim/exporters/participatory_space_components_serializer_spec.rb b/decidim-core/spec/serializers/decidim/exporters/participatory_space_components_serializer_spec.rb
index 5db241e065def..44074d821d5bd 100644
--- a/decidim-core/spec/serializers/decidim/exporters/participatory_space_components_serializer_spec.rb
+++ b/decidim-core/spec/serializers/decidim/exporters/participatory_space_components_serializer_spec.rb
@@ -9,11 +9,11 @@ module Decidim::Exporters
         described_class.new(participatory_space)
       end
 
-      let!(:component_1) { create(:component) }
-      let!(:participatory_space) { component_1.participatory_space }
-      let!(:component_2) { create(:component, participatory_space: participatory_space) }
+      let!(:component1) { create(:component) }
+      let!(:participatory_space) { component1.participatory_space }
+      let!(:component2) { create(:component, participatory_space: participatory_space) }
       let(:components) do
-        { component_1.id => component_1, component_2.id => component_2 }
+        { component1.id => component1, component2.id => component2 }
       end
       let(:previous_conf) { {} }
 
@@ -24,7 +24,7 @@ def serialize
       end
 
       before do
-        manifest = component_2.manifest
+        manifest = component2.manifest
         previous_conf[:serializes_specific_data] = manifest.serializes_specific_data
         manifest.serializes_specific_data = true
         previous_conf[:specific_data_serializer_class_name] = manifest.specific_data_serializer_class_name
@@ -32,7 +32,7 @@ def serialize
       end
 
       after do
-        manifest = component_2.manifest
+        manifest = component2.manifest
         manifest.serializes_specific_data = previous_conf[:serializes_specific_data]
         manifest.specific_data_serializer_class_name = previous_conf[:specific_data_serializer_class_name]
       end
@@ -44,7 +44,7 @@ def serialize
           expect(serialized.size).to eq(2)
           serialized.each do |serialized|
             serialized_component_attrs_should_be_as_expected(serialized)
-            expect(serialized[:specific_data]).to eq(specific: :data) if serialized[:id] == component_2.id
+            expect(serialized[:specific_data]).to eq(specific: :data) if serialized[:id] == component2.id
           end
         end
 
diff --git a/decidim-core/spec/serializers/decidim/importers/participatory_space_components_importer_spec.rb b/decidim-core/spec/serializers/decidim/importers/participatory_space_components_importer_spec.rb
index f82b4692fad68..7635069ca331e 100644
--- a/decidim-core/spec/serializers/decidim/importers/participatory_space_components_importer_spec.rb
+++ b/decidim-core/spec/serializers/decidim/importers/participatory_space_components_importer_spec.rb
@@ -11,40 +11,40 @@ module Decidim::Importers
 
       let(:user) { create(:user) }
       let(:previous_participatory_space) { create(:participatory_process) }
-      let!(:component_1) { create(:component, :with_one_step, :published, :with_permissions, weight: 1) }
-      let!(:participatory_space) { component_1.participatory_space }
-      let!(:component_2) { create(:component, :with_one_step, :unpublished, :with_permissions, participatory_space: participatory_space, weight: 2) }
+      let!(:component1) { create(:component, :with_one_step, :published, :with_permissions, weight: 1) }
+      let!(:participatory_space) { component1.participatory_space }
+      let!(:component2) { create(:component, :with_one_step, :unpublished, :with_permissions, participatory_space: participatory_space, weight: 2) }
 
       let(:json_as_text) do
         <<~EOJSON
           [{
-            "manifest_name": "#{component_1.manifest_name}",
-            "id": #{component_1.id},
+            "manifest_name": "#{component1.manifest_name}",
+            "id": #{component1.id},
             "name": {
-              "ca": "#{component_1.name["ca"]}",
-              "en": "#{component_1.name["en"]}",
-              "es": "#{component_1.name["es"]}"
+              "ca": "#{component1.name["ca"]}",
+              "en": "#{component1.name["en"]}",
+              "es": "#{component1.name["es"]}"
             },
             "participatory_space_id": #{previous_participatory_space.id},
-            "participatory_space_type": "#{component_1.participatory_space.class.name}",
-            "settings": #{component_1.attributes["settings"].to_json},
-            "weight": #{component_1.weight},
-            "permissions": #{component_1.permissions.to_json},
-            "published_at": "#{component_1.published_at&.iso8601 || "null"}"
+            "participatory_space_type": "#{component1.participatory_space.class.name}",
+            "settings": #{component1.attributes["settings"].to_json},
+            "weight": #{component1.weight},
+            "permissions": #{component1.permissions.to_json},
+            "published_at": "#{component1.published_at&.iso8601 || "null"}"
           }, {
-            "manifest_name": "#{component_2.manifest_name}",
-            "id": #{component_2.id},
+            "manifest_name": "#{component2.manifest_name}",
+            "id": #{component2.id},
             "name": {
-              "ca": "#{component_2.name["ca"]}",
-              "en": "#{component_2.name["en"]}",
-              "es": "#{component_2.name["es"]}"
+              "ca": "#{component2.name["ca"]}",
+              "en": "#{component2.name["en"]}",
+              "es": "#{component2.name["es"]}"
             },
             "participatory_space_id": #{previous_participatory_space.id},
-            "participatory_space_type": "#{component_2.participatory_space.class.name}",
-            "settings": #{component_2.attributes["settings"].to_json},
-            "weight": #{component_2.weight},
-            "permissions": #{component_2.permissions.to_json},
-            "published_at": "#{component_2.published_at&.iso8601 || "null"}"
+            "participatory_space_type": "#{component2.participatory_space.class.name}",
+            "settings": #{component2.attributes["settings"].to_json},
+            "weight": #{component2.weight},
+            "permissions": #{component2.permissions.to_json},
+            "published_at": "#{component2.published_at&.iso8601 || "null"}"
           }
           ]
         EOJSON
@@ -54,8 +54,8 @@ module Decidim::Importers
         let!(:imported) { subject }
 
         it "imports space components" do
-          expect_imported_to_be_equal(component_1)
-          expect_imported_to_be_equal(component_2)
+          expect_imported_to_be_equal(component1)
+          expect_imported_to_be_equal(component2)
         end
 
         def expect_imported_to_be_equal(component)
diff --git a/decidim-core/spec/services/decidim/activity_search_spec.rb b/decidim-core/spec/services/decidim/activity_search_spec.rb
deleted file mode 100644
index 244dc68301413..0000000000000
--- a/decidim-core/spec/services/decidim/activity_search_spec.rb
+++ /dev/null
@@ -1,256 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  ActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-
-  describe ActivitySearch do
-    subject { search.results }
-
-    let(:search) do
-      described_class.new(organization: organization, resource_type: resource_type, current_user: current_user)
-    end
-    let(:current_user) { nil }
-    let(:organization) { create(:organization) }
-    let(:resource_type) { "all" }
-
-    context "with admin logs" do
-      let!(:admin_log) { create(:action_log, visibility: "admin-only", organization: organization) }
-
-      it { is_expected.not_to include(admin_log) }
-    end
-
-    context "when a resource is not publicable" do
-      let(:comment) { create(:comment) }
-      let!(:action_log) do
-        create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization)
-      end
-
-      it { is_expected.to include(action_log) }
-    end
-
-    context "with any other actions" do
-      let!(:action_log) do
-        create(:action_log, action: "update", visibility: "public-only", organization: organization)
-      end
-
-      it { is_expected.to include(action_log) }
-    end
-
-    context "when a resource is publicable" do
-      let!(:action_log) do
-        create(:action_log, action: action, visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space)
-      end
-      let(:component) do
-        create(:component, :published, organization: organization)
-      end
-
-      context "and it is not published" do
-        let(:action) { "create" }
-        let(:resource) do
-          create(:dummy_resource, component: component, published_at: nil)
-        end
-
-        it { is_expected.not_to include(action_log) }
-      end
-
-      context "and it is published" do
-        let(:action) { "publish" }
-        let(:resource) do
-          create(:dummy_resource, component: component, published_at: Time.current)
-        end
-
-        it { is_expected.to include(action_log) }
-      end
-    end
-
-    context "when a resource is hidden through moderation" do
-      let(:comment) { create(:comment) }
-      let!(:action_log) do
-        create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization)
-      end
-      let!(:moderation) do
-        create(
-          :moderation,
-          :hidden,
-          reportable: comment,
-          participatory_space: comment.commentable.participatory_space
-        )
-      end
-
-      it { is_expected.not_to include(action_log) }
-    end
-
-    context "when a resource is hidden through a private space" do
-      let(:current_user) { create(:user, :confirmed, organization: organization) }
-      let(:participatory_process) { create(:participatory_process, :private, organization: organization) }
-      let(:component) { create(:component, participatory_space: participatory_process) }
-      let(:commentable) { create(:dummy_resource, component: component) }
-      let(:comment) { create(:comment, commentable: commentable) }
-      let!(:action_log) do
-        create(
-          :action_log,
-          action: "create",
-          visibility: "public-only",
-          resource: comment,
-          participatory_space: participatory_process,
-          organization: organization
-        )
-      end
-
-      it { is_expected.not_to include(action_log) }
-
-      context "and the user is in the private space users" do
-        before do
-          create(:participatory_space_private_user, user: current_user, privatable_to: participatory_process)
-        end
-
-        it { is_expected.to include(action_log) }
-      end
-    end
-
-    context "when a public space has private users" do
-      let(:current_user) { create(:user, :confirmed, organization: organization) }
-      let(:user) { create(:user, :confirmed, organization: organization) }
-      let(:process) { create(:participatory_process, organization: organization) }
-      let(:assembly) { create(:assembly, organization: organization) }
-      let(:private_process) { create(:participatory_process, :private, organization: organization) }
-      let(:private_assembly) { create(:assembly, :private, organization: organization) }
-
-      let(:component) { create(:component, manifest_name: "dummy", participatory_space: process) }
-      let(:comment) { create(:comment, author: user, commentable: build(:dummy_resource, component: component)) }
-      let!(:log) { create(:action_log, action: "create", visibility: "public-only", resource: comment, participatory_space: process, user: user) }
-
-      let(:private_component) { create(:component, manifest_name: "dummy", participatory_space: private_process) }
-      let(:private_comment) { create(:comment, author: user, commentable: build(:dummy_resource, component: private_component)) }
-      let!(:private_log) { create(:action_log, action: "create", visibility: "public-only", resource: private_comment, participatory_space: private_process, user: user) }
-
-      before do
-        # Note that it is possible to add private users also to public processes
-        # and assemblies, there is no programming logic forbidding that to happen.
-        [process, assembly, private_process, private_assembly].each do |space|
-          10.times { create(:participatory_space_private_user, user: build(:user, :confirmed, organization: organization), privatable_to: space) } # rubocop:disable FactoryBot/CreateList
-        end
-
-        # Add the user to both private spaces
-        create(:participatory_space_private_user, user: user, privatable_to: private_process)
-        create(:participatory_space_private_user, user: user, privatable_to: private_assembly)
-      end
-
-      it "does not return duplicates" do
-        expect(subject.count).to eq(1)
-      end
-
-      context "when the current user has access to the private space" do
-        before do
-          create(:participatory_space_private_user, user: current_user, privatable_to: private_process)
-        end
-
-        it "returns also the private comment without duplicates" do
-          expect(subject.count).to eq(2)
-        end
-      end
-    end
-
-    context "with followed resources and interesting scopes" do
-      let(:comment) { create(:comment) }
-      let(:user) { create(:user, organization: organization) }
-      let(:user2) { create(:user, organization: organization) }
-
-      let(:component) do
-        create(:component, :published, organization: organization)
-      end
-
-      let(:component2) do
-        create(:component, :published, organization: organization)
-      end
-
-      let(:component3) do
-        create(:component, :published, organization: organization)
-      end
-
-      let(:resource) do
-        create(:dummy_resource, component: component, published_at: Time.current)
-      end
-
-      let(:resource2) do
-        create(:dummy_resource, component: component2, published_at: Time.current)
-      end
-
-      let(:scoped_resource) do
-        create(:dummy_resource, component: component3, published_at: Time.current)
-      end
-
-      let!(:uninteresting_resource) do
-        create(:dummy_resource, component: component3, published_at: Time.current)
-      end
-
-      let(:interesting_scope) do
-        scoped_resource.scope
-      end
-
-      let!(:followed_user_action_log) do
-        create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization, user: user2)
-      end
-
-      let!(:followed_space_action_log) do
-        create(:action_log, action: "publish", visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space)
-      end
-
-      let!(:followed_resource_action_log) do
-        create(:action_log, action: "publish", visibility: "all", resource: resource2, organization: organization)
-      end
-
-      let!(:scoped_resource_action_log) do
-        create(:action_log, action: "publish", visibility: "all", resource: scoped_resource, organization: organization, scope: scoped_resource.scope)
-      end
-
-      let!(:uninteresting_resource_action_log) do
-        create(:action_log, action: "publish", visibility: "all", resource: uninteresting_resource, organization: organization)
-      end
-
-      let(:search) do
-        described_class.new(
-          organization: organization,
-          resource_type: resource_type,
-          follows: user.following_follows,
-          scopes: [interesting_scope]
-        )
-      end
-
-      before do
-        Decidim::Follow.create!(user: user, followable: user2)
-        Decidim::Follow.create!(user: user, followable: followed_space_action_log.participatory_space)
-        Decidim::Follow.create!(user: user, followable: resource2)
-      end
-
-      it "includes results performed by followed users" do
-        expect(subject).to include(followed_user_action_log)
-      end
-
-      it "includes results from followed spaces" do
-        expect(subject).to include(followed_space_action_log)
-      end
-
-      it "includes results from interesting scopes" do
-        expect(subject).to include(scoped_resource_action_log)
-      end
-
-      it "includes results from followed resources" do
-        expect(subject).to include(followed_resource_action_log)
-      end
-
-      it "does not include results from uninteresting resources" do
-        expect(subject).not_to include(uninteresting_resource_action_log)
-      end
-    end
-  end
-end
diff --git a/decidim-core/spec/services/decidim/data_portability_exporter_spec.rb b/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
similarity index 80%
rename from decidim-core/spec/services/decidim/data_portability_exporter_spec.rb
rename to decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
index f9384c021ed88..eb4495b3a6074 100644
--- a/decidim-core/spec/services/decidim/data_portability_exporter_spec.rb
+++ b/decidim-core/spec/services/decidim/download_your_data_exporter_spec.rb
@@ -3,12 +3,12 @@
 require "spec_helper"
 
 module Decidim
-  describe DataPortabilityExporter do
-    subject { DataPortabilityExporter.new(user, tmp_file_in.path, password) }
+  describe DownloadYourDataExporter do
+    subject { DownloadYourDataExporter.new(user, tmp_file_in.path, password) }
 
-    let(:tmp_file_in) { Tempfile.new(["data-portability", ".7z"]) }
-    let(:tmp_dir_out) { Dir.mktmpdir("data_portability_exporter_spec") }
-    let(:password) { "data-portability.7z>passwd" }
+    let(:tmp_file_in) { Tempfile.new(["download-your-data", ".7z"]) }
+    let(:tmp_dir_out) { Dir.mktmpdir("download_your_data_exporter_spec") }
+    let(:password) { "download-your-data.7z>passwd" }
     let(:user) { create :user }
     let(:expected_files) do
       # this are the prefixes for the files archived in the zip
@@ -42,7 +42,7 @@ module Decidim
         open_7z_and_extract_zip(tmp_file_in.path)
 
         file_prefixes = expected_files.dup
-        Zip::File.open(File.join(tmp_dir_out, DataPortabilityExporter::ZIP_FILE_NAME)) do |zip_file|
+        Zip::File.open(File.join(tmp_dir_out, DownloadYourDataExporter::ZIP_FILE_NAME)) do |zip_file|
           zip_file.each do |entry|
             entry_name = entry.name
             prefix = file_prefixes.find { |start| entry_name.start_with?(start) }
diff --git a/decidim-core/spec/services/decidim/email_notification_generator_spec.rb b/decidim-core/spec/services/decidim/email_notification_generator_spec.rb
index 01f311838838d..27d035d55e1a1 100644
--- a/decidim-core/spec/services/decidim/email_notification_generator_spec.rb
+++ b/decidim-core/spec/services/decidim/email_notification_generator_spec.rb
@@ -26,8 +26,8 @@
 
       context "when the user does not want emails for notifications" do
         before do
-          recipient.update(email_on_notification: false)
-          follower.update(email_on_notification: false)
+          recipient.update(notifications_sending_frequency: "none")
+          follower.update(notifications_sending_frequency: "none")
         end
 
         it "does not schedule a job for that recipient" do
@@ -40,17 +40,17 @@
 
       context "when the user wants emails for notifications" do
         before do
-          recipient.update!(email_on_notification: true)
-          follower.update!(email_on_notification: true)
+          recipient.update!(notifications_sending_frequency: "real_time")
+          follower.update!(notifications_sending_frequency: "real_time")
         end
 
         it "schedules a job for each recipient" do
-          expect(Decidim::NotificationMailer)
+          allow(Decidim::NotificationMailer)
             .to receive(:event_received)
             .with(event, event_class_name, resource, recipient, :affected_user.to_s, extra)
             .and_return(mailer)
 
-          expect(Decidim::NotificationMailer)
+          allow(Decidim::NotificationMailer)
             .to receive(:event_received)
             .with(event, event_class_name, resource, follower, :follower.to_s, extra)
             .and_return(mailer)
@@ -71,12 +71,12 @@
 
         context "and the user can participate" do
           it "enqueues the job" do
-            expect(Decidim::NotificationMailer)
+            allow(Decidim::NotificationMailer)
               .to receive(:event_received)
               .with(event, event_class_name, resource, recipient, :affected_user.to_s, extra)
               .and_return(mailer)
 
-            expect(Decidim::NotificationMailer)
+            allow(Decidim::NotificationMailer)
               .to receive(:event_received)
               .with(event, event_class_name, resource, follower, :follower.to_s, extra)
               .and_return(mailer)
diff --git a/decidim-core/spec/services/decidim/engine_resolver_spec.rb b/decidim-core/spec/services/decidim/engine_resolver_spec.rb
new file mode 100644
index 0000000000000..70953a091b3fd
--- /dev/null
+++ b/decidim-core/spec/services/decidim/engine_resolver_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::EngineResolver do
+  subject { resolver }
+
+  let(:resolver) { described_class.new(route_set) }
+  let(:mounted_helpers) do
+    Class.new { include Rails.application.routes.mounted_helpers }.new
+  end
+  let(:route_set) { mounted_helpers.public_send(mounted_engine_name).routes }
+  let(:mounted_engine_name) { :decidim }
+
+  describe "#mounted_name" do
+    subject { resolver.mounted_name }
+
+    it "resolves the correct name for the core module" do
+      expect(subject).to eq("decidim")
+    end
+
+    context "when in the main app" do
+      let(:route_set) { Rails.application.routes }
+
+      it "resolves the main_app name" do
+        expect(subject).to eq("main_app")
+      end
+    end
+
+    context "when in a participatory process" do
+      let(:mounted_engine_name) { :decidim_participatory_processes }
+
+      it "resolves the correct name for the space" do
+        expect(subject).to eq("decidim_participatory_processes")
+      end
+    end
+
+    context "when in a component" do
+      let(:mounted_engine_name) { :decidim_participatory_process_dummy }
+
+      it "resolves the correct name for the component" do
+        expect(subject).to eq("decidim_participatory_process_dummy")
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/services/decidim/events_manager_spec.rb b/decidim-core/spec/services/decidim/events_manager_spec.rb
index 7afb37690c555..3c4e6f4e31927 100644
--- a/decidim-core/spec/services/decidim/events_manager_spec.rb
+++ b/decidim-core/spec/services/decidim/events_manager_spec.rb
@@ -38,9 +38,7 @@
     end
 
     context "when there are invalid values as affected_users" do
-      # rubocop: disable Lint/BinaryOperatorWithIdenticalOperands
       let(:affected_users) { followers + followers + [nil] }
-      # rubocop: enable Lint/BinaryOperatorWithIdenticalOperands
 
       it "sanitizes the recipients" do
         expect(ActiveSupport::Notifications)
@@ -59,9 +57,7 @@
     end
 
     context "when there are invalid values as followers" do
-      # rubocop: disable Lint/BinaryOperatorWithIdenticalOperands
       let(:followers) { affected_users + affected_users + [nil] }
-      # rubocop: enable Lint/BinaryOperatorWithIdenticalOperands
 
       it "sanitizes the recipients" do
         expect(ActiveSupport::Notifications)
@@ -85,7 +81,7 @@
     let(:block) { proc { "Hello world" } }
 
     it "delegates the params to ActiveSupport::Notifications" do
-      expect(ActiveSupport::Notifications)
+      allow(ActiveSupport::Notifications)
         .to receive(:subscribe)
         .with(event, &block)
 
diff --git a/decidim-core/spec/services/decidim/home_activity_search_spec.rb b/decidim-core/spec/services/decidim/home_activity_search_spec.rb
deleted file mode 100644
index ccbb06e156a9b..0000000000000
--- a/decidim-core/spec/services/decidim/home_activity_search_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  HomeActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-
-  describe HomeActivitySearch do
-    subject { search.results }
-
-    let(:search) do
-      described_class.new(organization: organization, resource_type: resource_type)
-    end
-    let(:organization) { create(:organization) }
-    let(:resource_type) { "all" }
-
-    context "with admin logs" do
-      let!(:admin_log) { create(:action_log, visibility: "admin-only", organization: organization) }
-
-      it { is_expected.not_to eq(admin_log) }
-    end
-
-    context "when a resource is not publicable" do
-      let(:comment) { create(:comment) }
-      let!(:action_log) do
-        create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization)
-      end
-
-      it { is_expected.to include(action_log) }
-    end
-
-    context "with update actions" do
-      let!(:action_log) do
-        create(:action_log, action: "update", visibility: "public-only", organization: organization)
-      end
-
-      it { is_expected.not_to include(action_log) }
-    end
-
-    context "when a resource is publicable" do
-      let!(:action_log) do
-        create(:action_log, action: action, visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space)
-      end
-      let(:component) do
-        create(:component, :published, organization: organization)
-      end
-
-      context "and it is not published" do
-        let(:action) { "create" }
-        let(:resource) do
-          create(:dummy_resource, component: component, published_at: nil)
-        end
-
-        it { is_expected.not_to include(action_log) }
-      end
-
-      context "and it is published" do
-        let(:action) { "publish" }
-        let(:resource) do
-          create(:dummy_resource, component: component, published_at: Time.current)
-        end
-
-        it { is_expected.to include(action_log) }
-      end
-    end
-  end
-end
diff --git a/decidim-core/spec/services/decidim/html_truncation_spec.rb b/decidim-core/spec/services/decidim/html_truncation_spec.rb
index a4b38c27dfcbb..da91fa54c6306 100644
--- a/decidim-core/spec/services/decidim/html_truncation_spec.rb
+++ b/decidim-core/spec/services/decidim/html_truncation_spec.rb
@@ -3,7 +3,8 @@
 require "spec_helper"
 
 describe Decidim::HtmlTruncation do
-  let(:subject) { described_class.new(text, options).perform }
+  subject { described_class.new(text, options).perform }
+
   let(:options) do
     {
       max_length: max_length,
@@ -85,7 +86,7 @@
       end
     end
 
-    describe "sequential void elements " do
+    describe "sequential void elements" do
       let(:text) { %(<img src="some/path/foo/bar" alt="foobar"><input id="bar" type="text"><br>) }
 
       it "cuts between elements" do
diff --git a/decidim-core/spec/services/decidim/iframe_disabler_spec.rb b/decidim-core/spec/services/decidim/iframe_disabler_spec.rb
new file mode 100644
index 0000000000000..b2100b96e7614
--- /dev/null
+++ b/decidim-core/spec/services/decidim/iframe_disabler_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::IframeDisabler do
+  let(:disabler) { described_class.new(text, {}) }
+
+  describe "#perform" do
+    subject { disabler.perform }
+
+    let(:iframe) { %(<iframe class="testing" src="https://www.youtube.com/embed/f6JMgJAQ2tc" title="Decidim video" allowfullscreen></iframe>) }
+
+    context "when the text is an iframe" do
+      let(:text) { iframe }
+
+      it "converts the iframe to a disabled div element" do
+        expect(subject).to eq(
+          %(<div class="disabled-iframe"><!-- #{text} --></div>)
+        )
+      end
+    end
+
+    context "when the iframe is a sub-node" do
+      let(:text) { %(<div><div>#{iframe}</div></div>) }
+
+      it "converts the iframe to a disabled div element" do
+        expect(subject).to eq(
+          %(<div><div><div class="disabled-iframe"><!-- #{iframe} --></div></div></div>)
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/services/decidim/notification_generator_for_recipient_spec.rb b/decidim-core/spec/services/decidim/notification_generator_for_recipient_spec.rb
index 2225868d9963a..5d53339afab8f 100644
--- a/decidim-core/spec/services/decidim/notification_generator_for_recipient_spec.rb
+++ b/decidim-core/spec/services/decidim/notification_generator_for_recipient_spec.rb
@@ -24,5 +24,9 @@
       expect(notification.resource).to eq resource
       expect(notification.extra["received_as"]).to eq "affected_user"
     end
+
+    it "returns the generated notification" do
+      expect(subject.generate).to eq(Decidim::Notification.last)
+    end
   end
 end
diff --git a/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb b/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb
new file mode 100644
index 0000000000000..74c5f04780285
--- /dev/null
+++ b/decidim-core/spec/services/decidim/notifications_digest_sending_decider_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::NotificationsDigestSendingDecider do
+  subject { described_class }
+
+  context "with a user who has never received a notifications digest mail" do
+    let(:user) { build :user, notifications_sending_frequency: :daily, digest_sent_at: nil }
+
+    describe "must_notify?" do
+      it "returns true" do
+        expect(subject.must_notify?(user)).to be(true)
+      end
+    end
+  end
+
+  context "when frequency is set to none" do
+    let(:user) { build :user, notifications_sending_frequency: :none, digest_sent_at: Time.now.utc }
+
+    describe "must_notify?" do
+      it "returns false" do
+        expect(subject.must_notify?(user)).to be(false)
+      end
+    end
+  end
+
+  context "when frequency is set to daily" do
+    context "with a user who has received a notifications digest mail in the same day" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :daily, digest_sent_at: current_time - 1.hour }
+
+      describe "must_notify?" do
+        it "returns false" do
+          expect(subject.must_notify?(user, time: current_time)).to be(false)
+        end
+      end
+    end
+
+    context "with a user who has received a notifications digest mail two days ago" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :daily, digest_sent_at: current_time - 2.days }
+
+      describe "must_notify?" do
+        it "returns true" do
+          expect(subject.must_notify?(user, time: current_time)).to be(true)
+        end
+      end
+    end
+
+    # This particular case shouldn't happen on daily runs but in case sending
+    # takes a long time, those users should be also included who were notified
+    # a bit later than the exact time when the scheduled task was run as we
+    # cannot know precicely on which second the scheduled task was run exactly
+    # and if it is always run at the same second.
+    context "with a user who has received a notification digest mail the previous day but less than a day ago" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :daily, digest_sent_at: (current_time - 1.day).end_of_day }
+
+      describe "must_notify?" do
+        it "returns true" do
+          expect(subject.must_notify?(user, time: current_time)).to be(true)
+        end
+      end
+    end
+  end
+
+  context "when frequency is set to weekly" do
+    context "with a user who has received a notifications digest mail in the same week" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :weekly, digest_sent_at: current_time - 1.day }
+
+      describe "must_notify?" do
+        it "returns false" do
+          expect(subject.must_notify?(user, time: current_time)).to be(false)
+        end
+      end
+    end
+
+    context "with a user who has received a notifications digest mail two weeks ago" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :weekly, digest_sent_at: current_time - 2.weeks }
+
+      describe "must_notify?" do
+        it "returns true" do
+          expect(subject.must_notify?(user, time: current_time)).to be(true)
+        end
+      end
+    end
+
+    # This particular case shouldn't happen on weekly runs but in case sending
+    # takes a long time, those users should be also included who were notified
+    # a bit later than the exact time when the scheduled task was run as we
+    # cannot know precicely on which second the scheduled task was run exactly
+    # and if it is always run at the same second.
+    context "with a user who has received a notifications the previous week but less than a exactly 7 days ago from yesterday" do
+      let(:current_time) { Time.now.utc }
+      let(:user) { build :user, notifications_sending_frequency: :weekly, digest_sent_at: (current_time - 1.day - 1.week).end_of_day }
+
+      describe "must_notify?" do
+        it "returns true" do
+          expect(subject.must_notify?(user, time: current_time)).to be(true)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/services/decidim/notifications_subscriptions_persistor_spec.rb b/decidim-core/spec/services/decidim/notifications_subscriptions_persistor_spec.rb
new file mode 100644
index 0000000000000..ec8f6aee765b3
--- /dev/null
+++ b/decidim-core/spec/services/decidim/notifications_subscriptions_persistor_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe NotificationsSubscriptionsPersistor, type: :service do
+    subject { described_class.new(user) }
+
+    let(:organization) { create(:organization, colors: { "theme" => "#f0f0f0" }) }
+    let(:params) { { endpoint: "https://example.es", keys: { auth: "auth_code_121", p256dh: "a_p256dh" } } }
+
+    describe "#add_subscription" do
+      context "when no subscriptions" do
+        let(:user) { create(:user, organization: organization) }
+
+        it "persist subscription params" do
+          expect(subject.add_subscription(params)).to be_truthy
+          expect(user.notifications_subscriptions).not_to be_empty
+          expect(user.notifications_subscriptions["auth_code_121"]["endpoint"]).to eq(params[:endpoint])
+          expect(user.notifications_subscriptions["auth_code_121"]["auth"]).to eq(params[:keys][:auth])
+          expect(user.notifications_subscriptions["auth_code_121"]["p256dh"]).to eq(params[:keys][:p256dh])
+        end
+      end
+
+      context "when user has subscriptions" do
+        let(:user) do
+          create(:user, organization: organization, "notification_settings" => {
+                   "subscriptions" => {
+                     "auth_code_100" => { p256dh: "value", endpoint: "value" }
+                   }
+                 })
+        end
+
+        it "persist subscription params" do
+          expect(subject.add_subscription(params)).to be_truthy
+          expect(user.notifications_subscriptions.size).to eq(2)
+          expect(user.notifications_subscriptions["auth_code_121"]["endpoint"]).to eq(params[:endpoint])
+          expect(user.notifications_subscriptions["auth_code_121"]["auth"]).to eq(params[:keys][:auth])
+          expect(user.notifications_subscriptions["auth_code_121"]["p256dh"]).to eq(params[:keys][:p256dh])
+        end
+      end
+    end
+
+    describe "#delete_subscription" do
+      let(:user) do
+        create(:user, organization: organization, "notification_settings" => {
+                 "subscriptions" => {
+                   "auth_code_121" => { p256dh: "value", endpoint: "value" },
+                   "auth_code_100" => { p256dh: "value", endpoint: "value" }
+                 }
+               })
+      end
+
+      it "returns the result of the subscription deletion" do
+        expect(subject.delete_subscription("auth_code_121")).to be_truthy
+        expect(user.notifications_subscriptions).not_to be_empty
+        expect(user.notifications_subscriptions["auth_code_121"]).to be_nil
+        expect(user.notifications_subscriptions["auth_code_100"]).to be_present
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/services/decidim/open_data_exporter_spec.rb b/decidim-core/spec/services/decidim/open_data_exporter_spec.rb
index ec8e217818ff4..ffc72cb5be91d 100644
--- a/decidim-core/spec/services/decidim/open_data_exporter_spec.rb
+++ b/decidim-core/spec/services/decidim/open_data_exporter_spec.rb
@@ -12,7 +12,7 @@
     it "generates a zip file at the path" do
       subject.export
 
-      expect(File.exist?(path)).to eq(true)
+      expect(File.exist?(path)).to be(true)
     end
 
     describe "contents" do
diff --git a/decidim-core/spec/services/decidim/searchable_user_resource_spec.rb b/decidim-core/spec/services/decidim/searchable_user_resource_spec.rb
index 51a2d28e8562d..8620ceb29837d 100644
--- a/decidim-core/spec/services/decidim/searchable_user_resource_spec.rb
+++ b/decidim-core/spec/services/decidim/searchable_user_resource_spec.rb
@@ -8,7 +8,7 @@ module Decidim
 
     let(:organization) { create(:organization) }
     let(:scope1) { create :scope, organization: organization }
-    let!(:user) { create(:user, name: "Neil Diamond", organization: organization) }
+    let!(:user) { create(:user, nickname: "the_solitary_man", name: "Neil Diamond", organization: organization) }
 
     describe "Indexing of users" do
       context "when implementing Searchable" do
@@ -81,7 +81,7 @@ module Decidim
               user.update!({
                              blocked: true,
                              blocked_at: Time.current,
-                             extended_data: { "user_name": user.name },
+                             extended_data: { user_name: user.name },
                              name: "Blocked user"
                            })
 
@@ -107,27 +107,25 @@ module Decidim
 
     describe "Search" do
       context "when searching by User resource_type" do
-        let!(:user2) { create(:user, name: "Neil Young", organization: organization) }
-
-        it "returns User results" do
-          Decidim::Search.call("Neil", organization, resource_type: user.class.name) do
-            on(:ok) do |results_by_type|
-              results = results_by_type[user.class.name]
-              expect(results[:count]).to eq 2
-              expect(results[:results]).to match_array [user, user2]
-            end
-            on(:invalid) { raise("Should not happen") }
+        let!(:user2) { create(:user, nickname: "the_loner", name: "Neil Young", organization: organization) }
+
+        context "when searching by name" do
+          it "returns User results" do
+            expect_searched_user_results("Neil", 2, [user, user2])
+          end
+
+          it "allows searching by prefix characters" do
+            expect_searched_user_results("diam", 1, [user])
           end
         end
 
-        it "allows searching by prefix characters" do
-          Decidim::Search.call("diam", organization, resource_type: user.class.name) do
-            on(:ok) do |results_by_type|
-              results = results_by_type[user.class.name]
-              expect(results[:count]).to eq 1
-              expect(results[:results]).to eq [user]
-            end
-            on(:invalid) { raise("Should not happen") }
+        context "when searching by nickname" do
+          it "returns User results" do
+            expect_searched_user_results("the_loner", 1, [user2])
+          end
+
+          it "allows searching by prefix characters" do
+            expect_searched_user_results("the_", 2, [user, user2])
           end
         end
 
@@ -135,14 +133,7 @@ module Decidim
           let!(:user2) { create(:user, :deleted, name: "Neil Young", organization: organization) }
 
           it "doesn't returns User results" do
-            Decidim::Search.call("Neil", organization, resource_type: user.class.name) do
-              on(:ok) do |results_by_type|
-                results = results_by_type[user.class.name]
-                expect(results[:count]).to eq 1
-                expect(results[:results]).to match_array [user]
-              end
-              on(:invalid) { raise("Should not happen") }
-            end
+            expect_searched_user_results("Neil", 1, [user])
           end
         end
 
@@ -150,14 +141,7 @@ module Decidim
           let!(:user2) { create(:user, :blocked, name: "Neil Young", organization: organization) }
 
           it "doesn't returns User results" do
-            Decidim::Search.call("Neil", organization, resource_type: user.class.name) do
-              on(:ok) do |results_by_type|
-                results = results_by_type[user.class.name]
-                expect(results[:count]).to eq 1
-                expect(results[:results]).to match_array [user]
-              end
-              on(:invalid) { raise("Should not happen") }
-            end
+            expect_searched_user_results("Neil", 1, [user])
           end
         end
       end
@@ -178,7 +162,7 @@ def expect_searchable_resource_to_correspond_to_user(searchable, user, locale)
     def expected_searchable_resource_attrs(resource, locale)
       {
         "content_a" => resource.name,
-        "content_b" => "",
+        "content_b" => resource.nickname,
         "content_c" => "",
         "content_d" => "",
         "locale" => locale,
@@ -191,5 +175,16 @@ def expected_searchable_resource_attrs(resource, locale)
         "resource_type" => "Decidim::User"
       }
     end
+
+    def expect_searched_user_results(term, count, expected_results)
+      Decidim::Search.call(term, organization, resource_type: user.class.name) do
+        on(:ok) do |results_by_type|
+          results = results_by_type[user.class.name]
+          expect(results[:count]).to eq count
+          expect(results[:results]).to match_array expected_results
+        end
+        on(:invalid) { raise("Should not happen") }
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/services/decidim/send_push_notification_spec.rb b/decidim-core/spec/services/decidim/send_push_notification_spec.rb
new file mode 100644
index 0000000000000..1dcf55f30c018
--- /dev/null
+++ b/decidim-core/spec/services/decidim/send_push_notification_spec.rb
@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::SendPushNotification do
+  subject { described_class.new }
+
+  let(:subscription) { { "auth_key_1" => { "auth" => "auth_key_1", "p256dh" => "p256dh_1", "endpoint" => "endpoint_1" } } }
+  let(:subscriptions) do
+    {
+      "auth_key_1" => { "auth" => "auth_key_1", "p256dh" => "p256dh_1", "endpoint" => "endpoint_1" },
+      "auth_key_2" => { "auth" => "auth_key_2", "p256dh" => "p256dh_2", "endpoint" => "endpoint_2" },
+      "auth_key_3" => { "auth" => "auth_key_3", "p256dh" => "p256dh_3", "endpoint" => "endpoint_3" }
+    }
+  end
+
+  before do
+    allow(Rails.application.secrets).to receive("vapid").and_return({ enabled: true, public_key: "public_key", private_key: "private_key" })
+  end
+
+  context "without vapid settings config" do
+    before do
+      allow(Rails.application.secrets).to receive("vapid").and_return({ enabled: false })
+    end
+
+    describe "#perform" do
+      let(:user) { create(:user) }
+      let(:notification) { create :notification, user: user }
+
+      it "returns false" do
+        expect(subject.perform(notification)).to be_falsy
+      end
+    end
+  end
+
+  context "without any subscription" do
+    describe "#perform" do
+      let(:user) { create(:user, notification_settings: { subscriptions: {} }) }
+      let(:notification) { create :notification, user: user }
+
+      it "returns empty array" do
+        expect(subject.perform(notification)).to be_empty
+      end
+    end
+  end
+
+  context "with subscriptions" do
+    let(:user) { create(:user, notification_settings: { subscriptions: subscriptions }) }
+    let(:notification) { create :notification, user: user }
+
+    describe "#perform" do
+      it "returns 201 and created if the message is sent ok" do
+        presented_notification = Decidim::PushNotificationPresenter.new(notification)
+        message = JSON.generate({
+                                  title: presented_notification.title,
+                                  body: presented_notification.body,
+                                  icon: presented_notification.icon,
+                                  data: { url: presented_notification.url }
+                                })
+
+        first_notification_payload = {
+          message: message,
+          endpoint: subscriptions["auth_key_1"]["endpoint"],
+          p256dh: subscriptions["auth_key_1"]["p256dh"],
+          auth: subscriptions["auth_key_1"]["auth"],
+          vapid: a_hash_including(
+            public_key: "public_key",
+            private_key: "private_key"
+          )
+        }
+        second_notification_payload = {
+          message: message,
+          endpoint: subscriptions["auth_key_2"]["endpoint"],
+          p256dh: subscriptions["auth_key_2"]["p256dh"],
+          auth: subscriptions["auth_key_2"]["auth"],
+          vapid: a_hash_including(
+            public_key: "public_key",
+            private_key: "private_key"
+          )
+        }
+        third_notification_payload = {
+          message: message,
+          endpoint: subscriptions["auth_key_3"]["endpoint"],
+          p256dh: subscriptions["auth_key_3"]["p256dh"],
+          auth: subscriptions["auth_key_3"]["auth"],
+          vapid: a_hash_including(
+            public_key: "public_key",
+            private_key: "private_key"
+          )
+        }
+        expect(Webpush).to receive(:payload_send).with(first_notification_payload).ordered.and_return(double("result", message: "Created", code: "201"))
+        expect(Webpush).to receive(:payload_send).with(second_notification_payload).ordered.and_return(double("result", message: "Created", code: "201"))
+        expect(Webpush).to receive(:payload_send).with(third_notification_payload).ordered.and_raise(Webpush::Error)
+
+        responses = subject.perform(notification)
+        expect(responses.size).to eq(2)
+        expect(responses.all? { |response| response.code == "201" }).to be(true)
+        expect(responses.all? { |response| response.message == "Created" }).to be(true)
+      end
+    end
+  end
+
+  context "with subscription" do
+    let(:user) { create(:user, notification_settings: { subscriptions: subscription }) }
+    let(:notification) { create :notification, user: user }
+
+    describe "#perform" do
+      it "returns 201 and created if the message is sent ok" do
+        presented_notification = Decidim::PushNotificationPresenter.new(notification)
+        notification_payload = {
+          message: JSON.generate({
+                                   title: presented_notification.title,
+                                   body: presented_notification.body,
+                                   icon: presented_notification.icon,
+                                   data: { url: presented_notification.url }
+                                 }),
+          endpoint: subscriptions["auth_key_1"]["endpoint"],
+          p256dh: subscriptions["auth_key_1"]["p256dh"],
+          auth: subscriptions["auth_key_1"]["auth"],
+          vapid: a_hash_including(
+            public_key: "public_key",
+            private_key: "private_key"
+          )
+        }
+
+        allow(Webpush).to receive(:payload_send).with(notification_payload).and_return(double("result", message: "Created", code: "201"))
+
+        responses = subject.perform(notification)
+        expect(responses.all? { |response| response.code == "201" }).to be(true)
+        expect(responses.all? { |response| response.message == "Created" }).to be(true)
+      end
+
+      it "builds notification in user locale" do
+        # Pick other locale from organization
+        alternative_locale = (user.organization.available_locales - [user.locale]).sample
+        user.update(locale: alternative_locale)
+
+        I18n.with_locale(user.locale) do
+          presented_notification = Decidim::PushNotificationPresenter.new(notification)
+          message = JSON.generate({
+                                    title: presented_notification.title,
+                                    body: presented_notification.body,
+                                    icon: presented_notification.icon,
+                                    data: { url: presented_notification.url }
+                                  })
+
+          notification_payload = a_hash_including(message: message)
+          expect(Webpush).to receive(:payload_send).with(notification_payload).ordered.and_return(double("result", message: "Created", code: "201"))
+        end
+
+        responses = subject.perform(notification)
+        expect(responses.all? { |response| response.code == "201" }).to be(true)
+        expect(responses.all? { |response| response.message == "Created" }).to be(true)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/services/decidim/settings_change_spec.rb b/decidim-core/spec/services/decidim/settings_change_spec.rb
index fcfd6d6b35b98..fe2601393a120 100644
--- a/decidim-core/spec/services/decidim/settings_change_spec.rb
+++ b/decidim-core/spec/services/decidim/settings_change_spec.rb
@@ -42,7 +42,7 @@ module Decidim
       let(:block) { proc { |_data| "Hello world" } }
 
       it "subscribes to setting changes" do
-        expect(ActiveSupport::Notifications)
+        allow(ActiveSupport::Notifications)
           .to receive(:subscribe)
           .with(/^decidim\.settings_change\.dummy/, &block)
 
diff --git a/decidim-core/spec/services/decidim/tokenizer_spec.rb b/decidim-core/spec/services/decidim/tokenizer_spec.rb
index 891353e21318f..a330f755c28f7 100644
--- a/decidim-core/spec/services/decidim/tokenizer_spec.rb
+++ b/decidim-core/spec/services/decidim/tokenizer_spec.rb
@@ -26,7 +26,7 @@
 
     it "generates an hexadecimal key" do
       expect(subject.hex_digest(string)).to be_a(String)
-      expect(subject.hex_digest(string).size <= 20).to eq(true)
+      expect(subject.hex_digest(string).size <= 20).to be(true)
     end
 
     it "generates random secrets" do
diff --git a/decidim-core/spec/system/accesslist_spec.rb b/decidim-core/spec/system/accesslist_spec.rb
index e9a291b3596a5..29f1f9efc014f 100644
--- a/decidim-core/spec/system/accesslist_spec.rb
+++ b/decidim-core/spec/system/accesslist_spec.rb
@@ -12,7 +12,7 @@
     login_as admin, scope: :admin
   end
 
-  it "allows access to citizen side" do
+  it "allows access to participants side" do
     visit decidim.root_path
 
     expect(page).to have_content(organization.name)
@@ -29,7 +29,7 @@
       allow(Decidim.config).to receive(:system_accesslist_ips).and_return(["127.0.0.1"])
     end
 
-    it "allows access to citizen side" do
+    it "allows access to participants side" do
       visit decidim.root_path
 
       expect(page).to have_content(organization.name)
diff --git a/decidim-core/spec/system/account_spec.rb b/decidim-core/spec/system/account_spec.rb
index 68ce7196368ca..dc3037d259647 100644
--- a/decidim-core/spec/system/account_spec.rb
+++ b/decidim-core/spec/system/account_spec.rb
@@ -33,7 +33,7 @@
 
     describe "update avatar" do
       it "can update avatar" do
-        attach_file :user_avatar, Decidim::Dev.asset("avatar.jpg")
+        dynamically_attach_file(:user_avatar, Decidim::Dev.asset("avatar.jpg"), remove_before: true)
 
         within "form.edit_user" do
           find("*[type=submit]").click
@@ -43,18 +43,22 @@
       end
 
       it "shows error when image is too big" do
-        attach_file :user_avatar, Decidim::Dev.asset("5000x5000.png")
+        find("#user_avatar_button").click
 
-        within "form.edit_user" do
-          find("*[type=submit]").click
-        end
+        within ".upload-modal" do
+          find(".remove-upload-item").click
+          input_element = find("input[type='file']", visible: :all)
+          input_element.attach_file(Decidim::Dev.asset("5000x5000.png"))
 
-        expect(page).to have_content("The image is too big", count: 1)
-        expect(page).to have_css(".flash.alert")
+          expect(page).to have_content("File resolution is too large", count: 1)
+          expect(page).to have_css(".upload-errors .form-error", count: 1)
+        end
       end
     end
 
     describe "updating personal data" do
+      let!(:encrypted_password) { user.encrypted_password }
+
       it "updates the user's data" do
         within "form.edit_user" do
           select "Castellano", from: :user_locale
@@ -80,6 +84,9 @@
 
         expect(page).to have_content("example.org")
         expect(page).to have_content("Serbian-American")
+
+        # The user's password should not change when they did not update it
+        expect(user.reload.encrypted_password).to eq(encrypted_password)
       end
     end
 
@@ -99,7 +106,7 @@
             expect(page).to have_content("successfully")
           end
 
-          expect(user.reload.valid_password?("sekritpass123")).to eq(true)
+          expect(user.reload.valid_password?("sekritpass123")).to be(true)
         end
       end
 
@@ -118,22 +125,58 @@
             expect(page).to have_content("There was a problem")
           end
 
-          expect(user.reload.valid_password?("sekritpass123")).to eq(false)
+          expect(user.reload.valid_password?("sekritpass123")).to be(false)
         end
       end
+    end
 
-      context "when updating the email" do
-        it "needs to confirm it" do
-          within "form.edit_user" do
-            fill_in :user_email, with: "foo@bar.com"
+    context "when updating the email" do
+      let(:pending_email) { "foo@bar.com" }
 
-            find("*[type=submit]").click
-          end
+      before do
+        within "form.edit_user" do
+          fill_in :user_email, with: pending_email
 
-          within_flash_messages do
-            expect(page).to have_content("email to confirm")
-          end
+          perform_enqueued_jobs { find("*[type=submit]").click }
+        end
+
+        within_flash_messages do
+          expect(page).to have_content("You'll receive an email to confirm your new email address")
+        end
+      end
+
+      after do
+        clear_enqueued_jobs
+      end
+
+      it "tells user to confirm new email" do
+        expect(page).to have_content("Email change verification")
+        expect(page).to have_selector("#user_email[disabled='disabled']")
+        expect(page).to have_content("We've sent an email to #{pending_email} to verify your new email address")
+      end
+
+      it "resend confirmation" do
+        within "#email-change-pending" do
+          click_link "Send again"
         end
+        expect(page).to have_content("Confirmation email resent successfully to #{pending_email}")
+        perform_enqueued_jobs
+        perform_enqueued_jobs
+
+        expect(emails.count).to eq(2)
+        visit last_email_link
+        expect(page).to have_content("Your email address has been successfully confirmed")
+      end
+
+      it "cancels the email change" do
+        expect(Decidim::User.find(user.id).unconfirmed_email).to eq(pending_email)
+        within "#email-change-pending" do
+          click_link "cancel"
+        end
+
+        expect(page).to have_content("Email change cancelled successfully")
+        expect(page).not_to have_content("Email change verification")
+        expect(Decidim::User.find(user.id).unconfirmed_email).to be_nil
       end
     end
 
@@ -155,6 +198,33 @@
           expect(page).to have_content("successfully")
         end
       end
+
+      context "when the user is an admin" do
+        let!(:user) { create(:user, :confirmed, :admin, password: password, password_confirmation: password) }
+
+        before do
+          login_as user, scope: :user
+          visit decidim.notifications_settings_path
+        end
+
+        it "updates the administrator's notifications" do
+          within ".switch.email_on_moderations" do
+            page.find(".switch-paddle").click
+          end
+
+          within ".switch.notification_settings" do
+            page.find(".switch-paddle").click
+          end
+
+          within "form.edit_user" do
+            find("*[type=submit]").click
+          end
+
+          within_flash_messages do
+            expect(page).to have_content("successfully")
+          end
+        end
+      end
     end
 
     context "when on the interests page" do
@@ -199,7 +269,7 @@
         visit decidim.delete_account_path
       end
 
-      it "the user can delete his account" do
+      it "the user can delete their account" do
         fill_in :delete_user_delete_account_delete_reason, with: "I just want to delete my account"
 
         click_button "Delete my account"
@@ -223,4 +293,64 @@
       end
     end
   end
+
+  context "when on the notifications page in a PWA browser" do
+    let(:organization) { create(:organization, host: "pwa.lvh.me") }
+    let(:user) { create(:user, :confirmed, password: password, password_confirmation: password, organization: organization) }
+    let(:password) { "dqCFgjfDbC7dPbrv" }
+    let(:vapid_keys) do
+      {
+        enabled: true,
+        public_key: "BKmjw_A8tJCcZNQ72uG8QW15XHQnrGJjHjsmoUILUUFXJ1VNhOnJLc3ywR3eZKibX4HSqhB1hAzZFj__3VqzcPQ=",
+        private_key: "TF_MRbSSs_4BE1jVfOsILSJemND8cRMpiznWHgdsro0="
+      }
+    end
+
+    context "when VAPID keys are set" do
+      before do
+        allow(Rails.application.secrets).to receive("vapid").and_return(vapid_keys)
+        driven_by(:pwa_chrome)
+        switch_to_host(organization.host)
+        login_as user, scope: :user
+        visit decidim.notifications_settings_path
+      end
+
+      context "when on the account page" do
+        it "enables push notifications if supported browser" do
+          sleep 2
+          within ".push-notifications" do
+            # Check allow push notifications
+            find(".switch-paddle").click
+          end
+
+          # Wait for the browser to be subscribed
+          sleep 5
+
+          within "form.edit_user" do
+            find("*[type=submit]").click
+          end
+
+          within_flash_messages do
+            expect(page).to have_content("successfully")
+          end
+
+          expect(page.find("#allow_push_notifications", visible: false)).to be_checked
+        end
+      end
+    end
+
+    context "when VAPID keys are not set" do
+      before do
+        allow(Rails.application.secrets).to receive("vapid").and_return({})
+        driven_by(:pwa_chrome)
+        switch_to_host(organization.host)
+        login_as user, scope: :user
+        visit decidim.notifications_settings_path
+      end
+
+      it "does not show the push notifications switch" do
+        expect(page).to have_no_selector(".push-notifications")
+      end
+    end
+  end
 end
diff --git a/decidim-core/spec/system/admin_passwords_spec.rb b/decidim-core/spec/system/admin_passwords_spec.rb
new file mode 100644
index 0000000000000..f70a668bab1ee
--- /dev/null
+++ b/decidim-core/spec/system/admin_passwords_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin passwords", type: :system do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :confirmed, :admin, password: password, password_updated_at: password_updated_at, organization: organization) }
+  let(:password) { "decidim123456789" }
+  let(:new_password) { "decidim987654321" }
+  let(:password_updated_at) { nil }
+
+  before do
+    switch_to_host(organization.host)
+    visit decidim.root_path
+  end
+
+  context "when admin has not updated their password" do
+    let(:password_updated_at) { nil }
+
+    it "can update password successfully" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Admin users need to change their password every 90 days")
+      expect(page).to have_content("Password change")
+      fill_in :password_user_password, with: new_password
+      fill_in :password_user_password_confirmation, with: new_password
+      click_button "Change my password"
+      expect(page).to have_css(".callout.success")
+      expect(page).to have_content("Password successfully updated")
+      expect(user.reload.password_updated_at).to be_between(2.seconds.ago, Time.current)
+    end
+
+    it "cannot dismiss password change" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Password change")
+      click_link "Home"
+      expect(page).to have_content("You need to change your password in order to proceed further")
+      expect(page).to have_content("Password change")
+      expect(page).to have_current_path(decidim.change_password_path)
+    end
+
+    it "shows error when passwords doesnt match" do
+      manual_login(user.email, password)
+      fill_in :password_user_password, with: new_password
+      fill_in :password_user_password_confirmation, with: "decidim12345678"
+      click_button "Change my password"
+      expect(page).to have_css(".callout.alert")
+      expect(page).to have_content("There was a problem updating the password")
+      expect(page).to have_content("doesn't match Password")
+    end
+
+    context "when user has strong password" do
+      let(:password) { new_password }
+
+      it "cant reuse old password" do
+        manual_login(user.email, password)
+        expect(page).to have_content("Password change")
+        fill_in :password_user_password, with: new_password
+        fill_in :password_user_password_confirmation, with: new_password
+        click_button "Change my password"
+        expect(page).to have_css(".callout.alert")
+        expect(page).to have_content("There was a problem updating the password")
+        expect(page).to have_content("cannot reuse old password")
+      end
+    end
+
+    context "when user is in different path" do
+      let(:static_page) { create(:static_page, organization: organization) }
+
+      before do
+        visit decidim.page_path(static_page)
+      end
+
+      it "redirects to original path after password update" do
+        manual_login(user.email, password)
+        expect(page).to have_content("Password change")
+        fill_in :password_user_password, with: new_password
+        fill_in :password_user_password_confirmation, with: new_password
+        click_button "Change my password"
+        expect(page).to have_css(".callout.success")
+        expect(page).to have_current_path(decidim.page_path(static_page))
+      end
+    end
+  end
+
+  context "when users password is expired" do
+    let(:password_updated_at) { 91.days.ago }
+
+    it "redirects to edit password view" do
+      manual_login(user.email, password)
+      expect(page).to have_content("Password change")
+    end
+  end
+
+  def manual_login(email, password)
+    click_link "Sign In"
+    fill_in :session_user_email, with: email
+    fill_in :session_user_password, with: password
+    click_button "Log in"
+  end
+end
diff --git a/decidim-core/spec/system/authentication_spec.rb b/decidim-core/spec/system/authentication_spec.rb
index 4c61b57e6bdfb..2a4513e6836f2 100644
--- a/decidim-core/spec/system/authentication_spec.rb
+++ b/decidim-core/spec/system/authentication_spec.rb
@@ -226,6 +226,27 @@
       end
     end
 
+    context "when nickname is not unique case insensitively" do
+      let!(:user) { create(:user, nickname: "Nick", organization: organization) }
+
+      it "show an error message" do
+        find(".sign-up-link").click
+
+        within ".new_user" do
+          fill_in :registration_user_email, with: "user@example.org"
+          fill_in :registration_user_name, with: "Responsible Citizen"
+          fill_in :registration_user_nickname, with: "NiCk"
+          fill_in :registration_user_password, with: "DfyvHn425mYAy2HL"
+          fill_in :registration_user_password_confirmation, with: "DfyvHn425mYAy2HL"
+          check :registration_user_tos_agreement
+          check :registration_user_newsletter
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("has already been taken")
+      end
+    end
+
     context "when sign up is disabled" do
       let(:organization) { create(:organization, users_registration_mode: :existing) }
 
@@ -253,7 +274,7 @@
   end
 
   context "when confirming the account" do
-    let!(:user) { create(:user, email_on_notification: true, organization: organization) }
+    let!(:user) { create(:user, organization: organization) }
 
     before do
       perform_enqueued_jobs { user.confirm }
@@ -368,8 +389,8 @@
         visit last_email_link
 
         within ".new_user" do
-          fill_in :password_user_password, with: "example"
-          fill_in :password_user_password_confirmation, with: "example"
+          fill_in :password_user_password, with: "whatislove"
+          fill_in :password_user_password_confirmation, with: "whatislove"
           find("*[type=submit]").click
         end
 
@@ -378,6 +399,19 @@
         expect(page).to have_content("must not be too common")
         expect(page).to have_current_path "/users/password"
       end
+
+      it "enforces the minimum length for the password in the front-end" do
+        visit last_email_link
+
+        within ".new_user" do
+          fill_in :password_user_password, with: "example"
+          fill_in :password_user_password_confirmation, with: "example"
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("The password is too short.")
+        expect(page).to have_content("Password confirmation must match the password.")
+      end
     end
 
     describe "Sign Out" do
diff --git a/decidim-core/spec/system/cookies_spec.rb b/decidim-core/spec/system/cookies_spec.rb
deleted file mode 100644
index d8b21fdf903c5..0000000000000
--- a/decidim-core/spec/system/cookies_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Cookies", type: :system do
-  let(:organization) { create(:organization) }
-  let(:last_user) { Decidim::User.last }
-
-  before do
-    switch_to_host(organization.host)
-    visit decidim.root_path
-  end
-
-  it "user see the cookie policy" do
-    expect(page).to have_content "This site uses cookies."
-  end
-
-  it "user accept the cookie policy and he doesn't see it anymore'" do
-    click_button "I agree"
-    expect(page).to have_no_content "This site uses cookies."
-
-    visit decidim.root_path
-    expect(page).to have_no_content "This site uses cookies."
-  end
-end
diff --git a/decidim-core/spec/system/data_consent/organization_spec.rb b/decidim-core/spec/system/data_consent/organization_spec.rb
new file mode 100644
index 0000000000000..89b579a4ee394
--- /dev/null
+++ b/decidim-core/spec/system/data_consent/organization_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Data consent within organization", type: :system do
+  let(:organization) { create(:organization) }
+  let(:cookie) { page.driver.browser.manage.cookie_named(Decidim.consent_cookie_name) }
+
+  before do
+    page.driver.browser.execute_cdp(
+      "Network.deleteCookies",
+      domain: ".#{organization.host}",
+      name: Decidim.consent_cookie_name,
+      path: "/"
+    )
+
+    switch_to_host(organization.host)
+    visit decidim.root_path
+  end
+
+  it "shows the data consent" do
+    expect(page).to have_content("Information about the cookies used on the website")
+  end
+
+  it "discards the data consent" do
+    click_button(id: "dc-dialog-accept")
+    expect(page).not_to have_content("Information about the cookies used on the website")
+  end
+
+  it "sets the correct expiration for the cookie" do
+    diff = cookie[:expires].to_time - Time.zone.now
+    expect(diff).to be_within(30).of(365.days)
+  end
+
+  it "sets the correct domain for the cookie" do
+    expect(cookie[:domain]).to eq(".#{organization.host}")
+  end
+
+  it "sets the correct SameSite flag for the cookie" do
+    expect(cookie[:same_site]).to eq("Lax")
+  end
+
+  it "leaves HttpOnly flag false for the cookie" do
+    # In order to expose the cookie to JS, this needs to be false. Otherwise it
+    # is only available for the backend request headers.
+    expect(cookie[:http_only]).to be(false)
+  end
+
+  if ENV["TEST_SSL"]
+    it "sets the cookie with the secure flag" do
+      expect(page).to have_content("Information about the cookies used on the website")
+      click_button(id: "dc-dialog-accept")
+      expect(cookie[:secure]).to be(true)
+    end
+  else
+    it "sets the cookie without the secure flag" do
+      expect(page).to have_content("Information about the cookies used on the website")
+      click_button(id: "dc-dialog-accept")
+      expect(cookie[:secure]).to be(false)
+    end
+  end
+end
diff --git a/decidim-core/spec/system/data_consent/scripts_spec.rb b/decidim-core/spec/system/data_consent/scripts_spec.rb
new file mode 100644
index 0000000000000..953cc83c51288
--- /dev/null
+++ b/decidim-core/spec/system/data_consent/scripts_spec.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Data consent scripts", type: :system do
+  let(:orga) { create(:organization) }
+
+  let(:template_class) do
+    Class.new(ActionView::Base) do
+      def protect_against_forgery?
+        false
+      end
+    end
+  end
+  let(:template) { template_class.new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
+  let(:modal) { Decidim::ViewModel.cell("decidim/data_consent", orga).call.to_s }
+
+  let(:html_document) do
+    cookie_modal = modal
+    document_inner = html_body
+    template.instance_eval do
+      js_config = { icons_path: asset_pack_path("media/images/icons.svg") }
+
+      <<~HTML.strip
+        <!doctype html>
+        <html lang="en">
+        <head>
+          <title>Accessibility Test</title>
+          #{stylesheet_pack_tag "decidim_core"}
+          #{javascript_pack_tag "decidim_core", defer: false}
+          #{stylesheet_pack_tag "decidim_dev"}
+          #{javascript_pack_tag "decidim_dev", defer: false}
+        </head>
+        <!-- Add some line breaks so that the "WAI WCAG" notification doesnt block screenshots -->
+        <br><br><br><br><br>
+        <body>
+          #{cookie_modal}
+          #{document_inner}
+          <div class="footer">
+            <a href="#" class="button" data-open="dc-modal">
+              Cookie settings
+            </a>
+          </div>
+          <script>
+          Decidim.config.set(#{js_config.to_json});
+          </script>
+        </body>
+        </html>
+      HTML
+    end
+  end
+  let(:html_body) { "" }
+
+  before do
+    # Create a temporary route to display the generated HTML in a correct site
+    # context.
+    final_html = html_document
+    Rails.application.routes.draw do
+      get "cookie_scripts", to: ->(_) { [200, {}, [final_html]] }
+    end
+
+    switch_to_host(orga.host)
+    visit "/cookie_scripts"
+  end
+
+  after do
+    # Reset the routes back to original
+    Rails.application.reload_routes!
+  end
+
+  context "when managing cookies" do
+    context "with content that has disabled javascript" do
+      let(:html_body) do
+        <<~HTML.strip
+          <div id="test_root">
+            <p>Hello cookies</p>
+            <script type="text/plain" data-consent="essential">
+              document.querySelector("#test_root").append(' #{essential_cookies_accepted} ');
+            </script>
+            <script type="text/plain" data-consent="preferences">
+              document.querySelector("#test_root").append(' #{preferences_cookies_accepted} ');
+            </script>
+            <script type="text/plain" data-consent="analytics">
+              document.querySelector("#test_root").append(' #{analytics_cookies_accepted} ');
+            </script>
+            <script type="text/plain" data-consent="marketing">
+              document.querySelector("#test_root").append(' #{marketing_cookies_accepted} ');
+            </script>
+          </div>
+        HTML
+      end
+      let(:essential_cookies_accepted) { "essential cookies accepted" }
+      let(:preferences_cookies_accepted) { "preferences cookies accepted" }
+      let(:analytics_cookies_accepted) { "analytics cookies accepted" }
+      let(:marketing_cookies_accepted) { "marketing cookies accepted" }
+
+      it "doesnt run scripts" do
+        expect(page).to have_content("Hello cookies")
+        expect(page).not_to have_content("cookies accepted")
+      end
+
+      context "when accept all cookies" do
+        before { data_consent(true) }
+
+        it "runs scripts" do
+          expect(page).to have_content(essential_cookies_accepted)
+          expect(page).to have_content(preferences_cookies_accepted)
+          expect(page).to have_content(analytics_cookies_accepted)
+          expect(page).to have_content(marketing_cookies_accepted)
+        end
+      end
+
+      context "when essential cookies only" do
+        before { data_consent(false) }
+
+        it "runs scripts" do
+          expect(page).to have_content(essential_cookies_accepted)
+          expect(page).not_to have_content(preferences_cookies_accepted)
+          expect(page).not_to have_content(analytics_cookies_accepted)
+          expect(page).not_to have_content(marketing_cookies_accepted)
+        end
+      end
+
+      context "when analytics cookies accepted" do
+        before { data_consent(%w(analytics)) }
+
+        it "runs analytics scripts" do
+          expect(page).to have_content(essential_cookies_accepted)
+          expect(page).not_to have_content(preferences_cookies_accepted)
+          expect(page).to have_content(analytics_cookies_accepted)
+          expect(page).not_to have_content(marketing_cookies_accepted)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/system/data_consent/settings_spec.rb b/decidim-core/spec/system/data_consent/settings_spec.rb
new file mode 100644
index 0000000000000..1d07de0402a25
--- /dev/null
+++ b/decidim-core/spec/system/data_consent/settings_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Data consent", type: :system do
+  let(:orga) { create(:organization) }
+  let(:cookies_description) { "We use cookies on our website to improve the performance and content of the site" }
+
+  before do
+    switch_to_host(orga.host)
+    visit decidim.root_path
+  end
+
+  context "when cookie dialog is shown" do
+    it "user see the cookie policy" do
+      within "#dc-dialog-wrapper" do
+        expect(page).to have_content "Information about the cookies used on the website"
+      end
+    end
+
+    it "user accepts the cookies and dialog isn't shown anymore'" do
+      expect(page).to have_content(cookies_description)
+
+      click_button "Accept all"
+      expect(page).not_to have_content(cookies_description)
+
+      visit decidim.root_path
+      expect(page).not_to have_content(cookies_description)
+    end
+
+    it "user rejects the cookies and dialog isn't shown anymore'" do
+      expect(page).to have_content(cookies_description)
+
+      click_button "Accept only essential"
+      expect(page).not_to have_content(cookies_description)
+
+      visit decidim.root_path
+      expect(page).not_to have_content(cookies_description)
+    end
+  end
+
+  context "when cookie modal is open" do
+    before do
+      within "#dc-dialog-wrapper" do
+        click_button "Settings"
+      end
+    end
+
+    it "shows cookie" do
+      expect(page).not_to have_content("decidim-consent")
+      expect(page).not_to have_content("Stores information about the cookies allowed by the user on this website")
+      find(".category-wrapper[data-id='essential']").find("button.dc-title").click
+      expect(page).to have_content("decidim-consent")
+      expect(page).to have_content("Stores information about the cookies allowed by the user on this website")
+    end
+
+    it "modal remembers users selection" do
+      within "[data-id='analytics']" do
+        find(".switch-paddle").click
+      end
+      click_button "Save settings"
+
+      within ".footer" do
+        click_link "Cookie settings"
+      end
+
+      within "[data-id='analytics']" do
+        expect(find("input", visible: :all).checked?).to be(true)
+      end
+      within "[data-id='marketing']" do
+        expect(find("input", visible: :all).checked?).to be(false)
+      end
+      within "[data-id='preferences']" do
+        expect(find("input", visible: :all).checked?).to be(false)
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/system/data_portability_spec.rb b/decidim-core/spec/system/download_your_data_spec.rb
similarity index 82%
rename from decidim-core/spec/system/data_portability_spec.rb
rename to decidim-core/spec/system/download_your_data_spec.rb
index b1c07664e8e0d..819c138d1bb99 100644
--- a/decidim-core/spec/system/data_portability_spec.rb
+++ b/decidim-core/spec/system/download_your_data_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "DataPortability", type: :system do
+describe "DownloadYourData", type: :system do
   let(:user) { create(:user, :confirmed, name: "Hodor User") }
   let(:organization) { user.organization }
 
@@ -11,14 +11,14 @@
     login_as user, scope: :user
   end
 
-  context "when on the data portability page" do
+  context "when on the download your data page" do
     before do
-      visit decidim.data_portability_path
+      visit decidim.download_your_data_path
     end
 
     describe "show button export data" do
       it "export the user's data" do
-        within ".data-portability" do
+        within ".download-your-data" do
           expect(page).to have_content("Download the data")
           expect(page).to have_content(user.email)
         end
diff --git a/decidim-core/spec/system/external_domain_warning_spec.rb b/decidim-core/spec/system/external_domain_warning_spec.rb
index 278f229bc2759..e49d0186e2918 100644
--- a/decidim-core/spec/system/external_domain_warning_spec.rb
+++ b/decidim-core/spec/system/external_domain_warning_spec.rb
@@ -37,6 +37,33 @@
     end
   end
 
+  context "when the url is malformed" do
+    let(:invalid_url) do
+      "http://#{organization.host}/link?external_url=javascript:alert(document.location.host)//%0ahttps://www.example.org"
+    end
+    let!(:invalid_url2) do
+      %W(
+        http://#{organization.host}/link?external_url=javascript:fetch%28%22%2Fprocesses%2Fconsequuntur%2Daperiam%2Ff%2F12%2F
+        proposals%2F8%2Fproposal%5Fvote%22%2C%20%7B%22headers%22%3A%7B%22x%2Dcsrf%2Dtoken%22%3Adocument%2EquerySelectorAll%28
+        %27%5Bname%3D%22csrf%2Dtoken%22%5D%27%29%5B0%5D%2EgetAttribute%28%22content%22%29%2C%22x%2Drequested%2Dwith%22%3A%20
+        %22XMLHttpRequest%22%7D%2C%22method%22%3A%20%22POST%22%2C%22mode%22%3A%20%22cors%22%2C%22credentials%22%3A%20%22
+        include%22%7D%29//%0ahttps://www.example.org
+      ).join
+    end
+
+    it "shows invalid url alert when using simple scenario" do
+      visit invalid_url
+      expect(page).to have_content("Invalid URL")
+      expect(page).to have_current_path(decidim.root_path, ignore_query: true)
+    end
+
+    it "shows invalid url alert when using complex scenario" do
+      visit invalid_url2
+      expect(page).to have_content("Invalid URL")
+      expect(page).to have_current_path(decidim.root_path, ignore_query: true)
+    end
+  end
+
   context "without param" do
     let(:no_param) { "http://#{organization.host}/link" }
 
diff --git a/decidim-core/spec/system/homepage_spec.rb b/decidim-core/spec/system/homepage_spec.rb
index c57a7a1ddc6a7..c14c7f23efc63 100644
--- a/decidim-core/spec/system/homepage_spec.rb
+++ b/decidim-core/spec/system/homepage_spec.rb
@@ -16,7 +16,16 @@
 
   context "when there's an organization" do
     let(:official_url) { "http://mytesturl.me" }
-    let(:organization) { create(:organization, official_url: official_url) }
+    let(:organization) do
+      create(:organization, official_url: official_url,
+                            highlighted_content_banner_enabled: true,
+                            highlighted_content_banner_title: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_short_description: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_title: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_subtitle: Decidim::Faker::Localized.sentence(word_count: 2),
+                            highlighted_content_banner_action_url: ::Faker::Internet.url,
+                            highlighted_content_banner_image: Decidim::Dev.test_file("city.jpeg", "image/jpeg"))
+    end
 
     before do
       create :content_block, organization: organization, scope_name: :homepage, manifest_name: :hero
@@ -37,6 +46,12 @@
         visit decidim.root_path
       end
 
+      context "when having homepage anchors" do
+        %w(hero sub_hero highlighted_content_banner how_to_participate footer_sub_hero).each do |anchor|
+          it { expect(page).to have_selector("##{anchor}", visible: :all) }
+        end
+      end
+
       it_behaves_like "accessible page"
 
       it "includes the official organization links and images" do
@@ -145,9 +160,9 @@
       end
 
       context "when there are static pages" do
-        let!(:static_page_1) { create(:static_page, organization: organization, show_in_footer: true) }
-        let!(:static_page_2) { create(:static_page, organization: organization, show_in_footer: true) }
-        let!(:static_page_3) { create(:static_page, organization: organization, show_in_footer: false) }
+        let!(:static_page1) { create(:static_page, organization: organization, show_in_footer: true) }
+        let!(:static_page2) { create(:static_page, organization: organization, show_in_footer: true) }
+        let!(:static_page3) { create(:static_page, organization: organization, show_in_footer: false) }
 
         before do
           visit current_path
@@ -155,17 +170,17 @@
 
         it "includes links to them" do
           within ".main-footer" do
-            [static_page_1, static_page_2].each do |static_page|
+            [static_page1, static_page2].each do |static_page|
               expect(page).to have_content(static_page.title["en"])
             end
 
-            expect(page).to have_no_content(static_page_3.title["en"])
+            expect(page).to have_no_content(static_page3.title["en"])
           end
 
-          click_link static_page_1.title["en"]
-          expect(page).to have_i18n_content(static_page_1.title)
+          click_link static_page1.title["en"]
+          expect(page).to have_i18n_content(static_page1.title)
 
-          expect(page).to have_i18n_content(static_page_1.content)
+          expect(page).to have_i18n_content(static_page1.content)
         end
 
         it "includes the footer sub_hero with the current organization name" do
@@ -185,7 +200,7 @@
             )
           end
           let(:user) { nil }
-          let!(:static_page_1) { create(:static_page, organization: organization, show_in_footer: true, allow_public_access: true) }
+          let!(:static_page1) { create(:static_page, organization: organization, show_in_footer: true, allow_public_access: true) }
           let!(:static_page_topic1) { create(:static_page_topic, organization: organization, show_in_footer: true) }
           let!(:static_page_topic1_page1) do
             create(
@@ -220,9 +235,9 @@
 
           it "displays only publicly accessible pages and topics in the footer" do
             within ".main-footer" do
-              expect(page).to have_content(static_page_1.title["en"])
-              expect(page).to have_no_content(static_page_2.title["en"])
-              expect(page).to have_no_content(static_page_3.title["en"])
+              expect(page).to have_content(static_page1.title["en"])
+              expect(page).to have_no_content(static_page2.title["en"])
+              expect(page).to have_no_content(static_page3.title["en"])
               expect(page).to have_content(static_page_topic1.title["en"])
               expect(page).to have_no_content(static_page_topic2.title["en"])
               expect(page).to have_no_content(static_page_topic3.title["en"])
@@ -240,9 +255,9 @@
             it_behaves_like "accessible page"
 
             it "displays all pages and topics in footer that are configured to display in footer" do
-              expect(page).to have_content(static_page_1.title["en"])
-              expect(page).to have_content(static_page_2.title["en"])
-              expect(page).to have_no_content(static_page_3.title["en"])
+              expect(page).to have_content(static_page1.title["en"])
+              expect(page).to have_content(static_page2.title["en"])
+              expect(page).to have_no_content(static_page3.title["en"])
               expect(page).to have_content(static_page_topic1.title["en"])
               expect(page).to have_content(static_page_topic2.title["en"])
               expect(page).to have_no_content(static_page_topic3.title["en"])
diff --git a/decidim-core/spec/system/last_activity_spec.rb b/decidim-core/spec/system/last_activity_spec.rb
index bd64f3925363a..35867fdf68cd7 100644
--- a/decidim-core/spec/system/last_activity_spec.rb
+++ b/decidim-core/spec/system/last_activity_spec.rb
@@ -3,26 +3,11 @@
 require "spec_helper"
 
 describe "Last activity", type: :system do
-  Decidim::ActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-  Decidim::HomeActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
   let(:organization) { create(:organization) }
-  let(:comment) { create(:comment) }
+  let(:commentable) { create(:dummy_resource, component: component) }
+  let(:comment) { create(:comment, commentable: commentable) }
   let!(:action_log) do
-    create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization)
+    create(:action_log, created_at: 1.day.ago, action: "create", visibility: "public-only", resource: comment, organization: organization)
   end
   let!(:other_action_log) do
     create(:action_log, action: "publish", visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space)
@@ -30,7 +15,7 @@ def resource_types
   let(:long_body_comment) { "This is my very long comment for Last Activity card that must be shorten up because is more than 100 chars" }
   let(:another_comment) { create(:comment, body: long_body_comment) }
   let!(:another_action_log) do
-    create(:action_log, action: "create", visibility: "public-only", resource: another_comment, organization: organization)
+    create(:action_log, created_at: 2.days.ago, action: "create", visibility: "public-only", resource: another_comment, organization: organization)
   end
   let(:component) do
     create(:component, :published, organization: organization)
@@ -40,6 +25,16 @@ def resource_types
   end
 
   before do
+    allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
+      %w(
+        Decidim::Comments::Comment
+        Decidim::DummyResources::DummyResource
+      )
+    )
+    allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
+      %w(Decidim::DummyResources::DummyResource)
+    )
+
     create :content_block, organization: organization, scope_name: :homepage, manifest_name: :last_activity
     switch_to_host organization.host
   end
@@ -50,7 +45,7 @@ def resource_types
     end
 
     it "displays the activities at the home page" do
-      within ".upcoming-events" do
+      within "#last_activity" do
         expect(page).to have_css(".card--activity", count: 3)
       end
     end
@@ -64,7 +59,7 @@ def resource_types
       let(:comment) { create(:comment, :deleted, body: "This is deleted") }
 
       it "isn't shown" do
-        within ".upcoming-events" do
+        within "#last_activity" do
           expect(page).not_to have_content("This is deleted")
         end
       end
@@ -72,7 +67,7 @@ def resource_types
 
     context "when viewing all activities" do
       before do
-        within ".upcoming-events" do
+        within "#last_activity" do
           click_link "View all"
         end
       end
@@ -84,6 +79,12 @@ def resource_types
         expect(page).to have_content(translated(another_comment.commentable.title))
       end
 
+      it "shows the activities in correct order" do
+        result = page.find("#activities .row").text
+        expect(result.index(translated(resource.title))).to be < result.index(translated(comment.commentable.title))
+        expect(result.index(translated(comment.commentable.title))).to be < result.index(translated(another_comment.commentable.title))
+      end
+
       it "allows filtering by type" do
         within ".filters" do
           choose "Comment"
@@ -95,6 +96,29 @@ def resource_types
         expect(page).to have_css(".card--activity", count: 2)
       end
 
+      context "when there are recently update old activities" do
+        let(:commentables) { create_list(:dummy_resource, 20, component: component) }
+        let(:comments) { commentables.map { |commentable| create(:comment, commentable: commentable) } }
+        let!(:action_logs) do
+          comments.map do |comment|
+            create(:action_log, created_at: 1.day.ago, action: "create", visibility: "public-only", resource: comment, organization: organization)
+          end
+        end
+
+        let(:old_commentable) { create(:dummy_resource, component: component) }
+        let(:old_comment) { create(:comment, commentable: old_commentable, created_at: 2.years.ago) }
+        let!(:create_action_log) { create(:action_log, created_at: 2.years.ago, action: "create", visibility: "public-only", resource: old_comment, organization: organization) }
+        let!(:update_action_log) { create(:action_log, created_at: 1.minute.ago, action: "update", visibility: "public-only", resource: old_comment, organization: organization) }
+
+        before do
+          visit current_path
+        end
+
+        it "doesn't show the old activities at the top of the list" do
+          expect(page).not_to have_content(translated(old_comment.commentable.title))
+        end
+      end
+
       context "when there are activities from private spaces" do
         before do
           component.participatory_space.update(private_space: true)
diff --git a/decidim-core/spec/system/locales_spec.rb b/decidim-core/spec/system/locales_spec.rb
index d0f487d0481bb..e8b64777edd6c 100644
--- a/decidim-core/spec/system/locales_spec.rb
+++ b/decidim-core/spec/system/locales_spec.rb
@@ -37,7 +37,7 @@
       expect(page).to have_content("Inici")
     end
 
-    it "displays devise messages with the right locale when not authenticated " do
+    it "displays devise messages with the right locale when not authenticated" do
       within_language_menu do
         click_link "Català"
       end
@@ -47,7 +47,7 @@
       expect(page).to have_content("Has d'iniciar la sessió o registrar-te abans de continuar.")
     end
 
-    it "displays devise messages with the right locale when authentication fails " do
+    it "displays devise messages with the right locale when authentication fails" do
       click_link "Sign In"
 
       within_language_menu do
diff --git a/decidim-core/spec/system/map/provider/autocomplete/here_builder_spec.rb b/decidim-core/spec/system/map/provider/autocomplete/here_builder_spec.rb
index 061d2bdce3c8b..dfa5ffec9c65c 100644
--- a/decidim-core/spec/system/map/provider/autocomplete/here_builder_spec.rb
+++ b/decidim-core/spec/system/map/provider/autocomplete/here_builder_spec.rb
@@ -87,7 +87,7 @@ module Autocomplete
             it "calls the geocoding API correctly" do
               find("#test_address").set("item")
               expect(page).to have_selector(
-                ".tribute-container",
+                ".autoComplete_wrapper",
                 text: "first item\nsecond item\nthird item"
               )
               expect(page).to have_selector(
@@ -104,7 +104,7 @@ module Autocomplete
                 }.to_json
               )
 
-              find(".tribute-container ul#results li", match: :first).click
+              find(".autoComplete_wrapper ul#autoComplete_list_1 li", match: :first).click
               expect(page).to have_selector(
                 "#ajax_request",
                 text: {
diff --git a/decidim-core/spec/system/map/provider/autocomplete/osm_builder_spec.rb b/decidim-core/spec/system/map/provider/autocomplete/osm_builder_spec.rb
index 5f018362ef53c..de58ac4b22267 100644
--- a/decidim-core/spec/system/map/provider/autocomplete/osm_builder_spec.rb
+++ b/decidim-core/spec/system/map/provider/autocomplete/osm_builder_spec.rb
@@ -83,7 +83,7 @@ module Autocomplete
             it "calls the geocoding API correctly" do
               find("#test_address").set("city")
               expect(page).to have_selector(
-                ".tribute-container",
+                ".autoComplete_wrapper",
                 text: [
                   "Park, Street1 1, 123456, City1, State1, Country1",
                   "Street2, 654321, City2, Country2",
@@ -103,7 +103,7 @@ module Autocomplete
                 }.to_json
               )
 
-              find(".tribute-container ul#results li", match: :first).click
+              find(".autoComplete_wrapper ul#autoComplete_list_1 li", match: :first).click
               expect(page).to have_selector(
                 "#geocoder_suggested",
                 text: {
diff --git a/decidim-core/spec/system/messaging/conversations_spec.rb b/decidim-core/spec/system/messaging/conversations_spec.rb
index aac3092965304..3f2a08d2b30be 100644
--- a/decidim-core/spec/system/messaging/conversations_spec.rb
+++ b/decidim-core/spec/system/messaging/conversations_spec.rb
@@ -117,6 +117,7 @@
       visit_inbox
 
       within ".conversations" do
+        expect(page).to have_content(conversation.created_at.strftime("%d/%m/%Y %H:%M"))
         expect(page).to have_selector(".card.card--widget", text: /#{interlocutor.name}/i)
         expect(page).to have_selector(".card.card--widget", text: "who wants apples?")
       end
@@ -289,154 +290,115 @@
           visit_inbox
           expect(page).to have_content("New conversation")
           click_button "New conversation"
-          expect(page).to have_selector(".js-multiple-mentions")
-          # The sleep function is called due to a setTimeout function in input_multiple_mentions
-          sleep(2)
-          find(".js-multiple-mentions").fill_in with: "@"
-          page.execute_script('$(".js-multiple-mentions")[0].dispatchEvent(new Event("keydown"));$(".js-multiple-mentions")[0].dispatchEvent(new Event("keyup"));')
-          expect(page).to have_selector(".tribute-container .disabled-tribute-element")
+          expect(page).to have_selector("#add_conversation_users")
+          find("#add_conversation_users").fill_in with: "@#{interlocutor2.nickname.chars.first}"
+          expect(page).to have_selector("#autoComplete_list_1 li.disabled", wait: 2)
         end
       end
     end
   end
 
-  context "when multiple participants conversation" do
-    let(:user1) { create(:user, organization: organization) }
-    let(:user2) { create(:user_group, organization: organization) }
-    let(:user3) { create(:user, organization: organization) }
-    let(:user4) { create(:user, organization: organization) }
-    let(:user5) { create(:user, organization: organization) }
-    let(:user6) { create(:user, organization: organization) }
-    let(:user7) { create(:user, organization: organization) }
-    let(:user8) { create(:user, organization: organization) }
-    let(:user9) { create(:user, organization: organization) }
-    let(:user10) { create(:user, organization: organization) }
-
-    describe "GET conversations" do
-      context "when 2 participants conversation" do
-        let!(:conversation2) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1],
-            body: "Hi!"
-          )
-        end
+  describe "when having a conversation with multiple participants" do
+    context "and it's with only one participant" do
+      let(:user1) { create(:user, organization: organization) }
+      let!(:conversation2) do
+        Decidim::Messaging::Conversation.start!(
+          originator: user,
+          interlocutors: [user1],
+          body: "Hi!"
+        )
+      end
 
+      context "when starting the conversation" do
         before do
           visit decidim.new_conversation_path(recipient_id: user1.id)
         end
 
-        it "shows only 1 other participant name" do
+        it "shows only the other participant name" do
           within ".conversation-header .ml-s" do
             expect(page).to have_content(user1.name)
             expect(page).not_to have_content(user.name)
           end
         end
       end
-    end
 
-    describe "GET conversations" do
-      context "when 4 participants conversation" do
-        let!(:conversation4) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3],
-            body: "Hi all 4 people!"
-          )
+      context "when going to the conversation" do
+        before do
+          visit decidim.conversation_path(id: conversation2.id)
+        end
+
+        it "shows only the other participant name" do
+          within ".conversation-header .ml-s" do
+            expect(page).to have_content(user1.name)
+          end
         end
+      end
 
+      context "when listing the conversations" do
         before do
-          visit decidim.new_conversation_path(recipient_id: [
-                                                user1.id, user2.id, user3.id
-                                              ])
+          visit decidim.conversations_path
         end
 
-        it "shows the other 3 participant name" do
-          within ".conversation-header .ml-s" do
+        it "shows only the other participant name" do
+          within ".mr-s > strong" do
             expect(page).to have_content(user1.name)
-            expect(page).to have_content(user2.name)
-            expect(page).to have_content(user3.name)
             expect(page).not_to have_content(user.name)
           end
         end
       end
     end
 
-    describe "GET conversations" do
-      context "when 10 participants conversation" do
-        let!(:conversation10) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3, user4, user5, user6, user7, user8, user9],
-            body: "Hi all 10 people!"
-          )
-        end
+    context "and it's with four participants" do
+      let(:user1) { create(:user, organization: organization) }
+      let(:user2) { create(:user_group, organization: organization) }
+      let(:user3) { create(:user, organization: organization) }
+      let!(:conversation4) do
+        Decidim::Messaging::Conversation.start!(
+          originator: user,
+          interlocutors: [user1, user2, user3],
+          body: "Hi all 4 people!"
+        )
+      end
 
+      context "when starting the conversation" do
         before do
           visit decidim.new_conversation_path(recipient_id: [
-                                                user1.id, user2.id, user3.id,
-                                                user4.id, user5.id, user6.id,
-                                                user7.id, user8.id, user9.id
+                                                user1.id, user2.id, user3.id
                                               ])
         end
 
-        it_behaves_like "accessible page"
-
-        it "shows the other 9 participant name" do
+        it "shows the other three participants names" do
           within ".conversation-header .ml-s" do
             expect(page).to have_content(user1.name)
             expect(page).to have_content(user2.name)
             expect(page).to have_content(user3.name)
-            expect(page).to have_content(user4.name)
-            expect(page).to have_content(user5.name)
-            expect(page).to have_content(user6.name)
-            expect(page).to have_content(user7.name)
-            expect(page).to have_content(user8.name)
-            expect(page).to have_content(user9.name)
             expect(page).not_to have_content(user.name)
           end
         end
       end
-    end
-
-    describe "GET existent conversation" do
-      context "when 2 participants conversation" do
-        let!(:conversation2) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1],
-            body: "Hi!"
-          )
-        end
 
+      context "when going to the conversation" do
         before do
-          visit decidim.conversation_path(id: conversation2.id)
+          visit decidim.conversation_path(id: conversation4.id)
         end
 
-        it "shows only 1 other participant name" do
+        it "shows the other three participants names" do
           within ".conversation-header .ml-s" do
             expect(page).to have_content(user1.name)
+            expect(page).to have_content(user2.name)
+            expect(page).to have_content(user3.name)
+            expect(page).not_to have_content(user.name)
           end
         end
       end
-    end
-
-    describe "GET existent conversation" do
-      context "when 4 participants conversation" do
-        let!(:conversation4) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3],
-            body: "Hi all 4 people!"
-          )
-        end
 
+      context "when listing the conversations" do
         before do
-          visit decidim.conversation_path(id: conversation4.id)
+          visit decidim.conversations_path
         end
 
-        it "shows the other 3 participant name" do
-          within ".conversation-header .ml-s" do
+        it "shows only the 3 other participant name" do
+          within ".mr-s > strong" do
             expect(page).to have_content(user1.name)
             expect(page).to have_content(user2.name)
             expect(page).to have_content(user3.name)
@@ -446,21 +408,36 @@
       end
     end
 
-    describe "GET existent conversation" do
-      context "when 10 participants conversation" do
-        let!(:conversation10) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3, user4, user5, user6, user7, user8, user9],
-            body: "Hi all 10 people!"
-          )
-        end
+    context "and it's with ten participants" do
+      let(:user1) { create(:user, organization: organization) }
+      let(:user2) { create(:user_group, organization: organization) }
+      let(:user3) { create(:user, organization: organization) }
+      let(:user4) { create(:user, organization: organization) }
+      let(:user5) { create(:user, organization: organization) }
+      let(:user6) { create(:user, organization: organization) }
+      let(:user7) { create(:user, organization: organization) }
+      let(:user8) { create(:user, organization: organization) }
+      let(:user9) { create(:user, organization: organization) }
+      let!(:conversation10) do
+        Decidim::Messaging::Conversation.start!(
+          originator: user,
+          interlocutors: [user1, user2, user3, user4, user5, user6, user7, user8, user9],
+          body: "Hi all 10 people!"
+        )
+      end
 
+      context "when starting the conversation" do
         before do
-          visit decidim.conversation_path(id: conversation10.id)
+          visit decidim.new_conversation_path(recipient_id: [
+                                                user1.id, user2.id, user3.id,
+                                                user4.id, user5.id, user6.id,
+                                                user7.id, user8.id, user9.id
+                                              ])
         end
 
-        it "shows the other 9 participant name" do
+        it_behaves_like "accessible page"
+
+        it "shows the other nine participants names" do
           within ".conversation-header .ml-s" do
             expect(page).to have_content(user1.name)
             expect(page).to have_content(user2.name)
@@ -475,66 +452,29 @@
           end
         end
       end
-    end
-
-    describe "GET conversations index" do
-      context "when 2 participants conversation" do
-        let!(:conversation2) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1],
-            body: "Hi!"
-          )
-        end
 
+      context "when going to the conversation" do
         before do
-          visit decidim.conversations_path
-        end
-
-        it "shows only the other participant name" do
-          within ".mr-s > strong" do
-            expect(page).to have_content(user1.name)
-            expect(page).not_to have_content(user.name)
-          end
-        end
-      end
-    end
-
-    describe "GET conversations index" do
-      context "when 4 participants conversation" do
-        let!(:conversation4) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3],
-            body: "Hi all 4 people!"
-          )
-        end
-
-        before do
-          visit decidim.conversations_path
+          visit decidim.conversation_path(id: conversation10.id)
         end
 
-        it "shows only the 3 other participant name" do
-          within ".mr-s > strong" do
+        it "shows the other nine participants names" do
+          within ".conversation-header .ml-s" do
             expect(page).to have_content(user1.name)
             expect(page).to have_content(user2.name)
             expect(page).to have_content(user3.name)
+            expect(page).to have_content(user4.name)
+            expect(page).to have_content(user5.name)
+            expect(page).to have_content(user6.name)
+            expect(page).to have_content(user7.name)
+            expect(page).to have_content(user8.name)
+            expect(page).to have_content(user9.name)
             expect(page).not_to have_content(user.name)
           end
         end
       end
-    end
-
-    describe "GET conversations index" do
-      context "when 10 participants conversation" do
-        let!(:conversation10) do
-          Decidim::Messaging::Conversation.start!(
-            originator: user,
-            interlocutors: [user1, user2, user3, user4, user5, user6, user7, user8, user9],
-            body: "Hi all 10 people!"
-          )
-        end
 
+      context "when listing the conversations" do
         before do
           visit decidim.conversations_path
         end
diff --git a/decidim-core/spec/system/messaging/profile_conversations_spec.rb b/decidim-core/spec/system/messaging/profile_conversations_spec.rb
index a725d36a15586..6ddfcb03da591 100644
--- a/decidim-core/spec/system/messaging/profile_conversations_spec.rb
+++ b/decidim-core/spec/system/messaging/profile_conversations_spec.rb
@@ -315,10 +315,8 @@
           visit_profile_inbox
           expect(page).to have_content("New conversation")
           click_button "New conversation"
-          expect(page).to have_selector(".js-multiple-mentions")
-          find(".js-multiple-mentions").fill_in with: "@"
-          page.execute_script('$(".js-multiple-mentions")[0].dispatchEvent(new Event("keydown"));$(".js-multiple-mentions")[0].dispatchEvent(new Event("keyup"));')
-          expect(page).to have_selector(".tribute-container .disabled-tribute-element")
+          find("#add_conversation_users").fill_in with: "@#{interlocutor2.nickname}"
+          expect(page).to have_selector("#autoComplete_list_1 li.disabled", wait: 2)
         end
       end
 
@@ -334,7 +332,7 @@
 
         it "enables submit button after selecting interlocutor" do
           find("#add_conversation_users").fill_in with: "@#{interlocutor.nickname}"
-          find(".tribute-item.User").click
+          find("#autoComplete_result_0").click
           expect(page).to have_button("Next", disabled: false)
         end
       end
diff --git a/decidim-core/spec/system/newsletter_spec.rb b/decidim-core/spec/system/newsletter_spec.rb
index ce0e4a9f93f15..59814e8f63873 100644
--- a/decidim-core/spec/system/newsletter_spec.rb
+++ b/decidim-core/spec/system/newsletter_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 describe "Newsletters (view in web)", type: :system do
-  let(:organization) { newsletter.organization }
-  let!(:newsletter) { create :newsletter, :sent }
+  let(:organization) { create(:organization) }
+  let!(:newsletter) { create :newsletter, :sent, organization: organization }
   let!(:content_block) do
     content_block = Decidim::ContentBlock.find_by(organization: organization, scope_name: :newsletter_template, scoped_resource_id: newsletter.id)
     content_block.destroy!
@@ -38,5 +38,19 @@
         expect(page).to have_link(translated(content_block.settings.cta_text), href: translated(content_block.settings.cta_url))
       end
     end
+
+    context "when the organization has a primary color defined" do
+      let(:organization) { create(:organization, colors: { primary: "#6500ff" }) }
+      let(:cta_text) { translated(content_block.settings.cta_text) }
+
+      it "shows the CTA button in correct color" do
+        color = find("table.button table td", text: cta_text).native.css_value("background-color")
+        expect(color).to eq("rgba(101, 0, 255, 1)")
+      end
+
+      it "does not scrub the <style> tag on the page when the organization has a color setting" do
+        expect(page).to have_css("style", visible: :hidden)
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/system/pwa_features_spec.rb b/decidim-core/spec/system/pwa_features_spec.rb
new file mode 100644
index 0000000000000..ff5be3c683205
--- /dev/null
+++ b/decidim-core/spec/system/pwa_features_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "PWA features", type: :system do
+  let(:organization) { create(:organization, host: "pwa.lvh.me") }
+
+  before do
+    driven_by(:pwa_chrome)
+    switch_to_host(organization.host)
+  end
+
+  describe "offline navigation" do
+    it "shows the account form when clicking on the menu" do
+      # Cache the homepage
+      visit decidim.root_path
+      expect(page).to have_content("Home")
+
+      with_browser_in_offline_mode do
+        visit decidim.root_path
+        expect(page).to have_content("Home")
+        expect(page).to have_content("Your network is offline. This is a previously cached version of the page you're visiting, perhaps the content is not up to date.")
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/system/scopes_spec.rb b/decidim-core/spec/system/scopes_spec.rb
index 22801f52717c6..ac9caaa4664e5 100644
--- a/decidim-core/spec/system/scopes_spec.rb
+++ b/decidim-core/spec/system/scopes_spec.rb
@@ -26,7 +26,7 @@
       let(:params) { { title: title, required: true } }
 
       it "does not allow to choose current scope (none)" do
-        expect(page).to have_css(".scope-picker.picker-footer .buttons a.button.muted")
+        expect(page).to have_selector(".scope-picker.picker-footer .buttons a.button[disabled='true']")
       end
 
       it "shows organization top scopes in content" do
@@ -44,8 +44,8 @@
       context "when has a current scope" do
         let(:params) { { title: title, required: true, current: scopes.first } }
 
-        it "does not allow to choose it" do
-          expect(page).to have_no_css(".scope-picker.picker-footer .buttons a.button.muted")
+        it "allows to choose it" do
+          expect(page).to have_no_selector(".scope-picker.picker-footer .buttons a.button[disabled='true']")
         end
       end
     end
diff --git a/decidim-core/spec/system/social_share_button_spec.rb b/decidim-core/spec/system/social_share_button_spec.rb
index 9082be64832b5..3476e4c05e2a8 100644
--- a/decidim-core/spec/system/social_share_button_spec.rb
+++ b/decidim-core/spec/system/social_share_button_spec.rb
@@ -69,26 +69,38 @@
     end
   end
 
-  context "when the user is logged in" do
+  context "without cookie dialog" do
     before do
-      sign_in resource.author
-      visit resource_path
+      page.driver.browser.execute_cdp(
+        "Network.setCookie",
+        domain: resource.organization.host,
+        name: Decidim.consent_cookie_name,
+        value: { essential: true }.to_json,
+        path: "/"
+      )
     end
 
-    context "and clicks on the Share button" do
-      before { click_button "Share" }
+    context "when the user is logged in" do
+      before do
+        sign_in resource.author
+        visit resource_path
+      end
+
+      context "and clicks on the Share button" do
+        before { click_button "Share" }
 
-      it_behaves_like "showing the social share buttons"
+        it_behaves_like "showing the social share buttons"
+      end
     end
-  end
 
-  context "when the user is NOT logged in" do
-    before { visit resource_path }
+    context "when the user is NOT logged in" do
+      before { visit resource_path }
 
-    context "and clicks on the Share button" do
-      before { click_button "Share" }
+      context "and clicks on the Share button" do
+        before { click_button "Share" }
 
-      it_behaves_like "showing the social share buttons"
+        it_behaves_like "showing the social share buttons"
+      end
     end
   end
 end
diff --git a/decidim-core/spec/system/static_pages_spec.rb b/decidim-core/spec/system/static_pages_spec.rb
index 52af0729e051f..81e878c0cb8ce 100644
--- a/decidim-core/spec/system/static_pages_spec.rb
+++ b/decidim-core/spec/system/static_pages_spec.rb
@@ -38,6 +38,44 @@
         before { visit decidim.page_path(page3) }
       end
     end
+
+    context "when page content has embedded iframe" do
+      let!(:video_page) { create(:static_page, :with_topic, content: content, organization: organization) }
+      let(:content) { { "en" => %(<p>foo</p><p><br></p><iframe class="ql-video" allowfullscreen="true" src="#{iframe_src}" frameborder="0"></iframe><p><br></p><p>bar</p>) } }
+      let(:iframe_src) { "http://www.example.org" }
+
+      before do
+        stub_request(:get, iframe_src)
+          .to_return(status: 200, body: "foo", headers: { "Content-Type" => "text/plain" })
+        visit decidim.pages_path
+      end
+
+      context "when cookies are rejected" do
+        before do
+          click_link "Cookie settings"
+          click_button "Accept only essential"
+        end
+
+        it "disables iframe" do
+          visit decidim.page_path(video_page)
+          expect(page).to have_content("You need to enable all cookies in order to see this content")
+          expect(page).not_to have_selector("iframe")
+        end
+      end
+
+      context "when cookies are accepted" do
+        before do
+          click_link "Cookie settings"
+          click_button "Accept all"
+        end
+
+        it "shows iframe" do
+          visit decidim.page_path(video_page)
+          expect(page).not_to have_content("You need to enable all cookies in order to see this content")
+          expect(page).to have_selector("iframe", count: 1)
+        end
+      end
+    end
   end
 
   context "with a long list of URL parameters" do
diff --git a/decidim-core/spec/system/user_activity_spec.rb b/decidim-core/spec/system/user_activity_spec.rb
index c71a09c76b9ed..44c60fa13a3b6 100644
--- a/decidim-core/spec/system/user_activity_spec.rb
+++ b/decidim-core/spec/system/user_activity_spec.rb
@@ -3,24 +3,15 @@
 require "spec_helper"
 
 describe "User activity", type: :system do
-  Decidim::ActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-
   let(:organization) { create(:organization) }
   let(:comment) { create(:comment) }
-  let(:user) { create(:user, organization: organization) }
+  let(:user) { create(:user, :confirmed, organization: organization) }
 
   let!(:action_log) do
     create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization, user: user)
   end
 
-  let!(:action_log_2) do
+  let!(:action_log2) do
     create(:action_log, action: "publish", visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space, user: user)
   end
 
@@ -28,6 +19,10 @@ def resource_types
     create(:action_log, action: "publish", visibility: "all", resource: resource2, organization: organization, participatory_space: component.participatory_space)
   end
 
+  let!(:private_action_log) do
+    create(:action_log, action: "update", visibility: "private-only", resource: resource3, organization: organization, participatory_space: component.participatory_space, user: user)
+  end
+
   let(:component) do
     create(:component, :published, organization: organization)
   end
@@ -40,14 +35,57 @@ def resource_types
     create(:dummy_resource, component: component, published_at: Time.current)
   end
 
+  let!(:resource3) do
+    create(:coauthorable_dummy_resource, component: component)
+  end
+
   let(:resource_types) do
-    %w(Collaborative\ Draft Comment Debate Initiative Meeting Post Proposal Question)
+    ["Collaborative Draft", "Comment", "Debate", "Initiative", "Meeting", "Post", "Proposal", "Question"]
   end
 
   before do
+    allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
+      %w(
+        Decidim::Comments::Comment
+        Decidim::DummyResources::DummyResource
+      )
+    )
+    allow(Decidim::ActionLog).to receive(:private_resource_types).and_return(
+      %w(Decidim::DummyResources::CoauthorableDummyResource)
+    )
+    allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
+      %w(Decidim::DummyResources::DummyResource)
+    )
+
     switch_to_host organization.host
   end
 
+  context "when signed in" do
+    before do
+      switch_to_host(organization.host)
+      login_as user, scope: :user
+    end
+
+    describe "accessing user's own activity page" do
+      it "displays the private-only action also" do
+        # rubocop:disable RSpec/AnyInstance
+        # Because CoauthorableDummyResource does not have path.
+        allow_any_instance_of(Decidim::ActivityCell).to receive(:resource_link_path).and_return("/example/path")
+        # rubocop:enable RSpec/AnyInstance
+
+        page.visit decidim.profile_activity_path(nickname: user.nickname)
+        within ".user-activity" do
+          expect(page).to have_css(".card--activity", count: 3)
+
+          expect(page).to have_content(translated(resource.title))
+          expect(page).to have_content(translated(comment.commentable.title))
+          expect(page).to have_content(translated(resource3.title))
+          expect(page).to have_no_content(translated(resource2.title))
+        end
+      end
+    end
+  end
+
   describe "accessing the user activity page" do
     before do
       page.visit decidim.profile_activity_path(nickname: user.nickname)
@@ -60,6 +98,7 @@ def resource_types
         expect(page).to have_content(translated(resource.title))
         expect(page).to have_content(translated(comment.commentable.title))
         expect(page).to have_no_content(translated(resource2.title))
+        expect(page).to have_no_content(translated(resource3.title))
       end
     end
 
diff --git a/decidim-core/spec/system/user_group_creation_spec.rb b/decidim-core/spec/system/user_group_creation_spec.rb
index 4bc3cc6843421..dd6c43b85947d 100644
--- a/decidim-core/spec/system/user_group_creation_spec.rb
+++ b/decidim-core/spec/system/user_group_creation_spec.rb
@@ -22,7 +22,7 @@
     fill_in "Phone", with: "12345678"
     fill_in "About", with: "This is us."
 
-    attach_file "Avatar", Decidim::Dev.asset("avatar.jpg")
+    dynamically_attach_file(:group_avatar, Decidim::Dev.asset("avatar.jpg"))
 
     click_button "Create group"
 
diff --git a/decidim-core/spec/system/user_group_leaving_spec.rb b/decidim-core/spec/system/user_group_leaving_spec.rb
index cb21f208537d9..0df2e423dddd8 100644
--- a/decidim-core/spec/system/user_group_leaving_spec.rb
+++ b/decidim-core/spec/system/user_group_leaving_spec.rb
@@ -16,19 +16,45 @@
     context "when the user is the creator" do
       let!(:user_group) { create(:user_group, users: [user], organization: user.organization) }
 
-      it "does not show the link to leave" do
-        expect(page).to have_no_content("Leave group")
+      it "cant leave group" do
+        accept_confirm { click_link "Leave group" }
+
+        expect(page).to have_content("You can't remove yourself from this group as you're the last administrator")
+      end
+
+      context "when there is another admin in the group" do
+        let(:another_admin) { create(:user, :confirmed, organization: user.organization) }
+
+        before do
+          create :user_group_membership, user: another_admin, user_group: user_group, role: :admin
+          visit decidim.profile_path(user_group.nickname)
+        end
+
+        it "can leave the group" do
+          accept_confirm { click_link "Leave group" }
+
+          expect(page).to have_content("Group successfully abandoned")
+          expect(page).not_to have_content("Leave group")
+        end
       end
     end
 
-    it "allows the user to join" do
-      create :user_group_membership, user: user, user_group: user_group, role: :admin
-      visit decidim.profile_path(user_group.nickname)
+    context "when there is two admins in the group" do
+      let(:another_user) { create(:user, :confirmed, organization: user.organization) }
+
+      before do
+        create :user_group_membership, user: user, user_group: user_group, role: :admin
+        create :user_group_membership, user: another_user, user_group: user_group, role: :admin
+      end
 
-      accept_confirm { click_link "Leave group" }
+      it "allows the user to leave and join back" do
+        visit decidim.profile_path(user_group.nickname)
 
-      expect(page).to have_content("Group successfully abandoned")
-      expect(page).to have_content("Request to join group")
+        accept_confirm { click_link "Leave group" }
+
+        expect(page).to have_content("Group successfully abandoned")
+        expect(page).to have_content("Request to join group")
+      end
     end
   end
 
diff --git a/decidim-core/spec/system/user_group_profile_edition_spec.rb b/decidim-core/spec/system/user_group_profile_edition_spec.rb
index 4a16b36c67c19..9f522e1d8a7bd 100644
--- a/decidim-core/spec/system/user_group_profile_edition_spec.rb
+++ b/decidim-core/spec/system/user_group_profile_edition_spec.rb
@@ -41,7 +41,7 @@
 
       fill_in "Name", with: "My super duper group"
       fill_in "About", with: "We are awesome"
-      attach_file "Avatar", Decidim::Dev.asset("city.jpeg")
+      dynamically_attach_file(:group_avatar, Decidim::Dev.asset("city.jpeg"), remove_before: true)
 
       click_button "Update group"
 
diff --git a/decidim-core/spec/system/user_groups_verification_status_on_account_page_spec.rb b/decidim-core/spec/system/user_groups_verification_status_on_account_page_spec.rb
index b7b49de19c469..83394055821a8 100644
--- a/decidim-core/spec/system/user_groups_verification_status_on_account_page_spec.rb
+++ b/decidim-core/spec/system/user_groups_verification_status_on_account_page_spec.rb
@@ -15,7 +15,7 @@
   context "when the user group is pending" do
     let(:user_group) { create(:user_group) }
 
-    it "the user can check its status on his account page" do
+    it "the user can check their status on their account page" do
       visit decidim.own_user_groups_path
 
       click_link "Groups"
@@ -26,7 +26,7 @@
 
     describe "#verified?" do
       it "returns false" do
-        expect(user_group.verified?).to eq(false)
+        expect(user_group.verified?).to be(false)
       end
     end
   end
@@ -34,7 +34,7 @@
   context "when the user group is rejected" do
     let(:user_group) { create(:user_group, :rejected) }
 
-    it "the user can check its status on his account page" do
+    it "the user can check their status on their account page" do
       visit decidim.own_user_groups_path
 
       click_link "Groups"
@@ -47,7 +47,7 @@
   context "when the user group is verified" do
     let(:user_group) { create(:user_group, :verified) }
 
-    it "the user can check its status on his account page" do
+    it "the user can check their status on their account page" do
       visit decidim.own_user_groups_path
 
       click_link "Groups"
@@ -58,7 +58,7 @@
 
     describe "#verified?" do
       it "returns true" do
-        expect(user_group.verified?).to eq(true)
+        expect(user_group.verified?).to be(true)
       end
     end
   end
diff --git a/decidim-core/spec/system/user_redirect_spec.rb b/decidim-core/spec/system/user_redirect_spec.rb
index 8e449b165c4a8..92d9c92aa8da0 100644
--- a/decidim-core/spec/system/user_redirect_spec.rb
+++ b/decidim-core/spec/system/user_redirect_spec.rb
@@ -18,7 +18,7 @@
 
         within "form.new_user" do
           fill_in :session_user_email, with: user.email
-          fill_in :session_user_password, with: "decidim123456"
+          fill_in :session_user_password, with: "decidim123456789"
           find("*[type=submit]").click
         end
       end
diff --git a/decidim-core/spec/system/user_timeline_spec.rb b/decidim-core/spec/system/user_timeline_spec.rb
index b3d2c280f7298..0478dd6605733 100644
--- a/decidim-core/spec/system/user_timeline_spec.rb
+++ b/decidim-core/spec/system/user_timeline_spec.rb
@@ -3,15 +3,6 @@
 require "spec_helper"
 
 describe "User timeline", type: :system do
-  Decidim::ActivitySearch.class_eval do
-    def resource_types
-      %w(
-        Decidim::Comments::Comment
-        Decidim::DummyResources::DummyResource
-      )
-    end
-  end
-
   let(:organization) { create(:organization) }
   let(:comment) { create(:comment) }
   let(:user) { create(:user, :confirmed, organization: organization) }
@@ -45,11 +36,11 @@ def resource_types
     create(:action_log, action: "create", visibility: "public-only", resource: comment, organization: organization, user: user2)
   end
 
-  let!(:action_log_2) do
+  let!(:action_log2) do
     create(:action_log, action: "publish", visibility: "all", resource: resource, organization: organization, participatory_space: component.participatory_space)
   end
 
-  let!(:action_log_3) do
+  let!(:action_log3) do
     create(:action_log, action: "publish", visibility: "all", resource: resource2, organization: organization)
   end
 
@@ -58,12 +49,22 @@ def resource_types
   end
 
   let(:resource_types) do
-    %w(Collaborative\ Draft Comment Debate Initiative Meeting Post Proposal Question)
+    ["Collaborative Draft", "Comment", "Debate", "Initiative", "Meeting", "Post", "Proposal", "Question"]
   end
 
   before do
+    allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
+      %w(
+        Decidim::Comments::Comment
+        Decidim::DummyResources::DummyResource
+      )
+    )
+    allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
+      %w(Decidim::DummyResources::DummyResource)
+    )
+
     Decidim::Follow.create!(user: user, followable: user2)
-    Decidim::Follow.create!(user: user, followable: action_log_2.participatory_space)
+    Decidim::Follow.create!(user: user, followable: action_log2.participatory_space)
     Decidim::Follow.create!(user: user, followable: resource2)
     login_as user, scope: :user
     switch_to_host organization.host
diff --git a/decidim-core/spec/system/user_tos_acceptance_spec.rb b/decidim-core/spec/system/user_tos_acceptance_spec.rb
index 3c53271e8616f..435877a50a346 100644
--- a/decidim-core/spec/system/user_tos_acceptance_spec.rb
+++ b/decidim-core/spec/system/user_tos_acceptance_spec.rb
@@ -75,7 +75,7 @@
 
         it "shows an option to download the users data" do
           within "#tos-refuse-modal" do
-            expect(page).to have_link("download your data", href: decidim.data_portability_path)
+            expect(page).to have_link("download your data", href: decidim.download_your_data_path)
           end
         end
 
diff --git a/decidim-core/spec/tasks/decidim_tasks_delete_data_portability_files_spec.rb b/decidim-core/spec/tasks/decidim_tasks_delete_download_your_data_files_spec.rb
similarity index 53%
rename from decidim-core/spec/tasks/decidim_tasks_delete_data_portability_files_spec.rb
rename to decidim-core/spec/tasks/decidim_tasks_delete_download_your_data_files_spec.rb
index be01e74e63c29..1803c5fe6541a 100644
--- a/decidim-core/spec/tasks/decidim_tasks_delete_data_portability_files_spec.rb
+++ b/decidim-core/spec/tasks/decidim_tasks_delete_download_your_data_files_spec.rb
@@ -2,16 +2,16 @@
 
 require "spec_helper"
 
-describe "rake decidim:delete_data_portability_files", type: :task do
-  let!(:original_expiry_time) { Decidim.data_portability_expiry_time }
+describe "rake decidim:delete_download_your_data_files", type: :task do
+  let!(:original_expiry_time) { Decidim.download_your_data_expiry_time }
   let!(:user) { create(:user) }
 
   before do
-    Decidim.data_portability_expiry_time = 0.seconds
+    Decidim.download_your_data_expiry_time = 0.seconds
   end
 
   after do
-    Decidim.data_portability_expiry_time = original_expiry_time
+    Decidim.download_your_data_expiry_time = original_expiry_time
   end
 
   it "preloads the Rails environment" do
@@ -26,13 +26,13 @@
 
   context "when there are some files" do
     before do
-      produce_data_portability_files
+      produce_download_your_data_files
     end
 
     it "runs gracefully" do
-      expect(portability_attachments.count).to be_positive
+      expect(download_your_data_attachments.count).to be_positive
       expect { task.execute }.not_to raise_error
-      expect(portability_attachments.count).to be_zero
+      expect(download_your_data_attachments.count).to be_zero
     end
   end
 
@@ -41,13 +41,13 @@
 
   #-------------------------------------------------------------
 
-  def produce_data_portability_files
-    user.data_portability_file.attach(io: File.open(Decidim::Dev.asset("city.jpeg")), filename: "city.jpeg")
+  def produce_download_your_data_files
+    user.download_your_data_file.attach(io: File.open(Decidim::Dev.asset("city.jpeg")), filename: "city.jpeg")
   end
 
-  def portability_attachments
+  def download_your_data_attachments
     ActiveStorage::Attachment.joins(:blob).where(
-      name: "data_portability_file",
+      name: "download_your_data_file",
       record_type: "Decidim::UserBaseEntity"
     )
   end
diff --git a/decidim-core/spec/tasks/decidim_tasks_fix_nickname_uniqueness_spec.rb b/decidim-core/spec/tasks/decidim_tasks_fix_nickname_uniqueness_spec.rb
new file mode 100644
index 0000000000000..0a1856a6c1f2c
--- /dev/null
+++ b/decidim-core/spec/tasks/decidim_tasks_fix_nickname_uniqueness_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "rake decidim:upgrade:fix_nickname_uniqueness", type: :task do
+  context "when all users come from the same organization" do
+    let(:organization) { create(:organization) }
+    let!(:user1) { create(:user, :confirmed, nickname: "toto", organization: organization) }
+    let!(:user2) { create(:user, :confirmed, nickname: "Toto", organization: organization) }
+    let!(:user3) { create(:user, :confirmed, nickname: "TOTO", organization: organization) }
+    let!(:user4) { create(:user, :confirmed, nickname: "foO", organization: organization) }
+    let!(:user5) { create(:user, :confirmed, nickname: "Foo", organization: organization) }
+
+    context "when executing task" do
+      it "have to be executed without failures" do
+        allow($stdin).to receive(:gets).and_return("N")
+        expect { task.execute }.not_to raise_error
+      end
+
+      it "has to change nicknames" do
+        task.execute
+
+        expect(user1.reload.nickname).to eq("toto")
+        expect(user2.reload.nickname).to eq("toto_2")
+        expect(user3.reload.nickname).to eq("toto_3")
+        expect(user4.reload.nickname).to eq("foO")
+        expect(user5.reload.nickname).to eq("foo_2")
+      end
+
+      it "send notifications" do
+        expect(Decidim::EventsManager).to receive(:publish).exactly(3).times
+
+        task.execute
+      end
+    end
+  end
+
+  context "when users come from differents organizations" do
+    let(:organization1) { create(:organization) }
+    let(:organization2) { create(:organization) }
+    let!(:user1) { create(:user, :confirmed, nickname: "toto", organization: organization1) }
+    let!(:user2) { create(:user, :confirmed, nickname: "Toto", organization: organization1) }
+    let!(:user3) { create(:user, :confirmed, nickname: "TOTO", organization: organization2) }
+    let!(:user4) { create(:user, :confirmed, nickname: "foO", organization: organization1) }
+    let!(:user5) { create(:user, :confirmed, nickname: "Foo", organization: organization2) }
+
+    context "when executing task" do
+      it "have to be executed without failures" do
+        allow($stdin).to receive(:gets).and_return("N")
+        expect { task.execute }.not_to raise_error
+      end
+
+      it "has to change nicknames" do
+        task.execute
+
+        expect(user1.reload.nickname).to eq("toto")
+        expect(user2.reload.nickname).to match(/toto_2/)
+        expect(user3.reload.nickname).to eq("TOTO")
+        expect(user4.reload.nickname).to eq("foO")
+        expect(user5.reload.nickname).to eq("Foo")
+      end
+
+      it "send notifications" do
+        expect(Decidim::EventsManager).to receive(:publish).once
+
+        task.execute
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/tasks/decidim_tasks_pwa_spec.rb b/decidim-core/spec/tasks/decidim_tasks_pwa_spec.rb
new file mode 100644
index 0000000000000..85833749c34bf
--- /dev/null
+++ b/decidim-core/spec/tasks/decidim_tasks_pwa_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Executing Decidim Generators tasks" do
+  describe "rake decidim:generate_vapid_keys", type: :task do
+    context "when executing task" do
+      it "shows the VAPID public and private keys" do
+        Rake::Task[:"decidim:pwa:generate_vapid_keys"].invoke
+        expect($stdout.string).to include("VAPID keys correctly generated.")
+        expect($stdout.string).to include("VAPID_PUBLIC_KEY")
+        expect($stdout.string).to include("VAPID_PRIVATE_KEY")
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb b/decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb
index 2b90671e23017..9bcb2c9fedb67 100644
--- a/decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb
+++ b/decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb
@@ -62,7 +62,7 @@
 
   context "when file do not exists" do
     it "raise a FILE NOT FOUND error" do
-      expect(ENV).to receive(:[]).with("FILE_PATH").and_return("tmp/not_found_file")
+      allow(ENV).to receive(:[]).with("FILE_PATH").and_return("tmp/not_found_file")
       task.execute
       check_error_printed("File not found")
     end
diff --git a/decidim-core/spec/types/localized_string_type_spec.rb b/decidim-core/spec/types/localized_string_type_spec.rb
index 8c7e62d33d307..6f1b1befa71c8 100644
--- a/decidim-core/spec/types/localized_string_type_spec.rb
+++ b/decidim-core/spec/types/localized_string_type_spec.rb
@@ -23,10 +23,58 @@ module Core
       describe "text" do
         let(:query) { "{ text }" }
 
-        it "returns the text " do
+        it "returns the text" do
           expect(response).to include("text" => "A test locale.")
         end
       end
+
+      describe "machineTranslated" do
+        let(:query) { "{ machineTranslated }" }
+
+        it "returns false by default" do
+          expect(response).to include("machineTranslated" => false)
+        end
+
+        context "when the model responds to machine_translated" do
+          let(:model) { OpenStruct.new(machine_translated: true) }
+
+          it "returns the correct value" do
+            expect(response).to include("machineTranslated" => true)
+          end
+
+          context "and the model returns false" do
+            let(:model) { OpenStruct.new(machine_translated: false) }
+
+            it "returns the correct value" do
+              expect(response).to include("machineTranslated" => false)
+            end
+          end
+
+          context "and the model returns a nil" do
+            let(:model) { OpenStruct.new(machine_translated: nil) }
+
+            it "returns false" do
+              expect(response).to include("machineTranslated" => false)
+            end
+          end
+
+          context "and the model returns a non-boolean evaluating as present" do
+            let(:model) { OpenStruct.new(machine_translated: "true") }
+
+            it "returns true" do
+              expect(response).to include("machineTranslated" => true)
+            end
+          end
+
+          context "and the model returns a non-boolean evaluating as blank" do
+            let(:model) { OpenStruct.new(machine_translated: "") }
+
+            it "returns false" do
+              expect(response).to include("machineTranslated" => false)
+            end
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-core/spec/types/trace_version_type_spec.rb b/decidim-core/spec/types/trace_version_type_spec.rb
index aba1b4eeec3a8..06351c0891e28 100644
--- a/decidim-core/spec/types/trace_version_type_spec.rb
+++ b/decidim-core/spec/types/trace_version_type_spec.rb
@@ -52,7 +52,7 @@ module Core
           let(:user) { "test suite" }
 
           it "returns nil" do
-            expect(response["editor"]).to eq(nil)
+            expect(response["editor"]).to be_nil
           end
         end
       end
diff --git a/decidim-core/spec/types/translated_field_type_spec.rb b/decidim-core/spec/types/translated_field_type_spec.rb
index 5a3e5111c8a14..f15ab619a299e 100644
--- a/decidim-core/spec/types/translated_field_type_spec.rb
+++ b/decidim-core/spec/types/translated_field_type_spec.rb
@@ -8,6 +8,19 @@ module Core
     describe TranslatedFieldType do
       include_context "with a graphql class type"
 
+      shared_context "with machine translations" do
+        let(:model) do
+          {
+            ca: "Hola",
+            en: "Hello",
+            es: "",
+            machine_translations: {
+              es: "Ey"
+            }
+          }
+        end
+      end
+
       let(:model) do
         {
           ca: "Hola",
@@ -21,6 +34,14 @@ module Core
         it "returns the available locales" do
           expect(response["locales"]).to include("en", "ca")
         end
+
+        context "when there are machine translations" do
+          include_context "with machine translations"
+
+          it "returns all available locales with no duplicates" do
+            expect(response["locales"]).to include("en", "ca", "es")
+          end
+        end
       end
 
       describe "translations" do
@@ -33,6 +54,41 @@ module Core
             expect(translations).to include("locale" => "ca", "text" => "Hola")
             expect(translations).to include("locale" => "en", "text" => "Hello")
           end
+
+          context "when there are machine translations" do
+            include_context "with machine translations"
+
+            let(:query) { "{ translations { locale text machineTranslated }}" }
+
+            it "returns correct translations" do
+              translations = response["translations"]
+              expect(translations.length).to eq(3)
+              expect(translations).to include("locale" => "ca", "text" => "Hola", "machineTranslated" => false)
+              expect(translations).to include("locale" => "en", "text" => "Hello", "machineTranslated" => false)
+              expect(translations).to include("locale" => "es", "text" => "Ey", "machineTranslated" => true)
+            end
+
+            context "with defined translation overriding machine translation" do
+              let(:model) do
+                {
+                  ca: "Hola",
+                  en: "Hello",
+                  es: "Hola",
+                  machine_translations: {
+                    es: "Ey"
+                  }
+                }
+              end
+
+              it "returns correct translations" do
+                translations = response["translations"]
+                expect(translations.length).to eq(3)
+                expect(translations).to include("locale" => "ca", "text" => "Hola", "machineTranslated" => false)
+                expect(translations).to include("locale" => "en", "text" => "Hello", "machineTranslated" => false)
+                expect(translations).to include("locale" => "es", "text" => "Hola", "machineTranslated" => false)
+              end
+            end
+          end
         end
 
         context "when locales are provided" do
@@ -61,7 +117,7 @@ module Core
 
           it "returns a null value" do
             translation = response["translation"]
-            expect(translation).to eq(nil)
+            expect(translation).to be_nil
           end
         end
       end
diff --git a/decidim-core/spec/uploaders/application_uploader_spec.rb b/decidim-core/spec/uploaders/application_uploader_spec.rb
new file mode 100644
index 0000000000000..f265d466addf7
--- /dev/null
+++ b/decidim-core/spec/uploaders/application_uploader_spec.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ApplicationUploader do
+    subject { described_class.new(model, mounted_as) }
+
+    let(:model) { create(:organization) }
+    let(:mounted_as) { :official_img_header }
+
+    before do
+      allow(ENV).to receive(:fetch).and_call_original
+      allow(ENV).to receive(:fetch).with("HTTP_PORT", instance_of(Integer)).and_return(local_port) if respond_to?(:local_port)
+      allow(ENV).to receive(:fetch).with("HOSTNAME", nil).and_return(hostname) if respond_to?(:hostname)
+    end
+
+    describe "#variant_url" do
+      shared_context "with force_ssl enabled" do
+        before do
+          allow(Rails.application.config).to receive(:force_ssl).and_return(true)
+        end
+      end
+
+      shared_examples "development local storage protocol options" do
+        let(:default_port) { Rails.env.development? ? 3000 : Capybara.server_port }
+
+        it "returns a URL containing the port only" do
+          expect(subject.variant_url(:testing)).to match(%r{^http://localhost:#{default_port}/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+        end
+
+        context "when force_ssl is enabled" do
+          include_context "with force_ssl enabled"
+
+          it "returns a URL containing the port and protocol" do
+            expect(subject.variant_url(:testing)).to match(%r{^https://localhost:#{default_port}/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+          end
+
+          context "and the PORT environment variable is defined as 3001" do
+            let(:local_port) { 3001 }
+
+            it "returns a URL containing the port and protocol" do
+              expect(subject.variant_url(:testing)).to match(%r{^https://localhost:3001/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+            end
+          end
+
+          context "and the PORT environment variable is defined as 443" do
+            let(:local_port) { 443 }
+
+            it "returns a URL containing the protocol only" do
+              expect(subject.variant_url(:testing)).to match(%r{^https://localhost/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+            end
+          end
+        end
+
+        context "with an existing variant" do
+          subject { test_class.new(model, mounted_as) }
+
+          let(:test_class) do
+            Class.new(described_class) do
+              set_variants do
+                { testing: { resize_to_fit: [200, 100] } }
+              end
+            end
+          end
+
+          it "returns a URL to the variant" do
+            expect(subject.variant_url(:testing)).to match(%r{^http://localhost:#{default_port}/rails/active_storage/representations/redirect/.*/avatar.jpg$})
+          end
+        end
+      end
+
+      context "with test environment" do
+        it_behaves_like "development local storage protocol options"
+      end
+
+      context "with development environment" do
+        before do
+          allow(Rails.env).to receive(:development?).and_return(true)
+        end
+
+        it_behaves_like "development local storage protocol options"
+      end
+
+      context "with production environment" do
+        let(:hostname) { "production.decidim.test" }
+
+        before do
+          allow(Rails.env).to receive(:development?).and_return(false)
+          allow(Rails.env).to receive(:test?).and_return(false)
+        end
+
+        it "returns a default URL" do
+          expect(subject.variant_url(:testing)).to match(%r{^http://production.decidim.test/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+        end
+
+        context "and the PORT environment variable is defined as 443" do
+          let(:local_port) { 443 }
+
+          it "returns a URL containing the protocol only" do
+            expect(subject.variant_url(:testing)).to match(%r{^https://production.decidim.test/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+          end
+        end
+
+        context "and the PORT environment variable is defined as 8080" do
+          let(:local_port) { 8080 }
+
+          it "returns a URL containing the port" do
+            expect(subject.variant_url(:testing)).to match(%r{^http://production.decidim.test:8080/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+          end
+        end
+
+        context "and force_ssl is enabled" do
+          include_context "with force_ssl enabled"
+
+          it "returns a URL containing the protocol only" do
+            expect(subject.variant_url(:testing)).to match(%r{^https://production.decidim.test/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+          end
+
+          context "and the PORT environment variable is defined as 8080" do
+            let(:local_port) { 8080 }
+
+            it "returns a URL containing the port and protocol" do
+              expect(subject.variant_url(:testing)).to match(%r{^https://production.decidim.test:8080/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+            end
+          end
+        end
+      end
+
+      context "with CDN host defined in the secrets" do
+        let(:cdn_host) { "https://cdn.example.org" }
+
+        # Local env variables should not affect the CDN URLs
+        let(:hostname) { "production.decidim.test" }
+        let(:local_port) { 9999 }
+
+        before do
+          allow(Rails.env).to receive(:development?).and_return(false)
+          allow(Rails.env).to receive(:test?).and_return(false)
+          allow(Rails.application.secrets).to receive(:dig).and_call_original
+          allow(Rails.application.secrets).to receive(:dig).with(:storage, :cdn_host).and_return(cdn_host)
+        end
+
+        it "returns a URL containing the CDN configurations" do
+          expect(subject.variant_url(:testing)).to match(%r{^https://cdn.example.org/rails/active_storage/blobs/redirect/.*/avatar.jpg$})
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/uploaders/avatar_uploader_spec.rb b/decidim-core/spec/uploaders/avatar_uploader_spec.rb
new file mode 100644
index 0000000000000..e2d0e341b5b6e
--- /dev/null
+++ b/decidim-core/spec/uploaders/avatar_uploader_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe AvatarUploader do
+    subject { uploader }
+
+    let(:uploader) { described_class.new(model, :avatar) }
+    let(:model) { create(:user) }
+
+    describe "#default_url" do
+      subject { uploader.default_url }
+
+      let(:asset) { "media/images/default-avatar.svg" }
+      let(:correct_asset_path) { ActionController::Base.helpers.asset_pack_path(asset) }
+
+      it { is_expected.to eq("//#{model.organization.host}:#{Capybara.server_port}#{correct_asset_path}") }
+    end
+
+    describe "#default_multiuser_url" do
+      subject { uploader.default_multiuser_url }
+
+      let(:asset) { "media/images/avatar-multiuser.png" }
+      let(:correct_asset_path) { ActionController::Base.helpers.asset_pack_path(asset) }
+
+      it { is_expected.to eq("//#{model.organization.host}:#{Capybara.server_port}#{correct_asset_path}") }
+    end
+  end
+end
diff --git a/decidim-core/spec/uploaders/image_uploader.spec.rb b/decidim-core/spec/uploaders/cw/image_uploader_spec.rb
similarity index 98%
rename from decidim-core/spec/uploaders/image_uploader.spec.rb
rename to decidim-core/spec/uploaders/cw/image_uploader_spec.rb
index c89eea787b51d..5d23af5e5bfdf 100644
--- a/decidim-core/spec/uploaders/image_uploader.spec.rb
+++ b/decidim-core/spec/uploaders/cw/image_uploader_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 require "carrierwave/test/matchers"
 
-module Decidim
+module Decidim::Cw
   describe ImageUploader do
     include CarrierWave::Test::Matchers
 
diff --git a/decidim-core/spec/validators/active_model/validations/file_content_type_validator_spec.rb b/decidim-core/spec/validators/active_model/validations/file_content_type_validator_spec.rb
new file mode 100644
index 0000000000000..d99104956859b
--- /dev/null
+++ b/decidim-core/spec/validators/active_model/validations/file_content_type_validator_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ActiveModel::Validations::FileContentTypeValidator do
+  subject do
+    dummy_record = validatable.new(organization: organization)
+    dummy_record.class.validators_on(:file).each do |validator|
+      validator.validate_each(dummy_record, :file, file)
+    end
+    dummy_record.errors
+  end
+
+  let(:uploader) do
+    Class.new(Decidim::ApplicationUploader) do
+      def content_type_allowlist
+        %w(image/jpeg image/png)
+      end
+    end
+  end
+
+  let(:file_validation_options) { {} }
+
+  let(:validatable) do
+    mount_class = uploader
+    validation_options = file_validation_options
+    Class.new(ApplicationRecord) do
+      include Decidim::HasUploadValidations
+
+      self.table_name = "decidim_dummy_resources_dummy_resources"
+
+      def self.model_name
+        ActiveModel::Name.new(self, nil, "Validatable")
+      end
+
+      attr_accessor :file
+      attr_accessor :organization
+
+      validates_upload(:file, **validation_options.merge(uploader: mount_class))
+    end
+  end
+
+  let(:organization) { create(:organization) }
+
+  context "when the file is valid" do
+    let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+
+    it "does not add any errors" do
+      expect(subject.count).to eq(0)
+    end
+  end
+
+  context "when the file is not valid" do
+    let(:file) { Decidim::Dev.test_file("city.jpeg", "application/pdf") }
+
+    it "adds the content type error" do
+      expect(subject.count).to eq(1)
+      expect(subject[:file]).to eq(
+        ["only files with the following extensions are allowed: jpeg, jpg, png"]
+      )
+    end
+
+    context "and the content type is text/csv" do
+      let(:organization) do
+        create(
+          :organization,
+          file_upload_settings: Decidim::OrganizationSettings.default(:upload).deep_merge(
+            "allowed_file_extensions" => { "default" => ["csv"] }
+          )
+        )
+      end
+
+      let(:uploader) do
+        Class.new(Decidim::ApplicationUploader) do
+          def content_type_allowlist
+            %w(text/csv)
+          end
+        end
+      end
+
+      it "adds the content type error" do
+        expect(subject.count).to eq(1)
+        expect(subject[:file]).to eq(
+          ["only files with the following extensions are allowed: csv"]
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-core/spec/validators/etiquette_validator_spec.rb b/decidim-core/spec/validators/etiquette_validator_spec.rb
index 4b5f49a78c760..a724152c814ac 100644
--- a/decidim-core/spec/validators/etiquette_validator_spec.rb
+++ b/decidim-core/spec/validators/etiquette_validator_spec.rb
@@ -3,13 +3,15 @@
 require "spec_helper"
 
 describe EtiquetteValidator do
+  subject { validatable.new(body: body) }
+
   let(:validatable) do
     Class.new do
       def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :body
@@ -18,8 +20,6 @@ def self.model_name
     end
   end
 
-  let(:subject) { validatable.new(body: body) }
-
   context "when the body is reasonable" do
     [
       %(I am a very reasonable body, ain't I? I have the right length, the right style, the right words. Yup.),
diff --git a/decidim-core/spec/validators/geocoding_validator_spec.rb b/decidim-core/spec/validators/geocoding_validator_spec.rb
index 49ca0969bc17a..3a5538cdafb27 100644
--- a/decidim-core/spec/validators/geocoding_validator_spec.rb
+++ b/decidim-core/spec/validators/geocoding_validator_spec.rb
@@ -3,32 +3,30 @@
 require "spec_helper"
 
 describe GeocodingValidator do
+  subject { validatable.new(address: address, component: component) }
+
   let(:validatable) do
     Class.new do
       def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :address
       attribute :latitude
       attribute :longitude
+      attribute :component
 
       validates :address, geocoding: true
-
-      def component
-        FactoryBot.create(:component)
-      end
     end
   end
 
   let(:address) { "Some address" }
   let(:latitude) { 40.1234 }
   let(:longitude) { 2.1234 }
-
-  let(:subject) { validatable.new(address: address) }
+  let(:component) { create(:component) }
 
   context "when the address is valid" do
     before do
diff --git a/decidim-core/spec/validators/passthru_validator_spec.rb b/decidim-core/spec/validators/passthru_validator_spec.rb
index 19b5439633d41..6715353daf1c7 100644
--- a/decidim-core/spec/validators/passthru_validator_spec.rb
+++ b/decidim-core/spec/validators/passthru_validator_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe PassthruValidator do
-  subject { validatable.new(file: file) }
+  subject { validatable.new(file: file, organization: organization) }
 
   let(:validator_settings) { {} }
 
@@ -39,18 +39,18 @@ def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :file
-      validates :file, validator_config
+      attribute :organization
 
-      def organization
-        @organization ||= FactoryBot.create(:organization)
-      end
+      validates :file, validator_config
     end
   end
 
+  let(:organization) { create(:organization) }
+
   context "when the file is valid" do
     let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
 
@@ -64,7 +64,7 @@ def organization
       it "adds the passthrough record's validation errors on the field" do
         expect(subject).to be_invalid
         expect(subject.errors[:file]).to eq(
-          ["file should be one of image/jpeg, image/png"]
+          ["only files with the following extensions are allowed: jpeg, jpg, png"]
         )
       end
     end
@@ -108,7 +108,7 @@ def organization
         it { is_expected.to be_valid }
       end
 
-      context "when the if condition returns false" do
+      context "when the unless condition returns false" do
         let(:validator_settings) { { unless: -> { false } } }
 
         it { is_expected.to be_invalid }
diff --git a/decidim-core/spec/forms/password_validator_spec.rb b/decidim-core/spec/validators/password_validator_spec.rb
similarity index 57%
rename from decidim-core/spec/forms/password_validator_spec.rb
rename to decidim-core/spec/validators/password_validator_spec.rb
index 803f2a2721134..fc51d0391a8e6 100644
--- a/decidim-core/spec/forms/password_validator_spec.rb
+++ b/decidim-core/spec/validators/password_validator_spec.rb
@@ -7,17 +7,22 @@
     let(:organization) { create(:organization) }
     let(:validator) { described_class.new(options).validate_each(record, attribute, value) }
 
+    let(:errors) { ActiveModel::Errors.new(attribute.to_s => []) }
     let(:record) do
       double(
         name: ::Faker::Name.name,
         email: ::Faker::Internet.email,
         nickname: ::Faker::Internet.username(specifier: 10..15),
         current_organization: organization,
-        errors: {
-          attribute.to_s => []
-        }
+        errors: errors,
+        admin?: admin_record,
+        previous_passwords: previous_passwords,
+        encrypted_password_was: ::Devise::Encryptor.digest(Decidim::User, "decidim123456"),
+        encrypted_password_changed?: true
       )
     end
+    let(:admin_record) { false }
+    let(:previous_passwords) { [] }
     let(:attribute) { "password" }
     let(:options) do
       {
@@ -29,9 +34,19 @@
       let(:value) { "decidim123456" }
 
       it "just works" do
-        expect(validator).to eq(true)
+        expect(validator).to be(true)
         expect(record.errors[attribute]).to be_empty
       end
+
+      context "when the record is an admin" do
+        let(:admin_record) { true }
+        let(:value) { "decidim123456789" }
+
+        it "just works" do
+          expect(validator).to be(true)
+          expect(record.errors[attribute]).to be_empty
+        end
+      end
     end
 
     context "when there is blacklisted passwords" do
@@ -50,7 +65,7 @@
         let(:value) { example_password }
 
         it "is blacklisted" do
-          expect(validator).to eq(false)
+          expect(validator).to be(false)
           expect(record.errors[attribute]).to eq(["is blacklisted"])
         end
       end
@@ -59,7 +74,7 @@
         let(:value) { "bazfoobar123456" }
 
         it "does not validate" do
-          expect(validator).to eq(false)
+          expect(validator).to be(false)
           expect(record.errors[attribute]).to eq(["is blacklisted"])
         end
       end
@@ -68,7 +83,7 @@
         let(:value) { "decidim123456" }
 
         it "is valid" do
-          expect(validator).to eq(true)
+          expect(validator).to be(true)
           expect(record.errors[attribute]).to be_empty
         end
       end
@@ -78,16 +93,31 @@
       let(:value) { ::Faker::Internet.password(max_length: ::PasswordValidator::MINIMUM_LENGTH - 1) }
 
       it "is too short" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too short"])
       end
+
+      context "when the record is an admin" do
+        let(:admin_record) { true }
+        let(:value) do
+          ::Faker::Internet.password(
+            min_length: ::PasswordValidator::MINIMUM_LENGTH,
+            max_length: ::PasswordValidator::ADMIN_MINIMUM_LENGTH - 1
+          )
+        end
+
+        it "is too short" do
+          expect(validator).to be(false)
+          expect(record.errors[attribute]).to eq(["is too short"])
+        end
+      end
     end
 
     describe "long password" do
       let(:value) { ::Faker::Internet.password(min_length: ::PasswordValidator::MAX_LENGTH + 1) }
 
       it "is too long" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too long"])
       end
     end
@@ -96,7 +126,7 @@
       let(:value) { "ab" * ::PasswordValidator::MINIMUM_LENGTH }
 
       it "does not have enough unique characters" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["does not have enough unique characters"])
       end
     end
@@ -105,7 +135,7 @@
       let(:value) { "foo#{record.email}bar" }
 
       it "is too similar with email" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too similar to your email"])
       end
     end
@@ -114,7 +144,7 @@
       let(:value) { "foo#{record.name.delete(" ")}bar" }
 
       it "is too similar with name" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too similar to your name"])
       end
     end
@@ -123,7 +153,7 @@
       let(:value) { "foo#{record.nickname}bar" }
 
       it "is too similar with nickname" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too similar to your nickname"])
       end
     end
@@ -132,7 +162,7 @@
       let(:value) { "foo#{organization.host}bar" }
 
       it "is too similar with domain" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too similar to this domain name"])
       end
     end
@@ -141,9 +171,42 @@
       let(:value) { "qwerty12345" }
 
       it "is too common" do
-        expect(validator).to eq(false)
+        expect(validator).to be(false)
         expect(record.errors[attribute]).to eq(["is too common"])
       end
     end
+
+    describe "repeated password" do
+      let(:admin_record) { true }
+      let(:previous_passwords) { plain_passwords.map { |password| ::Devise::Encryptor.digest(Decidim::User, password) } }
+      let(:plain_passwords) { Array.new(6) { ::Faker::Internet.password(min_length: ::PasswordValidator::ADMIN_MINIMUM_LENGTH) } }
+
+      context "when password is last used" do
+        let(:value) { plain_passwords[0] }
+
+        it "cannot reuse" do
+          expect(validator).to be(false)
+          expect(record.errors[attribute]).to eq(["cannot reuse old password"])
+        end
+      end
+
+      context "when password has used before" do
+        let(:value) { plain_passwords[2] }
+
+        it "cannot reuse" do
+          expect(validator).to be(false)
+          expect(record.errors[attribute]).to eq(["cannot reuse old password"])
+        end
+      end
+
+      context "when password is used but repetition times is less" do
+        let(:value) { plain_passwords[5] }
+
+        it "can reuse" do
+          expect(validator).to be(true)
+          expect(record.errors[attribute]).to be_empty
+        end
+      end
+    end
   end
 end
diff --git a/decidim-core/spec/validators/scope_belongs_to_component_validator_spec.rb b/decidim-core/spec/validators/scope_belongs_to_component_validator_spec.rb
index 9d15e87ab1f22..d2c3bf274b824 100644
--- a/decidim-core/spec/validators/scope_belongs_to_component_validator_spec.rb
+++ b/decidim-core/spec/validators/scope_belongs_to_component_validator_spec.rb
@@ -3,13 +3,15 @@
 require "spec_helper"
 
 describe ScopeBelongsToComponentValidator do
+  subject { validatable.new(scope: scope, component: component) }
+
   let(:validatable) do
     Class.new do
       def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :scope
@@ -18,8 +20,6 @@ def self.model_name
       validates :scope, scope_belongs_to_component: true
     end
   end
-
-  let(:subject) { validatable.new(scope: scope, component: component) }
   let(:component) { create :component, organization: organization }
   let!(:parent_scope) { create(:scope, organization: organization) }
   let!(:organization) { create :organization }
diff --git a/decidim-core/spec/validators/time_zone_validator_spec.rb b/decidim-core/spec/validators/time_zone_validator_spec.rb
index c968f6fd4c2b1..9b7458674834d 100644
--- a/decidim-core/spec/validators/time_zone_validator_spec.rb
+++ b/decidim-core/spec/validators/time_zone_validator_spec.rb
@@ -3,13 +3,15 @@
 require "spec_helper"
 
 describe TimeZoneValidator do
+  subject { validatable.new(time_zone: time_zone) }
+
   let(:validatable) do
     Class.new do
       def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :time_zone
@@ -18,8 +20,6 @@ def self.model_name
     end
   end
 
-  let(:subject) { validatable.new(time_zone: time_zone) }
-
   context "when the time zone is valid" do
     let(:time_zone) { "Tijuana" }
 
diff --git a/decidim-core/spec/validators/uploader_content_type_validator_spec.rb b/decidim-core/spec/validators/uploader_content_type_validator_spec.rb
index b8925dc7ffff3..b01b70adfa404 100644
--- a/decidim-core/spec/validators/uploader_content_type_validator_spec.rb
+++ b/decidim-core/spec/validators/uploader_content_type_validator_spec.rb
@@ -8,7 +8,7 @@
 # the passthru validator uses it for the upload form objects.
 describe UploaderContentTypeValidator do
   subject do
-    dummy_record = validatable.new
+    dummy_record = validatable.new(organization: organization)
     dummy_record.class.validators_on(:file).each do |validator|
       validator.validate_each(dummy_record, :file, file)
     end
@@ -38,15 +38,14 @@ def self.model_name
       end
 
       attr_accessor :file
+      attr_accessor :organization
 
       validates_upload(:file, **validation_options.merge(uploader: mount_class))
-
-      def organization
-        @organization ||= FactoryBot.create(:organization)
-      end
     end
   end
 
+  let(:organization) { create(:organization) }
+
   context "when the file is valid" do
     let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
 
@@ -54,13 +53,82 @@ def organization
   end
 
   context "when the file is not valid" do
-    let(:file) { fixture_file_upload(Decidim::Dev.test_file("city.jpeg", "application/pdf"), "application/pdf") }
+    let(:file) { Decidim::Dev.test_file("city.jpeg", "application/pdf") }
 
     it "adds the content type error" do
       expect(subject.count).to eq(1)
       expect(subject[:file]).to eq(
-        ["file should be one of image/jpeg, image/png"]
+        ["only files with the following extensions are allowed: jpeg, jpg, png"]
       )
     end
+
+    context "and the content type contains a recognized wildcard match" do
+      let(:uploader) do
+        Class.new(Decidim::ApplicationUploader) do
+          def content_type_allowlist
+            %w(image/*)
+          end
+        end
+      end
+
+      it "adds the correct content type error with the allowed extensions" do
+        expect(subject.count).to eq(1)
+        expect(subject[:file]).to eq(
+          ["only files with the following extensions are allowed: bmp, gif, jpeg, jpg, png"]
+        )
+      end
+    end
+
+    context "and the content type contains an unrecognized wildcard match" do
+      let(:uploader) do
+        Class.new(Decidim::ApplicationUploader) do
+          def content_type_allowlist
+            %w(foobar/*)
+          end
+        end
+      end
+
+      it "adds the content type to the error" do
+        expect(subject.count).to eq(1)
+        expect(subject[:file]).to eq(
+          ["only files with the following extensions are allowed: foobar/*"]
+        )
+      end
+    end
+
+    context "and the content type contains a recognized and an unrecognized wildcard match" do
+      let(:uploader) do
+        Class.new(Decidim::ApplicationUploader) do
+          def content_type_allowlist
+            %w(image/* foobar/*)
+          end
+        end
+      end
+
+      it "adds the recognized extensions and content type to the error in correct order" do
+        expect(subject.count).to eq(1)
+        expect(subject[:file]).to eq(
+          ["only files with the following extensions are allowed: bmp, gif, jpeg, jpg, png, foobar/*"]
+        )
+      end
+    end
+
+    context "and the uploader defines forbidden types" do
+      let(:uploader) do
+        Class.new(Decidim::ApplicationUploader) do
+          def content_type_denylist
+            %w(image/jpeg)
+          end
+        end
+      end
+      let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+
+      it "adds the possible file extensions to the error message" do
+        expect(subject.count).to eq(1)
+        expect(subject[:file]).to eq(
+          ["file cannot be jpe, jpeg, jpg"]
+        )
+      end
+    end
   end
 end
diff --git a/decidim-debates/app/commands/decidim/debates/admin/close_debate.rb b/decidim-debates/app/commands/decidim/debates/admin/close_debate.rb
index 8c60fbeaac36a..9f24a2d293d1c 100644
--- a/decidim-debates/app/commands/decidim/debates/admin/close_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/admin/close_debate.rb
@@ -4,7 +4,7 @@ module Decidim
   module Debates
     module Admin
       # A command with all the business logic when an admin closes a debate.
-      class CloseDebate < Rectify::Command
+      class CloseDebate < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
diff --git a/decidim-debates/app/commands/decidim/debates/admin/create_debate.rb b/decidim-debates/app/commands/decidim/debates/admin/create_debate.rb
index aa1f937bff9a5..34e0e519e2b8b 100644
--- a/decidim-debates/app/commands/decidim/debates/admin/create_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/admin/create_debate.rb
@@ -5,7 +5,7 @@ module Debates
     module Admin
       # This command is executed when the user creates a Debate from the admin
       # panel.
-      class CreateDebate < Rectify::Command
+      class CreateDebate < Decidim::Command
         def initialize(form)
           @form = form
         end
diff --git a/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb b/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
index 3878b40a83324..cea28589391f3 100644
--- a/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/admin/update_debate.rb
@@ -5,7 +5,7 @@ module Debates
     module Admin
       # This command is executed when the user changes a Debate from the admin
       # panel.
-      class UpdateDebate < Rectify::Command
+      class UpdateDebate < Decidim::Command
         # Initializes a UpdateDebate Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-debates/app/commands/decidim/debates/close_debate.rb b/decidim-debates/app/commands/decidim/debates/close_debate.rb
index a0dac4e72ccfb..28a48b70e8c8b 100644
--- a/decidim-debates/app/commands/decidim/debates/close_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/close_debate.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class CloseDebate < Rectify::Command
+    class CloseDebate < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-debates/app/commands/decidim/debates/create_debate.rb b/decidim-debates/app/commands/decidim/debates/create_debate.rb
index 962df695cba17..508a40b18ff8f 100644
--- a/decidim-debates/app/commands/decidim/debates/create_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/create_debate.rb
@@ -4,7 +4,7 @@ module Decidim
   module Debates
     # This command is executed when the user creates a Debate from the public
     # views.
-    class CreateDebate < Rectify::Command
+    class CreateDebate < Decidim::Command
       def initialize(form)
         @form = form
       end
diff --git a/decidim-debates/app/commands/decidim/debates/update_debate.rb b/decidim-debates/app/commands/decidim/debates/update_debate.rb
index 8e53a43bdfcdd..ddc15764f83c9 100644
--- a/decidim-debates/app/commands/decidim/debates/update_debate.rb
+++ b/decidim-debates/app/commands/decidim/debates/update_debate.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
-    class UpdateDebate < Rectify::Command
+    class UpdateDebate < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-debates/app/controllers/decidim/debates/admin/debate_closes_controller.rb b/decidim-debates/app/controllers/decidim/debates/admin/debate_closes_controller.rb
index c37b85743dc8f..a5c3e70b5246e 100644
--- a/decidim-debates/app/controllers/decidim/debates/admin/debate_closes_controller.rb
+++ b/decidim-debates/app/controllers/decidim/debates/admin/debate_closes_controller.rb
@@ -17,7 +17,6 @@ def update
           enforce_permission_to :close, :debate, debate: debate
 
           @form = form(Admin::CloseDebateForm).from_params(params)
-          @form.debate = debate
 
           CloseDebate.call(@form) do
             on(:ok) do |_debate|
diff --git a/decidim-debates/app/controllers/decidim/debates/debates_controller.rb b/decidim-debates/app/controllers/decidim/debates/debates_controller.rb
index 97f4685854b5c..bbaf0f4e733bb 100644
--- a/decidim-debates/app/controllers/decidim/debates/debates_controller.rb
+++ b/decidim-debates/app/controllers/decidim/debates/debates_controller.rb
@@ -53,7 +53,6 @@ def update
         enforce_permission_to :edit, :debate, debate: debate
 
         @form = form(DebateForm).from_params(params)
-        @form.debate = debate
 
         UpdateDebate.call(@form) do
           on(:ok) do |debate|
@@ -72,7 +71,6 @@ def close
         enforce_permission_to :close, :debate, debate: debate
 
         @form = form(CloseDebateForm).from_params(params)
-        @form.debate = debate
 
         CloseDebate.call(@form) do
           on(:ok) do |debate|
@@ -98,7 +96,7 @@ def paginated_debates
       end
 
       def debates
-        @debates ||= reorder(search.results)
+        @debates ||= reorder(search.result)
       end
 
       def debate
@@ -109,26 +107,18 @@ def close_debate_form
         @close_debate_form ||= form(CloseDebateForm).from_model(debate)
       end
 
-      def search_klass
-        DebateSearch
-      end
-
-      def default_search_params
-        {
-          page: params[:page],
-          per_page: 12
-        }
+      def search_collection
+        Debate.where(component: current_component).not_hidden
       end
 
       def default_filter_params
         {
-          search_text: "",
-          origin: %w(official citizens user_group),
+          search_text_cont: "",
+          with_any_origin: %w(official participants user_group),
           activity: "all",
-          category_id: default_filter_category_params,
-          scope_id: default_filter_scope_params,
-          status: "all",
-          state: %w(open closed)
+          with_any_category: default_filter_category_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_state: %w(open closed)
         }
       end
     end
diff --git a/decidim-debates/app/controllers/decidim/debates/orderable.rb b/decidim-debates/app/controllers/decidim/debates/orderable.rb
index 8c9c8dde73f5f..76123790b3bf0 100644
--- a/decidim-debates/app/controllers/decidim/debates/orderable.rb
+++ b/decidim-debates/app/controllers/decidim/debates/orderable.rb
@@ -24,11 +24,11 @@ def default_order
         def reorder(debates)
           case order
           when "recent"
-            debates.order("created_at DESC")
+            debates.order(created_at: :desc)
           when "commented"
-            debates.order("comments_count DESC")
+            debates.order(comments_count: :desc)
           when "updated"
-            debates.order("updated_at DESC")
+            debates.order(updated_at: :desc)
           when "random"
             debates.order_randomly(random_seed)
           else
diff --git a/decidim-debates/app/forms/decidim/debates/admin/close_debate_form.rb b/decidim-debates/app/forms/decidim/debates/admin/close_debate_form.rb
index 9ce65b8abe8b9..3df0fa74565a7 100644
--- a/decidim-debates/app/forms/decidim/debates/admin/close_debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/admin/close_debate_form.rb
@@ -14,8 +14,6 @@ class CloseDebateForm < Decidim::Form
           validates translated_attribute, length: { minimum: 10, maximum: 10_000 }, if: ->(record) { record.default_locale?(locale) }
         end
 
-        attribute :debate, Debate
-
         validates :debate, presence: true
         validate :user_can_close_debate
 
@@ -23,6 +21,10 @@ def closed_at
           debate&.closed_at || Time.current
         end
 
+        def debate
+          @debate ||= Debate.find_by(id: id)
+        end
+
         private
 
         def user_can_close_debate
diff --git a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
index eb3fdb8e3ca56..e0a0b1be373b5 100644
--- a/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/admin/debate_form.rb
@@ -47,14 +47,14 @@ def category
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def scope_id
-          @scope_id || scope&.id
+          super || scope&.id
         end
 
         private
diff --git a/decidim-debates/app/forms/decidim/debates/close_debate_form.rb b/decidim-debates/app/forms/decidim/debates/close_debate_form.rb
index 18cb56c9a040e..abaef7bd5ea41 100644
--- a/decidim-debates/app/forms/decidim/debates/close_debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/close_debate_form.rb
@@ -7,7 +7,6 @@ class CloseDebateForm < Decidim::Form
       mimic :debate
 
       attribute :conclusions, Decidim::Attributes::CleanString
-      attribute :debate, Debate
 
       validates :debate, presence: true
       validates :conclusions, presence: true, length: { minimum: 10, maximum: 10_000 }
@@ -19,7 +18,6 @@ def closed_at
 
       def map_model(debate)
         super
-        self.debate = debate
 
         # Debates can be translated in different languages from the admin but
         # the public form doesn't allow it. When a user closes a debate the
@@ -27,6 +25,10 @@ def map_model(debate)
         self.conclusions = debate.conclusions&.values&.first
       end
 
+      def debate
+        @debate ||= Debate.find_by(id: id)
+      end
+
       private
 
       def user_can_close_debate
diff --git a/decidim-debates/app/forms/decidim/debates/debate_form.rb b/decidim-debates/app/forms/decidim/debates/debate_form.rb
index 0b784976c95f8..b33bfb97e2adf 100644
--- a/decidim-debates/app/forms/decidim/debates/debate_form.rb
+++ b/decidim-debates/app/forms/decidim/debates/debate_form.rb
@@ -11,7 +11,6 @@ class DebateForm < Decidim::Form
       attribute :category_id, Integer
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
-      attribute :debate, Debate
 
       validates :title, presence: true
       validates :description, presence: true
@@ -22,8 +21,6 @@ class DebateForm < Decidim::Form
 
       def map_model(debate)
         super
-        self.debate = debate
-
         # Debates can be translated in different languages from the admin but
         # the public form doesn't allow it. When a user creates a debate the
         # user locale is taken as the text locale.
@@ -45,14 +42,18 @@ def category
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+        @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the debate
       def scope_id
-        @scope_id || scope&.id
+        super || scope&.id
+      end
+
+      def debate
+        @debate ||= Debate.find_by(id: id)
       end
 
       private
diff --git a/decidim-debates/app/helpers/decidim/debates/application_helper.rb b/decidim-debates/app/helpers/decidim/debates/application_helper.rb
index f28531a34b129..54c13b374ae0a 100644
--- a/decidim-debates/app/helpers/decidim/debates/application_helper.rb
+++ b/decidim-debates/app/helpers/decidim/debates/application_helper.rb
@@ -35,7 +35,7 @@ def text_editor_for_debate_description(form)
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.debates.debates.filters.official"))
-        origin_values << TreePoint.new("citizens", t("decidim.debates.debates.filters.citizens"))
+        origin_values << TreePoint.new("participants", t("decidim.debates.debates.filters.participants"))
         origin_values << TreePoint.new("user_group", t("decidim.debates.debates.filters.user_groups")) if current_organization.user_groups_enabled?
 
         TreeNode.new(TreePoint.new("", t("decidim.debates.debates.filters.all")), origin_values)
diff --git a/decidim-debates/app/models/decidim/debates/debate.rb b/decidim-debates/app/models/decidim/debates/debate.rb
index 7c0723eec85ea..d9fc04f3a0b12 100644
--- a/decidim-debates/app/models/decidim/debates/debate.rb
+++ b/decidim-debates/app/models/decidim/debates/debate.rb
@@ -18,13 +18,14 @@ class Debate < Debates::ApplicationRecord
       include Decidim::HasReference
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
       include Decidim::Endorsable
       include Decidim::Randomable
+      include Decidim::FilterableResource
 
       belongs_to :last_comment_by, polymorphic: true, foreign_type: "last_comment_by_type", optional: true
       component_manifest_name "debates"
@@ -53,6 +54,7 @@ class Debate < Debates::ApplicationRecord
           }
         )
       }
+      scope_search_multi :with_any_state, [:open, :closed]
 
       def self.log_presenter_class_for(_log)
         Decidim::Debates::AdminLog::DebatePresenter
@@ -141,7 +143,7 @@ def allow_resource_permissions?
       end
 
       def self.export_serializer
-        Decidim::Debates::DataPortabilityDebateSerializer
+        Decidim::Debates::DownloadYourDataDebateSerializer
       end
 
       def self.newsletter_participant_ids(component)
@@ -193,6 +195,18 @@ def update_comments_count
       end
       # rubocop:enable Rails/SkipsModelValidations
 
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_state, :with_any_origin, :with_any_category, :with_any_scope]
+      end
+
+      def self.ransack(params = {}, options = {})
+        DebateSearch.new(self, params, options)
+      end
+
       private
 
       def comments_blocked?
diff --git a/decidim-debates/app/serializers/decidim/debates/data_portability_debate_serializer.rb b/decidim-debates/app/serializers/decidim/debates/download_your_data_debate_serializer.rb
similarity index 80%
rename from decidim-debates/app/serializers/decidim/debates/data_portability_debate_serializer.rb
rename to decidim-debates/app/serializers/decidim/debates/download_your_data_debate_serializer.rb
index 5dc2051b0238a..ccefa39cb2190 100644
--- a/decidim-debates/app/serializers/decidim/debates/data_portability_debate_serializer.rb
+++ b/decidim-debates/app/serializers/decidim/debates/download_your_data_debate_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   module Debates
-    class DataPortabilityDebateSerializer < Decidim::Exporters::Serializer
-      # Serializes a Debate for data portability
+    class DownloadYourDataDebateSerializer < Decidim::Exporters::Serializer
+      # Serializes a Debate for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-debates/app/services/decidim/debates/debate_search.rb b/decidim-debates/app/services/decidim/debates/debate_search.rb
index 652dad76da38e..ef90baa035afe 100644
--- a/decidim-debates/app/services/decidim/debates/debate_search.rb
+++ b/decidim-debates/app/services/decidim/debates/debate_search.rb
@@ -2,35 +2,24 @@
 
 module Decidim
   module Debates
-    # This class handles search and filtering of debates. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the debates.
+    # This service scopes the debate searches with parameters that cannot be
+    # passed from the user interface.
     class DebateSearch < ResourceSearch
-      text_search_fields :title, :description
+      attr_reader :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the debates from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of debates to return per page.
-      def initialize(options = {})
-        super(Debate.not_hidden, options)
-      end
+      def build(params)
+        @activity = params[:activity]
 
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "commented"
-          query.commented_by(user)
-        when "my_debates"
-          query.authored_by(user)
-        else # Assume 'all'
-          query
+        if params[:activity] && user
+          case params[:activity]
+          when "commented"
+            add_scope(:commented_by, user)
+          when "my_debates"
+            add_scope(:authored_by, user)
+          end
         end
-      end
 
-      # Handle the state filter
-      def search_state
-        apply_scopes(%w(open closed), state)
+        super
       end
     end
   end
diff --git a/decidim-debates/app/views/decidim/debates/debates/_filters.html.erb b/decidim-debates/app/views/decidim/debates/debates/_filters.html.erb
index b93fb19d302a7..d6c38f9955d6c 100644
--- a/decidim-debates/app/views/decidim/debates/debates/_filters.html.erb
+++ b/decidim-debates/app/views/decidim/debates/debates/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="debates">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,17 +14,17 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
+  <%= form.check_boxes_tree :with_any_state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
   <% end %>
 
   <% if current_participatory_space.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "debates" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "debates" %>
   <% end %>
 
-  <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "debates" %>
+  <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "debates" %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "debates" %>
diff --git a/decidim-debates/config/locales/ar.yml b/decidim-debates/config/locales/ar.yml
index 53128b493060b..8b91cca285059 100644
--- a/decidim-debates/config/locales/ar.yml
+++ b/decidim-debates/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -87,10 +88,10 @@ ar:
           all: الكل
           category: ال�ئة
           category_prompt: اختر تصني�
-          citizens: المواطنين
           my_debates: مناقشاتي
           official: الرسمية
           origin: الأصل
+          participants: المشاركون
           search: بحث
           user_groups: ال��رَق
         filters_small_view:
diff --git a/decidim-debates/config/locales/bg.yml b/decidim-debates/config/locales/bg.yml
index cbb2427afd427..c35150fd990e4 100644
--- a/decidim-debates/config/locales/bg.yml
+++ b/decidim-debates/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-debates/config/locales/ca.yml b/decidim-debates/config/locales/ca.yml
index 5cfba5bb4957a..e5001d66039f9 100644
--- a/decidim-debates/config/locales/ca.yml
+++ b/decidim-debates/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -48,7 +49,7 @@ ca:
     debates:
       actions:
         close: Tanca
-        confirm_destroy: N'estàs segura?
+        confirm_destroy: Segur?
         destroy: Suprimeix
         edit: Edita
         new: Nou %{name}
@@ -118,11 +119,11 @@ ca:
           all: Tots
           category: Categoria
           category_prompt: Selecciona una categoria
-          citizens: Ciutadania
           commented: Comentat
           my_debates: Els meus debats
           official: Oficial
           origin: Origen
+          participants: Participants
           scope: Àmbit
           search: Cerca
           state: Estat
diff --git a/decidim-debates/config/locales/cs.yml b/decidim-debates/config/locales/cs.yml
index 8a0e2498ea538..f439bc600818b 100644
--- a/decidim-debates/config/locales/cs.yml
+++ b/decidim-debates/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -122,11 +123,11 @@ cs:
           all: VÅ¡e
           category: Kategorie
           category_prompt: Vyberte kategorii
-          citizens: Ob�ané
           commented: Okomentováno
           my_debates: Moje rozpravy
           official: Oficiální
           origin: Původ
+          participants: Ú�astníci
           scope: Oblast působnosti
           search: Hledat
           state: Stav
diff --git a/decidim-debates/config/locales/de.yml b/decidim-debates/config/locales/de.yml
index 7b1a10f4348ae..dedebf62f42e3 100644
--- a/decidim-debates/config/locales/de.yml
+++ b/decidim-debates/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -117,11 +118,11 @@ de:
           all: Alle
           category: Kategorie
           category_prompt: Wählen Sie eine Kategorie
-          citizens: Einzelpersonen
           commented: Kommentiert
           my_debates: Meine Debatten
           official: Offiziell
           origin: Ursprung
+          participants: Teilnehmer
           scope: Bereich
           search: Suche
           state: Status
diff --git a/decidim-debates/config/locales/el.yml b/decidim-debates/config/locales/el.yml
index 200bd06762888..dea1d6932491a 100644
--- a/decidim-debates/config/locales/el.yml
+++ b/decidim-debates/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -78,7 +79,6 @@ el:
           all: Όλα
           category: Κατηγο�ία
           category_prompt: Επιλέξτε μια κατηγο�ία
-          citizens: Πολίτες
           official: Επίσημη
           origin: Π�οέλευση
           search: Αναζήτηση
diff --git a/decidim-debates/config/locales/en.yml b/decidim-debates/config/locales/en.yml
index c2c1775f6c254..1a899157f8fa9 100644
--- a/decidim-debates/config/locales/en.yml
+++ b/decidim-debates/config/locales/en.yml
@@ -119,11 +119,11 @@ en:
           all: All
           category: Category
           category_prompt: Select a category
-          citizens: Citizens
           commented: Commented
           my_debates: My debates
           official: Official
           origin: Origin
+          participants: Participants
           scope: Scope
           search: Search
           state: Status
diff --git a/decidim-debates/config/locales/es-MX.yml b/decidim-debates/config/locales/es-MX.yml
index 94c786914ca08..e49825515e524 100644
--- a/decidim-debates/config/locales/es-MX.yml
+++ b/decidim-debates/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -118,11 +119,11 @@ es-MX:
           all: Todos
           category: Categoría
           category_prompt: Selecciona una categoría
-          citizens: Ciudadanía
           commented: Comentado
           my_debates: Mis debates
           official: Oficial
           origin: Origen
+          participants: Participantes
           scope: �mbito
           search: Buscar
           state: Estado
diff --git a/decidim-debates/config/locales/es-PY.yml b/decidim-debates/config/locales/es-PY.yml
index 3762b62ded7e3..94eeab984dc39 100644
--- a/decidim-debates/config/locales/es-PY.yml
+++ b/decidim-debates/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -114,11 +115,11 @@ es-PY:
           all: Todos
           category: Categoría
           category_prompt: Selecciona una categoría
-          citizens: Ciudadanía
           commented: Comentado
           my_debates: Mis debates
           official: Oficial
           origin: Origen
+          participants: Participantes
           scope: �mbito
           search: Buscar
           state: Estado
diff --git a/decidim-debates/config/locales/es.yml b/decidim-debates/config/locales/es.yml
index 9c9afe8c5fc8a..810bc0a31bbe4 100644
--- a/decidim-debates/config/locales/es.yml
+++ b/decidim-debates/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -118,11 +119,11 @@ es:
           all: Todos
           category: Categoría
           category_prompt: Selecciona una categoría
-          citizens: Ciudadanía
           commented: Comentado
           my_debates: Mis debates
           official: Oficial
           origin: Origen
+          participants: Participantes
           scope: �mbito
           search: Buscar
           state: Estado
diff --git a/decidim-debates/config/locales/eu.yml b/decidim-debates/config/locales/eu.yml
index d82b28c89b742..8f687fcb731bb 100644
--- a/decidim-debates/config/locales/eu.yml
+++ b/decidim-debates/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -6,22 +7,24 @@ eu:
         closed_at: Amaiera-data
         conclusions: Ondorioak
         decidim_category_id: Kategoria
-        description: deskribapena
-        end_time: Amaitzen du
+        description: Deskribapena
+        end_time: Bukaera-data
         information_updates: Informazioaren eguneratzeak
         instructions: Parte hartzeko argibideak
+        scope_id: Eremua
         start_time: Hasi da
         title: Izenburua
         user_group_id: Sortu eztabaida gisa
     models:
       decidim/debates/close_debate_event: Eztabaida itxita
-      decidim/debates/create_debate_event: Debate
-      decidim/debates/creation_disabled_event: Debateak desgaituta daude
+      decidim/debates/create_debate_event: Eztabaida
+      decidim/debates/creation_disabled_event: Eztabaidak desgaituta daude
+      decidim/debates/creation_enabled_event: Eztabaidak sortzea gaituta
   activerecord:
     models:
       decidim/debates/debate:
-        one: Debate
-        other: eztabaidak
+        one: Eztabaida
+        other: Eztabaidak
   decidim:
     components:
       debates:
@@ -29,24 +32,25 @@ eu:
           comment: Iruzkina
           create: Sortu
           endorse: Atxiki
-        name: eztabaidak
+        name: Eztabaidak
         settings:
           global:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 defektuz)
+            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eutsi nahi badiozu)
             scope_id: Eremua
             scopes_enabled: Esparruak gaituta
           step:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_blocked: Iruzkinak blokeatuta
+            creation_enabled: Parte-hartzaileek eztabaidak sor ditzakete
             endorsements_blocked: Atxikimenduak blokeatuta
             endorsements_enabled: Atxikimenduak gaituta
     debates:
       actions:
         close: Itxi
         confirm_destroy: Ziur zaude?
-        destroy: ezabatu
+        destroy: Ezabatu
         edit: Editatu
         new: '%{name} berria'
         title: Ekintzak
@@ -57,10 +61,10 @@ eu:
             title: Itxi eztabaida
         debates:
           create:
-            invalid: Arazo bat izan da eztabaida sortzen ari den bitartean.
-            success: Debate sortu da behar bezala.
+            invalid: Arazo bat gertatu da eztabaida sortzean.
+            success: Eztabaida zuzen sortu da.
           destroy:
-            success: Debata zuzen ezabatu da.
+            success: Eztabaida zuzen ezabatu da.
           edit:
             title: Editatu eztabaida
             update: Eguneratu eztabaida
@@ -115,11 +119,11 @@ eu:
           all: guztiak
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
-          citizens: Hiritarrak
           commented: Iruzkina eginda
           my_debates: Nire eztabaidak
           official: Ofiziala
           origin: Origin
+          participants: Parte-hartzaileak
           scope: Eremua
           search: Search
           state: Egoera
diff --git a/decidim-debates/config/locales/fi-plain.yml b/decidim-debates/config/locales/fi-plain.yml
index a62716715abe4..dd2797a7702f4 100644
--- a/decidim-debates/config/locales/fi-plain.yml
+++ b/decidim-debates/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -118,11 +119,11 @@ fi-pl:
           all: Kaikki
           category: Aihepiiri
           category_prompt: Valitse aihepiiri
-          citizens: Kansalaiset
           commented: Kommentoitu
           my_debates: Omat keskustelut
           official: Virallinen
           origin: Alkuperä
+          participants: Osallistujat
           scope: Teema
           search: Hae
           state: Tila
diff --git a/decidim-debates/config/locales/fi.yml b/decidim-debates/config/locales/fi.yml
index 8cfdf31e6b871..d489f5b0fe28c 100644
--- a/decidim-debates/config/locales/fi.yml
+++ b/decidim-debates/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -10,6 +11,7 @@ fi:
         end_time: Päättymisaika
         information_updates: Tietojen päivitykset
         instructions: Osallistumisohjeet
+        scope_id: Teema
         start_time: Alkamisaika
         title: Otsikko
         user_group_id: Luo keskustelu käyttäjänä
@@ -117,11 +119,11 @@ fi:
           all: Kaikki
           category: Aihepiiri
           category_prompt: Valitse aihepiiri
-          citizens: Kansalaiset
           commented: Kommentoitu
           my_debates: Omat keskustelut
           official: Virallinen
           origin: Alkuperä
+          participants: Osallistujat
           scope: Teema
           search: Hae
           state: Tila
diff --git a/decidim-debates/config/locales/fr-CA.yml b/decidim-debates/config/locales/fr-CA.yml
index 9a761da346b7f..79c72110c2aa1 100644
--- a/decidim-debates/config/locales/fr-CA.yml
+++ b/decidim-debates/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -10,7 +11,7 @@ fr-CA:
         end_time: Prend fin à
         information_updates: Informations mises à jour
         instructions: Instructions pour participer
-        scope_id: Périmètre d'application
+        scope_id: Secteur
         start_time: Commence à
         title: Titre
         user_group_id: Créer un débat en tant que
@@ -118,11 +119,11 @@ fr-CA:
           all: Tout
           category: Catégorie
           category_prompt: Choisir une catégorie
-          citizens: Citoyenne
           commented: Commenté
           my_debates: Mes débats
           official: Officielle
           origin: Origine
+          participants: Participants
           scope: Périmètre d'application
           search: Rechercher
           state: Statut
diff --git a/decidim-debates/config/locales/fr.yml b/decidim-debates/config/locales/fr.yml
index 1cef9934b50bc..577efcea788c6 100644
--- a/decidim-debates/config/locales/fr.yml
+++ b/decidim-debates/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -10,7 +11,7 @@ fr:
         end_time: Prend fin à
         information_updates: Informations mises à jour
         instructions: Instructions pour participer
-        scope_id: Périmètre d'application
+        scope_id: Secteur
         start_time: Commence à
         title: Titre
         user_group_id: Créer un débat en tant que
@@ -118,11 +119,11 @@ fr:
           all: Tout
           category: Catégorie
           category_prompt: Choisir une catégorie
-          citizens: Citoyenne
           commented: Commenté
           my_debates: Mes débats
           official: Officielle
           origin: Origine
+          participants: Participants
           scope: Secteur
           search: Rechercher
           state: Statut
diff --git a/decidim-debates/config/locales/ga-IE.yml b/decidim-debates/config/locales/ga-IE.yml
index a9a05fd96c597..ba3b251b1a554 100644
--- a/decidim-debates/config/locales/ga-IE.yml
+++ b/decidim-debates/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -47,7 +48,6 @@ ga:
           all: Uile
           category: Catagóir
           category_prompt: Roghnaigh catagóir
-          citizens: Saoránaigh
           official: Oifigiúil
           origin: Bunús
           scope: Scóip
diff --git a/decidim-debates/config/locales/gl.yml b/decidim-debates/config/locales/gl.yml
index 8b7463facd1e1..8c4bd80c31d1f 100644
--- a/decidim-debates/config/locales/gl.yml
+++ b/decidim-debates/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -80,9 +81,9 @@ gl:
           all: Todo
           category: Categoría
           category_prompt: Selecciona unha categoría
-          citizens: Cidadáns
           official: Oficial
           origin: Orixe
+          participants: Participantes
           search: Busca
         filters_small_view:
           close_modal: Pechar modal
diff --git a/decidim-debates/config/locales/hu.yml b/decidim-debates/config/locales/hu.yml
index ba92409a8eb81..d11420b8f032a 100644
--- a/decidim-debates/config/locales/hu.yml
+++ b/decidim-debates/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -117,11 +118,11 @@ hu:
           all: Összes
           category: Kategória
           category_prompt: Válassz kategóriát
-          citizens: �llampolgárok
           commented: Hozzászólással rendelkezik
           my_debates: Vitáim
           official: Hivatalos
           origin: Kiindulópont
+          participants: Résztvevők
           scope: Hatókör
           search: Keresés
           state: �llapot
diff --git a/decidim-debates/config/locales/id-ID.yml b/decidim-debates/config/locales/id-ID.yml
index 3ccb83fc5b677..e776e6c137367 100644
--- a/decidim-debates/config/locales/id-ID.yml
+++ b/decidim-debates/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ id:
           all: Semua
           category: Kategori
           category_prompt: Pilih Kategori
-          citizens: Warga
           official: Resmi
           origin: Asal
           search: Pencarian
diff --git a/decidim-debates/config/locales/is-IS.yml b/decidim-debates/config/locales/is-IS.yml
index 92a334a19c47d..a3392af16f034 100644
--- a/decidim-debates/config/locales/is-IS.yml
+++ b/decidim-debates/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       debate:
@@ -59,7 +60,6 @@ is-IS:
           all: Allt
           category: Flokkur
           category_prompt: Veldu flokk
-          citizens: Borgarar
           official: Opinber
           origin: Uppruni
           search: Leita
diff --git a/decidim-debates/config/locales/it.yml b/decidim-debates/config/locales/it.yml
index b9eb753b3a1b5..aa07a802f9e66 100644
--- a/decidim-debates/config/locales/it.yml
+++ b/decidim-debates/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -117,11 +118,11 @@ it:
           all: Tutti
           category: Categoria
           category_prompt: Seleziona una categoria
-          citizens: Cittadini
           commented: Commentato
           my_debates: I miei dibattiti
           official: Ufficiale
           origin: Origine
+          participants: Partecipanti
           scope: Ambito
           search: Ricerca
           state: Stato
diff --git a/decidim-debates/config/locales/ja.yml b/decidim-debates/config/locales/ja.yml
index c00cb6e2304ad..aa6bbb9466c67 100644
--- a/decidim-debates/config/locales/ja.yml
+++ b/decidim-debates/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -116,11 +117,11 @@ ja:
           all: ���
           category: カテゴリ
           category_prompt: カテゴリを�択
-          citizens: 一般�加者
           commented: 'コメント:'
           my_debates: ��議論
           official: 事務局
           origin: 起案者：
+          participants: �加者
           scope: スコープ
           search: 検索
           state: ステータス
diff --git a/decidim-debates/config/locales/ka-GE.yml b/decidim-debates/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-debates/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-debates/config/locales/lb.yml b/decidim-debates/config/locales/lb.yml
index eb84a473de9fb..efa05974570c1 100644
--- a/decidim-debates/config/locales/lb.yml
+++ b/decidim-debates/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
diff --git a/decidim-debates/config/locales/lt.yml b/decidim-debates/config/locales/lt.yml
index 7568ae17f9b90..4eeb5379e60d5 100644
--- a/decidim-debates/config/locales/lt.yml
+++ b/decidim-debates/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -121,11 +122,11 @@ lt:
           all: Visos
           category: Kategorija
           category_prompt: Pasirinkite kategorijÄ…
-          citizens: Pilie�iai
           commented: Komentuota
           my_debates: Mano diskusijos
           official: Oficialūs
           origin: KilmÄ—
+          participants: Dalyviai
           scope: Apimtis
           search: Ieškoti
           state: BÅ«sena
diff --git a/decidim-debates/config/locales/lv.yml b/decidim-debates/config/locales/lv.yml
index bde46de4efcb2..ea3710175c188 100644
--- a/decidim-debates/config/locales/lv.yml
+++ b/decidim-debates/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -66,7 +67,6 @@ lv:
           all: Visi
           category: Kategorija
           category_prompt: Izvēlieties kategoriju
-          citizens: Pilsoņi
           official: Ofici�l�
           origin: Izcelsme
           search: Meklēt
diff --git a/decidim-debates/config/locales/nl.yml b/decidim-debates/config/locales/nl.yml
index a3c0c29f238ec..bb92b00bbf4ca 100644
--- a/decidim-debates/config/locales/nl.yml
+++ b/decidim-debates/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -101,11 +102,11 @@ nl:
           all: Alle
           category: Categorie
           category_prompt: Selecteer een categorie
-          citizens: Burgers
           commented: Reactie
           my_debates: Mijn debatten
           official: Officieel
           origin: Oorsprong
+          participants: Deelnemers
           scope: Scope
           search: Zoeken
           state: Status
diff --git a/decidim-debates/config/locales/no.yml b/decidim-debates/config/locales/no.yml
index a587333467842..d5ae0bbbc4227 100644
--- a/decidim-debates/config/locales/no.yml
+++ b/decidim-debates/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -117,11 +118,11 @@
           all: Alle
           category: Kategori
           category_prompt: Velg en kategori
-          citizens: Innbyggere
           commented: Kommentert
           my_debates: Mine debatter
           official: Offentlig
           origin: Opprinnelse
+          participants: Deltakere
           scope: Tema
           search: Søk
           state: Status
diff --git a/decidim-debates/config/locales/pl.yml b/decidim-debates/config/locales/pl.yml
index a0a323c45a784..62afea94c4db8 100644
--- a/decidim-debates/config/locales/pl.yml
+++ b/decidim-debates/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -119,7 +120,6 @@ pl:
           all: Wszystkie
           category: Kategoria
           category_prompt: Wybierz kategoriÄ™
-          citizens: Obywatele
           commented: Skomentowano
           my_debates: Moje debaty
           official: Urzędnik
diff --git a/decidim-debates/config/locales/pt-BR.yml b/decidim-debates/config/locales/pt-BR.yml
index b23f900aa5622..cfddfd8da7b2b 100644
--- a/decidim-debates/config/locales/pt-BR.yml
+++ b/decidim-debates/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -114,7 +115,6 @@ pt-BR:
           all: Todos
           category: Categoria
           category_prompt: Selecione uma categoria
-          citizens: Cidadãos
           commented: Comentado
           my_debates: Meus debates
           official: Oficial
diff --git a/decidim-debates/config/locales/pt.yml b/decidim-debates/config/locales/pt.yml
index 0f76fae76913d..5a5e88d32e6e5 100644
--- a/decidim-debates/config/locales/pt.yml
+++ b/decidim-debates/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -115,7 +116,6 @@ pt:
           all: Todos
           category: Categoria
           category_prompt: Selecione uma categoria
-          citizens: Cidadãos
           commented: Comentários
           my_debates: Os meus debates
           official: Oficial
diff --git a/decidim-debates/config/locales/ro-RO.yml b/decidim-debates/config/locales/ro-RO.yml
index 369e28e1dc6f0..8d228172dd1ef 100644
--- a/decidim-debates/config/locales/ro-RO.yml
+++ b/decidim-debates/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -10,6 +11,7 @@ ro:
         end_time: Se termină la
         information_updates: Actualizări informații
         instructions: Instrucţiuni de participare
+        scope_id: Domeniu de interes
         start_time: ÃŽncepe la
         title: Titlu
         user_group_id: Creați o dezbatere în calitate de
@@ -119,11 +121,11 @@ ro:
           all: Toate
           category: Categorie
           category_prompt: Selectați o categorie
-          citizens: Cetățeni
           commented: Comentat
           my_debates: Dezbaterile mele
           official: Oficial
           origin: Origine
+          participants: Participanți
           scope: Domeniu de interes
           search: Caută
           state: Stare
diff --git a/decidim-debates/config/locales/ru.yml b/decidim-debates/config/locales/ru.yml
index 8fa4bf6b04b9d..6afcf760d9ce7 100644
--- a/decidim-debates/config/locales/ru.yml
+++ b/decidim-debates/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -82,7 +83,6 @@ ru:
           all: В�е
           category: Категори�
           category_prompt: Выберите категорию
-          citizens: Граждане
           official: Служебные
           origin: И�точник
           search: Пои�к
diff --git a/decidim-debates/config/locales/sk.yml b/decidim-debates/config/locales/sk.yml
index 452b54dd36b86..d168478361add 100644
--- a/decidim-debates/config/locales/sk.yml
+++ b/decidim-debates/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -82,7 +83,6 @@ sk:
           all: VÅ¡etko
           category: Kategória
           category_prompt: Vyberte kategóriu
-          citizens: Ob�ania
           official: Oficiálni
           origin: Pôvod
           search: Vyhľadávanie
diff --git a/decidim-debates/config/locales/sl.yml b/decidim-debates/config/locales/sl.yml
index 5db1c192e5a93..975719b0e3788 100644
--- a/decidim-debates/config/locales/sl.yml
+++ b/decidim-debates/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-debates/config/locales/sr-CS.yml b/decidim-debates/config/locales/sr-CS.yml
index a51c7ba36e0c3..6121b6bed807c 100644
--- a/decidim-debates/config/locales/sr-CS.yml
+++ b/decidim-debates/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     debates:
diff --git a/decidim-debates/config/locales/sv.yml b/decidim-debates/config/locales/sv.yml
index af037c0ed2d84..f2781860e6cd0 100644
--- a/decidim-debates/config/locales/sv.yml
+++ b/decidim-debates/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -10,6 +11,7 @@ sv:
         end_time: Slutar vid
         information_updates: Informationsuppdateringar
         instructions: Deltagaranvisningar
+        scope_id: Omfång
         start_time: Börjar vid
         title: Titel
         user_group_id: Skapa debatt som
@@ -115,11 +117,11 @@ sv:
           all: Alla
           category: Kategori
           category_prompt: Välj en kategori
-          citizens: Medborgare
           commented: Kommenterade
           my_debates: Mina debatter
           official: Officiell
           origin: Ursprung
+          participants: Deltagare
           scope: Omfång
           search: Sök
           state: Status
diff --git a/decidim-debates/config/locales/tr-TR.yml b/decidim-debates/config/locales/tr-TR.yml
index 903c1170b3cb6..086ddfdf011f0 100644
--- a/decidim-debates/config/locales/tr-TR.yml
+++ b/decidim-debates/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -114,7 +115,6 @@ tr:
           all: Tümü
           category: Kategori
           category_prompt: Bir kategori seç
-          citizens: VatandaÅŸlar
           commented: Yorum yaptı
           my_debates: Tartışmalarım
           official: Resmi
diff --git a/decidim-debates/config/locales/uk.yml b/decidim-debates/config/locales/uk.yml
index 8303818033c5a..e2189aa2a6f79 100644
--- a/decidim-debates/config/locales/uk.yml
+++ b/decidim-debates/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -82,7 +83,6 @@ uk:
           all: У�і
           category: Категорі�
           category_prompt: Оберіть категорію
-          citizens: Громад�ни
           official: Службове
           origin: Джерело
           search: Шукати
diff --git a/decidim-debates/config/locales/zh-CN.yml b/decidim-debates/config/locales/zh-CN.yml
index 7939e0f24c28a..bc09847cdd215 100644
--- a/decidim-debates/config/locales/zh-CN.yml
+++ b/decidim-debates/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -106,7 +107,6 @@ zh-CN:
           all: 所有的
           category: 类别
           category_prompt: 选择一个类别
-          citizens: Citizens
           commented: 已评论
           my_debates: 我的辩论
           official: 官方的
diff --git a/decidim-debates/db/migrate/20181016132850_add_organization_as_author_to_debates.rb b/decidim-debates/db/migrate/20181016132850_add_organization_as_author_to_debates.rb
index 23c04d52aee20..66c56a7e1ea16 100644
--- a/decidim-debates/db/migrate/20181016132850_add_organization_as_author_to_debates.rb
+++ b/decidim-debates/db/migrate/20181016132850_add_organization_as_author_to_debates.rb
@@ -5,9 +5,11 @@ class Debate < ApplicationRecord
     self.table_name = :decidim_debates_debates
     include Decidim::HasComponent
   end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
   end
+
   def change
     add_column :decidim_debates_debates, :decidim_author_type, :string
 
diff --git a/decidim-debates/decidim-debates.gemspec b/decidim-debates/decidim-debates.gemspec
index a362682488bd5..840e060382217 100644
--- a/decidim-debates/decidim-debates.gemspec
+++ b/decidim-debates/decidim-debates.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "genis.matutes@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-debates"
   s.summary = "Decidim debates module"
diff --git a/decidim-debates/lib/decidim/debates/test/factories.rb b/decidim-debates/lib/decidim/debates/test/factories.rb
index aae2ffa539e09..c36d64fb9304c 100644
--- a/decidim-debates/lib/decidim/debates/test/factories.rb
+++ b/decidim-debates/lib/decidim/debates/test/factories.rb
@@ -28,7 +28,7 @@ def generate_localized_debate_title
       end_time { 1.day.from_now }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       start_time { nil }
       end_time { nil }
       author do
diff --git a/decidim-debates/lib/decidim/debates/version.rb b/decidim-debates/lib/decidim/debates/version.rb
index 138a3a6d5cc41..a1d3a5d466f0a 100644
--- a/decidim-debates/lib/decidim/debates/version.rb
+++ b/decidim-debates/lib/decidim/debates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
index 8a79b4e6c7ce6..8371a8ebb3808 100644
--- a/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/admin/create_debate_spec.rb
@@ -44,7 +44,7 @@
     let(:debate) { Decidim::Debates::Debate.last }
 
     it "creates the debate" do
-      expect { subject.call }.to change { Decidim::Debates::Debate.count }.by(1)
+      expect { subject.call }.to change(Decidim::Debates::Debate, :count).by(1)
     end
 
     context "when debate is open" do
diff --git a/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
index 7e1964b4ac2e0..799d5228cca6f 100644
--- a/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/create_debate_spec.rb
@@ -38,7 +38,7 @@
     let(:debate) { Decidim::Debates::Debate.last }
 
     it "creates the debate" do
-      expect { subject.call }.to change { Decidim::Debates::Debate.count }.by(1)
+      expect { subject.call }.to change(Decidim::Debates::Debate, :count).by(1)
     end
 
     it "sets the scope" do
diff --git a/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb b/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
index abe11cfb457a4..b82df2e6be4a1 100644
--- a/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
+++ b/decidim-debates/spec/commands/decidim/debates/update_debate_spec.rb
@@ -11,14 +11,15 @@
   let(:scope) { create :scope, organization: organization }
   let(:category) { create :category, participatory_space: participatory_process }
   let(:user) { create :user, organization: organization }
-  let!(:debate) { create :debate, author: user, component: current_component }
+  let(:author) { user }
+  let!(:debate) { create :debate, author: author, component: current_component }
   let(:form) do
     Decidim::Debates::DebateForm.from_params(
       title: "title",
       description: "description",
       scope_id: scope.id,
       category_id: category.id,
-      debate: debate
+      id: debate.id
     ).with_context(
       current_organization: organization,
       current_participatory_space: current_component.participatory_space,
@@ -29,7 +30,7 @@
 
   describe "when the form is not valid" do
     before do
-      expect(form).to receive(:invalid?).and_return(true)
+      allow(form).to receive(:invalid?).and_return(true)
     end
 
     it "broadcasts invalid" do
@@ -39,14 +40,13 @@
     it "doesn't update the debate" do
       expect do
         subject.call
+        debate.reload
       end.not_to change(debate, :title)
     end
   end
 
   describe "when the debate is not editable by the user" do
-    before do
-      expect(debate).to receive(:editable_by?).and_return(false)
-    end
+    let(:author) { create :user, organization: organization }
 
     it "broadcasts invalid" do
       expect { subject.call }.to broadcast(:invalid)
@@ -55,32 +55,40 @@
     it "doesn't update the debate" do
       expect do
         subject.call
+        debate.reload
       end.not_to change(debate, :title)
     end
   end
 
   context "when everything is ok" do
     it "updates the debate" do
-      expect { subject.call }.to change(debate, :title)
+      expect do
+        subject.call
+        debate.reload
+      end.to change(debate, :title)
     end
 
     it "sets the scope" do
       subject.call
+      debate.reload
       expect(debate.scope).to eq scope
     end
 
     it "sets the category" do
       subject.call
+      debate.reload
       expect(debate.category).to eq category
     end
 
     it "sets the title with i18n" do
       subject.call
+      debate.reload
       expect(debate.title.except("machine_translations").values.uniq).to eq ["title"]
     end
 
     it "sets the description with i18n" do
       subject.call
+      debate.reload
       expect(debate.description.except("machine_translations").values.uniq).to eq ["description"]
     end
 
diff --git a/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb b/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
index 06e77cc4e1467..3081ed0462c88 100644
--- a/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
+++ b/decidim-debates/spec/events/decidim/debates/create_debate_event_spec.rb
@@ -7,7 +7,7 @@
 
   include_context "when a simple event"
 
-  let(:resource) { create :debate, :citizen_author, title: { en: "It's my debate" } }
+  let(:resource) { create :debate, :participant_author, title: { en: "It's my debate" } }
   let(:space) { resource.participatory_space }
   let(:event_name) { "decidim.events.debates.debate_created" }
   let(:space_path) { resource_locator(space).path }
@@ -82,7 +82,7 @@
       it "is generated correctly" do
         expect(subject.email_outro)
           .to eq("You have received this notification because you are following the #{translated(space.title)} participatory space. " \
-          "You can stop receiving notifications following the previous link.")
+                 "You can stop receiving notifications following the previous link.")
       end
     end
 
diff --git a/decidim-debates/spec/forms/decidim/debates/admin/close_debate_form_spec.rb b/decidim-debates/spec/forms/decidim/debates/admin/close_debate_form_spec.rb
index 007cc9388cb4d..98f78956b7445 100644
--- a/decidim-debates/spec/forms/decidim/debates/admin/close_debate_form_spec.rb
+++ b/decidim-debates/spec/forms/decidim/debates/admin/close_debate_form_spec.rb
@@ -17,7 +17,7 @@
   let(:conclusions) { Decidim::Faker::Localized.localized { "We found a conlcusion." } }
   let(:attributes) do
     {
-      debate: debate,
+      id: debate.id,
       conclusions: conclusions
     }
   end
diff --git a/decidim-debates/spec/forms/decidim/debates/close_debate_form_spec.rb b/decidim-debates/spec/forms/decidim/debates/close_debate_form_spec.rb
index 7f113285f3a74..d4ba24d4496a7 100644
--- a/decidim-debates/spec/forms/decidim/debates/close_debate_form_spec.rb
+++ b/decidim-debates/spec/forms/decidim/debates/close_debate_form_spec.rb
@@ -14,11 +14,11 @@
       current_user: user
     }
   end
-  let(:debate) { create :debate, :citizen_author, component: current_component, author: user }
+  let(:debate) { create :debate, :participant_author, component: current_component, author: user }
   let(:conclusions) { "We found a conlcusion." }
   let(:attributes) do
     {
-      debate: debate,
+      id: debate.id,
       conclusions: conclusions
     }
   end
diff --git a/decidim-debates/spec/lib/commented_debates_badge_spec.rb b/decidim-debates/spec/lib/commented_debates_badge_spec.rb
index a3331fb036cff..664e015da0ae1 100644
--- a/decidim-debates/spec/lib/commented_debates_badge_spec.rb
+++ b/decidim-debates/spec/lib/commented_debates_badge_spec.rb
@@ -12,7 +12,7 @@
     let!(:other_comment) { create(:comment, author: user2, commentable: debate, root_commentable: debate) }
 
     context "when creating the first comment" do
-      it "increses a user's score " do
+      it "increses a user's score" do
         comment = create(:comment, author: user, commentable: debate, root_commentable: debate)
         Decidim::Comments::CommentCreation.publish(comment, {})
         expect(Decidim::Gamification.status_for(user, :commented_debates).score).to eq(1)
diff --git a/decidim-debates/spec/models/decidim/debates/debate_spec.rb b/decidim-debates/spec/models/decidim/debates/debate_spec.rb
index 5c5450b5eef42..dd5c61f6cf65b 100644
--- a/decidim-debates/spec/models/decidim/debates/debate_spec.rb
+++ b/decidim-debates/spec/models/decidim/debates/debate_spec.rb
@@ -40,7 +40,7 @@
     end
 
     context "when author is set" do
-      let(:debate) { build :debate, :citizen_author }
+      let(:debate) { build :debate, :participant_author }
 
       it { is_expected.not_to be_official }
     end
@@ -108,7 +108,7 @@
     end
 
     context "when comments are enabled" do
-      let(:debate) { build :debate, :citizen_author }
+      let(:debate) { build :debate, :participant_author }
 
       before do
         allow(debate).to receive(:commentable?).and_return(true)
@@ -134,7 +134,7 @@
     end
 
     context "when the debate has been closed" do
-      let(:debate) { build :debate, :citizen_author, :closed }
+      let(:debate) { build :debate, :participant_author, :closed }
 
       it { is_expected.to be_falsey }
     end
diff --git a/decidim-debates/spec/permissions/decidim/debates/admin/permissions_spec.rb b/decidim-debates/spec/permissions/decidim/debates/admin/permissions_spec.rb
index 7571540a755d3..24041cb8673dd 100644
--- a/decidim-debates/spec/permissions/decidim/debates/admin/permissions_spec.rb
+++ b/decidim-debates/spec/permissions/decidim/debates/admin/permissions_spec.rb
@@ -14,7 +14,7 @@
   end
   let(:debates_component) { create :debates_component }
   let(:debate) { create :debate, component: debates_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is not admin" do
     let(:action) do
@@ -30,7 +30,7 @@
         { scope: :admin, action: :export, subject: :comments }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when subject is anything else" do
@@ -55,7 +55,7 @@
       { scope: :admin, action: :create, subject: :debate }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "debate update" do
@@ -64,13 +64,13 @@
     end
 
     context "when the debate is official" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when debate is not official" do
       let(:debate) { create :debate, author: user, component: debates_component }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -80,13 +80,13 @@
     end
 
     context "when the debate is official" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when debate is not official" do
       let(:debate) { create :debate, author: user, component: debates_component }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 end
diff --git a/decidim-debates/spec/permissions/decidim/debates/permissions_spec.rb b/decidim-debates/spec/permissions/decidim/debates/permissions_spec.rb
index 31ae4123a933d..9f75483ff20f3 100644
--- a/decidim-debates/spec/permissions/decidim/debates/permissions_spec.rb
+++ b/decidim-debates/spec/permissions/decidim/debates/permissions_spec.rb
@@ -25,7 +25,7 @@
     }
   end
   let(:extra_settings) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
@@ -59,13 +59,13 @@
     context "when creation is disabled" do
       let(:extra_settings) { { creation_enabled?: false } }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user is authorized" do
       let(:extra_settings) { { creation_enabled?: true } }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -77,11 +77,11 @@
     context "when the user is the author" do
       let(:debate) { create :debate, author: user, component: debates_component }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when the user is not the author" do
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -90,7 +90,7 @@
       { scope: :public, action: :report, subject: :debate }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when endorsing a debate" do
@@ -98,12 +98,12 @@
       { scope: :public, action: :endorse, subject: :debate }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     context "when the debate is closed" do
       let(:debate) { create :debate, :closed, component: debates_component }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 end
diff --git a/decidim-debates/spec/queries/decidim/debates/metrics/debate_followers_metric_measure_spec.rb b/decidim-debates/spec/queries/decidim/debates/metrics/debate_followers_metric_measure_spec.rb
index 29d11e1c93212..ad6dea046e794 100644
--- a/decidim-debates/spec/queries/decidim/debates/metrics/debate_followers_metric_measure_spec.rb
+++ b/decidim-debates/spec/queries/decidim/debates/metrics/debate_followers_metric_measure_spec.rb
@@ -8,7 +8,7 @@
   let(:not_valid_resource) { create(:dummy_resource) }
   let(:participatory_space) { create(:participatory_process, :with_steps, organization: organization) }
   let(:debates_component) { create(:debates_component, :published, participatory_space: participatory_space) }
-  let(:debate) { create(:debate, :citizen_author, component: debates_component, created_at: day) }
+  let(:debate) { create(:debate, :participant_author, component: debates_component, created_at: day) }
   let!(:follows) { create_list(:follow, 5, followable: debate, created_at: day) }
   let!(:old_follows) { create_list(:follow, 5, followable: debate, created_at: day - 1.week) }
 
diff --git a/decidim-debates/spec/queries/decidim/debates/metrics/debate_participants_metric_measure_spec.rb b/decidim-debates/spec/queries/decidim/debates/metrics/debate_participants_metric_measure_spec.rb
index 256728e67e4be..bbad944c23ba4 100644
--- a/decidim-debates/spec/queries/decidim/debates/metrics/debate_participants_metric_measure_spec.rb
+++ b/decidim-debates/spec/queries/decidim/debates/metrics/debate_participants_metric_measure_spec.rb
@@ -8,8 +8,8 @@
   let(:not_valid_resource) { create(:dummy_resource) }
   let(:participatory_space) { create(:participatory_process, :with_steps, organization: organization) }
   let(:debates_component) { create(:debates_component, :published, participatory_space: participatory_space) }
-  let!(:debates) { create_list(:debate, 5, :citizen_author, component: debates_component, created_at: day) }
-  let!(:old_debates) { create_list(:debate, 5, :citizen_author, component: debates_component, created_at: day - 1.week) }
+  let!(:debates) { create_list(:debate, 5, :participant_author, component: debates_component, created_at: day) }
+  let!(:old_debates) { create_list(:debate, 5, :participant_author, component: debates_component, created_at: day - 1.week) }
   # TOTAL Participants for Debates:
   #  Cumulative: 10
   #  Quantity: 5
diff --git a/decidim-debates/spec/requests/debate_search_spec.rb b/decidim-debates/spec/requests/debate_search_spec.rb
new file mode 100644
index 0000000000000..9cbb64f1487ba
--- /dev/null
+++ b/decidim-debates/spec/requests/debate_search_spec.rb
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Debate search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :debates_component }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:debate1) do
+    create(
+      :debate,
+      :official,
+      component: component,
+      start_time: 1.day.from_now
+    )
+  end
+  let!(:debate2) do
+    create(
+      :debate,
+      :official,
+      component: component,
+      start_time: 2.days.from_now
+    )
+  end
+  let!(:debate3) do
+    create(
+      :debate,
+      :official,
+      :closed,
+      component: component
+    )
+  end
+  let!(:debate4) do
+    create(
+      :debate,
+      :user_group_author,
+      component: component
+    )
+  end
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).debates_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :debate
+  it_behaves_like "a resource search with scopes", :debate
+  it_behaves_like "a resource search with categories", :debate
+  it_behaves_like "a resource search with origin", :debate
+
+  it "displays all debates without any filters" do
+    expect(subject).to have_escaped_html(translated(debate1.title))
+    expect(subject).to have_escaped_html(translated(debate2.title))
+    expect(subject).to have_escaped_html(translated(debate3.title))
+    expect(subject).to have_escaped_html(translated(debate4.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: search_text } }
+    let(:search_text) { "doggo" }
+
+    let!(:debate1) do
+      create(
+        :debate,
+        :official,
+        title: { en: "Do you like my doggo?" },
+        component: component,
+        start_time: 1.day.from_now
+      )
+    end
+
+    it "displays all debates without any filters" do
+      expect(subject).to have_escaped_html(translated(debate1.title))
+      expect(subject).not_to have_escaped_html(translated(debate2.title))
+      expect(subject).not_to have_escaped_html(translated(debate3.title))
+      expect(subject).not_to have_escaped_html(translated(debate4.title))
+    end
+  end
+
+  context "when searching by state" do
+    let(:filter_params) { { with_any_state: state } }
+
+    context "and the state is open" do
+      let(:state) { %w(open) }
+
+      it "returns the open debates" do
+        expect(subject).to have_escaped_html(translated(debate1.title))
+        expect(subject).to have_escaped_html(translated(debate2.title))
+        expect(subject).not_to have_escaped_html(translated(debate3.title))
+        expect(subject).to have_escaped_html(translated(debate4.title))
+      end
+    end
+
+    context "and the state is closed" do
+      let(:state) { %w(closed) }
+
+      it "returns the closed debates" do
+        expect(subject).not_to have_escaped_html(translated(debate1.title))
+        expect(subject).not_to have_escaped_html(translated(debate2.title))
+        expect(subject).to have_escaped_html(translated(debate3.title))
+        expect(subject).not_to have_escaped_html(translated(debate4.title))
+      end
+    end
+  end
+
+  context "when searching by activity" do
+    let(:current_user) { create(:user, :confirmed, organization: organization) }
+
+    before do
+      login_as current_user, scope: :user
+    end
+
+    context "and the activity is commented" do
+      let(:filter_params) { { activity: "commented" } }
+
+      before do
+        create(:comment, body: "This is a good debate!", commentable: debate4, author: current_user)
+
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
+      it "returns the debates commented by the current user" do
+        expect(subject).not_to have_escaped_html(translated(debate1.title))
+        expect(subject).not_to have_escaped_html(translated(debate2.title))
+        expect(subject).not_to have_escaped_html(translated(debate3.title))
+        expect(subject).to have_escaped_html(translated(debate4.title))
+      end
+    end
+
+    context "and the activity is my_debates" do
+      let(:filter_params) { { activity: "my_debates" } }
+      let(:current_user) { create(:user, :confirmed, organization: organization) }
+
+      let!(:debate5) do
+        create(
+          :debate,
+          component: component,
+          author: current_user
+        )
+      end
+
+      before do
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
+      it "returns the debates commented by the current user" do
+        expect(subject).not_to have_escaped_html(translated(debate1.title))
+        expect(subject).not_to have_escaped_html(translated(debate2.title))
+        expect(subject).not_to have_escaped_html(translated(debate3.title))
+        expect(subject).not_to have_escaped_html(translated(debate4.title))
+        expect(subject).to have_escaped_html(translated(debate5.title))
+      end
+    end
+  end
+end
diff --git a/decidim-debates/spec/serializers/decidim/debates/data_portability_debate_serializer_spec.rb b/decidim-debates/spec/serializers/decidim/debates/download_your_data_debate_serializer_spec.rb
similarity index 92%
rename from decidim-debates/spec/serializers/decidim/debates/data_portability_debate_serializer_spec.rb
rename to decidim-debates/spec/serializers/decidim/debates/download_your_data_debate_serializer_spec.rb
index 4dbf9d46c639c..460580bdcf3b1 100644
--- a/decidim-debates/spec/serializers/decidim/debates/data_portability_debate_serializer_spec.rb
+++ b/decidim-debates/spec/serializers/decidim/debates/download_your_data_debate_serializer_spec.rb
@@ -3,8 +3,8 @@
 require "spec_helper"
 
 module Decidim
-  describe Debates::DataPortabilityDebateSerializer do
-    let(:subject) { described_class.new(resource) }
+  describe Debates::DownloadYourDataDebateSerializer do
+    subject { described_class.new(resource) }
     let(:resource) { create(:debate) }
 
     let(:serialized) { subject.serialize }
diff --git a/decidim-debates/spec/services/decidim/debates/debate_search_spec.rb b/decidim-debates/spec/services/decidim/debates/debate_search_spec.rb
deleted file mode 100644
index 35b2e945fe442..0000000000000
--- a/decidim-debates/spec/services/decidim/debates/debate_search_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe Decidim::Debates::DebateSearch do
-  subject { described_class.new(params).results }
-
-  let(:component) { create :component, manifest_name: "debates" }
-  let(:default_params) { { component: component } }
-  let(:params) { default_params }
-
-  it_behaves_like "a resource search", :debate
-  it_behaves_like "a resource search with categories", :debate
-  it_behaves_like "a resource search with origin", :debate
-
-  describe "results" do
-    subject { described_class.new(params).results }
-
-    let!(:debate1) do
-      create(
-        :debate,
-        component: component,
-        start_time: 1.day.from_now
-      )
-    end
-    let!(:debate2) do
-      create(
-        :debate,
-        component: component,
-        start_time: 2.days.from_now
-      )
-    end
-
-    describe "search_text filter" do
-      let(:params) { default_params.merge(search_text: search_text) }
-      let(:search_text) { "dog" }
-
-      before do
-        debate1.title["en"] = "Do you like my dog?"
-        debate1.save
-      end
-
-      it "searches the title or the description in i18n" do
-        expect(subject).to eq [debate1]
-      end
-    end
-  end
-end
diff --git a/decidim-debates/spec/services/decidim/debates/searchable_debate_resource_spec.rb b/decidim-debates/spec/services/decidim/debates/searchable_debate_resource_spec.rb
index 78dc6019e1f32..ba95ad5ec1fbe 100644
--- a/decidim-debates/spec/services/decidim/debates/searchable_debate_resource_spec.rb
+++ b/decidim-debates/spec/services/decidim/debates/searchable_debate_resource_spec.rb
@@ -73,7 +73,7 @@ module Decidim
 
     describe "Search" do
       context "when searching by Debate resource_type" do
-        let!(:debate_2) do
+        let!(:debate2) do
           create(
             :debate,
             component: current_component,
@@ -84,7 +84,7 @@ module Decidim
 
         before do
           debate.update(title: "#{debate.title}+1")
-          debate_2.update(title: "#{debate.title}+2")
+          debate2.update(title: "#{debate.title}+2")
         end
 
         it "returns Debate results" do
@@ -92,7 +92,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[debate.class.name]
               expect(results[:count]).to eq 2
-              expect(results[:results]).to match_array [debate, debate_2]
+              expect(results[:results]).to match_array [debate, debate2]
             end
             on(:invalid) { raise("Should not happen") }
           end
@@ -103,7 +103,7 @@ module Decidim
             on(:ok) do |results_by_type|
               results = results_by_type[debate.class.name]
               expect(results[:count]).to eq 1
-              expect(results[:results]).to eq [debate_2]
+              expect(results[:results]).to eq [debate2]
             end
             on(:invalid) { raise("Should not happen") }
           end
diff --git a/decidim-debates/spec/shared/manage_debates_examples.rb b/decidim-debates/spec/shared/manage_debates_examples.rb
index 4eaad968ab6c2..9bd5317e079b8 100644
--- a/decidim-debates/spec/shared/manage_debates_examples.rb
+++ b/decidim-debates/spec/shared/manage_debates_examples.rb
@@ -52,7 +52,7 @@
     end
 
     context "when the debate has an author" do
-      let!(:debate) { create(:debate, :citizen_author, component: current_component) }
+      let!(:debate) { create(:debate, :participant_author, component: current_component) }
 
       it "cannot edit the debate" do
         within find("tr", text: translated(debate.title)) do
@@ -203,7 +203,7 @@
     end
 
     context "when the debate has an author" do
-      let!(:debate2) { create(:debate, :citizen_author, component: current_component) }
+      let!(:debate2) { create(:debate, :participant_author, component: current_component) }
 
       it "cannot delete the debate" do
         within find("tr", text: translated(debate2.title)) do
@@ -246,7 +246,7 @@
     end
 
     context "when the debate has an author" do
-      let!(:debate) { create(:debate, :citizen_author, component: current_component) }
+      let!(:debate) { create(:debate, :participant_author, component: current_component) }
 
       it "cannot close the debate" do
         within find("tr", text: translated(debate.title)) do
diff --git a/decidim-debates/spec/system/explore_debates_spec.rb b/decidim-debates/spec/system/explore_debates_spec.rb
index 1762f61fcf48f..68496166c7cc0 100644
--- a/decidim-debates/spec/system/explore_debates_spec.rb
+++ b/decidim-debates/spec/system/explore_debates_spec.rb
@@ -108,15 +108,34 @@
     end
 
     context "when filtering" do
+      context "when filtering by text" do
+        it "updates the current URL" do
+          create(:debate, component: component, title: { en: "Foobar debate" })
+          create(:debate, component: component, title: { en: "Another debate" })
+          visit_component
+
+          within "form.new_filter" do
+            fill_in("filter[search_text_cont]", with: "foobar")
+            click_button "Search"
+          end
+
+          expect(page).not_to have_content("Another debate")
+          expect(page).to have_content("Foobar debate")
+
+          filter_params = CGI.parse(URI.parse(page.current_url).query)
+          expect(filter_params["filter[search_text_cont]"]).to eq(["foobar"])
+        end
+      end
+
       context "when filtering by origin" do
         context "with 'official' origin" do
           let!(:debates) { create_list(:debate, 2, component: component, skip_injection: true) }
 
           it "lists the filtered debates" do
-            create(:debate, :citizen_author, component: component, skip_injection: true)
+            create(:debate, :participant_author, component: component, skip_injection: true)
             visit_component
 
-            within ".filters .origin_check_boxes_tree_filter" do
+            within ".filters .with_any_origin_check_boxes_tree_filter" do
               uncheck "All"
               check "Official"
             end
@@ -126,16 +145,16 @@
           end
         end
 
-        context "with 'citizens' origin" do
-          let!(:debates) { create_list(:debate, 2, :citizen_author, component: component, skip_injection: true) }
+        context "with 'participants' origin" do
+          let!(:debates) { create_list(:debate, 2, :participant_author, component: component, skip_injection: true) }
 
           it "lists the filtered debates" do
             create(:debate, component: component, skip_injection: true)
             visit_component
 
-            within ".filters .origin_check_boxes_tree_filter" do
+            within ".filters .with_any_origin_check_boxes_tree_filter" do
               uncheck "All"
-              check "Citizens"
+              check "Participants"
             end
 
             expect(page).to have_css(".card--debate", count: 2)
@@ -152,7 +171,7 @@
 
         visit_component
 
-        within ".scope_id_check_boxes_tree_filter" do
+        within ".with_any_scope_check_boxes_tree_filter" do
           check "All"
           uncheck "All"
           check translated(scope.name)
@@ -172,7 +191,7 @@
         end
 
         it "can be filtered by category" do
-          within ".filters .category_id_check_boxes_tree_filter" do
+          within ".filters .with_any_category_check_boxes_tree_filter" do
             uncheck "All"
             check category.name[I18n.locale.to_s]
           end
@@ -180,8 +199,8 @@
           expect(page).to have_css(".card--debate", count: 1)
         end
 
-        it "works with 'back to list' link " do
-          within ".filters .category_id_check_boxes_tree_filter" do
+        it "works with 'back to list' link" do
+          within ".filters .with_any_category_check_boxes_tree_filter" do
             uncheck "All"
             check category.name[I18n.locale.to_s]
           end
diff --git a/decidim-debates/spec/system/search_debates_spec.rb b/decidim-debates/spec/system/search_debates_spec.rb
index e8bbcdd21aeea..ce9645263804c 100644
--- a/decidim-debates/spec/system/search_debates_spec.rb
+++ b/decidim-debates/spec/system/search_debates_spec.rb
@@ -6,7 +6,7 @@
   include_context "with a component"
   let(:manifest_name) { "debates" }
   let!(:searchables) { create_list(:debate, 3, component: component, skip_injection: true) }
-  let!(:term) { translated(searchables.first.title).split(" ").last }
+  let!(:term) { translated(searchables.first.title).split.last }
   let(:hashtag) { "#decidim" }
 
   before do
diff --git a/decidim-debates/spec/types/integration_schema_spec.rb b/decidim-debates/spec/types/integration_schema_spec.rb
index a1fc37416ebb6..a1a2e52809702 100644
--- a/decidim-debates/spec/types/integration_schema_spec.rb
+++ b/decidim-debates/spec/types/integration_schema_spec.rb
@@ -9,7 +9,7 @@
   let(:component_type) { "Debates" }
 
   let!(:current_component) { create :debates_component, participatory_space: participatory_process }
-  let!(:debate) { create(:debate, :citizen_author, component: current_component, category: category) }
+  let!(:debate) { create(:debate, :participant_author, component: current_component, category: category) }
 
   let(:debate_single_result) do
     {
diff --git a/decidim-dev/app/commands/decidim/dummy_resources/create_dummy_resource.rb b/decidim-dev/app/commands/decidim/dummy_resources/create_dummy_resource.rb
index 530df866c0852..4ad81967a1b43 100644
--- a/decidim-dev/app/commands/decidim/dummy_resources/create_dummy_resource.rb
+++ b/decidim-dev/app/commands/decidim/dummy_resources/create_dummy_resource.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module DummyResources
-    class CreateDummyResource < Rectify::Command
+    class CreateDummyResource < Decidim::Command
       include Decidim::AttachmentMethods
       include Decidim::GalleryMethods
 
diff --git a/decidim-dev/app/controllers/concerns/decidim/dev/needs_development_tools.rb b/decidim-dev/app/controllers/concerns/decidim/dev/needs_development_tools.rb
index c9494abd64007..b03e435ca1fb0 100644
--- a/decidim-dev/app/controllers/concerns/decidim/dev/needs_development_tools.rb
+++ b/decidim-dev/app/controllers/concerns/decidim/dev/needs_development_tools.rb
@@ -18,7 +18,7 @@ def apply_development_tools
         return unless respond_to?(:snippets)
 
         snippets.add(:head, helpers.stylesheet_pack_tag("decidim_dev"))
-        snippets.add(:head, helpers.javascript_pack_tag("decidim_dev"))
+        snippets.add(:foot, helpers.javascript_pack_tag("decidim_dev", defer: false))
       end
     end
   end
diff --git a/decidim-dev/config/locales/ar.yml b/decidim-dev/config/locales/ar.yml
index 8cef79d362008..ba737df7f9f88 100644
--- a/decidim-dev/config/locales/ar.yml
+++ b/decidim-dev/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/bg.yml b/decidim-dev/config/locales/bg.yml
index 913461bf73fe1..30c048be0be2b 100644
--- a/decidim-dev/config/locales/bg.yml
+++ b/decidim-dev/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/ca.yml b/decidim-dev/config/locales/ca.yml
index a4d56a0112b17..6f459d3266921 100644
--- a/decidim-dev/config/locales/ca.yml
+++ b/decidim-dev/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/cs.yml b/decidim-dev/config/locales/cs.yml
index 00a8fe2dbe2f6..4a9b905d46827 100644
--- a/decidim-dev/config/locales/cs.yml
+++ b/decidim-dev/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/de.yml b/decidim-dev/config/locales/de.yml
index f5724aab64282..fc616ff42173f 100644
--- a/decidim-dev/config/locales/de.yml
+++ b/decidim-dev/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/el.yml b/decidim-dev/config/locales/el.yml
index 67048c59a392b..0e463d6cf7ee6 100644
--- a/decidim-dev/config/locales/el.yml
+++ b/decidim-dev/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/es-MX.yml b/decidim-dev/config/locales/es-MX.yml
index 6de37d3d0b5e1..65a2bd031e146 100644
--- a/decidim-dev/config/locales/es-MX.yml
+++ b/decidim-dev/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/es-PY.yml b/decidim-dev/config/locales/es-PY.yml
index 1b57618c5107e..2694ee584ddb2 100644
--- a/decidim-dev/config/locales/es-PY.yml
+++ b/decidim-dev/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/es.yml b/decidim-dev/config/locales/es.yml
index 2de7d2552685f..2525176139074 100644
--- a/decidim-dev/config/locales/es.yml
+++ b/decidim-dev/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/eu.yml b/decidim-dev/config/locales/eu.yml
index 46ea38bc4dadc..c71bca963fcfe 100644
--- a/decidim-dev/config/locales/eu.yml
+++ b/decidim-dev/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/fi-plain.yml b/decidim-dev/config/locales/fi-plain.yml
index 12ef95cbfbe89..0309a544e63d9 100644
--- a/decidim-dev/config/locales/fi-plain.yml
+++ b/decidim-dev/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/fi.yml b/decidim-dev/config/locales/fi.yml
index d8c17596584ff..f5c4d598276e0 100644
--- a/decidim-dev/config/locales/fi.yml
+++ b/decidim-dev/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/fr-CA.yml b/decidim-dev/config/locales/fr-CA.yml
index d495d0e63cd09..4c29f11491919 100644
--- a/decidim-dev/config/locales/fr-CA.yml
+++ b/decidim-dev/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/fr.yml b/decidim-dev/config/locales/fr.yml
index 2b6dbf9b0699f..1e346dbee329c 100644
--- a/decidim-dev/config/locales/fr.yml
+++ b/decidim-dev/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/ga-IE.yml b/decidim-dev/config/locales/ga-IE.yml
index fc7f537b739df..b641273c2be13 100644
--- a/decidim-dev/config/locales/ga-IE.yml
+++ b/decidim-dev/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/gl.yml b/decidim-dev/config/locales/gl.yml
index ac773602495ff..ae51f41a60dac 100644
--- a/decidim-dev/config/locales/gl.yml
+++ b/decidim-dev/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/hu.yml b/decidim-dev/config/locales/hu.yml
index 233b64aa2501e..7eee038695b22 100644
--- a/decidim-dev/config/locales/hu.yml
+++ b/decidim-dev/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/id-ID.yml b/decidim-dev/config/locales/id-ID.yml
index bcde925046360..d372f2ee5124b 100644
--- a/decidim-dev/config/locales/id-ID.yml
+++ b/decidim-dev/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/is-IS.yml b/decidim-dev/config/locales/is-IS.yml
index 17c6c7d121346..d8a147a910150 100644
--- a/decidim-dev/config/locales/is-IS.yml
+++ b/decidim-dev/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       dummy_resource:
diff --git a/decidim-dev/config/locales/it.yml b/decidim-dev/config/locales/it.yml
index 05d9da5e86647..cb6c99e699203 100644
--- a/decidim-dev/config/locales/it.yml
+++ b/decidim-dev/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/ja.yml b/decidim-dev/config/locales/ja.yml
index 439a886db0d1a..5ac0352a21a98 100644
--- a/decidim-dev/config/locales/ja.yml
+++ b/decidim-dev/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/ka-GE.yml b/decidim-dev/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-dev/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-dev/config/locales/lt.yml b/decidim-dev/config/locales/lt.yml
index 93ba82df766ab..bdd35edde3be0 100644
--- a/decidim-dev/config/locales/lt.yml
+++ b/decidim-dev/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/lv.yml b/decidim-dev/config/locales/lv.yml
index 72a09cb497f62..a1d0a58c13849 100644
--- a/decidim-dev/config/locales/lv.yml
+++ b/decidim-dev/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/nl.yml b/decidim-dev/config/locales/nl.yml
index 76483056bf279..372a627fb72f5 100644
--- a/decidim-dev/config/locales/nl.yml
+++ b/decidim-dev/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/no.yml b/decidim-dev/config/locales/no.yml
index 296d22f4e1d22..7d287d96d6391 100644
--- a/decidim-dev/config/locales/no.yml
+++ b/decidim-dev/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/pl.yml b/decidim-dev/config/locales/pl.yml
index 6b3762179a864..e91bb7f65b5eb 100644
--- a/decidim-dev/config/locales/pl.yml
+++ b/decidim-dev/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/pt-BR.yml b/decidim-dev/config/locales/pt-BR.yml
index ab4474b94ecac..ec03691980188 100644
--- a/decidim-dev/config/locales/pt-BR.yml
+++ b/decidim-dev/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/pt.yml b/decidim-dev/config/locales/pt.yml
index 3adc791d0b3f4..b6876f7a5bf6a 100644
--- a/decidim-dev/config/locales/pt.yml
+++ b/decidim-dev/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/ro-RO.yml b/decidim-dev/config/locales/ro-RO.yml
index 8886a68f7d701..7a5f87ed3f55f 100644
--- a/decidim-dev/config/locales/ro-RO.yml
+++ b/decidim-dev/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -14,6 +15,7 @@ ro:
       dummy:
         settings:
           global:
+            guided_help: Text de ajutor
             readonly_attribute: Atribut Readonly
             test: Un test
             test_choices:
diff --git a/decidim-dev/config/locales/ru.yml b/decidim-dev/config/locales/ru.yml
index e560f638769cd..b2f05c71f1409 100644
--- a/decidim-dev/config/locales/ru.yml
+++ b/decidim-dev/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/sk.yml b/decidim-dev/config/locales/sk.yml
index ad2f7fadcb370..356e69e4fca28 100644
--- a/decidim-dev/config/locales/sk.yml
+++ b/decidim-dev/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/sl.yml b/decidim-dev/config/locales/sl.yml
index b1494573f92ff..8f8097d1350d6 100644
--- a/decidim-dev/config/locales/sl.yml
+++ b/decidim-dev/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/sr-CS.yml b/decidim-dev/config/locales/sr-CS.yml
index 305310abb0b5c..495dd83c6a25a 100644
--- a/decidim-dev/config/locales/sr-CS.yml
+++ b/decidim-dev/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     components:
diff --git a/decidim-dev/config/locales/sv.yml b/decidim-dev/config/locales/sv.yml
index 4d0366a8a3a3b..a2b294ccf91af 100644
--- a/decidim-dev/config/locales/sv.yml
+++ b/decidim-dev/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -14,6 +15,7 @@ sv:
       dummy:
         settings:
           global:
+            guided: Guidad ingång
             readonly_attribute: Skrivskyddat attribut
             test: Ett test
             test_choices:
diff --git a/decidim-dev/config/locales/tr-TR.yml b/decidim-dev/config/locales/tr-TR.yml
index 13b4a25540c4c..57c0f9cee4152 100644
--- a/decidim-dev/config/locales/tr-TR.yml
+++ b/decidim-dev/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/uk.yml b/decidim-dev/config/locales/uk.yml
index a2d17ecdc5f48..e2ead5c0fd113 100644
--- a/decidim-dev/config/locales/uk.yml
+++ b/decidim-dev/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
diff --git a/decidim-dev/config/locales/zh-CN.yml b/decidim-dev/config/locales/zh-CN.yml
index 134568fb835f1..81d3ebcb02fb3 100644
--- a/decidim-dev/config/locales/zh-CN.yml
+++ b/decidim-dev/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
diff --git a/decidim-dev/decidim-dev.gemspec b/decidim-dev/decidim-dev.gemspec
index e973e5d940f69..81db5ba78dec9 100644
--- a/decidim-dev/decidim-dev.gemspec
+++ b/decidim-dev/decidim-dev.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-dev"
   s.summary = "Decidim dev tools"
@@ -30,21 +30,21 @@ Gem::Specification.new do |s|
   s.add_dependency "erb_lint", "~> 0.0.35"
   s.add_dependency "i18n-tasks", "~> 0.9.18"
   s.add_dependency "mdl", "~> 0.5"
-  s.add_dependency "nokogiri", "~> 1.12"
+  s.add_dependency "nokogiri", "~> 1.13"
+  s.add_dependency "parallel_tests", "~> 3.7"
   s.add_dependency "puma", "~> 5.0"
   s.add_dependency "rails-controller-testing", "~> 1.0"
-  s.add_dependency "rspec-cells", "~> 0.3.4"
+  s.add_dependency "rspec-cells", "~> 0.3.7"
   s.add_dependency "rspec-html-matchers", "~> 0.9.1"
   s.add_dependency "rspec_junit_formatter", "~> 0.3.0"
   s.add_dependency "rspec-rails", "~> 4.0"
   s.add_dependency "rspec-retry", "~> 0.6.2"
-  s.add_dependency "rubocop", "~> 0.92.0"
-  s.add_dependency "rubocop-rails", "~> 2.8"
-  s.add_dependency "rubocop-rspec", "= 1.43.2"
-  s.add_dependency "selenium-webdriver", "~> 3.142"
-  s.add_dependency "simplecov", "~> 0.19.0"
-  s.add_dependency "simplecov-cobertura", "~> 1.3.1"
-  s.add_dependency "system_test_html_screenshots", "~> 0.2"
+  s.add_dependency "rubocop", "~> 1.28.0"
+  s.add_dependency "rubocop-rails", "~> 2.14"
+  s.add_dependency "rubocop-rspec", "~> 2.10"
+  s.add_dependency "selenium-webdriver", "~> 4.1.0"
+  s.add_dependency "simplecov", "~> 0.21.0"
+  s.add_dependency "simplecov-cobertura", "~> 2.1.0"
   s.add_dependency "w3c_rspec_validators", "~> 0.3.0"
   s.add_dependency "webmock", "~> 3.6"
   s.add_dependency "wisper-rspec", "~> 1.0"
diff --git a/decidim-dev/lib/decidim-dev.rb b/decidim-dev/lib/decidim-dev.rb
index 8ad7e35adc646..7a81219ffad10 100644
--- a/decidim-dev/lib/decidim-dev.rb
+++ b/decidim-dev/lib/decidim-dev.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "decidim/dev/engine" if Rails.env.development? || ENV["DECIDIM_DEV_ENGINE"]
+require "decidim/dev/engine" if Rails.env.development? || ENV.fetch("DECIDIM_DEV_ENGINE", nil)
diff --git a/decidim-dev/lib/decidim/dev/assets/geocoder_result_here.json b/decidim-dev/lib/decidim/dev/assets/geocoder_result_here.json
index 5792c7482cbba..a43553d26a6c3 100644
--- a/decidim-dev/lib/decidim/dev/assets/geocoder_result_here.json
+++ b/decidim-dev/lib/decidim/dev/assets/geocoder_result_here.json
@@ -1,72 +1,51 @@
 {
-    "Response": {
-      "MetaInfo": {
-        "Timestamp": "2013-02-08T16:26:39.382+0000"
+  "items": [
+    {
+      "title": "5 Rue Daunou, 75002 Paris, France",
+      "id": "here:af:streetsection:bI4Le6cyA.1mlQyLunYpjC:CggIBCCi-9SPARABGgE1KGQ",
+      "resultType": "houseNumber",
+      "houseNumberType": "PA",
+      "address": {
+        "label": "5 Rue Daunou, 75002 Paris, France",
+        "countryCode": "FRA",
+        "countryName": "France",
+        "stateCode": "IDF",
+        "state": "ÃŽle-de-France",
+        "county": "Paris",
+        "city": "Paris",
+        "district": "2e Arrondissement",
+        "street": "Rue Daunou",
+        "postalCode": "75002",
+        "houseNumber": "5"
       },
-      "View": [
+      "position": {
+        "lat": 48.86926,
+        "lng": 2.3321
+      },
+      "access": [
         {
-          "_type": "SearchResultsViewType",
-          "ViewId": 0,
-          "Result": [
-            {
-              "Relevance": 1.0,
-              "MatchLevel": "houseNumber",
-              "MatchQuality": {
-                "State": 1.0,
-                "City": 1.0,
-                "Street": [
-                  1.0
-                ],
-                "HouseNumber": 1.0
-              },
-              "MatchType": "pointAddress",
-              "Location": {
-                "LocationId": "NT_ArsGdYbpo6dqjPQel9gTID_4",
-                "LocationType": "point",
-                "DisplayPosition": {
-                  "Latitude": 40.7504692,
-                  "Longitude": -73.9933777
-                },
-                "NavigationPosition": [
-                  {
-                    "Latitude": 40.7500305,
-                    "Longitude": -73.9942398
-                  }
-                ],
-                "MapView": {
-                  "TopLeft": {
-                    "Latitude": 40.7515934,
-                    "Longitude": -73.9948616
-                  },
-                  "BottomRight": {
-                    "Latitude": 40.7493451,
-                    "Longitude": -73.9918938
-                  }
-                },
-                "Address": {
-                  "Label": "4 Penn Plz, New York, NY 10001, United States",
-                  "Country": "USA",
-                  "State": "NY",
-                  "County": "New York",
-                  "City": "New York",
-                  "Street": "Penn Plz",
-                  "HouseNumber": "4",
-                  "PostalCode": "10001",
-                  "AdditionalData": [
-                    {
-                      "value": "United States",
-                      "key": "CountryName"
-                    },
-                    {
-                      "value": "New York",
-                      "key": "StateName"
-                    }
-                  ]
-                }
-              }
-            }
-          ]
+          "lat": 48.86931,
+          "lng": 2.33215
+        }
+      ],
+      "mapView": {
+        "west": 2.33073,
+        "south": 48.86836,
+        "east": 2.33347,
+        "north": 48.87016
+      },
+      "scoring": {
+        "queryScore": 0.97,
+        "fieldScore": {
+          "country": 1,
+          "city": 1,
+          "streets": [
+            1
+          ],
+          "houseNumber": 1,
+          "postalCode": 0.82
         }
-      ]
+      }
     }
-  }
+  ]
+}
diff --git a/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv b/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv
new file mode 100644
index 0000000000000..6d86a4c7071a4
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/assets/import_participatory_space_private_users_iso8859-1.csv
@@ -0,0 +1,2 @@
+my_user@example.org,My Üser Name
+my_private_user@example.org,My Priväté User Namë
diff --git a/decidim-dev/lib/decidim/dev/assets/import_voting_census_only_headers.csv b/decidim-dev/lib/decidim/dev/assets/import_voting_census_only_headers.csv
new file mode 100644
index 0000000000000..9a3c5355a4a2d
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/assets/import_voting_census_only_headers.csv
@@ -0,0 +1 @@
+Document ID;Document Type;Date of Birth;Full name;Full address;Postal Code;Mobile phone number;Email address
diff --git a/decidim-dev/lib/decidim/dev/assets/logo.png b/decidim-dev/lib/decidim/dev/assets/logo.png
new file mode 100644
index 0000000000000..f4cb6171c1704
Binary files /dev/null and b/decidim-dev/lib/decidim/dev/assets/logo.png differ
diff --git a/decidim-dev/lib/decidim/dev/assets/ssl-cert.pem b/decidim-dev/lib/decidim/dev/assets/ssl-cert.pem
new file mode 100644
index 0000000000000..6c45ebd6b27a7
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/assets/ssl-cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIUK548SGgd4RimiJRsHG/eydDD7dMwDQYJKoZIhvcNAQEL
+BQAwbDELMAkGA1UEBhMCRVUxEDAOBgNVBAgMB0R5c3RvcHkxETAPBgNVBAcMCEF0
+bGFudGlzMRAwDgYDVQQKDAdEZWNpZGltMRIwEAYDVQQLDAlEZW1vY3JhY3kxEjAQ
+BgNVBAMMCWxvY2FsaG9zdDAgFw0yMjA3MTMwOTQ5MTJaGA8zMDIxMTExMzA5NDkx
+MlowbDELMAkGA1UEBhMCRVUxEDAOBgNVBAgMB0R5c3RvcHkxETAPBgNVBAcMCEF0
+bGFudGlzMRAwDgYDVQQKDAdEZWNpZGltMRIwEAYDVQQLDAlEZW1vY3JhY3kxEjAQ
+BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJmUINZVaCrApqIpqI+NVw7Ju1mIMlG7T57qoU4Hc5Qy9qKGsBNpYnHuyd4Wn8oY
+MpOzDjVyOXhhGBh/TOWwr9f3dFTSbrUz22OtKr553P+dwdE7/BX+VRIpChZn/dKO
+OzGvInBEArU2FwYgQ59KbhCMXUVqdebXCNvTbPbbVVHqFV8uZbaoeNanhUlBjUKN
+CRVY4+fq6DftzXSF41b+lX4iTSLH7UOZfRagAANhbZXFna/ni53SRHPnuvNfy4BA
+ewWWOD97Or2Bh0zBntDzMvhFd5rotQFjox31FIdHwRPD/KU4Wk2OwIQ0/IPlDdyS
+Xvc6EbUFzDGpqi/FLxHaen0CAwEAAaNTMFEwHQYDVR0OBBYEFDfOkB+JbPCS1KF2
+RW6gw86pvs6TMB8GA1UdIwQYMBaAFDfOkB+JbPCS1KF2RW6gw86pvs6TMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADMUG6VaCyFPV9HI0AsalfBZ
+2S0zSo5qJblVE8JfkhXn0RlbuYS86BtgKKpqe3wNsvRMChscQ+PX/aPGoNF7t8+B
+yFc+Vw+3VImP+KgfkqhP+1ObUItpMjlbqkdL+XsiTto9f7BBnBWftMNXxvdM3F4a
+sblIYLb2KBxM54Kli8ZM9TQqHwnbfAQmkam3mQ+vHSLNXVSwher1dMIF38uINbgS
+sYI9CqfPa2hiHFak7NKubjyLOSkgVF8ftkJqjY8Mq1pQnNiNBiPWBrpPoWaavhix
+sGnwcgoJuIf5XdbHucmints0Na4JbEGPpE/Ux/R/gszBGyN6xUNzcPEQMTic4Go=
+-----END CERTIFICATE-----
diff --git a/decidim-dev/lib/decidim/dev/assets/ssl-key.pem b/decidim-dev/lib/decidim/dev/assets/ssl-key.pem
new file mode 100644
index 0000000000000..7951f368372bd
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/assets/ssl-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCZlCDWVWgqwKai
+KaiPjVcOybtZiDJRu0+e6qFOB3OUMvaihrATaWJx7sneFp/KGDKTsw41cjl4YRgY
+f0zlsK/X93RU0m61M9tjrSq+edz/ncHRO/wV/lUSKQoWZ/3SjjsxryJwRAK1NhcG
+IEOfSm4QjF1FanXm1wjb02z221VR6hVfLmW2qHjWp4VJQY1CjQkVWOPn6ug37c10
+heNW/pV+Ik0ix+1DmX0WoAADYW2VxZ2v54ud0kRz57rzX8uAQHsFljg/ezq9gYdM
+wZ7Q8zL4RXea6LUBY6Md9RSHR8ETw/ylOFpNjsCENPyD5Q3ckl73OhG1Bcwxqaov
+xS8R2np9AgMBAAECggEAXUfpggWyFXWaQJjI9xhELok9MC5XUelRfRbKDtjbzMH/
+p8vjGodB8i21kx1uxJNZ9PgmwzOz0Hg46Hg5vrFIvQZiNDr0Xz82HB7L/ZGLN/8b
+//hNLxahmTwwElfrhX46Wf0kD8hfVK2b4m6qZBATNh3rcQQuxJ0Llmmen3mtIuj4
+VlfbuBylXGe5Lo43r1c2mJszTy7d4nPoDdtDU2PY/UsowDQX14A0OkPR2vzD1sXs
+5KhDb6zQSWUX4lIlvjdsGjasZHlW9sGc9SgrkpyaYx7MTZahYd0We/i6yl+QzYQM
+ULuBuOK2vWfw4hl3NutqC13gZxyHUwoZJNaITMgbwQKBgQDJr/oRMs+SVv3h2EwN
+/GOUQTECCh90XcoDvLIUurmCRKsFGIw1xjNQUrYAi7mZy7RBozUWsiJC0yGABRi3
+NWJW0lNzdl5LAPj+hn1HfCrIpGKs+Zz1xra63ZIRrm/KOhWDmaGxlE74N1xf8Z9C
+61F/25PkuFiHqtqYs0Pg3UpdqQKBgQDC75roQKbefdRHp0slbuQuEuzvPaTiXr1M
+F7vS8Nuw74gx9Zi5b0ajVzAivmUKXg0Q0FOVS7DUbaMynNHqWIu65fPxsZObweFg
+aEmB0s6vjgdz+UTBqDIRudNYpRiQf1Sn6Sg09ax/aIWIGB3IQ7kTv6u1QfKX1sp2
+X3N4mqlytQKBgDVAma5g1B23imFPUwV+VmyWqfH36kY3XVePQxXmF4UlzGIUETFB
+m9rhe9y5B9Br0LRj+2h6sEEkrfu3XMdC+SwjbJVX852qLBRIPlvZlRJVFRjG74KV
+bTn5ts+kVy/2FighMGhK2G8BbwqGKZ7psyMnPu1tHzLzEbSv4IRG6ZPBAoGAVJiY
++Du+bwXaTvI5+VfDbH9IFZcB7D9DFTejiip+nK2GxG+ZxLeWxyH6QMmxnastLmPK
+Mhsz9SxTS46kxneAxC4xDG2M6mZcQXNgmxd6HNOdRmYhwY0VlX24S1ryaxrnCSt1
+CG6pWm1oraQRoKxLMFfY04N4HQ7YtEA+I1OzP5UCgYEAudD3jeGWODXvBNitENpG
+TmZQQd1LVdj7WNxHgKaQg+OLPPIxf/2Po5ml7J5v1nnfo78bN9TvIs3XynxBRrRS
+3ZnbN0N/vnrmQTFlfpNnnTdKEmZH7QtB+459yCYNiLAHGpzHSLnabBwHN6yP/+/+
+SN2zDne6Od2PySmsj6Xo1Go=
+-----END PRIVATE KEY-----
diff --git a/decidim-dev/lib/decidim/dev/common_rake.rb b/decidim-dev/lib/decidim/dev/common_rake.rb
index 001edb5748e7e..3350d811aa6cc 100644
--- a/decidim-dev/lib/decidim/dev/common_rake.rb
+++ b/decidim-dev/lib/decidim/dev/common_rake.rb
@@ -3,6 +3,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "decidim/dev"
+require "parallel_tests/tasks"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "--format progress --format RspecJunitFormatter -o ~/rspec/rspec.xml" if ENV["CI"]
diff --git a/decidim-dev/lib/decidim/dev/railtie.rb b/decidim-dev/lib/decidim/dev/railtie.rb
index e3cea814c350f..50231603bcc86 100644
--- a/decidim-dev/lib/decidim/dev/railtie.rb
+++ b/decidim-dev/lib/decidim/dev/railtie.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails"
+require "decidim/rails"
 
 module Decidim
   module Dev
diff --git a/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb b/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb
index 38d6a3bdebb7e..ae308d321755c 100644
--- a/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb
+++ b/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb
@@ -3,6 +3,7 @@
 require "decidim/dev"
 
 ENV["RAILS_ENV"] ||= "test"
+ENV["RAILS_SYSTEM_TESTING_SCREENSHOT_HTML"] ||= "1"
 
 engine_spec_dir = File.join(Dir.pwd, "spec")
 
@@ -18,7 +19,7 @@
 
 require "#{Decidim::Dev.dummy_app_path}/config/environment"
 
-Dir["#{engine_spec_dir}/shared/**/*.rb"].sort.each { |f| require f }
+Dir["#{engine_spec_dir}/shared/**/*.rb"].each { |f| require f }
 
 require "paper_trail/frameworks/rspec"
 
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/attachment_helpers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/attachment_helpers.rb
index c0a4ca13da672..2caeeb996cfe5 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/attachment_helpers.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/attachment_helpers.rb
@@ -9,6 +9,36 @@ module AttachmentHelpers
   def attachment_file_size(attachment)
     ActiveSupport::NumberHelper.number_to_human_size(attachment.file_size)
   end
+
+  # Creates ActiveStorage::Blob object and returns its signed_id
+  # Used in non-system tests that need files.
+  def upload_test_file(file, options = {})
+    filename = options[:filename] || upload_test_file_filename(file)
+    content_type = options[:content_type] || upload_test_file_content_type(file)
+
+    blob = ActiveStorage::Blob.create_and_upload!(
+      io: File.open(file),
+      filename: filename,
+      content_type: content_type
+    )
+    return blob if options[:return_blob]
+
+    blob.signed_id
+  end
+
+  private
+
+  def upload_test_file_filename(file)
+    return file.original_filename if file.respond_to? :original_filename
+
+    file.split("/").last
+  end
+
+  def upload_test_file_content_type(file)
+    return file.content_type if file.respond_to? :content_type
+
+    MIME::Types.type_for(file).first.content_type
+  end
 end
 
 RSpec.configure do |config|
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/autocomplete_select.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/autocomplete_select.rb
new file mode 100644
index 0000000000000..bd63a5037a361
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/autocomplete_select.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Capybara
+  module AutoCompleteJS
+    def autocomplete_select(value, from:)
+      within("div[data-autocomplete-for='#{from}']") do
+        find(".autocomplete-input").click
+        find(".autocomplete-input").native.send_keys(value[0..4])
+        expect(page).to have_css("#autoComplete_list_1") # select should be open now
+
+        expect(page).to have_css("#autoComplete_result_0", text: value)
+        find("#autoComplete_result_0", text: value).hover
+        expect(page).to have_css("#autoComplete_result_0", text: value)
+        find("#autoComplete_result_0", text: value).click
+        expect(page).to have_css(".autocomplete__selected-item", text: value)
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::AutoCompleteJS, type: :system
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/capybara.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/capybara.rb
index 75c76fe430594..03876072b4002 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/capybara.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/capybara.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "selenium-webdriver"
-require "system_test_html_screenshots"
 
 module Decidim
   # Helpers meant to be used only during capybara test runs.
@@ -9,7 +8,7 @@ module CapybaraTestHelpers
     def switch_to_host(host = "lvh.me")
       raise "Can't switch to a custom host unless it really exists. Use `whatever.lvh.me` as a workaround." unless /lvh\.me$/.match?(host)
 
-      app_host = (host ? "http://#{host}" : nil)
+      app_host = (host ? "#{protocol}://#{host}" : nil)
       Capybara.app_host = app_host
     end
 
@@ -18,7 +17,13 @@ def switch_to_default_host
     end
 
     def switch_to_secure_context_host
-      Capybara.app_host = "http://localhost"
+      Capybara.app_host = "#{protocol}://localhost"
+    end
+
+    def protocol
+      return "https" if ENV["TEST_SSL"]
+
+      "http"
     end
   end
 end
@@ -32,11 +37,50 @@ def switch_to_secure_context_host
                   else
                     "--window-size=1920,1080"
                   end
+  options.args << "--ignore-certificate-errors" if ENV["TEST_SSL"]
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    capabilities: [options]
+  )
+end
+
+1.step do
+  port = rand(5000..6999)
+  begin
+    Socket.tcp("127.0.0.1", port, connect_timeout: 5).close
+  rescue Errno::ECONNREFUSED
+    # When connection is refused, the port is available for use.
+    Capybara.server_port = port
+    break
+  end
+end
+
+# In order to work with PWA apps, Chrome can't be run in headless mode, and requires
+# setting up special prefs and flags
+Capybara.register_driver :pwa_chrome do |app|
+  options = ::Selenium::WebDriver::Chrome::Options.new
+  options.args << "--no-sandbox"
+  # Don't limit browser resources
+  options.args << "--disable-dev-shm-usage"
+  # Add pwa.lvh.me host as a secure origin
+  options.args << "--unsafely-treat-insecure-origin-as-secure=http://pwa.lvh.me:#{Capybara.server_port}"
+  # User data flag is mandatory when preferences and locale state is set
+  options.args << "--user-data-dir=/tmp/decidim_tests_user_data_#{rand(1000)}"
+  options.args << if ENV["BIG_SCREEN_SIZE"].present?
+                    "--window-size=1920,3000"
+                  else
+                    "--window-size=1920,1080"
+                  end
+  # Set notifications allowed in http protocol
+  options.local_state["browser.enabled_labs_experiments"] = ["enable-system-notifications@1", "unsafely-treat-insecure-origin-as-secure"]
+  # Mark notification permission as enabled
+  options.prefs["profile.default_content_setting_values.notifications"] = 1
 
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    options: options
+    capabilities: [options]
   )
 end
 
@@ -49,13 +93,22 @@ def switch_to_secure_context_host
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    options: options
+    capabilities: [options]
   )
 end
 
-Capybara.server = :puma, { Silent: true, Threads: "1:1" }
-
-Capybara.asset_host = "http://localhost:3000"
+server_options = { Silent: true, queue_requests: false }
+if ENV["TEST_SSL"]
+  dev_gem = Bundler.load.specs.find { |spec| spec.name == "decidim-dev" }
+  cert_dir = "#{dev_gem.full_gem_path}/lib/decidim/dev/assets"
+  server_options.merge!(
+    Host: "ssl://#{Capybara.server_host}:#{Capybara.server_port}?key=#{cert_dir}/ssl-key.pem&cert=#{cert_dir}/ssl-cert.pem"
+  )
+  Capybara.asset_host = "https://localhost:3000"
+else
+  Capybara.asset_host = "http://localhost:3000"
+end
+Capybara.server = :puma, server_options
 
 Capybara.server_errors = [SyntaxError, StandardError]
 
@@ -65,6 +118,21 @@ def switch_to_secure_context_host
   config.before :each, type: :system do
     driven_by(:headless_chrome)
     switch_to_default_host
+    domain = (try(:organization) || try(:current_organization))&.host
+    if domain
+      # Javascript sets the cookie also for all subdomains but localhost is a
+      # special case.
+      domain = ".#{domain}" unless domain == "localhost"
+      page.driver.browser.execute_cdp(
+        "Network.setCookie",
+        domain: domain,
+        name: Decidim.consent_cookie_name,
+        value: { essential: true }.to_json,
+        path: "/",
+        expires: 1.day.from_now.to_i,
+        same_site: "Lax"
+      )
+    end
   end
 
   config.before :each, driver: :rack_test do
@@ -80,7 +148,7 @@ def switch_to_secure_context_host
   end
 
   config.after(type: :system) do |example|
-    warn page.driver.browser.manage.logs.get(:browser) unless example.metadata[:driver].eql?(:rack_test)
+    warn page.driver.browser.logs.get(:browser) unless example.metadata[:driver].eql?(:rack_test)
   end
 
   config.include Decidim::CapybaraTestHelpers, type: :system
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
index 72f5d82a3953b..eb741fe93cdae 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/comments.rb
@@ -3,7 +3,7 @@
 module CommentsHelpers
   def have_comment_from(user, text, opts = {})
     within "#comments" do
-      have_content(user.name, opts) && have_content(text, opts)
+      have_content(user.name, **opts) && have_content(text, **opts)
     end
   end
 
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/component.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/component.rb
index 720db84c7a7ca..c244e2dd8a370 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/component.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/component.rb
@@ -89,7 +89,7 @@ class DummyResource < ApplicationRecord
       include Followable
       include Traceable
       include Publicable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Searchable
       include Paddable
       include Amendable
@@ -236,8 +236,8 @@ def serialize
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
-    settings.attribute :dummy_global_attribute_1, type: :boolean
-    settings.attribute :dummy_global_attribute_2, type: :boolean, readonly: ->(_context) { false }
+    settings.attribute :dummy_global_attribute1, type: :boolean
+    settings.attribute :dummy_global_attribute2, type: :boolean, readonly: ->(_context) { false }
     settings.attribute :readonly_attribute, type: :boolean, default: true, readonly: ->(_context) { true }
     settings.attribute :enable_pads_creation, type: :boolean, default: false
     settings.attribute :amendments_enabled, type: :boolean, default: false
@@ -246,8 +246,8 @@ def serialize
 
   component.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
-    settings.attribute :dummy_step_attribute_1, type: :boolean
-    settings.attribute :dummy_step_attribute_2, type: :boolean, readonly: ->(_context) { false }
+    settings.attribute :dummy_step_attribute1, type: :boolean
+    settings.attribute :dummy_step_attribute2, type: :boolean, readonly: ->(_context) { false }
     settings.attribute :dummy_step_translatable_text, type: :text, translated: true, editor: true, required: true
     settings.attribute :readonly_step_attribute, type: :boolean, default: true, readonly: ->(_context) { true }
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/controller_example_group.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/controller_example_group.rb
new file mode 100644
index 0000000000000..b394d86fdfc55
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/controller_example_group.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ControllerExampleGroup
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def routes
+        before do
+          routes = yield
+          @orig_default_url_options = routes.default_url_options.dup
+          routes.default_url_options[:script_name] = ""
+
+          self.routes = routes
+        end
+
+        after do
+          routes.default_url_options = @orig_default_url_options
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Decidim::ControllerExampleGroup, type: :controller
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/data_consent.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/data_consent.rb
new file mode 100644
index 0000000000000..8a53e6bce41a5
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/data_consent.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Capybara
+  module DataConsent
+    # Update data consent
+    def data_consent(categories = "all", options = {})
+      visit decidim.root_path if options[:visit_root]
+
+      dialog_present = begin
+        find("#dc-dialog-wrapper")
+      rescue Capybara::ElementNotFound => _e
+        false
+      end
+
+      if dialog_present
+        click_button "Settings"
+      else
+        within ".footer" do
+          click_link "Cookie settings"
+        end
+      end
+
+      if [true, "all"].include?(categories)
+        click_button "Accept all"
+      elsif categories.is_a?(Array)
+        categories.each do |category|
+          within "[data-id='#{category}']" do
+            find(".switch-paddle").click
+          end
+        end
+        click_button "Save settings"
+      elsif [false, "essential"].include?(categories)
+        click_button "Accept only essential"
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::DataConsent, type: :system
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/dynamic_attach.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/dynamic_attach.rb
new file mode 100644
index 0000000000000..07d9d6056058d
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/dynamic_attach.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Adapted from https://github.com/JedWatson/react-select/issues/832#issuecomment-276441836
+
+module Capybara
+  module UploadModal
+    # Replaces attach_file.
+    # Beware that modal does not open within form!
+    def dynamically_attach_file(name, file_location, options = {})
+      find("##{name}_button").click
+      filename = options[:filename] || file_location.to_s.split("/").last
+
+      yield if block_given?
+
+      within ".upload-modal" do
+        find(".remove-upload-item").click if options[:remove_before]
+        input_element = find("input[type='file']", visible: :all)
+        input_element.attach_file(file_location)
+        within "[data-filename='#{filename}']" do
+          expect(page).to have_css("div.progress-bar.filled", wait: 5)
+        end
+        all("input.attachment-title").last.set(options[:title]) if options.has_key?(:title)
+        click_button "Save" unless options[:keep_modal_open]
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::UploadModal, type: :system
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/frontend.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/frontend.rb
index 14c2303781b89..10ee1d90a1d99 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/frontend.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/frontend.rb
@@ -4,7 +4,7 @@ module FrontendHelpers
   # Thanks to:
   # https://medium.com/@coorasse/catch-javascript-errors-in-your-system-tests-89c2fe6773b1
   def expect_no_js_errors
-    errors = page.driver.browser.manage.logs.get(:browser)
+    errors = page.driver.browser.logs.get(:browser)
     return if errors.blank?
 
     aggregate_failures "javascript errors" do
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/geocoder.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/geocoder.rb
index bca579e1264da..4ce5cc967b77c 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/geocoder.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/geocoder.rb
@@ -17,8 +17,9 @@ def stub_geocoding(address, coordinates)
   # Waits for the front-end geocoding request to finish in order to ensure there
   # are no pending requests when proceeding.
   def fill_in_geocoding(attribute, options = {})
-    fill_in attribute, options
-    expect(page).to have_selector(".tribute-container ul#results", count: 1)
+    fill_in attribute, **options
+    expect(page).to have_selector(".autoComplete_wrapper ul#autoComplete_list_1", count: 1)
+    find("li#autoComplete_result_0").click
   end
 
   module_function
@@ -38,6 +39,7 @@ module Decidim::Map::Provider
   module Geocoding
     class Test < ::Decidim::Map::Geocoding; end
   end
+
   module Autocomplete
     class Test < ::Decidim::Map::Autocomplete
       def self.stubs
@@ -66,9 +68,11 @@ def javascript_snippets
       end
     end
   end
+
   module DynamicMap
     class Test < ::Decidim::Map::DynamicMap; end
   end
+
   module StaticMap
     class Test < ::Decidim::Map::StaticMap; end
   end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/html_matchers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/html_matchers.rb
index ff85ca999eb42..818eedf2b677d 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/html_matchers.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/html_matchers.rb
@@ -2,6 +2,16 @@
 
 require "rspec-html-matchers"
 
+module EscapeHtmlHelpers
+  def escaped_html(string)
+    CGI.escapeHTML(string)
+  end
+
+  def have_escaped_html(string)
+    include(escaped_html(string))
+  end
+end
+
 RSpec::Matchers.define(:have_equivalent_markup_to) do |expected|
   cleaner = ->(str) { str.gsub(/>[[:space:]]*/, ">").gsub(/[[:space:]]*</, "<").strip }
 
@@ -14,4 +24,5 @@
 
 RSpec.configure do |config|
   config.include RSpecHtmlMatchers
+  config.include EscapeHtmlHelpers
 end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/imports_controller_shared_examples.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/imports_controller_shared_examples.rb
index 3b9a13977fdfe..d4a48dc38f1fb 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/imports_controller_shared_examples.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/imports_controller_shared_examples.rb
@@ -19,14 +19,9 @@
   end
 
   describe "POST create" do
-    let(:file) do
-      # The file does not really matter for the dummies creator because it
-      # will always create a record for each data row regardless of the data.
-      Rack::Test::UploadedFile.new(
-        Decidim::Dev.test_file("import_proposals.csv", "text/csv"),
-        "text/csv"
-      )
-    end
+    # The file does not really matter for the dummies creator because it
+    # will always create a record for each data row regardless of the data.
+    let(:file) { upload_test_file(Decidim::Dev.test_file("import_proposals.csv", "text/csv")) }
     let(:params) do
       default_params.merge(extra_params).merge(file: file)
     end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/network_conditions_helpers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/network_conditions_helpers.rb
new file mode 100644
index 0000000000000..48fd7339fedaa
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/network_conditions_helpers.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module NetworkConditionsHelpers
+  def with_browser_in_offline_mode
+    page.driver.browser.network_conditions = { offline: true }
+
+    # Wait for the browser to be offline
+    sleep 1
+
+    yield
+
+    page.driver.browser.network_conditions = { offline: false }
+  end
+end
+
+RSpec.configure do |config|
+  config.include NetworkConditionsHelpers, type: :system
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/rake_tasks.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/rake_tasks.rb
index 1f41383252684..9ce0f0ed68caa 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/rake_tasks.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/rake_tasks.rb
@@ -32,7 +32,6 @@ module RakeTaskOutputHelpers
   included do
     let!(:original_stdout) { $stdout }
 
-    # rubocop:disable RSpec/ExpectOutput
     before do
       $stdout = StringIO.new
     end
@@ -40,7 +39,6 @@ module RakeTaskOutputHelpers
     after do
       $stdout = original_stdout
     end
-    # rubocop:enable RSpec/ExpectOutput
   end
 
   def check_no_errors_have_been_printed
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/react_select.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/react_select.rb
deleted file mode 100644
index 3ffb94365f271..0000000000000
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/react_select.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# Adapted from https://github.com/JedWatson/react-select/issues/832#issuecomment-276441836
-
-module Capybara
-  module ReactSelect
-    def autocomplete_select(value, from:)
-      within("div[data-autocomplete-for='#{from}']") do
-        find(".Select-control").click
-
-        find(".Select .Select-input input").native.send_keys(value[0..4])
-        expect(page).to have_css(".Select-menu-outer") # select should be open now
-
-        # This is a little funky because when the entered text forces the select to
-        # wrap, it causes React to re-render.  We need to get it to re-render
-        # (if needed) by hovering.
-        expect(page).to have_css(".Select-option", text: value)
-        find(".Select-option", text: value).hover
-        expect(page).to have_css(".Select-option", text: value)
-        find(".Select-option", text: value).click
-        expect(page).to have_css(".Select-value-label", text: value)
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include Capybara::ReactSelect, type: :system
-end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/screenshot_helper.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/screenshot_helper.rb
new file mode 100644
index 0000000000000..289551dc8df95
--- /dev/null
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/screenshot_helper.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "action_dispatch/system_testing/test_helpers/screenshot_helper"
+
+module ActionDispatch
+  module SystemTesting
+    module TestHelpers
+      module ScreenshotHelper
+        private
+
+        # Customize the screenshot helper to fix the file paths for examples that have
+        # unallowed characters in them. Otherwise the artefacts creation and upload
+        # fails at GitHub actions. See the list of unallowed characters from:
+        # https://github.com/actions/toolkit/blob/main/packages/artifact/docs/additional-information.md#non-supported-characters
+        def image_name
+          # By default, this only cleans up the forward and backward slash characters.
+          sanitized_method_name = method_name.tr("/\\()\":<>|*?", "-----------")
+          name = "#{unique}_#{sanitized_method_name}"
+          name[0...225]
+        end
+
+        # Add the file URI scheme so terminal emulators can open one click
+        def display_image
+          message = +"[Screenshot Image]: file://#{image_path}\n"
+          message << +"[Screenshot HTML]: file://#{html_path}\n" if save_html?
+
+          case output_type
+          when "artifact"
+            message << "\e]1338;url=artifact://#{absolute_image_path}\a\n"
+          when "inline"
+            name = inline_base64(File.basename(absolute_image_path))
+            image = inline_base64(File.read(absolute_image_path))
+            message << "\e]1337;File=name=#{name};height=400px;inline=1:#{image}\a\n"
+          end
+
+          message
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/warden.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/warden.rb
index e1e195ed31518..33f2481f36ac7 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/warden.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/warden.rb
@@ -18,6 +18,7 @@ def relogin_as(user, scope: :user)
 
 RSpec.configure do |config|
   config.include Decidim::WardenTestHelpers, type: :system
+  config.include Decidim::WardenTestHelpers, type: :request
   config.include Devise::Test::ControllerHelpers, type: :controller
 
   config.before :each, type: :cell do
@@ -30,4 +31,8 @@ def relogin_as(user, scope: :user)
   config.after :each, type: :system do
     Warden.test_reset!
   end
+
+  config.after :each, type: :request do
+    Warden.test_reset!
+  end
 end
diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/wicked_pdf_assets_mock.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/wicked_pdf_assets_mock.rb
index 78d9e658ca2f5..b9a7a118a9474 100644
--- a/decidim-dev/lib/decidim/dev/test/rspec_support/wicked_pdf_assets_mock.rb
+++ b/decidim-dev/lib/decidim/dev/test/rspec_support/wicked_pdf_assets_mock.rb
@@ -8,6 +8,10 @@ module Assets
       def wicked_pdf_stylesheet_pack_tag(*sources)
         stylesheet_pack_tag(*sources)
       end
+
+      # Disables the images in the PDFs as those requests would be jamming under
+      # the test environment
+      def wicked_pdf_image_tag(img, options = {}); end
     end
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/test/spec_helper.rb b/decidim-dev/lib/decidim/dev/test/spec_helper.rb
index 62caebacb7987..29d626db3d93e 100644
--- a/decidim-dev/lib/decidim/dev/test/spec_helper.rb
+++ b/decidim-dev/lib/decidim/dev/test/spec_helper.rb
@@ -4,7 +4,6 @@
 require "rspec/rails"
 require "rspec/cells"
 require "byebug"
-require "rectify/rspec"
 require "wisper/rspec/stub_wisper_publisher"
 require "db-query-matchers"
 require "action_view/helpers/sanitize_helper"
@@ -14,13 +13,13 @@
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./rspec_support/ and its subdirectories.
-Dir["#{__dir__}/rspec_support/**/*.rb"].sort.each { |f| require f }
+Dir["#{__dir__}/rspec_support/**/*.rb"].each { |f| require f }
 
 require_relative "factories"
 
 RSpec.configure do |config|
   config.color = true
-  config.fail_fast = ENV["FAIL_FAST"] == "true"
+  config.fail_fast = ENV.fetch("FAIL_FAST", nil) == "true"
   config.infer_spec_type_from_file_location!
   config.mock_with :rspec
   config.order = :random
@@ -32,7 +31,6 @@
   # instead of true.
   config.use_transactional_fixtures = true
 
-  config.include Rectify::RSpec::Helpers
   config.include ActionView::Helpers::SanitizeHelper
   config.include ERB::Util
 end
diff --git a/decidim-dev/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb b/decidim-dev/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb
index 78b10d01c40f9..72a09d173f794 100644
--- a/decidim-dev/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb
+++ b/decidim-dev/lib/decidim/dev/test/w3c_rspec_validators_overrides.rb
@@ -3,8 +3,13 @@
 # This is a temporary fix to ignore some HTML/CSS validation issues with the
 # Decidim HTML validation process.
 #
-# See: https://github.com/decidim/decidim/issues/8596
-# Related: https://github.com/w3c/css-validator/issues/355
+# See:
+# - https://github.com/decidim/decidim/issues/8596
+# - https://github.com/decidim/decidim/pull/10014
+# Related:
+# - https://github.com/w3c/css-validator/issues/355
+# - https://github.com/rails/rails/issues/46405
+# - https://github.com/foundation/foundation-sites/pull/12496
 module W3CValidators
   class NuValidator
     protected
@@ -17,7 +22,9 @@ def validate(options) # :nodoc:
 
     def ignore_errors
       @ignore_errors ||= [
-        "CSS: “--content-height�: One operand must be a number."
+        "CSS: “--content-height�: One operand must be a number.",
+        "An “input� element with a “type� attribute whose value is “hidden� must not have an “autocomplete� attribute whose value is “on� or “off�.",
+        "An “input� element with a “type� attribute whose value is “hidden� must not have any “aria-*� attributes."
       ]
     end
 
@@ -36,12 +43,10 @@ def filter_results(results)
 # This allows us to dynamically load the validator URL from the ENV.
 module W3cRspecValidators
   class Config
-    # rubocop:disable Naming/MemoizedInstanceVariableName
     def self.get
       @config ||= {
         w3c_service_uri: ENV.fetch("VALIDATOR_HTML_URI", "https://validator.w3.org/nu/")
       }.stringify_keys
     end
-    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 end
diff --git a/decidim-dev/lib/decidim/dev/version.rb b/decidim-dev/lib/decidim/dev/version.rb
index b01d6df3e789a..d53f68508acff 100644
--- a/decidim-dev/lib/decidim/dev/version.rb
+++ b/decidim-dev/lib/decidim/dev/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-dev/lib/tasks/generators.rake b/decidim-dev/lib/tasks/generators.rake
index 3e7bf48ab3f22..b466a0859c14b 100644
--- a/decidim-dev/lib/tasks/generators.rake
+++ b/decidim-dev/lib/tasks/generators.rake
@@ -32,7 +32,9 @@ namespace :decidim do
       "--skip_spring",
       "--demo",
       "--force_ssl",
-      "false"
+      "false",
+      "--locales",
+      "en,ca,es"
     )
   end
 
@@ -48,7 +50,10 @@ namespace :decidim do
         "--recreate_db",
         "--seed_db",
         "--demo",
-        "--profiling"
+        "--profiling",
+        "--locales",
+        "en,ca,es",
+        "--dev_ssl"
       )
     end
   end
diff --git a/decidim-dev/lib/tasks/lighthouse_report.rake b/decidim-dev/lib/tasks/lighthouse_report.rake
new file mode 100644
index 0000000000000..4f019a96b9db6
--- /dev/null
+++ b/decidim-dev/lib/tasks/lighthouse_report.rake
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :lighthouse do
+    desc "Prepares seeds for Lighthouse report"
+    task prepare_urls: :environment do
+      # Lighhouse report is executed in CI and should check:
+      # - homepage
+      # - a participatory process page
+      # - a meeting page
+      # - a proposal page
+      #
+      # Because seeds make urls dynamic, this task updates the lighthouse configuration
+      # to add dynamically the urls to check.
+
+      host = "http://localhost:3000"
+      urls = ["/"]
+      urls << ::Decidim::ResourceLocatorPresenter.new(Decidim::ParticipatoryProcess.published.first).path
+      urls << ::Decidim::ResourceLocatorPresenter.new(Decidim::Meetings::Meeting.published.first).path
+      urls << ::Decidim::ResourceLocatorPresenter.new(Decidim::Proposals::Proposal.published.first).path
+
+      # Update lighthouse configuration with the urls
+      lighthouse_rc_path = Rails.root.join("../.lighthouserc.json")
+      lighthouserc = JSON.parse(File.read(lighthouse_rc_path))
+      lighthouserc["ci"]["collect"]["url"] = urls.map { |url| "#{host}#{url}" }
+      File.write(lighthouse_rc_path, lighthouserc.to_json)
+    end
+  end
+end
diff --git a/decidim-dev/lib/tasks/locale_checker.rake b/decidim-dev/lib/tasks/locale_checker.rake
index 6627a8f61205b..c06c741a55b96 100644
--- a/decidim-dev/lib/tasks/locale_checker.rake
+++ b/decidim-dev/lib/tasks/locale_checker.rake
@@ -5,7 +5,7 @@ namespace :decidim do
   task check_locales: :environment do
     FileUtils.remove_dir("tmp/decidim_repo", true)
 
-    branch = ENV["TARGET_BRANCH"] || "develop"
+    branch = ENV.fetch("TARGET_BRANCH", nil) || "develop"
     status = system("git clone --depth=1 --single-branch --branch #{branch} https://github.com/decidim/decidim tmp/decidim_repo")
     return unless status
 
diff --git a/decidim-dev/spec/system/accessibility_tool_spec.rb b/decidim-dev/spec/system/accessibility_tool_spec.rb
index 646b0a6c27d58..e129d080664ba 100644
--- a/decidim-dev/spec/system/accessibility_tool_spec.rb
+++ b/decidim-dev/spec/system/accessibility_tool_spec.rb
@@ -12,7 +12,7 @@ def protect_against_forgery?
       end
     end
   end
-  let(:template) { template_class.new }
+  let(:template) { template_class.new(ActionView::LookupContext.new(ActionController::Base.view_paths), {}, []) }
 
   let(:html_document) do
     document_inner = html_body
diff --git a/decidim-elections/README.md b/decidim-elections/README.md
index e9c3598995007..f6a809e9fd2f8 100644
--- a/decidim-elections/README.md
+++ b/decidim-elections/README.md
@@ -8,7 +8,7 @@ The Elections module adds elections to any participatory space.
 
 Elections will be available as a Component for a Participatory Space.
 
-In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://github.com/decidim/decidim/blob/develop/docs/services/elections_bulletin_board.md).
+In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://docs.decidim.org/en/services/elections_bulletin_board/).
 
 ## Installation
 
diff --git a/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb b/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb
index 0f84acc4493b8..be7def20c15d5 100644
--- a/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb
+++ b/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_votings" class="wrapper-home home-section">
   <div class="row" id="highlighted-votings">
     <h3 class="section-heading"><%= t("active_votings", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb b/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb
index 9965e11bc72c1..0dfc47c2221e3 100644
--- a/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb
+++ b/decidim-elections/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb
@@ -6,10 +6,6 @@ module ContentBlocks
       class HighlightedVotingsCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_votings.any?
         end
diff --git a/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb b/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb
index f01bf61114843..4df87dadfce45 100644
--- a/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb
+++ b/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb
@@ -16,7 +16,7 @@ def introductory_image
           end
 
           def description_text
-            decidim_sanitize_editor(translated_attribute(current_participatory_space.description))
+            decidim_sanitize_editor_admin(translated_attribute(current_participatory_space.description))
           end
         end
       end
diff --git a/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb b/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb
index a020290272bbb..e8b7e60cd8b84 100644
--- a/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb
+++ b/decidim-elections/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb
@@ -74,7 +74,7 @@ def navigation_items
                   url: decidim_votings.voting_path(current_participatory_space),
                   active: is_active_link?(decidim_votings.voting_path(current_participatory_space), :exclusive)
                 },
-                if current_participatory_space.dataset.present?
+                if current_participatory_space.check_census_enabled?
                   {
                     name: t("layouts.decidim.voting_navigation.check_census"),
                     url: decidim_votings.voting_check_census_path(current_participatory_space),
diff --git a/decidim-elections/app/commands/decidim/elections/admin/add_user_as_trustee.rb b/decidim-elections/app/commands/decidim/elections/admin/add_user_as_trustee.rb
index cb84f5c79fe81..08ca9c57b6e9c 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/add_user_as_trustee.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/add_user_as_trustee.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the admin user creates a trustee
       # from the admin panel.
-      class AddUserAsTrustee < Rectify::Command
+      class AddUserAsTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/elections/admin/create_answer.rb b/decidim-elections/app/commands/decidim/elections/admin/create_answer.rb
index ee29abb808f45..bb875a0d4446b 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/create_answer.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/create_answer.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user creates an Answer
       # from the admin panel.
-      class CreateAnswer < Rectify::Command
+      class CreateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/create_election.rb b/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
index 2dea3259f21dd..afff6ca6313db 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/create_election.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user creates an Election
       # from the admin panel.
-      class CreateElection < Rectify::Command
+      class CreateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/create_question.rb b/decidim-elections/app/commands/decidim/elections/admin/create_question.rb
index 688e4fd508534..687c077db7ad3 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/create_question.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/create_question.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user creates a Question
       # from the admin panel.
-      class CreateQuestion < Rectify::Command
+      class CreateQuestion < Decidim::Command
         def initialize(form)
           @form = form
         end
diff --git a/decidim-elections/app/commands/decidim/elections/admin/destroy_answer.rb b/decidim-elections/app/commands/decidim/elections/admin/destroy_answer.rb
index ba35ca5df4c0c..e260ebe8d876e 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/destroy_answer.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/destroy_answer.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user destroys an Answer
       # from the admin panel.
-      class DestroyAnswer < Rectify::Command
+      class DestroyAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/destroy_election.rb b/decidim-elections/app/commands/decidim/elections/admin/destroy_election.rb
index 5189ea8ac5713..526a7f5caf455 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/destroy_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/destroy_election.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user destroys an Election
       # from the admin panel.
-      class DestroyElection < Rectify::Command
+      class DestroyElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/destroy_question.rb b/decidim-elections/app/commands/decidim/elections/admin/destroy_question.rb
index eb7815ac276a6..21a7e67e09934 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/destroy_question.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/destroy_question.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user destroys a Question
       # from the admin panel.
-      class DestroyQuestion < Rectify::Command
+      class DestroyQuestion < Decidim::Command
         def initialize(question, current_user)
           @question = question
           @current_user = current_user
diff --git a/decidim-elections/app/commands/decidim/elections/admin/end_vote.rb b/decidim-elections/app/commands/decidim/elections/admin/end_vote.rb
index 9cf781a45a97f..c45bc9f4ec27d 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/end_vote.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/end_vote.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to end the voting period in the Bulletin Board.
-      class EndVote < Rectify::Command
+      class EndVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period
diff --git a/decidim-elections/app/commands/decidim/elections/admin/import_proposals_to_elections.rb b/decidim-elections/app/commands/decidim/elections/admin/import_proposals_to_elections.rb
index b9dfdfd5dd3d7..125fd89fab23d 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/import_proposals_to_elections.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/import_proposals_to_elections.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # A command is executed when an admin imports proposals from
       # one component to answers of elections component.
-      class ImportProposalsToElections < Rectify::Command
+      class ImportProposalsToElections < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/elections/admin/publish_election.rb b/decidim-elections/app/commands/decidim/elections/admin/publish_election.rb
index 6e1a1b282b47f..65bfe662a8d2f 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/publish_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/publish_election.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is published from the admin panel.
-      class PublishElection < Rectify::Command
+      class PublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to publish.
diff --git a/decidim-elections/app/commands/decidim/elections/admin/publish_results.rb b/decidim-elections/app/commands/decidim/elections/admin/publish_results.rb
index 4931463fd5b54..5178be5b4ebf4 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/publish_results.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/publish_results.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to publish the election results in the Bulletin Board.
-      class PublishResults < Rectify::Command
+      class PublishResults < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to publish the results
diff --git a/decidim-elections/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb b/decidim-elections/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb
index 8decd6fb24665..7be488c2a859b 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the admin user removes a trustee
       # from a participatory space from the admin panel.
-      class RemoveTrusteeFromParticipatorySpace < Rectify::Command
+      class RemoveTrusteeFromParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space
diff --git a/decidim-elections/app/commands/decidim/elections/admin/report_missing_trustee.rb b/decidim-elections/app/commands/decidim/elections/admin/report_missing_trustee.rb
index 461f449efe0f8..6ef21f6f148c9 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/report_missing_trustee.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/report_missing_trustee.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to report a missing trustee during the tally process.
-      class ReportMissingTrustee < Rectify::Command
+      class ReportMissingTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A ReportMissingTrusteeForm object with the information needed to report the missing trustee.
diff --git a/decidim-elections/app/commands/decidim/elections/admin/setup_election.rb b/decidim-elections/app/commands/decidim/elections/admin/setup_election.rb
index 1e9bf390e942f..babf7f73de974 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/setup_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/setup_election.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is setup from the admin panel.
-      class SetupElection < Rectify::Command
+      class SetupElection < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A SetupForm object with the information needed to setup the election
diff --git a/decidim-elections/app/commands/decidim/elections/admin/start_key_ceremony.rb b/decidim-elections/app/commands/decidim/elections/admin/start_key_ceremony.rb
index 9c4e930aa42ff..84b87a9126269 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/start_key_ceremony.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/start_key_ceremony.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the key ceremony in the Bulletin Board.
-      class StartKeyCeremony < Rectify::Command
+      class StartKeyCeremony < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action
diff --git a/decidim-elections/app/commands/decidim/elections/admin/start_tally.rb b/decidim-elections/app/commands/decidim/elections/admin/start_tally.rb
index bd8ba65b0aa67..420ab79f97600 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/start_tally.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/start_tally.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the tally in the Bulletin Board.
-      class StartTally < Rectify::Command
+      class StartTally < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action
diff --git a/decidim-elections/app/commands/decidim/elections/admin/start_vote.rb b/decidim-elections/app/commands/decidim/elections/admin/start_vote.rb
index ea49769c328d3..1fb56c1f8fb34 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/start_vote.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/start_vote.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the voting period in the Bulletin Board.
-      class StartVote < Rectify::Command
+      class StartVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period
diff --git a/decidim-elections/app/commands/decidim/elections/admin/unpublish_election.rb b/decidim-elections/app/commands/decidim/elections/admin/unpublish_election.rb
index 1008bc0a67e88..f36628f387ca0 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/unpublish_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/unpublish_election.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is unpublished from the admin panel.
-      class UnpublishElection < Rectify::Command
+      class UnpublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to unpublish.
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_action_status.rb b/decidim-elections/app/commands/decidim/elections/admin/update_action_status.rb
index 191426940425a..f90afd15ed17d 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_action_status.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_action_status.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command updates the status of the action and the election if it got changed
-      class UpdateActionStatus < Rectify::Command
+      class UpdateActionStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # action - The pending action to be updated
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_answer.rb b/decidim-elections/app/commands/decidim/elections/admin/update_answer.rb
index 31dce2ff8eeeb..6c4c9a9e10635 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_answer.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_answer.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user updates an Answer
       # from the admin panel.
-      class UpdateAnswer < Rectify::Command
+      class UpdateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_answer_selection.rb b/decidim-elections/app/commands/decidim/elections/admin/update_answer_selection.rb
index 4ff7cec77f369..b91d48698efd4 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_answer_selection.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_answer_selection.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when an admin marks an answer
       # as selected.
-      class UpdateAnswerSelection < Rectify::Command
+      class UpdateAnswerSelection < Decidim::Command
         def initialize(answer, selected)
           @answer = answer
           @selected = selected
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_election.rb b/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
index 1f38c62142849..922ce98e602b0 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_election.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user updates an Election
       # from the admin panel.
-      class UpdateElection < Rectify::Command
+      class UpdateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_question.rb b/decidim-elections/app/commands/decidim/elections/admin/update_question.rb
index 9279cf49dc375..930d266fb6ada 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_question.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_question.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user updates a Question
       # from the admin panel.
-      class UpdateQuestion < Rectify::Command
+      class UpdateQuestion < Decidim::Command
         def initialize(form, question)
           @form = form
           @question = question
diff --git a/decidim-elections/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb b/decidim-elections/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb
index c9f2655284726..1aa431be250da 100644
--- a/decidim-elections/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb
+++ b/decidim-elections/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb
@@ -5,7 +5,7 @@ module Elections
     module Admin
       # This command is executed when the user updates a trustee
       # status from the admin panel.
-      class UpdateTrusteeParticipatorySpace < Rectify::Command
+      class UpdateTrusteeParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space
diff --git a/decidim-elections/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb b/decidim-elections/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb
index 7488c9e9475e1..2bada23f4906f 100644
--- a/decidim-elections/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb
+++ b/decidim-elections/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command updates the election status if it got changed
-      class UpdateElectionBulletinBoardStatus < Rectify::Command
+      class UpdateElectionBulletinBoardStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # status - The actual election status
diff --git a/decidim-elections/app/commands/decidim/elections/trustee_zone/update_trustee.rb b/decidim-elections/app/commands/decidim/elections/trustee_zone/update_trustee.rb
index 8e011ca100018..81a479ebfa7df 100644
--- a/decidim-elections/app/commands/decidim/elections/trustee_zone/update_trustee.rb
+++ b/decidim-elections/app/commands/decidim/elections/trustee_zone/update_trustee.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command allows the user to update their trustee information
-      class UpdateTrustee < Rectify::Command
+      class UpdateTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with the new trustee information
diff --git a/decidim-elections/app/commands/decidim/elections/voter/cast_vote.rb b/decidim-elections/app/commands/decidim/elections/voter/cast_vote.rb
index d3da6ec74f154..8f27be8eaa0e8 100644
--- a/decidim-elections/app/commands/decidim/elections/voter/cast_vote.rb
+++ b/decidim-elections/app/commands/decidim/elections/voter/cast_vote.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command allows the user to store and cast their vote.
-      class CastVote < Rectify::Command
+      class CastVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with necessary info to cast a vote.
diff --git a/decidim-elections/app/commands/decidim/elections/voter/update_vote_status.rb b/decidim-elections/app/commands/decidim/elections/voter/update_vote_status.rb
index 84d9127d769e0..b772fbb1228ba 100644
--- a/decidim-elections/app/commands/decidim/elections/voter/update_vote_status.rb
+++ b/decidim-elections/app/commands/decidim/elections/voter/update_vote_status.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command updates the vote status and sends a notification.
-      class UpdateVoteStatus < Rectify::Command
+      class UpdateVoteStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # vote        - the vote that has been updated
@@ -74,7 +74,7 @@ def send_vote_notification
             }
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
 
         def send_vote_email
diff --git a/decidim-elections/app/commands/decidim/votings/admin/create_ballot_style.rb b/decidim-elections/app/commands/decidim/votings/admin/create_ballot_style.rb
index b2ae3edcab476..ba874ba455a3a 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/create_ballot_style.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/create_ballot_style.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create the ballot style
-      class CreateBallotStyle < Rectify::Command
+      class CreateBallotStyle < Decidim::Command
         def initialize(form)
           @form = form
         end
diff --git a/decidim-elections/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb b/decidim-elections/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb
index 7884e8f0c367b..635364da6a263 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new monitoring committee member
-      class CreateMonitoringCommitteeMember < Rectify::Command
+      class CreateMonitoringCommitteeMember < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params
diff --git a/decidim-elections/app/commands/decidim/votings/admin/create_polling_officer.rb b/decidim-elections/app/commands/decidim/votings/admin/create_polling_officer.rb
index 31f2b0329a526..96e5e5f8a115e 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/create_polling_officer.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/create_polling_officer.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new polling officer
-      class CreatePollingOfficer < Rectify::Command
+      class CreatePollingOfficer < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params
diff --git a/decidim-elections/app/commands/decidim/votings/admin/create_voting.rb b/decidim-elections/app/commands/decidim/votings/admin/create_voting.rb
index 89fc3dc7ed1a6..084d7e6836f25 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/create_voting.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/create_voting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with all the business logic when creating a new voting space
-      class CreateVoting < Rectify::Command
+      class CreateVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -51,7 +51,8 @@ def create_voting!
             banner_image: form.banner_image,
             introductory_image: form.introductory_image,
             voting_type: form.voting_type,
-            census_contact_information: form.census_contact_information
+            census_contact_information: form.census_contact_information,
+            show_check_census: form.show_check_census
           )
         end
       end
diff --git a/decidim-elections/app/commands/decidim/votings/admin/destroy_ballot_style.rb b/decidim-elections/app/commands/decidim/votings/admin/destroy_ballot_style.rb
index 7c262ec6143ce..0fc047f5c2398 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/destroy_ballot_style.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/destroy_ballot_style.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to delete the ballot style
-      class DestroyBallotStyle < Rectify::Command
+      class DestroyBallotStyle < Decidim::Command
         def initialize(ballot_style, current_user)
           @ballot_style = ballot_style
           @current_user = current_user
diff --git a/decidim-elections/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb b/decidim-elections/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb
index 607a2c118fa4e..5ca3a543a26c2 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to destroy a monitoring committee member
-      class DestroyMonitoringCommitteeMember < Rectify::Command
+      class DestroyMonitoringCommitteeMember < Decidim::Command
         # Public: Initializes the command.
         #
         # monitoring_committee_member - the MonitoringCommitteeMember to destroy
diff --git a/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_officer.rb b/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_officer.rb
index 41e3025457af4..1f5fce139e13e 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_officer.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_officer.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to destroy a poling officer
-      class DestroyPollingOfficer < Rectify::Command
+      class DestroyPollingOfficer < Decidim::Command
         # Public: Initializes the command.
         #
         # polling_officer - the PollingOfficer to destroy
diff --git a/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_station.rb b/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_station.rb
index b1fc6457c2237..2327569c5e719 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_station.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/destroy_polling_station.rb
@@ -5,7 +5,7 @@ module Votings
     module Admin
       # This command is executed when the user destroys a polling station
       # from the admin panel.
-      class DestroyPollingStation < Rectify::Command
+      class DestroyPollingStation < Decidim::Command
         def initialize(polling_station, current_user)
           @polling_station = polling_station
           @current_user = current_user
diff --git a/decidim-elections/app/commands/decidim/votings/admin/manage_polling_station.rb b/decidim-elections/app/commands/decidim/votings/admin/manage_polling_station.rb
index 32dea61247afb..52e1997ba9c90 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/manage_polling_station.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/manage_polling_station.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the shared business logic to manage a polling station
-      class ManagePollingStation < Rectify::Command
+      class ManagePollingStation < Decidim::Command
         def manage_polling_officers(polling_station, president_id, managers_ids)
           manage_president(polling_station, president_id)
           manage_managers(polling_station, managers_ids)
@@ -14,7 +14,7 @@ def manage_polling_officers(polling_station, president_id, managers_ids)
 
         def manage_president(polling_station, president_id)
           unassign_president(polling_station)
-          return if president_id.nil?
+          return if president_id.blank?
 
           assign_president(president_id, polling_station)
           notify_officer(president_id, polling_station.voting)
diff --git a/decidim-elections/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb b/decidim-elections/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb
index 8d9b13d4cbdb7..eaff03f8c2725 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with all the business logic for a monitornig committee member to validate a polling station closure
-      class MonitoringCommitteeValidatePollingStationClosure < Rectify::Command
+      class MonitoringCommitteeValidatePollingStationClosure < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/votings/admin/publish_voting.rb b/decidim-elections/app/commands/decidim/votings/admin/publish_voting.rb
index 8045c7b03a0b6..a2968a61c5da0 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/publish_voting.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/publish_voting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # This command gets called when a voting is published from the admin panel.
-      class PublishVoting < Rectify::Command
+      class PublishVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # voting - The voting to publish.
diff --git a/decidim-elections/app/commands/decidim/votings/admin/unpublish_voting.rb b/decidim-elections/app/commands/decidim/votings/admin/unpublish_voting.rb
index 0aeb4b5828806..2b6d86d87baf1 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/unpublish_voting.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/unpublish_voting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # This command gets called when a voting is unpublished from the admin panel.
-      class UnpublishVoting < Rectify::Command
+      class UnpublishVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # voting - The voting to unpublish.
diff --git a/decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb b/decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb
index 51fbf47cf894c..425dcbe53136f 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to update the ballot style
-      class UpdateBallotStyle < Rectify::Command
+      class UpdateBallotStyle < Decidim::Command
         def initialize(form, ballot_style)
           @form = form
           @ballot_style = ballot_style
diff --git a/decidim-elections/app/commands/decidim/votings/admin/update_voting.rb b/decidim-elections/app/commands/decidim/votings/admin/update_voting.rb
index d1ba458dc7fd3..9bf645c1696aa 100644
--- a/decidim-elections/app/commands/decidim/votings/admin/update_voting.rb
+++ b/decidim-elections/app/commands/decidim/votings/admin/update_voting.rb
@@ -5,7 +5,7 @@ module Votings
     module Admin
       # A command with all the business logic when updating an existing
       # voting in the system.
-      class UpdateVoting < Rectify::Command
+      class UpdateVoting < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -67,7 +67,8 @@ def attributes
             scope: form.scope,
             promoted: form.promoted,
             voting_type: form.voting_type,
-            census_contact_information: form.census_contact_information
+            census_contact_information: form.census_contact_information,
+            show_check_census: form.show_check_census
           }.merge(attachment_attributes(*image_fields))
         end
       end
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/create_dataset.rb b/decidim-elections/app/commands/decidim/votings/census/admin/create_dataset.rb
index b9722b26cd408..d1e5487ec28ca 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/create_dataset.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/create_dataset.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "English"
 require "csv"
 
 module Decidim
@@ -8,7 +9,9 @@ module Census
       module Admin
         # A command with the business logic to create census dataset for a
         # voting space.
-        class CreateDataset < Rectify::Command
+        class CreateDataset < Decidim::Command
+          include Decidim::ProcessesFileLocally
+
           def initialize(form, current_user)
             @form = form
             @current_user = current_user
@@ -23,23 +26,28 @@ def initialize(form, current_user)
           def call
             return broadcast(:invalid) unless form.valid?
 
-            dataset = create_census_dataset!
+            process_file_locally(form.file) do |file_path|
+              @file_path = file_path
+              dataset = create_census_dataset!
 
-            if csv_header_invalid?
-              dataset.destroy!
-              return broadcast(:invalid_csv_header)
-            end
+              if csv_header_invalid?
+                dataset.destroy!
+                return broadcast(:invalid_csv_header)
+              end
 
-            if dataset
-              CSV.foreach(form.file.tempfile.path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
-                CreateDatumJob.perform_later(current_user, dataset, row.fields)
+              if dataset
+                CSV.foreach(file_path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
+                  CreateDatumJob.perform_later(current_user, dataset, row.fields)
+                end
               end
             end
 
             broadcast(:ok)
           end
 
-          attr_reader :form, :current_user
+          private
+
+          attr_reader :form, :current_user, :file_path
           attr_accessor :dataset
 
           def create_census_dataset!
@@ -48,7 +56,7 @@ def create_census_dataset!
               current_user,
               {
                 voting: form.current_participatory_space,
-                file: form.file.original_filename,
+                filename: form.file.filename.to_s,
                 csv_row_raw_count: csv_row_count,
                 status: :creating_data
               },
@@ -57,31 +65,34 @@ def create_census_dataset!
           end
 
           def csv_header_invalid?
-            CSV.parse_line(File.open(form.file.tempfile.path), col_sep: ";", headers: true, header_converters: :symbol).headers != expected_headers
+            headers.blank? || headers != expected_headers
           end
 
           def headers
+            @headers ||= CSV.parse_line(File.open(file_path), col_sep: ";", headers: true, header_converters: :symbol)&.headers
+          end
+
+          def no_ballot_headers
             [:document_id, :document_type, :date_of_birth, :full_name, :full_address, :postal_code, :mobile_phone_number, :email_address]
           end
 
           def ballot_style_headers
-            headers.push(:ballot_style_code)
+            no_ballot_headers.push(:ballot_style_code)
           end
 
           def expected_headers
-            @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : headers
-          end
-
-          def csv_rows
-            @csv_rows ||= CSV.read(form.file.tempfile.path)
+            @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : no_ballot_headers
           end
 
           def csv_row_count
-            @csv_row_count ||= file_lines_count(form.file.tempfile.path) - 1
+            @csv_row_count ||= file_lines_count - 1
           end
 
-          def file_lines_count(file_path)
-            `wc -l "#{file_path.shellescape}"`.strip.split(" ")[0].to_i
+          # count lines in the most resource-efficient way using ruby, handles milions of lines with minimal memory footprint
+          def file_lines_count
+            lines = 0
+            File.foreach(file_path) { lines += 1 }
+            lines
           end
         end
       end
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/create_datum.rb b/decidim-elections/app/commands/decidim/votings/census/admin/create_datum.rb
index eecb892ed9e0b..abd27dd4a0080 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/create_datum.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/create_datum.rb
@@ -6,7 +6,7 @@ module Census
       module Admin
         # A command with the business logic to create the datum for a
         # dataset row.
-        class CreateDatum < Rectify::Command
+        class CreateDatum < Decidim::Command
           def initialize(form, dataset)
             @form = form
             @dataset = dataset
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/destroy_dataset.rb b/decidim-elections/app/commands/decidim/votings/census/admin/destroy_dataset.rb
index 870d410b7c678..c4f1715908e85 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/destroy_dataset.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/destroy_dataset.rb
@@ -8,7 +8,7 @@ module Census
       module Admin
         # A command with the business logic to destroy a census dataset
         # from the admin panel.
-        class DestroyDataset < Rectify::Command
+        class DestroyDataset < Decidim::Command
           def initialize(dataset, current_user)
             @dataset = dataset
             @current_user = current_user
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb b/decidim-elections/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb
index 6348cf65b5bb6..35284edf87262 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb
@@ -6,7 +6,7 @@ module Census
       module Admin
         # A command with the business logic to create increment the dataset
         # processed rows and change the state when the last is processed
-        class IncrementDatasetProcessedRows < Rectify::Command
+        class IncrementDatasetProcessedRows < Decidim::Command
           def initialize(dataset)
             @dataset = dataset
           end
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb b/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb
index 4a503cfa92f0f..a0ec9f7c9d011 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb
@@ -5,7 +5,7 @@ module Votings
     module Census
       module Admin
         # A command to launch the access codes export
-        class LaunchAccessCodesExport < Rectify::Command
+        class LaunchAccessCodesExport < Decidim::Command
           def initialize(dataset, user)
             @dataset = dataset
             @user = user
@@ -19,6 +19,8 @@ def initialize(dataset, user)
           def call
             return broadcast(:invalid) unless valid?
 
+            UpdateDataset.call(dataset, { status: :exporting_codes }, user)
+
             ExportAccessCodesJob.perform_later(dataset, user)
 
             broadcast(:ok)
@@ -29,7 +31,7 @@ def call
           private
 
           def valid?
-            user.present? && dataset&.data&.present? && dataset.codes_generated?
+            user.present? && dataset&.data&.exists? && dataset.codes_generated?
           end
         end
       end
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb b/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb
index 6c92c6274d988..35bd194baf806 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb
@@ -5,7 +5,7 @@ module Votings
     module Census
       module Admin
         # A command to launch the access codes generation
-        class LaunchAccessCodesGeneration < Rectify::Command
+        class LaunchAccessCodesGeneration < Decidim::Command
           def initialize(dataset, user)
             @dataset = dataset
             @user = user
@@ -31,7 +31,7 @@ def call
           private
 
           def valid?
-            user.present? && dataset&.data&.present? && dataset.data_created?
+            user.present? && dataset&.data&.exists? && dataset.data_created?
           end
 
           def update_dataset_status(dataset, status, user)
diff --git a/decidim-elections/app/commands/decidim/votings/census/admin/update_dataset.rb b/decidim-elections/app/commands/decidim/votings/census/admin/update_dataset.rb
index 588bd6d867f37..7c021234806a5 100644
--- a/decidim-elections/app/commands/decidim/votings/census/admin/update_dataset.rb
+++ b/decidim-elections/app/commands/decidim/votings/census/admin/update_dataset.rb
@@ -11,7 +11,7 @@ module Admin
         # dataset - the Decidim::Votings::Census::Dataset to update
         # attributes - the hash of attibutes to update
         # user - the user performing the action (used for tracing)
-        class UpdateDataset < Rectify::Command
+        class UpdateDataset < Decidim::Command
           def initialize(dataset, attributes, user)
             @dataset = dataset
             @attributes = attributes
diff --git a/decidim-elections/app/commands/decidim/votings/certify_polling_station_closure.rb b/decidim-elections/app/commands/decidim/votings/certify_polling_station_closure.rb
index 7196788d7b4e3..d86209d855c54 100644
--- a/decidim-elections/app/commands/decidim/votings/certify_polling_station_closure.rb
+++ b/decidim-elections/app/commands/decidim/votings/certify_polling_station_closure.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when signing a closure of a polling station
-    class CertifyPollingStationClosure < Rectify::Command
+    class CertifyPollingStationClosure < Decidim::Command
       include ::Decidim::AttachmentMethods
       include ::Decidim::GalleryMethods
       # Public: Initializes the command.
diff --git a/decidim-elections/app/commands/decidim/votings/check_census.rb b/decidim-elections/app/commands/decidim/votings/check_census.rb
index 999270bffdf66..80f237265d31b 100644
--- a/decidim-elections/app/commands/decidim/votings/check_census.rb
+++ b/decidim-elections/app/commands/decidim/votings/check_census.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command to check if census data is given
-    class CheckCensus < Rectify::Command
+    class CheckCensus < Decidim::Command
       def initialize(form)
         @form = form
       end
diff --git a/decidim-elections/app/commands/decidim/votings/create_polling_station_closure.rb b/decidim-elections/app/commands/decidim/votings/create_polling_station_closure.rb
index c3a627e81db02..e7c7fe20ccba2 100644
--- a/decidim-elections/app/commands/decidim/votings/create_polling_station_closure.rb
+++ b/decidim-elections/app/commands/decidim/votings/create_polling_station_closure.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when creating a closure for a polling station
-    class CreatePollingStationClosure < Rectify::Command
+    class CreatePollingStationClosure < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/votings/create_polling_station_results.rb b/decidim-elections/app/commands/decidim/votings/create_polling_station_results.rb
index ae4c9f8f15480..68aa6b85182c0 100644
--- a/decidim-elections/app/commands/decidim/votings/create_polling_station_results.rb
+++ b/decidim-elections/app/commands/decidim/votings/create_polling_station_results.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when creating results for a polling station
-    class CreatePollingStationResults < Rectify::Command
+    class CreatePollingStationResults < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/votings/send_access_code.rb b/decidim-elections/app/commands/decidim/votings/send_access_code.rb
index b5b78329696b6..840698cc5eae6 100644
--- a/decidim-elections/app/commands/decidim/votings/send_access_code.rb
+++ b/decidim-elections/app/commands/decidim/votings/send_access_code.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command to send the access code
-    class SendAccessCode < Rectify::Command
+    class SendAccessCode < Decidim::Command
       def initialize(datum, medium)
         @datum = datum
         @medium = medium
diff --git a/decidim-elections/app/commands/decidim/votings/sign_polling_station_closure.rb b/decidim-elections/app/commands/decidim/votings/sign_polling_station_closure.rb
index 58cbf3026712c..168a0d90f805f 100644
--- a/decidim-elections/app/commands/decidim/votings/sign_polling_station_closure.rb
+++ b/decidim-elections/app/commands/decidim/votings/sign_polling_station_closure.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # A command with all the business logic when signing a closure of a polling station
-    class SignPollingStationClosure < Rectify::Command
+    class SignPollingStationClosure < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-elections/app/commands/decidim/votings/voter/in_person_vote.rb b/decidim-elections/app/commands/decidim/votings/voter/in_person_vote.rb
index 3386a238ef2ed..466a50fd501e2 100644
--- a/decidim-elections/app/commands/decidim/votings/voter/in_person_vote.rb
+++ b/decidim-elections/app/commands/decidim/votings/voter/in_person_vote.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Voter
       # This command allows the user to register an in person vote.
-      class InPersonVote < Rectify::Command
+      class InPersonVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with necessary info to register an in person vote.
diff --git a/decidim-elections/app/commands/decidim/votings/voter/update_in_person_vote_status.rb b/decidim-elections/app/commands/decidim/votings/voter/update_in_person_vote_status.rb
index a6d8d733bae51..4d06efe2f7262 100644
--- a/decidim-elections/app/commands/decidim/votings/voter/update_in_person_vote_status.rb
+++ b/decidim-elections/app/commands/decidim/votings/voter/update_in_person_vote_status.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Voter
       # This command updates the in person vote status
-      class UpdateInPersonVoteStatus < Rectify::Command
+      class UpdateInPersonVoteStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # in_person_vote     - the in person vote that has been updated
diff --git a/decidim-elections/app/controllers/decidim/elections/admin/steps_controller.rb b/decidim-elections/app/controllers/decidim/elections/admin/steps_controller.rb
index ad9cd26737c0a..dcf90498fe150 100644
--- a/decidim-elections/app/controllers/decidim/elections/admin/steps_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/admin/steps_controller.rb
@@ -73,7 +73,7 @@ def current_step_form_class
             "key_ceremony_ended" => VotePeriodForm,
             "vote" => VotePeriodForm,
             "vote_ended" => ActionForm,
-            "tally" => ReportMissingTrusteeForm,
+            "tally_started" => ReportMissingTrusteeForm,
             "tally_ended" => ActionForm
           }[current_step]
         end
@@ -85,7 +85,7 @@ def current_step_command_class
             "key_ceremony_ended" => StartVote,
             "vote" => EndVote,
             "vote_ended" => StartTally,
-            "tally" => ReportMissingTrustee,
+            "tally_started" => ReportMissingTrustee,
             "tally_ended" => PublishResults
           }[current_step]
         end
diff --git a/decidim-elections/app/controllers/decidim/elections/elections_controller.rb b/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
index 2316431441822..abed9835305b6 100644
--- a/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/elections_controller.rb
@@ -26,10 +26,12 @@ def election_log; end
       delegate :bulletin_board_server, :authority_slug, to: :bulletin_board_client
 
       def elections
-        @elections ||= Election.where(component: current_component).published
+        @elections ||= search_collection
       end
 
       def election
+        # The single election is searched from non-published records on purpose
+        # to allow previewing for admins.
         @election ||= Election.where(component: current_component).find(params[:id])
       end
 
@@ -57,26 +59,26 @@ def single
       end
 
       def paginated_elections
-        @paginated_elections ||= reorder(search.results.published)
+        @paginated_elections ||= reorder(search.result.published)
         @paginated_elections = paginate(@paginated_elections)
       end
 
       def scheduled_elections
-        @scheduled_elections ||= search_klass.new(search_params.merge(state: %w(active upcoming))).results
+        @scheduled_elections ||= search_with(filter_params.merge(with_any_date: %w(active upcoming))).result
       end
 
-      def search_klass
-        ElectionSearch
+      def search_collection
+        Election.where(component: current_component).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: default_filter_state_params
+          search_text_cont: "",
+          with_any_date: default_filter_date_params
         }
       end
 
-      def default_filter_state_params
+      def default_filter_date_params
         if elections.active.any?
           %w(active)
         elsif elections.upcoming.any?
@@ -85,10 +87,6 @@ def default_filter_state_params
           %w()
         end
       end
-
-      def context_params
-        { component: current_component, organization: current_organization }
-      end
     end
   end
 end
diff --git a/decidim-elections/app/controllers/decidim/elections/trustee_zone/elections_controller.rb b/decidim-elections/app/controllers/decidim/elections/trustee_zone/elections_controller.rb
index 51f1383efe80e..a07ae88857145 100644
--- a/decidim-elections/app/controllers/decidim/elections/trustee_zone/elections_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/trustee_zone/elections_controller.rb
@@ -41,7 +41,7 @@ def authority_public_key
         end
 
         def current_step
-          @current_step ||= election.bb_status if election.bb_key_ceremony? || election.bb_tally?
+          @current_step ||= election.bb_status if election.bb_key_ceremony? || election.bb_tally_started?
         end
       end
     end
diff --git a/decidim-elections/app/controllers/decidim/votings/census/admin/census_controller.rb b/decidim-elections/app/controllers/decidim/votings/census/admin/census_controller.rb
index 3c34663c3ee9a..c436311ef4f19 100644
--- a/decidim-elections/app/controllers/decidim/votings/census/admin/census_controller.rb
+++ b/decidim-elections/app/controllers/decidim/votings/census/admin/census_controller.rb
@@ -8,12 +8,12 @@ module Admin
         class CensusController < Admin::ApplicationController
           helper_method :votings, :current_participatory_space, :current_census, :census_steps, :current_census_action_view,
                         :user_email, :ballot_style_callout_text, :ballot_style_callout_level, :ballot_style_code_header
-          helper_method :admin_voting_census_path, :admin_status_voting_census_path, :generate_access_codes_path, :export_access_codes_path
+          helper_method :admin_voting_census_path, :admin_status_voting_census_path, :generate_access_codes_path, :export_access_codes_path, :waiting_status?
 
           def show
             enforce_permission_to :manage, :census, voting: current_participatory_space
 
-            flash[:notice] = "Finished processing #{current_census.file}" if current_census.data_created?
+            flash[:notice] = "Finished processing #{current_census.filename}" if current_census.data_created?
 
             @form = form(DatasetForm).instance
           end
@@ -184,6 +184,10 @@ def admin_voting_ballot_styles_path
           def ballot_style_code_header
             "Ballot Style Code"
           end
+
+          def waiting_status?
+            current_census.creating_data? || current_census.generating_codes? || current_census.exporting_codes?
+          end
         end
       end
     end
diff --git a/decidim-elections/app/controllers/decidim/votings/votings_controller.rb b/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
index 8e0c58f0bd765..63f43850d7731 100644
--- a/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
+++ b/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
@@ -49,11 +49,15 @@ def login
       end
 
       def show_check_census
+        raise ActionController::RoutingError, "Not Found" unless current_participatory_space.check_census_enabled?
+
         @form = form(Census::CheckForm).instance
         render :check_census, locals: { success: false, not_found: false }
       end
 
       def check_census
+        raise ActionController::RoutingError, "Not Found" unless current_participatory_space.check_census_enabled?
+
         @form = form(Census::CheckForm).from_params(params).with_context(
           current_participatory_space: current_participatory_space
         )
@@ -129,7 +133,7 @@ def published_votings
       end
 
       def paginated_votings
-        @paginated_votings ||= reorder(search.results.published)
+        @paginated_votings ||= reorder(search.result.published)
         @paginated_votings = paginate(@paginated_votings)
       end
 
@@ -138,7 +142,7 @@ def promoted_votings
       end
 
       def finished_votings
-        @finished_votings ||= search_klass.new(search_params.merge(state: ["finished"])).results
+        @finished_votings ||= search_with(filter_params.merge(with_any_date: %w(finished))).result
       end
 
       def only_finished_votings?
@@ -147,21 +151,14 @@ def only_finished_votings?
         published_votings.count == finished_votings.count
       end
 
-      def search_klass
-        VotingSearch
+      def search_collection
+        Voting.where(organization: current_organization).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: [""]
-        }
-      end
-
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
+          search_text_cont: "",
+          with_any_date: [""]
         }
       end
 
diff --git a/decidim-elections/app/forms/decidim/elections/admin/setup_form.rb b/decidim-elections/app/forms/decidim/elections/admin/setup_form.rb
index 640df169ac06c..5301e3a39af6c 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/setup_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/setup_form.rb
@@ -57,9 +57,9 @@ def census_validations
         end
 
         def messages
-          @messages ||= validations.map do |message, t_args, _valid|
+          @messages ||= validations.to_h do |message, t_args, _valid|
             [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
-          end.to_h
+          end
         end
 
         def census_messages
@@ -107,7 +107,7 @@ def main_button?
         private
 
         def choose_random_trustees
-          return @trustee_ids if @trustee_ids.any? || defined?(@trustees)
+          return @trustee_ids if @trustee_ids&.any? || defined?(@trustees)
 
           @trustees = if participatory_space_trustees_with_public_key.count >= bulletin_board.number_of_trustees
                         participatory_space_trustees_with_public_key.sample(bulletin_board.number_of_trustees)
diff --git a/decidim-elections/app/forms/decidim/elections/admin/vote_period_form.rb b/decidim-elections/app/forms/decidim/elections/admin/vote_period_form.rb
index 4b67586af03d0..0eea9d1e156a7 100644
--- a/decidim-elections/app/forms/decidim/elections/admin/vote_period_form.rb
+++ b/decidim-elections/app/forms/decidim/elections/admin/vote_period_form.rb
@@ -27,9 +27,9 @@ def validations
         end
 
         def messages
-          @messages ||= validations.map do |message, t_args, _valid|
+          @messages ||= validations.to_h do |message, t_args, _valid|
             [message, I18n.t("steps.#{current_step}.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
-          end.to_h
+          end
         end
       end
     end
diff --git a/decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb b/decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb
index c488f7f78a76f..0cfe7732a03b6 100644
--- a/decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb
+++ b/decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb
@@ -11,7 +11,7 @@ class BallotStyleForm < Form
         validates :code, presence: true
 
         def code
-          @code&.upcase
+          super&.upcase
         end
       end
     end
diff --git a/decidim-elections/app/forms/decidim/votings/admin/voting_form.rb b/decidim-elections/app/forms/decidim/votings/admin/voting_form.rb
index 3b0d765510492..12158b7f0e587 100644
--- a/decidim-elections/app/forms/decidim/votings/admin/voting_form.rb
+++ b/decidim-elections/app/forms/decidim/votings/admin/voting_form.rb
@@ -15,11 +15,12 @@ class VotingForm < Decidim::Form
         attribute :scope_id, Integer
         attribute :promoted, Boolean
         attribute :remove_banner_image, Boolean, default: false
-        attribute :banner_image, String
+        attribute :banner_image
         attribute :remove_introductory_image, Boolean, default: false
-        attribute :introductory_image, String
+        attribute :introductory_image
         attribute :voting_type, String
         attribute :census_contact_information, String
+        attribute :show_check_census, Boolean, default: false
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -29,7 +30,7 @@ class VotingForm < Decidim::Form
         validates :end_time, presence: true, date: { after: :start_time }
         validates :banner_image, passthru: { to: Decidim::Votings::Voting }
         validates :introductory_image, passthru: { to: Decidim::Votings::Voting }
-        validates :voting_type, presence: true, inclusion: { in: Votings::Voting.voting_types, message: "%{value} is not a valid voting type" }
+        validates :voting_type, presence: true, inclusion: { in: Votings::Voting.voting_types }
 
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
 
diff --git a/decidim-elections/app/forms/decidim/votings/census/admin/dataset_form.rb b/decidim-elections/app/forms/decidim/votings/census/admin/dataset_form.rb
index 0e15daa987cd0..6f900252f9b55 100644
--- a/decidim-elections/app/forms/decidim/votings/census/admin/dataset_form.rb
+++ b/decidim-elections/app/forms/decidim/votings/census/admin/dataset_form.rb
@@ -6,14 +6,11 @@ module Census
       module Admin
         # A form to temporaly upload csv census data
         class DatasetForm < Form
-          include Decidim::HasUploadValidations
-
           mimic :dataset
 
-          attribute :file
+          attribute :file, Decidim::Attributes::Blob
 
-          validates_upload :file
-          validates :file, presence: true
+          validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
 
           def organization
             context.current_participatory_space&.organization
diff --git a/decidim-elections/app/forms/decidim/votings/census/admin/datum_form.rb b/decidim-elections/app/forms/decidim/votings/census/admin/datum_form.rb
index a795f4a3acfd6..7cb746b58a7a2 100644
--- a/decidim-elections/app/forms/decidim/votings/census/admin/datum_form.rb
+++ b/decidim-elections/app/forms/decidim/votings/census/admin/datum_form.rb
@@ -25,7 +25,7 @@ class DatumForm < Form
                     presence: true
 
           def ballot_style_code
-            @ballot_style_code&.upcase
+            super&.upcase
           end
         end
       end
diff --git a/decidim-elections/app/helpers/decidim/elections/application_helper.rb b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
index 9e9b147efe8c4..b61e316827cb5 100644
--- a/decidim-elections/app/helpers/decidim/elections/application_helper.rb
+++ b/decidim-elections/app/helpers/decidim/elections/application_helper.rb
@@ -7,7 +7,7 @@ module Elections
     module ApplicationHelper
       include Decidim::CheckBoxesTreeHelper
 
-      def state_filter_values
+      def date_filter_values
         TreeNode.new(
           TreePoint.new("", t("elections.elections.filters.all", scope: "decidim")),
           [
diff --git a/decidim-elections/app/helpers/decidim/votings/votings_helper.rb b/decidim-elections/app/helpers/decidim/votings/votings_helper.rb
index e53dcb7b1e73a..65154598dcc50 100644
--- a/decidim-elections/app/helpers/decidim/votings/votings_helper.rb
+++ b/decidim-elections/app/helpers/decidim/votings/votings_helper.rb
@@ -5,7 +5,7 @@ module Votings
     module VotingsHelper
       include Decidim::CheckBoxesTreeHelper
 
-      def filter_states_values
+      def date_filter_values
         TreeNode.new(
           TreePoint.new("", t("votings.filters.all", scope: "decidim.votings")),
           [
diff --git a/decidim-elections/app/models/decidim/elections/answer.rb b/decidim-elections/app/models/decidim/elections/answer.rb
index 48e117cf253d2..4e022d0de744c 100644
--- a/decidim-elections/app/models/decidim/elections/answer.rb
+++ b/decidim-elections/app/models/decidim/elections/answer.rb
@@ -39,12 +39,7 @@ def results_total
       # A result percentage relative to the question
       # Returns a Float.
       def results_percentage
-        @results_percentage ||= begin
-          return 0 unless results_total.positive?
-
-          result = results_total.to_f / question.results_total * 100.0
-          result.round
-        end
+        @results_percentage ||= results_total.positive? ? (results_total.to_f / question.results_total * 100.0).round : 0
       end
     end
   end
diff --git a/decidim-elections/app/models/decidim/elections/election.rb b/decidim-elections/app/models/decidim/elections/election.rb
index 62225cf1a08a8..f65bac4686230 100644
--- a/decidim-elections/app/models/decidim/elections/election.rb
+++ b/decidim-elections/app/models/decidim/elections/election.rb
@@ -14,10 +14,11 @@ class Election < ApplicationRecord
       include Traceable
       include Loggable
       include Decidim::Forms::HasQuestionnaire
+      include Decidim::FilterableResource
 
       translatable_fields :title, :description
 
-      enum bb_status: [:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally, :tally_ended, :results_published].index_with(&:to_s), _prefix: :bb
+      enum bb_status: [:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally_started, :tally_ended, :results_published].index_with(&:to_s), _prefix: :bb
 
       component_manifest_name "elections"
 
@@ -43,6 +44,8 @@ class Election < ApplicationRecord
           .where("end_time < ?", Time.current)
       }
 
+      scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
       def self.log_presenter_class_for(_log)
         Decidim::Elections::AdminLog::ElectionPresenter
       end
@@ -124,7 +127,7 @@ def voting_period_status
       end
 
       def trustee_action_required?
-        bb_key_ceremony? || bb_tally?
+        bb_key_ceremony? || bb_tally_started?
       end
 
       # Public: Checks if the election has a blocked_at value
@@ -138,6 +141,14 @@ def blocked?
       def allow_resource_permissions?
         true
       end
+
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_date]
+      end
     end
   end
 end
diff --git a/decidim-elections/app/models/decidim/elections/question.rb b/decidim-elections/app/models/decidim/elections/question.rb
index 2cbd1ed1dbb96..38886aaead81a 100644
--- a/decidim-elections/app/models/decidim/elections/question.rb
+++ b/decidim-elections/app/models/decidim/elections/question.rb
@@ -41,12 +41,7 @@ def results_total
       # A result percentage relative to the question
       # Returns a Float.
       def blank_votes_percentage
-        @blank_votes_percentage ||= begin
-          return 0 unless results_total.positive?
-
-          result = blank_votes.to_f / results_total * 100.0
-          result.round
-        end
+        @blank_votes_percentage ||= results_total.positive? ? (blank_votes.to_f / results_total * 100.0).round : 0
       end
 
       def slug
diff --git a/decidim-elections/app/models/decidim/votings/census/dataset.rb b/decidim-elections/app/models/decidim/votings/census/dataset.rb
index 31305840a85bb..b513c4234066e 100644
--- a/decidim-elections/app/models/decidim/votings/census/dataset.rb
+++ b/decidim-elections/app/models/decidim/votings/census/dataset.rb
@@ -21,7 +21,7 @@ class Dataset < ApplicationRecord
 
         enum status: [:init_data, :creating_data, :data_created, :generating_codes, :codes_generated, :exporting_codes, :freeze]
 
-        validates :file, presence: true
+        validates :filename, presence: true
 
         alias participatory_space voting
 
diff --git a/decidim-elections/app/models/decidim/votings/polling_station.rb b/decidim-elections/app/models/decidim/votings/polling_station.rb
index 2f8427a1471bf..4ced85a69ae50 100644
--- a/decidim-elections/app/models/decidim/votings/polling_station.rb
+++ b/decidim-elections/app/models/decidim/votings/polling_station.rb
@@ -7,6 +7,7 @@ class PollingStation < ApplicationRecord
       include Traceable
       include Loggable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       translatable_fields :title, :location, :location_hints
 
@@ -37,9 +38,7 @@ class PollingStation < ApplicationRecord
       alias participatory_space voting
 
       # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      ransacker_i18n :title
 
       [:manager, :president].each do |role|
         [:name, :email, :nickname].each do |field|
diff --git a/decidim-elections/app/models/decidim/votings/voting.rb b/decidim-elections/app/models/decidim/votings/voting.rb
index d2ed209a372b7..45aff477a0fdf 100644
--- a/decidim-elections/app/models/decidim/votings/voting.rb
+++ b/decidim-elections/app/models/decidim/votings/voting.rb
@@ -16,6 +16,7 @@ class Voting < ApplicationRecord
       include Decidim::HasUploadValidations
       include Decidim::HasAttachments
       include Decidim::HasAttachmentCollections
+      include Decidim::FilterableResource
 
       enum voting_type: [:in_person, :online, :hybrid].index_with(&:to_s), _suffix: :voting
 
@@ -62,6 +63,8 @@ class Voting < ApplicationRecord
       scope :order_by_most_recent, -> { order(created_at: :desc) }
       scope :promoted, -> { published.where(promoted: true) }
 
+      scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
       def upcoming?
         start_time > Time.now.utc
       end
@@ -135,6 +138,10 @@ def has_ballot_styles?
         ballot_styles.exists?
       end
 
+      def check_census_enabled?
+        dataset.present? && show_check_census?
+      end
+
       def elections
         Decidim::Elections::Election.where(component: components)
       end
@@ -156,6 +163,14 @@ def complete_election_data(election, election_data)
       def vote_flow_for(election)
         Decidim::Votings::CensusVoteFlow.new(election)
       end
+
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_date]
+      end
     end
   end
 end
diff --git a/decidim-elections/app/packs/entrypoints/decidim_elections_trustee_tally.js b/decidim-elections/app/packs/entrypoints/decidim_elections_trustee_tally_started.js
similarity index 100%
rename from decidim-elections/app/packs/entrypoints/decidim_elections_trustee_tally.js
rename to decidim-elections/app/packs/entrypoints/decidim_elections_trustee_tally_started.js
diff --git a/decidim-elections/app/packs/src/decidim/elections/trustee/tally.js b/decidim-elections/app/packs/src/decidim/elections/trustee/tally.js
index fa6daca8593bb..83063cb6b0d1f 100644
--- a/decidim-elections/app/packs/src/decidim/elections/trustee/tally.js
+++ b/decidim-elections/app/packs/src/decidim/elections/trustee/tally.js
@@ -115,7 +115,7 @@ $(() => {
           url: $tally.data("updateElectionStatusUrl"),
           contentType: "application/json",
           data: JSON.stringify({
-            status: "tally"
+            status: "tally_started"
           }),
           headers: {
             "X-CSRF-Token": $("meta[name=csrf-token]").attr("content")
diff --git a/decidim-elections/app/packs/src/decidim/elections/voter/setup-vote.js b/decidim-elections/app/packs/src/decidim/elections/voter/setup-vote.js
index 9d034a2a4d9a4..0dcad9913c486 100644
--- a/decidim-elections/app/packs/src/decidim/elections/voter/setup-vote.js
+++ b/decidim-elections/app/packs/src/decidim/elections/voter/setup-vote.js
@@ -48,12 +48,6 @@ export default function setupVoteComponent($voteWrapper) {
   });
 }
 
-/* Fallback for non-handled failed promises */
-window.addEventListener("unhandledrejection", (event) => {
-  $("#server-failure .tech-info").html(event.reason);
-  $("#server-failure").foundation("open");
-});
-
 window.Decidim = window.Decidim || {};
 window.Decidim.setupVoteComponent = setupVoteComponent;
 
diff --git a/decidim-elections/app/packs/src/decidim/votings/admin/update_census_dataset_status.js b/decidim-elections/app/packs/src/decidim/votings/admin/update_census_dataset_status.js
index b1d7a6d2cc756..a5bc0262ec9b1 100644
--- a/decidim-elections/app/packs/src/decidim/votings/admin/update_census_dataset_status.js
+++ b/decidim-elections/app/packs/src/decidim/votings/admin/update_census_dataset_status.js
@@ -8,6 +8,6 @@ $(() => {
     }
   }
 
-  // 1 minute
-  setInterval(updateCensusDatasetStatus, 60000);
+  // 10 seconds
+  setInterval(updateCensusDatasetStatus, 10000);
 });
diff --git a/decidim-elections/app/permissions/decidim/votings/admin/permissions.rb b/decidim-elections/app/permissions/decidim/votings/admin/permissions.rb
index 949f7ae232b2c..402c45aeaa4d2 100644
--- a/decidim-elections/app/permissions/decidim/votings/admin/permissions.rb
+++ b/decidim-elections/app/permissions/decidim/votings/admin/permissions.rb
@@ -79,7 +79,7 @@ def allowed_voting_action?
             end
           when :landing_page
             toggle_allow(user.admin?) if permission_action.action == :update
-          when :components
+          when :ballot_styles, :components, :polling_stations, :polling_officers, :monitoring_committee_members
             toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_station
             case permission_action.action
@@ -88,8 +88,6 @@ def allowed_voting_action?
             when :update, :delete
               toggle_allow(user.admin? && polling_station.present?)
             end
-          when :polling_stations
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_officer
             case permission_action.action
             when :create
@@ -97,8 +95,6 @@ def allowed_voting_action?
             when :delete
               toggle_allow(user.admin? && polling_officer.present?)
             end
-          when :polling_officers
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :monitoring_committee_member
             case permission_action.action
             when :create
@@ -108,18 +104,12 @@ def allowed_voting_action?
             end
           when :monitoring_committee_menu
             toggle_allow(user_can_read_voting?) if permission_action.action == :read
-          when :monitoring_committee_members
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :monitoring_committee_polling_station_closure
             toggle_allow(user_monitoring_committee_for_voting? && closure.present?) if [:read, :validate].member?(permission_action.action)
-          when :monitoring_committee_polling_station_closures
-            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
-          when :monitoring_committee_verify_elections
+          when :monitoring_committee_polling_station_closures, :monitoring_committee_verify_elections, :monitoring_committee_election_results
             toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
           when :monitoring_committee_election_result
             toggle_allow(user_monitoring_committee_for_voting? && election.present?) if [:read, :validate].member?(permission_action.action)
-          when :monitoring_committee_election_results
-            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
           when :census
             toggle_allow(user.admin?) if permission_action.action == :manage
           when :ballot_style
@@ -129,8 +119,6 @@ def allowed_voting_action?
             when :update, :delete
               toggle_allow(user.admin? && (voting.dataset.blank? || voting.dataset.init_data?) && ballot_style.present?)
             end
-          when :ballot_styles
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :component_data
             toggle_allow(user.admin?) if permission_action.action == :import
           end
diff --git a/decidim-elections/app/permissions/decidim/votings/permissions.rb b/decidim-elections/app/permissions/decidim/votings/permissions.rb
index c3e30d19879aa..4f1be33896d3f 100644
--- a/decidim-elections/app/permissions/decidim/votings/permissions.rb
+++ b/decidim-elections/app/permissions/decidim/votings/permissions.rb
@@ -27,12 +27,10 @@ def allowed_public_anonymous_action?
         return unless permission_action.scope == :public
 
         case permission_action.subject
-        when :votings
+        when :votings, :participatory_space
           allow!
         when :voting
           toggle_allow(voting.published? || user&.admin?)
-        when :participatory_space
-          allow!
         end
       end
 
diff --git a/decidim-elections/app/presenters/decidim/votings/voting_stats_presenter.rb b/decidim-elections/app/presenters/decidim/votings/voting_stats_presenter.rb
index 1cc3a8792d925..399005906ecbf 100644
--- a/decidim-elections/app/presenters/decidim/votings/voting_stats_presenter.rb
+++ b/decidim-elections/app/presenters/decidim/votings/voting_stats_presenter.rb
@@ -4,9 +4,12 @@ module Decidim
   module Votings
     # A presenter to render statistics in the homepage.
     class VotingStatsPresenter < Decidim::StatsPresenter
-      attribute :voting, Decidim::Votings::Voting
       include Decidim::IconHelper
 
+      def voting
+        __getobj__.fetch(:voting)
+      end
+
       # Public: returns a collection of stats (Hash) for the Voting Landing.
       def collection
         highlighted_stats = voting_participants_stats
diff --git a/decidim-elections/app/queries/decidim/elections/admin/pending_actions.rb b/decidim-elections/app/queries/decidim/elections/admin/pending_actions.rb
index d0f9b83690372..3be6aeee8e22f 100644
--- a/decidim-elections/app/queries/decidim/elections/admin/pending_actions.rb
+++ b/decidim-elections/app/queries/decidim/elections/admin/pending_actions.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # A class used to find actions with a pending status
-      class PendingActions < Rectify::Query
+      class PendingActions < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query
diff --git a/decidim-elections/app/queries/decidim/elections/admin/votes_for_statistics.rb b/decidim-elections/app/queries/decidim/elections/admin/votes_for_statistics.rb
index d85c4963dc077..839f1d7a66e18 100644
--- a/decidim-elections/app/queries/decidim/elections/admin/votes_for_statistics.rb
+++ b/decidim-elections/app/queries/decidim/elections/admin/votes_for_statistics.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # A class used to find election votes for statistics
-      class VotesForStatistics < Rectify::Query
+      class VotesForStatistics < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried object.
         def self.for(election)
           new(election).query
diff --git a/decidim-elections/app/queries/decidim/elections/elections_finished_to_end.rb b/decidim-elections/app/queries/decidim/elections/elections_finished_to_end.rb
index 1503fa244e39c..2ffb7acfd38f4 100644
--- a/decidim-elections/app/queries/decidim/elections/elections_finished_to_end.rb
+++ b/decidim-elections/app/queries/decidim/elections/elections_finished_to_end.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections finished to close their voting period
-    class ElectionsFinishedToEnd < Rectify::Query
+    class ElectionsFinishedToEnd < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for
         new.query
diff --git a/decidim-elections/app/queries/decidim/elections/elections_ready_to_start.rb b/decidim-elections/app/queries/decidim/elections/elections_ready_to_start.rb
index 963fa6d6a9bad..2fd712e4e7cd5 100644
--- a/decidim-elections/app/queries/decidim/elections/elections_ready_to_start.rb
+++ b/decidim-elections/app/queries/decidim/elections/elections_ready_to_start.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections ready and near to start the voting period
-    class ElectionsReadyToStart < Rectify::Query
+    class ElectionsReadyToStart < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for
         new.query
diff --git a/decidim-elections/app/queries/decidim/elections/filtered_elections.rb b/decidim-elections/app/queries/decidim/elections/filtered_elections.rb
index f7f5d20bcf6cf..68e504212972f 100644
--- a/decidim-elections/app/queries/decidim/elections/filtered_elections.rb
+++ b/decidim-elections/app/queries/decidim/elections/filtered_elections.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections filtered by its state
-    class FilteredElections < Rectify::Query
+    class FilteredElections < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component
diff --git a/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space.rb b/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space.rb
index dd45cfcb3a959..9fb48bdc94e33 100644
--- a/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space.rb
+++ b/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Trustees
       # A class used to find trustees by participatory space.
-      class ByParticipatorySpace < Rectify::Query
+      class ByParticipatorySpace < Decidim::Query
         # Initializes the class.
         #
         def initialize(participatory_space)
diff --git a/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb b/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb
index 8667b47a22da2..6e69337ec9faa 100644
--- a/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb
+++ b/decidim-elections/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Trustees
       # A class used to find trustees by participatory space trustee ids.
-      class ByParticipatorySpaceTrusteeIds < Rectify::Query
+      class ByParticipatorySpaceTrusteeIds < Decidim::Query
         # Initializes the class.
         #
         def initialize(trustee_ids)
diff --git a/decidim-elections/app/queries/decidim/elections/votes/last_vote_for_voter.rb b/decidim-elections/app/queries/decidim/elections/votes/last_vote_for_voter.rb
index 14f2b4254b5e8..5cae54dcbbf40 100644
--- a/decidim-elections/app/queries/decidim/elections/votes/last_vote_for_voter.rb
+++ b/decidim-elections/app/queries/decidim/elections/votes/last_vote_for_voter.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Votes
       # A class used to find the last vote casted by a voter in an election
-      class LastVoteForVoter < Rectify::Query
+      class LastVoteForVoter < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # election - the election where the vote was casted
diff --git a/decidim-elections/app/queries/decidim/elections/votes/pending_votes.rb b/decidim-elections/app/queries/decidim/elections/votes/pending_votes.rb
index 0d08be419367f..f743cfec83e12 100644
--- a/decidim-elections/app/queries/decidim/elections/votes/pending_votes.rb
+++ b/decidim-elections/app/queries/decidim/elections/votes/pending_votes.rb
@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Votes
       # A class used to find votes with a pending status
-      class PendingVotes < Rectify::Query
+      class PendingVotes < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query
diff --git a/decidim-elections/app/queries/decidim/votings/admin/admin_users.rb b/decidim-elections/app/queries/decidim/votings/admin/admin_users.rb
index 334195876cc69..a2f185b03f13d 100644
--- a/decidim-elections/app/queries/decidim/votings/admin/admin_users.rb
+++ b/decidim-elections/app/queries/decidim/votings/admin/admin_users.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class used to find the admins for a voting or an organization votings.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # voting - a voting that needs to find its voting admins
diff --git a/decidim-elections/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb b/decidim-elections/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb
index 96513ee92f31a..cfc418486ef04 100644
--- a/decidim-elections/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb
+++ b/decidim-elections/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class used to find trustees by participatory space.
-      class BallotStyleByVotingCode < Rectify::Query
+      class BallotStyleByVotingCode < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # voting - the voting of the Ballot Style
diff --git a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb
index 1ed072815a82e..d17ea2bf058c8 100644
--- a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb
+++ b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective polling stations.
-      class PollingOfficersJoinPollingStations < Rectify::Query
+      class PollingOfficersJoinPollingStations < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers
diff --git a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb
index 0b0b4afb3866c..94d13b3ecde00 100644
--- a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb
+++ b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective polling stations and users.
-      class PollingOfficersJoinPollingStationsAndUser < Rectify::Query
+      class PollingOfficersJoinPollingStationsAndUser < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers
@@ -23,7 +23,7 @@ def initialize(polling_officers)
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Rectify::Query.merge(
+          Decidim::Query.merge(
             PollingOfficersJoinPollingStations.new(@polling_officers),
             PollingOfficersJoinUser.new(@polling_officers)
           ).query
diff --git a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_user.rb b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_user.rb
index 6867fc869fb18..2ecdb66f246ab 100644
--- a/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_user.rb
+++ b/decidim-elections/app/queries/decidim/votings/admin/polling_officers_join_user.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective decidim user.
-      class PollingOfficersJoinUser < Rectify::Query
+      class PollingOfficersJoinUser < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers
diff --git a/decidim-elections/app/queries/decidim/votings/organization_prioritized_votings.rb b/decidim-elections/app/queries/decidim/votings/organization_prioritized_votings.rb
index 417343a3c3963..4423f96131116 100644
--- a/decidim-elections/app/queries/decidim/votings/organization_prioritized_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/organization_prioritized_votings.rb
@@ -4,14 +4,14 @@ module Decidim
   module Votings
     # This query class filters public votings given an organization in a
     # meaningful prioritized order.
-    class OrganizationPrioritizedVotings < Rectify::Query
+    class OrganizationPrioritizedVotings < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedVotings.new(@organization),
           PrioritizedVotings.new
         ).query
diff --git a/decidim-elections/app/queries/decidim/votings/organization_promoted_votings.rb b/decidim-elections/app/queries/decidim/votings/organization_promoted_votings.rb
index 2e426ce40125f..b3af079465991 100644
--- a/decidim-elections/app/queries/decidim/votings/organization_promoted_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/organization_promoted_votings.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query selects the promoted votings
-    class OrganizationPromotedVotings < Rectify::Query
+    class OrganizationPromotedVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-elections/app/queries/decidim/votings/organization_published_votings.rb b/decidim-elections/app/queries/decidim/votings/organization_published_votings.rb
index 50808cc9868e7..2f945b6d50337 100644
--- a/decidim-elections/app/queries/decidim/votings/organization_published_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/organization_published_votings.rb
@@ -3,13 +3,13 @@
 module Decidim
   module Votings
     # This query class filters published votings given an organization.
-    class OrganizationPublishedVotings < Rectify::Query
+    class OrganizationPublishedVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationVotings.new(@organization),
           PublishedVotings.new
         ).query
diff --git a/decidim-elections/app/queries/decidim/votings/organization_votings.rb b/decidim-elections/app/queries/decidim/votings/organization_votings.rb
index 9dbbe1f840d19..7a9654cef46ab 100644
--- a/decidim-elections/app/queries/decidim/votings/organization_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/organization_votings.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query class filters all votings given an organization.
-    class OrganizationVotings < Rectify::Query
+    class OrganizationVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-elections/app/queries/decidim/votings/prioritized_votings.rb b/decidim-elections/app/queries/decidim/votings/prioritized_votings.rb
index dddf212424bb2..247e3d5334d79 100644
--- a/decidim-elections/app/queries/decidim/votings/prioritized_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/prioritized_votings.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     # This query orders votings by importance, prioritizing promoted
     # votings.
-    class PrioritizedVotings < Rectify::Query
+    class PrioritizedVotings < Decidim::Query
       def query
         Decidim::Votings::Voting.order(promoted: :desc)
       end
diff --git a/decidim-elections/app/queries/decidim/votings/published_votings.rb b/decidim-elections/app/queries/decidim/votings/published_votings.rb
index 066ae1be39c38..4415669daccc6 100644
--- a/decidim-elections/app/queries/decidim/votings/published_votings.rb
+++ b/decidim-elections/app/queries/decidim/votings/published_votings.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query filters published votings only.
-    class PublishedVotings < Rectify::Query
+    class PublishedVotings < Decidim::Query
       def query
         Decidim::Votings::Voting.published
       end
diff --git a/decidim-elections/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb b/decidim-elections/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb
index 9baa5a93419d3..a09618ae0d152 100644
--- a/decidim-elections/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb
+++ b/decidim-elections/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Votes
       # A class used to find a non-rejected in person vote registered for a voter in an election
-      class InPersonVoteForVoter < Rectify::Query
+      class InPersonVoteForVoter < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # election - the election where the vote was casted
diff --git a/decidim-elections/app/queries/decidim/votings/votes/pending_in_person_votes.rb b/decidim-elections/app/queries/decidim/votings/votes/pending_in_person_votes.rb
index 9e5a35e2d5725..54ca2a2ff7390 100644
--- a/decidim-elections/app/queries/decidim/votings/votes/pending_in_person_votes.rb
+++ b/decidim-elections/app/queries/decidim/votings/votes/pending_in_person_votes.rb
@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Votes
       # A class used to find in person votes with a pending status
-      class PendingInPersonVotes < Rectify::Query
+      class PendingInPersonVotes < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query
diff --git a/decidim-elections/app/services/decidim/elections/election_search.rb b/decidim-elections/app/services/decidim/elections/election_search.rb
deleted file mode 100644
index cec4130b99b8d..0000000000000
--- a/decidim-elections/app/services/decidim/elections/election_search.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Elections
-    # This class handles search and filtering of elections.
-    class ElectionSearch < ResourceSearch
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the election from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(Election.all, options)
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where("decidim_elections_elections.title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("decidim_elections_elections.description::text ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the state filter
-      def search_state
-        active = state.member?("active") ? query.active : nil
-        upcoming = state.member?("upcoming") ? query.upcoming : nil
-        finished = state.member?("finished") ? query.finished : nil
-
-        query
-          .where(id: upcoming)
-          .or(query.where(id: active))
-          .or(query.where(id: finished))
-      end
-    end
-  end
-end
diff --git a/decidim-elections/app/services/decidim/votings/census_vote_flow.rb b/decidim-elections/app/services/decidim/votings/census_vote_flow.rb
index c8c916de70967..72f57f867faa8 100644
--- a/decidim-elections/app/services/decidim/votings/census_vote_flow.rb
+++ b/decidim-elections/app/services/decidim/votings/census_vote_flow.rb
@@ -97,9 +97,7 @@ def datum_query
       end
 
       def valid_token_flow_data?
-        @valid_token_flow_data ||= begin
-          has_voter? && received_voter_token_data[:flow].as_json == voter_data.as_json
-        end
+        @valid_token_flow_data ||= has_voter? && received_voter_token_data[:flow].as_json == voter_data.as_json
       end
     end
   end
diff --git a/decidim-elections/app/services/decidim/votings/voting_search.rb b/decidim-elections/app/services/decidim/votings/voting_search.rb
deleted file mode 100644
index e4525fe72b343..0000000000000
--- a/decidim-elections/app/services/decidim/votings/voting_search.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Votings
-    # Service that encapsulates all logic related to filtering votings.
-    class VotingSearch < Searchlight::Search
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Votings::Voting.where(organization: options[:organization]).published
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        active = state.member?("active") ? query.active : nil
-        upcoming = state.member?("upcoming") ? query.upcoming : nil
-        finished = state.member?("finished") ? query.finished : nil
-
-        query
-          .where(id: upcoming)
-          .or(query.where(id: active))
-          .or(query.where(id: finished))
-      end
-
-      private
-
-      def current_locale
-        I18n.locale.to_s
-      end
-    end
-  end
-end
diff --git a/decidim-elections/app/views/decidim/elections/admin/steps/_tally.html.erb b/decidim-elections/app/views/decidim/elections/admin/steps/_tally_started.html.erb
similarity index 94%
rename from decidim-elections/app/views/decidim/elections/admin/steps/_tally.html.erb
rename to decidim-elections/app/views/decidim/elections/admin/steps/_tally_started.html.erb
index 4b51f7ade6573..90021124c5673 100644
--- a/decidim-elections/app/views/decidim/elections/admin/steps/_tally.html.erb
+++ b/decidim-elections/app/views/decidim/elections/admin/steps/_tally_started.html.erb
@@ -61,7 +61,7 @@
 </div>
 
 <div class="button--double form-general-submit">
-  <%= link_to t("steps.tally.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
+  <%= link_to t("steps.tally_started.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
 </div>
 
 <%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>
diff --git a/decidim-elections/app/views/decidim/elections/elections/_filters.html.erb b/decidim-elections/app/views/decidim/elections/elections/_filters.html.erb
index 75b46bdb5529d..3d2773ae514d7 100644
--- a/decidim-elections/app/views/decidim/elections/elections/_filters.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,6 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, state_filter_values, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>
diff --git a/decidim-elections/app/views/decidim/elections/elections/election_log.html.erb b/decidim-elections/app/views/decidim/elections/elections/election_log.html.erb
index 76f51509d7bd9..42b250ebcc6ba 100644
--- a/decidim-elections/app/views/decidim/elections/elections/election_log.html.erb
+++ b/decidim-elections/app/views/decidim/elections/elections/election_log.html.erb
@@ -179,4 +179,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_election_log" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_election_log" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/elections/trustee_zone/elections/_tally_steps.html.erb b/decidim-elections/app/views/decidim/elections/trustee_zone/elections/_tally_started_steps.html.erb
similarity index 100%
rename from decidim-elections/app/views/decidim/elections/trustee_zone/elections/_tally_steps.html.erb
rename to decidim-elections/app/views/decidim/elections/trustee_zone/elections/_tally_started_steps.html.erb
diff --git a/decidim-elections/app/views/decidim/elections/trustee_zone/elections/show.html.erb b/decidim-elections/app/views/decidim/elections/trustee_zone/elections/show.html.erb
index 3941e960cabb1..3d78ba19f7205 100644
--- a/decidim-elections/app/views/decidim/elections/trustee_zone/elections/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/trustee_zone/elections/show.html.erb
@@ -20,6 +20,7 @@
 
   <%= render "decidim/elections/shared/broken_promises_modal" %>
 
-  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
-
+  <% content_for :js_content do %>
+    <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+  <% end %>
 <% end %>
diff --git a/decidim-elections/app/views/decidim/elections/trustee_zone/trustees/show.html.erb b/decidim-elections/app/views/decidim/elections/trustee_zone/trustees/show.html.erb
index f2e67613ff49b..96ed15e41595a 100644
--- a/decidim-elections/app/views/decidim/elections/trustee_zone/trustees/show.html.erb
+++ b/decidim-elections/app/views/decidim/elections/trustee_zone/trustees/show.html.erb
@@ -99,4 +99,6 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb b/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb
index 3e869e6543156..2e8555642451e 100644
--- a/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/_onboarding_modal.html.erb
@@ -20,4 +20,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/_server_error_modal.html.erb b/decidim-elections/app/views/decidim/elections/votes/_server_error_modal.html.erb
deleted file mode 100644
index f21325421ca06..0000000000000
--- a/decidim-elections/app/views/decidim/elections/votes/_server_error_modal.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="reveal" id="server-failure" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title">
-      <%= t("modal.title", scope: "decidim.elections.votes.failed") %>
-    </h3>
-
-    <button class="close-button" data-close aria-label="<%= t("modal.close", scope: "decidim.elections.votes.failed") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-
-  <div class="row">
-    <p>
-      <%= t("modal.communication_lost", scope: "decidim.elections.votes.failed").html_safe %>
-    </p>
-
-    <p class="help-text tech-info"></p>
-  </div>
-
-  <div class="row">
-    <div class="column flex-center">
-      <button class="button primary expanded" data-close type="button">
-        <%= t("modal.close", scope: "decidim.elections.votes.failed") %>
-      </button>
-    </div>
-  </div>
-</div>
diff --git a/decidim-elections/app/views/decidim/elections/votes/_show_casting.html.erb b/decidim-elections/app/views/decidim/elections/votes/_show_casting.html.erb
index 4d806493512a7..d6bdba92304ac 100644
--- a/decidim-elections/app/views/decidim/elections/votes/_show_casting.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/_show_casting.html.erb
@@ -24,4 +24,6 @@
 
 <%= render "decidim/elections/shared/broken_promises_modal" %>
 
-<%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/new.html.erb b/decidim-elections/app/views/decidim/elections/votes/new.html.erb
index 4a064862f5339..5e2fd3cb42d3f 100644
--- a/decidim-elections/app/views/decidim/elections/votes/new.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/new.html.erb
@@ -61,10 +61,13 @@
 
 <%= render "decidim/elections/shared/broken_promises_modal" %>
 
-<% if preview_mode? %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
-<% else %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
-<% end %>
+<% content_for :js_content do %>
+
+  <% if preview_mode? %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
+  <% else %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
+  <% end %>
 
-<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
+  <%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/elections/votes/verify.html.erb b/decidim-elections/app/views/decidim/elections/votes/verify.html.erb
index 6ef3fe1672452..19484fd1c14bc 100644
--- a/decidim-elections/app/views/decidim/elections/votes/verify.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/verify.html.erb
@@ -54,6 +54,7 @@
 
             <input type="text" class="vote-identifier" name="vote-identifier" value="<%= params[:vote_id].gsub("_","") %>">
           </label>
+          <p class="help-text"><%= t("decidim.elections.votes.verify.form.vote_identifier_help") %></p>
           <div>
             <%= link_to(
               "#",
@@ -72,4 +73,6 @@
 
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb b/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb
index 41d49f5c48794..8a2b832d125e4 100644
--- a/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb
+++ b/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb
@@ -44,6 +44,15 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="columns xlarge-6 show_check_census">
+        <%= form.check_box :show_check_census %>
+        <p class="help-text">
+          <%== t(".show_check_census_help") %>
+        </p>
+      </div>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6 census_contact_information">
         <%= form.text_field :census_contact_information, label: t(".census_contact_information") %>
diff --git a/decidim-elections/app/views/decidim/votings/census/admin/census/_creating_data.html.erb b/decidim-elections/app/views/decidim/votings/census/admin/census/_creating_data.html.erb
index 1e6a0c7eefb49..e203c39f929cc 100644
--- a/decidim-elections/app/views/decidim/votings/census/admin/census/_creating_data.html.erb
+++ b/decidim-elections/app/views/decidim/votings/census/admin/census/_creating_data.html.erb
@@ -4,7 +4,7 @@
                         scope: "decidim.votings.census.admin.census",
                         processed_count: current_census.csv_row_processed_count,
                         raw_count: current_census.csv_row_raw_count,
-                        file: current_census.file)}" %>
+                        file: current_census.filename)}" %>
 
   <%= cell("decidim/announcement", info_message, callout_class: "warning") %>
 </div>
diff --git a/decidim-elections/app/views/decidim/votings/census/admin/census/_exporting_codes.html.erb b/decidim-elections/app/views/decidim/votings/census/admin/census/_exporting_codes.html.erb
index f33c4c820a0f7..c6677e60bb83c 100644
--- a/decidim-elections/app/views/decidim/votings/census/admin/census/_exporting_codes.html.erb
+++ b/decidim-elections/app/views/decidim/votings/census/admin/census/_exporting_codes.html.erb
@@ -1,3 +1,3 @@
 <div class="card-section" id="census-creating-data-wrapper" data-update-status-url="<%= admin_status_voting_census_path %>">
-  <%= cell("decidim/announcement", "<span class='loading-spinner'></span> &nbsp;#{t("exporting_access_codes.info_message", scope: "decidim.votings.census.admin.census")}", callout_class: "warning") %>
+  <%= cell("decidim/announcement", "<span class='loading-spinner'></span> &nbsp;#{t("exporting_access_codes.info_message", scope: "decidim.votings.census.admin.census", email: user_email)}", callout_class: "warning") %>
 </div>
diff --git a/decidim-elections/app/views/decidim/votings/census/admin/census/_freeze.html.erb b/decidim-elections/app/views/decidim/votings/census/admin/census/_freeze.html.erb
index 8253ef9f58ecb..4091d2bed27f1 100644
--- a/decidim-elections/app/views/decidim/votings/census/admin/census/_freeze.html.erb
+++ b/decidim-elections/app/views/decidim/votings/census/admin/census/_freeze.html.erb
@@ -1,3 +1,5 @@
 <div class="card-section">
   <%= cell("decidim/announcement", t("freeze.callout", scope: "decidim.votings.census.admin.census", email: user_email), callout_class: "warning" ) %>
+
+  <p><%= t("freeze.help_html", scope: "decidim.votings.census.admin.census") %></p>
 </div>
diff --git a/decidim-elections/app/views/decidim/votings/census/admin/census/_generate_codes.html.erb b/decidim-elections/app/views/decidim/votings/census/admin/census/_generate_codes.html.erb
index b31009e05acef..25186c288bac3 100644
--- a/decidim-elections/app/views/decidim/votings/census/admin/census/_generate_codes.html.erb
+++ b/decidim-elections/app/views/decidim/votings/census/admin/census/_generate_codes.html.erb
@@ -3,23 +3,33 @@
                       scope: "decidim.votings.census.admin.census",
                       data_count: current_census.data.size,
                       raw_count: current_census.csv_row_raw_count,
-                      file: current_census.file) %>
+                      file: current_census.filename) %>
   <% callout_class = "warning" %>
 <% else %>
   <% info_message = t("generate_access_codes.info_message_all",
                       scope: "decidim.votings.census.admin.census",
                       data_count: current_census.data.size,
                       raw_count: current_census.csv_row_raw_count,
-                      file: current_census.file) %>
+                      file: current_census.filename) %>
   <% callout_class = "success" %>
 <% end %>
 
 <div class="card-section">
   <%= cell("decidim/announcement", info_message, callout_class: callout_class ) %>
 
-  <%= cell("decidim/announcement", t("generate_access_codes.callout", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
-  <%= link_to t("generate_access_codes.button", scope: "decidim.votings.census.admin.census"),
+  <% if current_census.data.size.zero? %>
+    <%= cell("decidim/announcement", t("generate_access_codes.start_over", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
+      <%= link_to t("delete.button", scope: "decidim.votings.census.admin.census"),
+                admin_voting_census_path,
+                class: "button alert destroy",
+                method: :delete,
+                data: { confirm: t("delete.confirm", scope: "decidim.votings.census.admin.census") } %>
+
+  <% else %>
+    <%= cell("decidim/announcement", t("generate_access_codes.callout", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
+    <%= link_to t("generate_access_codes.button", scope: "decidim.votings.census.admin.census"),
                     generate_access_codes_path,
                     class: "button",
                     data: { confirm: t("generate_access_codes.confirm", scope: "decidim.votings.census.admin.census") } %>
+  <% end %>
 </div>
diff --git a/decidim-elections/app/views/decidim/votings/census/admin/census/show.html.erb b/decidim-elections/app/views/decidim/votings/census/admin/census/show.html.erb
index 9e721233744bc..3b0f0f18cf618 100644
--- a/decidim-elections/app/views/decidim/votings/census/admin/census/show.html.erb
+++ b/decidim-elections/app/views/decidim/votings/census/admin/census/show.html.erb
@@ -18,6 +18,6 @@
   </div>
 </div>
 
-<% if current_census.creating_data? || current_census.generating_codes? %>
+<% if waiting_status? %>
   <%= javascript_pack_tag "decidim_votings_admin_update_census_dataset_status" %>
 <% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb
index 51131f4df5c09..7db4ee0612622 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_certify_form.html.erb
@@ -6,7 +6,9 @@
     <fieldset>
       <legend><%= t("form_legend", scope: "decidim.votings.polling_officer_zone.closures.certify") %></legend>
       <div class="row column">
-        <%= form.file_field :add_photos, multiple: true, label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
+        <%= form.attachment :photos,
+          multiple: true,
+          label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
       </div>
     </fieldset>
   </div>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb
index 287d3a5fadcf8..25109a291e847 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb
@@ -53,4 +53,6 @@
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb
index 49c4ce379b3da..dde6365421562 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb
@@ -45,4 +45,6 @@
 
 <%= render "modal_ballots_results_count_error" %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb
index 014018e6ec5c5..5c5f9ca77774a 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb
@@ -59,4 +59,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb
index 23cac8661a3d2..4ba0e7be5fc6b 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/_complete_voting.html.erb
@@ -2,7 +2,11 @@
   <div class="columns">
     <% if vote_check.allowed? %>
       <div class="callout success mt-s">
-        <h5><%= t(".census_verified") %></h5>
+        <% if voted_online? %>
+          <h5><%= t(".census_verified_with_online_vote") %></h5>
+        <% else %>
+          <h5><%= t(".census_verified") %></h5>
+        <% end %>
       </div>
       <div class="row mt-sm">
         <div class="columns large-7">
@@ -56,4 +60,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb
index 6324e0e0068f6..06d42daebcbe9 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb
@@ -20,4 +20,6 @@
 
 <%= render "decidim/elections/shared/broken_promises_modal" %>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb
index c12b96df858f5..bfe8cb828ba40 100644
--- a/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb
+++ b/decidim-elections/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb
@@ -24,4 +24,6 @@
 
 <%= render "decidim/elections/shared/broken_promises_modal" %>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>
diff --git a/decidim-elections/app/views/decidim/votings/votings/_filters.html.erb b/decidim-elections/app/views/decidim/votings/votings/_filters.html.erb
index 5859e851b312d..94828b9e9a81b 100644
--- a/decidim-elections/app/views/decidim/votings/votings/_filters.html.erb
+++ b/decidim-elections/app/views/decidim/votings/votings/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,7 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_states_values, legend_title: t(".state") %>
-
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>
diff --git a/decidim-elections/app/views/layouts/decidim/election_votes.html.erb b/decidim-elections/app/views/layouts/decidim/election_votes.html.erb
index da5d259791efb..718476a4fa4b4 100644
--- a/decidim-elections/app/views/layouts/decidim/election_votes.html.erb
+++ b/decidim-elections/app/views/layouts/decidim/election_votes.html.erb
@@ -18,8 +18,10 @@
   <body>
     <main class="focus">
       <%= render partial: "layouts/decidim/election_votes_header" %>
+
       <%= yield %>
-      <%= render partial: "layouts/decidim/js_configuration" %>
     </main>
+
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
   </body>
 </html>
diff --git a/decidim-elections/config/assets.rb b/decidim-elections/config/assets.rb
index 21ec84acf03d1..70ee521479c76 100644
--- a/decidim-elections/config/assets.rb
+++ b/decidim-elections/config/assets.rb
@@ -11,7 +11,7 @@
   decidim_elections_admin_trustees_process: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_trustees_process.js",
   decidim_elections_admin_vote_statistics: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_vote_statistics.js",
   decidim_elections_trustee_key_ceremony: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js",
-  decidim_elections_trustee_tally: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally.js",
+  decidim_elections_trustee_tally_started: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally_started.js",
   decidim_elections_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_zone.js",
   decidim_elections_trustee_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_trustee_zone.js",
   decidim_elections_voter_casting_vote: "#{base_path}/app/packs/entrypoints/decidim_elections_voter_casting-vote.js",
diff --git a/decidim-elections/config/locales/ar.yml b/decidim-elections/config/locales/ar.yml
index 42d0816eea6df..f7f924616cea9 100644
--- a/decidim-elections/config/locales/ar.yml
+++ b/decidim-elections/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -9,7 +10,7 @@ ar:
     elections:
       admin:
         steps:
-          tally:
+          tally_started:
             invalid: كانت هناك مشكلة �ي الإبلاغ عن الأمين الم�قود
             mark_as_missing: وضع علامة م�قود
             mark_as_missing_description: يجب أن يشارك جميع الأمناء �ي هذه العملية، ولكن إذا لم يتمكن الأمين من المشاركة �ي العملية، يمكنك وضع علامة على أنها م�قودة.
diff --git a/decidim-elections/config/locales/bg.yml b/decidim-elections/config/locales/bg.yml
index 6101a77b150c4..c4ba3a6e3c604 100644
--- a/decidim-elections/config/locales/bg.yml
+++ b/decidim-elections/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-elections/config/locales/ca.yml b/decidim-elections/config/locales/ca.yml
index 011b23cf51129..69b62b14e9767 100644
--- a/decidim-elections/config/locales/ca.yml
+++ b/decidim-elections/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ ca:
         image: Imatge
         proposals: Propostes relacionades
         title: Títol
+      ballot_style:
+        code: Codi
       election:
         description: Descripció
         end_time: La votació finalitza el
         start_time: La votació comença el
         title: Títol
+      monitoring_committee_member:
+        email: Correu electrònic
+        name: Nom
+      polling_officer:
+        email: Correu electrònic
+        name: Nom
+      polling_station:
+        address: Adreça
+        location: Ubicació
+        location_hints: Detalls d'ubicació
+        polling_station_managers: Gestores
+        polling_station_president_id: Presidència
+        title: Títol
       question:
         max_selections: Número màxim d'opcions
         min_selections: Cap de les opcions anteriors
         title: Títol
+      trustees_participatory_space:
+        user_id: Participant
       voting:
+        banner_image: Imatge de capçalera
+        census_contact_information: Dades de contacte del cens
+        description: Descripció
         end_time: La votació finalitza
+        introductory_image: Imatge de presentació
+        promoted: Destacada
+        scope_id: Àmbit
+        show_check_census: Mostrar la pàgina de "comprovar el cens"
         start_time: La votació comença
+        title: Títol
+        voting_type: Tipus de votació
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ ca:
               cant_be_changed: no es pot canviar
             public_key:
               cant_be_changed: no es pot canviar
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} no es un tipus de votació vàlid"
   activerecord:
     errors:
       models:
@@ -290,15 +321,6 @@ ca:
             selected: Seleccionat
             submit: Enviar
             title: Resultats publicats
-          tally:
-            continue: Continuar
-            invalid: S'ha produït un error en notificar l'absència de la garant
-            mark_as_missing: Marcar com absent
-            mark_as_missing_description: Totes les garants haurien de participar en aquest procés, però si una garant no en pot prendre part, la pots marcar com a absent.
-            success: La notificació d'absència de la garant ha estat enviada correctament
-            tally_completion: El procés es completarà quan totes les garants estiguin actives o marcades com a absents. Fan falta com un mínim de %{quorum} garant per a completar el procés.
-            title: Procés de recompte
-            undo_mark_as_missing: Una garant marcada com a absent per error podrà participar abans de la finalització del procés. Pot actuar com de costum i la seva absència serà ignorada.
           tally_ended:
             answer: Resposta
             not_selected: No seleccionat
@@ -308,6 +330,15 @@ ca:
             submit: Publicar resultats
             success: La sol·licitud per publicar els resultats s'ha enviat correctament al Bulletin Board
             title: Resultats calculats
+          tally_started:
+            continue: Continuar
+            invalid: S'ha produït un error en notificar l'absència de la garant
+            mark_as_missing: Marcar com absent
+            mark_as_missing_description: Totes les garants haurien de participar en aquest procés, però si una garant no en pot prendre part, la pots marcar com a absent.
+            success: La notificació d'absència de la garant ha estat enviada correctament
+            tally_completion: El procés es completarà quan totes les garants estiguin actives o marcades com a absents. Fan falta com un mínim de %{quorum} garant per a completar el procés.
+            title: Procés de recompte
+            undo_mark_as_missing: Una garant marcada com a absent per error podrà participar abans de la finalització del procés. Pot actuar com de costum i la seva absència serà ignorada.
           vote:
             errors:
               time_after: L'elecció està en curs encara. Has d'esperar fins l'hora de fi (%{end_time}) per finalitzar el període de votació.
@@ -380,9 +411,8 @@ ca:
         end_date: Finalitza
         footer:
           remaining_time:
-            one: "Queden <strong>%{count} hora %{minutes} minuts</strong> per votar."
-            other: "Queden <strong>%{count} hores %{minutes} minuts</strong> per votar."
-            zero: "Queden <strong>%{minutes} minuts</strong> per votar."
+            one: "queda <strong>%{count} hora %{minutes} minuts</strong> per votar."
+            other: "queden <strong>%{count} hores %{minutes} minuts</strong> per votar."
           view: Veure
           vote: Votar
         label:
@@ -443,9 +473,9 @@ ca:
         filters:
           active: Activa
           all: Totes
+          date: Data
           finished: Finalizada
           search: Cercar
-          state: Estat
           upcoming: Properes
         filters_small_view:
           close_modal: Tancar el modal
@@ -464,7 +494,6 @@ ca:
           votes:
             one: "%{count} vot"
             other: "%{count} vots"
-            zero: "%{count} vots"
         show:
           action_button:
             change_vote: Canvia el teu vot
@@ -554,7 +583,7 @@ ca:
             title: Restaurar claus per l'elecció %{election}
             upload_election_keys: Pujar claus de l'elecció
             upload_icon: Icona que indica una acció de descàrrega
-          tally_steps:
+          tally_started_steps:
             back: Enrere
             description: Els resultats d'aquesta elecció s'estan computant al Bulletin Board. Per completar aquest procés, és necessària la teva participació com a garant.
             keys:
@@ -565,11 +594,11 @@ ca:
             list:
               status: Estat
               task: Tasca
-            process_warning: Un cop ha començat el procés, no hauries de sortir d'aquesta pàgina fins que aquest acabi. Trigarà varis minuts, ja que tots els garants han de connectar-se al mateix temps per completar-lo.
+            process_warning: Un cop ha començat el procés, no hauries de sortir d'aquesta pàgina fins que aquest acabi. Trigarà alguns minuts, ja que totes les garants han de connectar-se al mateix temps per completar-lo.
             start: Començar
             start_icon: Icona que indica un botó d'inici per a la generació de claus d'una elecció
             status:
-              completed: Completada
+              completed: Completat
               pending: Pendent
               processing: Processant
             title: Recompte per %{election}
@@ -604,14 +633,14 @@ ca:
               generate_legend_3: Assegura't de que el teu equip no tingui una còpia de l'arxiu (per exemple, comprova les carpetes de Baixades i Escriptori).
               generate_legend_4: Fes una altra copia de l'arxiu en un dispositiu extern diferent i guarda'l a un lloc molt segur.
               submit: Enviar
-              submit_legend: Després de seguir tots els passos explicats anteriorment, completa el procés enviant la clau d'identificació pública al servidor de Decidim.
+              submit_legend: Després de seguir tots els passos explicats anteriorment, completa el procés enviant la clau d'identificació pública al servidor.
               submit_title: Enviar la clau d'identificació pública
               title: Claus d'identificació del garant
               upload: Puja les teves claus d'identificació
               upload_error:
                 invalid_format: L'arxiu pujat no conté cap clau d'identificació.
                 invalid_key: Les claus d'identificació a l'arxiu pujat no es poden carregar.
-                invalid_public_key: Les claus d'identificació a l'arxiu pujat no coincideixen amb la clau d'identificació pública emmagatzemada per Decidim.
+                invalid_public_key: Les claus d'identificació a l'arxiu pujat no coincideixen amb la clau d'identificació pública emmagatzemada.
               upload_legend: Decidim té les teves claus públiques d'identificació, però el teu navegador encara no les té. Necessites importar l'arxiu amb les teves claus d'identificació al teu ordinador des de la còpia de seguretat que vas crear després de generar-les.
             not_supported_browser_description: Sembla que estàs usant un navegador que no pot ser utilitzat per a actuar com a garant. Assegura't que estàs usant la versió més recent del teu navegador, o intenta usar qualsevol dels navegadors més populars per a poder completar les teves tasques com a garant.
             not_supported_browser_title: Actualitza el navegador per a actuar com a garant
@@ -654,10 +683,6 @@ ca:
         failed:
           header: Vot fallit
           lead: El teu vot no s'ha enviat!
-          modal:
-            close: Tancar
-            communication_lost: Malauradament, sembla que la comunicació amb el servidor de votació (Bulletin Board) s'ha perdut.<br>Pot ser que la connexió a Internet estigui avariada o que el servidor de destí estigui massa ocupat.<br>Pots provar-ho més tard o posar-te en contacte amb el servei d'assistència si aquest problema persisteix.
-            title: Alguna cosa ha anat malament
           text: Alguna cosa ha anat malament. Si us plau, torna-ho a provar.
           try_again: Prova-ho de nou
         header:
@@ -683,9 +708,9 @@ ca:
         onboarding_modal:
           close: Tanca el modal
           create_account: Crea un compte
-          description: Vols crear un nou compte al Decidim? Podràs participar als processos i ser una part activa de l'organització.
+          description: Vols crear un nou compte? Podràs participar als processos i ser part activa de l'organització.
           no_account: No, gràcies.
-          title: Primer cop a Decidim?
+          title: Ets nova a la plataforma?
         update:
           error: Hi ha hagut un error en actualitzar el vot. Prova-ho de nou.
         verify:
@@ -696,9 +721,10 @@ ca:
             header: Vot no localitzat!
             info: El codi del vot no s'ha trobat a l'urna %{link}, intenta-ho de nou.
           form:
-            back: Tornar a Decidim
+            back: Tornar a la plataforma
             submit: Comprovar
             vote_identifier: 'Codi identificador:'
+            vote_identifier_help: Aquest és l'indicador que se't va donar després d'emetre el teu vot (no és el codi per a entrar a la cabina de votació).
           header:
             title: Verifica el teu vot
           success:
@@ -1019,6 +1045,7 @@ ca:
             introductory_image: Imatge de presentació
             promoted: Destacada
             select_a_voting_type: Si us plau selecciona un tipus de votació
+            show_check_census_help: Si vols mostrar l'enllaç "Puc votar?" al menú de votacions públiques
             slug: Nom curt d'URL
             slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
             title: Títol
@@ -1067,7 +1094,7 @@ ca:
               invalid: Hi ha hagut un error en pujar el cens, prova-ho de nou més tard.
               invalid_csv_header: Les capçaleres al CSV manquen o no son correctes. Si us plau, rellegeix atentament les instruccions
             creating_data:
-              info_message: "<strong>Si us plau espera</strong>, processades %{processed_count} de %{raw_count} fileres al fitxer de %{file}."
+              info_message: "<strong>Si us plau espera</strong>, processades %{processed_count} de %{raw_count} fileres al fitxer de %{file} (això pot trigar alguns minuts)."
             delete:
               button: Eliminar totes les dades del cens
               confirm: L'eliminació del cens no es pot desfer. Segur que vols continuar?
@@ -1082,9 +1109,12 @@ ca:
               launch_error: Hi ha hagut un error en exportar els codis d'accés
               launch_success: S'ha iniciat l'exportació dels codis d'accés. En breu rebràs un correu a %{email}
             exporting_access_codes:
-              info_message: "<strong>Si us plau espera</strong>, s'està preparant l'exportació. En breu rebràs un correu a %{email}"
+              info_message: "<strong>Si us plau espera</strong>, s'està preparant l'exportació, aviat la rebràs a %{email} (això pot trigar alguns minuts)."
             freeze:
               callout: El cens està tancat i no es pot modificar.
+              help_html: |
+                Les dades del cens s'han pujat correctament, els codis s'han generat i exportat correctament.<br><strong>Ara ja estàs llesta per a començar les eleccions.</strong><br>
+                Fes servir el CSV exportat que inclou els codis individuals per a distribuir-les al cens fent servir els teus propis mitjans o activant la pestanya "Puc votar?" per a permetre que qualsevol pugui recuperar aquest codi fent servir les seves dades censals.
             generate_access_codes:
               button: Generar els codis d'accés de la votació
               callout: Ara ja pots generar els codis d'accés. Tingues en compte que, un cop els hagis generat, ja no podràs modificar el cens.
@@ -1093,8 +1123,9 @@ ca:
               info_message_warn: Si us plau, comprova que no s'hagi perdut cap dada, s'han creat %{data_count} registres i el fitxer pujat %{file} té %{raw_count} fileres.
               launch_error: Hi ha hagut un error en generar els codis d'accés
               launch_success: S'ha iniciat la generació dels codis.
+              start_over: Si us plau, elimina el cens actual i torna a començar amb un arxiu CSV apropiat amb files vàlides.
             generating_access_codes:
-              info_message: "<strong>Si us plau, espera</strong>, s'estan generant el codis d'accés a la votació..."
+              info_message: "<strong>Si us plau, espera</strong>, els codis d'accés a la votació s'estan generant (això pot trigar uns minuts)..."
             new:
               file_help:
                 explanation: 'Instruccions per al fitxer:'
@@ -1213,11 +1244,12 @@ ca:
         in_person_votes:
           complete_voting:
             available_answers: 'Respostes disponibles:'
-            census_verified: La participant encara no ha votat.
+            census_verified: Aquesta participant no ha votat presencialment encara.
+            census_verified_with_online_vote: Aquesta participant ja ha votat en línia. Si vota presencialment, la votació prèvia serà invalidada i aquest serà el seu vot definitiu.
             complete_voting: Completar el vot
             identify_another: Identificar una altra participant
             questions_title: 'Té dret a votar les següents preguntes:'
-            questions_title_voted: 'La participant ja ha votat en línia i té dret a votar les següents preguntes:'
+            questions_title_voted: 'Aquesta participant ja ha votat en línia i té dret a votar a les següents preguntes:'
             voted: La participant ha votat
           create:
             error: El vot no ha estat registrat. Si us plau, prova-ho de nou.
@@ -1343,9 +1375,9 @@ ca:
         filters:
           active: Actives
           all: Totes
+          date: Data
           finished: Finalitzades
           search: Cercar
-          state: Estat
           upcoming: Properes
         filters_small_view:
           close_modal: Tancar finestra
diff --git a/decidim-elections/config/locales/cs.yml b/decidim-elections/config/locales/cs.yml
index 42ac8598c34f2..0cf8034925be4 100644
--- a/decidim-elections/config/locales/cs.yml
+++ b/decidim-elections/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ cs:
         image: Obrázek
         proposals: Související návrhy
         title: Název
+      ballot_style:
+        code: Kód
       election:
         description: Popis
         end_time: Hlasování kon�í v
         start_time: Hlasování za�íná v
         title: Název
+      monitoring_committee_member:
+        email: E-mail
+        name: Jméno
+      polling_officer:
+        email: E-mail
+        name: Jméno
+      polling_station:
+        address: Adresa
+        location: Poloha
+        location_hints: Nápověda k poloze
+        polling_station_managers: Manažeři
+        polling_station_president_id: Předseda
+        title: Název
       question:
         max_selections: Maximální po�et výběrů
         min_selections: Žádná z výše uvedených možností
         title: Název
+      trustees_participatory_space:
+        user_id: Ú�astník
       voting:
+        banner_image: Obrázek banneru
+        census_contact_information: Kontaktní informace pro rejstřík obyvatel
+        description: Popis
         end_time: Hlasování kon�í
+        introductory_image: Úvodní obrázek
+        promoted: Propagováno
+        scope_id: Oblast působnosti
+        show_check_census: Zobrazit stránku "zkontrolovat rejstřík"
         start_time: Hlasování za�íná
+        title: Název
+        voting_type: Typ hlasování
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ cs:
               cant_be_changed: nelze změnit
             public_key:
               cant_be_changed: nelze změnit
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} není platný typ hlasování"
   activerecord:
     errors:
       models:
@@ -308,15 +339,6 @@ cs:
             selected: Vybráno
             submit: Odeslat
             title: Výsledky publikovány
-          tally:
-            continue: Pokra�ovat
-            invalid: Došlo k problému s nahlášením chybějícího důvěrníka
-            mark_as_missing: Ozna�it jako chybějící
-            mark_as_missing_description: Tohoto procesu by se měli ú�astnit všichni důvěrníci, ale pokud se některý důvěrník nemůže procesu ú�astnit, můžete ho ozna�it jako chybějícího.
-            success: Zpráva o chybějícím důvěrníkovi byla úspěšně odeslána na vývěsku
-            tally_completion: Proces bude dokon�en, jakmile budou všichni důvěrníci aktivní nebo budou ozna�eni jako chybějící. K dokon�ení procesu je zapotřebí alespoň %{quorum} důvěrníků.
-            title: Proces volebního přepo�ítání
-            undo_mark_as_missing: Správce, který byl omylem ozna�en jako chybějící, se bude moci zú�astnit před dokon�ením procesu. Může postupovat jako obvykle a chybějící ozna�ení bude ignorováno.
           tally_ended:
             answer: Odpově�
             not_selected: Nevybráno
@@ -326,6 +348,15 @@ cs:
             submit: Publikovat výsledky
             success: Žádost o Zveřejnění výsledků bylo úspěšně odesláno na Vývěsku
             title: Vypo�ítané výsledky
+          tally_started:
+            continue: Pokra�ovat
+            invalid: Došlo k problému s nahlášením chybějícího důvěrníka
+            mark_as_missing: Ozna�it jako chybějící
+            mark_as_missing_description: Tohoto procesu by se měli ú�astnit všichni důvěrníci, ale pokud se některý důvěrník nemůže procesu ú�astnit, můžete ho ozna�it jako chybějícího.
+            success: Zpráva o chybějícím důvěrníkovi byla úspěšně odeslána na vývěsku
+            tally_completion: Proces bude dokon�en, jakmile budou všichni důvěrníci aktivní nebo budou ozna�eni jako chybějící. K dokon�ení procesu je zapotřebí alespoň %{quorum} důvěrníků.
+            title: Proces volebního přepo�ítání
+            undo_mark_as_missing: Správce, který byl omylem ozna�en jako chybějící, se bude moci zú�astnit před dokon�ením procesu. Může postupovat jako obvykle a chybějící ozna�ení bude ignorováno.
           vote:
             errors:
               time_after: Volby stále probíhají. Musíte po�kat na ukon�ení hlasovacího období (%{end_time}).
@@ -399,8 +430,9 @@ cs:
         footer:
           remaining_time:
             one: "Na hlasování zbývá <strong>%{count} hodina a %{minutes} minut</strong>."
+            few: "Na hlasování zbývá <strong>%{count} hodiny a %{minutes} minut</strong>."
+            many: "Na hlasování zbývá <strong>%{count} hodin a %{minutes} minut</strong>."
             other: "Na hlasování zbývá <strong>%{count} hodin a %{minutes} minut</strong>."
-            zero: "Na hlasování zbývá <strong>%{minutes} minut</strong>."
           view: Zobrazit
           vote: Hlasovat
         label:
@@ -463,9 +495,9 @@ cs:
         filters:
           active: Aktivní
           all: VÅ¡e
+          date: Datum
           finished: Dokon�eno
           search: Hledat
-          state: Stav
           upcoming: Nadcházející
         filters_small_view:
           close_modal: Zavřít okno
@@ -483,8 +515,9 @@ cs:
           title: Výsledky voleb
           votes:
             one: "%{count} hlas"
+            few: "%{count} hlasy"
+            many: "%{count} hlasů"
             other: "%{count} hlasů"
-            zero: "%{count} hlasů"
         show:
           action_button:
             change_vote: Změňte svůj hlas
@@ -574,7 +607,7 @@ cs:
             title: Obnovit volební klí�e pro %{election}
             upload_election_keys: Nahrát volební klí�e
             upload_icon: Ikona, která indikuje akci ke stažení
-          tally_steps:
+          tally_started_steps:
             back: Zpět
             description: Výsledky těchto voleb jsou vy�ísleny na Vývěsce. Pro dokon�ení tohoto procesu je zapotřebí vaší ú�asti jako Důvěrníka.
             keys:
@@ -624,15 +657,15 @@ cs:
               generate_legend_3: Ujistěte se, že váš po�íta� nemá kopii souboru (např. zkontrolujte složky Stahování a plocha).
               generate_legend_4: Vytvořit další kopii souboru na jiném externím zařízení a uložit jej na velmi bezpe�ném místě.
               submit: Odeslat
-              submit_legend: Po splnění všech výše uvedených kroků dokon�ete proces odesílání veřejného identifika�ního klí�e na server Decidim.
+              submit_legend: Po splnění všech výše uvedených kroků dokon�ete proces odesílání veřejného identifika�ního klí�e na server.
               submit_title: Odeslat veřejný identifika�ní klí�
               title: Identifika�ní klí�e důvěrníka
               upload: Nahrajte své identifika�ní klí�e
               upload_error:
                 invalid_format: Nahraný soubor neobsahuje žádný identifika�ní klí�.
                 invalid_key: Identifika�ní klí�e v nahraném souboru nelze na�íst.
-                invalid_public_key: Identifika�ní klí�e v nahraném souboru neodpovídají veřejnému identifika�nímu klí�i uloženému v Decidim.
-              upload_legend: Decidim má vaše veřejné identifika�ní klí�e, ale váš prohlíže� jej stále nemá. Je třeba importovat soubor s identifika�ními klí�i do po�íta�e ze zálohy, kterou jste vytvořili po jejich vygenerování.
+                invalid_public_key: Identifika�ní klí�e v nahraném souboru neodpovídají uloženému veřejnému identifika�nímu klí�i.
+              upload_legend: Server má vaše veřejné identifika�ní klí�e, ale váš prohlíže� jej stále nemá. Je třeba importovat soubor s identifika�ními klí�i do po�íta�e ze zálohy, kterou jste vytvořili po jejich vygenerování.
             not_supported_browser_description: Vypadá to, že používáte webový prohlíže�, který nelze použít jako správce. Ujistěte se, že používáte nejnovější verzi prohlíže�e, nebo zkuste použít některý z nejpopulárnějších prohlíže�ů, abyste mohli dokon�it své úkoly správce.
             not_supported_browser_title: Upgradujte prohlíže� abyste mohl fungovat jako důvěrník
             trustee_role_description: Byl jste pověřen, abyste v některých volbách, které na této platformě probíhají, jednal jako důvěrník.
@@ -674,10 +707,6 @@ cs:
         failed:
           header: Hlasování se nezdařilo
           lead: Váš hlas nebyl odeslán!
-          modal:
-            close: Zavřít
-            communication_lost: Bohužel se zdá, že komunikace s hlasovacím serverem (Bulletin Board) je ztracena.<br>Může se stát, že připojení k internetu je přerušeno nebo že cílový server je příliš zaneprázdněný.<br>Pokud tento problém přetrvává, můžete to zkusit později nebo se obraťte na podporu.
-            title: Něco se pokazilo
           text: Něco se pokazilo, zkuste to prosím znovu.
           try_again: Zkuste to znovu
         header:
@@ -703,9 +732,9 @@ cs:
         onboarding_modal:
           close: Zavřít okno
           create_account: Vytvořit ú�et
-          description: Chcete si vytvořit nový ú�et v Decidimu? Budete se moci ú�astnit procesů a být aktivní sou�ástí organizace.
+          description: Chcete vytvořit nový ú�et na platformě? Budete se moci ú�astnit procesů a být aktivní sou�ástí organizace.
           no_account: Ne, děkuji.
-          title: Jste v Decidim poprvé?
+          title: Jste na platformě nový?
         update:
           error: Při aktualizaci statusu hlasování se vyskytl problém. Prosím, hlasujte znovu.
         verify:
@@ -716,9 +745,10 @@ cs:
             header: Hlasování nenalezeno!
             info: Kód hlasu nebyl nalezen v %{link} volebních urnám, zkuste to znovu.
           form:
-            back: Zpět na Decidim
+            back: Zpět na platformu
             submit: Ověřit
             vote_identifier: 'Identifika�ní kód:'
+            vote_identifier_help: Toto je identifikátor, který vám byl poskytnut po hlasování (ne kód pro zadání hlasovacího pultu).
           header:
             title: Ověřte svůj hlas
           success:
@@ -1039,6 +1069,7 @@ cs:
             introductory_image: Úvodní obrázek
             promoted: Propagováno
             select_a_voting_type: Vyberte prosím typ hlasování
+            show_check_census_help: Zda zobrazit odkaz "Mohu hlasovat?" v nabídce veřejného hlasování
             slug: Slug
             slug_help: 'URL slug se používá k generování URL, které odkazují na toto hlasování. přijímá pouze písmena, �ísla a poml�ky a musí za�ínat písmenem. Příklad: %{url}'
             title: Název
@@ -1087,7 +1118,7 @@ cs:
               invalid: Při nahrávání seznamu osob došlo k chybě, opakujte akci později.
               invalid_csv_header: Hlavi�ky CSV chybí nebo nejsou správné - pře�těte si prosím pe�livě pokyny
             creating_data:
-              info_message: "<strong>Po�kejte prosím</strong>, zpracováno %{processed_count} z %{raw_count} řádků ze souboru %{file}."
+              info_message: "<strong>Po�kejte prosím</strong>, zpracováno %{processed_count} z %{raw_count} řádků ze souboru %{file} (to může trvat několik minut)."
             delete:
               button: Odstranit všechna data ze seznamu obyvatel
               confirm: Odstranění všech dat z rejstříku osob nelze vrátit zpět. Opravdu chcete pokra�ovat?
@@ -1102,9 +1133,13 @@ cs:
               launch_error: Problém se spuštěním exportu přístupových kódů
               launch_success: Export přístupových kódů byl spuštěn. Brzy obdržíte e-mail na %{email}
             exporting_access_codes:
-              info_message: "<strong>Po�kejte prosím</strong>, export se připravuje, brzy ho obdržíte na %{email}"
+              info_message: "<strong>Po�kejte prosím</strong>, export se připravuje, obdržíte ho brzy na %{email} (to může trvat několik minut)."
             freeze:
               callout: Seznam osob je zmrazen a nelze jej upravit.
+              help_html: |
+                Data z registru obyvatel byla nahrána, kódy byly úspěšně vygenerovány a exportovány.<br>
+                <strong>Nyní jste připraveni zahájit volbu.</strong><br>
+                Použijte exportovaný CSV s individuálními kódy k distribuci ve vašem s�ítání pomocí vlastních prostředků nebo aktivujte záložku "Můžu hlasovat", aby kdokoliv mohl tento kód na�íst pomocí vlastních dat ze s�ítání.
             generate_access_codes:
               button: Generovat hlasovací přístupové kódy
               callout: Nyní můžete přejít k vygenerování přístupových kódů. Pamatujte, že po vygenerování přístupových kódů již nebudete moci měnit seznam osob.
@@ -1113,8 +1148,9 @@ cs:
               info_message_warn: Zkontrolujte, že žádná data nechybí, protože byly vytvořeno %{data_count} záznamů a nahraný soubor %{file} měl %{raw_count} řádků.
               launch_error: Problém při spuštění generování přístupových kódů
               launch_success: Vytváření kódů bylo spuštěno.
+              start_over: Vymažte prosím aktuální rejstřík obyvatel a za�něte znovu se správným CSV souborem s platnými řádky.
             generating_access_codes:
-              info_message: "<strong>Po�kejte prosím</strong>, přístupové kódy hlasování jsou generovány..."
+              info_message: "<strong>Po�kejte prosím</strong>, přístupové kódy pro hlasování jsou vytvářeny (toto může trvat několik minut)..."
             new:
               file_help:
                 explanation: 'Pokyny pro soubor:'
@@ -1233,11 +1269,12 @@ cs:
         in_person_votes:
           complete_voting:
             available_answers: 'Dostupné odpovědi:'
-            census_verified: Uživatel ještě nehlasoval.
+            census_verified: Tento uživatel zatím nehlasoval osobně.
+            census_verified_with_online_vote: Tento uživatel již hlasoval online. Pokud hlasují osobně, předchozí hlasy budou zneplatněny a bude to kone�né hlasování.
             complete_voting: Dokon�ené hlasování
             identify_another: Identifikovat jiného ú�astníka
             questions_title: 'Má právo hlasovat v těchto otázkách:'
-            questions_title_voted: 'Ú�astník již hlasoval on-line a je oprávněn hlasovat v následujících otázkách:'
+            questions_title_voted: 'Tento uživatel již hlasoval on-line a je oprávněn hlasovat v následujících otázkách:'
             voted: Uživatel hlasoval
           create:
             error: Hlasování nebylo zaregistrováno. Zkuste to prosím znovu.
@@ -1365,9 +1402,9 @@ cs:
         filters:
           active: Aktivní
           all: VÅ¡e
+          date: Datum
           finished: Dokon�eno
           search: Hledat
-          state: Stav
           upcoming: Nadcházející
         filters_small_view:
           close_modal: Zavřít modal
diff --git a/decidim-elections/config/locales/de.yml b/decidim-elections/config/locales/de.yml
index 3d75219d8fc3f..7be4288bea9c9 100644
--- a/decidim-elections/config/locales/de.yml
+++ b/decidim-elections/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -16,8 +17,15 @@ de:
         min_selections: Nichts davon
         title: Titel
       voting:
+        banner_image: Kopf-Bild
+        census_contact_information: Kontaktinformation des Zensus
+        description: Beschreibung
         end_time: Abstimmung endet
+        promoted: Hervorgehoben
+        scope_id: Themenbereich
         start_time: Abstimmung beginnt
+        title: Titel
+        voting_type: Art der Abstimmung
     errors:
       models:
         answer:
@@ -34,6 +42,10 @@ de:
               cant_be_changed: kann nicht geändert werden
             public_key:
               cant_be_changed: kann nicht geändert werden
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} ist kein gültiger Abstimmungstyp"
   activerecord:
     errors:
       models:
@@ -275,15 +287,6 @@ de:
             selected: Ausgewählt
             submit: Absenden
             title: Ergebnisse veröffentlicht
-          tally:
-            continue: Fortfahren
-            invalid: Es ist ein Problem beim Melden des Stimmenzählers aufgetreten
-            mark_as_missing: Als fehlend markieren
-            mark_as_missing_description: Alle Wahlhelfer sollten an diesem Prozess teilnehmen. Wenn ein Wahlhelfer nicht am Prozess teilnehmen kann, können Sie ihn als fehlend markieren.
-            success: Eine Meldung über das Fehlen des Wahlhelfers wurde erfolgreich ans Forum gesendet
-            tally_completion: Der Prozess wird abgeschlossen, wenn alle Wahlhelfer aktiv sind oder als fehlend markiert wurden. Mindestens %{quorum} Wahlhelfer sind erforderlich, um den Prozess abzuschließen.
-            title: Stimmenzählung
-            undo_mark_as_missing: Ein Wahlhelfer, der versehentlich als fehlend markiert wurde, kann vor Abschluss des Prozesses teilnehmen. Sie können wie gewohnt fortfahren und die fehlend-Markierung wird ignoriert.
           tally_ended:
             answer: Antwort
             not_selected: Nicht ausgewählt
@@ -293,6 +296,15 @@ de:
             submit: Resultate veröffentlichen
             success: Die Anfrage zur Veröffentlichung der Resultate wurde erfolgreich ans Bulletin Board gesendet
             title: Berechnete Ergebnisse
+          tally_started:
+            continue: Fortfahren
+            invalid: Es ist ein Problem beim Melden des Stimmenzählers aufgetreten
+            mark_as_missing: Als fehlend markieren
+            mark_as_missing_description: Alle Wahlhelfer sollten an diesem Prozess teilnehmen. Wenn ein Wahlhelfer nicht am Prozess teilnehmen kann, können Sie ihn als fehlend markieren.
+            success: Eine Meldung über das Fehlen des Wahlhelfers wurde erfolgreich ans Forum gesendet
+            tally_completion: Der Prozess wird abgeschlossen, wenn alle Wahlhelfer aktiv sind oder als fehlend markiert wurden. Mindestens %{quorum} Wahlhelfer sind erforderlich, um den Prozess abzuschließen.
+            title: Stimmenzähl-Prozess
+            undo_mark_as_missing: Ein Wahlhelfer, der versehentlich als fehlend markiert wurde, kann vor Abschluss des Prozesses teilnehmen. Sie können wie gewohnt fortfahren und die fehlend-Markierung wird ignoriert.
           vote:
             errors:
               time_after: Die Wahl läuft noch. Sie müssen bis zum Ende (%{end_time}) warten, um die Abstimmungsperiode zu schließen.
@@ -351,7 +363,6 @@ de:
           remaining_time:
             one: "<strong>%{count} Stunde %{minutes} Minuten</strong> verbleiben zur Abstimmung."
             other: "<strong>%{count} Stunden %{minutes} Minuten</strong> verbleiben zur Abstimmung."
-            zero: "<strong>%{minutes} Minuten</strong> verbleibend zur Abstimmung."
           view: Ansicht
           vote: Abstimmung
         label:
@@ -412,9 +423,9 @@ de:
         filters:
           active: Aktiv
           all: Alle
+          date: Datum
           finished: Abgeschlossen
           search: Suche
-          state: Status
           upcoming: Anstehend
         filters_small_view:
           close_modal: Dialog schließen
@@ -433,7 +444,6 @@ de:
           votes:
             one: "%{count} Stimme"
             other: "%{count} Stimmen"
-            zero: "%{count} Stimmen"
         show:
           action_button:
             change_vote: Stimme ändern
@@ -522,7 +532,7 @@ de:
             title: Wahl-Schlüssel für %{election} wiederherstellen
             upload_election_keys: Wahl-Schlüssel hochladen
             upload_icon: Symbol, das eine Download-Aktion anzeigt
-          tally_steps:
+          tally_started_steps:
             back: Zurück
             description: Die Ergebnisse dieser Wahl werden im Bulletin Board berechnet. Um diesen Prozess abzuschließen ist Ihre Teilnahme als Wahlhelfer erforderlich.
             keys:
@@ -534,12 +544,10 @@ de:
               status: Status
               task: Aufgabe
             process_warning: Sobald der Prozess gestartet ist, sollten Sie diese Seite nicht verlassen, bis der Prozess endet. Dies kann einige Minuten dauern, da alle Wahlhelfer verbunden sein müssen um den Prozess abzuschliessen.
-            start: Start
-            start_icon: Symbol, das einen Startknopf anzeigt, um die Erzeugung der Wahl-Schlüssel zu starten
+            start: Starten
             status:
               completed: Abgeschlossen
               pending: Ausstehend
-              processing: In Verarbeitung
             title: Stimmenzählung für %{election}
           update:
             error: Der Wahlstatus wurde nicht aktualisiert.
@@ -572,15 +580,12 @@ de:
               generate_legend_3: Stellen Sie sicher, dass Ihr Computer keine Kopie der Datei hat (z.B. überprüfen Sie die Download- und Desktop-Ordner).
               generate_legend_4: Machen Sie eine weitere Kopie der Datei auf einem anderen externen Gerät und speichern Sie sie an einem sehr sicheren Ort.
               submit: Einreichen
-              submit_legend: Nachdem Sie alle oben beschriebenen Schritte befolgt haben, führen Sie den Prozess durch, der den öffentlichen Identifikationsschlüssel an den Decidim-Server sendet.
               submit_title: Öffentlichen Identifikationsschlüssel einreichen
               title: Wahlhelfer-Identifikationsschlüssel
               upload: Lade deine Identifikationsschlüssel hoch
               upload_error:
                 invalid_format: Die hochgeladene Datei enthält keinen Identifikationsschlüssel.
                 invalid_key: Die Identifikationsschlüssel in der hochgeladenen Datei können nicht geladen werden.
-                invalid_public_key: Die Identifikationsschlüssel in der hochgeladenen Datei stimmen nicht mit dem öffentlichen Identifikationsschlüssel überein, der von Decidim gespeichert wird.
-              upload_legend: Decidim hat Ihren öffentlichen Identifikationsschlüssel, aber Ihr Browser hat ihn immer noch nicht. Sie müssen die Datei mit Ihren Identifikationsschlüssel aus dem Backup auf Ihren Computer importieren, das Sie nach der Generierung erstellt haben.
             not_supported_browser_description: Es sieht so aus, als ob Sie einen Webbrowser verwenden, der als Wahlhelfer nicht verwendet werden kann. Stellen Sie sicher, dass Sie die neueste Version Ihres Browsers verwenden, oder versuchen Sie, einen der üblichen Browser zu verwenden, um Ihre Wahlhelfer-Aufgaben zu erfüllen.
             not_supported_browser_title: Browser aktualisieren, um als Wahlhelfer zu agieren
             trustee_role_description: Sie wurden beauftragt, bei einigen der auf dieser Plattform gehaltenen Wahlen als Wahlhelfer zu agieren.
@@ -614,10 +619,6 @@ de:
         failed:
           header: Abstimmung fehlgeschlagen
           lead: Ihre Stimme wurde nicht abgegeben!
-          modal:
-            close: Schließen
-            communication_lost: Leider scheint die Kommunikation mit dem Abstimmungsserver (Bulletin Board) unterbrochen.<br>Möglicherweise ist die Internetverbindung gestört oder der Server ist überlastet.<br>Bitte versuche es später noch einmal oder kontaktiere den Support, falls das Problem weiterhin besteht.
-            title: Etwas ist schiefgelaufen
           text: Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.
           try_again: Erneut versuchen
         header:
@@ -641,9 +642,8 @@ de:
         onboarding_modal:
           close: Dialog schließen
           create_account: Konto erstellen
-          description: Möchten Sie ein neues Konto in Decidim erstellen? Sie können an den Prozessen teilnehmen und aktiv an der Organisation teilnehmen.
           no_account: Nein, danke.
-          title: Neu bei Decidim?
+          title: Neu auf dieser Plattform?
         verify:
           content:
             heading: Stimme verifizieren
@@ -652,7 +652,6 @@ de:
             header: Stimme nicht gefunden!
             info: Diese Kennung wurde nicht in der Wahlurne %{link} gefunden. Versuchen Sie es erneut.
           form:
-            back: Zurück zu Decidim
             submit: Überprüfen
             vote_identifier: 'Kennung:'
           header:
@@ -965,6 +964,7 @@ de:
             banner_image: Kopf-Bild
             promoted: Hervorgehoben
             select_a_voting_type: Bitte einen Abstimmungs-Typ auswählen
+            show_check_census_help: Soll der Link "Kann ich abstimmen?" im Menü "öffentliche Abstimmung" angezeigt werden
             slug: URL-Segment
             slug_help: 'URL-Slugs werden zum Generieren der URLs verwendet, die auf diese Abstimmung verweisen. Akzeptiert nur Buchstaben, Zahlen und Bindestriche und muss mit einem Buchstaben beginnen. Beispiel: %{url}'
             title: Titel
@@ -993,8 +993,6 @@ de:
           census:
             create:
               invalid: Beim Hochladen der Erhebung ist ein Problem aufgetreten, bitte versuchen Sie es später erneut.
-            creating_data:
-              info_message: "<strong>Bitte warten</strong>, %{processed_count} von %{raw_count} Zeilen aus der Datei %{file} wurden verarbeitet."
             delete:
               button: Alle Erhebungsdaten löschen
             destroy:
@@ -1007,8 +1005,6 @@ de:
               file_not_exist: Diese Datei existiert nicht
               launch_error: Beim Starten des Zugangscode-Exports ist ein Problem aufgetreten
               launch_success: Der Zugangscode-Export wurde gestartet. Sie werden in Kürze eine E-Mail an %{email} erhalten
-            exporting_access_codes:
-              info_message: "<strong>Bitte warten</strong>, der Export wird gerade vorbereitet. Sie werden ihn in Kürze an %{email} erhalten"
             freeze:
               callout: Die Erhebung ist geschlossen und kann nicht verändert werden.
             generate_access_codes:
@@ -1019,8 +1015,6 @@ de:
               info_message_warn: Bitte überprüfen Sie, dass keine Daten fehlen, denn es wurden %{data_count} Datensätze erstellt und die hochgeladene Datei %{file} enthielt %{raw_count} Zeilen.
               launch_error: Problem beim Starten der Zugangscodes Generierung
               launch_success: Codegenerierung gestartet.
-            generating_access_codes:
-              info_message: "<strong>Bitte warten Sie</strong>, die Stimmzugriffscodes werden generiert..."
             new:
               file_help:
                 explanation: 'Hinweise für die Datei:'
@@ -1136,11 +1130,11 @@ de:
         in_person_votes:
           complete_voting:
             available_answers: 'Verfügbare Antworten:'
-            census_verified: Der Teilnehmer hat noch nicht abgestimmt.
+            census_verified: Dieser Benutzer hat noch nicht persönlich gewählt.
+            census_verified_with_online_vote: Dieser Teilnehmer hat bereits online abgestimmt. Wenn er persönlich abstimmt, wird die vorherigen Abstimmung ungültig und dies wird die endgültige Abstimmung sein.
             complete_voting: Abstimmung abschliessen
             identify_another: Einen anderen Teilnehmer identifizieren
             questions_title: 'Er hat das Recht, bei folgenden Anfragen abzustimmen:'
-            questions_title_voted: 'Der Teilnehmer hat bereits online abgestimmt und kann bei folgenden Fragen abstimmen:'
             voted: Der Teilnehmer hat abgestimmt
           create:
             error: Die Stimme wurde nicht registriert. Bitte versuchen Sie es erneut.
@@ -1263,9 +1257,9 @@ de:
         filters:
           active: Aktiv
           all: Alle
+          date: Datum
           finished: Abgeschlossen
           search: Suchen
-          state: Status
           upcoming: Zukünftig
         filters_small_view:
           close_modal: Dialog schließen
diff --git a/decidim-elections/config/locales/el.yml b/decidim-elections/config/locales/el.yml
index e10b488fff57f..ce44dee4a32e9 100644
--- a/decidim-elections/config/locales/el.yml
+++ b/decidim-elections/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
diff --git a/decidim-elections/config/locales/en.yml b/decidim-elections/config/locales/en.yml
index 37c649fbe76b2..a82873bc12882 100644
--- a/decidim-elections/config/locales/en.yml
+++ b/decidim-elections/config/locales/en.yml
@@ -7,18 +7,44 @@ en:
         image: Image
         proposals: Related proposals
         title: Title
+      ballot_style:
+        code: Code
       election:
         description: Description
         end_time: Voting ends at
         start_time: Voting start at
         title: Title
+      monitoring_committee_member:
+        email: Email
+        name: Name
+      polling_officer:
+        email: Email
+        name: Name
+      polling_station:
+        address: Address
+        location: Location
+        location_hints: Location hint
+        polling_station_managers: Managers
+        polling_station_president_id: President
+        title: Title
       question:
         max_selections: Maximum number of selections
         min_selections: None of the above option
         title: Title
+      trustees_participatory_space:
+        user_id: Participant
       voting:
+        banner_image: Banner image
+        census_contact_information: Census contact information
+        description: Description
         end_time: Voting ends
+        introductory_image: Introductory image
+        promoted: Promoted
+        scope_id: Scope
+        show_check_census: Show "check census" page
         start_time: Voting begins
+        title: Title
+        voting_type: Voting type
     errors:
       models:
         answer:
@@ -35,6 +61,10 @@ en:
               cant_be_changed: can't be changed
             public_key:
               cant_be_changed: can't be changed
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} is not a valid voting type"
   activerecord:
     errors:
       models:
@@ -291,15 +321,6 @@ en:
             selected: Selected
             submit: Submit
             title: Results published
-          tally:
-            continue: Continue
-            invalid: There was a problem reporting the missing trustee
-            mark_as_missing: Mark as missing
-            mark_as_missing_description: All the trustees should participate in this process, but if a trustee can't take part in the process, you can mark it as missing.
-            success: Missing trustee report was successfully sent to the Bulletin Board
-            tally_completion: The process will be completed when all the trustees are active or marked as missing. At least %{quorum} trustees are required to complete the process.
-            title: Tally process
-            undo_mark_as_missing: A trustee marked as missing by mistake will be able to participate before the completion of the process. They can proceed as usual and the missing mark will be ignored.
           tally_ended:
             answer: Answer
             not_selected: Not selected
@@ -309,6 +330,15 @@ en:
             submit: Publish results
             success: Publish results request was successfully sent to the Bulletin Board
             title: Calculated results
+          tally_started:
+            continue: Continue
+            invalid: There was a problem reporting the missing trustee
+            mark_as_missing: Mark as missing
+            mark_as_missing_description: All the trustees should participate in this process, but if a trustee can't take part in the process, you can mark it as missing.
+            success: Missing trustee report was successfully sent to the Bulletin Board
+            tally_completion: The process will be completed when all the trustees are active or marked as missing. At least %{quorum} trustees are required to complete the process.
+            title: Tally process
+            undo_mark_as_missing: A trustee marked as missing by mistake will be able to participate before the completion of the process. They can proceed as usual and the missing mark will be ignored.
           vote:
             errors:
               time_after: The election is still ongoing. You have to wait until the ending time (%{end_time}) to end the voting period.
@@ -444,9 +474,9 @@ en:
         filters:
           active: Active
           all: All
+          date: Date
           finished: Finished
           search: Search
-          state: Status
           upcoming: Upcoming
         filters_small_view:
           close_modal: Close modal
@@ -555,7 +585,7 @@ en:
             title: Restore election keys for %{election}
             upload_election_keys: Upload election keys
             upload_icon: Icon that indicates a download action
-          tally_steps:
+          tally_started_steps:
             back: Back
             description: The results for this election are being computed in the Bulletin Board. To complete this process, your participitation as a Trustee is needed.
             keys:
@@ -605,15 +635,15 @@ en:
               generate_legend_3: Ensure your computer doesn't have a copy of the file (e.g. check the Downloads and Desktop folders).
               generate_legend_4: Make another copy of the file on a different external device and store it in a very safe place.
               submit: Submit
-              submit_legend: After following all the steps explained above, complete the process sending the public identification key to the Decidim server.
+              submit_legend: After following all the steps explained above, complete the process sending the public identification key to the server.
               submit_title: Submit the public identification key
               title: Trustee identification keys
               upload: Upload your identification keys
               upload_error:
                 invalid_format: The uploaded file doesn't contain any identification key.
                 invalid_key: The identification keys in the uploaded file can't be loaded.
-                invalid_public_key: The identification keys in the uploaded file doesn't match the public identification key stored by Decidim.
-              upload_legend: Decidim has your public identification keys, but your browser still doesn't have it. You need to import the file with your identification keys to your computer from the backup you created after generating them.
+                invalid_public_key: The identification keys in the uploaded file doesn't match the public identification key stored.
+              upload_legend: The server has your public identification keys, but your browser still doesn't have it. You need to import the file with your identification keys to your computer from the backup you created after generating them.
             not_supported_browser_description: It looks like you are using a web browser that can't be used to act as a Trustee. Make sure you're using the most recent version of your browser, or try using any of the most popular browsers to be able to complete your Trustee tasks.
             not_supported_browser_title: Upgrade browser to act as a Trustee
             trustee_role_description: You have been assigned to act as a Trustee in some of the elections celebrated in this platform.
@@ -655,10 +685,6 @@ en:
         failed:
           header: Vote failed
           lead: Your vote has not been casted!
-          modal:
-            close: Close
-            communication_lost: Unfortunately, it looks like the communication with the voting server (Bulletin Board) is lost.<br>It might be that the Internet connection is broken or that the destination server is too busy.<br>You can try again later or contact support if this problem persist.
-            title: Something went wrong
           text: Something went wrong, please try it again.
           try_again: Try again
         header:
@@ -684,9 +710,9 @@ en:
         onboarding_modal:
           close: Close modal
           create_account: Create Account
-          description: Do you want to create a new account in Decidim? You will be able to participate in the processes and be an active part of the organization.
+          description: Do you want to create a new account on the platform? You will be able to participate in the processes and be an active part of the organization.
           no_account: No, thanks.
-          title: New to Decidim?
+          title: New to the platform?
         update:
           error: There was a problem updating the vote status. Please, vote again.
         verify:
@@ -697,9 +723,10 @@ en:
             header: Vote not found!
             info: The vote code was not found in the %{link} ballot box, try again.
           form:
-            back: Back to Decidim
+            back: Back to the platform
             submit: Check
             vote_identifier: 'Identifier code:'
+            vote_identifier_help: This is the identifier that was given to you after you cast your vote (not the code to enter the voting booth).
           header:
             title: Verify your vote
           success:
@@ -1020,6 +1047,7 @@ en:
             introductory_image: Introductory image
             promoted: Promoted
             select_a_voting_type: Please select a voting type
+            show_check_census_help: Whether to show the "Can I vote?" link at the public votings menu
             slug: Slug
             slug_help: 'URL slugs are used to generate the URLs that point to this voting. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
             title: Title
@@ -1068,7 +1096,7 @@ en:
               invalid: An error occurred uploading the census, please try again later.
               invalid_csv_header: The CSV headers are missing or not correct - please read the instructions carefully
             creating_data:
-              info_message: "<strong>Please wait</strong>, processed %{processed_count} of %{raw_count} rows from %{file} file."
+              info_message: "<strong>Please wait</strong>, processed %{processed_count} of %{raw_count} rows from %{file} file (this may take several minutes)."
             delete:
               button: Delete all census data
               confirm: Deleting all the census data cannot be undone. Are you sure you want to continue?
@@ -1083,9 +1111,13 @@ en:
               launch_error: Problem launching the access codes export
               launch_success: Access codes export launched. Shortly you will receive an email to %{email}
             exporting_access_codes:
-              info_message: "<strong>Please wait</strong>, the export is being prepared, you will receive it shortly to %{email}"
+              info_message: "<strong>Please wait</strong>, the export is being prepared, you will receive it shortly to %{email} (this may take several minutes)."
             freeze:
               callout: The census is frozen and cannot be modified.
+              help_html: |
+                The census data has been uploaded, the codes generated and exported successfully.<br>
+                <strong>You are now ready to start the election.</strong><br>
+                Use the exported CSV with the individual codes to distribute it along your census using you own means or activate the "Can I vote" tab to let anyone retrieve this code using their own census data.
             generate_access_codes:
               button: Generate voting Access Codes
               callout: You can now proceed to generate the access codes. Mind that after generating the access codes you will not be able to modify the census anymore.
@@ -1094,8 +1126,9 @@ en:
               info_message_warn: Please check that no data is missing, because %{data_count} records were created and the uploaded file %{file} had %{raw_count} rows.
               launch_error: Problem launching the access codes generation
               launch_success: Codes generation launched.
+              start_over: Please delete the current census and start over again with a proper CSV file with valid rows.
             generating_access_codes:
-              info_message: "<strong>Please wait</strong>, the voting access codes are being generated..."
+              info_message: "<strong>Please wait</strong>, the voting access codes are being generated (this may take several minutes)..."
             new:
               file_help:
                 explanation: 'Guidance for file:'
@@ -1214,17 +1247,18 @@ en:
         in_person_votes:
           complete_voting:
             available_answers: 'Available answers:'
-            census_verified: The participant has not voted yet.
+            census_verified: This participant has not voted in person yet.
+            census_verified_with_online_vote: This participant has already voted online. If they vote in person, the previous votes will be invalidated and this will be the definitive vote.
             complete_voting: Complete voting
             identify_another: Identify another participant
-            questions_title: 'She is entitled to vote in the following questions:'
-            questions_title_voted: 'The participant has already voted online and is entitled to vote in the following questions:'
+            questions_title: 'They''re entitled to vote in the following questions:'
+            questions_title_voted: 'This participant has already voted online and is entitled to vote in the following questions:'
             voted: The participant has voted
           create:
             error: The vote was not registered. Please try again.
           in_person_form:
             census_not_present: This participant is not listed in the census.
-            census_not_present_description: She must go to the census complaint office or contact support.
+            census_not_present_description: They must go to the census complaint office or contact support.
             date_of_birth: Date of birth
             day: Day
             day_placeholder: DD
@@ -1344,9 +1378,9 @@ en:
         filters:
           active: Active
           all: All
+          date: Date
           finished: Finished
           search: Search
-          state: Status
           upcoming: Upcoming
         filters_small_view:
           close_modal: Close modal
diff --git a/decidim-elections/config/locales/es-MX.yml b/decidim-elections/config/locales/es-MX.yml
index cfc49cda8047a..89f53d06ce98a 100644
--- a/decidim-elections/config/locales/es-MX.yml
+++ b/decidim-elections/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ es-MX:
         image: Imagen
         proposals: Propuestas relacionadas
         title: Título
+      ballot_style:
+        code: Código
       election:
         description: Descripción
         end_time: La votación termina en
         start_time: La votación comienza a las
         title: Título
+      monitoring_committee_member:
+        email: Correo electrónico
+        name: Nombre
+      polling_officer:
+        email: Correo electrónico
+        name: Nombre
+      polling_station:
+        address: Dirección
+        location: Ubicación
+        location_hints: Detalles de ubicación
+        polling_station_managers: Gestoras
+        polling_station_president_id: Presidencia
+        title: Título
       question:
         max_selections: Número máximo de opciones
         min_selections: Ninguna de las anteriores
         title: Título
+      trustees_participatory_space:
+        user_id: Participante
       voting:
+        banner_image: Imagen de cabecera
+        census_contact_information: Datos de contacto del censo
+        description: Descripción
         end_time: La votación finaliza
+        introductory_image: Imagen de presentación
+        promoted: Destacada
+        scope_id: �mbito
+        show_check_census: Mostrar la página de "comprobar censo"
         start_time: La votación empieza
+        title: Título
+        voting_type: Tipo de votación
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ es-MX:
               cant_be_changed: no se puede cambiar
             public_key:
               cant_be_changed: no se puede cambiar
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} no es un tipo de votación válido"
   activerecord:
     errors:
       models:
@@ -249,7 +280,7 @@ es-MX:
               'false': no tiene una <strong>clave pública</strong>
               'true': tiene una <strong> clave pública</strong>
             requirements:
-              census_codes_generated: Se han generador los códigos de acceso al censo.
+              census_codes_generated: Se han generado los códigos de acceso al censo.
               census_frozen: Se han exportado los códgos para el censo y el censo ha quedado congelado.
               census_uploaded: El censo está subido.
               component_published: La elección está <strong>publicada</strong>.
@@ -290,15 +321,6 @@ es-MX:
             selected: Seleccionado
             submit: Enviar
             title: Resultados publicados
-          tally:
-            continue: Continuar
-            invalid: Hubo un problema al reportar la ausencia de la persona garante
-            mark_as_missing: Marcar como ausente
-            mark_as_missing_description: Todas las personas garantes deben participar en este proceso, pero si una de ellas no puede, puedes marcarlo como ausente.
-            success: El reporte de ausencia de la persona garante fue enviada con éxito al estrado
-            tally_completion: El proceso estará completo cuando todas las personas garantes estén registradas como activas o reportadas como ausentes. Se requiere un quorum de %{quorum} personas garantes para completar el proceso.
-            title: Proceso de recuento
-            undo_mark_as_missing: Una persona garante reportada como ausente por error podrá participar hasta antes de la finalización del proceso. Puede realizar sus actividades normales y el reporte de ausencia será ignorado.
           tally_ended:
             answer: Respuesta
             not_selected: No seleccionado
@@ -308,6 +330,15 @@ es-MX:
             submit: Publicar resultados
             success: La solicitud de publicación de resultados se envió correctamente al Bulletin Board
             title: Resultados calculados
+          tally_started:
+            continue: Continuar
+            invalid: Hubo un problema al reportar la ausencia de la persona garante
+            mark_as_missing: Marcar como ausente
+            mark_as_missing_description: Todas las personas garantes deben participar en este proceso, pero si una de ellas no puede, puedes marcarlo como ausente.
+            success: El reporte de ausencia de la persona garante fue enviada con éxito al estrado
+            tally_completion: El proceso estará completo cuando todas las personas garantes estén registradas como activas o reportadas como ausentes. Se requiere un quorum de %{quorum} personas garantes para completar el proceso.
+            title: Proceso de recuento
+            undo_mark_as_missing: Una persona garante reportada como ausente por error podrá participar hasta antes de la finalización del proceso. Puede realizar sus actividades normales y el reporte de ausencia será ignorado.
           vote:
             errors:
               time_after: La elección aún está en curso. Tienes que esperar hasta la hora de finalización (%{end_time}) para terminar el periodo de votación.
@@ -380,9 +411,8 @@ es-MX:
         end_date: Termina
         footer:
           remaining_time:
-            one: "Quedan <strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
-            other: "Quedan <strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
-            zero: "Quedan <strong>%{minutes} minutos</strong> restantes para votar."
+            one: "<strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
+            other: "<strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
           view: Ver
           vote: Votar
         label:
@@ -443,9 +473,9 @@ es-MX:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar el modal
@@ -464,7 +494,6 @@ es-MX:
           votes:
             one: "%{count} voto"
             other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Cambia tu voto
@@ -554,7 +583,7 @@ es-MX:
             title: Restaurar claves para la elección %{election}
             upload_election_keys: Subir claves de elección
             upload_icon: Icono que indica una acción de descarga
-          tally_steps:
+          tally_started_steps:
             back: Atrás
             description: Los resultados de esta elección están siendo calculados en el Bulletin Board. Para completar este proceso, se necesita tu participación como garante.
             keys:
@@ -565,11 +594,11 @@ es-MX:
             list:
               status: Estado
               task: Tarea
-            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará varios minutos, ya que todos los garantes deben estar conectados para completarlo.
+            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará algunos minutos, ya que todas las garantes deben estar conectados para completarlo.
             start: Empezar
             start_icon: Icono que indica un botón de inicio para iniciar la generación de claves de una elección
             status:
-              completed: Completada
+              completed: Completado
               pending: Pendiente
               processing: Procesando
             title: Recuento para %{election}
@@ -604,15 +633,15 @@ es-MX:
               generate_legend_3: Asegúrate de que tu equipo no tenga una copia del archivo (por ejemplo, comprueba las carpetas de Descargas y Escritorio).
               generate_legend_4: Haz otra copia del archivo en un dispositivo externo diferente y guárdalo en un lugar muy seguro.
               submit: Enviar
-              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor de Decidim.
+              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor.
               submit_title: Enviar la clave pública de identificación
               title: Claves de identificación del garante
               upload: Sube tus claves de identificación
               upload_error:
                 invalid_format: El archivo subido no contiene ninguna clave de identificación.
                 invalid_key: Las claves de identificación en el archivo subido no se pueden cargar.
-                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave de identificación pública almacenada por Decidim.
-              upload_legend: Decidim tiene tus claves públicas de identificación, pero tu navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
+                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave pública de identificación almacenada.
+              upload_legend: El servidor tiene sus claves públicas de identificación, pero su navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
             not_supported_browser_description: Parece que estás usando un navegador que no puede ser utilizado para actuar como garante. Asegúrate de que estás usando la versión más reciente de tu navegador, o intenta usar cualquiera de los navegadores más populares para poder completar tus tareas como garante.
             not_supported_browser_title: Actualiza el navegador para actuar como garante
             trustee_role_description: Se le ha asignado como garante en algunas de las elecciones celebradas en esta plataforma.
@@ -654,10 +683,6 @@ es-MX:
         failed:
           header: Voto fallido
           lead: '¡Tu voto no ha sido emitido!'
-          modal:
-            close: Cerrar
-            communication_lost: Desafortunadamente, parece que la comunicación con el servidor de votación (Bulletin Board) se ha perdido.<br>Puede ser que la conexión a Internet esté averiada o que el servidor de destino esté demasiado ocupado.<br>Puedes intentarlo más tarde o ponerte en contacto con el servicio de asistencia si este problema persiste.
-            title: Algo salió mal
           text: Algo salió mal, por favor inténtalo de nuevo.
           try_again: Inténtalo de nuevo
         header:
@@ -683,9 +708,9 @@ es-MX:
         onboarding_modal:
           close: Cerrar modal
           create_account: Crear Cuenta
-          description: '¿Quieres crear una nueva cuenta en Decidim? Así participarás en los procesos y ser parte activa de la organización.'
+          description: '¿Quieres crear una nueva cuenta en la plataforma? Podrás participar en los procesos y ser parte activa de la organización.'
           no_account: No, gracias.
-          title: '¿Es tu primera vez en Decidim?'
+          title: '¿Eres nueva en la plataforma?'
         update:
           error: Ha habido un problema al actualizar el estado del voto. Vuelve a intentarlo.
         verify:
@@ -696,9 +721,10 @@ es-MX:
             header: Voto no encontrado!
             info: El código de voto no se ha encontrado en la urna de %{link}, inténtelo de nuevo.
           form:
-            back: Volver a Decidim
+            back: Volver a la plataforma
             submit: Comprobar
             vote_identifier: 'Código identificador:'
+            vote_identifier_help: Este es el identificador que se te dio después de emitir tu voto (no es el código para entrar la cabina de votación).
           header:
             title: Verifica tu voto
           success:
@@ -1019,6 +1045,7 @@ es-MX:
             introductory_image: Imagen de presentación
             promoted: Destacada
             select_a_voting_type: Por favor, selecciona un tipo de votación
+            show_check_census_help: Si quieres mostrar el enlace "¿Puedo votar?" en el menú de votaciones públicas
             slug: Nombre corto de URL
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Título
@@ -1067,7 +1094,7 @@ es-MX:
               invalid: Se ha producido un error al subir el censo, por favor inténtalo de nuevo más tarde.
               invalid_csv_header: Los encabezados CSV faltan o no son correctos - por favor lee las instrucciones cuidadosamente
             creating_data:
-              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file}."
+              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file} (esto puede tardar algunos minutos)."
             delete:
               button: Borrar todos los datos del censo
               confirm: Eliminar todo el censo no se puede deshacer. ¿Seguro que quieres continuar?
@@ -1082,9 +1109,12 @@ es-MX:
               launch_error: Problema al iniciar la exportación de códigos de acceso
               launch_success: Se ha iniciado la exportación de los códigos de acceso. En breve recibirás un correo en %{email}
             exporting_access_codes:
-              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación. La recibirás en breve en %{email}"
+              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación, la recibirás en breve en %{email} (esto puede tardar unos minutos)."
             freeze:
               callout: El censo está cerrado y no se puede modificar.
+              help_html: |
+                Los datos del censo Se han subido correctamente, los códigos se han generado y exportado con éxito.<br><strong>Ahora estás lista para comenzar la elección.</strong><br>
+                Utiliza el CSV exportado, que incluye los códigos individuales para distribuirlo al censo utilizando tus propios medios, o active la pestaña "¿Puedo votar?", para permitir que cualquiera recupere este código usando sus propios datos de censales.
             generate_access_codes:
               button: Generar códigos de acceso de la votación
               callout: Ahora puedes generar los códigos de acceso. Ten en cuenta que después de generarlos ya no podrás modificar más el censo.
@@ -1093,8 +1123,9 @@ es-MX:
               info_message_warn: Por favor, comprueba que no falten datos, ya que se han creado %{data_count} registros, pero el fichero que se ha subido (%{file}) tenía %{raw_count} filas.
               launch_error: Ha habido un problema al generar los códigos de acceso
               launch_success: Se ha iniciado la generación de códigos.
+              start_over: Por favor, elimine el censo actual y vuelva a empezar con un archivo CSV apropiado con filas válidas.
             generating_access_codes:
-              info_message: "<strong>Por favor espera</strong>, se están generando los códigos de acceso a la votación..."
+              info_message: "<strong>Espera, por favor<</strong>, los códigos de acceso a la votación se están generando (esto puede tardar unos minutos)..."
             new:
               file_help:
                 explanation: 'Instrucciones para el archivo:'
@@ -1213,11 +1244,12 @@ es-MX:
         in_person_votes:
           complete_voting:
             available_answers: 'Respuestas disponibles:'
-            census_verified: La participante aún no ha votado.
+            census_verified: Esta participante todavía no ha votado en persona.
+            census_verified_with_online_vote: Esta participante ya votó en línea previamente. Si vota en persona, sus votos anteriores serán invalidados y este será su voto definitivo.
             complete_voting: Completar votación
             identify_another: Identificar a otra participante
             questions_title: 'Tiene derecho a votar en las siguientes preguntas:'
-            questions_title_voted: 'La participante ya ha votado en línea y tiene derecho a votar en las siguientes preguntas:'
+            questions_title_voted: 'Esta participante ya votó en línea y tiene derecho a votar en las siguientes preguntas:'
             voted: La participante ha votado
           create:
             error: El voto no ha sido registrado. Por favor, inténtalo de nuevo.
@@ -1343,9 +1375,9 @@ es-MX:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar ventana
diff --git a/decidim-elections/config/locales/es-PY.yml b/decidim-elections/config/locales/es-PY.yml
index 68e672053cef2..0c8eb71c3d322 100644
--- a/decidim-elections/config/locales/es-PY.yml
+++ b/decidim-elections/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ es-PY:
         image: Imagen
         proposals: Propuestas relacionadas
         title: Título
+      ballot_style:
+        code: Código
       election:
         description: Descripción
         end_time: La votación acaba el
         start_time: La votación empieza el
         title: Título
+      monitoring_committee_member:
+        email: Correo electrónico
+        name: Nombre
+      polling_officer:
+        email: Correo electrónico
+        name: Nombre
+      polling_station:
+        address: Dirección
+        location: Ubicación
+        location_hints: Detalles de ubicación
+        polling_station_managers: Gestoras
+        polling_station_president_id: Presidencia
+        title: Título
       question:
         max_selections: Número máximo de opciones
         min_selections: Ninguna de las anteriores
         title: Título
+      trustees_participatory_space:
+        user_id: Participante
       voting:
+        banner_image: Imagen de cabecera
+        census_contact_information: Datos de contacto del censo
+        description: Descripción
         end_time: La votación finaliza
+        introductory_image: Imagen de presentación
+        promoted: Destacada
+        scope_id: �mbito
+        show_check_census: Mostrar la página de "comprobar censo"
         start_time: La votación empieza
+        title: Título
+        voting_type: Tipo de votación
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ es-PY:
               cant_be_changed: no se puede cambiar
             public_key:
               cant_be_changed: no se puede cambiar
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} no es un tipo de votación válido"
   activerecord:
     errors:
       models:
@@ -249,7 +280,7 @@ es-PY:
               'false': no tiene una <strong>clave pública</strong>
               'true': tiene una <strong> clave pública</strong>
             requirements:
-              census_codes_generated: Se han generador los códigos de acceso al censo.
+              census_codes_generated: Se han generado los códigos de acceso al censo.
               census_frozen: Se han exportado los códgos para el censo y el censo ha quedado congelado.
               census_uploaded: El censo está subido.
               component_published: La elección está <strong>publicada</strong>.
@@ -290,15 +321,6 @@ es-PY:
             selected: Seleccionado
             submit: Enviar
             title: Resultados publicados
-          tally:
-            continue: Continuar
-            invalid: Hubo un problema al reportar al garante ausente
-            mark_as_missing: Marcar como ausente
-            mark_as_missing_description: Todos los garantes deberían participar en este proceso, pero si uno de ellos no puede tomar parte en él, puedes marcarlo como ausente.
-            success: El reporte del garante que falta fue enviado con éxito al Bulletin Board
-            tally_completion: El proceso se completará cuando todos los garantes estén activos o marcados como ausentes. Se requiere al menos %{quorum} garantes para completar el proceso.
-            title: Proceso de recuento
-            undo_mark_as_missing: Un garante marcado como ausente por error podrá participar antes de completar el proceso. Pueden proceder como de costumbre y la marca de ausente será ignorada.
           tally_ended:
             answer: Respuesta
             not_selected: No seleccionado
@@ -308,6 +330,15 @@ es-PY:
             submit: Publicar resultados
             success: La solicitud de publicación de resultados se envió correctamente al Bulletin Board
             title: Resultados calculados
+          tally_started:
+            continue: Continuar
+            invalid: Hubo un problema al reportar al garante ausente
+            mark_as_missing: Marcar como ausente
+            mark_as_missing_description: Todos los garantes deberían participar en este proceso, pero si uno de ellos no puede tomar parte en él, puedes marcarlo como ausente.
+            success: El reporte del garante que falta fue enviado con éxito al Bulletin Board
+            tally_completion: El proceso se completará cuando todos los garantes estén activos o marcados como ausentes. Se requiere al menos %{quorum} garantes para completar el proceso.
+            title: Proceso de recuento
+            undo_mark_as_missing: Un garante marcado como ausente por error podrá participar antes de completar el proceso. Pueden proceder como de costumbre y la marca de ausente será ignorada.
           vote:
             errors:
               time_after: La elección aún está en curso. Tienes que esperar hasta la hora de finalización (%{end_time}) para terminar el periodo de votación.
@@ -380,9 +411,8 @@ es-PY:
         end_date: Termina
         footer:
           remaining_time:
-            one: "Quedan <strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
-            other: "Quedan <strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
-            zero: "Quedan <strong>%{minutes} minutos</strong> restantes para votar."
+            one: "<strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
+            other: "<strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
           view: Ver
           vote: Votar
         label:
@@ -443,9 +473,9 @@ es-PY:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar el modal
@@ -464,7 +494,6 @@ es-PY:
           votes:
             one: "%{count} voto"
             other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Cambia tu voto
@@ -554,7 +583,7 @@ es-PY:
             title: Restaurar claves para la elección %{election}
             upload_election_keys: Subir claves de elección
             upload_icon: Icono que indica una acción de descarga
-          tally_steps:
+          tally_started_steps:
             back: Atrás
             description: Los resultados de esta elección están siendo calculados en el Bulletin Board. Para completar este proceso, se necesita tu participación como garante.
             keys:
@@ -565,11 +594,11 @@ es-PY:
             list:
               status: Estado
               task: Tarea
-            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará varios minutos, ya que todos los garantes deben estar conectados para completarlo.
+            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará algunos minutos, ya que todas las garantes deben estar conectados para completarlo.
             start: Empezar
             start_icon: Icono que indica un botón de inicio para iniciar la generación de claves de una elección
             status:
-              completed: Completada
+              completed: Completado
               pending: Pendiente
               processing: Procesando
             title: Recuento para %{election}
@@ -604,15 +633,15 @@ es-PY:
               generate_legend_3: Asegúrate de que tu equipo no tenga una copia del archivo (por ejemplo, comprueba las carpetas de Descargas y Escritorio).
               generate_legend_4: Haz otra copia del archivo en un dispositivo externo diferente y guárdalo en un lugar muy seguro.
               submit: Enviar
-              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor de Decidim.
+              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor.
               submit_title: Enviar la clave pública de identificación
               title: Claves de identificación del garante
               upload: Sube tus claves de identificación
               upload_error:
                 invalid_format: El archivo subido no contiene ninguna clave de identificación.
                 invalid_key: Las claves de identificación en el archivo subido no se pueden cargar.
-                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave de identificación pública almacenada por Decidim.
-              upload_legend: Decidim tiene tus claves públicas de identificación, pero tu navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
+                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave pública de identificación almacenada.
+              upload_legend: El servidor tiene sus claves públicas de identificación, pero su navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
             not_supported_browser_description: Parece que estás usando un navegador que no puede ser utilizado para actuar como garante. Asegúrate de que estás usando la versión más reciente de tu navegador, o intenta usar cualquiera de los navegadores más populares para poder completar tus tareas como garante.
             not_supported_browser_title: Actualiza el navegador para actuar como garante
             trustee_role_description: Se le ha asignado como garante en algunas de las elecciones celebradas en esta plataforma.
@@ -654,10 +683,6 @@ es-PY:
         failed:
           header: Voto fallido
           lead: '¡Tu voto no ha sido emitido!'
-          modal:
-            close: Cerrar
-            communication_lost: Desafortunadamente, parece que la comunicación con el servidor de votación (Bulletin Board) se ha perdido.<br>Puede ser que la conexión a Internet esté averiada o que el servidor de destino esté demasiado ocupado.<br>Puedes intentarlo más tarde o ponerte en contacto con el servicio de asistencia si este problema persiste.
-            title: Algo salió mal
           text: Algo salió mal, por favor inténtalo de nuevo.
           try_again: Inténtalo de nuevo
         header:
@@ -683,9 +708,9 @@ es-PY:
         onboarding_modal:
           close: Cerrar modal
           create_account: Crear Cuenta
-          description: '¿Quieres crear una nueva cuenta en Decidim? Así participarás en los procesos y ser parte activa de la organización.'
+          description: '¿Quieres crear una nueva cuenta en la plataforma? Podrás participar en los procesos y ser parte activa de la organización.'
           no_account: No, gracias.
-          title: '¿Es tu primera vez en Decidim?'
+          title: '¿Eres nueva en la plataforma?'
         update:
           error: Ha habido un problema al actualizar el estado del voto. Vuelve a intentarlo.
         verify:
@@ -696,9 +721,10 @@ es-PY:
             header: Voto no encontrado!
             info: El código de voto no se ha encontrado en la urna de %{link}, inténtelo de nuevo.
           form:
-            back: Volver a Decidim
+            back: Volver a la plataforma
             submit: Comprobar
             vote_identifier: 'Código identificador:'
+            vote_identifier_help: Este es el identificador que se te dio después de emitir tu voto (no es el código para entrar la cabina de votación).
           header:
             title: Verifica tu voto
           success:
@@ -1019,6 +1045,7 @@ es-PY:
             introductory_image: Imagen de presentación
             promoted: Destacada
             select_a_voting_type: Por favor, selecciona un tipo de votación
+            show_check_census_help: Si quieres mostrar el enlace "¿Puedo votar?" en el menú de votaciones públicas
             slug: Nombre corto de URL
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Título
@@ -1067,7 +1094,7 @@ es-PY:
               invalid: Se ha producido un error al subir el censo, por favor inténtalo de nuevo más tarde.
               invalid_csv_header: Los encabezados CSV faltan o no son correctos - por favor lee las instrucciones cuidadosamente
             creating_data:
-              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file}."
+              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file} (esto puede tardar algunos minutos)."
             delete:
               button: Borrar todos los datos del censo
               confirm: Eliminar todo el censo no se puede deshacer. ¿Seguro que quieres continuar?
@@ -1082,9 +1109,12 @@ es-PY:
               launch_error: Problema al iniciar la exportación de códigos de acceso
               launch_success: Se ha iniciado la exportación de los códigos de acceso. En breve recibirás un correo en %{email}
             exporting_access_codes:
-              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación. La recibirás en breve en %{email}"
+              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación, la recibirás en breve en %{email} (esto puede tardar unos minutos)."
             freeze:
               callout: El censo está cerrado y no se puede modificar.
+              help_html: |
+                Los datos del censo Se han subido correctamente, los códigos se han generado y exportado con éxito.<br><strong>Ahora estás lista para comenzar la elección.</strong><br>
+                Utiliza el CSV exportado, que incluye los códigos individuales para distribuirlo al censo utilizando tus propios medios, o active la pestaña "¿Puedo votar?", para permitir que cualquiera recupere este código usando sus propios datos de censales.
             generate_access_codes:
               button: Generar códigos de acceso de la votación
               callout: Ahora puedes generar los códigos de acceso. Ten en cuenta que después de generarlos ya no podrás modificar más el censo.
@@ -1093,8 +1123,9 @@ es-PY:
               info_message_warn: Por favor, comprueba que no falten datos, ya que se han creado %{data_count} registros, pero el fichero que se ha subido (%{file}) tenía %{raw_count} filas.
               launch_error: Ha habido un problema al generar los códigos de acceso
               launch_success: Se ha iniciado la generación de códigos.
+              start_over: Por favor, elimine el censo actual y vuelva a empezar con un archivo CSV apropiado con filas válidas.
             generating_access_codes:
-              info_message: "<strong>Por favor espera</strong>, se están generando los códigos de acceso a la votación..."
+              info_message: "<strong>Espera, por favor<</strong>, los códigos de acceso a la votación se están generando (esto puede tardar unos minutos)..."
             new:
               file_help:
                 explanation: 'Instrucciones para el archivo:'
@@ -1213,11 +1244,12 @@ es-PY:
         in_person_votes:
           complete_voting:
             available_answers: 'Respuestas disponibles:'
-            census_verified: La participante aún no ha votado.
+            census_verified: Esta participante no ha votado presencialmente aún.
+            census_verified_with_online_vote: Esta participante ya ha votado en línea. Si vota en persona, los votos anteriores serán invalidados y este será su voto definitivo.
             complete_voting: Completar votación
             identify_another: Identificar a otra participante
             questions_title: 'Tiene derecho a votar en las siguientes preguntas:'
-            questions_title_voted: 'La participante ya ha votado en línea y tiene derecho a votar en las siguientes preguntas:'
+            questions_title_voted: 'Esta participante ya ha votado en línea y tiene derecho a votar en las siguientes preguntas:'
             voted: La participante ha votado
           create:
             error: El voto no ha sido registrado. Por favor, inténtalo de nuevo.
@@ -1343,9 +1375,9 @@ es-PY:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar ventana
diff --git a/decidim-elections/config/locales/es.yml b/decidim-elections/config/locales/es.yml
index aa85cd1fef3ba..8072e7c6246cd 100644
--- a/decidim-elections/config/locales/es.yml
+++ b/decidim-elections/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ es:
         image: Imagen
         proposals: Propuestas relacionadas
         title: Título
+      ballot_style:
+        code: Código
       election:
         description: Descripción
         end_time: La votación acaba el
         start_time: La votación empieza el
         title: Título
+      monitoring_committee_member:
+        email: Correo electrónico
+        name: Nombre
+      polling_officer:
+        email: Correo electrónico
+        name: Nombre
+      polling_station:
+        address: Dirección
+        location: Ubicación
+        location_hints: Detalles de ubicación
+        polling_station_managers: Gestoras
+        polling_station_president_id: Presidencia
+        title: Título
       question:
         max_selections: Número máximo de opciones
         min_selections: Ninguna de las opciones anteriores
         title: Título
+      trustees_participatory_space:
+        user_id: Participante
       voting:
+        banner_image: Imagen de cabecera
+        census_contact_information: Datos de contacto del censo
+        description: Descripción
         end_time: La votación finaliza
+        introductory_image: Imagen de presentación
+        promoted: Destacada
+        scope_id: �mbito
+        show_check_census: Mostrar la página de "comprobar censo"
         start_time: La votación empieza
+        title: Título
+        voting_type: Tipo de votación
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ es:
               cant_be_changed: no se puede cambiar
             public_key:
               cant_be_changed: no se puede cambiar
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} no es un tipo de votación válido"
   activerecord:
     errors:
       models:
@@ -249,7 +280,7 @@ es:
               'false': no tiene una <strong>clave pública</strong>
               'true': tiene una <strong> clave pública</strong>
             requirements:
-              census_codes_generated: Se han generador los códigos de acceso al censo.
+              census_codes_generated: Se han generado los códigos de acceso al censo.
               census_frozen: Se han exportado los códgos para el censo y el censo ha quedado congelado.
               census_uploaded: El censo está subido.
               component_published: La elección está <strong>publicada</strong>.
@@ -290,15 +321,6 @@ es:
             selected: Seleccionado
             submit: Enviar
             title: Resultados publicados
-          tally:
-            continue: Continuar
-            invalid: Hubo un problema al reportar al garante ausente
-            mark_as_missing: Marcar como ausente
-            mark_as_missing_description: Todos los garantes deberían participar en este proceso, pero si uno de ellos no puede tomar parte en él, puedes marcarlo como ausente.
-            success: El reporte del garante que falta fue enviado con éxito al Bulletin Board
-            tally_completion: El proceso se completará cuando todos los garantes estén activos o marcados como ausentes. Se requiere al menos %{quorum} garantes para completar el proceso.
-            title: Proceso de recuento
-            undo_mark_as_missing: Un garante marcado como ausente por error podrá participar antes de completar el proceso. Pueden proceder como de costumbre y la marca de ausente será ignorada.
           tally_ended:
             answer: Respuesta
             not_selected: No seleccionado
@@ -308,6 +330,15 @@ es:
             submit: Publicar resultados
             success: La solicitud de publicación de resultados se envió correctamente al Bulletin Board
             title: Resultados calculados
+          tally_started:
+            continue: Continuar
+            invalid: Hubo un problema al reportar al garante ausente
+            mark_as_missing: Marcar como ausente
+            mark_as_missing_description: Todos los garantes deberían participar en este proceso, pero si uno de ellos no puede tomar parte en él, puedes marcarlo como ausente.
+            success: El reporte del garante que falta fue enviado con éxito al Bulletin Board
+            tally_completion: El proceso se completará cuando todos los garantes estén activos o marcados como ausentes. Se requiere al menos %{quorum} garantes para completar el proceso.
+            title: Proceso de recuento
+            undo_mark_as_missing: Un garante marcado como ausente por error podrá participar antes de completar el proceso. Pueden proceder como de costumbre y la marca de ausente será ignorada.
           vote:
             errors:
               time_after: La elección aún está en curso. Tienes que esperar hasta la hora de finalización (%{end_time}) para terminar el periodo de votación.
@@ -380,9 +411,8 @@ es:
         end_date: Termina
         footer:
           remaining_time:
-            one: "Quedan <strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
-            other: "Quedan <strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
-            zero: "Quedan <strong>%{minutes} minutos</strong> restantes para votar."
+            one: "<strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
+            other: "<strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
           view: Ver
           vote: Votar
         label:
@@ -443,9 +473,9 @@ es:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar el modal
@@ -464,7 +494,6 @@ es:
           votes:
             one: "%{count} voto"
             other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Cambia tu voto
@@ -554,7 +583,7 @@ es:
             title: Restaurar claves para la elección %{election}
             upload_election_keys: Subir claves de elección
             upload_icon: Icono que indica una acción de descarga
-          tally_steps:
+          tally_started_steps:
             back: Atrás
             description: Los resultados de esta elección están siendo calculados en el Bulletin Board. Para completar este proceso, se necesita tu participación como garante.
             keys:
@@ -565,11 +594,11 @@ es:
             list:
               status: Estado
               task: Tarea
-            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará varios minutos, ya que todos los garantes deben estar conectados para completarlo.
+            process_warning: Una vez iniciado el proceso, no debes salir de esta página hasta que el proceso termine. Tardará algunos minutos, ya que todas las garantes deben estar conectados para completarlo.
             start: Empezar
             start_icon: Icono que indica un botón de inicio para iniciar la generación de claves de una elección
             status:
-              completed: Completada
+              completed: Completado
               pending: Pendiente
               processing: Procesando
             title: Recuento para %{election}
@@ -604,15 +633,15 @@ es:
               generate_legend_3: Asegúrate de que tu equipo no tenga una copia del archivo (por ejemplo, comprueba las carpetas de Descargas y Escritorio).
               generate_legend_4: Haz otra copia del archivo en un dispositivo externo diferente y guárdalo en un lugar muy seguro.
               submit: Enviar
-              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor de Decidim.
+              submit_legend: Después de seguir todos los pasos explicados anteriormente, completa el proceso enviando la clave de identificación pública al servidor.
               submit_title: Enviar la clave pública de identificación
               title: Claves de identificación del garante
               upload: Sube tus claves de identificación
               upload_error:
                 invalid_format: El archivo subido no contiene ninguna clave de identificación.
                 invalid_key: Las claves de identificación en el archivo subido no se pueden cargar.
-                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave de identificación pública almacenada por Decidim.
-              upload_legend: Decidim tiene tus claves públicas de identificación, pero tu navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
+                invalid_public_key: Las claves de identificación en el archivo subido no coinciden con la clave pública de identificación almacenada.
+              upload_legend: El servidor tiene sus claves públicas de identificación, pero su navegador todavía no las tiene. Necesitas importar el archivo con tus claves de identificación a tu ordenador desde la copia de seguridad que creaste después de generarlas.
             not_supported_browser_description: Parece que estás usando un navegador que no puede ser utilizado para actuar como garante. Asegúrate de que estás usando la versión más reciente de tu navegador, o intenta usar cualquiera de los navegadores más populares para poder completar tus tareas como garante.
             not_supported_browser_title: Actualiza el navegador para actuar como garante
             trustee_role_description: Se le ha asignado como garante en algunas de las elecciones celebradas en esta plataforma.
@@ -654,10 +683,6 @@ es:
         failed:
           header: Voto fallido
           lead: '¡Tu voto no ha sido emitido!'
-          modal:
-            close: Cerrar
-            communication_lost: Desafortunadamente, parece que la comunicación con el servidor de votación (Bulletin Board) se ha perdido.<br>Puede ser que la conexión a Internet esté averiada o que el servidor de destino esté demasiado ocupado.<br>Puedes intentarlo más tarde o ponerte en contacto con el servicio de asistencia si este problema persiste.
-            title: Algo salió mal
           text: Algo salió mal, por favor inténtalo de nuevo.
           try_again: Inténtalo de nuevo
         header:
@@ -683,9 +708,9 @@ es:
         onboarding_modal:
           close: Cerrar modal
           create_account: Crear Cuenta
-          description: '¿Quieres crear una nueva cuenta en Decidim? Así participarás en los procesos y ser parte activa de la organización.'
+          description: '¿Quieres crear una nueva cuenta en la plataforma? Podrás participar en los procesos y ser parte activa de la organización.'
           no_account: No, gracias.
-          title: '¿Es tu primera vez en Decidim?'
+          title: '¿Eres nueva en la plataforma?'
         update:
           error: Ha habido un problema al actualizar el estado del voto. Vuelve a intentarlo.
         verify:
@@ -696,9 +721,10 @@ es:
             header: Voto no encontrado!
             info: El código de voto no se ha encontrado en la urna de %{link}, inténtelo de nuevo.
           form:
-            back: Volver a Decidim
+            back: Volver a la plataforma
             submit: Comprobar
             vote_identifier: 'Código identificador:'
+            vote_identifier_help: Este es el identificador que se te dio después de emitir tu voto (no es el código para entrar la cabina de votación).
           header:
             title: Verifica tu voto
           success:
@@ -1019,6 +1045,7 @@ es:
             introductory_image: Imagen de presentación
             promoted: Destacada
             select_a_voting_type: Por favor, selecciona un tipo de votación
+            show_check_census_help: Si quieres mostrar el enlace "¿Puedo votar?" en el menú de votaciones públicas
             slug: Nombre corto de URL
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta votación. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Título
@@ -1067,7 +1094,7 @@ es:
               invalid: Se ha producido un error al subir el censo, por favor inténtalo de nuevo más tarde.
               invalid_csv_header: Los encabezados CSV faltan o no son correctos - por favor lee las instrucciones cuidadosamente
             creating_data:
-              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file}."
+              info_message: "<strong>Por favor espera</strong>, procesadas %{processed_count} de %{raw_count} filas del fichero %{file} (esto puede tardar algunos minutos)."
             delete:
               button: Borrar todos los datos del censo
               confirm: Eliminar todo el censo no se puede deshacer. ¿Seguro que quieres continuar?
@@ -1082,9 +1109,12 @@ es:
               launch_error: Problema al iniciar la exportación de códigos de acceso
               launch_success: Se ha iniciado la exportación de los códigos de acceso. En breve recibirás un correo en %{email}
             exporting_access_codes:
-              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación. La recibirás en breve en %{email}"
+              info_message: "<strong>Por favor, espera</strong>, se está preparando la exportación, la recibirás en breve en %{email} (esto puede tardar unos minutos)."
             freeze:
               callout: El censo está cerrado y no se puede modificar.
+              help_html: |
+                Los datos del censo Se han subido correctamente, los códigos se han generado y exportado con éxito.<br><strong>Ahora estás lista para comenzar la elección.</strong><br>
+                Utiliza el CSV exportado, que incluye los códigos individuales para distribuirlo al censo utilizando tus propios medios, o active la pestaña "¿Puedo votar?", para permitir que cualquiera recupere este código usando sus propios datos de censales.
             generate_access_codes:
               button: Generar códigos de acceso de la votación
               callout: Ahora puedes generar los códigos de acceso. Ten en cuenta que después de generarlos ya no podrás modificar más el censo.
@@ -1093,8 +1123,9 @@ es:
               info_message_warn: Por favor, comprueba que no falten datos, ya que se han creado %{data_count} registros, pero el fichero que se ha subido (%{file}) tenía %{raw_count} filas.
               launch_error: Ha habido un problema al generar los códigos de acceso
               launch_success: Se ha iniciado la generación de códigos.
+              start_over: Por favor, elimine el censo actual y vuelva a empezar con un archivo CSV apropiado con filas válidas.
             generating_access_codes:
-              info_message: "<strong>Por favor espera</strong>, se están generando los códigos de acceso a la votación..."
+              info_message: "<strong>Espera, por favor<</strong>, los códigos de acceso a la votación se están generando (esto puede tardar unos minutos)..."
             new:
               file_help:
                 explanation: 'Instrucciones para el archivo:'
@@ -1213,17 +1244,18 @@ es:
         in_person_votes:
           complete_voting:
             available_answers: 'Respuestas disponibles:'
-            census_verified: La participante aún no ha votado.
+            census_verified: Esta participante no ha votado presencialmente aún.
+            census_verified_with_online_vote: Esta participante ya ha votado en línea. Si vota en persona, los votos anteriores serán invalidados y este será su voto definitivo.
             complete_voting: Completar votación
             identify_another: Identificar a otra participante
-            questions_title: 'Tiene derecho a votar en las siguientes preguntas:'
-            questions_title_voted: 'La participante ya ha votado en línea y tiene derecho a votar en las siguientes preguntas:'
+            questions_title: 'Tienen derecho a votar en las siguientes preguntas:'
+            questions_title_voted: 'Esta participante ya ha votado en línea y tiene derecho a votar en las siguientes preguntas:'
             voted: La participante ha votado
           create:
             error: El voto no ha sido registrado. Por favor, inténtalo de nuevo.
           in_person_form:
             census_not_present: Esta participante no aparece en el censo.
-            census_not_present_description: Debe acudir a la oficina de reclamaciones del censo o al servicio de asistencia técnica.
+            census_not_present_description: Deben acudir a la oficina de reclamaciones del censo o al servicio de asistencia técnica.
             date_of_birth: Fecha de nacimiento
             day: Día
             day_placeholder: DD
@@ -1343,9 +1375,9 @@ es:
         filters:
           active: Activas
           all: Todas
+          date: Fecha
           finished: Finalizadas
           search: Buscar
-          state: Estado
           upcoming: Próximas
         filters_small_view:
           close_modal: Cerrar ventana
diff --git a/decidim-elections/config/locales/eu.yml b/decidim-elections/config/locales/eu.yml
index 9eecf985381c4..c7ed91a83e26a 100644
--- a/decidim-elections/config/locales/eu.yml
+++ b/decidim-elections/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -11,6 +12,16 @@ eu:
         end_time: Bozketaren amaiera-data
         start_time: Bozketaren hasiera-data
         title: Izenburua
+      monitoring_committee_member:
+        email: Helbide elektronikoa
+        name: Izena
+      polling_officer:
+        email: Helbide elektronikoa
+        name: Izena
+      polling_station:
+        address: Helbidea
+        location: Kokapena
+        title: Izenburua
       question:
         max_selections: Gehieneko aukera kopurua
         min_selections: Aurreko bat ere ez
@@ -18,6 +29,7 @@ eu:
       voting:
         end_time: Bozketaren amaiera-data
         start_time: Bozketaren hasiera-data
+        title: Izenburua
     errors:
       models:
         answer:
@@ -181,6 +193,9 @@ eu:
         exports:
           elections: Bozketak
           feedback_form_answers: Erantzunen feedbacka
+        mailers:
+          trustee_mailer:
+            body: "< p>Kaixo %{user_name}, </p><p> %{resource_name}-an sartu zaituzte, konfiantzazko gisa.< p>"
         menu:
           trustees: Bermatzaileak
         models:
@@ -275,10 +290,6 @@ eu:
             selected: Hautatua
             submit: Bidali
             title: Argitaratutako emaitzak
-          tally:
-            continue: Jarraitu
-            mark_as_missing: Marka desagertu da
-            title: Zenbatzeko prozesua
           tally_ended:
             answer: Erantzuna
             not_selected: Ez hautatua
@@ -288,6 +299,8 @@ eu:
             submit: Argitaratu emaitzak
             success: 'Emaitzak argitaratzeko eskaera zuzen bidali da hona: Iragarki Taula'
             title: Kalkulatutako emaitzak
+          tally_started:
+            mark_as_missing: Marka desagertu da
           vote:
             errors:
               time_after: Bozketa oraindik ez dago martxan. (%{end_time}) amaierako ordura arte itxaron behar duzu bozketaldia amaitzeko.
@@ -339,10 +352,6 @@ eu:
           upcoming: Hurrengoak
         end_date: Amaitu
         footer:
-          remaining_time:
-            one: "<strong>%{count} ordu %{minutes} minutu </strong> geratzen da bozkatzeko."
-            other: "<strong>%{count} ordu %{minutes} minutu </strong> geratzen da bozkatzeko."
-            zero: "<strong>%{minutes} ordu minutu </strong> geratzen da bozkatzeko."
           view: Ikusi
           vote: Eman botoa
         label:
@@ -405,7 +414,6 @@ eu:
           all: Guztiak
           finished: Amaituta
           search: Bilatu
-          state: Egoera
           upcoming: Hurrengoak
         filters_small_view:
           close_modal: Itxi leihoa
@@ -422,9 +430,8 @@ eu:
           selected: Hautatua
           title: Hautaketaren emaitzak
           votes:
-            one: "%{count} boto"
+            one: "Boto %{count}"
             other: "%{count} boto"
-            zero: "%{count} boto"
         show:
           action_button:
             change_vote: Aldatu zure botoa
@@ -514,24 +521,13 @@ eu:
             title: Berriztu gakoak %{election} aukerarako
             upload_election_keys: Igo aukeraren gakoak
             upload_icon: Ikonoak deskargatzeko ekintza adierazten du
-          tally_steps:
-            back: Atzera
+          tally_started_steps:
             description: Aukera horren emaitzak Iragarki Taulan kalkulatzen ari dira. Prozesu hori osatzeko, bermatzaile gisa parte hartu behar duzu.
             keys:
               end_tally: Zenbaketa amaituta
               tally:
                 cast: Zenbaketa bidaltzea
                 share: Zenbaketa partekatzea
-            list:
-              status: Egoera
-              task: Eginkizuna
-            process_warning: Prozesua hasi ondoren, ez duzu orrialde honetatik atera behar prozesua amaitu arte. Zenbait minutu beharko ditu, bermatzaile guztiek konektatuta egon behar baitute hura osatzeko.
-            start: Hasi
-            start_icon: Ikonoak hasteko botoia adierazten du aukera bateko gakoak sortzen hasteko
-            status:
-              completed: Osatuta
-              pending: Zain
-              processing: Prozesatzen
             title: Zenbaketa %{election} aukerarako
           update:
             error: Aukeraketaren egoera ez zen eguneratu.
@@ -539,7 +535,7 @@ eu:
         menu:
           trustee_zone: Bermatzailearen gunea
         no_bulletin_board:
-          body: Iragarki Taula bat behar da, atal honetarako konfiguratua. Jarri harremanetan administratzailearekin xehetasun gehiago izateko.
+          body: Atal honetarako iragarki-taula konfiguratu bat behar da. Deitu administratzaileari xehetasun gehiago izateko.
           title: Sentitzen dugu, Iragarki Taula oraindik ez dago konfiguratuta.
         trustees:
           show:
@@ -564,15 +560,12 @@ eu:
               generate_legend_3: Ziurtatu zure ekipoak ez duela fitxategiaren kopiarik (adibidez, egiaztatu Deskargak eta Mahaigaina karpetak).
               generate_legend_4: Egin beste kopia bat kanpoko beste gailu batean, eta gorde oso leku seguruan.
               submit: Bidali
-              submit_legend: Aurretik azaldutako urrats guztiak jarraitu ondoren, osatu prozesua identifikazio publikoaren gakoa bidaliz Decidimen zerbitzarian.
               submit_title: Bidali identifikatzeko gako publikoa
               title: Bermatzailearen identifikazio-gakoak
               upload: Igo zure identifikazio-gakoak
               upload_error:
                 invalid_format: Igotako artxiboak ez du identifikazio-gakorik.
                 invalid_key: Ezin dira kargatu identifikazio-gakoak igotako artxiboan.
-                invalid_public_key: Igotako artxiboko identifikazio-gakoak ez datoz bat Decidimek gordetako identifikazio publikoaren identifikazio-gakoarekin.
-              upload_legend: Decidimek zure identifikazio-gako publikoak ditu, baina zure nabigatzaileak oraindik ez ditu. Sortu ondoren egin zenuen segurtasun-kopiatik ordenagailura inportatu behar duzu zure identifikazio-gakoen fitxategia.
             not_supported_browser_description: Dirudienez, berme-emaile gisa erabili ezin den nabigatzaile bat erabiltzen ari zara. Ziurtatu nabigatzailearen bertsio berriena erabiltzen ari zarela, edo saiatu nabigatzaile ezagunenetako edozein erabiltzen, zure zereginak bermatzaile gisa bete ahal izateko.
             not_supported_browser_title: Eguneratu nabigatzailea bermatzaile gisa aritzeko
             trustee_role_description: Plataforma honetan egindako bozketa batzuen bermatzaile gisa izendatu zaituzte.
@@ -613,8 +606,6 @@ eu:
         failed:
           header: Boto okerra
           lead: Ez duzu eman botoa!
-          modal:
-            close: Itxi
           text: Zerbait txarto irten da, mesedez, saiatu berriro.
           try_again: Saiatu berriro
         header:
@@ -640,9 +631,7 @@ eu:
         onboarding_modal:
           close: Itxi leihoa
           create_account: Sortu Kontua
-          description: Kontu berri bat sortu nahi duzu Decidime-en? Horrela, prozesuetan parte hartuko duzu eta erakundearen parte aktiboa izango zara.
           no_account: Ez, eskerrik asko.
-          title: Berria zara Decidim-en?
         update:
           error: Arazo bat izan da botoaren egoera eguneratzean. Saiatu berriro.
         verify:
@@ -653,7 +642,6 @@ eu:
             header: Botoa ez da aurkitu!
             info: Botoaren kodea ez da aurkitu %{link} hautestontzian, saiatu berriro.
           form:
-            back: Itzuli Decidim-era
             submit: Egiaztatu
             vote_identifier: 'Kode identifikatzailea:'
           header:
@@ -1013,8 +1001,6 @@ eu:
             create:
               invalid: Arazo bai izan da errolda igotzean, mesedez, saiatu berriro geroago.
               invalid_csv_header: CSV goiburuak galdu dira edo ez dira zuzenak - mesedez, irakurri arretaz jarraibideak
-            creating_data:
-              info_message: "<strong>Mesedez itxaron</strong>, %{processed_count} prozesatuak %{raw_count} tik %{file} fitxeroko ilara."
             delete:
               button: Ezabatu erroldako datu guztiak
             destroy:
@@ -1026,8 +1012,6 @@ eu:
               confirm: Sartzeko kodeak behin baino ezin dituzu esportatu. Ziurtatu <strong>%{email}</strong> posta elektronikoan sarbidea duzula.
               launch_error: Arazoa sartzeko kodeak esportatzen hastean
               launch_success: 'Sartzeko kodeen esportazioa hasi egin da. Laster posta elektroniko bat jasoko duzu hemen: %{email}'
-            exporting_access_codes:
-              info_message: "<strong>Mesedez, itxaron</strong>, esportazioa prestatzen ari da, laster jasoko duzu hemen %{email}"
             freeze:
               callout: Errolda itxita dago eta ezin da aldatu.
             generate_access_codes:
@@ -1038,8 +1022,6 @@ eu:
               info_message_warn: Mesedez, egiaztatu daturik ez dela falta, %{data_count} erregistro sortu baitira, baina igo den (%{file}) fitxategiak %{raw_count} ilara zituen.
               launch_error: Arazo bat izan da sartzeko kodeak sortzean
               launch_success: Kodeak sortzen hasi da.
-            generating_access_codes:
-              info_message: "<strong>Mesedez, itxaron</strong>, bozketan sartzeko kodeak sortzen ari dira..."
             new:
               file_help:
                 explanation: 'Jarraibideak artxiborako:'
@@ -1153,11 +1135,9 @@ eu:
         in_person_votes:
           complete_voting:
             available_answers: 'Erantzun eskuragarriak:'
-            census_verified: Parte-hartzaileak oraindik ez du botoa eman.
             complete_voting: Osatu bozketa
             identify_another: Identifikatu beste parte-hartzaile bat
             questions_title: 'Botoa emateko eskubidea du ondoko galdera hauetan:'
-            questions_title_voted: 'Parte-hartzaileak dagoeneko lineako botoa eman du eta botoa emateko eskubidea du ondoko galdera hauetan:'
             voted: Parte-hartzaileak botoa eman du
           create:
             error: Botoa ez da erregistratu. Mesedez, saiatu berriro.
@@ -1280,7 +1260,6 @@ eu:
           all: Guztiak
           finished: Amaituta
           search: Bilatu
-          state: Egoera
           upcoming: Hurrengoak
         filters_small_view:
           close_modal: Itxi leihoa
diff --git a/decidim-elections/config/locales/fi-plain.yml b/decidim-elections/config/locales/fi-plain.yml
index ca848167caf3f..9ce61ab0b827e 100644
--- a/decidim-elections/config/locales/fi-plain.yml
+++ b/decidim-elections/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ fi-pl:
         image: Kuva
         proposals: Liittyvät ehdotukset
         title: Otsikko
+      ballot_style:
+        code: Koodi
       election:
         description: Kuvaus
         end_time: Äänestys päättyy
         start_time: Äänestys alkaa
         title: Otsikko
+      monitoring_committee_member:
+        email: Sähköpostiosoite
+        name: Nimi
+      polling_officer:
+        email: Sähköpostiosoite
+        name: Nimi
+      polling_station:
+        address: Osoite
+        location: Sijainti
+        location_hints: Paikan tarkemmat tiedot
+        polling_station_managers: Virkailijat
+        polling_station_president_id: Esimies
+        title: Otsikko
       question:
         max_selections: Valintojen enimmäismäärä
         min_selections: Ei mikään edellä mainituista
         title: Otsikko
+      trustees_participatory_space:
+        user_id: Osallistuja
       voting:
+        banner_image: Bannerikuva
+        census_contact_information: Henkilötietorekisterin vastuutahon yhteystiedot
+        description: Kuvaus
         end_time: Äänestyksen päättymisaika
+        introductory_image: Esittelykuva
+        promoted: Korostettu
+        scope_id: Teema
+        show_check_census: Näytä "tarkasta henkilötietorekisterin tiedot" -sivu
         start_time: Äänestyksen alkamisaika
+        title: Otsikko
+        voting_type: Äänestystapa
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ fi-pl:
               cant_be_changed: tietoa ei voi muuttaa
             public_key:
               cant_be_changed: tietoa ei voi muuttaa
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} ei ole sallittu äänestystyyppi"
   activerecord:
     errors:
       models:
@@ -290,15 +321,6 @@ fi-pl:
             selected: Valittu
             submit: Lähetä
             title: Tulokset julkaistu
-          tally:
-            continue: Jatka
-            invalid: Poissaolevan luottamushenkilön ilmoittaminen epäonnistui
-            mark_as_missing: Merkitse poissaolevaksi
-            mark_as_missing_description: Kaikkien luottamushenkilöiden pitäisi osallistua tähän prosessiin, mutta jos luottamushenkilö ei voi osallistua prosessiin, voit merkitä kyseisen henkilön poissaolevaksi.
-            success: Poissaolevan luottamushenkilön merkitseminen sähköiselle ääniuurnalle onnistui
-            tally_completion: Prosessi valmistuu, kun kaikki luottamushenkilöt ovat aktiivisia tai merkitty poissaoleviksi. Vähintään %{quorum} luottamushenkilöä tarvitaan prosessin loppuun saattamiseksi.
-            title: Ääntenlasku
-            undo_mark_as_missing: Poissaoleva luottamushenkilö voi osallistua prosessiin ennen sen päättymistä. He voivat jatkaa normaalisti ja heidän poissaolonsa jätetään huomioimatta.
           tally_ended:
             answer: Vastaus
             not_selected: Ei valittu
@@ -308,6 +330,15 @@ fi-pl:
             submit: Julkaise tulokset
             success: Pyyntösi julkaista äänestyksen tulokset on onnistuneesti lähetetty sähköiselle ääniuurnalle
             title: Ääntenlaskun tulokset
+          tally_started:
+            continue: Jatka
+            invalid: Poissaolevan luottamushenkilön ilmoittaminen epäonnistui
+            mark_as_missing: Merkitse poissaolevaksi
+            mark_as_missing_description: Kaikkien luottamushenkilöiden pitäisi osallistua tähän prosessiin, mutta jos luottamushenkilö ei voi osallistua prosessiin, voit merkitä kyseisen henkilön poissaolevaksi.
+            success: Poissaolevan luottamushenkilön merkitseminen sähköiselle ääniuurnalle onnistui
+            tally_completion: Prosessi valmistuu, kun kaikki luottamushenkilöt ovat aktiivisia tai merkitty poissaoleviksi. Vähintään %{quorum} luottamushenkilöä tarvitaan prosessin loppuun saattamiseksi.
+            title: Ääntenlasku
+            undo_mark_as_missing: Poissaoleva luottamushenkilö voi osallistua prosessiin ennen sen päättymistä. He voivat jatkaa normaalisti ja heidän poissaolonsa jätetään huomioimatta.
           vote:
             errors:
               time_after: Vaali on edelleen käynnissä. Sinun on odotettava päättymisaikaan saakka (%{end_time}) päättääksesi äänestyksen.
@@ -382,7 +413,6 @@ fi-pl:
           remaining_time:
             one: "<strong>%{count} tunti ja %{minutes} minuuttia</strong> äänestysaikaa jäljellä."
             other: "<strong>%{count} tuntia ja %{minutes} minuuttia</strong> äänestysaikaa jäljellä."
-            zero: "<strong>%{minutes} minuuttia</strong> äänestysaikaa jäljellä."
           view: Näytä
           vote: Äänestä
         label:
@@ -443,9 +473,9 @@ fi-pl:
         filters:
           active: Aktiiviset
           all: Kaikki
+          date: Päivämäärä
           finished: Valmiit
           search: Hae
-          state: Tila
           upcoming: Tulevat
         filters_small_view:
           close_modal: Sulje ikkuna
@@ -464,7 +494,6 @@ fi-pl:
           votes:
             one: "%{count} ääni"
             other: "%{count} ääntä"
-            zero: "%{count} ääntä"
         show:
           action_button:
             change_vote: Muuta ääntäsi
@@ -554,7 +583,7 @@ fi-pl:
             title: Palauta vaaliavaimet kohteelle %{election}
             upload_election_keys: Lataa vaaliavaimet
             upload_icon: Kuvake, joka ilmaisee lataustoiminnon
-          tally_steps:
+          tally_started_steps:
             back: Takaisin
             description: Näiden vaalien tuloksia lasketaan parhaillaan äänestystaululla. Jotta tämä prosessi voidaan saattaa loppuun, sinun tulee osallistua luottamushenkilönä.
             keys:
@@ -565,9 +594,9 @@ fi-pl:
             list:
               status: Tila
               task: Tehtävä
-            process_warning: Kun prosessi on käynnistetty, sinun ei tule poistua tältä sivulta ennen kuin prosessi päättyy. Se kestää useita minuutteja, koska kaikkiin luottamushenkilöihin tulee olla yhteydessä, jotta prosessi voidaan päättää.
-            start: Aloita
-            start_icon: Kuvake, joka ilmaisee aloituspainikkeen avainten luonnille
+            process_warning: Kun prosessi on käynnistetty, sinun ei tule poistua tältä sivulta ennen kuin prosessi päättyy. Tämä kestää useita minuutteja, koska kaikkien luottamushenkilöiden tulee olla yhteydessä samanaikaisesti, jotta prosessi voidaan suorittaa.
+            start: Aloitettu
+            start_icon: Kuvake, joka ilmaisee aloituspainikkeen avainten luonnin aloittamiselle
             status:
               completed: Valmis
               pending: Odottaa
@@ -604,15 +633,15 @@ fi-pl:
               generate_legend_3: Tarkasta, että tietokoneellesi ei jää kopiota kyseisestä tiedostosta (tarkasta myös Lataukset-kansio sekä työpöytäsi).
               generate_legend_4: Luo toinen kopio tiedostosta toiselle ulkoiselle laitteelle ja talleta se erittäin turvalliseen paikkaan.
               submit: Lähetä
-              submit_legend: Kun olet toteuttanut kaikki edellä esitetyt vaiheet, viimeistele julkisten tunnistusvainten lähetys Decidim-palvelimelle.
+              submit_legend: Kun olet toteuttanut kaikki edellä esitetyt vaiheet, viimeistele julkisten tunnistusvainten lähetys palvelimelle.
               submit_title: Lähetä julkinen tunnistusavain
               title: Luottamushenkilöiden tunnistusavaimet
               upload: Lataa tunnistusavaimet
               upload_error:
                 invalid_format: Ladattu tiedosto ei sisällä yhtään tunnistusavainta.
                 invalid_key: Ladatussa tiedostossa olevia tunnistusavaimia ei voida ladata.
-                invalid_public_key: Ladatun tiedoston tunnistusavaimet eivät vastaa Decidimiin tallennettua julkista tunnistusavainta.
-              upload_legend: Julkiset tunnistusavaimet ovat Decidimissä, mutta eivät selaimessasi. Sinun tulee tuoda tunnistusavainten tiedosto omalle tietokoneellesi varmuuskopiosta, jonka tallensit avaimia luotaessa.
+                invalid_public_key: Ladatun tiedoston tunnistusavaimet eivät vastaa tallennettua julkista tunnistusavainta.
+              upload_legend: Julkiset tunnistusavaimet ovat palvelimella, mutta eivät selaimessasi. Sinun täytyy tuoda tunnistusavainten tiedosto omalle tietokoneellesi varmuuskopiosta, jonka tallensit avaimia luotaessa.
             not_supported_browser_description: Näyttää siltä, että käytät selainta, jota ei voi käyttää luottamushenkilönä toimimiseen. Tarkasta, että käytät selaimesi viimeisintä versiota tai yritä käyttää jotain suosituimmista selaimista luottamushenkilön tehtävien suorittamiseksi.
             not_supported_browser_title: Päivitä selaimesi toimiaksesi luottamushenkilönä
             trustee_role_description: Sinulle on annettu luottamushenkilön tehtävä joissain vaaleissa tällä alustalla.
@@ -654,10 +683,6 @@ fi-pl:
         failed:
           header: Äänestys epäonnistui
           lead: Ääntäsi ei ole annettu!
-          modal:
-            close: Sulje
-            communication_lost: Valitettavasti näyttää siltä, että viestien välitys sähköisen ääniuurnan kanssa ei onnistu.<br>Internet-yhteydessäsi voi olla ongelma tai ääniuurnan palvelin on liian kiireinen.<br>Voit yrittää myöhemmin uudestaan tai ottaa yhteyttä tekniseen tukeen, jos ongelma jatkuu.
-            title: Jokin meni vikaan
           text: Jokin meni pieleen, yritä uudelleen.
           try_again: Yritä uudestaan
         header:
@@ -683,9 +708,9 @@ fi-pl:
         onboarding_modal:
           close: Sulje ikkuna
           create_account: Luo tili
-          description: Haluatko luoda oman käyttäjätilin alustalle? Sinulla on mahdollisuus osallistua prosesseihin ja olla mukana alustalla esitettyjen asioiden kehittämisessä.
+          description: Haluatko luoda oman käyttäjätilin alustalle? Voit osallistua prosesseihin ja alustalla esitettyjen asioiden kehittämiseen.
           no_account: Ei kiitos.
-          title: Oletko uusi käyttäjä tällä alustalla?
+          title: Oletko uusi käyttäjä tässä palvelussa?
         update:
           error: Äänen tilan päivittäminen epäonnistui valitettavasti. Ole hyvä ja äänestä uudestaan.
         verify:
@@ -696,9 +721,10 @@ fi-pl:
             header: Ääntä ei löytynyt!
             info: Äänestystunnusta ei löytynyt vaaliuurnasta %{link}, yritä uudelleen.
           form:
-            back: Takaisin Decidimiin
+            back: Takaisin alustalle
             submit: Tarkista
             vote_identifier: 'Äänen tunniste:'
+            vote_identifier_help: Tämä tunniste annettiin sinulle äänen jättämisen jälkeen (se ei ole koodi, jota käytit päästäksesi äänestyskoppiin).
           header:
             title: Vahvista äänesi
           success:
@@ -1019,6 +1045,7 @@ fi-pl:
             introductory_image: Esittelykuva
             promoted: Korostettu
             select_a_voting_type: Valitse äänestystapa
+            show_check_census_help: Määrittää, näytetäänkö "Voinko äänestää?" -linkki julkisten äänestysten sivuilla
             slug: Tunniste
             slug_help: 'URL-tunnisteita käytetään luomaan URL-osoitteita, jotka viittaavat tähän äänestykseen. Hyväksyy vain kirjaimet, numerot ja viivat. Kirjaimen on oltava ensimmäinen merkki tunnisteessa. Esimerkki: %{url}'
             title: Otsikko
@@ -1067,7 +1094,7 @@ fi-pl:
               invalid: Henkilötietorekisterin lataaminen epäonnistui, yritä uudestaan myöhemmin.
               invalid_csv_header: CSV-otsakkeet puuttuvat puuttuvat tai ovat virheellisiä - lue ohjeet huolellisesti
             creating_data:
-              info_message: "<strong>Odota hetki</strong>, käsitelty %{processed_count} / %{raw_count} riviä tiedostosta %{file}."
+              info_message: "<strong>Odota hetki</strong>, käsitelty %{processed_count} / %{raw_count} riviä tiedostosta %{file} (tämä voi kestää useita minuutteja)."
             delete:
               button: Poista kaikki henkilötietorekisterin tiedot
               confirm: Väestörekisterin tietojen poistamista ei voi peruuttaa jälkikäteen. Haluatko varmasti jatkaa?
@@ -1082,9 +1109,13 @@ fi-pl:
               launch_error: Tunnistautumiskoodien viennin aloittaminen epäonnistui
               launch_success: Tunnistautumiskoodien vienti aloitettu. Saat sähköpostia hetken kuluttua sähköpostiosoitteeseen %{email}
             exporting_access_codes:
-              info_message: "<strong>Odota hetki</strong>, vientiä valmistellaan, saat pian tiedon viennistä sähköpostiosoitteeseen %{email}"
+              info_message: "<strong>Odota hetki</strong>, vientiä valmistellaan, saat hetken kuluttua viestin sähköpostiisi osoitteeseen %{email} (tämä voi kestää useita minuutteja)."
             freeze:
               callout: Henkilötietorekisteri on jäädytetty, minkä takia sitä ei voi muokata.
+              help_html: |
+                Henkilötietorekisterin tiedot on ladattu, äänestyskoodien luonti ja vienti on onnistunut.<br>
+                <strong>Voit nyt aloittaa äänestyksen.</strong><br>
+                Käytä vietyä CSV-tiedostoa ja toimita siinä näkyvät äänestyskoodit henkilötietorekisterin henkilöille haluamallasi tavalla tai ota käyttöön "Voinko äänestää" -välilehti mahdollistaaksesi osallistujille heidän omien koodiensa tilaaminen henkilötietorekisteriin merkittyjen tietojen perusteella.
             generate_access_codes:
               button: Luo äänestyksen tunnistautumiskoodit
               callout: Voit nyt jatkaa tunnistautumiskoodien luontiin. Huomioithan, että tunnistautumiskoodien luonnin jälkeen, et voi enää muokata henkilötietorekisteriä.
@@ -1093,8 +1124,9 @@ fi-pl:
               info_message_warn: Tarkasta, että mitään tietoja ei puutu, koska %{data_count} tietuetta luotiin ja ladatussa tiedostossa %{file} on %{raw_count} riviä.
               launch_error: Tunnistautumiskoodien luonnin aloittaminen epäonnistui
               launch_success: Koodien luonti aloitettu.
+              start_over: Poista nykyinen henkilötietorekisteri ja aloita alusta oikeamuotoisella CSV-tiedostolla, joka sisältää ohjeiden mukaan muotointuja rivejä.
             generating_access_codes:
-              info_message: "<strong>Odota hetki</strong>, äänestyksen tunnistautumiskoodeja luodaan parhaillaan..."
+              info_message: "<strong>Odota hetki</strong>, äänestyskoodeja luodaan (tämä voi kestää useita minuutteja)..."
             new:
               file_help:
                 explanation: 'Tiedoston ohjeistus:'
@@ -1213,7 +1245,8 @@ fi-pl:
         in_person_votes:
           complete_voting:
             available_answers: 'Mahdolliset vastaukset:'
-            census_verified: Osallistuja ei ole vielä äänestänyt.
+            census_verified: Tämä osallistuja ei ole vielä äänestänyt fyysisesti.
+            census_verified_with_online_vote: Tämä osallistuja on jo äänestänyt verkossa. Jos hän äänestää fyysisesti, edelliset äänet mitätöidään ja ainoastaan fyysinen ääni lasketaan.
             complete_voting: Viimeistele äänestys
             identify_another: Tunnista toinen osallistuja
             questions_title: 'Hänellä on oikeus äänestää seuraavista kysymyksistä:'
@@ -1343,9 +1376,9 @@ fi-pl:
         filters:
           active: Aktiiviset
           all: Kaikki
+          date: Päivämäärä
           finished: Päättyneet
           search: Hae
-          state: Tila
           upcoming: Tulevat
         filters_small_view:
           close_modal: Sulje ikkuna
diff --git a/decidim-elections/config/locales/fi.yml b/decidim-elections/config/locales/fi.yml
index cdadced1b9f34..372ed1c603d05 100644
--- a/decidim-elections/config/locales/fi.yml
+++ b/decidim-elections/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ fi:
         image: Kuva
         proposals: Liittyvät ehdotukset
         title: Otsikko
+      ballot_style:
+        code: Koodi
       election:
         description: Kuvaus
         end_time: Äänestys päättyy
         start_time: Äänestys alkaa
         title: Otsikko
+      monitoring_committee_member:
+        email: Sähköpostiosoite
+        name: Nimi
+      polling_officer:
+        email: Sähköpostiosoite
+        name: Nimi
+      polling_station:
+        address: Osoite
+        location: Sijainti
+        location_hints: Paikan tarkemmat tiedot
+        polling_station_managers: Virkailijat
+        polling_station_president_id: Esimies
+        title: Otsikko
       question:
         max_selections: Valintojen enimmäismäärä
         min_selections: Ei mikään edellä mainituista
         title: Otsikko
+      trustees_participatory_space:
+        user_id: Osallistuja
       voting:
+        banner_image: Bannerikuva
+        census_contact_information: Henkilötietorekisterin vastuutahon yhteystiedot
+        description: Kuvaus
         end_time: Äänestyksen päättymisaika
+        introductory_image: Esittelykuva
+        promoted: Korostettu
+        scope_id: Teema
+        show_check_census: Näytä "tarkasta henkilötietorekisterin tiedot" -sivu
         start_time: Äänestyksen alkamisaika
+        title: Otsikko
+        voting_type: Äänestystapa
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ fi:
               cant_be_changed: tietoa ei voi muuttaa
             public_key:
               cant_be_changed: tietoa ei voi muuttaa
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} ei ole sallittu äänestystyyppi"
   activerecord:
     errors:
       models:
@@ -290,15 +321,6 @@ fi:
             selected: Valittu
             submit: Lähetä
             title: Tulokset julkaistu
-          tally:
-            continue: Jatka
-            invalid: Poissaolevan luottamushenkilön ilmoittaminen epäonnistui
-            mark_as_missing: Merkitse poissaolevaksi
-            mark_as_missing_description: Kaikkien luottamushenkilöiden pitäisi osallistua tähän prosessiin, mutta jos luottamushenkilö ei voi osallistua prosessiin, voit merkitä kyseisen henkilön poissaolevaksi.
-            success: Poissaolevan luottamushenkilön merkitseminen sähköiselle ääniuurnalle onnistui
-            tally_completion: Prosessi valmistuu, kun kaikki luottamushenkilöt ovat aktiivisia tai merkitty poissaoleviksi. Vähintään %{quorum} luottamushenkilöä tarvitaan prosessin loppuun saattamiseksi.
-            title: Ääntenlasku
-            undo_mark_as_missing: Poissaoleva luottamushenkilö voi osallistua prosessiin ennen sen päättymistä. He voivat jatkaa normaalisti ja heidän poissaolonsa jätetään huomioimatta.
           tally_ended:
             answer: Vastaus
             not_selected: Ei valittu
@@ -308,6 +330,15 @@ fi:
             submit: Julkaise tulokset
             success: Pyyntösi julkaista äänestyksen tulokset on onnistuneesti lähetetty sähköiselle ääniuurnalle
             title: Ääntenlaskun tulokset
+          tally_started:
+            continue: Jatka
+            invalid: Poissaolevan luottamushenkilön ilmoittaminen epäonnistui
+            mark_as_missing: Merkitse poissaolevaksi
+            mark_as_missing_description: Kaikkien luottamushenkilöiden pitäisi osallistua tähän prosessiin, mutta jos luottamushenkilö ei voi osallistua prosessiin, voit merkitä kyseisen henkilön poissaolevaksi.
+            success: Poissaolevan luottamushenkilön merkitseminen sähköiselle ääniuurnalle onnistui
+            tally_completion: Prosessi valmistuu, kun kaikki luottamushenkilöt ovat aktiivisia tai merkitty poissaoleviksi. Vähintään %{quorum} luottamushenkilöä tarvitaan prosessin loppuun saattamiseksi.
+            title: Ääntenlasku
+            undo_mark_as_missing: Poissaoleva luottamushenkilö voi osallistua prosessiin ennen sen päättymistä. He voivat jatkaa normaalisti ja heidän poissaolonsa jätetään huomioimatta.
           vote:
             errors:
               time_after: Vaali on edelleen käynnissä. Sinun on odotettava päättymisaikaan saakka (%{end_time}) päättääksesi äänestyksen.
@@ -382,7 +413,6 @@ fi:
           remaining_time:
             one: "<strong>%{count} tunti ja %{minutes} minuuttia</strong> äänestysaikaa jäljellä."
             other: "<strong>%{count} tuntia ja %{minutes} minuuttia</strong> äänestysaikaa jäljellä."
-            zero: "<strong>%{minutes} minuuttia</strong> äänestysaikaa jäljellä."
           view: Näytä
           vote: Äänestä
         label:
@@ -443,9 +473,9 @@ fi:
         filters:
           active: Aktiiviset
           all: Kaikki
+          date: Päivämäärä
           finished: Valmiit
           search: Hae
-          state: Tila
           upcoming: Tulevat
         filters_small_view:
           close_modal: Sulje ikkuna
@@ -464,7 +494,6 @@ fi:
           votes:
             one: "%{count} ääni"
             other: "%{count} ääntä"
-            zero: "%{count} ääntä"
         show:
           action_button:
             change_vote: Muuta ääntäsi
@@ -554,7 +583,7 @@ fi:
             title: Palauta vaaliavaimet kohteelle %{election}
             upload_election_keys: Lataa vaaliavaimet
             upload_icon: Kuvake, joka ilmaisee lataustoiminnon
-          tally_steps:
+          tally_started_steps:
             back: Takaisin
             description: Näiden vaalien tuloksia lasketaan parhaillaan sähköiseen ääniuurnaan. Jotta tämä prosessi voidaan saattaa loppuun, sinun tulee osallistua luottamushenkilönä.
             keys:
@@ -565,9 +594,9 @@ fi:
             list:
               status: Tila
               task: Tehtävä
-            process_warning: Kun prosessi on käynnistetty, sinun ei tule poistua tältä sivulta ennen kuin prosessi päättyy. Se kestää useita minuutteja, koska kaikkiin luottamushenkilöihin tulee olla yhteydessä, jotta prosessi voidaan päättää.
-            start: Aloita
-            start_icon: Kuvake, joka ilmaisee aloituspainikkeen avainten luonnille
+            process_warning: Kun prosessi on käynnistetty, sinun ei tule poistua tältä sivulta ennen kuin prosessi päättyy. Tämä kestää useita minuutteja, koska kaikkien luottamushenkilöiden tulee olla yhteydessä samanaikaisesti, jotta prosessi voidaan suorittaa.
+            start: Aloitettu
+            start_icon: Kuvake, joka ilmaisee aloituspainikkeen avainten luonnin aloittamiselle
             status:
               completed: Valmis
               pending: Odottaa
@@ -604,15 +633,15 @@ fi:
               generate_legend_3: Tarkasta, että tietokoneellesi ei jää kopiota kyseisestä tiedostosta (tarkasta myös Lataukset-kansio sekä työpöytäsi).
               generate_legend_4: Luo toinen kopio tiedostosta toiselle ulkoiselle laitteelle ja talleta se erittäin turvalliseen paikkaan.
               submit: Lähetä
-              submit_legend: Kun olet toteuttanut kaikki edellä esitetyt vaiheet, viimeistele julkisten tunnistusvainten lähetys Decidim-palvelimelle.
+              submit_legend: Kun olet toteuttanut kaikki edellä esitetyt vaiheet, viimeistele julkisten tunnistusvainten lähetys palvelimelle.
               submit_title: Lähetä julkinen tunnistusavain
               title: Luottamushenkilöiden tunnistusavaimet
               upload: Lataa tunnistusavaimet
               upload_error:
                 invalid_format: Ladattu tiedosto ei sisällä yhtään tunnistusavainta.
                 invalid_key: Ladatussa tiedostossa olevia tunnistusavaimia ei voida ladata.
-                invalid_public_key: Ladatun tiedoston tunnistusavaimet eivät vastaa Decidimiin tallennettua julkista tunnistusavainta.
-              upload_legend: Julkiset tunnistusavaimet ovat Decidimissä, mutta eivät selaimessasi. Sinun tulee tuoda tunnistusavainten tiedosto omalle tietokoneellesi varmuuskopiosta, jonka tallensit avaimia luotaessa.
+                invalid_public_key: Ladatun tiedoston tunnistusavaimet eivät vastaa tallennettua julkista tunnistusavainta.
+              upload_legend: Julkiset tunnistusavaimet ovat palvelimella, mutta eivät selaimessasi. Sinun täytyy tuoda tunnistusavainten tiedosto omalle tietokoneellesi varmuuskopiosta, jonka tallensit avaimia luotaessa.
             not_supported_browser_description: Näyttää siltä, että käytät selainta, jota ei voi käyttää luottamushenkilönä toimimiseen. Tarkasta, että käytät selaimesi viimeisintä versiota tai yritä käyttää jotain suosituimmista selaimista luottamushenkilön tehtävien suorittamiseksi.
             not_supported_browser_title: Päivitä selaimesi toimiaksesi luottamushenkilönä
             trustee_role_description: Sinulle on annettu luottamushenkilön tehtävä joissain vaaleissa tällä alustalla.
@@ -654,10 +683,6 @@ fi:
         failed:
           header: Äänestys epäonnistui
           lead: Ääntäsi ei ole annettu!
-          modal:
-            close: Sulje
-            communication_lost: Valitettavasti näyttää siltä, että viestien välitys sähköisen ääniuurnan kanssa ei onnistu.<br>Internet-yhteydessäsi voi olla ongelma tai ääniuurnan palvelin on liian kiireinen.<br>Voit yrittää myöhemmin uudestaan tai ottaa yhteyttä tekniseen tukeen, jos ongelma jatkuu.
-            title: Jokin meni vikaan
           text: Jokin meni pieleen, yritä uudelleen.
           try_again: Yritä uudestaan
         header:
@@ -683,9 +708,9 @@ fi:
         onboarding_modal:
           close: Sulje ikkuna
           create_account: Luo tili
-          description: Haluatko luoda oman käyttäjätilin alustalle? Sinulla on mahdollisuus osallistua prosesseihin ja olla mukana alustalla esitettyjen asioiden kehittämisessä.
+          description: Haluatko luoda oman käyttäjätilin alustalle? Voit osallistua prosesseihin ja alustalla esitettyjen asioiden kehittämiseen.
           no_account: Ei kiitos.
-          title: Oletko uusi käyttäjä tällä alustalla?
+          title: Oletko uusi käyttäjä tässä palvelussa?
         update:
           error: Äänen tilan päivittäminen epäonnistui valitettavasti. Ole hyvä ja äänestä uudestaan.
         verify:
@@ -696,9 +721,10 @@ fi:
             header: Ääntä ei löytynyt!
             info: Äänestystunnusta ei löytynyt vaaliuurnasta %{link}, yritä uudelleen.
           form:
-            back: Takaisin Decidimiin
+            back: Takaisin alustalle
             submit: Tarkista
             vote_identifier: 'Äänen tunniste:'
+            vote_identifier_help: Tämä tunniste annettiin sinulle äänen jättämisen jälkeen (se ei ole koodi, jota käytit päästäksesi äänestyskoppiin).
           header:
             title: Vahvista äänesi
           success:
@@ -1019,6 +1045,7 @@ fi:
             introductory_image: Esittelykuva
             promoted: Korostettu
             select_a_voting_type: Valitse äänestystapa
+            show_check_census_help: Määrittää, näytetäänkö "Voinko äänestää?" -linkki julkisten äänestysten sivuilla
             slug: Tunniste
             slug_help: 'URL-tunnisteita käytetään luomaan URL-osoitteita, jotka viittaavat tähän äänestykseen. Hyväksyy vain kirjaimet, numerot ja viivat. Kirjaimen on oltava ensimmäinen merkki tunnisteessa. Esimerkki: %{url}'
             title: Otsikko
@@ -1067,7 +1094,7 @@ fi:
               invalid: Henkilötietorekisterin lataaminen epäonnistui, yritä uudestaan myöhemmin.
               invalid_csv_header: CSV-otsakkeet puuttuvat puuttuvat tai ovat virheellisiä - lue ohjeet huolellisesti
             creating_data:
-              info_message: "<strong>Odota hetki</strong>, käsitelty %{processed_count} / %{raw_count} riviä tiedostosta %{file}."
+              info_message: "<strong>Odota hetki</strong>, käsitelty %{processed_count} / %{raw_count} riviä tiedostosta %{file} (tämä voi kestää useita minuutteja)."
             delete:
               button: Poista kaikki henkilötietorekisterin tiedot
               confirm: Väestörekisterin tietojen poistamista ei voi peruuttaa jälkikäteen. Haluatko varmasti jatkaa?
@@ -1082,9 +1109,13 @@ fi:
               launch_error: Tunnistautumiskoodien viennin aloittaminen epäonnistui
               launch_success: Tunnistautumiskoodien vienti aloitettu. Saat sähköpostia hetken kuluttua sähköpostiosoitteeseen %{email}
             exporting_access_codes:
-              info_message: "<strong>Odota hetki</strong>, vientiä valmistellaan, saat pian tiedon viennistä sähköpostiosoitteeseen %{email}"
+              info_message: "<strong>Odota hetki</strong>, vientiä valmistellaan, saat hetken kuluttua viestin sähköpostiisi osoitteeseen %{email} (tämä voi kestää useita minuutteja)."
             freeze:
               callout: Henkilötietorekisteri on jäädytetty, minkä takia sitä ei voi muokata.
+              help_html: |
+                Henkilötietorekisterin tiedot on ladattu, äänestyskoodien luonti ja vienti on onnistunut.<br>
+                <strong>Voit nyt aloittaa äänestyksen.</strong><br>
+                Käytä vietyä CSV-tiedostoa ja toimita siinä näkyvät äänestyskoodit henkilötietorekisterin henkilöille haluamallasi tavalla tai ota käyttöön "Voinko äänestää" -välilehti mahdollistaaksesi osallistujille heidän omien koodiensa tilaaminen henkilötietorekisteriin merkittyjen tietojen perusteella.
             generate_access_codes:
               button: Luo äänestyksen tunnistautumiskoodit
               callout: Voit nyt jatkaa tunnistautumiskoodien luontiin. Huomioithan, että tunnistautumiskoodien luonnin jälkeen, et voi enää muokata henkilötietorekisteriä.
@@ -1093,8 +1124,9 @@ fi:
               info_message_warn: Tarkasta, että mitään tietoja ei puutu, koska %{data_count} tietuetta luotiin ja ladatussa tiedostossa %{file} on %{raw_count} riviä.
               launch_error: Tunnistautumiskoodien luonnin aloittaminen epäonnistui
               launch_success: Koodien luonti aloitettu.
+              start_over: Poista nykyinen henkilötietorekisteri ja aloita alusta oikeamuotoisella CSV-tiedostolla, joka sisältää ohjeiden mukaan muotointuja rivejä.
             generating_access_codes:
-              info_message: "<strong>Odota hetki</strong>, äänestyksen tunnistautumiskoodeja luodaan parhaillaan..."
+              info_message: "<strong>Odota hetki</strong>, äänestyskoodeja luodaan (tämä voi kestää useita minuutteja)..."
             new:
               file_help:
                 explanation: 'Tiedoston ohjeistus:'
@@ -1213,17 +1245,18 @@ fi:
         in_person_votes:
           complete_voting:
             available_answers: 'Mahdolliset vastaukset:'
-            census_verified: Osallistuja ei ole vielä äänestänyt.
+            census_verified: Tämä osallistuja ei ole vielä äänestänyt fyysisesti.
+            census_verified_with_online_vote: Tämä osallistuja on jo äänestänyt verkossa. Jos hän äänestää fyysisesti, edelliset äänet mitätöidään ja ainoastaan fyysinen ääni lasketaan.
             complete_voting: Viimeistele äänestys
             identify_another: Tunnista toinen osallistuja
-            questions_title: 'Hänellä on oikeus äänestää seuraavista kysymyksistä:'
+            questions_title: 'Osallistujilla on oikeus äänestää seuraavista kysymyksistä:'
             questions_title_voted: 'Osallistuja on jo äänestänyt verkossa ja hänellä on oikeus äänestää seuraavista kysymyksistä:'
             voted: Osallistuja on äänestänyt
           create:
             error: Ääntä ei tallennettu. Ole hyvä ja yritä uudelleen.
           in_person_form:
             census_not_present: Tätä osallistujaa ei ole henkilötietorekisterissä.
-            census_not_present_description: Hänen on mentävä reklamoimaan henkilötietorekisteriä hallinnoivaan toimistoon tai otettava yhteyttä tukeen.
+            census_not_present_description: Osallistujan on mentävä reklamoimaan henkilötietorekisteriä hallinnoivaan toimistoon tai otettava yhteyttä tukeen.
             date_of_birth: Syntymäaika
             day: Päivä
             day_placeholder: PV
@@ -1343,9 +1376,9 @@ fi:
         filters:
           active: Aktiiviset
           all: Kaikki
+          date: Päivämäärä
           finished: Päättyneet
           search: Hae
-          state: Tila
           upcoming: Tulevat
         filters_small_view:
           close_modal: Sulje ikkuna
diff --git a/decidim-elections/config/locales/fr-CA.yml b/decidim-elections/config/locales/fr-CA.yml
index fafbf9cea4687..1afcffcf0aa9a 100644
--- a/decidim-elections/config/locales/fr-CA.yml
+++ b/decidim-elections/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ fr-CA:
         image: Image
         proposals: Propositions associées
         title: Titre
+      ballot_style:
+        code: Code
       election:
         description: Description
         end_time: Le vote se termine à
         start_time: Le vote commence à
         title: Titre
+      monitoring_committee_member:
+        email: Email
+        name: Nom
+      polling_officer:
+        email: Email
+        name: Nom
+      polling_station:
+        address: Adresse
+        location: Lieu
+        location_hints: Indication de lieu
+        polling_station_managers: Gestionnaires
+        polling_station_president_id: Président
+        title: Titre
       question:
         max_selections: Nombre maximum de sélections
         min_selections: Aucune des options ci-dessus
         title: Titre
+      trustees_participatory_space:
+        user_id: Participant
       voting:
+        banner_image: Image de bannière
+        census_contact_information: Informations de contact du recensement
+        description: Description
         end_time: Le vote se termine
+        introductory_image: Image d'introduction
+        promoted: Mis en avant
+        scope_id: Périmètre d'application
+        show_check_census: Afficher la page "Vérifier le recensement"
         start_time: Le vote commence le
+        title: Titre
+        voting_type: Type de vote
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ fr-CA:
               cant_be_changed: ne peut pas être modifié
             public_key:
               cant_be_changed: ne peut être modifiée
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} n'est pas un type de vote valide"
   activerecord:
     errors:
       models:
@@ -290,15 +321,6 @@ fr-CA:
             selected: Sélectionné
             submit: Envoyer
             title: Résultats publiés
-          tally:
-            continue: Continuer
-            invalid: Une erreur est survenue lors du signalement du garant absent
-            mark_as_missing: Marquer comme absent
-            mark_as_missing_description: Tout les garants doivent participer au processus, mais si un garant ne peut y prendre part, vous pouvez le marquer comme absent.
-            success: Le signalement du garant absent a été envoyé avec succès sur le Tableau d'Affichage
-            tally_completion: Le processus sera terminé lorsque tout les garants seront marqués comme actif ou absent. Au moins %{quorum} garants sont requis pour compléter le processus.
-            title: Dépouillement
-            undo_mark_as_missing: Un garant marqué comme absent par erreur sera capable de participer avant l'achèvement du processus. Ils peuvent procéder comme d'habitude et le signalement d'absence sera ignoré.
           tally_ended:
             answer: Répondre
             not_selected: Non sélectionné
@@ -308,6 +330,15 @@ fr-CA:
             submit: Publier les résultats
             success: La demande de publication des résultats a bien été envoyée au Panneau d'Affichage
             title: Résultat du calcul
+          tally_started:
+            continue: Continuer
+            invalid: Une erreur est survenue lors du signalement du garant absent
+            mark_as_missing: Marquer comme absent
+            mark_as_missing_description: Tout les garants doivent participer au processus, mais si un garant ne peut y prendre part, vous pouvez le marquer comme absent.
+            success: Le signalement du garant absent a été envoyé avec succès sur le Tableau d'Affichage
+            tally_completion: Le processus sera terminé lorsque tout les garants seront marqués comme actif ou absent. Au moins %{quorum} garants sont requis pour compléter le processus.
+            title: Dépouillement
+            undo_mark_as_missing: Un garant marqué comme absent par erreur sera capable de participer avant l'achèvement du processus. Ils peuvent procéder comme d'habitude et le signalement d'absence sera ignoré.
           vote:
             errors:
               time_after: L'élection est toujours en cours. Vous devez attendre (%{end_time}) pour terminer la période de vote.
@@ -382,7 +413,6 @@ fr-CA:
           remaining_time:
             one: "<strong>Il reste %{count} heure %{minutes} minutes</strong> pour voter."
             other: "<strong>Il reste %{count} heures %{minutes} minutes</strong> pour voter."
-            zero: "<strong>Il reste %{minutes} minutes</strong> pour voter."
           view: Voir
           vote: Voter
         label:
@@ -443,9 +473,9 @@ fr-CA:
         filters:
           active: Actif
           all: Toutes
+          date: Date
           finished: Terminées
           search: Rechercher
-          state: Statut
           upcoming: À venir
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
@@ -464,7 +494,6 @@ fr-CA:
           votes:
             one: "%{count} vote"
             other: "%{count} votes"
-            zero: "%{count} votes"
         show:
           action_button:
             change_vote: Changer votre vote
@@ -554,8 +583,8 @@ fr-CA:
             title: Restaurer les clés d'élection pour %{election}
             upload_election_keys: Télécharger les clés d'élection
             upload_icon: Icône indiquant une action de téléchargement
-          tally_steps:
-            back: Précédent
+          tally_started_steps:
+            back: Retour
             description: Les résultats de cette élection sont calculés dans le Bulletin Board et pour compléter ce processus, votre participation en tant que garant est nécessaire.
             keys:
               end_tally: Dépouillement terminé
@@ -565,7 +594,7 @@ fr-CA:
             list:
               status: Statut
               task: Tâche
-            process_warning: Une fois le processus démarré, vous ne devriez pas quitter cette page avant la fin du processus. Cela prendra plusieurs minutes, car tous les Mandataires doivent être connectés pour le compléter.
+            process_warning: Une fois le processus démarré, vous ne devriez pas quitter cette page avant la fin du processus. Cela prendra plusieurs minutes, car tous les garants doivent être connectés pour le compléter.
             start: Démarrer
             start_icon: Icône indiquant un bouton de démarrage pour démarrer la génération des clés d'élection
             status:
@@ -604,15 +633,15 @@ fr-CA:
               generate_legend_3: Assurez-vous que votre ordinateur ne possède pas de copie du fichier (par exemple, vérifiez les dossiers Téléchargements et Bureau).
               generate_legend_4: Faites une autre copie du fichier sur un appareil externe et conservez-le dans un endroit très sûr.
               submit: Envoyer
-              submit_legend: Après avoir suivi toutes les étapes expliquées ci-dessus, complétez le processus d'envoi de la clé d'identification publique au serveur Decidim.
+              submit_legend: Après avoir suivi toutes les étapes expliquées ci-dessus, complétez le processus d'envoi de la clé d'identification publique au serveur.
               submit_title: Soumettre la clé d'identification publique
               title: Clés d'identification du garant
               upload: Téléchargez vos clés d'identification
               upload_error:
                 invalid_format: Le fichier téléchargé ne contient pas de clé d'identification.
                 invalid_key: Impossible de charger les clés d'identification à partir du fichier téléchargé.
-                invalid_public_key: Les clés d'identification dans le fichier téléchargé ne correspondent pas à la clé d'identification publique stockée par Decidim.
-              upload_legend: Decidim a vos clés d'identification publiques, mais votre navigateur ne l'a toujours pas. Vous devez importer le fichier avec vos clés d'identification sur votre ordinateur à partir de la sauvegarde que vous avez créée après leur génération.
+                invalid_public_key: Les clés d'identification dans le fichier téléchargé ne correspondent pas à la clé d'identification publique stockée.
+              upload_legend: Le serveur a vos clés d'identification publiques, mais votre navigateur ne les a toujours pas. Vous devez importer le fichier avec vos clés d'identification sur votre ordinateur à partir de la sauvegarde que vous avez créée après leur génération.
             not_supported_browser_description: On dirait que vous utilisez un navigateur Web qui ne peut pas être utilisé pour agir en tant que garant. Assurez-vous d'utiliser la version la plus récente de votre navigateur, ou essayez d'utiliser l'un des navigateurs les plus populaires pour accomplir vos tâches de garant.
             not_supported_browser_title: Mettre à niveau le navigateur pour agir en tant que garant
             trustee_role_description: Vous avez été assigné à agir en tant que garant lors de certaines des élections mises en place sur cette plateforme.
@@ -654,10 +683,6 @@ fr-CA:
         failed:
           header: Le vote a échoué
           lead: Votre vote n'a pas été exprimé!
-          modal:
-            close: Fermer
-            communication_lost: Malheureusement, il semble que la communication avec le serveur de vote (Bulletin Board) est perdue.<br>Il se peut que la connexion Internet soit interrompue ou que le serveur de destination soit trop occupé.<br>Vous pouvez réessayer plus tard ou contacter le support si ce problème persiste.
-            title: Un problème est survenu
           text: Une erreur est survenue, veuillez réessayer.
           try_again: Réessayez
         header:
@@ -683,9 +708,9 @@ fr-CA:
         onboarding_modal:
           close: Fermer la fenêtre de dialogue
           create_account: Créer un compte
-          description: Voulez-vous créer un compte sur Decidim ? Vous pourrez participer à toutes les concertations et prendre une part active dans l'organisation.
+          description: Voulez-vous créer un compte sur la plateforme ? Vous pourrez participer aux concertations et prendre une part active dans l'organisation.
           no_account: Non, merci.
-          title: Nouveau sur Decidim ?
+          title: Nouveau sur la plateforme ?
         update:
           error: Une erreur s'est produite lors de la mise à jour du statut du vote. Tentez de voter à nouveau.
         verify:
@@ -696,9 +721,10 @@ fr-CA:
             header: Vote introuvable !
             info: Le code de vote n'a pas été trouvé dans %{link} l'urne, essayez à nouveau.
           form:
-            back: Retour à Decidim
+            back: Retour à la plateforme
             submit: Vérifier
             vote_identifier: 'Code d''identification :'
+            vote_identifier_help: C'est l'identifiant qui vous a été donné après que vous avez voté (pas le code pour entrer dans l'isoloir).
           header:
             title: Vérifiez votre vote
           success:
@@ -1019,6 +1045,7 @@ fr-CA:
             introductory_image: Image d'introduction
             promoted: Mis en avant
             select_a_voting_type: Veuillez sélectionner un type de vote
+            show_check_census_help: Si vous voulez afficher le lien "Puis-je voter?" dans le menu des votes publics
             slug: Slug
             slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui renvoient vers cette élection. Ils ne contiennent que des lettres, des chiffres et des tirets et doivent commencer par une lettre. Exemple : %{url}'
             title: Titre
@@ -1067,7 +1094,7 @@ fr-CA:
               invalid: Une erreur s'est produite lors de la mise à jour du recensement, veuillez réessayer plus tard.
               invalid_csv_header: Les en-têtes CSV sont manquants ou incorrects - veuillez lire attentivement les instructions
             creating_data:
-              info_message: "<strong>Veuillez patienter</strong>, %{processed_count} traités sur %{raw_count} lignes à partir du fichier %{file}."
+              info_message: "<strong>Veuillez patienter</strong>, %{processed_count} traités sur %{raw_count} lignes à partir du fichier %{file} (cela peut prendre plusieurs minutes)."
             delete:
               button: Supprimer toutes les données du recensement
               confirm: La suppression de tout le recensement ne peut pas être annulée. Êtes-vous sûr de vouloir continuer?
@@ -1082,9 +1109,13 @@ fr-CA:
               launch_error: Problème lors du lancement de l'export des codes d'accès
               launch_success: L'export des codes d'accès a été lancée. Vous recevrez sous peu un e-mail à %{email}
             exporting_access_codes:
-              info_message: "<strong>Veuillez patienter</strong>, l'export est en cours de préparation, vous le recevrez sous peu sur %{email}"
+              info_message: "<strong>Veuillez patienter</strong>, l'export est en cours de préparation, vous le recevrez sous peu à %{email} (cela peut prendre plusieurs minutes)."
             freeze:
               callout: Le recensement est gelé et ne peut pas être modifié.
+              help_html: |
+                Les données du recensement ont été téléchargées, les codes générés et exportés avec succès.<br>
+                <strong>Vous êtes maintenant prêt à commencer l'élection.</strong><br>
+                Utilisez le CSV exporté avec les codes individuels pour le distribuer le long de votre recensement en utilisant vos propres moyens ou activez l'onglet "Puis-je voter" pour permettre à quiconque de récupérer ce code en utilisant ses propres données de recensement.
             generate_access_codes:
               button: Générer des codes d'accès au vote
               callout: Vous pouvez maintenant procéder à la génération des codes d'accès. N'oubliez pas qu'après la génération des codes d'accès, vous ne pourrez plus modifier le recensement.
@@ -1093,8 +1124,9 @@ fr-CA:
               info_message_warn: Veuillez vérifier qu'aucune donnée n'est manquante, car %{data_count} enregistrements ont été créés et le fichier téléchargé %{file} a %{raw_count} lignes.
               launch_error: Problème lors du lancement de la génération des codes d'accès
               launch_success: Génération de codes lancée.
+              start_over: Veuillez supprimer le recensement actuel et recommencer avec un fichier CSV correct avec des lignes valides.
             generating_access_codes:
-              info_message: "<strong>Veuillez patienter</strong>, les codes d'accès au vote sont en cours de génération..."
+              info_message: "<strong>Veuillez patienter</strong>, les codes d'accès au vote sont en cours de génération (cela peut prendre plusieurs minutes)..."
             new:
               file_help:
                 explanation: 'Instructions concernant le fichier :'
@@ -1213,7 +1245,8 @@ fr-CA:
         in_person_votes:
           complete_voting:
             available_answers: 'Réponses disponibles:'
-            census_verified: Le participant n'a pas encore voté.
+            census_verified: Ce participant n'a pas encore voté en personne.
+            census_verified_with_online_vote: Ce participant a déjà voté en ligne. S'il vote en personne, les votes précédents seront invalidés et ce sera le vote définitif.
             complete_voting: Vote terminé
             identify_another: Identifier un autre participant
             questions_title: 'Elle a le droit de voter sur les questions suivantes:'
@@ -1343,9 +1376,9 @@ fr-CA:
         filters:
           active: Actifs
           all: Tous
+          date: Date
           finished: Terminées
           search: Rechercher
-          state: Statut
           upcoming: À venir
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
diff --git a/decidim-elections/config/locales/fr.yml b/decidim-elections/config/locales/fr.yml
index be93d2ddbaa94..8519356e85e28 100644
--- a/decidim-elections/config/locales/fr.yml
+++ b/decidim-elections/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ fr:
         image: Image
         proposals: Propositions associées
         title: Titre
+      ballot_style:
+        code: Code
       election:
         description: Description
         end_time: Le vote se termine à
         start_time: Le vote commence à
         title: Titre
+      monitoring_committee_member:
+        email: Email
+        name: Nom
+      polling_officer:
+        email: Email
+        name: Nom
+      polling_station:
+        address: Adresse
+        location: Lieu
+        location_hints: Indication de lieu
+        polling_station_managers: Gestionnaires
+        polling_station_president_id: Président
+        title: Titre
       question:
         max_selections: Nombre maximum de sélections
         min_selections: Aucune des options ci-dessus
         title: Titre
+      trustees_participatory_space:
+        user_id: Participant
       voting:
+        banner_image: Image de bannière
+        census_contact_information: Informations de contact du recensement
+        description: Description
         end_time: Le vote prend fin le
+        introductory_image: Image d'introduction
+        promoted: Mis en avant
+        scope_id: Périmètre d'application
+        show_check_census: Afficher la page "Vérifier le recensement"
         start_time: Le vote commence le
+        title: Titre
+        voting_type: Type de vote
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ fr:
               cant_be_changed: ne peut pas être modifié
             public_key:
               cant_be_changed: ne peut être modifiée
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} n'est pas un type de vote valide"
   activerecord:
     errors:
       models:
@@ -290,15 +321,6 @@ fr:
             selected: Sélectionné
             submit: Envoyer
             title: Résultats publiés
-          tally:
-            continue: Continuer
-            invalid: Une erreur est survenue lors du signalement du garant absent
-            mark_as_missing: Marquer comme absent
-            mark_as_missing_description: Tout les garants doivent participer au processus, mais si un garant ne peut y prendre part, vous pouvez le marquer comme absent.
-            success: Le signalement du garant absent a été envoyé avec succès sur le Tableau d'Affichage
-            tally_completion: Le processus sera terminé lorsque tout les garants seront marqués comme actifs ou absents. Au moins %{quorum} garants sont requis pour compléter le processus.
-            title: Dépouillement
-            undo_mark_as_missing: Un garant marqué comme absent par erreur sera capable de participer avant l'achèvement du processus. Ils peuvent procéder comme d'habitude et le signalement d'absence sera ignoré.
           tally_ended:
             answer: Répondre
             not_selected: Non sélectionné
@@ -308,6 +330,15 @@ fr:
             submit: Publier les résultats
             success: La demande de publication des résultats a bien été envoyée au Panneau d'Affichage
             title: Résultats du calcul
+          tally_started:
+            continue: Continuer
+            invalid: Une erreur est survenue lors du signalement du garant absent
+            mark_as_missing: Marquer comme absent
+            mark_as_missing_description: Tout les garants doivent participer au processus, mais si un garant ne peut y prendre part, vous pouvez le marquer comme absent.
+            success: Le signalement du garant absent a été envoyé avec succès sur le Tableau d'Affichage
+            tally_completion: Le processus sera terminé lorsque tout les garants seront marqués comme actifs ou absents. Au moins %{quorum} garants sont requis pour compléter le processus.
+            title: Dépouillement
+            undo_mark_as_missing: Un garant marqué comme absent par erreur sera capable de participer avant l'achèvement du processus. Ils peuvent procéder comme d'habitude et le signalement d'absence sera ignoré.
           vote:
             errors:
               time_after: L'élection est toujours en cours. Vous devez attendre (%{end_time}) pour terminer la période de vote.
@@ -382,7 +413,6 @@ fr:
           remaining_time:
             one: "<strong>Il reste %{count} heure %{minutes} minutes</strong> pour voter."
             other: "<strong>Il reste %{count} heures %{minutes} minutes</strong> pour voter."
-            zero: "<strong>Il reste %{minutes} minutes</strong> pour voter."
           view: Voir
           vote: Voter
         label:
@@ -443,9 +473,9 @@ fr:
         filters:
           active: Actif
           all: Toutes
+          date: Date
           finished: Terminées
           search: Rechercher
-          state: Statut
           upcoming: À venir
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
@@ -464,7 +494,6 @@ fr:
           votes:
             one: "%{count} vote"
             other: "%{count} votes"
-            zero: "%{count} votes"
         show:
           action_button:
             change_vote: Changer votre vote
@@ -554,7 +583,7 @@ fr:
             title: Restaurer les clés d'élection pour %{election}
             upload_election_keys: Télécharger les clés d'élection
             upload_icon: Icône indiquant une action de téléchargement
-          tally_steps:
+          tally_started_steps:
             back: Retour
             description: Les résultats de cette élection sont calculés dans le Panneau d'affichage et pour compléter ce processus, votre participation en tant que garant est nécessaire.
             keys:
@@ -604,15 +633,15 @@ fr:
               generate_legend_3: Assurez-vous que votre ordinateur ne possède pas de copie du fichier (par exemple, vérifiez les dossiers Téléchargements et Bureau).
               generate_legend_4: Faites une autre copie du fichier sur un appareil externe et conservez-le dans un endroit très sûr.
               submit: Envoyer
-              submit_legend: Après avoir suivi toutes les étapes expliquées ci-dessus, complétez le processus d'envoi de la clé d'identification publique au serveur Decidim.
+              submit_legend: Après avoir suivi toutes les étapes expliquées ci-dessus, complétez le processus d'envoi de la clé d'identification publique au serveur.
               submit_title: Soumettre la clé d'identification publique
               title: Clés d'identification du garant
               upload: Téléchargez vos clés d'identification
               upload_error:
                 invalid_format: Le fichier téléchargé ne contient pas de clé d'identification.
                 invalid_key: Impossible de charger les clés d'identification à partir du fichier téléchargé.
-                invalid_public_key: Les clés d'identification dans le fichier téléchargé ne correspondent pas à la clé d'identification publique stockée par Decidim.
-              upload_legend: Decidim a vos clés d'identification publiques, mais votre navigateur ne l'a toujours pas. Vous devez importer le fichier avec vos clés d'identification sur votre ordinateur à partir de la sauvegarde que vous avez créée après leur génération.
+                invalid_public_key: Les clés d'identification dans le fichier téléchargé ne correspondent pas à la clé d'identification publique stockée.
+              upload_legend: Le serveur a vos clés d'identification publiques, mais votre navigateur ne les a toujours pas. Vous devez importer le fichier avec vos clés d'identification sur votre ordinateur à partir de la sauvegarde que vous avez créée après leur génération.
             not_supported_browser_description: On dirait que vous utilisez un navigateur Web qui ne peut pas être utilisé pour agir en tant que garant. Assurez-vous d'utiliser la version la plus récente de votre navigateur, ou essayez d'utiliser l'un des navigateurs les plus populaires pour accomplir vos tâches de garant.
             not_supported_browser_title: Mettre à niveau le navigateur pour agir en tant que garant
             trustee_role_description: Vous avez été assigné à agir en tant que garant lors de certaines des élections mises en place sur cette plateforme.
@@ -654,10 +683,6 @@ fr:
         failed:
           header: Le vote a échoué
           lead: Votre vote n'a pas été exprimé !
-          modal:
-            close: Fermer
-            communication_lost: Malheureusement, il semble que la communication avec le serveur de vote (Bulletin Board) est perdue.<br>Il se peut que la connexion Internet soit interrompue ou que le serveur de destination soit trop occupé.<br>Vous pouvez réessayer plus tard ou contacter le support si ce problème persiste.
-            title: Un problème est survenu
           text: Une erreur est survenue, veuillez réessayer.
           try_again: Réessayez
         header:
@@ -683,9 +708,9 @@ fr:
         onboarding_modal:
           close: Fermer la fenêtre de dialogue
           create_account: S'inscrire
-          description: Voulez-vous créer un compte sur Decidim ? Vous pourrez participer aux concertations et prendre une part active dans l'organisation.
+          description: Voulez-vous créer un compte sur la plateforme ? Vous pourrez participer aux concertations et prendre une part active dans l'organisation.
           no_account: Non, merci.
-          title: Nouveau sur Decidim ?
+          title: Nouveau sur la plateforme ?
         update:
           error: Une erreur s'est produite lors de la mise à jour du statut du vote. Tentez de voter à nouveau. 
         verify:
@@ -696,9 +721,10 @@ fr:
             header: Vote introuvable !
             info: Le code de vote n'a pas été trouvé dans %{link} l'urne, essayez à nouveau.
           form:
-            back: Retour à Decidim
+            back: Retour à la plateforme
             submit: Vérifier
             vote_identifier: 'Code d''identification :'
+            vote_identifier_help: C'est l'identifiant qui vous a été donné après que vous avez voté (pas le code pour entrer dans l'isoloir).
           header:
             title: Vérifiez votre vote
           success:
@@ -1019,6 +1045,7 @@ fr:
             introductory_image: Image d'introduction
             promoted: Mis en avant
             select_a_voting_type: Veuillez sélectionner un type de vote
+            show_check_census_help: Si vous voulez afficher le lien "Puis-je voter?" dans le menu des votes publics
             slug: Slug
             slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui renvoient vers cette élection. Ils ne contiennent que des lettres, des chiffres et des tirets et doivent commencer par une lettre. Exemple : %{url}'
             title: Titre
@@ -1067,7 +1094,7 @@ fr:
               invalid: Une erreur s'est produite lors de la mise à jour du recensement, veuillez réessayer plus tard.
               invalid_csv_header: Les en-têtes CSV sont manquants ou incorrects - veuillez lire attentivement les instructions
             creating_data:
-              info_message: "<strong>Veuillez patienter</strong>, %{processed_count} traités sur %{raw_count} lignes à partir du fichier %{file}."
+              info_message: "<strong>Veuillez patienter</strong>, %{processed_count} traités sur %{raw_count} lignes à partir du fichier %{file} (cela peut prendre plusieurs minutes)."
             delete:
               button: Supprimer toutes les données du recensement
               confirm: La suppression de tout le recensement ne peut pas être annulée. Êtes-vous sûr de vouloir continuer?
@@ -1082,9 +1109,13 @@ fr:
               launch_error: Problème lors du lancement de l'export des codes d'accès
               launch_success: L'export des codes d'accès a été lancée. Vous recevrez sous peu un e-mail à %{email}
             exporting_access_codes:
-              info_message: "<strong>Veuillez patienter</strong>, l'export est en cours de préparation, vous le recevrez sous peu sur %{email}"
+              info_message: "<strong>Veuillez patienter</strong>, l'export est en cours de préparation, vous le recevrez sous peu à %{email} (cela peut prendre plusieurs minutes)."
             freeze:
               callout: Le recensement est gelé et ne peut pas être modifié.
+              help_html: |
+                Les données du recensement ont été téléchargées, les codes générés et exportés avec succès.<br>
+                <strong>Vous êtes maintenant prêt à commencer l'élection.</strong><br>
+                Utilisez le CSV exporté avec les codes individuels pour le distribuer le long de votre recensement en utilisant vos propres moyens ou activez l'onglet "Puis-je voter" pour permettre à quiconque de récupérer ce code en utilisant ses propres données de recensement.
             generate_access_codes:
               button: Générer des codes d'accès au vote
               callout: Vous pouvez maintenant procéder à la génération des codes d'accès. N'oubliez pas qu'après la génération des codes d'accès, vous ne pourrez plus modifier le recensement.
@@ -1093,8 +1124,9 @@ fr:
               info_message_warn: Veuillez vérifier qu'aucune donnée n'est manquante, car %{data_count} enregistrements ont été créés et le fichier téléchargé %{file} a %{raw_count} lignes.
               launch_error: Problème lors du lancement de la génération des codes d'accès
               launch_success: Génération de codes lancée.
+              start_over: Veuillez supprimer le recensement actuel et recommencer avec un fichier CSV correct avec des lignes valides.
             generating_access_codes:
-              info_message: "<strong>Veuillez patienter</strong>, les codes d'accès au vote sont en cours de génération..."
+              info_message: "<strong>Veuillez patienter</strong>, les codes d'accès au vote sont en cours de génération (cela peut prendre plusieurs minutes)..."
             new:
               file_help:
                 explanation: 'Instructions concernant le fichier :'
@@ -1213,10 +1245,11 @@ fr:
         in_person_votes:
           complete_voting:
             available_answers: 'Réponses disponibles:'
-            census_verified: Le participant n'a pas encore voté.
+            census_verified: Ce participant n'a pas encore voté en personne.
+            census_verified_with_online_vote: Ce participant a déjà voté en ligne. S'il vote en personne, les votes précédents seront invalidés et ce sera le vote définitif.
             complete_voting: Vote terminé
             identify_another: Identifier un autre participant
-            questions_title: 'Elle a le droit de voter sur les questions suivantes:'
+            questions_title: 'Ils ont le droit de voter sur les questions suivantes :'
             questions_title_voted: 'Le participant a déjà voté en ligne et a le droit de voter dans les questions suivantes :'
             voted: Le participant a voté
           create:
@@ -1343,9 +1376,9 @@ fr:
         filters:
           active: Actifs
           all: Tous
+          date: Date
           finished: Terminées
           search: Rechercher
-          state: Statut
           upcoming: À venir
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
diff --git a/decidim-elections/config/locales/ga-IE.yml b/decidim-elections/config/locales/ga-IE.yml
index 22f74434b58c4..5bd85c24bfa77 100644
--- a/decidim-elections/config/locales/ga-IE.yml
+++ b/decidim-elections/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -96,16 +97,10 @@ ga:
           all: Uile
           finished: Críochnaithe
           search: Cuardaigh
-          state: Stádas
           upcoming: Le teacht
         filters_small_view:
           filter: Scag
           unfold: Oscail
-        results:
-          votes:
-            one: "%{count} vóta"
-            other: "%{count} vótaí"
-            zero: "%{count} vótaí"
         show:
           action_button:
             change_vote: Athraigh do vóta
@@ -146,14 +141,6 @@ ga:
             start: Tosaigh
             status:
               pending: Ar feitheamh
-          tally_steps:
-            back: Ar Ais
-            list:
-              status: Stádas
-              task: Tasc
-            start: Tosaigh
-            status:
-              pending: Ar feitheamh
         trustees:
           show:
             elections:
@@ -170,9 +157,6 @@ ga:
           confirm: Deimhnigh
           edit: eagar
           nota_option: Bán
-        failed:
-          modal:
-            close: Dún
         modal:
           close: Dún
         verify:
@@ -347,7 +331,6 @@ ga:
           all: Uile
           finished: Críochnaithe
           search: Cuardaigh
-          state: Stádas
           upcoming: Le teacht
         filters_small_view:
           filter: Scag
diff --git a/decidim-elections/config/locales/gl.yml b/decidim-elections/config/locales/gl.yml
index ab251df070850..e1ae299d9ab3b 100644
--- a/decidim-elections/config/locales/gl.yml
+++ b/decidim-elections/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -111,14 +112,6 @@ gl:
             result: Resultado
             selected: Seleccionado
             submit: Enviar
-          tally:
-            continue: Continuar
-            invalid: Produciuse un problema ao denunciar o comisario ausente
-            mark_as_missing: Marcar coma ausente
-            mark_as_missing_description: Todos os comisarios teñen que participar neste proceso, mais se un comisario non pode tomar parte pode ser sinalado como ausente.
-            success: O informe sobre o comisario ausente foi enviado con éxito ao Bulletin Board
-            tally_completion: O proceso completarase cando todos os comisarios estean activos ou marcados coma ausentes. Son necesarios polo menos %{quorum} comisarios para completar o proceso.
-            undo_mark_as_missing: Un comisario sinalado como ausente poderá participar antes de se completar o proceso. Poderá proceder como é usual e a marca de ausencia será ignorada.
           tally_ended:
             answer: Resposta
             not_selected: Non seleccionado
@@ -127,6 +120,13 @@ gl:
             selected: Seleccionado
             success: A solicitude de publicación de resultados foi enviada con éxito ao Bulletin Board
             title: Resultados calculados
+          tally_started:
+            invalid: Produciuse un problema ao denunciar o comisario ausente
+            mark_as_missing: Marcar coma ausente
+            mark_as_missing_description: Todos os comisarios teñen que participar neste proceso, mais se un comisario non pode tomar parte pode ser sinalado como ausente.
+            success: O informe sobre o comisario ausente foi enviado con éxito ao Bulletin Board
+            tally_completion: O proceso completarase cando todos os comisarios estean activos ou marcados coma ausentes. Son necesarios polo menos %{quorum} comisarios para completar o proceso.
+            undo_mark_as_missing: Un comisario sinalado como ausente poderá participar antes de se completar o proceso. Poderá proceder como é usual e a marca de ausencia será ignorada.
           vote_ended:
             text: Rematou a votación. Podes comezar o reconto agora.
       admin_log:
@@ -146,9 +146,8 @@ gl:
           upcoming: Vindeiras
         footer:
           remaining_time:
-            one: "Falta <strong>%{count} hora %{minutes} minutos</strong> para votar."
-            other: "Faltan <strong>%{count} horas %{minutes} minutos</strong> para votar."
-            zero: "Faltan <strong>%{minutes} minutos</strong> para votar."
+            one: "<strong>%{count} hora %{minutes} minutos</strong> para votar."
+            other: "<strong>%{count} horas %{minutes} minutos</strong> para votar."
           view: Ver
           vote: Votar
         label:
@@ -173,6 +172,7 @@ gl:
         filters:
           active: Activa
           all: Todas
+          date: Data
           finished: Finalizada
           search: Procurar
           upcoming: Vindeiras
@@ -187,10 +187,6 @@ gl:
           description: 'Estes son os resultados da votación, para cada pregunta:'
           percentage: "%{count}%"
           selected: Seleccionado
-          votes:
-            one: "%{count} voto"
-            other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Troca o teu voto
@@ -235,13 +231,6 @@ gl:
             status:
               pending: Pendente
               processing: Procesando
-          tally_steps:
-            list:
-              task: Tarefa
-            start: Comezar
-            status:
-              pending: Pendente
-              processing: Procesando
         trustees:
           show:
             elections:
@@ -252,6 +241,9 @@ gl:
                 bb_status: Estado
             identification_keys:
               submit: Enviar
+              upload_error:
+                invalid_public_key: As claves de identificación no ficheiro a subir non coinciden coas claves públicas almacenadas.
+              upload_legend: O servidor ten as túas claves públicas, mais o teu navegador aínda non. Precisas importar ao teu computador o ficheiro coas túas claves de identificación dende a copia de seguranza creada despois de xerar as chaves.
       votes:
         ballot_decision:
           audit: "( Auditar papeleta )"
@@ -267,8 +259,6 @@ gl:
           header: Cifrando o voto...
           text: Cifrando a papeleta para asegurar que o teu voto é segredo.
         failed:
-          modal:
-            close: Pechar
           try_again: Tentar de novo
         header:
           ballot_decision: Enviar ou auditar o teu voto
@@ -282,11 +272,14 @@ gl:
         onboarding_modal:
           close: Pechar modal
           create_account: Crear conta
-          description: Queres crear unha conta nova no Decidim? Poderás participar nos procesos e ser unha parte activa da organización.
+          description: Queres crear unha conta nova na plataforma? Poderás participar nos procesos e ser unha parte activa da organización.
           no_account: Non, grazas.
-          title: Novo/a no Decidim?
+          title: Es novo na plataforma?
         update:
           error: Produciuse un problema ao actualizar o estado do voto. Por favor, téntao de novo.
+        verify:
+          form:
+            back: Volver á plataforma
     events:
       elections:
         votes:
@@ -413,8 +406,6 @@ gl:
           census:
             create:
               invalid_csv_header: Faltan as cabeceiras CSV ou non son correctas - por favor, le as instrucións con cuidado
-            creating_data:
-              info_message: "<strong>Agarda</strong>, procesadas %{processed_count} de %{raw_count} filas do ficheiro %{file}."
             delete:
               button: Eliminar todos os datos do censo
             destroy:
@@ -425,8 +416,6 @@ gl:
               confirm: Só podes exportar os códigos de acceso unha vez. Asegúrate de ter acceso á conta de correo <strong>%{email}</strong>.
               launch_error: Produciuse un problema ao iniciar a exportación dos códigos de acceso
               launch_success: Iniciada a exportación dos códigos de acceso. Nun intre recibirás un correo en %{email}
-            exporting_access_codes:
-              info_message: "<strong>Agarda</strong>, a exportación esta a ser preparada, a recibirás nun intre en %{email}"
             freeze:
               callout: O censo está conxelado e non pode ser modificado.
             generate_access_codes:
@@ -437,8 +426,6 @@ gl:
               info_message_warn: Por favor, verifica que non se perderan datos, xa que se teñen creado %{data_count} rexistros e o ficheiro subido %{file} ten %{raw_count} filas.
               launch_error: Produciuse un problema ao iniciar a xeración dos códigos de acceso
               launch_success: Xeración dos códigos iniciada.
-            generating_access_codes:
-              info_message: "<strong>Agarda</strong>, os códigos de acceso para votar están a ser xerados..."
             new:
               file_help:
                 explanation: 'Instrucións para o ficheiro:'
@@ -522,8 +509,8 @@ gl:
         in_person_votes:
           complete_voting:
             available_answers: 'Respostas dispoñibles:'
-            census_verified: O participante aínda non votou.
             complete_voting: Completar votación
+            questions_title: 'Teñen dereito a votar nas seguintes preguntas:'
           in_person_form:
             census_not_present: Este participante non está no censo.
             census_not_present_description: Ten de ir á oficina de reclamacións do censo ou contactar coa asistencia técnica.
@@ -610,6 +597,8 @@ gl:
           description: O rexistro da elección amosarache toda a información importante sobre cada votación. Por exemplo, o estado da cerimonia de chaves, o reconto ou se os resultados xa están publicados. Fai clic na elección da que desexas a información do rexistro.
           election_log: Rexistro da elección
           title: Rexistro da elección
+        filters:
+          date: Data
         login:
           access_code: Código de acceso
           access_code_placeholder: Código de acceso
diff --git a/decidim-elections/config/locales/hu.yml b/decidim-elections/config/locales/hu.yml
index 1c184a59de178..0c9546efb8e31 100644
--- a/decidim-elections/config/locales/hu.yml
+++ b/decidim-elections/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -16,8 +17,12 @@ hu:
         min_selections: Egyik opció sem a fentiek közül
         title: Cím
       voting:
+        banner_image: Banner kép
+        description: Leírás
         end_time: Szavazás vége
+        promoted: Támogatott
         start_time: Szavazás kezdete
+        title: Cím
     errors:
       models:
         answer:
@@ -185,8 +190,7 @@ hu:
           key_ceremony_ended:
             invalid: Hiba történt a szavazási időszak elindításakor
             title: Készen áll a kezdésre
-          tally:
-            continue: Folytatás
+          tally_started:
             invalid: Probléma volt a hiányzó megbízott bejelentésével
             mark_as_missing: Hiányzóként megjelölt
             mark_as_missing_description: Minden megbízottnaik részt kell vennie ebben a folyamatban, de ha egy megbízott nem tud részt venni a folyamatban, akkor jelölheti hiányzónak.
@@ -194,11 +198,8 @@ hu:
             tally_completion: A folyamat akkor fejeződik be, ha az összes megbízott aktív vagy hiányzónak van jelölve. A folyamat befejezéséhez legalább %{quorum} megbízottra van szükség.
             undo_mark_as_missing: A tévedésből hiányzónak megjelölt megbízott az eljárás befejezése előtt részt vehet. A szokásos módon folytathatja a folyamatot, és a hiányzó jelölést figyelmen kívül hagyják.
       elections:
-        results:
-          votes:
-            one: "%{count} szavazat"
-            other: "%{count} szavazat"
-            zero: "%{count} szavazat"
+        filters:
+          date: Dátum
         show:
           action_button:
             change_vote: Szavazatának megváltoztatása
@@ -211,12 +212,21 @@ hu:
             already_voted: Már szavaztál?
             verify_here: Itt ellenőrizheted szavazatod.
             will_verify: A választás megkezdését követően ellenőrizheted szavazatod.
+      trustee_zone:
+        trustees:
+          show:
+            identification_keys:
+              submit_legend: A fent ismertetett lépések végrehajtása után, a nyilvános azonosító kulcs szervernek való elküldésével fejezi be a folyamatot.
+              upload_error:
+                invalid_public_key: A feltöltött fájlban található azonosító kulcsok nem egyeznek a tárolt nyilvános azonosítókulccsal.
+              upload_legend: A szerver rendelkezik az nyilvános azonosító kulcsaiddal, de a böngésződ még mindig nem. Az azonosító kulcsaidat tartalmazó fájlt importálnod kell a számítógépére a generálás után létrehozott biztonsági másolatból.
       votes:
         onboarding_modal:
-          title: Kezdő a Decidim -ben?
+          description: Szeretnél új fiókot létrehozni a platformon? Képes leszel a folyamatokban részt venni, és aktív részese lehetsz a szervezetnek.
+          title: Új a platformon?
         verify:
           form:
-            back: Vissza a Decidim -be
+            back: Vissza a platformra
     events:
       elections:
         election_published:
@@ -235,9 +245,7 @@ hu:
       polling_officer_zone:
         in_person_votes:
           complete_voting:
-            questions_title: 'A következő kérdésekben jogosult szavazni:'
-          in_person_form:
-            census_not_present_description: Be kell mennie a népszámlálási panaszirodába, vagy kapcsolatba kell lépnie az ügyfélszolgálattal.
+            questions_title: 'A következő kérdésekben jogosultak szavazni:'
         polling_officers:
           index:
             polling_officer_role_description: Szavazóhelyiségi Tisztnek jelöltek (Elnökként vagy Ügyvezetőként) azért, hogy ezen platformon megtartott választásokon intézkedj.
@@ -251,5 +259,7 @@ hu:
             info: 'Kérjük, próbálja újra. Amennyiben Ön szerint a rendszerben rögzített adat hibás, itt jelentheti: %{census_contact_information}'
           success:
             access_link: e-mailen keresztül.
+        filters:
+          date: Dátum
         login:
           start_voting: Szavazás kezdete
diff --git a/decidim-elections/config/locales/it.yml b/decidim-elections/config/locales/it.yml
index 11186ba73681e..cfb7abd431a94 100644
--- a/decidim-elections/config/locales/it.yml
+++ b/decidim-elections/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -271,9 +272,6 @@ it:
             selected: Selezionato
             submit: Invia
             title: Risultati pubblicati
-          tally:
-            continue: Continua
-            title: Conteggio
           tally_ended:
             answer: Risposta
             not_selected: Non selezionato
@@ -346,6 +344,9 @@ it:
           upcoming: Imminente
         end_date: Fine
         footer:
+          remaining_time:
+            one: "<strong>%{count} ora %{minutes} minuti</strong> rimanenti per votare."
+            other: "<strong>%{count} ore %{minutes} minuti</strong> rimanenti per votare."
           view: Visualizza
           vote: Vota
         label:
@@ -408,7 +409,6 @@ it:
           all: Tutti
           finished: Completata
           search: Cerca
-          state: Stato
           upcoming: Imminente
         filters_small_view:
           close_modal: Chiudi finestra
@@ -427,7 +427,6 @@ it:
           votes:
             one: "%{count} voto"
             other: "%{count} voti"
-            zero: "%{count} voti"
         show:
           action_button:
             change_vote: Cambia il tuo voto
@@ -517,24 +516,13 @@ it:
             title: Ripristina le chiavi elettorali per %{election}
             upload_election_keys: Carica chiavi elettorali
             upload_icon: Icona che indica un'azione di download
-          tally_steps:
-            back: Indietro
+          tally_started_steps:
             description: I risultati di queste elezioni sono in fase di elaborazione nel Bulletin Board. Per completare questo processo, è necessaria la tua partecipazione come Garante.
             keys:
               end_tally: Conteggio terminato
               tally:
                 cast: Invio del conteggio
                 share: Condivisione del conteggio
-            list:
-              status: Stato
-              task: Attività
-            process_warning: Una volta avviato il processo, non si dovrebbe uscire da questa pagina fino alla fine dello stesso. Ci vorranno diversi minuti, poiché tutti i Garanti dovrebbero essere collegati per completarlo.
-            start: Avvia
-            start_icon: Icona che indica un pulsante avvia per avviare la generazione delle chiavi elettorali
-            status:
-              completed: Completata
-              pending: In attesa
-              processing: Elaborazione in corso
             title: Conteggio di %{election}
           update:
             error: Lo stato delle elezioni non è stato aggiornato.
@@ -567,15 +555,12 @@ it:
               generate_legend_3: Assicurati che sul computer non ci sia una copia del file (controlla anche le cartelle Download e Desktop).
               generate_legend_4: Fai un'altra copia del file su un altro dispositivo esterno e memorizzarlo in un luogo molto sicuro.
               submit: Invia
-              submit_legend: Dopo aver seguito tutti i passaggi sopra illustrati, completare il processo inviando il codice di identificazione pubblica al server Decidim.
               submit_title: Invia la chiave di identificazione pubblica
               title: Codici di identificazione del Garante
               upload: Carica i tuoi codici di identificazione
               upload_error:
                 invalid_format: Il file caricato non contiene alcun codice di identificazione.
                 invalid_key: I codici di identificazione nel file caricato non possono essere caricati.
-                invalid_public_key: I codici di identificazione nel file caricato non corrispondono a quelli pubblici memorizzati da Decidim.
-              upload_legend: Decidim ha i tuoi codici di identificazione pubblici, ma il tuo browser ancora no. È necessario importare il file con i codici di identificazione sul computer dal backup creato dopo averli generati.
             not_supported_browser_description: Sembra che tu stia usando un browser web che non può essere usato in qualitá di Garante. Assicurati di utilizzare la versione più recente del tuo browser, o prova ad utilizzare uno dei browser più popolari che ti permettano di esercitare il ruolo di Garante.
             not_supported_browser_title: Aggiorna il browser per fungere da Garante
             trustee_role_description: Ti è stato assegnato di ruolo di Garante in alcune delle elezioni che si svolgeranno su questa piattaforma.
@@ -616,8 +601,6 @@ it:
         failed:
           header: Votazione fallita
           lead: Il tuo voto non è stato deposto!
-          modal:
-            close: Chiuso
           text: Qualcosa è andato storto. Riprova di nuovo.
           try_again: Riprova
         header:
@@ -643,9 +626,7 @@ it:
         onboarding_modal:
           close: Chiudi finestra
           create_account: Crea Account
-          description: Vuoi creare un nuovo account in Decidim? Potrai partecipare ai processi ed essere parte attiva dell'organizzazione.
           no_account: No, grazie.
-          title: Nuovo su Decidim?
         update:
           error: Si è verificato un errore durante l'aggiornamento del voto. Si prega di votare di nuovo.
         verify:
@@ -656,7 +637,6 @@ it:
             header: Voto non trovato!
             info: Il codice di voto non è stato trovato nella scheda elettorale %{link}, riprova.
           form:
-            back: Torna su Decidim
             submit: Controlla
             vote_identifier: 'Codice identificativo:'
           header:
@@ -1018,8 +998,6 @@ it:
             create:
               invalid: Si è verificato un errore durante il caricamento del censimento, riprova più tardi.
               invalid_csv_header: Le intestazioni CSV sono mancanti o non corrette - si prega di leggere attentamente le istruzioni
-            creating_data:
-              info_message: "<strong>Attendere</strong>, elaborato %{processed_count} di %{raw_count} righe dal file %{file}."
             delete:
               button: Elimina tutti i dati del censimento
             destroy:
@@ -1031,8 +1009,6 @@ it:
               confirm: Puoi esportare i codici di accesso solo una volta. Assicurati di avere accesso all'indirizzo <strong>%{email}</strong>.
               launch_error: Problema nel lanciare l'esportazione dei codici di accesso
               launch_success: Esportazione codici di accesso avviata. A breve riceverai un'email all'indirizzo %{email}
-            exporting_access_codes:
-              info_message: "<strong>Attendere</strong>, l'esportazione è in fase di preparazione, lo riceverai tra breve all'indirizzo %{email}"
             freeze:
               callout: Il censimento è congelato e non può essere modificato.
             generate_access_codes:
@@ -1043,8 +1019,6 @@ it:
               info_message_warn: Si prega di controllare che non manchino dati, poiché %{data_count} record sono stati creati e il file caricato %{file} aveva %{raw_count} righe.
               launch_error: Problema nel lanciare la generazione di codici di accesso
               launch_success: Generazione di codici lanciata.
-            generating_access_codes:
-              info_message: "<strong>Attendere</strong>, vengono generati i codici di accesso alle votazioni..."
             new:
               file_help:
                 explanation: 'Guida per il file:'
@@ -1161,11 +1135,9 @@ it:
         in_person_votes:
           complete_voting:
             available_answers: 'Risposte disponibili:'
-            census_verified: L'utente non ha ancora votato.
             complete_voting: Completa la votazione
             identify_another: Identificare un altro utente
             questions_title: 'Ha diritto di voto nelle seguenti domande:'
-            questions_title_voted: 'Il partecipante ha già votato online e ha diritto a votare nelle seguenti domande:'
             voted: L'utente ha votato
           create:
             error: La votazione non è stata registrata. Per favore riprova.
@@ -1288,7 +1260,6 @@ it:
           all: Tutti
           finished: Finito
           search: Ricerca
-          state: Stato
           upcoming: Prossimi
         filters_small_view:
           close_modal: Chiudi modalità
diff --git a/decidim-elections/config/locales/ja.yml b/decidim-elections/config/locales/ja.yml
index 168a098eb0dd1..b7be48b8b1c85 100644
--- a/decidim-elections/config/locales/ja.yml
+++ b/decidim-elections/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -6,18 +7,44 @@ ja:
         image: 画�
         proposals: 関連�る�案
         title: タイトル
+      ballot_style:
+        code: コード
       election:
         description: 説明
         end_time: 投票�終了���：
         start_time: 投票開始
         title: タイトル
+      monitoring_committee_member:
+        email: Eメールアドレス
+        name: ��
+      polling_officer:
+        email: Eメールアドレス
+        name: ��
+      polling_station:
+        address: �所
+        location: 場所
+        location_hints: �置情報�ヒント
+        polling_station_managers: マ�ージャー
+        polling_station_president_id: 投票管�者
+        title: タイトル
       question:
         max_selections: �択範囲�最大数
         min_selections: 上記��れ�も��
         title: タイトル
+      trustees_participatory_space:
+        user_id: �加者
       voting:
+        banner_image: �ナー画�
+        census_contact_information: センサス�連絡先情報
+        description: 説明
         end_time: 投票終了
+        introductory_image: 導入画�
+        promoted: プロモート
+        scope_id: スコープ
+        show_check_census: '「センサス�確��ページを表示'
         start_time: 投票開始
+        title: タイトル
+        voting_type: 投票タイプ
     errors:
       models:
         answer:
@@ -34,6 +61,10 @@ ja:
               cant_be_changed: 変更����ん
             public_key:
               cant_be_changed: 変更����ん
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} �有効�投票タイプ���り��ん"
   activerecord:
     errors:
       models:
@@ -281,15 +312,6 @@ ja:
             selected: �択済�
             submit: �信
             title: �果を公開����
-          tally:
-            continue: 続�る
-            invalid: �託者�見��ら��報告�る際��題�発生����
-            mark_as_missing: missing ���マーク
-            mark_as_missing_description: �����託者����プロセス��加�る必���り�����託者�プロセス��加����場���missing �マーク�る�������。
-            success: �足�����託者�報告�正��掲示���信�れ���
-            tally_completion: �����託者�アクティブ��� missing �マーク�れ�場��プロセス�完了���。少���も %{quorum} 人��託者�プロセスを完了�る必���り��。
-            title: 集計処�
-            undo_mark_as_missing: �託者��プロセス�完了�る���間���missing�マーク�れ��る�������。 ��場��通常通り�進行�る������missing�マーク�無視�れ��。
           tally_ended:
             answer: 回答
             not_selected: 未�択
@@ -299,6 +321,15 @@ ja:
             submit: �果を公開
             success: �果公開�リクエスト�正常�掲示���信�れ���
             title: 計算�果
+          tally_started:
+            continue: 続�る
+            invalid: �託者�見��ら��報告�る際��題�発生����
+            mark_as_missing: missing ���マーク
+            mark_as_missing_description: �����託者����プロセス��加�る必���り�����託者�プロセス��加����場���missing �マーク�る�������。
+            success: �足�����託者�報告�正��掲示���信�れ���
+            tally_completion: �����託者�アクティブ��� missing �マーク�れ�場��プロセス�完了���。少���も %{quorum} 人��託者�プロセスを完了�る必���り��。
+            title: 集計処�
+            undo_mark_as_missing: �託者��プロセス�完了�る���間���missing�マーク�れ��る�������。 ��場��通常通り�進行�る������missing�マーク�無視�れ��。
           vote:
             errors:
               time_after: �挙���進行中��。投票期間を終了�る���終了時間（%{end_time}）��待�必���り��。
@@ -371,9 +402,7 @@ ja:
         end_date: 終了
         footer:
           remaining_time:
-            one: "投票期間�残り <strong>%{count} 時間 %{minutes} 分</strong> ��。"
             other: "投票期間�残り <strong>%{count} 時間 %{minutes} 分</strong> ��。"
-            zero: "投票期間�残り <strong>%{minutes} 分</strong> ��。"
           view: 表示
           vote: 投票
         label:
@@ -433,9 +462,9 @@ ja:
         filters:
           active: 有効
           all: 全�
+          date: 日付
           finished: 完了
           search: 検索
-          state: ステータス：
           upcoming: 今後�予定
         filters_small_view:
           close_modal: ウィンドウを閉�る
@@ -452,9 +481,7 @@ ja:
           selected: �択済
           title: �挙�果
           votes:
-            one: "%{count} 票"
             other: "%{count} 票"
-            zero: "%{count} 票"
         show:
           action_button:
             change_vote: 投票�変更
@@ -544,7 +571,7 @@ ja:
             title: '%{election} ��挙用キーを復元'
             upload_election_keys: �挙用キーをアップロード
             upload_icon: ダウンロードアクションを示�アイコン
-          tally_steps:
+          tally_started_steps:
             back: 戻る
             description: ���挙��果��掲示�上�計算�れ��。��処�を完了�る����託者����加�る��必���り��。
             keys:
@@ -553,14 +580,14 @@ ja:
                 cast: 集計キャスト
                 share: 集計を共有
             list:
-              status: ステータス：
+              status: ステータス
               task: タスク
-            process_warning: プロセス�開始�れ�後��プロセス�終了�る����ページを終了��������。 �����託者�連��れ完了�れる���数分��る����り��。
+            process_warning: 処��開始�れ�後��処��終了�る����ページを閉��������。 �����託者�接続�完了�る�����ら���る����り��。
             start: 開始
-            start_icon: アイコン���挙キー�生�を開始�る���開始ボタンを示���
+            start_icon: アイコン���挙キー�生�を開始�る���スタートボタンを示���
             status:
               completed: 完了
-              pending: �留中
+              pending: �留
               processing: 処�中
             title: '%{election} ��計'
           update:
@@ -594,15 +621,15 @@ ja:
               generate_legend_3: コンピュータ�ファイル�コピー�����を確�������(例:ダウンロードフォルダ�デスクトップフォルダを確�������)。
               generate_legend_4: 異�る外部デ�イス�ファイル�別�コピーを作����常�安全�場所��存���。
               submit: �信
-              submit_legend: 上記�����手順�従��後�公開識別キーを Decidim サー�ー��信�るプロセスを完了���。
+              submit_legend: 上記�����手順�従���公開識別キーをサー�ー��信�るプロセス�完了��り��。
               submit_title: 公開識別キーを�信
               title: �託者�識別キー
               upload: 識別キーをアップロード
               upload_error:
                 invalid_format: アップロード�れ�ファイル��識別キー���れ����ん。
                 invalid_key: アップロード�れ�ファイル�識別キー�読�込���ん。
-                invalid_public_key: アップロード�れ�ファイル�識別キー��Decidim ��存��公開識別キー�一致���ん。
-              upload_legend: Decidim�����公開識別キーを���������使��ブラウザ�����り��ん。識別キーを生���後�作����ックアップ�ら�識別キー�入��ファイルをコンピュータ�イン�ート�る必���り��。
+                invalid_public_key: アップロード�れ�ファイル�識別キー�公開��一致���ん。
+              upload_legend: サー�ー��公開���り����ブラウザ����公開���り��ん。 公開�を作�後�作����ックアップ�ら�公開�を使用��ファイルをコンピュータ�イン�ート�る必���り��。
             not_supported_browser_description: �託者����活動�使用����Webブラウザを使用���るよ���。最新�ージョン�ブラウザを使用�る�����一般的�ブラウザを使用����託者�タスクを完了��るよ��������。
             not_supported_browser_title: ブラウザをアップグレード���託者���行動�る
             trustee_role_description: �������プラットフォーム�行�れる�挙�������託者を務�る���������。
@@ -644,10 +671,6 @@ ja:
         failed:
           header: 投票�失敗����
           lead: 投票�行�れ��ん����
-          modal:
-            close: 閉�る
-            communication_lost: 投票サー�ー (掲示�) ��通信�切れ��るよ���。<br>インター�ット接続�切れ��る��接続先�サー�ー�混雑���る�能性��り��。<br>���題�続�よ����ら�時間を����度�試�������サ�ート������������。
-            title: �題�発生����
           text: �題�発生����。も�一度やり直������。
           try_again: �実行
         header:
@@ -673,9 +696,9 @@ ja:
         onboarding_modal:
           close: 閉�る
           create_account: アカウント�作�
-          description: Decidim�新��アカウントを作�����？ プロセス��加��組織��極的�一員��る�������。
+          description: プラットフォーム�新��アカウントを作�����？ プロセス��加��組織��極的�一員��る�������。
           no_account: ����構��。
-          title: Decidim�������？
+          title: プラットフォーム�������？
         update:
           error: 投票ステータス�更新中��題�発生����。も�一度投票������。
         verify:
@@ -686,9 +709,10 @@ ja:
             header: 投票�見��り��ん�
             info: 投票コード� %{link} 投票箱�見��り��ん���。も�一度やり直������。
           form:
-            back: Decidim�戻る
+            back: プラットフォーム�戻る
             submit: �ェック
             vote_identifier: '識別コード:'
+            vote_identifier_help: �れ�投票後�与�られ�識別��� (投票ブース�入る���コード���り��ん)。
           header:
             title: 投票を確�
           success:
@@ -1009,6 +1033,7 @@ ja:
             introductory_image: 導入画�
             promoted: プロモート
             select_a_voting_type: 投票方�を�択������
+            show_check_census_help: 公開投票メニュー�「投票�����?�リンクを表示�る����
             slug: スラグ
             slug_help: 'URLスラグ����投票を指�URLを生��る���使用�れ��。 使用��る��アルファベット�数字�ダッシュ����アルファベット�ら始�る必���り��。例: %{url}'
             title: タイトル
@@ -1057,7 +1082,7 @@ ja:
               invalid: センサス�アップロード中�エラー�発生����。後�も�一度�試�����。
               invalid_csv_header: CSVヘッダー�見��ら���正���り��ん。手順をよ��読�����。
             creating_data:
-              info_message: "<strong>��ら��待�下��</strong>, ファイル %{file} � %{raw_count} 行中 %{processed_count} 行目を処������."
+              info_message: "<strong>��ら��待�下��</strong>, ファイル %{file} � %{raw_count} 行中 %{processed_count} 行目を処������ (数分��る場�も�り��)."
             delete:
               button: センサスデータを���削除�る
               confirm: センサスデータを���削除���。元�戻��������ん。続行��もよ������？
@@ -1072,9 +1097,12 @@ ja:
               launch_error: アクセスコード�エクス�ート�起動��題��り��
               launch_success: アクセスコード�エクス�ート�開始�れ���。�も�� %{email} �メール�届���。
             exporting_access_codes:
-              info_message: "<strong>��ら��待�����</strong>, エクス�ート�準備�完了�����, 間も�� %{email} ����れるよ���り��"
+              info_message: "<strong>��ら��待�下��</strong>, エクス�ートを準備���り, 間も�� %{email} ��信�れ�� (数分��る場���り��)"
             freeze:
               callout: センサス������り�変更�る�������ん。
+              help_html: |
+                センサスデータ�アップロード�コード�生���よ�エクス�ート�正常�行�れ���。<br> <strong>�れ��挙を開始�る準備�整����。</strong><br>
+                エクス�ート�れ�個人�コード付�� CSV を使用���独自�方法�センサス�沿���布�る��「投票��る�タブを有効����誰�も自分�センサスデータ���コードを�得��るよ�����。
             generate_access_codes:
               button: 投票アクセスコードを生��る
               callout: アクセスコード�生��進�る�����るよ���り���。 アクセスコードを生��る��センサスを変更�る��������り��。
@@ -1083,8 +1111,9 @@ ja:
               info_message_warn: '%{data_count} レコード�作��れ�����アップロード�れ�ファイル %{file} � %{raw_count} 行������データ�失�れ������を確�������。'
               launch_error: アクセスコード�生�中��題�発生����
               launch_success: コード�生��開始�れ���
+              start_over: �在�センサスを削除��有効�行�ら�る�切�CSVファイル�やり直������。
             generating_access_codes:
-              info_message: "<strong>��ら��待�����</strong>, 投票アクセスコード�生�中��..."
+              info_message: "<strong>��ら��待�����</strong>, 投票アクセスコードを生������ (数分��る����り��)。"
             new:
               file_help:
                 explanation: 'ファイル�ガイダンス:'
@@ -1203,11 +1232,12 @@ ja:
         in_person_votes:
           complete_voting:
             available_answers: '利用�能�回答:'
-            census_verified: �加者���投票�����ん。
+            census_verified: ���加者���対�投票�れ����ん。
+            census_verified_with_online_vote: ���加者����オンライン�投票�����。�加者�直接投票��場��以��投票�無効��り���ら�最終投票��り��。
             complete_voting: 投票を完了
             identify_another: 他��加者を特定�る
             questions_title: '彼女�以下�質��投票�る権利��り��:'
-            questions_title_voted: '�加者����オンライン�投票���り�次�質��投票�る権利��り��:'
+            questions_title_voted: '���加者����オンライン�投票���り�次�質��投票�る権利��り��：'
             voted: �加者�投票����
           create:
             error: 投票�登録�れ��ん���。も�一度やり直������。
@@ -1332,9 +1362,9 @@ ja:
         filters:
           active: 有効
           all: 全�
+          date: 日付
           finished: 完了
           search: 検索
-          state: ステータス：
           upcoming: 今後�予定
         filters_small_view:
           close_modal: 閉�る
diff --git a/decidim-elections/config/locales/ka-GE.yml b/decidim-elections/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-elections/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-elections/config/locales/lb.yml b/decidim-elections/config/locales/lb.yml
index d67b296c70d0f..89c971a0bdb52 100644
--- a/decidim-elections/config/locales/lb.yml
+++ b/decidim-elections/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   decidim:
     elections:
diff --git a/decidim-elections/config/locales/lt.yml b/decidim-elections/config/locales/lt.yml
index 7b8642d888c21..d81cc84557999 100644
--- a/decidim-elections/config/locales/lt.yml
+++ b/decidim-elections/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -16,8 +17,16 @@ lt:
         min_selections: Nei vienas iš pasiūlytų variantų
         title: Pavadinimas
       voting:
+        banner_image: ReklamjuostÄ—s paveikslÄ—lis
+        census_contact_information: Surašytojų kontaktinė informacija
+        description: Aprašymas
         end_time: Balsavimas baigiasi
+        introductory_image: Įvadinis paveikslėlis
+        promoted: Paremta
+        show_check_census: Rodyti "patikrinti surašymą" puslapį
         start_time: Balsavimas prasideda
+        title: Pavadinimas
+        voting_type: Balsavimo tipas
     errors:
       models:
         answer:
@@ -34,6 +43,10 @@ lt:
               cant_be_changed: negali būti pakeista
             public_key:
               cant_be_changed: negali būti pakeista
+        voting:
+          attributes:
+            voting_type:
+              inclusion: "%{value} nÄ—ra tinkamas balsavimo tipas"
   activerecord:
     errors:
       models:
@@ -304,15 +317,6 @@ lt:
             selected: Pasirinkta
             submit: Pateikti
             title: Rezultatai publikuoti
-          tally:
-            continue: Tęsti
-            invalid: Raportuojant trūkstantį patikėtinį iškilo problema
-            mark_as_missing: Pažymėti neesan�iu
-            mark_as_missing_description: Visi patikėtiniai turėtų dalyvauti procese, bet jei patikėtinis to padaryti negali, galite jį pažymėti kaip trūkstantį.
-            success: Trūkstan�io patikėtinio ataskaita išsiųsta į Skelbimų Lentą
-            tally_completion: Šis procesas bus įvykdytas kai visi patikėtiniai bus aktyvūs arba pažymėti kaip trūkstantys. Reikia bent %{quorum} patikėtinių, kad įvykdyti šį procesą.
-            title: Skai�iavimo procesas
-            undo_mark_as_missing: Patikėtinis nety�ia pažymėtas kaip trūkstantis gali dalyvauti prieš pasibaigiant procesui. Jis gali atlikti savo užduotis kaip įprasta.
           tally_ended:
             answer: Atsakymas
             not_selected: Nepasrinkta
@@ -322,6 +326,15 @@ lt:
             submit: Skelbti rezultatus
             success: Balsavimo rezultatų publikavimo užklausa buvo sėkmingai išsiųsta Skelbimų Lentai
             title: Suskai�iuoti rezultatai
+          tally_started:
+            continue: Tęsti
+            invalid: Raportuojant trūkstantį patikėtinį iškilo problema
+            mark_as_missing: Pažymėti neesan�iu
+            mark_as_missing_description: Visi patikėtiniai turėtų dalyvauti procese, bet jei patikėtinis to padaryti negali, galite jį pažymėti kaip trūkstantį.
+            success: Trūkstan�io patikėtinio ataskaita išsiųsta į Skelbimų Lentą
+            tally_completion: Šis procesas bus įvykdytas kai visi patikėtiniai bus aktyvūs arba pažymėti kaip trūkstantys. Reikia bent %{quorum} patikėtinių, kad įvykdyti šį procesą.
+            title: Perskai�iavimo procesas
+            undo_mark_as_missing: Patikėtinis nety�ia pažymėtas kaip trūkstantis gali dalyvauti prieš pasibaigiant procesui. Jis gali atlikti savo užduotis kaip įprasta.
           vote:
             errors:
               time_after: Rinkimai vis dar vyksta. Turite palaukti iki %{end_time}, kad baigti balsavimo periodÄ….
@@ -394,9 +407,10 @@ lt:
         end_date: Baigiasi
         footer:
           remaining_time:
-            one: "Iki balsavimo pabaigos liko <strong>%{count} valandos %{minutes} minutÄ—s </strong>."
-            other: "Iki balsavimo pabaigos liko <strong>%{count} valandos %{minutes} minutÄ—s</strong>."
-            zero: "Iki balsavimo pabaigos liko <strong>%{minutes} minutÄ—s </strong>."
+            one: "Iki balsavimo liko <strong>%{count} valandos %{minutes} minutÄ—s</strong>."
+            few: "Iki balsavimo liko <strong>%{count} valandos %{minutes} minutÄ—s</strong>."
+            many: "Iki balsavimo liko <strong>%{count} valandos %{minutes} minutÄ—s</strong>."
+            other: "Iki balsavimo liko <strong>%{count} valandos %{minutes} minutÄ—s</strong>."
           view: Peržiūrėti
           vote: Balsuoti
         label:
@@ -459,9 +473,9 @@ lt:
         filters:
           active: Aktyvūs
           all: Visi
+          date: Data
           finished: Užbaigta
           search: Ieškoti
-          state: BÅ«sena
           upcoming: ArtÄ—jantys
         filters_small_view:
           close_modal: Uždaryti modalinį langą
@@ -479,8 +493,9 @@ lt:
           title: Rinkimų rezultatai
           votes:
             one: "%{count} balsas"
+            few: "%{count} balsai"
+            many: "%{count} balsai"
             other: "%{count} balsai"
-            zero: "%{count} balsų"
         show:
           action_button:
             change_vote: Pakeisti balsÄ…
@@ -570,7 +585,7 @@ lt:
             title: Atkurti %{election} rinkimų raktus
             upload_election_keys: Įkelti rinkimų raktus
             upload_icon: Ikona indikuojanti parsisiuntimo veiksmÄ…
-          tally_steps:
+          tally_started_steps:
             back: Atgal
             description: Šių rinkimų rezultatai skai�iuojami Skelbimų lentoje. Norint užbaigti šį procesą, būtinas jūsų, kaip Patikėtinio, dalyvavimas.
             keys:
@@ -620,14 +635,14 @@ lt:
               generate_legend_3: Įsitikinkite, kad kompiuteryje nėra rinkmenos kopijos.
               generate_legend_4: Padarykite kitÄ… rinkmenos kopijÄ… ir laikykite jÄ… labai saugioje vietoje.
               submit: Pateikti
-              submit_legend: Atlikę visus aukš�iau aprašytus veiksmus, užbaikite procesą siųsdami viešojo identifikavimo raktą į Decidim serverį.
+              submit_legend: Įgyvendinus visus anks�iau paaiškintus žingsnius, baikite procesą išsiųsdami viešo atpažinimo raktą į serverį.
               submit_title: Įkelti viešo atpažinimo raktą
               title: Patikėtinių atpažinimo raktai
               upload: Įkelkite atpažinimo raktus
               upload_error:
                 invalid_format: Įkelta rinkmena neturi atpažinimo rakto.
                 invalid_key: Atpažinimo raktai negali būti įkelti.
-                invalid_public_key: Atpažinimo raktai įkeltoje rinkmenoje nesutampa su viešu apažinimo raktu Decidim platformoje.
+                invalid_public_key: Atpažinimo raktai įkeltoje rinkmenoje nesutampa su viešu apažinimo raktu.
               upload_legend: Serveris turi atpažinimo raktus, ta�iau naršyklė jų neturi. Turite importuoti atpažinimo raktų rinkimeną į kompiuterį iš atsarginės saugyklos kurią sukūrėte sugeneravę raktus.
             not_supported_browser_description: Regis naudojate patikėtinio rolei netinkamą naršyklę. Įsitikinkite, kad naršyklė atnaujinta arba pabandykite naudoti kitas naršykles.
             not_supported_browser_title: Atnaujinkite naršyklę
@@ -670,10 +685,6 @@ lt:
         failed:
           header: Balsavimas nepavyko
           lead: Jūsų balsas nebuvo įskai�iuotas!
-          modal:
-            close: Uždaryti
-            communication_lost: Deja, bet panašu, kad ryšys su balsavimo serveriu (Skelbimų Lenta) - prarastas. <br>Gali būti, kad taip yra dėl interneto ryšio arba serverio apkrovos. <br>Pabandykite vėliau arba susisiekite su serverių prižiūrėtojais.
-            title: Įvyko klaida
           text: Įvyko klaida. Bandykite dar kartą.
           try_again: Bandykite dar kartÄ…
         header:
@@ -701,7 +712,7 @@ lt:
           create_account: Sukurti paskyrÄ…
           description: Ar norite susikurti naują paskyrą šioje platformoje? Galėsite dalyvauti procesuose ir būti aktyvi(-us) organizacijos narė(-ys).
           no_account: Ne, a�iū.
-          title: Naujas Decidim vartotojas?
+          title: PirmÄ… kartÄ… platformoje?
         update:
           error: Atnaujinant balso būseną iškilo problema. Prašau pabandykite iš naujo.
         verify:
@@ -712,9 +723,10 @@ lt:
             header: Balsas nerastas!
             info: Balso kodas nebuvo rastas %{link} balsadėžėje. Pabandykite iš naujo.
           form:
-            back: Atgal į Decidim
+            back: Atgal į platformą
             submit: Patikrinti
             vote_identifier: 'Atpažinimo kodas:'
+            vote_identifier_help: Å is identifikatorius Jums buvo duotas po balsavimo.
           header:
             title: Patikrinkite savo balsÄ…
           success:
@@ -1035,6 +1047,7 @@ lt:
             introductory_image: Įvadinis paveikslėlis
             promoted: Paremta
             select_a_voting_type: Pasirinkite balsavimo tipÄ…
+            show_check_census_help: Ar rodyti "Ar galiu balsuoti?" nuorodą viešų balsavimų meniu
             slug: Nuorodos dalis
             slug_help: 'Nuorodos priedėliai nukreipia į šią konkretų balsavimą. Priedėliai sudaromi iš raidžių, skai�ių, brukšnių ir turi prasidėti nuo raidės. Pavyzdys: %{url}'
             title: Pavadinimas
@@ -1083,7 +1096,7 @@ lt:
               invalid: Kuriant surašymą kilo problema. Pabandykite dar kartą vėliau.
               invalid_csv_header: Trūksta CSV antraš�ių, arba jos nėra teisingos - prašome atidžiai perskaityti instrukcijas
             creating_data:
-              info_message: "<strong>Prašome palaukti</strong>, aprodota %{processed_count} iš %{raw_count} eilu�ių iš %{file} failo."
+              info_message: "<strong>Prašome palaukti</strong>, aprodota %{processed_count} iš %{raw_count} eilu�ių iš %{file} failo (tai gali užtrukti kelias minutes)."
             delete:
               button: Pašalinti visus surašymo duomenis
               confirm: Pašalinus visus surašymo duomenis, veiksmo nebus galima anuliuoti. Ar tikrai norite tęsti?
@@ -1098,9 +1111,11 @@ lt:
               launch_error: Pradedant prieigos kodų eksportą kilo problema
               launch_success: Prieigos kodų eksportas prasidėjo. Neužilgo gausite el. laišką į %{email}
             exporting_access_codes:
-              info_message: "<strong>Prašome palaukti</strong>, eskportas ruošiamas ir neužilgo jį gausite į %{email}"
+              info_message: "<strong>Prašome palaukti</strong>, eskportas ruošiamas ir neužilgo gausite kodus į %{email}."
             freeze:
               callout: Surašymas užšaldytas ir negali būti pakeistas.
+              help_html: |
+                Surašymo duomenys buvo įkelti - kodai sugeneruoti ir sėkmingai eksportuoti.<br><strong>Esate pasiruošę pradėti rinkimus</strong><br>Naudokite eksportuota CSV su individualiais kodais, kad juos išdalinti surašytiems asmenims arba aktyvuokite "Ar galiu balsuoti" skiltį, kad bet kas galėtų surasti savo kodą.
             generate_access_codes:
               button: Generuoti balsavimo prieigos kodus
               callout: Dabar galite sugeneruoti prieigos kodus. Atsižvelkite į tai, kad sugeneravus prieigos kodus nebegalėsite pakeisti surašymo.
@@ -1109,8 +1124,9 @@ lt:
               info_message_warn: Prašome patikrinti ar netrūksta duomenų, nes %{data_count} įrašai buvo sukurti ir įkeltas failas file %{file} turėjo %{raw_count} eilu�ių.
               launch_error: Pradedant prieigos kodų generavimą kilo problema
               launch_success: Kodų generavimas pradėtas.
+              start_over: Prašome pašalinti turimą surašymą ir pradėkite iš naujo su deramu CSV failu ir teisingomis eilutėmis.
             generating_access_codes:
-              info_message: "<strong>Prašome palaukti</strong>, balsavimo prieigos kodai yra generuojami..."
+              info_message: "<strong>Prašome palaukti</strong>, balsavimo prieigos kodai yra generuojami (tai gali užtrukti kelias minutes)..."
             new:
               file_help:
                 explanation: 'Failo gairÄ—s:'
@@ -1229,17 +1245,18 @@ lt:
         in_person_votes:
           complete_voting:
             available_answers: 'Galimi atsakymai:'
-            census_verified: Dalyvis dar nebalsavo.
+            census_verified: Šis dalyvis iki šiol fiziškai nebalsavo.
+            census_verified_with_online_vote: Šis dalyvis jau balsavo internetu. Jeigu dalyvis nuspręs balsuoti fiziškai, prieš tai pateiktas balsas bus anuliuotas ir šis taps galutiniu balsu.
             complete_voting: Užbaigti balsavimą
             identify_another: Identifikuoti kitą dalyvį
-            questions_title: 'Ji turi teisÄ™ balsuoti Å¡iais klausimais:'
-            questions_title_voted: 'Dalyvis jau balsavo internetu ir turi teisÄ™ balsuoti Å¡iais klausimais:'
+            questions_title: 'Jie turi teisÄ™ balsuoti Å¡iais klausimais:'
+            questions_title_voted: 'Å is dalyvis jau balsavo internetu ir turi galimybÄ— balsuoti Å¡iais klausimais:'
             voted: Dalyvis prabalsavo
           create:
             error: Balsavimas nebuvo užregistruotas. Prašome bandyti dar kartą.
           in_person_form:
             census_not_present: Šis dalyvis nėra įskai�iuotas į surašymą.
-            census_not_present_description: Ji turi kreiptis į surašymo skundų biurą arba susisiekti su pagalbos centru.
+            census_not_present_description: Jie privalo kreiptis į surašymo skundų biurą arba susisiekti su klientų pagalba.
             date_of_birth: Gimimo data
             day: Diena
             day_placeholder: DD
@@ -1361,9 +1378,9 @@ lt:
         filters:
           active: Aktyvūs
           all: Visi
+          date: Data
           finished: Užbaigta
           search: Ieškoti
-          state: BÅ«sena
           upcoming: ArtÄ—jantys
         filters_small_view:
           close_modal: Uždaryti modalinį langą
diff --git a/decidim-elections/config/locales/lv.yml b/decidim-elections/config/locales/lv.yml
index 68f4d7821ec7a..906a97cb5f575 100644
--- a/decidim-elections/config/locales/lv.yml
+++ b/decidim-elections/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
diff --git a/decidim-elections/config/locales/nl.yml b/decidim-elections/config/locales/nl.yml
index 48601c8a33ac5..9f6393d0cf657 100644
--- a/decidim-elections/config/locales/nl.yml
+++ b/decidim-elections/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -233,15 +234,6 @@ nl:
             selected: Geselecteerd
             submit: Indienen
             title: Resultaten gepubliceerd
-          tally:
-            continue: Doorgaan
-            invalid: Er is een fout opgetreden bij het rapporteren van de ontbrekende trustee
-            mark_as_missing: Als ontbrekend markeren
-            mark_as_missing_description: Alle trustees moeten deelnemen aan dit proces, maar als een trustee niet aan het proces kan deelnemen, kan je dit als ontbrekend aanduiden.
-            success: Het rapport met de ontbrekende trustees is met succes verzonden naar het Bulletin Board
-            tally_completion: Het proces zal worden voltooid wanneer alle trustees actief zijn of als ontbrekend zijn aangeduid. Tenminste %{quorum} trustees zijn vereist om het proces te voltooien.
-            title: Tellingsproces
-            undo_mark_as_missing: Zolang het proces niet is voltooid zal een trustee die per ongeluk is gemarkeerd als ontbrekend kunnen deelnemen. Ze kunnen doorgaan zoals gebruikelijk en de aanduiding als 'ontbrekend' wordt genegeerd.
           tally_ended:
             answer: Antwoord
             not_selected: Niet geselecteerd
@@ -250,6 +242,13 @@ nl:
             selected: Geselecteerd
             success: Verzoek om de resultaten te publiceren is met succes verzonden naar het Bulletin Board
             title: Berekende resultaten
+          tally_started:
+            invalid: Er is een fout opgetreden bij het rapporteren van de ontbrekende trustee
+            mark_as_missing: Als ontbrekend markeren
+            mark_as_missing_description: Alle trustees moeten deelnemen aan dit proces, maar als een trustee niet aan het proces kan deelnemen, kan je dit als ontbrekend aanduiden.
+            success: Het rapport met de ontbrekende trustees is met succes verzonden naar het Bulletin Board
+            tally_completion: Het proces zal worden voltooid wanneer alle trustees actief zijn of als ontbrekend zijn aangeduid. Tenminste %{quorum} trustees zijn vereist om het proces te voltooien.
+            undo_mark_as_missing: Zolang het proces niet is voltooid zal een trustee die per ongeluk is gemarkeerd als ontbrekend kunnen deelnemen. Ze kunnen doorgaan zoals gebruikelijk en de aanduiding als 'ontbrekend' wordt genegeerd.
           vote:
             title: Stemperiode
           vote_ended:
@@ -296,12 +295,6 @@ nl:
           update: "%{user_name} heeft de verkiezing %{resource_name} van %{space_name} bijgewerkt"
         trustee:
           create: "%{user_name} heeft de gebruiker %{trustee_user} aangewezen als Trustee"
-      election_m:
-        footer:
-          remaining_time:
-            one: "<strong>%{count} uur %{minutes} minuten</strong> over om te stemmen."
-            other: "<strong>%{count} uur %{minutes} minuten</strong> over om te stemmen."
-            zero: "<strong>%{minutes} minuten</strong> over om te stemmen."
       elections:
         count:
           elections_count:
@@ -352,18 +345,12 @@ nl:
             not_started: Het stemproces is nog niet begonnen.
             started: Het stemproces is begonnen.
           vote_title: Stemproces
-        filters:
-          state: Status
         preview:
           available_answers: 'Beschikbare antwoorden:'
           description: 'Dit zijn de vragen die je tijdens het stemproces tegenkomt:'
         results:
           description: 'Dit zijn de resultaten van de stemronde, voor elke vraag:'
           percentage: "%{count}%"
-          votes:
-            one: "%{count} stem"
-            other: "%{count} stemmen"
-            zero: "%{count} stemmen"
         show:
           action_button:
             change_vote: Wijzig je stem
@@ -447,19 +434,8 @@ nl:
             title: Herstel verkiezingssleutels voor %{election}
             upload_election_keys: Upload verkiezingssleutels
             upload_icon: Icoon dat een downloadactie aangeeft
-          tally_steps:
-            back: Achterzijde
+          tally_started_steps:
             description: De resultaten voor deze verkiezingen worden berekend in de Bulletin Board. Om dit proces te voltooien, is uw deelname als Trustee nodig.
-            list:
-              status: Status
-              task: Taak
-            process_warning: Zodra het proces is gestart, mag je de pagina niet verlaten totdat het proces is afgerond. Het duurt enkele minuten, omdat alle Trustees verbonden moeten zijn om het te voltooien.
-            start: Begin
-            start_icon: Icoon met startknop om verkiezingssleutels aan te maken
-            status:
-              completed: Voltooid
-              pending: In afwachting
-              processing: In verwerking
           update:
             error: De verkiezingsstatus is niet bijgewerkt.
             success: 'De verkiezingsstatus is: %{status}'
@@ -491,15 +467,12 @@ nl:
               generate_legend_3: Zorg ervoor dat uw computer geen kopie van het bestand heeft (kijk bijvoorbeeld naar de downloads en Desktop-mappen).
               generate_legend_4: Maak nog een kopie van het bestand op een ander extern apparaat en sla het op een zeer veilige plaats.
               submit: Verzenden
-              submit_legend: Na het volgen van alle bovenstaande stappen, voltooi het proces door de publieke identificatiesleutel naar de Decidim server te sturen.
               submit_title: Vul de publieke identificatiesleutel in
               title: Trustee identificatiesleutels
               upload: Upload jouw identificatiesleutels
               upload_error:
                 invalid_format: Het geüploade bestand bevat geen identificatiesleutel.
                 invalid_key: De identificatiesleutels in het geüploade bestand kunnen niet worden geladen.
-                invalid_public_key: De identificatiesleutels in het geüploade bestand komen niet overeen met de publieke identificatiesleutel die door Decidim is opgeslagen.
-              upload_legend: Decidim heeft jouw publieke identificatiesleutels, maar je browser heeft deze nog niet. Je moet het bestand met jouw identificatiesleutels importeren naar je computer, vanuit de back-up die je hebt gemaakt na het genereren ervan.
             not_supported_browser_description: Het lijkt erop dat je een webbrowser gebruikt die niet kan gebruikt worden als Trustee. Zorg ervoor dat je de meest recente versie van je browser gebruikt, of probeer een van de populairste browsers te gebruiken om je Trustee taken te voltooien.
             not_supported_browser_title: Upgrade de browser om als Trustee te fungeren
             trustee_role_description: Je bent aangeduid om als Trustee te fungeren in enkele verkiezingen op dit platform.
@@ -538,8 +511,6 @@ nl:
         failed:
           header: Stem mislukt
           lead: Je stem is niet uitgebracht!
-          modal:
-            close: Afsluiten
           text: Er is iets mis gegaan, probeer het alsjeblief nog een keer.
           try_again: Probeer opnieuw
         header:
@@ -563,9 +534,7 @@ nl:
         onboarding_modal:
           close: Sluit venster
           create_account: Account aanmaken
-          description: Wil je en nieuwe account aanmaken in Decidim? Je kunt deelnemen aan de processen en een actief deel van de organisatie zijn.
           no_account: Nee, bedankt.
-          title: Nieuw bij Decidim?
         update:
           error: Er is een probleem opgetreden bij het bijwerken van stemstatus. Probeer het opnieuw.
         verify:
@@ -576,7 +545,6 @@ nl:
             header: Stem niet gevonden!
             info: De stemcode werd niet gevonden in de stembus %{link}, probeer het opnieuw.
           form:
-            back: Terug naar Decidim
             submit: Controleer
             vote_identifier: 'Identificatiecode:'
           header:
@@ -909,8 +877,6 @@ nl:
             create:
               invalid: Er is een fout opgetreden bij het uploaden van de kiezerslijst, probeer het later opnieuw.
               invalid_csv_header: De CSV-headers ontbreken of zijn niet correct - lees de instructies zorgvuldig door
-            creating_data:
-              info_message: "<strong>Gelieve te wachten</strong>, %{processed_count} verwerkt van %{raw_count} rijen uit bestand %{file}."
             delete:
               button: Verwijder alle kiezerslijstgegevens
             destroy:
@@ -922,8 +888,6 @@ nl:
               confirm: Je kunt de toegangscodes slechts één keer exporteren. Controleer of je toegang heeft tot het e-mailadres <strong>%{email}</strong>.
               launch_error: Probleem bij het starten van de toegangscodes export
               launch_success: Exporteer toegangscodes gestart. Je ontvangt binnenkort een e-mail op %{email}
-            exporting_access_codes:
-              info_message: "<strong>Gelieve te wachten</strong>, de export wordt voorbereid, je ontvangt deze binnenkort op %{email}"
             freeze:
               callout: De kiezerslijst is bevroren, en kan niet worden gewijzigd.
             generate_access_codes:
@@ -934,8 +898,6 @@ nl:
               info_message_warn: Controleer of er geen gegevens ontbreken, omdat %{data_count} records zijn gemaakt en het geüploade bestand %{file} %{raw_count} rijen had.
               launch_error: Probleem bij het starten van de toegangscodes export
               launch_success: Codes genereren gestart.
-            generating_access_codes:
-              info_message: "<strong>Even geduld</strong>, de codes voor stemtoegang worden gegenereerd..."
             new:
               file_help:
                 explanation: 'Instructie bij het bestand:'
@@ -1050,17 +1012,15 @@ nl:
         in_person_votes:
           complete_voting:
             available_answers: 'Beschikbare antwoorden:'
-            census_verified: De gebruiker heeft nog niet gestemd.
             complete_voting: Voltooi het stemmen
             identify_another: Identificeer een andere deelnemer
             questions_title: 'Zij/hij heeft het recht om te stemmen op de volgende vragen:'
-            questions_title_voted: 'De gebruiker heeft al online gestemd en heeft het recht om te stemmen op de volgende vragen:'
             voted: De gebruiker heeft gestemd
           create:
             error: De stemming werd niet geregistreerd. Probeer het opnieuw.
           in_person_form:
             census_not_present: Deze gebruiker staat niet op het stemregister.
-            census_not_present_description: Zij/hij moet naar het klachtenbureau gaan of contact opnemen met support.
+            census_not_present_description: Zij moeten zich tot het klachtenbureau voor de verkiezing wenden, of contact opnemen met Support.
             date_of_birth: Geboortedatum
             day: Dag
             day_placeholder: DD
@@ -1168,7 +1128,6 @@ nl:
           all: Alle
           finished: Afgelopen
           search: Zoeken
-          state: Status
           upcoming: Gepland
         filters_small_view:
           close_modal: Sluit venster
diff --git a/decidim-elections/config/locales/no.yml b/decidim-elections/config/locales/no.yml
index b2bc6f5e1eb52..e0dfd40a6f96c 100644
--- a/decidim-elections/config/locales/no.yml
+++ b/decidim-elections/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -271,15 +272,6 @@
             selected: Valgt
             submit: Send inn
             title: Resultater publisert
-          tally:
-            continue: Fortsett
-            invalid: Kunne ikke rapportere manglende tillitsmann
-            mark_as_missing: Marker som manglende
-            mark_as_missing_description: Alle tillitsmenn bør delta i denne prosessen, men dersom en tillitsmann ikke kan delta i prosessen, kan du merke det som manglende.
-            success: Manglende tillitsmannrapport ble sendt til oppslagstavle
-            tally_completion: Prosessen vil bli fullført når alle tillitsmenn er aktive eller merket som manglende. Minst %{quorum} tillitsmenn er nødvendig for å fullføre prosessen.
-            title: Opptellingsprosess
-            undo_mark_as_missing: En tillitsmann merket som feilaktig merkes som manglende vil kunne delta før prosessen fullføres. De kan fortsette som vanlig og merket for "manglende" vil bli ignorert.
           tally_ended:
             answer: Svar
             not_selected: Ikke valgt
@@ -289,6 +281,13 @@
             submit: Publiser resultater
             success: Forespørsel om publisering av resultater ble sendt til oppslagstavlen
             title: Beregnet resultat
+          tally_started:
+            invalid: Kunne ikke rapportere manglende tillitsmann
+            mark_as_missing: Marker som manglende
+            mark_as_missing_description: Alle tillitsmenn bør delta i denne prosessen, men dersom en tillitsmann ikke kan delta i prosessen, kan du merke det som manglende.
+            success: Manglende tillitsmannrapport ble sendt til oppslagstavle
+            tally_completion: Prosessen vil bli fullført når alle tillitsmenn er aktive eller merket som manglende. Minst %{quorum} tillitsmenn er nødvendig for å fullføre prosessen.
+            undo_mark_as_missing: En tillitsmann merket som feilaktig merkes som manglende vil kunne delta før prosessen fullføres. De kan fortsette som vanlig og merket for "manglende" vil bli ignorert.
           vote:
             errors:
               time_after: Valget pågår enda. Du må vente til det er ferdog (%{end_time}) for å avslutte avstemmingen.
@@ -354,9 +353,8 @@
         end_date: Slutter
         footer:
           remaining_time:
-            one: "<strong>%{count} time %{minutes} minutter</strong> gjenstår for å stemme."
-            other: "<strong>%{count} time %{minutes} minutter</strong> gjenstår for å stemme."
-            zero: "<strong>%{minutes} minutter</strong> gjenstår for å stemme."
+            one: "<strong>%{count} time %{minutes} minutter</strong> gjenstår til å stemme."
+            other: "<strong>%{count} timer %{minutes} minutter</strong> gjenstår til å stemme."
           view: Vis
           vote: Stem
         label:
@@ -422,11 +420,6 @@
           upcoming: Kommende
         filters_small_view:
           close_modal: Lukk dialogboks
-        results:
-          votes:
-            one: "%{count} stemmer"
-            other: "%{count} stemmer"
-            zero: "%{count} stemmer"
         show:
           action_button:
             change_vote: Endre stemmen din
@@ -462,23 +455,13 @@
             title: Gjenopprett valgnøkler for %{election}
             upload_election_keys: Last opp valgnøkler
             upload_icon: Ikon som indikerer en nedlastningshandling
-          tally_steps:
-            back: Tilbake
+          tally_started_steps:
             description: Resultatet av valget utregnes i oppslagstavlen. For å fullføre denne prosessen må du delta som en tillitsmann.
             keys:
               end_tally: Opptelling avsluttet
               tally:
                 cast: Opptelling ferdig
                 share: Opptellingsandel
-            list:
-              task: Oppgave
-            process_warning: Når prosessen er startet, bør du ikke gå ut av denne siden før prosessen er ferdig. Det vil ta flere minutter fordi alle tillitsmenn skal kobles til dette for å fullføre.
-            start: Start
-            start_icon: Ikon som indikerer en startknapp for å starte generering av valgnøklene
-            status:
-              completed: Fullført
-              pending: Ventende
-              processing: Behandler
             title: Opptelling for %{election}
           update:
             error: Valgstatusen ble ikke oppdatert.
@@ -511,15 +494,12 @@
               generate_legend_3: Kontroller at datamaskinen ikke har noen kopi av filen (f.eks. sjekk nedlastingsmappen og skrivebordsmapper).
               generate_legend_4: Lag en annen kopi av filen på en annen ekstern enhet og lagre den på et svært trygt sted.
               submit: Send inn
-              submit_legend: Etter å ha fulgt alle trinnene beskrevet ovenfor, fullfør prosessen med å sende den offentlige identifikasjonsnøkkel til Decidim-serveren.
               submit_title: Send inn den offentlige identifikasjonsnøkkelen
               title: Identifikasjonsnøkler for tillitsmenn
               upload: Last opp dine identifikasjonsnøkler
               upload_error:
                 invalid_format: Den opplastede filen inneholder ikke en identifikasjonsnøkkel.
                 invalid_key: Identifikasjonsnøklene i den opplastede filen kan ikke lastes.
-                invalid_public_key: Identifikasjonsnøklene i den opplastede filen samsvarer ikke med den offentlige identifikasjonnøkkelen lagret av Decidim.
-              upload_legend: Decidim har dine offentlige identifikasjonsnøkler, men din nettleser har den fortsatt ikke. Du må importere filen med identifikasjonsnøkler til datamaskinen fra sikkerhetskopien du opprettet etter de ble generert.
       votes:
         confirm:
           answer: Svar
@@ -535,9 +515,6 @@
           feedback: Gi oss en tilbakemelding
           header: Avstemning bekreftet
           text: 'Du kan sjekke at stemmen din har blitt lagt til i stemmeboksen med følgende identifikator: <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
-        failed:
-          modal:
-            close: Lukk
         header:
           confirm: Bekreft stemmen din
           confirmed: Avstemning bekreftet
@@ -574,12 +551,6 @@
         menu:
           votings_submenu:
             monitoring_committee: Kontrollgruppe
-      polling_officer_zone:
-        in_person_votes:
-          complete_voting:
-            questions_title: 'Hun har stemmerett i følgende spørsmål:'
-          in_person_form:
-            census_not_present_description: Hun må gå til folketellingskontoret eller ta kontakt med kundestøtten.
       votings:
         login:
           start_voting: Start avstemning
diff --git a/decidim-elections/config/locales/pl.yml b/decidim-elections/config/locales/pl.yml
index b0a4e1534159b..20c8a73328f24 100644
--- a/decidim-elections/config/locales/pl.yml
+++ b/decidim-elections/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -16,6 +17,7 @@ pl:
         min_selections: Żadna z powyższych opcji
         title: Tytuł
       voting:
+        banner_image: Banner
         end_time: Głosowanie kończy się
         start_time: GÅ‚osowanie rozpoczyna siÄ™
     errors:
@@ -287,15 +289,6 @@ pl:
             selected: Wybrane
             submit: Prześlij
             title: Opublikowano wyniki
-          tally:
-            continue: Dalej
-            invalid: Wystąpił błąd podczas usuwania męża (osoby) zaufania
-            mark_as_missing: Oznacz jako brakujÄ…cy
-            mark_as_missing_description: Wszyscy mężowie zaufania powinni uczestniczyć w tym procesie, ale jeśli nie może wziąć udziału w tym procesie, możesz oznaczyć go jako brakujący.
-            success: Brakująca uwaga męża zaufania została pomyślnie wysłana do Tablicy
-            tally_completion: 'Proces zostanie zakończony, gdy wszyscy mężowie zaufania będą aktywni lub zostaną oznaczeni jako brakujący. Wymagana ilość mężów zaufania: %{quorum}.'
-            title: Proces ustalania wyniku głosowania
-            undo_mark_as_missing: Przed zakończeniem procesu będzie mógł uczestniczyć mąż zaufania oznaczony jako brakujący omyłkowo. Mężowie zaufania mogą postępować jak zwykle, a oznaczenie jako "brakujący" zostanie zignorowane.
           tally_ended:
             answer: Odpowiedź
             not_selected: Nie wybrano
@@ -305,6 +298,13 @@ pl:
             submit: Opublikuj wyniki
             success: Prośba o publikację wyników została pomyślnie przesłana do Tablicy danych wyborczych
             title: Obliczone wyniki
+          tally_started:
+            invalid: Wystąpił błąd podczas usuwania męża (osoby) zaufania
+            mark_as_missing: Oznacz jako brakujÄ…cy
+            mark_as_missing_description: Wszyscy mężowie zaufania powinni uczestniczyć w tym procesie, ale jeśli nie może wziąć udziału w tym procesie, możesz oznaczyć go jako brakujący.
+            success: Brakująca uwaga męża zaufania została pomyślnie wysłana do Tablicy
+            tally_completion: 'Proces zostanie zakończony, gdy wszyscy mężowie zaufania będą aktywni lub zostaną oznaczeni jako brakujący. Wymagana ilość mężów zaufania: %{quorum}.'
+            undo_mark_as_missing: Przed zakończeniem procesu będzie mógł uczestniczyć mąż zaufania oznaczony jako brakujący omyłkowo. Mężowie zaufania mogą postępować jak zwykle, a oznaczenie jako "brakujący" zostanie zignorowane.
           vote:
             errors:
               time_after: Wybory nadal trwają. Musisz poczekać do daty zakończenia (%{end_time}) aby zamknąć głosowanie.
@@ -358,6 +358,11 @@ pl:
           upcoming: NadchodzÄ…ce
         end_date: Data zakończenia
         footer:
+          remaining_time:
+            one: "<strong>%{count} godzina %{minutes} minut</strong> pozostało do głosowania."
+            few: "<strong>%{count} godzin %{minutes} minut</strong> pozostało do głosowania."
+            many: "<strong>%{count} godzin %{minutes} minut</strong> pozostało do głosowania."
+            other: "<strong>%{count} godziny %{minutes} minuty</strong> pozostały do głosowania."
           view: Zobacz
           vote: GÅ‚osuj
         label:
@@ -422,7 +427,6 @@ pl:
           all: Wszystkie
           finished: Zakończone
           search: Szukaj
-          state: Status
           upcoming: NadchodzÄ…ce
         filters_small_view:
           close_modal: Zamknij okno
@@ -440,8 +444,9 @@ pl:
           title: Wyniki wyborów
           votes:
             one: "%{count} głos"
+            few: "%{count} głosów"
+            many: "%{count} głosów"
             other: "%{count} głosy"
-            zero: "%{count} głosów"
         show:
           action_button:
             change_vote: Zmień swój głos
@@ -531,24 +536,13 @@ pl:
             title: Przywróć klucze dla wyborów %{election}
             upload_election_keys: Prześlij klucze wyborcze
             upload_icon: Ikona wskazujÄ…ca akcjÄ™ pobierania
-          tally_steps:
-            back: Wróć
+          tally_started_steps:
             description: Wyniki tego głosowania są generowane na Tablicy danych wyborczych. Aby zakończyć ten proces niezbędne jest twoje uczestnictwo jako męża (osoby) zaufania.
             keys:
               end_tally: Zakończono proces ustalania wyniku głosowania
               tally:
                 cast: Suma oddanych głosów
                 share: Udostępnij ustalony wynik głosowania
-            list:
-              status: Status
-              task: Zadanie
-            process_warning: Po rozpoczęciu procesu, nie powinieneś opuszczać tej strony do czasu jego zakończenia. Zajmie to kilka minut, ponieważ wszyscy mężowie (osoby) zaufania powinni być podłączeni w celu jego ukończenia.
-            start: Rozpocznij
-            start_icon: Ikona wskazujÄ…ca przycisk startu dla tworzenia kluczy wyborczych
-            status:
-              completed: Zakończono
-              pending: OczekujÄ…ce
-              processing: Przetwarzanie
             title: Wynik głosowania dla %{election}
           update:
             error: Status wyborów nie został zaktualizowany.
@@ -581,15 +575,12 @@ pl:
               generate_legend_3: Upewnij się, że Twój komputer nie ma kopii pliku (np. sprawdź foldery Pobrane i Pulpit).
               generate_legend_4: Utwórz kolejną kopię pliku na innym urządzeniu zewnętrznym i przechowuj go w bezpiecznym miejscu.
               submit: Prześlij
-              submit_legend: Po wykonaniu wszystkich opisanych wyżej kroków, zakończ proces wysyłania publicznego klucza identyfikacyjnego na serwer Decidim.
               submit_title: Prześlij publiczny klucz identyfikacyjny
               title: Klucze identyfikacyjne męża (osoby) zaufania
               upload: Prześlij swoje klucze identyfikacyjne
               upload_error:
                 invalid_format: Wgrany plik nie zawiera żadnego klucza identyfikacyjnego.
                 invalid_key: Nie można załadować kluczy identyfikacyjnych z przesłanego pliku.
-                invalid_public_key: Klucze identyfikacyjne z przesłanego pliku nie pasują do publicznego klucza identyfikacyjnego przechowywanego przez Decidim.
-              upload_legend: Decidim posiada twoje publiczne klucze identyfikacyjne, ale Twoja przeglądarka nadal nie ma tych kluczy. Musisz zaimportować plik z kluczami identyfikacyjnymi do komputera z kopii zapasowej, którą utworzyłeś po ich utworzeniu.
             not_supported_browser_description: Wygląda na to, że używasz przeglądarki internetowej, która nie może być użyta do działań męża (osoby) zaufania. Upewnij się, że używasz najnowszej wersji przeglądarki, lub spróbuj użyć dowolnej z najpopularniejszych przeglądarek, aby móc wykonać zadania męża (osoby) zaufania.
             not_supported_browser_title: Aktualizuj przeglądarkę by działać jako mąż (osoba) zaufania
             trustee_role_description: Zostałeś powołany do pełnienia funkcji męża (osoby) zaufania w niektórych głosowaniach na tej platformie.
@@ -630,8 +621,6 @@ pl:
         failed:
           header: Oddanie głosu nie powiodło się
           lead: Twój głos nie został oddany!
-          modal:
-            close: Zamknij
           text: Coś poszło nie tak. Spróbuj ponownie.
           try_again: Spróbuj ponownie
         header:
@@ -657,9 +646,7 @@ pl:
         onboarding_modal:
           close: Zamknij okno
           create_account: Utwórz konto
-          description: Czy chcesz utworzyć nowe konto w Decydim? Będziesz mógł uczestniczyć w procesach i aktywnie działać w organizacji.
           no_account: Nie, dziękuję.
-          title: Nowy w Decydim?
         update:
           error: Wystąpił błąd z aktualizacją stanu Twojego głosu. Zagłosuj ponownie.
         verify:
@@ -670,7 +657,6 @@ pl:
             header: Nie znaleziono głosu!
             info: Kod głosu nie został znaleziony na urnie wyborczej %{link}, spróbuj ponownie.
           form:
-            back: Wróć do Decidim
             submit: Sprawdź
             vote_identifier: 'Kod identyfikacyjny:'
           header:
@@ -1013,8 +999,6 @@ pl:
           census:
             create:
               invalid: Wystąpił błąd przy przesyłaniu listy wyborców. Spróbuj ponownie później.
-            creating_data:
-              info_message: "<strong>Poczekaj</strong>, przetworzono %{processed_count} z %{raw_count} wierszy z pliku %{file}."
             delete:
               button: Usuń wszystkie dane listy wyborców
             destroy:
@@ -1026,8 +1010,6 @@ pl:
               confirm: Możesz wyeksportować kody dostępu tylko raz. Upewnij się, że masz dostęp do konta e-mail <strong>%{email}</strong>.
               launch_error: Wystąpił problem z uruchomieniem eksportu kodów dostępu
               launch_success: Eksport kodów dostępu został uruchomiony. Wkrótce otrzymasz e-mail na adres %{email}
-            exporting_access_codes:
-              info_message: "<strong>Poczekaj</strong>, eksport jest przygotowywany, wkrótce otrzymasz go na adres %{email}"
             freeze:
               callout: Lista wyborców została zamknięta i nie może być już zmieniania.
             generate_access_codes:
@@ -1038,8 +1020,6 @@ pl:
               info_message_warn: Sprawdź, czy nie brakuje żadnych danych, ponieważ utworzono %{data_count} rekordów, a przesłany plik %{file} miał %{raw_count} wierszy.
               launch_error: Wystąpił błąd przy uruchomieniu tworzenia kodów dostępu
               launch_success: Uruchomiono tworzenie kodów.
-            generating_access_codes:
-              info_message: "<strong>Poczekaj</strong>, kody dostępu do głosowania są tworzone..."
             new:
               file_help:
                 explanation: 'Wytyczne dotyczÄ…ce pliku:'
@@ -1154,11 +1134,9 @@ pl:
         in_person_votes:
           complete_voting:
             available_answers: 'Możliwe odpowiedzi:'
-            census_verified: Uczestnik jeszcze nie głosował.
             complete_voting: Zakończ głosowanie
             identify_another: Zidentyfikuj innego uczestnika
             questions_title: 'Ma prawo do głosowania w następujących kwestiach:'
-            questions_title_voted: 'Uczestnik głosował już online i ma prawo głosować w następujących kwestiach:'
             voted: Uczestnik zagłosował
           create:
             error: Głos nie został zarejestrowany. Spróbuj ponownie.
@@ -1283,7 +1261,6 @@ pl:
           all: Wszystko
           finished: Zakończone
           search: Szukaj
-          state: Status
           upcoming: NadchodzÄ…ce
         filters_small_view:
           close_modal: Zamknij okno
diff --git a/decidim-elections/config/locales/pt-BR.yml b/decidim-elections/config/locales/pt-BR.yml
index fce2f818a3f51..c5946063b71c5 100644
--- a/decidim-elections/config/locales/pt-BR.yml
+++ b/decidim-elections/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -270,8 +271,6 @@ pt-BR:
             selected: Selecionado
             submit: Enviar
             title: Resultados publicados
-          tally:
-            title: Processo de apuração
           tally_ended:
             answer: Resposta
             not_selected: Não selecionado
@@ -329,6 +328,9 @@ pt-BR:
           upcoming: Próximos
         end_date: Finaliza
         footer:
+          remaining_time:
+            one: "<strong>%{count} hora %{minutes} minutos</strong> restantes para votar."
+            other: "<strong>%{count} horas %{minutes} minutos</strong> restantes para votar."
           view: Visualizar
           vote: Votar
         label:
@@ -391,7 +393,6 @@ pt-BR:
           all: Todos
           finished: Finalizado
           search: Pesquisa
-          state: Status
           upcoming: Próximos
         filters_small_view:
           close_modal: Fechar modal
@@ -408,9 +409,8 @@ pt-BR:
           selected: Selecionado
           title: Resultados da eleição
           votes:
-            one: "%{count} votos"
+            one: "%{count} voto"
             other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Mude seu voto
@@ -500,24 +500,13 @@ pt-BR:
             title: Restaurar chaves eleitorais para %{election}
             upload_election_keys: Upload das chaves eleitorais
             upload_icon: �cone que indica uma ação de download
-          tally_steps:
-            back: Voltar
+          tally_started_steps:
             description: Os resultados para esta eleição estão sendo calculados no Quadro de Notas. Para completar este processo, é necessário a sua participação como um curador.
             keys:
               end_tally: Apuração encerrada
               tally:
                 cast: Transmissão de apuração
                 share: Compartilhar apuração
-            list:
-              status: Status
-              task: Tarefa
-            process_warning: Depois que o processo for iniciado, você não deverá sair desta página até que o processo termine. Levará vários minutos, pois todos os curadores deverão estar conectados para completá-lo.
-            start: Iniciar
-            start_icon: �cone que indica um botão iniciar para começar a geração de chaves eleitorais
-            status:
-              completed: Concluído
-              pending: Pendente
-              processing: Processando
             title: Apuração para %{election}
           update:
             error: O status da eleição não foi atualizado.
@@ -550,15 +539,12 @@ pt-BR:
               generate_legend_3: Certifique-se de que seu computador não tenha uma cópia do arquivo (por exemplo, verifique as pastas Downloads e Desktop).
               generate_legend_4: Faça outra cópia do arquivo em um dispositivo externo diferente e armazene-o em um lugar muito seguro.
               submit: Enviar
-              submit_legend: Depois de seguir todos os passos explicados acima, complete o processo de envio da chave de identificação pública para o servidor Decidim.
               submit_title: Enviar a chave de identificação pública
               title: Chaves de identificação de curadores
               upload: Envie suas chaves de identificação
               upload_error:
                 invalid_format: O arquivo enviado não contém nenhuma chave de identificação.
                 invalid_key: As chaves de identificação no arquivo enviado não podem ser carregadas.
-                invalid_public_key: As chaves de identificação no arquivo enviado não correspondem à chave de identificação pública armazenada pelo Decidim.
-              upload_legend: O Decidim tem suas chaves públicas de identificação, mas seu navegador ainda não tem. Você precisa importar o arquivo com as suas chaves de identificação para o seu computador a partir do backup que você criou após gerá-las.
             not_supported_browser_description: Parece que você está usando um navegador da web que não pode ser usado para atuar como um curador. Certifique-se de estar usando a versão mais recente do seu navegador, ou tente usar qualquer um dos navegadores mais populares para conseguir completar suas tarefas de confiança.
             not_supported_browser_title: Atualize o navegador para agir como um curador
             trustee_role_description: Você foi designado para agir como um curador em algumas das eleições realizadas nesta plataforma.
@@ -599,8 +585,6 @@ pt-BR:
         failed:
           header: Votação falhou
           lead: Seu voto não foi transmitido!
-          modal:
-            close: Fechado
           text: Algo deu errado, por favor, tente novamente.
           try_again: Tente novamente
         header:
@@ -626,9 +610,7 @@ pt-BR:
         onboarding_modal:
           close: Fechar modal
           create_account: Criar conta
-          description: Você quer criar uma nova conta em Decidim? Você poderá participar dos processos e ser parte ativa da organização.
           no_account: Não, obrigado.
-          title: Nova(o) no Decidim?
         update:
           error: Houve um problema ao atualizar o status do voto. Por favor, vote novamente.
         verify:
@@ -639,7 +621,6 @@ pt-BR:
             header: Voto não encontrado!
             info: O código de voto não foi encontrado na urna %{link}. Tente novamente.
           form:
-            back: Voltar ao Decidim
             submit: Check
             vote_identifier: 'Código de identificador:'
           header:
@@ -982,8 +963,6 @@ pt-BR:
           census:
             create:
               invalid: Ocorreu um erro ao atualizar o censo, por favor tente novamente mais tarde.
-            creating_data:
-              info_message: "<strong>Aguarde</strong>, processado %{processed_count} de %{raw_count} linhas de %{file} arquivo."
             delete:
               button: Excluir todos os dados do censo
             destroy:
@@ -995,8 +974,6 @@ pt-BR:
               confirm: Você só pode exportar os códigos de acesso uma vez. Certifique-se de que você tem acesso à conta de e-mail <strong>%{email}</strong>.
               launch_error: Problema ao lançar a exportação de códigos de acesso
               launch_success: Códigos de acesso lançado. Em breve, você receberá um e-mail em %{email}
-            exporting_access_codes:
-              info_message: "<strong>Por favor, aguarde</strong>, a exportação está sendo preparada, você o receberá em breve para %{email}"
             freeze:
               callout: O censo está congelado e não pode ser modificado.
             generate_access_codes:
@@ -1007,8 +984,6 @@ pt-BR:
               info_message_warn: Por favor, verifique se nenhum dado está faltando, porque %{data_count} registros foram criados e o arquivo enviado %{file} possui %{raw_count} linhas.
               launch_error: Problema ao lançar a geração de códigos de acesso
               launch_success: Geração de códigos iniciada.
-            generating_access_codes:
-              info_message: "<strong>Aguarde</strong>, os códigos de acesso a votação estão sendo gerados..."
             new:
               file_help:
                 explanation: 'Orientação para o arquivo:'
@@ -1123,11 +1098,9 @@ pt-BR:
         in_person_votes:
           complete_voting:
             available_answers: 'Respostas disponíveis:'
-            census_verified: O usuário ainda não votou.
             complete_voting: Votação concluída
             identify_another: Identificar outro usuário
             questions_title: 'Ela tem o direito de votar nas seguintes perguntas:'
-            questions_title_voted: 'O usuário já votou on-line e tem direito a votar nas seguintes perguntas:'
             voted: O usuário votou
           create:
             error: A votação não foi registrada. Por favor, tente novamente.
@@ -1250,7 +1223,6 @@ pt-BR:
           all: Todos
           finished: Finalizado
           search: Pesquisar
-          state: Status
           upcoming: Próximos
         filters_small_view:
           close_modal: Fechar modal
diff --git a/decidim-elections/config/locales/pt.yml b/decidim-elections/config/locales/pt.yml
index 5267e45841f39..76f3a3685568e 100644
--- a/decidim-elections/config/locales/pt.yml
+++ b/decidim-elections/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -271,15 +272,6 @@ pt:
             selected: Seleccionado
             submit: Enviar
             title: Resultados publicados
-          tally:
-            continue: Continuar
-            invalid: Ouve um problema ao denunciar o curador ausente
-            mark_as_missing: Assinalar como ausente
-            mark_as_missing_description: Todos os curadores devem participar neste processo, mas se um curador não pode tomar parte no processo pode ser assinalado como ausente.
-            success: O curador ausente foi denunciado com êxito e enviado para o Quadro Informativo
-            tally_completion: O processo será completo quando todos os curadores estiverem activos ou assinalados como ausentes. São necessários pelo menos %{quorum} curadores para completar o processo.
-            title: Processo de contagem
-            undo_mark_as_missing: Um curador assinalado como ausente poderá participar antes do processo estar completo. Pode proceder como usualmente e o assinalar da ausência será ignorado.
           tally_ended:
             answer: Resposta
             not_selected: Não seleccionado
@@ -289,6 +281,13 @@ pt:
             submit: Publicar resultados
             success: Pedido publicação de resultados enviado com êxito para o Quadro Informativo
             title: Resultados calculados
+          tally_started:
+            invalid: Ouve um problema ao denunciar o curador ausente
+            mark_as_missing: Assinalar como ausente
+            mark_as_missing_description: Todos os curadores devem participar neste processo, mas se um curador não pode tomar parte no processo pode ser assinalado como ausente.
+            success: O curador ausente foi denunciado com êxito e enviado para o Quadro Informativo
+            tally_completion: O processo será completo quando todos os curadores estiverem activos ou assinalados como ausentes. São necessários pelo menos %{quorum} curadores para completar o processo.
+            undo_mark_as_missing: Um curador assinalado como ausente poderá participar antes do processo estar completo. Pode proceder como usualmente e o assinalar da ausência será ignorado.
           vote:
             errors:
               time_after: A eleição ainda está a decorrer. Tem que esperar até à hora de fecho (%{end_time}) para poder fechar o período de votação.
@@ -352,6 +351,9 @@ pt:
           upcoming: Seguinte
         end_date: Termina
         footer:
+          remaining_time:
+            one: "<strong>%{count} hora %{minutos} minutos </strong> restante para votar."
+            other: "<strong>%{count} horas %{minutos} minutos </strong> restantes para votar."
           view: Visualizar
           vote: Votar
         label:
@@ -414,7 +416,6 @@ pt:
           all: Todos
           finished: Terminado
           search: Pesquisar
-          state: Estado
           upcoming: Seguinte
         filters_small_view:
           close_modal: Fechar o modal
@@ -433,7 +434,6 @@ pt:
           votes:
             one: "%{count} voto"
             other: "%{count} votos"
-            zero: "%{count} votos"
         show:
           action_button:
             change_vote: Mudar o seu voto
@@ -523,24 +523,13 @@ pt:
             title: Restaurar as chaves de eleição para %{election}
             upload_election_keys: Enviar chaves de eleição
             upload_icon: �cone que indica uma acção de descarregar
-          tally_steps:
-            back: Retroceder
+          tally_started_steps:
             description: Os resultados desta eleição estão a ser processados no Quadro Informativo. Para completar este processo é necessária a sua participação como curador.
             keys:
               end_tally: A contagem  terminou
               tally:
                 cast: Registar a contagem
                 share: Partilhar a contagem
-            list:
-              status: Estado
-              task: Tarefa
-            process_warning: Uma vez o processo é iniciado, você não deve sair desta página até que o processo termine. Pode demorar vários minutos, visto que os Curadores todos os curadores devem estar ligados para completá-lo.
-            start: Início
-            start_icon: �cone que indica um botão de início para iniciar a geração de chaves eleitorais
-            status:
-              completed: Completo
-              pending: Pendente
-              processing: A processar
             title: Contagem para %{election}
           update:
             error: O estado da eleição não foi actualizado.
@@ -573,15 +562,12 @@ pt:
               generate_legend_3: Verifique se o seu computador não tem uma cópia do ficheiro (por exemplo verifique nas pastas Downloads ou Desktop).
               generate_legend_4: Faça uma cópia du ficheiro num dispositivo externo e guarde-o num local seguro.
               submit: Submeter
-              submit_legend: Depois de seguir todos os passos explicados acima, complete o processo enviando a chave de identificação pública para o servidor Decidim.
               submit_title: Submeter a chave de identificação pública
               title: Chaves de identificação de curador
               upload: Enviar as suas chaves de identificação
               upload_error:
                 invalid_format: O ficheiro enviado não contém nenhuma chave de identificação.
                 invalid_key: As chaves de identificação no ficheiro enviado não puderam ser carregadas.
-                invalid_public_key: As chaves de identificação no ficheiro enviado não correspondem à chave de identificação pública guardada pelo Decidim.
-              upload_legend: O Decidim tem as suas chaves de identificação públicas, mas o seu navegador não tem. Precisa de importar o ficheiro com as suas chaves de identificação para o seu computador a partir da cópia de segurança que criou após as gerar.
             not_supported_browser_description: Parece que está a utilizar um navegador web que não pode ser utilizado para agir como curador. Certifique-se que está a suar a versão mais recente do seu navegador, ou tente usar um dos navegadores mais populares para que seja possível as suas tarefas de Curador.
             not_supported_browser_title: Actualize o seu navegador para poder agir como Curador
             trustee_role_description: Foi designado para agir como Curador em algumas eleições celebradas nesta plataforma.
@@ -622,8 +608,6 @@ pt:
         failed:
           header: Votação falhou
           lead: O seu voto não foi registado!
-          modal:
-            close: Fechar
           text: Algo correu mal, por favor tente de novo.
           try_again: Tente de novo
         header:
@@ -649,9 +633,7 @@ pt:
         onboarding_modal:
           close: Fechar o modal
           create_account: Criar conta
-          description: Deseja criar uma conta nova com Decidim? Será capaz de participar nos processos e de ser um parte activa da organização.
           no_account: Não, obrigado.
-          title: Novo no Decidim?
         update:
           error: Houve um problema ao actualizar o seu voto. Por favor, tente de novo.
         verify:
@@ -662,7 +644,6 @@ pt:
             header: Voto não encontrado!
             info: O código do voto não foi encontrado na urna de voto de %{link}, tente de novo.
           form:
-            back: Retroceder para o Decidim
             submit: Verificar
             vote_identifier: 'Código de identificação:'
           header:
@@ -1024,8 +1005,6 @@ pt:
             create:
               invalid: Ocorreu um erro ao enviar o recenseamento, por favor tente de novo.
               invalid_csv_header: Os cabeçalhos CSV não estão presentes ou estão incorrectos - por favor leia as instruções com cuidado
-            creating_data:
-              info_message: "<strong>Por favor</strong>, processadas %{processed_count} de %{raw_count} do ficheiro %{file}"
             delete:
               button: Eliminar todos os dados do censo
             destroy:
@@ -1037,8 +1016,6 @@ pt:
               confirm: Só pode exportar os códigos de acesso uma vez. Certifique-se que tem acesso à conta de e-mail <strong>%{email}</strong>.
               launch_error: Problemas ao lançar a exportação dos códigos de acesso
               launch_success: Exportação dos códigos de acesso lançada. Em breve irá receber um e-mail em %{email}
-            exporting_access_codes:
-              info_message: "<strong>Por favor aguarde</strong>, a exportação está a ser preparada, irá recebe-la em breve em %{email}"
             freeze:
               callout: O recenseamento está congelado e não pode ser modificado
             generate_access_codes:
@@ -1049,8 +1026,6 @@ pt:
               info_message_warn: Por favor verifique que não há dados em falta, porque %{data_count} registos foram criados e o ficheiro %{file} enviado tinha %{raw_count} linhas.
               launch_error: Problemas ao lançar a geração dos códigos de acesso
               launch_success: Geração de códigos lançada.
-            generating_access_codes:
-              info_message: "<strong>Por favor</strong> aguarde, os código de acesso para a votação estão a ser gerados..."
             new:
               file_help:
                 explanation: 'Orientação para o ficheiro:'
@@ -1165,11 +1140,9 @@ pt:
         in_person_votes:
           complete_voting:
             available_answers: 'Respostas disponíveis:'
-            census_verified: O participante ainda não votou.
             complete_voting: Completar votação
             identify_another: Identificar outro participante
             questions_title: 'Ela tem o direito de votar nas seguintes questões:'
-            questions_title_voted: 'O participante já voto on-line e tem direito a votar nas seguintes questões:'
             voted: O participante já votou
           create:
             error: O voto não foi registado. Por favor tente de novo.
@@ -1292,7 +1265,6 @@ pt:
           all: Todos
           finished: Terminado
           search: Pesquisar
-          state: Estado
           upcoming: Seguinte
         filters_small_view:
           close_modal: Fechar o modal
diff --git a/decidim-elections/config/locales/ro-RO.yml b/decidim-elections/config/locales/ro-RO.yml
index fa89b196ea5f5..55c97a289f7e4 100644
--- a/decidim-elections/config/locales/ro-RO.yml
+++ b/decidim-elections/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -11,6 +12,8 @@ ro:
         end_time: Votarea se încheie la
         start_time: Votarea începe la
         title: Titlu
+      polling_station:
+        title: Titlu
       question:
         max_selections: Numărul maxim de selecții
         min_selections: Niciuna dintre opțiunile de mai sus
@@ -18,6 +21,7 @@ ro:
       voting:
         end_time: Votarea se încheie
         start_time: Votarea începe
+        title: Titlu
     errors:
       models:
         answer:
@@ -255,15 +259,6 @@ ro:
             selected: Selectat
             submit: Trimite
             title: Rezultate publicate
-          tally:
-            continue: Continuă
-            invalid: A apărut o problemă la raportarea împuternicitului care lipsește
-            mark_as_missing: Marcheză drept absent
-            mark_as_missing_description: Toți imputerniciții trebuie să ia parte la proces, dar dacă un împuternicit nu poate participa îl poți marca drept absent.
-            success: Raportul privind împuternicitul absent a fost trimis cu succes către Panoul de afișare
-            tally_completion: Procesul va fi finalizat cânt toți împuternicții sunt activi sau marcați drept absenți. Pentru a finaliza procesul sunt necesari cel puțin %{quorum} împuterniciți.
-            title: Procesul de numărare al voturilor
-            undo_mark_as_missing: Un împuternicit marcat din greșeală drept absent va putea participa înainte de finalizarea procesului. Acesta poate proceda ca de obicei, iar marcarea drept absent va fi ingnorată.
           tally_ended:
             answer: Răspuns
             not_selected: Neselectate
@@ -273,6 +268,13 @@ ro:
             submit: Publică rezultatele
             success: Cererea de publicare a rezultatelor a fost trimisă cu succes către Panoul de afișare
             title: Calculează rezultatele
+          tally_started:
+            invalid: A apărut o problemă la raportarea împuternicitului care lipsește
+            mark_as_missing: Marcheză drept absent
+            mark_as_missing_description: Toți imputerniciții trebuie să ia parte la proces, dar dacă un împuternicit nu poate participa îl poți marca drept absent.
+            success: Raportul privind împuternicitul absent a fost trimis cu succes către Panoul de afișare
+            tally_completion: Procesul va fi finalizat cânt toți împuternicții sunt activi sau marcați drept absenți. Pentru a finaliza procesul sunt necesari cel puțin %{quorum} împuterniciți.
+            undo_mark_as_missing: Un împuternicit marcat din greșeală drept absent va putea participa înainte de finalizarea procesului. Acesta poate proceda ca de obicei, iar marcarea drept absent va fi ingnorată.
           vote:
             errors:
               time_after: Alegerile sunt încă în desfășurare. Trebuie să aștepți până se încheie (%{end_time}) pentru încheia perioada de votare.
@@ -338,9 +340,9 @@ ro:
         end_date: Se termină
         footer:
           remaining_time:
-            one: "<strong>%{count} oră %{minutes} minute</strong> rămasă pentru a vota."
+            one: "<strong>%{count} oră %{minutes} minute</strong> rămase de votat."
+            few: "<strong>%{count} ore %{minutes} minute</strong> rămase de votat."
             other: "<strong>%{count} ore %{minutes} minute</strong> rămase pentru a vota."
-            zero: "<strong>%{minutes} minute</strong> rămase pentru a vota."
           view: Vizualizare
           vote: Votează
         label:
@@ -413,10 +415,6 @@ ro:
           description: 'Acestea sunt rezultatele votului, pentru fiecare întrebare:'
           selected: Selectate
           title: Rezultatele alegerilor
-          votes:
-            one: "%{count} vot"
-            other: "%{count} de voturi"
-            zero: "%{count} de voturi"
         show:
           action_button:
             change_vote: Schimbă-ți votul
@@ -470,8 +468,7 @@ ro:
             title: Copie de rezervă chei pentru %{election}
           key_ceremony_steps:
             title: Crează chei electorale pentru %{election}
-          tally_steps:
-            back: ÃŽnapoi
+          tally_started_steps:
             description: Rezultatele acestor alegeri sunt în proces de calculare în Panoul de afișare. Pentru a finaliza procesul este necesară participarea ta drept împuternicit.
             keys:
               end_tally: Procesul de numărare al voturilor s-a încheiat
@@ -510,15 +507,12 @@ ro:
               generate_legend_3: Asigură-te că nu există o copie a fișierului în calculatorul tău (de exemplu, verifică dosarele Descărcări și Desktop).
               generate_legend_4: Faceți o altă copie a fișierului pe un alt dispozitiv extern și păstrați-l într-un loc foarte sigur.
               submit: Trimiteți
-              submit_legend: După urmărirea tuturor paşilor explicaţi mai sus, finalizaţi procesul de trimitere a cheii publice de identificare la serverul Decidim.
               submit_title: Trimite cheia publică de identificare
               title: Chei de identificare împuternicit
               upload: Încărcați-vă cheile de identificare
               upload_error:
                 invalid_format: Fişierul încărcat nu conţine nici o cheie de identificare.
                 invalid_key: Tastele de identificare din fișierul încărcat nu pot fi încărcate.
-                invalid_public_key: Tastele de identificare din fişierul încărcat nu se potrivesc cu cheia de identificare publică stocată de Decidim.
-              upload_legend: Decidim are cheile tale de identificare publică, dar browserul tău încă nu le are. Trebuie să importați fișierul cu cheile de identificare în calculator din copia de siguranță creată după ce ați generat.
             not_supported_browser_description: Se pare că folosești un browser web care nu poate fi folosit pentru a acționa ca împuternicit. Asigură-te că folosești cea mai recentă versiune de browser, sau încercați să utilizați oricare dintre cele mai populare browsere pentru a putea finaliza sarcinile dvs. drept împuternicit.
             not_supported_browser_title: Actualizează browser-ul pentru a acționa ca împuternicit
             trustee_role_description: Ai fost desemnat drept împuternicit în unele dintre alegerile celebrate în această platformă.
@@ -549,8 +543,6 @@ ro:
           verify_link: Pentru a verifica, copiați identificatorul și lipiți-l pe pagina <a href="%{link}">pentru verificarea votului</a>
         failed:
           header: Vot eșuat
-          modal:
-            close: Inchide
         header:
           confirm: Confirmă votul tău
           confirmed: Votare confirmată
@@ -568,9 +560,7 @@ ro:
         onboarding_modal:
           close: ÃŽnchidere
           create_account: Creează cont
-          description: Vrei să creezi un cont nou în Decidim? Veţi putea participa la procese şi să fiţi o parte activă a organizaţiei.
           no_account: Nu, mulțumesc.
-          title: Nou în Decidem?
         voting_step:
           back: ÃŽnapoi
           continue: Următoarea
@@ -602,6 +592,9 @@ ro:
           index:
             actions:
               confirm_destroy: Sigur dorești asta?
+              destroy: Șterge
+              edit: Editare
+              title: Acțiuni
             associated_census_data: Intrări asociate recensământului
             explanation_callout: Un stil de votare specifică ce fel de întrebări va primi un alegător în cabina de vot. Poți alege ce întrebări aparțin votării din componeta alegeri. Codul stilului de vot este folosit pentru a potrivi un alegător de la recensământ cu buletinul de vot pe care îl vor primi în cabina de vot. Nu crea niciun stil de votare dacă vrei să prezinți mereu toate întrebările.
           new:
@@ -629,7 +622,16 @@ ro:
             monitoring_committee: Comitetul de monitorizare
             monitoring_committee_members: Membri
             monitoring_committee_verify_elections: Verifică alegerile
+        models:
+          polling_station:
+            fields:
+              title: Titlu
+          voting:
+            fields:
+              title: Titlu
         monitoring_committee_election_results:
+          actions:
+            title: Acțiuni
           results:
             bulletin_board: Panoul de afișare
           update:
@@ -643,6 +645,7 @@ ro:
         monitoring_committee_polling_station_closures:
           actions:
             title: Acțiuni
+            validate: Validează
         monitoring_committee_verify_elections:
           index:
             how_to_run_verifier: 'Odată ce ai descărcat fișierul și te-ai asigurat că este în regulă, poți continua pornind verificatorul universal. Clonează <a href=''https://github.com/decidim/decidim-bulletin-board''>acestă arhivă</a> și, din dosarul rădăcină, rulează comanda următoare:'
@@ -660,10 +663,13 @@ ro:
         votings:
           actions:
             confirm_destroy: Sigur dorești asta?
+            publish: Publică
+            unpublish: Anulează publicarea
           edit:
             add_election_component: Nu ai alegeri configurate pentru acest vot. Te rugăm să o adaugi în secțiunea Componente
           form:
             slug_help: 'URL slugs sunt utilizate pentru a genera URL-urile care indică acest proces de votare. Acestea acceptă doar litere, numere și cratime și trebuie să înceapă cu o literă. Exemplu: %{url}'
+            title: Titlu
           new:
             create: Creează
       census:
@@ -691,6 +697,7 @@ ro:
       monitoring_committee_members:
         actions:
           confirm_destroy: Sigur dorești asta?
+          title: Acțiuni
       polling_officer_zone:
         closures:
           new:
@@ -699,7 +706,6 @@ ro:
         in_person_votes:
           complete_voting:
             questions_title: 'Are drept de vot pentru umătoarele întrebări:'
-            questions_title_voted: 'Participantul a votat deja online și are drept de vot pentru următoarele întrebări:'
           in_person_form:
             census_not_present_description: Trebuie mers la biroul de reclamații pentru recensământ sau să contacteze echipa de suport.
           update:
@@ -717,13 +723,16 @@ ro:
       polling_officers:
         actions:
           confirm_destroy: Sigur dorești asta?
+          title: Acțiuni
       polling_stations:
         actions:
           confirm_destroy: Sigur dorești asta?
+          title: Acțiuni
       votings:
         check_census:
           check_status: Verifică starea
           form_title: 'Completează următorul formular pentru a verifica datele recensământului:'
+          title: Pot vota?
         check_fields:
           date_of_birth: Data naÅŸterii
           day: Zi
diff --git a/decidim-elections/config/locales/sl.yml b/decidim-elections/config/locales/sl.yml
index 43488193e446d..509563ac1ab0e 100644
--- a/decidim-elections/config/locales/sl.yml
+++ b/decidim-elections/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-elections/config/locales/sv.yml b/decidim-elections/config/locales/sv.yml
index 344c218c20be0..5a4b576a41842 100644
--- a/decidim-elections/config/locales/sv.yml
+++ b/decidim-elections/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -6,17 +7,34 @@ sv:
         image: Bild
         proposals: Relaterade förslag
         title: Titel
+      ballot_style:
+        code: Kod
       election:
         description: Beskrivning
         end_time: Omröstningen slutar vid
         start_time: Röstningsstart vid
         title: Titel
+      monitoring_committee_member:
+        email: E-post
+        name: Namn
+      polling_officer:
+        email: E-post
+        name: Namn
+      polling_station:
+        address: Adress
+        location: Plats
+        location_hints: Detaljer om platsen
+        polling_station_managers: Koordinatorer
+        title: Titel
       question:
         max_selections: Maximalt antal val
         title: Titel
       voting:
+        banner_image: Bannerbild
         end_time: Omröstningen avslutas
+        promoted: Annonserad
         start_time: Omröstningen börjar
+        title: Titel
     errors:
       models:
         answer:
@@ -101,6 +119,7 @@ sv:
         confirm_destroy: Är du säker?
         destroy: Förstör
         edit: Redigera
+        feedback: Väljarfeedback
         import: Importera förslag till svar
         manage_answers: Hantera svar
         manage_questions: Hantera frågor
@@ -197,7 +216,11 @@ sv:
             success: Frågan har uppdaterats
         steps:
           create_election:
+            census: Census
             not_used_trustee: "(används inte)"
+            submit: Sätta upp omröstning
+            title: Sätta upp omröstning
+            trustees: Omröstningsförvaltare
           created:
             title: Omröstningen skapades
             trustees: Förvaltare
@@ -214,9 +237,7 @@ sv:
             result: Resultat
             selected: Valda
             submit: Skicka in
-          tally:
-            continue: Fortsätt
-            mark_as_missing: Markera som saknad
+            title: Publicerade resultat
           tally_ended:
             answer: Svar
             not_selected: Inte vald
@@ -224,8 +245,15 @@ sv:
             result: Resultat
             selected: Valda
             submit: Publicera resultat
+          tally_started:
+            continue: Fortsätt
+            mark_as_missing: Markera som saknad
+            title: Rösträkning
           vote:
+            submit: Avsluta röstningsperiod
             title: Röstningsperiod
+          vote_ended:
+            title: Röstningsperiod avslutad
           vote_stats:
             no_vote_statistics_yet: Ingen röstningsstatistik ännu
             title: Röstningsstatistik
@@ -240,7 +268,12 @@ sv:
           index:
             title: Förvaltare
           new:
+            create: Skapa förvaltare
             title: Ny förvaltare
+      connection:
+        failed:
+          modal:
+            close: Stäng
       election_m:
         badge_name:
           finished: Avslutad
@@ -265,6 +298,7 @@ sv:
           creation_title: Omröstningen skapades
           download: Ladda ner
           key_ceremony_title: Nyckelceremoni
+          not_available: Ännu inte publicerade
           not_created: Inte skapat
           not_published: Ej publicerat
           not_ready: Inte klart
@@ -272,14 +306,15 @@ sv:
           published: Publicerat
           results_title: Resultat
           started: Startad
+          tally_title: Rösträkning
           title: Omröstningslogg
           vote_title: Omröstningsprocess
         filters:
           active: Aktiv
           all: Allt
+          date: Datum
           finished: Avslutad
           search: Sök
-          state: Status
           upcoming: Kommande
         filters_small_view:
           close_modal: Stäng fönster
@@ -291,9 +326,8 @@ sv:
           selected: Valda
           title: Omröstningsresultat
           votes:
-            one: "%{count} röster"
+            one: "%{count} röst"
             other: "%{count} röster"
-            zero: "%{count} röster"
         show:
           action_button:
             change_vote: Ändra din röst
@@ -351,16 +385,16 @@ sv:
               completed: Slutförd
               pending: Avvaktande
               processing: Bearbetar
-          tally_steps:
+          tally_started_steps:
             back: Tillbaka
             list:
               status: Status
               task: Uppgift
             start: Start
             status:
-              completed: Slutförd
-              pending: Avvaktande
-              processing: Bearbetar
+              pending: Väntande
+        menu:
+          trustee_zone: Förvaltarzon
         trustees:
           show:
             elections:
@@ -397,8 +431,6 @@ sv:
           text: 'Du kan kontrollera att din röst har lagts till i röstsedeln med följande identifierare: <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
         failed:
           header: Röst ej framgångsrik
-          modal:
-            close: Stäng
           try_again: Försök igen
         header:
           ballot_decision: Lägg eller granska din röst
@@ -426,10 +458,11 @@ sv:
           error:
             header: Hittade inga omröstningar!
           form:
-            back: Tillbaka till Decidim
             submit: Kontrollera
           header:
             title: Verifiera din röst
+          success:
+            header: Röst identifierad!
         voting_step:
           back: Tillbaka
           continue: Nästa
@@ -443,6 +476,12 @@ sv:
           email_outro: Du har fått det här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta ta emot meddelanden via föregående länk.
           email_subject: Valet %{resource_title} är nu aktivt för %{participatory_space_title}.
           notification_title: Valet <a href="%{resource_path}">%{resource_title}</a> är nu aktivt för %{participatory_space_title}.
+    help:
+      participatory_spaces:
+        votings:
+          contextual: "<p>En <strong>omröstning</strong> är ett utrymme där du kan ställa en tydlig fråga till alla personer som bildar en organisation, där du kan be att få medverka i omröstningen, samt sätta igång och hantera debatten för eller emot ett svar. När omröstningsdatumet anländer kan du rösta och publicera resultatet.</p> <p>Exempel: Omröstningar kan handla om nästan allting som påverkar en organisation: till exempel att ändra organisationens namn eller logotyp med flera alternativa förslag, rösta ja eller nej om att bli en del av en större organisation, anta eller avvisa en ny strategisk plan eller resultatet från en arbetsgrupp, eller besluta om förtroendevalda ska kunna sitta högst en, två eller tre mandatperioder.</p>\n"
+          page: "<p>En <strong>omröstning</strong> är ett utrymme där du kan ställa en tydlig fråga till alla personer som bildar en organisation, där du kan be att få medverka i omröstningen, samt sätta igång och hantera debatten för eller emot ett svar. När omröstningsdatumet anländer kan du rösta och publicera resultatet.</p> <p>Exempel: Omröstningar kan handla om nästan allting som påverkar en organisation: till exempel att ändra organisationens namn eller logotyp med flera alternativa förslag, rösta ja eller nej om att bli en del av en större organisation, anta eller avvisa en ny strategisk plan eller resultatet från en arbetsgrupp, eller besluta om förtroendevalda ska kunna sitta högst en, två eller tre mandatperioder.</p>\n"
+          title: Vad är omröstningar?
     menu:
       votings: Omröstningar
     statistics:
@@ -452,6 +491,7 @@ sv:
       admin:
         ballot_styles:
           edit:
+            title: Redigera valtyp
             update: Uppdatera
           form:
             election: Omröstning
@@ -462,12 +502,17 @@ sv:
               edit: Redigera
               new: Ny
               title: Åtgärder
+            title: Valtyper
           new:
             create: Skapa
         content_blocks:
           landing_page:
+            header:
+              name: Omröstningsbanner
             metrics:
               name: Omröstningsmetrik
+            stats:
+              name: Omröstningsstatistik
             timeline:
               name: Omröstningstidslinje
         index:
@@ -483,6 +528,7 @@ sv:
             attachment_collections: Mappar
             attachment_files: Filer
             attachments: Bilagor
+            ballot_styles: Valtyper
             census: Census
             components: Komponenter
             info: Information
@@ -523,9 +569,11 @@ sv:
             title: Åtgärder
             view: Visa
           results:
+            bulletin_board: Anslagstavla
             result_types:
               blank_answers: Tomma svar
               blank_ballots: Tomma röstsedlar
+              null_ballots: Ogiltiga röstsedlar
               total_ballots: Totalt antal röstsedlar
               valid_ballots: Giltiga röstsedlar
             selected: Valda
@@ -552,6 +600,7 @@ sv:
         monitoring_committee_verify_elections:
           index:
             download: Ladda ner
+            not_available: Ännu inte tillgängliga
             title: Omröstningar
         polling_officers:
           form:
@@ -581,6 +630,7 @@ sv:
           edit:
             update: Uppdatera
           form:
+            banner_image: Bannerbild
             promoted: Annonserad
             slug: Slug
             title: Titel
@@ -592,6 +642,10 @@ sv:
             create: Skapa
             title: Ny omröstning
       census:
+        admin:
+          census:
+            new:
+              title: Skapa census
         document_types:
           dni: ID-kort
           nie: Personnummer
@@ -601,6 +655,8 @@ sv:
             download: Ladda ner
       content_blocks:
         landing_page:
+          description:
+            title: Om den här omröstningen
           metrics:
             heading: Metrik
           polling_stations:
@@ -626,13 +682,16 @@ sv:
             modal_ballots_results_count_error:
               close_modal: Stäng
             save_recount: Spara omräkning
+            total_ballots: Totalt antal röstsedlar
           new:
             election: 'Omröstning:'
             heading: Omräkning
             modal_ballots_count_error:
               close_modal: Stäng
+              total_ballots: 'Totalt antal röstsedlar:'
               total_people: 'Totala människor:'
             polling_station: 'Vallokal:'
+            total_ballots_count: Antal röstsedlar
           show:
             heading: Omräkning
           sign:
@@ -648,6 +707,7 @@ sv:
             document_number_placeholder: ID-nummer
             month: MÃ¥nad
             month_placeholder: MM
+            validate_document: Validera dokument
             year: Ã…r
             year_placeholder: Ã…Ã…Ã…Ã…
           verify_document:
@@ -659,8 +719,10 @@ sv:
               address: Adress
               count_votes: Räkna röster
               election: Omröstning
+              identify_person: Identifiera en person
               name: Namn
               role: Din roll
+              show_closure: Visa avslutning
               title: Vallokaler
               voting: Omröstning
       polling_officers:
@@ -688,6 +750,8 @@ sv:
           title: Få behörighetskod
         check_census:
           check_status: Kontrollera status
+          success:
+            access_link_with_sms: via SMS eller e-post.
           title: Kan jag rösta?
         check_fields:
           date_of_birth: Födelsedatum
@@ -711,9 +775,9 @@ sv:
         filters:
           active: Aktiva
           all: Alla
+          date: Datum
           finished: Avslutade
           search: Sök
-          state: Status
           upcoming: Kommande
         filters_small_view:
           close_modal: Stäng fönster
diff --git a/decidim-elections/config/locales/tr-TR.yml b/decidim-elections/config/locales/tr-TR.yml
index 449a3388f26e1..82f08b87e5864 100644
--- a/decidim-elections/config/locales/tr-TR.yml
+++ b/decidim-elections/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -200,7 +201,6 @@ tr:
           all: Tümü
           finished: Bitti
           search: Arama
-          state: Statü
           upcoming: Yakında
         filters_small_view:
           close_modal: Pencereyi kapat
@@ -212,6 +212,9 @@ tr:
         results:
           selected: Seçili
           title: Seçim sonuçları
+          votes:
+            one: "%{count} oy"
+            other: "%{count} oy"
         show:
           back: Mevcut seçimler
           preview: Önizleme
@@ -251,11 +254,6 @@ tr:
         older: Daha eski
         recent: En son
       trustee_zone:
-        elections:
-          tally_steps:
-            back: Geri
-            list:
-              status: Statü
         menu:
           trustee_zone: Vekil bölgesi
         trustees:
@@ -276,15 +274,12 @@ tr:
               generate_legend_3: Bilgisayarınızda dosyanın bir kopyası olmadığından emin olun (ör. İndirilenler ve Masaüstü klasörlerini kontrol edin).
               generate_legend_4: Dosyanın başka bir kopyasını farklı bir harici cihazda oluşturun ve çok güvenli bir yerde saklayın.
               submit: Gönder
-              submit_legend: Yukarıda açıklanan tüm adımları izledikten sonra, açık kimlik anahtarını Decidim sunucusuna gönderme işlemini tamamlayın.
               submit_title: Genel kimlik anahtarını gönderin
               title: Vekil kimlik anahtarları
               upload: Kimlik anahtarlarınızı yükleyin
               upload_error:
                 invalid_format: Yüklenen dosya herhangi bir kimlik anahtarı içermiyor.
                 invalid_key: Yüklenen dosyadaki kimlik anahtarları yüklenemez.
-                invalid_public_key: Yüklenen dosyadaki tanımlama anahtarları, Decidim tarafından saklanan genel tanımlama anahtarıyla eşleşmiyor.
-              upload_legend: Decidim'de sizin genel kimlik anahtarlarınız var, ancak tarayıcınızda hala bu anahtarlar yok. Kimlik anahtarlarınızın olduğu dosyayı, oluşturduktan sonra oluşturduğunuz yedekten bilgisayarınıza aktarmanız gerekir.
             not_supported_browser_description: Vekil olarak hareket etmek için kullanılamayan bir web tarayıcısı kullanıyorsunuz gibi görünüyor. Vekil görevlerinizi tamamlayabilmek için tarayıcınızın en son sürümünü kullandığınızdan emin olun veya en popüler tarayıcılardan herhangi birini kullanmayı deneyin.
             not_supported_browser_title: Vekil kişi olarak hareket etmek için tarayıcıyı yükseltin
             trustee_role_description: Bu platformda kutlanan bazı seçimlerde Vekil olarak görev yapmakla görevlendirildiniz.
@@ -306,9 +301,6 @@ tr:
           feedback: Bize geri bildirim verin
           header: Oy onaylandı
           text: 'Aşağıdaki tanımlayıcıyla oyunuzun başarıyla oy sandığına eklenip eklenmediğini kontrol edebilirsiniz: <strong class = "evote__poll-id">%{e_vote_poll_id} </strong>'
-        failed:
-          modal:
-            close: Kapat
         header:
           confirm: Oyunu onayla
           confirmed: Oy onaylandı
@@ -348,10 +340,6 @@ tr:
             email_outro: Bu bildirimi, %{resource_name} için vekil kişi olarak eklendiğiniz için aldınız.
             email_subject: '%{resource_name} için vekil birisiniz.'
             notification_title: <a href="%{participatory_space_url}">%{resource_name} </a> için vekil birisiniz.
-    votings:
-      votings:
-        filters:
-          state: Statü
   layouts:
     decidim:
       election_votes_header:
diff --git a/decidim-elections/config/locales/zh-CN.yml b/decidim-elections/config/locales/zh-CN.yml
index 974c78e474125..16f6b5b47edab 100644
--- a/decidim-elections/config/locales/zh-CN.yml
+++ b/decidim-elections/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -184,10 +185,6 @@ zh-CN:
         label: 排�选举方�
         older: 更旧的
         recent: 最近的
-      trustee_zone:
-        elections:
-          tally_steps:
-            back: �退
       votes:
         confirm:
           answer: 答案
@@ -204,9 +201,6 @@ zh-CN:
           feedback: 给我们一些�馈
           header: 已确认投票
           text: '您�以检查您的投票是�已�功地添加到选票箱，其标识符如下： <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
-        failed:
-          modal:
-            close: 关闭
         header:
           confirm: 确认您的投票
           confirmed: 已确认投票
diff --git a/decidim-elections/db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb b/decidim-elections/db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb
new file mode 100644
index 0000000000000..fe17a8b34f8ee
--- /dev/null
+++ b/decidim-elections/db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RenameBbStatusTallyToTallyStarted < ActiveRecord::Migration[6.1]
+  class Election < ApplicationRecord
+    self.table_name = :decidim_elections_elections
+  end
+
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Election.where(bb_status: "tally").update_all(bb_status: "tally_started")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    Election.where(bb_status: "tally_started").update_all(bb_status: "tally")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end
diff --git a/decidim-elections/db/migrate/20220424121541_add_show_check_census_to_votings.rb b/decidim-elections/db/migrate/20220424121541_add_show_check_census_to_votings.rb
new file mode 100644
index 0000000000000..1781742f569a3
--- /dev/null
+++ b/decidim-elections/db/migrate/20220424121541_add_show_check_census_to_votings.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddShowCheckCensusToVotings < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_votings_votings, :show_check_census, :boolean, default: true
+  end
+end
diff --git a/decidim-elections/db/migrate/20220615102642_remove_description_from_elections_questions.rb b/decidim-elections/db/migrate/20220615102642_remove_description_from_elections_questions.rb
index 2d8443f574488..c6a791ed11f87 100644
--- a/decidim-elections/db/migrate/20220615102642_remove_description_from_elections_questions.rb
+++ b/decidim-elections/db/migrate/20220615102642_remove_description_from_elections_questions.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RemoveDescriptionFromElectionsQuestions < ActiveRecord::Migration[6.0]
+class RemoveDescriptionFromElectionsQuestions < ActiveRecord::Migration[6.1]
   def change
     remove_column :decidim_elections_questions, :description, :jsonb
   end
diff --git a/decidim-elections/db/migrate/20220711112802_rename_dataset_file_to_filename.rb b/decidim-elections/db/migrate/20220711112802_rename_dataset_file_to_filename.rb
new file mode 100644
index 0000000000000..c2d7f91801f69
--- /dev/null
+++ b/decidim-elections/db/migrate/20220711112802_rename_dataset_file_to_filename.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameDatasetFileToFilename < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :decidim_votings_census_datasets, :file, :filename
+  end
+end
diff --git a/decidim-elections/decidim-elections.gemspec b/decidim-elections/decidim-elections.gemspec
index 7c8d569085be6..e956fa14b1f49 100644
--- a/decidim-elections/decidim-elections.gemspec
+++ b/decidim-elections/decidim-elections.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["leo@codegram.com", "agusti@codegram.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim-elections"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-elections"
   s.summary = "A decidim elections module (votings space and elections component)"
@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"]
 
-  s.add_dependency "decidim-bulletin_board", "0.22.3"
-  s.add_dependency "voting_schemes-dummy", "0.22.3"
-  s.add_dependency "voting_schemes-electionguard", "0.22.3"
+  s.add_dependency "decidim-bulletin_board", "0.23"
+  s.add_dependency "voting_schemes-dummy", "0.23"
+  s.add_dependency "voting_schemes-electionguard", "0.23"
 
   s.add_dependency "decidim-core", Decidim::Elections.version
   s.add_dependency "decidim-forms", Decidim::Elections.version
diff --git a/decidim-elections/lib/decidim/elections/component.rb b/decidim-elections/lib/decidim/elections/component.rb
index 8ba98254b7d27..004ec02401d6a 100644
--- a/decidim-elections/lib/decidim/elections/component.rb
+++ b/decidim-elections/lib/decidim/elections/component.rb
@@ -142,7 +142,7 @@
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -239,7 +239,7 @@
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -360,7 +360,7 @@
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -476,7 +476,7 @@
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: answer,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
diff --git a/decidim-elections/lib/decidim/elections/test/factories.rb b/decidim-elections/lib/decidim/elections/test/factories.rb
index b38581e1811cf..3bce5c8646cf0 100644
--- a/decidim-elections/lib/decidim/elections/test/factories.rb
+++ b/decidim-elections/lib/decidim/elections/test/factories.rb
@@ -70,7 +70,7 @@
 
     trait :ready_for_setup do
       transient do
-        trustee_keys { 3.times.map { [Faker::Name.name, generate(:private_key).export.to_json] }.to_h }
+        trustee_keys { 3.times.to_h { [Faker::Name.name, generate(:private_key).export.to_json] } }
       end
 
       upcoming
@@ -124,13 +124,13 @@
       end
     end
 
-    trait :tally do
+    trait :tally_started do
       vote_ended
-      bb_status { "tally" }
+      bb_status { "tally_started" }
     end
 
     trait :tally_ended do
-      tally
+      tally_started
       bb_status { "tally_ended" }
       verifiable_results_file_hash { SecureRandom.hex(32) }
       verifiable_results_file_url { Faker::Internet.url }
diff --git a/decidim-elections/lib/decidim/elections/version.rb b/decidim-elections/lib/decidim/elections/version.rb
index 41ec6bb4e2b52..e07bb6d1c018f 100644
--- a/decidim-elections/lib/decidim/elections/version.rb
+++ b/decidim-elections/lib/decidim/elections/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-elections/lib/decidim/votings/participatory_space.rb b/decidim-elections/lib/decidim/votings/participatory_space.rb
index 3a7b379eaada8..543b6e3d0070e 100644
--- a/decidim-elections/lib/decidim/votings/participatory_space.rb
+++ b/decidim-elections/lib/decidim/votings/participatory_space.rb
@@ -51,7 +51,7 @@
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first,
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -99,8 +99,8 @@
           user.update!(
             name: Faker::Name.name,
             nickname: Faker::Twitter.unique.screen_name,
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             organization: organization,
             confirmed_at: Time.current,
             locale: I18n.default_locale,
diff --git a/decidim-elections/lib/decidim/votings/test/factories.rb b/decidim-elections/lib/decidim/votings/test/factories.rb
index b67b4f4fc1b67..35a18a114792b 100644
--- a/decidim-elections/lib/decidim/votings/test/factories.rb
+++ b/decidim-elections/lib/decidim/votings/test/factories.rb
@@ -29,6 +29,7 @@ def hash_for(*data)
     introductory_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     voting_type { "hybrid" }
     census_contact_information { nil }
+    show_check_census { true }
 
     trait :unpublished do
       published_at { nil }
@@ -105,7 +106,7 @@ def hash_for(*data)
 
   factory :dataset, class: "Decidim::Votings::Census::Dataset" do
     voting { create(:voting) }
-    file { "file.csv" }
+    filename { "file.csv" }
     status { "init_data" }
     csv_row_raw_count { 1 }
     csv_row_processed_count { 1 }
@@ -174,7 +175,7 @@ def hash_for(*data)
       with_questions
 
       after(:create) do |ballot_style, evaluator|
-        evaluator.election.questions.first(2).map { |question| create(:ballot_style_question, question: question, ballot_style: ballot_style) }
+        evaluator.election.reload.questions.first(2).map { |question| create(:ballot_style_question, question: question, ballot_style: ballot_style) }
       end
     end
   end
diff --git a/decidim-elections/spec/cells/decidim/elections/election_m_cell_spec.rb b/decidim-elections/spec/cells/decidim/elections/election_m_cell_spec.rb
index fb687f4058b68..c6ccc48a0008c 100644
--- a/decidim-elections/spec/cells/decidim/elections/election_m_cell_spec.rb
+++ b/decidim-elections/spec/cells/decidim/elections/election_m_cell_spec.rb
@@ -29,7 +29,7 @@ module Decidim::Elections
         expect(subject).to have_css(".card--election")
       end
 
-      it "renders the start and end time " do
+      it "renders the start and end time" do
         election_start = I18n.l(start_time.to_date, format: :decidim_short)
         election_end = I18n.l(end_time.to_date, format: :decidim_short)
 
diff --git a/decidim-elections/spec/cells/decidim/votings/content_blocks/landing_page/attachments_and_folders_cell_spec.rb b/decidim-elections/spec/cells/decidim/votings/content_blocks/landing_page/attachments_and_folders_cell_spec.rb
new file mode 100644
index 0000000000000..69c345cdb7f1e
--- /dev/null
+++ b/decidim-elections/spec/cells/decidim/votings/content_blocks/landing_page/attachments_and_folders_cell_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Votings::ContentBlocks::LandingPage::AttachmentsAndFoldersCell, type: :cell do
+  subject { cell(content_block.cell, content_block).call }
+
+  controller Decidim::Votings::VotingsController
+
+  let(:organization) { create(:organization) }
+  let(:voting) { create(:voting, :published, organization: organization) }
+  let(:content_block) { create :content_block, organization: organization, manifest_name: :attachments_and_folders, scope_name: :voting_landing_page }
+  let!(:attachment_pdf) { create(:attachment, :with_pdf, attached_to: voting) }
+  let!(:attachment_img) { create(:attachment, :with_image, attached_to: voting) }
+
+  before do
+    allow(controller).to receive(:current_participatory_space).and_return(voting)
+    allow(controller).to receive(:current_organization).and_return(organization)
+  end
+
+  context "when rendering attachments" do
+    it "shows image attachment" do
+      expect(subject).to have_selector(".attachments .thumbnail", count: 1)
+    end
+
+    it "shows pdf attachment" do
+      expect(subject).to have_selector(".documents .card__link", count: 1)
+    end
+  end
+end
diff --git a/decidim-elections/spec/cells/decidim/votings/voting_m_cell_spec.rb b/decidim-elections/spec/cells/decidim/votings/voting_m_cell_spec.rb
index 50f1d19e582c1..0a13ed5619c42 100644
--- a/decidim-elections/spec/cells/decidim/votings/voting_m_cell_spec.rb
+++ b/decidim-elections/spec/cells/decidim/votings/voting_m_cell_spec.rb
@@ -28,7 +28,7 @@ module Decidim::Votings
         expect(subject).to have_css(".card--voting")
       end
 
-      it "renders the start and end time " do
+      it "renders the start and end time" do
         voting_start = I18n.l(start_time.to_date, format: :decidim_short)
         voting_end = I18n.l(end_time.to_date, format: :decidim_short)
 
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/add_user_as_trustee_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/add_user_as_trustee_spec.rb
index 4598edb85c8c0..315bf8fa08a90 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/add_user_as_trustee_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/add_user_as_trustee_spec.rb
@@ -26,7 +26,7 @@
     let(:trustee) { nil }
 
     it "adds the user to trustees" do
-      expect { subject.call }.to change { Decidim::Elections::Trustee.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Trustee, :count).by(1)
     end
 
     it "adds the user organization to trustee" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/create_answer_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/create_answer_spec.rb
index 43af7983389ee..0fb78d6ed3d5d 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/create_answer_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/create_answer_spec.rb
@@ -38,7 +38,7 @@
   let(:answer) { Decidim::Elections::Answer.last }
 
   it "creates the answer" do
-    expect { subject.call }.to change { Decidim::Elections::Answer.count }.by(1)
+    expect { subject.call }.to change(Decidim::Elections::Answer, :count).by(1)
   end
 
   it "stores the given data" do
@@ -86,7 +86,7 @@
     let(:proposals) { create_list :proposal, 2, component: proposals_component }
 
     it "creates the answer" do
-      expect { subject.call }.to change { Decidim::Elections::Answer.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Answer, :count).by(1)
     end
 
     it "stores the relations with proposals" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
index 1ae61ba62521d..79deaf958eeaf 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/create_election_spec.rb
@@ -34,7 +34,7 @@
   let(:election) { Decidim::Elections::Election.last }
 
   it "creates the election" do
-    expect { subject.call }.to change { Decidim::Elections::Election.count }.by(1)
+    expect { subject.call }.to change(Decidim::Elections::Election, :count).by(1)
   end
 
   it "stores the given data" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/create_question_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/create_question_spec.rb
index 3968013c74e8a..22e543fd26893 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/create_question_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/create_question_spec.rb
@@ -29,7 +29,7 @@
   let(:question) { Decidim::Elections::Question.last }
 
   it "creates the question" do
-    expect { subject.call }.to change { Decidim::Elections::Question.count }.by(1)
+    expect { subject.call }.to change(Decidim::Elections::Question, :count).by(1)
   end
 
   it "stores the given data" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/destroy_answer_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/destroy_answer_spec.rb
index 3801d072b4772..691e8619cbf85 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/destroy_answer_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/destroy_answer_spec.rb
@@ -13,7 +13,7 @@
   let(:user) { create :user, :admin, :confirmed, organization: organization }
 
   it "destroys the answer" do
-    expect { subject.call }.to change { Decidim::Elections::Answer.count }.by(-1)
+    expect { subject.call }.to change(Decidim::Elections::Answer, :count).by(-1)
   end
 
   it "traces the action", versioning: true do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/destroy_election_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/destroy_election_spec.rb
index 96b3ebafa7de4..8f63aca929f80 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/destroy_election_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/destroy_election_spec.rb
@@ -10,7 +10,7 @@
   let(:user) { create :user, :admin, :confirmed, organization: organization }
 
   it "destroys the election" do
-    expect { subject.call }.to change { Decidim::Elections::Election.count }.by(-1)
+    expect { subject.call }.to change(Decidim::Elections::Election, :count).by(-1)
   end
 
   it "traces the action", versioning: true do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/destroy_question_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/destroy_question_spec.rb
index 0fec0148e09bf..aa558b61ef0fc 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/destroy_question_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/destroy_question_spec.rb
@@ -11,7 +11,7 @@
   let(:user) { create :user, :admin, :confirmed, organization: organization }
 
   it "destroys the question" do
-    expect { subject.call }.to change { Decidim::Elections::Question.count }.by(-1)
+    expect { subject.call }.to change(Decidim::Elections::Question, :count).by(-1)
   end
 
   it "traces the action", versioning: true do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/end_vote_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/end_vote_spec.rb
index 9c9008810bbad..47b2c2daf78dc 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/end_vote_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/end_vote_spec.rb
@@ -32,11 +32,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -56,7 +56,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/import_proposals_to_elections_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/import_proposals_to_elections_spec.rb
index 18f887c5abc1e..ec8f0011b2e3c 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/import_proposals_to_elections_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/import_proposals_to_elections_spec.rb
@@ -47,7 +47,7 @@ module Admin
             it "doesn't create the answer" do
               expect do
                 command.call
-              end.to change(Decidim::Elections::Answer, :count).by(0)
+              end.not_to change(Decidim::Elections::Answer, :count)
             end
           end
 
@@ -73,7 +73,7 @@ module Admin
               it "doesn't import it again" do
                 expect do
                   command.call
-                end.to change { Decidim::Elections::Answer.where(question: question).count }.by(0)
+                end.not_to(change { Decidim::Elections::Answer.where(question: question).count })
 
                 answers = Decidim::Elections::Answer.where(question: question)
                 first_answer = answers.first
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/publish_results_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/publish_results_spec.rb
index 3598ec6fd916d..48b82603e956a 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/publish_results_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/publish_results_spec.rb
@@ -42,11 +42,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -66,7 +66,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/report_missing_trustee_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/report_missing_trustee_spec.rb
index 1a7996829e378..ecfc733e90288 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/report_missing_trustee_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/report_missing_trustee_spec.rb
@@ -10,7 +10,7 @@
   let(:participatory_process) { create :participatory_process, organization: organization }
   let(:current_component) { create :component, participatory_space: participatory_process, manifest_name: "elections" }
   let(:user) { create :user, :admin, :confirmed, organization: organization }
-  let(:election) { create :election, :tally }
+  let(:election) { create :election, :tally_started }
   let(:trustee) { election.trustees.first }
   let(:form) do
     double(
@@ -35,11 +35,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -63,7 +63,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/setup_election_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/setup_election_spec.rb
index e1c7ada9415c0..79c217b3f7b4c 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/setup_election_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/setup_election_spec.rb
@@ -42,11 +42,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/start_key_ceremony_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/start_key_ceremony_spec.rb
index d12644658dc52..b21d0b9afeb74 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/start_key_ceremony_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/start_key_ceremony_spec.rb
@@ -32,11 +32,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -56,7 +56,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/start_tally_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/start_tally_spec.rb
index e5a62bc10d8e6..87f4822418561 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/start_tally_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/start_tally_spec.rb
@@ -32,11 +32,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -56,7 +56,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/start_vote_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/start_vote_spec.rb
index 0fbb50140d786..7ed5a9714a9bf 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/start_vote_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/start_vote_spec.rb
@@ -32,11 +32,11 @@
 
   before do
     allow(bulletin_board).to receive(:public_key).and_return({
-                                                               "kty": "RSA",
-                                                               "n": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
-                                                               "e": "AQAB",
-                                                               "alg": "RS256",
-                                                               "kid": "2011-04-29"
+                                                               kty: "RSA",
+                                                               n: "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw",
+                                                               e: "AQAB",
+                                                               alg: "RS256",
+                                                               kid: "2011-04-29"
                                                              })
     allow(bulletin_board).to receive(:authority_name).and_return("Decidim Test Authority")
     allow(bulletin_board).to receive(:authority_slug).and_return("decidim-test-authority")
@@ -56,7 +56,7 @@
     end
 
     it "creates an action" do
-      expect { subject.call }.to change { Decidim::Elections::Action.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Action, :count).by(1)
 
       expect(action.election).to eq(election)
       expect(action.message_id).to eq "a.message+id"
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_answer_selection_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_answer_selection_spec.rb
index 1f8a47c5416f9..b93fa75a8de1a 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/update_answer_selection_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/update_answer_selection_spec.rb
@@ -12,7 +12,7 @@
 
   it "updates the selected answer attribute" do
     subject.call
-    expect(answer.selected).to eq(false)
+    expect(answer.selected).to be(false)
   end
 
   context "when answer has no votes" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_answer_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_answer_spec.rb
index c481b6d6c3206..0463bcef08093 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/update_answer_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/update_answer_spec.rb
@@ -57,7 +57,7 @@
     let(:proposals) { create_list :proposal, 2, component: proposals_component }
 
     it "creates the answer" do
-      expect { subject.call }.to change { Decidim::Elections::Answer.count }.by(1)
+      expect { subject.call }.to change(Decidim::Elections::Answer, :count).by(1)
     end
 
     it "stores the relations with proposals" do
diff --git a/decidim-elections/spec/commands/decidim/elections/admin/update_trustee_participatory_space_spec.rb b/decidim-elections/spec/commands/decidim/elections/admin/update_trustee_participatory_space_spec.rb
index fa433cdf703bd..f6a9ee2b50093 100644
--- a/decidim-elections/spec/commands/decidim/elections/admin/update_trustee_participatory_space_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/admin/update_trustee_participatory_space_spec.rb
@@ -9,7 +9,7 @@
 
   it "toggles the considered status" do
     subject.call
-    expect(trustee_participatory_space.considered).to eq(false)
+    expect(trustee_participatory_space.considered).to be(false)
   end
 
   context "when trustee_participatory_space is missing" do
diff --git a/decidim-elections/spec/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status_spec.rb b/decidim-elections/spec/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status_spec.rb
index a14a4be2b560e..cb3965d0daa61 100644
--- a/decidim-elections/spec/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status_spec.rb
@@ -38,7 +38,7 @@
 
   context "when the new election status is tally_ended" do
     let(:election) { create :election, :complete, bb_status: required_status }
-    let(:required_status) { :tally }
+    let(:required_status) { :tally_started }
     let(:new_status) { :tally_ended }
     let(:bullettin_board_server) { "https://my-bb.com" }
     let(:election_results_response) do
diff --git a/decidim-elections/spec/commands/decidim/elections/voter/cast_vote_spec.rb b/decidim-elections/spec/commands/decidim/elections/voter/cast_vote_spec.rb
index f776df118d068..8b0f1745a6a9e 100644
--- a/decidim-elections/spec/commands/decidim/elections/voter/cast_vote_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/voter/cast_vote_spec.rb
@@ -20,7 +20,11 @@
     )
   end
   let(:invalid) { false }
-  let(:encrypted_data) { { question_1: "aNsWeR 1" }.to_json }
+  let(:encrypted_data) do
+    # rubocop:disable Naming/VariableNumber
+    { question_1: "aNsWeR 1" }.to_json
+    # rubocop:enable Naming/VariableNumber
+  end
   let(:encrypted_data_hash) { "1234" }
   let(:election) { create(:election) }
   let(:election_id) { election.id }
diff --git a/decidim-elections/spec/commands/decidim/elections/voter/update_vote_status_spec.rb b/decidim-elections/spec/commands/decidim/elections/voter/update_vote_status_spec.rb
index c0e838a9cedf8..1e91217b4f080 100644
--- a/decidim-elections/spec/commands/decidim/elections/voter/update_vote_status_spec.rb
+++ b/decidim-elections/spec/commands/decidim/elections/voter/update_vote_status_spec.rb
@@ -13,7 +13,7 @@
   let(:email) { "an_email@example.org" }
   let(:method_name) { :get_pending_message_status }
   let(:response) { :accepted }
-  let(:verify_url) { "http://#{organization.host}/processes/#{component.participatory_space.slug}/f/#{component.id}/elections/#{election.id}/votes/#{vote.encrypted_vote_hash}/verify" }
+  let(:verify_url) { "http://#{organization.host}:#{Capybara.server_port}/processes/#{component.participatory_space.slug}/f/#{component.id}/elections/#{election.id}/votes/#{vote.encrypted_vote_hash}/verify" }
 
   before do
     allow(Decidim::Elections.bulletin_board).to receive(method_name).and_return(response)
@@ -72,7 +72,7 @@
     end
 
     it "sends an email" do
-      expect(Decidim::Elections::VoteAcceptedMailer)
+      allow(Decidim::Elections::VoteAcceptedMailer)
         .to receive(:notification)
         .with(vote, verify_url, I18n.locale.to_s)
         .and_return(mailer)
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/create_ballot_style_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/create_ballot_style_spec.rb
index 4f04fa037797c..cabb68946b658 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/create_ballot_style_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/create_ballot_style_spec.rb
@@ -32,11 +32,11 @@ module Admin
         let(:ballot_style) { Decidim::Votings::BallotStyle.last }
 
         it "creates the ballot style" do
-          expect { subject.call }.to change { Decidim::Votings::BallotStyle.count }.by(1)
+          expect { subject.call }.to change(Decidim::Votings::BallotStyle, :count).by(1)
         end
 
         it "creates the association between ballot style and questions" do
-          expect { subject.call }.to change { Decidim::Votings::BallotStyleQuestion.count }.by(2)
+          expect { subject.call }.to change(Decidim::Votings::BallotStyleQuestion, :count).by(2)
         end
 
         it "broadcasts ok" do
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/create_polling_station_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/create_polling_station_spec.rb
index 5f8e3952eb0b0..160cd603cf9c9 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/create_polling_station_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/create_polling_station_spec.rb
@@ -44,7 +44,7 @@ module Admin
         let(:polling_station) { Decidim::Votings::PollingStation.last }
 
         it "creates the voting" do
-          expect { subject.call }.to change { Decidim::Votings::PollingStation.count }.by(1)
+          expect { subject.call }.to change(Decidim::Votings::PollingStation, :count).by(1)
         end
 
         it "broadcasts ok" do
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/create_voting_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/create_voting_spec.rb
index b7f8c3901b6e9..dfb46507ad04a 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/create_voting_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/create_voting_spec.rb
@@ -26,7 +26,8 @@ module Admin
             introductory_image: nil,
             promoted: promoted,
             voting_type: voting_type,
-            census_contact_information: census_contact_information
+            census_contact_information: census_contact_information,
+            show_check_census: show_check_census
           )
         end
 
@@ -40,11 +41,12 @@ module Admin
         let(:promoted) { true }
         let(:voting_type) { "online" }
         let(:census_contact_information) { nil }
+        let(:show_check_census) { true }
 
         let(:voting) { Decidim::Votings::Voting.last }
 
         it "creates the voting" do
-          expect { subject.call }.to change { Decidim::Votings::Voting.count }.by(1)
+          expect { subject.call }.to change(Decidim::Votings::Voting, :count).by(1)
         end
 
         it "broadcasts ok" do
@@ -62,6 +64,7 @@ module Admin
           expect(voting.organization).to eq organization
           expect(voting.promoted).to eq promoted
           expect(voting.voting_type).to eq voting_type
+          expect(voting.show_check_census).to eq show_check_census
         end
 
         it "traces the action", versioning: true do
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/update_ballot_style_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/update_ballot_style_spec.rb
index ed807a13fb7e3..7625013dcc8ee 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/update_ballot_style_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/update_ballot_style_spec.rb
@@ -34,7 +34,8 @@ module Admin
             current_user: user
           )
         end
-        let(:subject) { described_class.new(form, ballot_style) }
+
+        subject { described_class.new(form, ballot_style) }
 
         context "when the form is not valid" do
           context "when the code is not present" do
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/update_polling_station_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/update_polling_station_spec.rb
index 3173c749e5361..b95bb2738705b 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/update_polling_station_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/update_polling_station_spec.rb
@@ -40,7 +40,8 @@ module Admin
           }
         end
         let(:form) { PollingStationForm.from_params(params).with_context(context) }
-        let(:subject) { described_class.new(form, polling_station) }
+
+        subject { described_class.new(form, polling_station) }
 
         context "when the form is not valid" do
           let(:params) { { address: nil } }
diff --git a/decidim-elections/spec/commands/decidim/votings/admin/update_voting_spec.rb b/decidim-elections/spec/commands/decidim/votings/admin/update_voting_spec.rb
index bd142ce45a7d5..731a2f9499bc3 100644
--- a/decidim-elections/spec/commands/decidim/votings/admin/update_voting_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/admin/update_voting_spec.rb
@@ -44,7 +44,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -61,9 +61,9 @@ module Admin
 
         describe "when the voting is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
             expect(voting).to receive(:valid?).at_least(:once).and_return(false)
-            voting.errors.add(:banner_image, "Image too big")
+            voting.errors.add(:banner_image, "File resolution is too large")
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-elections/spec/commands/decidim/votings/census/admin/create_dataset_spec.rb b/decidim-elections/spec/commands/decidim/votings/census/admin/create_dataset_spec.rb
index ebfa3343ad3d8..3fc742f57626b 100644
--- a/decidim-elections/spec/commands/decidim/votings/census/admin/create_dataset_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/census/admin/create_dataset_spec.rb
@@ -8,14 +8,14 @@ module Decidim::Votings::Census::Admin
 
     let(:voting) { create(:voting) }
     let(:user) { create(:user, :admin, organization: voting.organization) }
-    let(:file) { Decidim::Dev.test_file("import_voting_census.csv", "text/csv") }
+    let(:file) { upload_test_file(Decidim::Dev.test_file("import_voting_census.csv", "text/csv")) }
     let(:params) { { file: file } }
     let(:context) { { current_participatory_space: voting } }
 
     let(:form) { DatasetForm.from_params(params).with_context(context) }
 
     context "when the form is not valid" do
-      let(:file) {}
+      let(:file) { nil }
 
       it "broadcasts invalid" do
         expect(subject.call).to broadcast(:invalid)
@@ -29,7 +29,21 @@ module Decidim::Votings::Census::Admin
     end
 
     context "when headers are invalid" do
-      let(:file) { Decidim::Dev.test_file("import_voting_census_without_headers.csv", "text/csv") }
+      let(:file) { upload_test_file(Decidim::Dev.test_file("import_voting_census_without_headers.csv", "text/csv")) }
+
+      it "broadcasts invalid_csv_file" do
+        expect(subject.call).to broadcast(:invalid_csv_header)
+      end
+
+      it "does not enqueue any job" do
+        expect(CreateDatumJob).not_to receive(:perform_later)
+
+        subject.call
+      end
+    end
+
+    context "when file only contains headers" do
+      let(:file) { upload_test_file(Decidim::Dev.test_file("import_voting_census_only_headers.csv", "text/csv")) }
 
       it "broadcasts invalid_csv_file" do
         expect(subject.call).to broadcast(:invalid_csv_header)
@@ -44,6 +58,20 @@ module Decidim::Votings::Census::Admin
 
     it "broadcasts ok" do
       expect(subject.call).to broadcast(:ok)
+      expect(Decidim::Votings::Census::Dataset.last.csv_row_raw_count).to eq(5)
+    end
+
+    context "when active storage service is not local" do
+      before do
+        allow(ActiveStorage::Blob.service).to receive(:respond_to?).and_call_original
+        # rubocop:disable RSpec/StubbedMock
+        expect(ActiveStorage::Blob.service).to receive(:respond_to?).with(:path_for).and_return(false)
+        # rubocop:enable RSpec/StubbedMock
+      end
+
+      it "still broadcasts ok" do
+        expect(subject.call).to broadcast(:ok)
+      end
     end
 
     it "enqueues a job for processing the dataset and strips the data from whitespaces" do
diff --git a/decidim-elections/spec/commands/decidim/votings/census/admin/create_datum_spec.rb b/decidim-elections/spec/commands/decidim/votings/census/admin/create_datum_spec.rb
index a466dd6b7c76e..ffe89ac84b0b2 100644
--- a/decidim-elections/spec/commands/decidim/votings/census/admin/create_datum_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/census/admin/create_datum_spec.rb
@@ -40,7 +40,7 @@ module Decidim::Votings::Census::Admin
     let(:email) { "example@test.org" }
 
     context "when the form is not valid" do
-      let(:document_number) {}
+      let(:document_number) { nil }
 
       it "broadcasts invalid" do
         expect(subject.call).to broadcast(:invalid)
diff --git a/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_export_spec.rb b/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_export_spec.rb
index 01eb20ce87586..2361bfb2ce848 100644
--- a/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_export_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_export_spec.rb
@@ -7,12 +7,12 @@ module Decidim::Votings::Census::Admin
     subject { described_class.new(dataset, user) }
 
     let(:dataset) { create(:dataset, :codes_generated) }
-    let(:user) { create(:user, :admin) }
+    let(:user) { create(:user, :admin, organization: dataset.organization) }
 
     context "when the inputs are not valid" do
       context "when the user in nil" do
         let(:dataset) { create(:dataset) }
-        let(:user) {}
+        let(:user) { nil }
 
         it { expect(subject).to broadcast(:invalid) }
       end
diff --git a/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_generation_spec.rb b/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_generation_spec.rb
index 3d059679ea44e..8dca6172da5aa 100644
--- a/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_generation_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/census/admin/launch_access_codes_generation_spec.rb
@@ -12,7 +12,7 @@ module Decidim::Votings::Census::Admin
     context "when the inputs are not valid" do
       context "when the user in nil" do
         let(:dataset) { create(:dataset) }
-        let(:user) {}
+        let(:user) { nil }
 
         it { expect(subject).to broadcast(:invalid) }
       end
diff --git a/decidim-elections/spec/commands/decidim/votings/census/admin/update_dataset_spec.rb b/decidim-elections/spec/commands/decidim/votings/census/admin/update_dataset_spec.rb
index 55497751005da..bbdd0435d6b5e 100644
--- a/decidim-elections/spec/commands/decidim/votings/census/admin/update_dataset_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/census/admin/update_dataset_spec.rb
@@ -14,7 +14,7 @@ module Decidim::Votings::Census::Admin
     context "when the inputs are NOT valid" do
       context "when the user is nil" do
         let(:dataset) { create(:dataset) }
-        let(:user) {}
+        let(:user) { nil }
 
         it "broadcasts invalid" do
           expect(subject.call).to broadcast(:invalid)
@@ -22,7 +22,7 @@ module Decidim::Votings::Census::Admin
       end
 
       context "when the dataset is nil" do
-        let(:dataset) {}
+        let(:dataset) { nil }
 
         it "broadcasts invalid" do
           expect(subject.call).to broadcast(:invalid)
diff --git a/decidim-elections/spec/commands/decidim/votings/certify_polling_station_closure_spec.rb b/decidim-elections/spec/commands/decidim/votings/certify_polling_station_closure_spec.rb
index dcc74ca4ca892..2260aeec39c6d 100644
--- a/decidim-elections/spec/commands/decidim/votings/certify_polling_station_closure_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/certify_polling_station_closure_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Votings
     subject { described_class.new(form, closure) }
 
     let(:closure) { create :ps_closure, :with_results, phase: :certificate }
-    let(:add_photos) { [Decidim::Dev.test_file("city.jpeg", "image/jpeg")] }
+    let(:add_photos) { [upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"))] }
 
     let(:form) { ClosureCertifyForm.from_params(add_photos: add_photos).with_context(closure: closure) }
 
diff --git a/decidim-elections/spec/commands/decidim/votings/check_census_spec.rb b/decidim-elections/spec/commands/decidim/votings/check_census_spec.rb
index b37375678f267..fdd1a6393f6d9 100644
--- a/decidim-elections/spec/commands/decidim/votings/check_census_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/check_census_spec.rb
@@ -31,7 +31,7 @@ module Decidim::Votings
     let(:form) { Census::CheckForm.from_params(params).with_context(context) }
 
     context "when the form is not valid" do
-      let(:document_number) {}
+      let(:document_number) { nil }
 
       it "broadcasts invalid" do
         expect(subject.call).to broadcast(:invalid)
diff --git a/decidim-elections/spec/commands/decidim/votings/create_polling_station_results_spec.rb b/decidim-elections/spec/commands/decidim/votings/create_polling_station_results_spec.rb
index ad3eb37ee3140..3a9928073b2ca 100644
--- a/decidim-elections/spec/commands/decidim/votings/create_polling_station_results_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/create_polling_station_results_spec.rb
@@ -57,7 +57,7 @@ module Decidim::Votings
     let(:form) { ClosureResultForm.from_params(params).with_context(context) }
 
     context "when the form is not valid" do
-      let(:polling_station_id) {}
+      let(:polling_station_id) { nil }
 
       it "broadcasts invalid" do
         expect(subject.call).to broadcast(:invalid)
diff --git a/decidim-elections/spec/commands/decidim/votings/send_access_code_spec.rb b/decidim-elections/spec/commands/decidim/votings/send_access_code_spec.rb
index 614271127649a..da6ab998a015e 100644
--- a/decidim-elections/spec/commands/decidim/votings/send_access_code_spec.rb
+++ b/decidim-elections/spec/commands/decidim/votings/send_access_code_spec.rb
@@ -14,7 +14,7 @@ module Decidim::Votings
     let(:medium) { "email" }
 
     context "when datum is nil" do
-      let(:datum) {}
+      let(:datum) { nil }
 
       it "broadcasts invalid" do
         expect(subject.call).to broadcast(:invalid)
@@ -26,7 +26,7 @@ module Decidim::Votings
 
       context "when medium is email" do
         it "sends an email" do
-          expect(Decidim::Votings::AccessCodeMailer)
+          allow(Decidim::Votings::AccessCodeMailer)
             .to receive(:send_access_code)
             .with(datum)
             .and_return(mailer)
diff --git a/decidim-elections/spec/controllers/decidim/elections/admin/answers_controller_spec.rb b/decidim-elections/spec/controllers/decidim/elections/admin/answers_controller_spec.rb
index 18742fd080a3a..3fbd9c106020e 100644
--- a/decidim-elections/spec/controllers/decidim/elections/admin/answers_controller_spec.rb
+++ b/decidim-elections/spec/controllers/decidim/elections/admin/answers_controller_spec.rb
@@ -36,6 +36,7 @@ module Admin
               photos: election.photos.map { |a| a.id.to_s }
             }
           end
+
           let(:params) do
             {
               id: answer.id,
@@ -59,13 +60,10 @@ module Admin
               let(:answer_title) { { en: "" } }
               let(:answer) { create(:election_answer, :with_photos, question: question) }
 
-              before do
-                controller.class_eval do
-                  helper_method :proposals_picker_election_question_answers_path
-
-                  def proposals_picker_election_question_answers_path(_election, _question)
-                    "/"
-                  end
+              controller(AnswersController) do
+                helper_method :proposals_picker_election_question_answers_path
+                def proposals_picker_election_question_answers_path(_foo, _bar)
+                  "/"
                 end
               end
 
diff --git a/decidim-elections/spec/events/decidim/votings/polling_officers/polling_station_assigned_event_spec.rb b/decidim-elections/spec/events/decidim/votings/polling_officers/polling_station_assigned_event_spec.rb
index 454ed0865bbfa..a83e63be13568 100644
--- a/decidim-elections/spec/events/decidim/votings/polling_officers/polling_station_assigned_event_spec.rb
+++ b/decidim-elections/spec/events/decidim/votings/polling_officers/polling_station_assigned_event_spec.rb
@@ -18,7 +18,7 @@ module PollingOfficers
         let(:polling_station_name) { translated(polling_station.title) }
         let(:voting_title) { translated(voting.title) }
         let(:voting_path) { "/votings/#{voting.slug}?voting_slug=#{voting.slug}" }
-        let(:voting_url) { "http://#{organization.host}#{voting_path}" }
+        let(:voting_url) { "http://#{organization.host}:#{Capybara.server_port}#{voting_path}" }
         let(:polling_officer_zone_url) { "http://#{organization.host}/polling_officers" }
 
         it_behaves_like "a simple event"
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/answer_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/answer_form_spec.rb
index 8d14ccc57fed0..65866940c63f2 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/answer_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/answer_form_spec.rb
@@ -59,7 +59,7 @@
       it "adds an error to the `:attachment` field" do
         expect(subject).not_to be_valid
         expect(subject.errors.full_messages).to match_array(["Title en can't be blank", "Attachment Needs to be reattached"])
-        expect(subject.errors.keys).to match_array([:title_en, :attachment])
+        expect(subject.errors.attribute_names).to match_array([:title_en, :attachment])
       end
     end
   end
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/answer_import_proposals_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/answer_import_proposals_form_spec.rb
index 1120661cf22ce..fbb124dfe66e9 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/answer_import_proposals_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/answer_import_proposals_form_spec.rb
@@ -46,7 +46,7 @@ module Admin
           it { is_expected.to be_valid }
         end
 
-        context "when the import proposals is  accepted" do
+        context "when the import proposals is accepted" do
           let(:import_all_accepted_proposals) { true }
 
           it { is_expected.to be_valid }
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
index 033c5a9d289a5..0db33ae2e3b25 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/election_form_spec.rb
@@ -83,7 +83,7 @@
       it "adds an error to the `:attachment` field" do
         expect(subject).not_to be_valid
         expect(subject.errors.full_messages).to match_array(["Title en can't be blank", "Attachment Needs to be reattached"])
-        expect(subject.errors.keys).to match_array([:title_en, :attachment])
+        expect(subject.errors.attribute_names).to match_array([:title_en, :attachment])
       end
     end
   end
diff --git a/decidim-elections/spec/forms/decidim/elections/admin/report_missing_trustee_form_spec.rb b/decidim-elections/spec/forms/decidim/elections/admin/report_missing_trustee_form_spec.rb
index 25c0068bd7a83..4f219c5c9ac97 100644
--- a/decidim-elections/spec/forms/decidim/elections/admin/report_missing_trustee_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/elections/admin/report_missing_trustee_form_spec.rb
@@ -16,7 +16,7 @@
   let(:component) { election.component }
   let(:current_step) { election.bb_status }
   let(:attributes) { { trustee_id: trustee_id } }
-  let(:election) { create :election, :tally }
+  let(:election) { create :election, :tally_started }
   let(:trustee) { election.trustees.first }
   let(:trustee_id) { trustee.id }
 
diff --git a/decidim-elections/spec/forms/decidim/votings/admin/voting_form_spec.rb b/decidim-elections/spec/forms/decidim/votings/admin/voting_form_spec.rb
index 53aa0f2aee4c9..e2c850f69fb68 100644
--- a/decidim-elections/spec/forms/decidim/votings/admin/voting_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/votings/admin/voting_form_spec.rb
@@ -14,7 +14,7 @@
   let(:start_time) { 1.day.from_now }
   let(:end_time) { start_time + 1.month }
   let(:promoted) { true }
-  let(:banner_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
+  let(:banner_image) { upload_test_file(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")) }
   let(:voting_type) { "online" }
   let(:census_contact_information) { nil }
 
@@ -122,14 +122,14 @@
       organization.settings.tap do |settings|
         settings.upload.maximum_file_size.default = 5
       end
-      expect(subject.banner_image).to receive(:size).and_return(6.megabytes)
+      ActiveStorage::Blob.find_signed(banner_image).update(byte_size: 6.megabytes)
     end
 
     it { is_expected.not_to be_valid }
   end
 
   context "when images are not the expected type" do
-    let(:banner_image) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
+    let(:banner_image) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")) }
 
     it { is_expected.not_to be_valid }
   end
diff --git a/decidim-elections/spec/forms/decidim/votings/answer_result_form_spec.rb b/decidim-elections/spec/forms/decidim/votings/answer_result_form_spec.rb
index 23a0eda1e23ec..d7d8fc199870f 100644
--- a/decidim-elections/spec/forms/decidim/votings/answer_result_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/votings/answer_result_form_spec.rb
@@ -42,6 +42,7 @@
   describe "when value is not a number" do
     let(:value) { "abcde" }
 
-    it { is_expected.to be_invalid }
+    # The value is cast to the correct type so "abcde" becomes 0 which is valid.
+    it { is_expected.to be_valid }
   end
 end
diff --git a/decidim-elections/spec/forms/decidim/votings/census/admin/dataset_form_spec.rb b/decidim-elections/spec/forms/decidim/votings/census/admin/dataset_form_spec.rb
index efe53888fc294..c6007b519b45d 100644
--- a/decidim-elections/spec/forms/decidim/votings/census/admin/dataset_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/votings/census/admin/dataset_form_spec.rb
@@ -6,7 +6,7 @@
   subject { described_class.from_params(file: file).with_context(current_participatory_space: voting) }
 
   let(:voting) { create(:voting) }
-  let(:file) { Decidim::Dev.test_file("import_voting_census.csv", "text/csv") }
+  let(:file) { upload_test_file(Decidim::Dev.test_file("import_voting_census.csv", "text/csv")) }
 
   it { is_expected.to be_valid }
 
diff --git a/decidim-elections/spec/forms/decidim/votings/question_result_form_spec.rb b/decidim-elections/spec/forms/decidim/votings/question_result_form_spec.rb
index 7c806e15bfd7c..49b4c501cc6b3 100644
--- a/decidim-elections/spec/forms/decidim/votings/question_result_form_spec.rb
+++ b/decidim-elections/spec/forms/decidim/votings/question_result_form_spec.rb
@@ -33,6 +33,7 @@
   describe "when value not a number" do
     let(:value) { "abcde" }
 
-    it { is_expected.to be_invalid }
+    # The value is cast to the correct type so "abcde" becomes 0 which is valid.
+    it { is_expected.to be_valid }
   end
 end
diff --git a/decidim-elections/spec/helpers/decidim/elections/steps_helper_spec.rb b/decidim-elections/spec/helpers/decidim/elections/steps_helper_spec.rb
index dcb9b460cf36d..59700b3c044a9 100644
--- a/decidim-elections/spec/helpers/decidim/elections/steps_helper_spec.rb
+++ b/decidim-elections/spec/helpers/decidim/elections/steps_helper_spec.rb
@@ -19,7 +19,7 @@ module Admin
                                     ["key_ceremony_ended", "text-muted"],
                                     ["vote", "text-muted"],
                                     ["vote_ended", "text-muted"],
-                                    ["tally", "text-muted"],
+                                    ["tally_started", "text-muted"],
                                     ["tally_ended", "text-muted"],
                                     ["results_published", "text-muted"]
                                   ])
@@ -36,7 +36,7 @@ module Admin
                                       ["key_ceremony_ended", "text-warning"],
                                       ["vote", "text-muted"],
                                       ["vote_ended", "text-muted"],
-                                      ["tally", "text-muted"],
+                                      ["tally_started", "text-muted"],
                                       ["tally_ended", "text-muted"],
                                       ["results_published", "text-muted"]
                                     ])
@@ -54,7 +54,7 @@ module Admin
                                       ["key_ceremony_ended", "text-success"],
                                       ["vote", "text-success"],
                                       ["vote_ended", "text-success"],
-                                      ["tally", "text-success"],
+                                      ["tally_started", "text-success"],
                                       ["tally_ended", "text-success"],
                                       ["results_published", "text-warning"]
                                     ])
diff --git a/decidim-elections/spec/jobs/decidim/votings/census/admin/create_datum_job_spec.rb b/decidim-elections/spec/jobs/decidim/votings/census/admin/create_datum_job_spec.rb
index adeaa16ba92c4..a8c1bc547609b 100644
--- a/decidim-elections/spec/jobs/decidim/votings/census/admin/create_datum_job_spec.rb
+++ b/decidim-elections/spec/jobs/decidim/votings/census/admin/create_datum_job_spec.rb
@@ -31,7 +31,7 @@
       end
     end
 
-    context "when the dataset is missing" do
+    context "when the user is missing" do
       let!(:user) { nil }
 
       it "does not create a datum" do
diff --git a/decidim-elections/spec/lib/components/votings/current_component_spec.rb b/decidim-elections/spec/lib/components/votings/current_component_spec.rb
index b2df734af0871..abe037fea2572 100644
--- a/decidim-elections/spec/lib/components/votings/current_component_spec.rb
+++ b/decidim-elections/spec/lib/components/votings/current_component_spec.rb
@@ -6,21 +6,19 @@ module Decidim
   module Votings
     describe CurrentComponent do
       let(:request) { double(params: params, env: env) }
-      let(:subject) { described_class.new(manifest) }
       let(:params) { {} }
       let(:manifest) { Decidim.find_component_manifest("dummy") }
-
       let(:organization) do
         create(:organization)
       end
-
       let(:current_voting) { create(:voting, organization: organization) }
       let(:other_voting) { create(:voting, organization: organization) }
-
       let(:env) do
         { "decidim.current_organization" => organization }
       end
 
+      subject { described_class.new(manifest) }
+
       context "when the params contain a voting id" do
         before do
           params["voting_slug"] = current_voting.id.to_s
@@ -28,7 +26,7 @@ module Votings
 
         context "when the params don't contain a component id" do
           it "doesn't match" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -41,7 +39,7 @@ module Votings
             let(:component) { create(:component, participatory_space: other_voting) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(false)
+              expect(subject.matches?(request)).to be(false)
             end
           end
 
@@ -49,7 +47,7 @@ module Votings
             let(:component) { create(:component, participatory_space: current_voting) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(true)
+              expect(subject.matches?(request)).to be(true)
             end
           end
         end
diff --git a/decidim-elections/spec/lib/tasks/decidim_tasks_delete_data_portability_files_spec.rb b/decidim-elections/spec/lib/tasks/decidim_tasks_delete_download_your_data_files_spec.rb
similarity index 100%
rename from decidim-elections/spec/lib/tasks/decidim_tasks_delete_data_portability_files_spec.rb
rename to decidim-elections/spec/lib/tasks/decidim_tasks_delete_download_your_data_files_spec.rb
diff --git a/decidim-elections/spec/mailers/decidim/elections/vote_accepted_mailer_spec.rb b/decidim-elections/spec/mailers/decidim/elections/vote_accepted_mailer_spec.rb
index d265635e652ce..dd3e69a2c8816 100644
--- a/decidim-elections/spec/mailers/decidim/elections/vote_accepted_mailer_spec.rb
+++ b/decidim-elections/spec/mailers/decidim/elections/vote_accepted_mailer_spec.rb
@@ -15,7 +15,7 @@ module Decidim::Elections
       let(:translated_title) { translated(election.title, locale: locale || election.component.organization.default_locale) }
 
       context "when using the organization default locale" do
-        let(:subject) { "Your vote for #{translated_title} was accepted." }
+        let(:mail_subject) { "Your vote for #{translated_title} was accepted." }
         let(:body) do
           ["<h2>Your vote for #{translated_title} was accepted.</h2>",
            "<p>Your vote was accepted! Using your voting token: #{vote.encrypted_vote_hash}, you can verify your vote <a href=\"#{verify_url}\">here</a>.</p>",
@@ -23,7 +23,7 @@ module Decidim::Elections
         end
 
         it "sends an email with the right subject" do
-          expect(mail.subject).to eq(subject)
+          expect(mail.subject).to eq(mail_subject)
         end
 
         it "sends an email with the right body" do
@@ -35,7 +35,7 @@ module Decidim::Elections
 
       context "when setting a locale" do
         let(:locale) { "ca" }
-        let(:subject) { "El teu vot a #{translated_title} s'ha acceptat." }
+        let(:mail_subject) { "El teu vot a #{translated_title} s'ha acceptat." }
         let(:body) do
           ["<h2>El teu vot a #{translated_title} s&#39;ha acceptat.</h2>",
            "<p>El teu vot s'ha acceptat! Utilitzant el comprovant de vot: #{vote.encrypted_vote_hash}, pots verificar-lo <a href=\"#{verify_url}\">aquí</a>.</p>",
@@ -43,7 +43,7 @@ module Decidim::Elections
         end
 
         it "sends an email with the right subject" do
-          expect(mail.subject).to eq(subject)
+          expect(mail.subject).to eq(mail_subject)
         end
 
         it "sends an email with the right body" do
diff --git a/decidim-elections/spec/mailers/decidim/votings/access_code_mailer_spec.rb b/decidim-elections/spec/mailers/decidim/votings/access_code_mailer_spec.rb
index 36bdbeebc8c87..5529af7ad858f 100644
--- a/decidim-elections/spec/mailers/decidim/votings/access_code_mailer_spec.rb
+++ b/decidim-elections/spec/mailers/decidim/votings/access_code_mailer_spec.rb
@@ -16,14 +16,14 @@ module Decidim::Votings
       let(:translated_title) { translated(voting.title, locale: locale || organization.default_locale) }
 
       context "when using the organization default locale" do
-        let(:subject) { "Your Access Code to participate in #{translated_title}" }
+        let(:mail_subject) { "Your Access Code to participate in #{translated_title}" }
         let(:body) do
           ["Hello #{datum.full_name},",
            "Here is your Access Code that you asked for: #{access_code}. With this you will be able to participate in #{translated_title}."]
         end
 
         it "sends an email with the right subject" do
-          expect(mail.subject).to eq(subject)
+          expect(mail.subject).to eq(mail_subject)
         end
 
         it "sends an email with the right body" do
diff --git a/decidim-elections/spec/mailers/decidim/votings/census/export_mailer_spec.rb b/decidim-elections/spec/mailers/decidim/votings/census/export_mailer_spec.rb
index 7439c966e83df..9400b1ac55471 100644
--- a/decidim-elections/spec/mailers/decidim/votings/census/export_mailer_spec.rb
+++ b/decidim-elections/spec/mailers/decidim/votings/census/export_mailer_spec.rb
@@ -9,7 +9,7 @@ module Census
         let(:voting) { create(:voting) }
         let(:user) { create(:user, organization: voting.organization) }
 
-        describe "access codes export " do
+        describe "access codes export" do
           let(:filename) { "an_encrypted_zip_archive" }
           let(:password) { "secret" }
           let(:mail) { described_class.access_codes_export(user, voting, filename, password) }
diff --git a/decidim-elections/spec/models/decidim/elections/result_spec.rb b/decidim-elections/spec/models/decidim/elections/result_spec.rb
index b8651125b0fdb..7c4dab04814b5 100644
--- a/decidim-elections/spec/models/decidim/elections/result_spec.rb
+++ b/decidim-elections/spec/models/decidim/elections/result_spec.rb
@@ -15,7 +15,7 @@
     expect(result.answer).to be_a(Decidim::Elections::Answer)
   end
 
-  context "when the result comes from the bulletin board " do
+  context "when the result comes from the bulletin board" do
     it "has an associated bulletin board closure" do
       expect(result.closurable).to be_a(Decidim::Elections::BulletinBoardClosure)
     end
diff --git a/decidim-elections/spec/models/decidim/votings/ballot_style_spec.rb b/decidim-elections/spec/models/decidim/votings/ballot_style_spec.rb
index 0b7695a11ee9f..b1332223a379f 100644
--- a/decidim-elections/spec/models/decidim/votings/ballot_style_spec.rb
+++ b/decidim-elections/spec/models/decidim/votings/ballot_style_spec.rb
@@ -25,7 +25,7 @@
         end
       end
 
-      context "when the ballot style has questions from this election" do
+      context "when the ballot style has questions from another election" do
         let(:ballot_style) { create(:ballot_style) }
 
         it "returns the questions for the specified election" do
@@ -43,7 +43,7 @@
         end
       end
 
-      context "when the ballot style has questions from this election" do
+      context "when the ballot style has questions from another election" do
         let(:ballot_style) { create(:ballot_style) }
 
         it "returns the questions for the specified election" do
diff --git a/decidim-elections/spec/models/decidim/votings/census/dataset_spec.rb b/decidim-elections/spec/models/decidim/votings/census/dataset_spec.rb
index 7a816ffe3d4e8..0ec33c87c87e4 100644
--- a/decidim-elections/spec/models/decidim/votings/census/dataset_spec.rb
+++ b/decidim-elections/spec/models/decidim/votings/census/dataset_spec.rb
@@ -20,7 +20,7 @@
   end
 
   context "without file" do
-    let(:dataset) { build(:dataset, file: nil) }
+    let(:dataset) { build(:dataset, filename: nil) }
 
     it { is_expected.not_to be_valid }
   end
diff --git a/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
index b0ce96f1ac55c..b7ec1f2eaed62 100644
--- a/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/elections/admin/permissions_spec.rb
@@ -22,13 +22,13 @@
   let(:answer) { nil }
   let(:trustee_participatory_space) { create :trustees_participatory_space }
   let(:questionnaire) { election&.questionnaire }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   shared_examples "not allowed when election was created on the bulletin board" do
     context "when election was created on the bulletin board" do
       let(:election) { create :election, :created, component: elections_component }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -37,7 +37,7 @@
       let(:election) { create :election, component: elections_component }
       let(:question) { create :question, :candidates, max_selections: 11, election: election }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -46,7 +46,7 @@
       let(:trustee) { create :trustee, :with_elections }
       let(:trustee_participatory_space) { create :trustees_participatory_space, trustee: trustee }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -80,7 +80,7 @@
     end
     let(:election) { nil }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "election update" do
@@ -88,7 +88,7 @@
       { scope: :admin, action: :update, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when election was created on the bulletin board"
   end
@@ -99,7 +99,7 @@
       { scope: :admin, action: :publish, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when election was created on the bulletin board"
     it_behaves_like "not allowed when election has invalid questions"
@@ -110,7 +110,7 @@
       { scope: :admin, action: :delete, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when election was created on the bulletin board"
   end
@@ -120,7 +120,7 @@
       { scope: :admin, action: :unpublish, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when election was created on the bulletin board"
   end
@@ -134,7 +134,7 @@
       end
       let(:question) { nil }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -144,7 +144,7 @@
         { scope: :admin, action: :update, subject: :question }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -154,7 +154,7 @@
         { scope: :admin, action: :delete, subject: :question }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -170,7 +170,7 @@
       end
       let(:answer) { nil }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -180,7 +180,7 @@
         { scope: :admin, action: :update, subject: :answer }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -190,7 +190,7 @@
         { scope: :admin, action: :delete, subject: :answer }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -202,7 +202,7 @@
         { scope: :admin, action: :select, subject: :answer }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     describe "import proposals" do
@@ -210,7 +210,7 @@
         { scope: :admin, action: :import_proposals, subject: :answer }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when election was created on the bulletin board"
     end
@@ -221,7 +221,7 @@
       end
       let(:trustee) { nil }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     describe "remove trustee from participatory space" do
@@ -229,7 +229,7 @@
         { scope: :admin, action: :delete, subject: :trustee_participatory_space }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
 
       it_behaves_like "not allowed when trustee has elections"
     end
@@ -239,7 +239,7 @@
         { scope: :admin, action: :update, subject: :trustee_participatory_space }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when subject is a questionnaire" do
@@ -248,13 +248,13 @@
       end
 
       context "when feedback form is present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when feedback form is missing" do
         let(:questionnaire) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -263,7 +263,7 @@
         { scope: :admin, action: :read, subject: :steps }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     describe "update election steps" do
@@ -271,7 +271,7 @@
         { scope: :admin, action: :update, subject: :steps }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 end
diff --git a/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
index 7dbc8f0850724..039f9a1acad67 100644
--- a/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/elections/permissions_spec.rb
@@ -15,7 +15,7 @@
   end
   let(:elections_component) { create :elections_component }
   let(:election) { create :election, :published, component: elections_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
diff --git a/decidim-elections/spec/permissions/decidim/elections/trustee_zone/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/elections/trustee_zone/permissions_spec.rb
index a2fc69e792e93..475001cb4fcb6 100644
--- a/decidim-elections/spec/permissions/decidim/elections/trustee_zone/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/elections/trustee_zone/permissions_spec.rb
@@ -19,7 +19,7 @@
   end
   let(:trustee_participatory_space) { create :trustees_participatory_space, trustee: trustee }
   let(:permission_trustee) { trustee }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   shared_examples "not allowed when the user is not a trustee" do
     context "when the user is not a trustee" do
@@ -75,7 +75,7 @@
       { scope: :trustee_zone, action: :view, subject: :trustee }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when the user is not a trustee"
     it_behaves_like "not allowed when the given trustee is not the same than the user trustee"
@@ -86,7 +86,7 @@
       { scope: :trustee_zone, action: :update, subject: :trustee }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when the user is not a trustee"
     it_behaves_like "not allowed when the given trustee is not the same than the user trustee"
@@ -97,7 +97,7 @@
       { scope: :trustee_zone, action: :view, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when the user is not a trustee"
     it_behaves_like "not allowed when the given trustee is not the same than the user trustee"
@@ -108,7 +108,7 @@
       { scope: :trustee_zone, action: :update, subject: :election }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
 
     it_behaves_like "not allowed when election is not attached to trustee"
     it_behaves_like "not allowed when the user is not a trustee"
diff --git a/decidim-elections/spec/permissions/decidim/votings/admin/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/votings/admin/permissions_spec.rb
index 9a6140de16071..abbd4755d5cb3 100644
--- a/decidim-elections/spec/permissions/decidim/votings/admin/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/votings/admin/permissions_spec.rb
@@ -10,7 +10,7 @@
   let(:voting) { create :voting, organization: organization }
   let(:context) { { participatory_space: voting }.merge(extra_context) }
   let(:extra_context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:action) do
     { scope: :admin, action: action_name, subject: action_subject }
   end
@@ -29,14 +29,14 @@
       { scope: :admin, action: :foo, subject: :bar }
     end
 
-    it { is_expected.to eq false }
+    it { is_expected.to be false }
   end
 
   describe "participatory spaces" do
     let(:action_subject) { :participatory_space }
     let(:action_name) { :read }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "components" do
@@ -46,7 +46,7 @@
       { participatory_space: voting }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "votings" do
@@ -55,13 +55,13 @@
     context "when creating a voting" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when reading a voting" do
       let(:action_name) { :read }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -71,7 +71,7 @@
     context "when managing a census" do
       let(:action_name) { :manage }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -81,14 +81,14 @@
         let(:action_subject) { :monitoring_committee_members }
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when reading the Certificates" do
         let(:action_subject) { :monitoring_committee_polling_station_closures }
         let(:action_name) { :read }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -100,21 +100,21 @@
         let(:action_subject) { :admin_dashboard }
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when reading the votings" do
         let(:action_subject) { :votings }
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when listing their voting" do
         let(:action_subject) { :voting }
         let(:action_name) { :list }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when listing another voting" do
@@ -123,28 +123,28 @@
         let(:action_subject) { :voting }
         let(:action_name) { :list }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when reading their voting's Polling Officers" do
         let(:action_subject) { :polling_officers }
         let(:action_name) { :read }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when reading their voting's Committee Members" do
         let(:action_subject) { :monitoring_committee_members }
         let(:action_name) { :read }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when reading their voting's Certificates" do
         let(:action_subject) { :monitoring_committee_polling_station_closures }
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -160,23 +160,23 @@
       context "when census ballot style is not present" do
         let(:ballot_style) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when census dataset is not present" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when census dataset is in init_data status" do
         let!(:dataset) { create(:dataset, voting: voting, status: :init_data) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when census dataset is in another status" do
         let!(:dataset) { create(:dataset, voting: voting, status: :data_created) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
diff --git a/decidim-elections/spec/permissions/decidim/votings/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/votings/permissions_spec.rb
index 0294e60ef75e5..c70a1f3b84dfe 100644
--- a/decidim-elections/spec/permissions/decidim/votings/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/votings/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:organization) { create :organization }
   let(:voting) { create :voting, organization: organization }
   let(:context) { { voting: voting } }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when the action is for the admin part" do
     let(:action) do
@@ -31,7 +31,7 @@
       context "when the consultation is published" do
         let(:voting) { create :voting, :published, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
diff --git a/decidim-elections/spec/permissions/decidim/votings/polling_officer_zone/permissions_spec.rb b/decidim-elections/spec/permissions/decidim/votings/polling_officer_zone/permissions_spec.rb
index 4de89078b90d9..c538d230aedc8 100644
--- a/decidim-elections/spec/permissions/decidim/votings/polling_officer_zone/permissions_spec.rb
+++ b/decidim-elections/spec/permissions/decidim/votings/polling_officer_zone/permissions_spec.rb
@@ -19,7 +19,7 @@ module PollingOfficerZone
         let(:other_voting) { create(:voting, organization: voting.organization) }
         let(:polling_officer) { create(:polling_officer, user: user, voting: voting) }
         let(:polling_officers) { [polling_officer, create(:polling_officer, user: user, voting: other_voting)] }
-        let(:permission_action) { Decidim::PermissionAction.new(action) }
+        let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
         shared_examples "not allowed when a polling officer is not attached to the current user" do
           context "when a polling officer is not attached to a user" do
@@ -58,7 +58,7 @@ module PollingOfficerZone
             { scope: :polling_officer_zone, action: :view, subject: :polling_officers }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
 
           it_behaves_like "not allowed when a polling officer is not attached to the current user"
         end
@@ -68,7 +68,7 @@ module PollingOfficerZone
             { scope: :polling_officer_zone, action: :manage, subject: :polling_station_results }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
 
           it_behaves_like "not allowed when a polling officer is not attached to the current user"
         end
@@ -78,7 +78,7 @@ module PollingOfficerZone
             { scope: :polling_officer_zone, action: :manage, subject: :in_person_vote }
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
 
           it_behaves_like "not allowed when a polling officer is not attached to the current user"
         end
diff --git a/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb b/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
index 485f00d8dc4d8..77146030fcb72 100644
--- a/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
+++ b/decidim-elections/spec/presenters/decidim/elections/election_presenter_spec.rb
@@ -34,8 +34,8 @@ module Elections
 
         it "returns the description with html tags" do
           expect(subject).to eq "Election description and some spam links:<ul>\n" \
-                            "<li><a href='http://example.org'>this is for SEO</a></li>\n" \
-                            "<li><strong><a href='http://example.org'>visit this</a></strong></li></ul>"
+                                "<li><a href='http://example.org'>this is for SEO</a></li>\n" \
+                                "<li><strong><a href='http://example.org'>visit this</a></strong></li></ul>"
         end
 
         context "when stripping tags" do
diff --git a/decidim-elections/spec/presenters/decidim/votings/voting_presenter_spec.rb b/decidim-elections/spec/presenters/decidim/votings/voting_presenter_spec.rb
index d318f74b6485b..dfd516730561c 100644
--- a/decidim-elections/spec/presenters/decidim/votings/voting_presenter_spec.rb
+++ b/decidim-elections/spec/presenters/decidim/votings/voting_presenter_spec.rb
@@ -26,11 +26,11 @@ module Decidim
 
     describe "when images are attached" do
       it "resolves introductory_image_url" do
-        expect(subject.introductory_image_url).to eq("http://#{organization_host}#{voting.attached_uploader(:introductory_image).path}")
+        expect(subject.introductory_image_url).to eq("http://#{organization_host}:#{Capybara.server_port}#{voting.attached_uploader(:introductory_image).path}")
       end
 
       it "resolves banner_image_url" do
-        expect(subject.banner_image_url).to eq("http://#{organization_host}#{voting.attached_uploader(:banner_image).path}")
+        expect(subject.banner_image_url).to eq("http://#{organization_host}:#{Capybara.server_port}#{voting.attached_uploader(:banner_image).path}")
       end
     end
   end
diff --git a/decidim-elections/spec/queries/decidim/elections/admin/votes_for_statistics_spec.rb b/decidim-elections/spec/queries/decidim/elections/admin/votes_for_statistics_spec.rb
index 7e9ab9de11371..6f2351a048ed3 100644
--- a/decidim-elections/spec/queries/decidim/elections/admin/votes_for_statistics_spec.rb
+++ b/decidim-elections/spec/queries/decidim/elections/admin/votes_for_statistics_spec.rb
@@ -6,10 +6,10 @@
   subject { described_class.for(election) }
 
   let!(:election) { create :election, :bb_test, :vote }
-  let!(:user_1) { create :user, :confirmed }
-  let!(:user_2) { create :user, :confirmed }
-  let!(:user_1_votes) { create_list :vote, 3, election: election, status: "accepted", voter_id: "voter_#{user_1.id}" }
-  let!(:user_2_votes) { create :vote, election: election, status: "rejected", voter_id: "voter_#{user_2.id}" }
+  let!(:user1) { create :user, :confirmed }
+  let!(:user2) { create :user, :confirmed }
+  let!(:user1_votes) { create_list :vote, 3, election: election, status: "accepted", voter_id: "voter_#{user1.id}" }
+  let!(:user2_votes) { create :vote, election: election, status: "rejected", voter_id: "voter_#{user2.id}" }
 
   describe "query" do
     it "returns the id and voter id for accepted votes only" do
diff --git a/decidim-elections/spec/requests/election_search_spec.rb b/decidim-elections/spec/requests/election_search_spec.rb
new file mode 100644
index 0000000000000..56577e7583c59
--- /dev/null
+++ b/decidim-elections/spec/requests/election_search_spec.rb
@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Election search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :component, manifest_name: "elections" }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:active_election1) do
+    create(
+      :election,
+      :published,
+      :ongoing,
+      component: component,
+      description: Decidim::Faker::Localized.literal("Chambray chia selvage hammock health goth.")
+    )
+  end
+  let!(:active_election2) do
+    create(
+      :election,
+      :published,
+      :ongoing,
+      component: component,
+      description: Decidim::Faker::Localized.literal("Tacos gentrify celiac mixtape.")
+    )
+  end
+  let!(:upcoming_election) do
+    create(
+      :election,
+      :published,
+      :upcoming,
+      component: component,
+      description: Decidim::Faker::Localized.literal("Selfies kale chips taxidermy adaptogen.")
+    )
+  end
+  let!(:finished_election) do
+    create(
+      :election,
+      :published,
+      :finished,
+      component: component
+    )
+  end
+  let!(:unpublished_election) do
+    create(
+      :election,
+      :upcoming,
+      component: component
+    )
+  end
+  let!(:external_election) { create :election }
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).elections_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it "displays all active elections without any filters" do
+    expect(subject).to include(translated(active_election1.title))
+    expect(subject).to include(translated(active_election2.title))
+    expect(subject).not_to include(translated(upcoming_election.title))
+    expect(subject).not_to include(translated(finished_election.title))
+    expect(subject).not_to include(translated(unpublished_election.title))
+    expect(subject).not_to include(translated(external_election.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "mixtape" } }
+
+    it "displays only the election containing the search_text" do
+      expect(subject).not_to include(translated(active_election1.title))
+      expect(subject).to include(translated(active_election2.title))
+      expect(subject).not_to include(translated(upcoming_election.title))
+      expect(subject).not_to include(translated(finished_election.title))
+      expect(subject).not_to include(translated(unpublished_election.title))
+      expect(subject).not_to include(translated(external_election.title))
+    end
+  end
+
+  context "when searching by date" do
+    let(:filter_params) { { with_any_date: date } }
+
+    context "and the date is active" do
+      let(:date) { %w(active) }
+
+      it "only displays active elections" do
+        expect(subject).to include(translated(active_election1.title))
+        expect(subject).to include(translated(active_election2.title))
+        expect(subject).not_to include(translated(upcoming_election.title))
+        expect(subject).not_to include(translated(finished_election.title))
+        expect(subject).not_to include(translated(unpublished_election.title))
+        expect(subject).not_to include(translated(external_election.title))
+      end
+    end
+
+    context "and the date is finished" do
+      let(:date) { %w(finished) }
+
+      it "only displays finished elections" do
+        expect(subject).not_to include(translated(active_election1.title))
+        expect(subject).not_to include(translated(active_election2.title))
+        expect(subject).not_to include(translated(upcoming_election.title))
+        expect(subject).to include(translated(finished_election.title))
+        expect(subject).not_to include(translated(unpublished_election.title))
+        expect(subject).not_to include(translated(external_election.title))
+      end
+    end
+
+    context "and the date is upcoming" do
+      let(:date) { %w(upcoming) }
+
+      it "only displays upcoming elections" do
+        expect(subject).not_to include(translated(active_election1.title))
+        expect(subject).not_to include(translated(active_election2.title))
+        expect(subject).to include(translated(upcoming_election.title))
+        expect(subject).not_to include(translated(finished_election.title))
+        expect(subject).not_to include(translated(unpublished_election.title))
+        expect(subject).not_to include(translated(external_election.title))
+      end
+    end
+
+    context "and the date is finished or upcoming" do
+      let(:date) { %w(finished upcoming) }
+
+      it "only displays finished and upcoming elections" do
+        expect(subject).not_to include(translated(active_election1.title))
+        expect(subject).not_to include(translated(active_election2.title))
+        expect(subject).to include(translated(upcoming_election.title))
+        expect(subject).to include(translated(finished_election.title))
+        expect(subject).not_to include(translated(unpublished_election.title))
+        expect(subject).not_to include(translated(external_election.title))
+      end
+    end
+  end
+end
diff --git a/decidim-elections/spec/requests/voting_search_spec.rb b/decidim-elections/spec/requests/voting_search_spec.rb
new file mode 100644
index 0000000000000..45b0928f40a6f
--- /dev/null
+++ b/decidim-elections/spec/requests/voting_search_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Voting search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:organization) { create(:organization) }
+  let(:filter_params) { {} }
+
+  let!(:published_voting) { create :voting, :published, title: Decidim::Faker::Localized.localized { "Tacos gentrify celiac mixtape." }, organization: organization }
+  let!(:upcoming_voting) { create :voting, :upcoming, organization: organization }
+  let!(:ongoing_voting) { create :voting, :ongoing, organization: organization }
+  let!(:finished_voting) { create :voting, :finished, organization: organization }
+  let!(:ongoing_online_voting) { create :voting, :ongoing, :online, organization: organization }
+  let!(:ongoing_in_person_voting) { create :voting, :ongoing, :in_person, organization: organization }
+  let!(:ongoing_hybrid_voting) { create :voting, :ongoing, :hybrid, organization: organization }
+  let!(:unpublished_voting) { create :voting, :unpublished, organization: organization }
+  let!(:external_voting) { create :voting, :published }
+
+  let(:request_path) { decidim_votings.votings_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all published votings within the organization without any filters" do
+    expect(subject).to include(translated(published_voting.title))
+    expect(subject).to include(translated(upcoming_voting.title))
+    expect(subject).to include(translated(ongoing_voting.title))
+    expect(subject).to include(translated(finished_voting.title))
+    expect(subject).to include(translated(ongoing_online_voting.title))
+    expect(subject).to include(translated(ongoing_in_person_voting.title))
+    expect(subject).to include(translated(ongoing_hybrid_voting.title))
+    expect(subject).not_to include(translated(unpublished_voting.title))
+    expect(subject).not_to include(translated(external_voting.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "mixtape" } }
+
+    it "displays only the votings containing the search_text" do
+      expect(subject).to include(translated(published_voting.title))
+      expect(subject).not_to include(translated(upcoming_voting.title))
+      expect(subject).not_to include(translated(ongoing_voting.title))
+      expect(subject).not_to include(translated(finished_voting.title))
+      expect(subject).not_to include(translated(ongoing_online_voting.title))
+      expect(subject).not_to include(translated(ongoing_in_person_voting.title))
+      expect(subject).not_to include(translated(ongoing_hybrid_voting.title))
+      expect(subject).not_to include(translated(unpublished_voting.title))
+      expect(subject).not_to include(translated(external_voting.title))
+    end
+  end
+
+  context "when searching by date" do
+    let(:filter_params) { { with_any_date: date } }
+
+    context "and the date is active" do
+      let(:date) { %w(active) }
+
+      it "only displays active votings" do
+        expect(subject).not_to include(translated(published_voting.title))
+        expect(subject).not_to include(translated(upcoming_voting.title))
+        expect(subject).to include(translated(ongoing_voting.title))
+        expect(subject).not_to include(translated(finished_voting.title))
+        expect(subject).to include(translated(ongoing_online_voting.title))
+        expect(subject).to include(translated(ongoing_in_person_voting.title))
+        expect(subject).to include(translated(ongoing_hybrid_voting.title))
+        expect(subject).not_to include(translated(unpublished_voting.title))
+        expect(subject).not_to include(translated(external_voting.title))
+      end
+    end
+
+    context "and the date is finished" do
+      let(:date) { %w(finished) }
+
+      it "only displays finished votings" do
+        expect(subject).not_to include(translated(published_voting.title))
+        expect(subject).not_to include(translated(upcoming_voting.title))
+        expect(subject).not_to include(translated(ongoing_voting.title))
+        expect(subject).to include(translated(finished_voting.title))
+        expect(subject).not_to include(translated(ongoing_online_voting.title))
+        expect(subject).not_to include(translated(ongoing_in_person_voting.title))
+        expect(subject).not_to include(translated(ongoing_hybrid_voting.title))
+        expect(subject).not_to include(translated(unpublished_voting.title))
+        expect(subject).not_to include(translated(external_voting.title))
+      end
+    end
+
+    context "and the date is upcoming" do
+      let(:date) { %w(upcoming) }
+
+      it "only displays upcoming votings" do
+        expect(subject).to include(translated(published_voting.title))
+        expect(subject).to include(translated(upcoming_voting.title))
+        expect(subject).not_to include(translated(ongoing_voting.title))
+        expect(subject).not_to include(translated(finished_voting.title))
+        expect(subject).not_to include(translated(ongoing_online_voting.title))
+        expect(subject).not_to include(translated(ongoing_in_person_voting.title))
+        expect(subject).not_to include(translated(ongoing_hybrid_voting.title))
+        expect(subject).not_to include(translated(unpublished_voting.title))
+        expect(subject).not_to include(translated(external_voting.title))
+      end
+    end
+
+    context "and the date is finished or upcoming" do
+      let(:date) { %w(finished upcoming) }
+
+      it "only displays finished and upcoming votings" do
+        expect(subject).to include(translated(published_voting.title))
+        expect(subject).to include(translated(upcoming_voting.title))
+        expect(subject).not_to include(translated(ongoing_voting.title))
+        expect(subject).to include(translated(finished_voting.title))
+        expect(subject).not_to include(translated(ongoing_online_voting.title))
+        expect(subject).not_to include(translated(ongoing_in_person_voting.title))
+        expect(subject).not_to include(translated(ongoing_hybrid_voting.title))
+        expect(subject).not_to include(translated(unpublished_voting.title))
+        expect(subject).not_to include(translated(external_voting.title))
+      end
+    end
+  end
+end
diff --git a/decidim-elections/spec/services/decidim/elections/election_search_spec.rb b/decidim-elections/spec/services/decidim/elections/election_search_spec.rb
deleted file mode 100644
index 6b761ff0a0894..0000000000000
--- a/decidim-elections/spec/services/decidim/elections/election_search_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Elections
-  describe ElectionSearch do
-    subject { described_class.new(params) }
-
-    let(:current_component) { create :component, manifest_name: "elections" }
-    let!(:active_election) do
-      create(
-        :election,
-        :ongoing,
-        component: current_component,
-        description: Decidim::Faker::Localized.literal("Chambray chia selvage hammock health goth.")
-      )
-    end
-    let!(:upcoming_election) do
-      create(
-        :election,
-        :upcoming,
-        component: current_component,
-        description: Decidim::Faker::Localized.literal("Selfies kale chips taxidermy adaptogen.")
-      )
-    end
-    let!(:finished_election) do
-      create(
-        :election,
-        :finished,
-        component: current_component,
-        description: Decidim::Faker::Localized.literal("Tacos gentrify celiac mixtape.")
-      )
-    end
-    let(:external_election) { create :election }
-    let(:component_id) { current_component.id }
-    let(:organization_id) { current_component.organization.id }
-    let(:default_params) { { component: current_component, organization: current_component.organization } }
-    let(:params) { default_params }
-
-    describe "base query" do
-      context "when no component is passed" do
-        let(:default_params) { { component: nil } }
-
-        it "raises an error" do
-          expect { subject.results }.to raise_error(StandardError, "Missing component")
-        end
-      end
-    end
-
-    describe "filters" do
-      context "with component_id" do
-        it "only returns elections from the given component" do
-          external_election = create(:election)
-
-          expect(subject.results).not_to include(external_election)
-        end
-      end
-
-      context "with status" do
-        let(:params) { default_params.merge(state: state) }
-
-        context "when active" do
-          let(:state) { ["active"] }
-
-          it "only returns active elections" do
-            expect(subject.results).to match_array [active_election]
-          end
-        end
-
-        context "when finished" do
-          let(:state) { ["finished"] }
-
-          it "only returns finished elections" do
-            expect(subject.results).to match_array [finished_election]
-          end
-        end
-
-        context "when upcoming" do
-          let(:state) { ["upcoming"] }
-
-          it "only returns upcoming elections" do
-            expect(subject.results).to match_array [upcoming_election]
-          end
-        end
-      end
-
-      context "with search_text" do
-        let(:params) { default_params.merge(search_text: "mixtape") }
-
-        it "show only the election containing the search_text" do
-          expect(subject.results).to include(finished_election)
-          expect(subject.results.length).to eq(1)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-elections/spec/shared/admin_manages_election_context.rb b/decidim-elections/spec/shared/admin_manages_election_shared_context.rb
similarity index 100%
rename from decidim-elections/spec/shared/admin_manages_election_context.rb
rename to decidim-elections/spec/shared/admin_manages_election_shared_context.rb
diff --git a/decidim-elections/spec/shared/full_election_process_context.rb b/decidim-elections/spec/shared/full_election_process_shared_context.rb
similarity index 98%
rename from decidim-elections/spec/shared/full_election_process_context.rb
rename to decidim-elections/spec/shared/full_election_process_shared_context.rb
index f36595b2f1aa7..5982a73329d00 100644
--- a/decidim-elections/spec/shared/full_election_process_context.rb
+++ b/decidim-elections/spec/shared/full_election_process_shared_context.rb
@@ -64,6 +64,7 @@ def access_trustee_zone(trustee_index, upload_keys = true) # rubocop:disable Sty
         visit decidim.decidim_elections_trustee_zone_path
 
         if upload_keys
+          expect(page).to have_content("Upload your identification keys")
           attach_file(private_keys[trustee_index]) do
             click_button "Upload your identification keys"
           end
diff --git a/decidim-elections/spec/shared/test_bulletin_board_context.rb b/decidim-elections/spec/shared/test_bulletin_board_shared_context.rb
similarity index 100%
rename from decidim-elections/spec/shared/test_bulletin_board_context.rb
rename to decidim-elections/spec/shared/test_bulletin_board_shared_context.rb
diff --git a/decidim-elections/spec/system/admin/admin_manages_election_steps_spec.rb b/decidim-elections/spec/system/admin/admin_manages_election_steps_spec.rb
index a5591baa45ee3..55b656809e55b 100644
--- a/decidim-elections/spec/system/admin/admin_manages_election_steps_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_election_steps_spec.rb
@@ -163,10 +163,10 @@
     end
 
     context "with vote statistics" do
-      let!(:user_1) { create :user, :confirmed }
-      let!(:user_2) { create :user, :confirmed }
-      let!(:user_1_votes) { create_list :vote, 3, election: election, status: "accepted", voter_id: "voter_#{user_1.id}" }
-      let!(:user_2_votes) { create :vote, election: election, status: "accepted", voter_id: "voter_#{user_2.id}" }
+      let!(:user1) { create :user, :confirmed }
+      let!(:user2) { create :user, :confirmed }
+      let!(:user1_votes) { create_list :vote, 3, election: election, status: "accepted", voter_id: "voter_#{user1.id}" }
+      let!(:user2_votes) { create :vote, election: election, status: "accepted", voter_id: "voter_#{user2.id}" }
 
       it "shows votes and unique voters" do
         visit_steps_page
@@ -227,14 +227,14 @@
         expect(page).to have_content("Processing...")
       end
 
-      within ".form.tally" do
+      within ".form.tally_started" do
         expect(page).to have_content("Tally process")
       end
     end
   end
 
   describe "report missing trustee" do
-    let(:election) { create :election, :bb_test, :tally, component: current_component }
+    let(:election) { create :election, :bb_test, :tally_started, component: current_component }
     let(:trustee) { election.trustees.first }
 
     it "marks the trustee as missing" do
diff --git a/decidim-elections/spec/system/admin/admin_manages_voting_census_spec.rb b/decidim-elections/spec/system/admin/admin_manages_voting_census_spec.rb
index bd2bc237b0462..3994ee6934269 100644
--- a/decidim-elections/spec/system/admin/admin_manages_voting_census_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_voting_census_spec.rb
@@ -5,7 +5,7 @@
 describe "Admin manages polling officers", type: :system do
   include_context "when admin managing a voting"
 
-  let(:csv_file) { Decidim::Dev.test_file("import_voting_census.csv", "text/csv") }
+  let(:csv_file) { upload_test_file(Decidim::Dev.test_file("import_voting_census.csv", "text/csv")) }
 
   before do
     switch_to_host(organization.host)
@@ -21,9 +21,8 @@
     end
 
     it "uploads a csv" do
+      dynamically_attach_file(:dataset_file, Decidim::Dev.asset("import_voting_census.csv"))
       within ".form.new_census" do
-        attach_file "File", Decidim::Dev.asset("import_voting_census.csv")
-
         find("*[type=submit]").click
       end
 
@@ -31,6 +30,34 @@
     end
   end
 
+  context "when data is invalid" do
+    before do
+      create :dataset, :data_created, voting: voting
+      visit decidim_admin_votings.voting_census_path(voting)
+    end
+
+    it "shows the processed file result" do
+      expect(page).to have_admin_callout("Finished processing")
+      expect(page).not_to have_content("You can now proceed to generate the access codes")
+      expect(page).to have_content("Please delete the current census and start over")
+    end
+
+    it "shows an option to delete the census" do
+      expect(page).to have_link("Delete all census data", count: 2)
+    end
+
+    context "when deleting the census" do
+      it "deletes the census" do
+        within "#wrapper-action-view" do
+          accept_confirm { click_link "Delete all census data" }
+        end
+
+        expect(page).to have_admin_callout("Census data deleted")
+        expect(page).to have_content("There is no census yet")
+      end
+    end
+  end
+
   context "when data exists" do
     before do
       create :dataset, :data_created, :with_data, voting: voting
diff --git a/decidim-elections/spec/system/admin/admin_manages_votings_spec.rb b/decidim-elections/spec/system/admin/admin_manages_votings_spec.rb
index d7e92af106b3c..104322df3786a 100644
--- a/decidim-elections/spec/system/admin/admin_manages_votings_spec.rb
+++ b/decidim-elections/spec/system/admin/admin_manages_votings_spec.rb
@@ -52,12 +52,14 @@
           ca: "Descripció més llarga"
         )
         fill_in :voting_slug, with: "slug"
-        attach_file :voting_banner_image, image1_path
-        attach_file :voting_introductory_image, image2_path
-        select "Online", from: :voting_voting_type
+      end
 
-        scope_pick select_data_picker(:voting_scope_id), organization.scopes.first
+      dynamically_attach_file(:voting_banner_image, image1_path)
+      dynamically_attach_file(:voting_introductory_image, image2_path)
 
+      within ".new_voting" do
+        select "Online", from: :voting_voting_type
+        scope_pick select_data_picker(:voting_scope_id), organization.scopes.first
         find("*[type=submit]").click
       end
 
@@ -105,10 +107,13 @@
         )
         fill_in :voting_slug, with: "slug"
         select "Online", from: :voting_voting_type
-        attach_file :voting_banner_image, image1_path
-        attach_file :voting_introductory_image, image2_path
-        scope_pick select_data_picker(:voting_scope_id), organization.scopes.first
+      end
+
+      dynamically_attach_file(:voting_banner_image, image1_path)
+      dynamically_attach_file(:voting_introductory_image, image2_path)
 
+      within ".new_voting" do
+        scope_pick select_data_picker(:voting_scope_id), organization.scopes.first
         find("*[type=submit]").click
       end
 
@@ -133,7 +138,7 @@
         es: "Mi nuevo título",
         ca: "El meu nou títol"
       )
-      attach_file :voting_banner_image, image3_path
+      dynamically_attach_file(:voting_banner_image, image3_path, remove_before: true)
       select "Online", from: :voting_voting_type
 
       within ".edit_voting" do
@@ -178,14 +183,17 @@
       click_link translated(voting.title)
     end
 
-    it "does not update the voting" do
-      attach_file :voting_banner_image, image_invalid_path
+    it "shows an error inside the upload modal" do
+      find("#voting_banner_image_button").click
 
-      within ".edit_voting" do
-        find("*[type=submit]").click
-      end
+      within ".upload-modal" do
+        find(".remove-upload-item").click
+        input_element = find("input[type='file']", visible: :all)
+        input_element.attach_file(image_invalid_path)
 
-      expect(page).to have_admin_callout("problem")
+        expect(page).to have_content("only files with the following extensions are allowed: jpeg, jpg, png", count: 1)
+        expect(page).to have_css(".upload-errors .form-error", count: 1)
+      end
     end
   end
 
diff --git a/decidim-elections/spec/system/check_census_spec.rb b/decidim-elections/spec/system/check_census_spec.rb
index 2be931098682a..ee728d6d50380 100644
--- a/decidim-elections/spec/system/check_census_spec.rb
+++ b/decidim-elections/spec/system/check_census_spec.rb
@@ -36,6 +36,18 @@
     end
   end
 
+  context "when the page has been hidden" do
+    before do
+      voting.update!(show_check_census: false)
+    end
+
+    it "returns a not found page" do
+      visit decidim_votings.voting_path(voting)
+
+      expect(page).not_to have_content("CAN I VOTE?")
+    end
+  end
+
   context "when census data is correct" do
     before do
       visit decidim_votings.voting_check_census_path(voting)
diff --git a/decidim-elections/spec/system/election_log_spec.rb b/decidim-elections/spec/system/election_log_spec.rb
index 32b17e65584eb..1271e83f1217b 100644
--- a/decidim-elections/spec/system/election_log_spec.rb
+++ b/decidim-elections/spec/system/election_log_spec.rb
@@ -105,7 +105,7 @@
   context "when tally has started" do
     include_context "with test bulletin board"
 
-    let(:election) { create(:election, :bb_test, :tally, component: component) }
+    let(:election) { create(:election, :bb_test, :tally_started, component: component) }
 
     it "shows that tally has started" do
       expect(page).to have_content("The election got created and is successfully set up on the Bulletin Board.")
diff --git a/decidim-elections/spec/system/explore_elections_spec.rb b/decidim-elections/spec/system/explore_elections_spec.rb
index 064ccb2486015..bf192b54d7aac 100644
--- a/decidim-elections/spec/system/explore_elections_spec.rb
+++ b/decidim-elections/spec/system/explore_elections_spec.rb
@@ -43,7 +43,7 @@
       it "allows searching by text" do
         visit_component
         within ".filters" do
-          fill_in "filter[search_text]", with: translated(elections.first.title)
+          fill_in "filter[search_text_cont]", with: translated(elections.first.title)
 
           # The form should be auto-submitted when filter box is filled up, but
           # somehow it's not happening. So we workaround that be explicitly
@@ -56,12 +56,12 @@
         expect(page).to have_content(translated(elections.first.title))
       end
 
-      it "allows filtering by state" do
+      it "allows filtering by date" do
         finished_election = create(:election, :complete, :published, :finished, component: component)
         upcoming_election = create(:election, :complete, :published, :upcoming, component: component)
         visit_component
 
-        within ".state_check_boxes_tree_filter" do
+        within ".with_any_date_check_boxes_tree_filter" do
           uncheck "All"
           check "Finished"
         end
@@ -69,14 +69,14 @@
         expect(page).to have_css(".card--election", count: 1)
         expect(page).to have_content(translated(finished_election.title))
 
-        within ".state_check_boxes_tree_filter" do
+        within ".with_any_date_check_boxes_tree_filter" do
           uncheck "All"
           check "Active"
         end
 
         expect(page).to have_css(".card--election", count: 5)
 
-        within ".state_check_boxes_tree_filter" do
+        within ".with_any_date_check_boxes_tree_filter" do
           uncheck "All"
           check "Upcoming"
         end
@@ -84,7 +84,7 @@
         expect(page).to have_css(".card--election", count: 1)
         expect(page).to have_content(translated(upcoming_election.title))
 
-        within ".state_check_boxes_tree_filter" do
+        within ".with_any_date_check_boxes_tree_filter" do
           uncheck "All"
         end
 
diff --git a/decidim-elections/spec/system/polling_officer_zone_spec.rb b/decidim-elections/spec/system/polling_officer_zone_spec.rb
index 2b26034158ef3..4da102f4aa4b5 100644
--- a/decidim-elections/spec/system/polling_officer_zone_spec.rb
+++ b/decidim-elections/spec/system/polling_officer_zone_spec.rb
@@ -114,8 +114,8 @@
       it "can attach images to the closure" do
         expect(page).to have_content("Vote recount - Upload certificate")
 
+        dynamically_attach_file(:closure_certify_photos, Decidim::Dev.asset("city.jpeg"))
         within ".form.certify_closure" do
-          attach_file :closure_certify_add_photos, Decidim::Dev.asset("city.jpeg")
           find("*[type=submit]").click
         end
 
diff --git a/decidim-elections/spec/system/vote_in_person_spec.rb b/decidim-elections/spec/system/vote_in_person_spec.rb
index 5a1206ccba92c..ee6acb64f3ae5 100644
--- a/decidim-elections/spec/system/vote_in_person_spec.rb
+++ b/decidim-elections/spec/system/vote_in_person_spec.rb
@@ -31,7 +31,8 @@
   shared_examples "a polling officer registers an in person vote" do
     include_context "with test bulletin board"
 
-    let(:questions_title) { "She is entitled to vote in the following questions:" }
+    let(:questions_title) { "They're entitled to vote in the following questions:" }
+    let(:census_verified) { "This participant has not voted in person yet." }
 
     it "can identify a person and register their vote", :slow do
       click_link "Identify a person"
@@ -42,6 +43,8 @@
       expect(page).to have_content("Jon Doe")
       click_button "Verify document"
 
+      election.reload
+      expect(page).to have_content(census_verified)
       expect(page).to have_content(questions_title)
       election.questions.each do |question|
         expect(page).to have_content(translated(question.title))
@@ -73,7 +76,8 @@
     end
 
     it_behaves_like "a polling officer registers an in person vote" do
-      let(:questions_title) { "The participant has already voted online and is entitled to vote in the following questions:" }
+      let(:census_verified) { "This participant has already voted online. If they vote in person, the previous votes will be invalidated and this will be the definitive vote." }
+      let(:questions_title) { "This participant has already voted online and is entitled to vote in the following questions:" }
     end
   end
 
diff --git a/decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb b/decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb
index 61a587190b2ec..551f0c114b3ec 100644
--- a/decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb
+++ b/decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb
@@ -89,7 +89,7 @@
           click_button "Submit"
         end
 
-        expect(page).to have_content("New to Decidim?")
+        expect(page).to have_content("New to the platform?")
 
         within "#onboarding-modal" do
           click_button "No, thanks."
@@ -105,7 +105,7 @@
       it "can vote and sign up without feedback" do
         vote_with_census_data
 
-        expect(page).to have_content("New to Decidim?")
+        expect(page).to have_content("New to the platform?")
 
         within "#onboarding-modal" do
           click_button "No, thanks."
@@ -117,7 +117,7 @@
 
         expect(page).to have_current_path router.elections_path
 
-        expect(page).not_to have_content("New to Decidim?")
+        expect(page).not_to have_content("New to the platform?")
       end
     end
   end
diff --git a/decidim-elections/spec/system/voting_spec.rb b/decidim-elections/spec/system/voting_spec.rb
index 175a81b38fd30..0cf1d6275df15 100644
--- a/decidim-elections/spec/system/voting_spec.rb
+++ b/decidim-elections/spec/system/voting_spec.rb
@@ -25,6 +25,13 @@
       expect(page).to have_i18n_content(voting.description)
     end
 
+    it_behaves_like "has embedded video in description", :description do
+      before do
+        voting.update!(description: description)
+        visit decidim_votings.voting_path(voting)
+      end
+    end
+
     context "when the voting is unpublished" do
       let!(:voting) do
         create(:voting, :unpublished, organization: organization)
diff --git a/decidim-elections/spec/system/votings_spec.rb b/decidim-elections/spec/system/votings_spec.rb
index d3902af25333a..e3c7795df6732 100644
--- a/decidim-elections/spec/system/votings_spec.rb
+++ b/decidim-elections/spec/system/votings_spec.rb
@@ -18,7 +18,7 @@
     end
 
     it "redirects to the voting" do
-      expect(page).to have_content(translated(title: single_voting))
+      expect(page).to have_content(translated(single_voting.title))
       expect(page).not_to have_selector("#votings")
     end
   end
@@ -108,7 +108,7 @@
       it "allows searching by text" do
         visit decidim_votings.votings_path
         within ".filters" do
-          fill_in "filter[search_text]", with: translated(voting.title)
+          fill_in "filter[search_text_cont]", with: translated(voting.title)
 
           # The form should be auto-submitted when filter box is filled up, but
           # somehow it's not happening. So we workaround that be explicitly
@@ -121,7 +121,7 @@
         expect(page).to have_content(translated(voting.title))
       end
 
-      describe "when by different states" do
+      describe "when by different dates" do
         let!(:finished_voting) { create(:voting, :finished, organization: organization) }
         let!(:upcoming_voting) { create(:voting, :upcoming, organization: organization) }
         let!(:ongoing_voting) { create(:voting, :ongoing, organization: organization) }
@@ -130,8 +130,8 @@
           visit decidim_votings.votings_path
         end
 
-        it "allows filtering by finished state" do
-          within ".state_check_boxes_tree_filter" do
+        it "allows filtering by finished date" do
+          within ".with_any_date_check_boxes_tree_filter" do
             uncheck "All"
             check "Finished"
           end
@@ -140,8 +140,8 @@
           expect(page).to have_content(translated(finished_voting.title))
         end
 
-        it "allows filtering by active state" do
-          within ".state_check_boxes_tree_filter" do
+        it "allows filtering by active date" do
+          within ".with_any_date_check_boxes_tree_filter" do
             uncheck "All"
             check "Active"
           end
@@ -149,8 +149,8 @@
           expect(page).to have_css(".card--voting", count: 1)
         end
 
-        it "allows filtering by upcoming state" do
-          within ".state_check_boxes_tree_filter" do
+        it "allows filtering by upcoming date" do
+          within ".with_any_date_check_boxes_tree_filter" do
             uncheck "All"
             check "Upcoming"
           end
@@ -159,8 +159,8 @@
           expect(page).to have_content(translated(upcoming_voting.title))
         end
 
-        it "allows filtering by all states" do
-          within ".state_check_boxes_tree_filter" do
+        it "allows filtering by all date" do
+          within ".with_any_date_check_boxes_tree_filter" do
             uncheck "All"
           end
 
diff --git a/decidim-elections/spec/types/decidim/elections/election_type_spec.rb b/decidim-elections/spec/types/decidim/elections/election_type_spec.rb
index 37340f8aac082..5ba72371c0b1e 100644
--- a/decidim-elections/spec/types/decidim/elections/election_type_spec.rb
+++ b/decidim-elections/spec/types/decidim/elections/election_type_spec.rb
@@ -72,7 +72,7 @@ module Elections
         context "when the election's parameters are blocked" do
           let!(:model) { create(:election, :created) }
 
-          it "returns true " do
+          it "returns true" do
             expect(response["blocked"]).to be true
           end
         end
diff --git a/decidim-elections/spec/types/decidim/votings/polling_station_closure_type_spec.rb b/decidim-elections/spec/types/decidim/votings/polling_station_closure_type_spec.rb
index 6423dbb8f8b2a..55eb75fca6d82 100644
--- a/decidim-elections/spec/types/decidim/votings/polling_station_closure_type_spec.rb
+++ b/decidim-elections/spec/types/decidim/votings/polling_station_closure_type_spec.rb
@@ -74,7 +74,7 @@ module Votings
         context "when the closure is signed" do
           let(:signed_at) { Time.current }
 
-          it "returns true " do
+          it "returns true" do
             expect(response["signed"]).to be true
           end
         end
diff --git a/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb b/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb
index dbee0f89cc9ae..caf07f5d56e4c 100644
--- a/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb
+++ b/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb
@@ -5,14 +5,15 @@ module Forms
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
         # questionnaire - The current instance of the questionnaire to be updated.
-        def initialize(form, questionnaire)
+        def initialize(form, questionnaire, user)
           @form = form
           @questionnaire = questionnaire
+          @user = user
         end
 
         # Updates the questionnaire if valid.
@@ -21,13 +22,17 @@ def initialize(form, questionnaire)
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          Decidim::Forms::Questionnaire.transaction do
-            if @questionnaire.questions_editable?
-              update_questionnaire_questions
-              delete_answers unless @questionnaire.published?
-            end
+          Decidim.traceability.perform_action!("update",
+                                               @questionnaire,
+                                               @user) do
+            Decidim::Forms::Questionnaire.transaction do
+              if @questionnaire.questions_editable?
+                update_questionnaire_questions
+                delete_answers unless @questionnaire.published?
+              end
 
-            update_questionnaire
+              update_questionnaire
+            end
           end
 
           broadcast(:ok)
diff --git a/decidim-forms/app/commands/decidim/forms/answer_questionnaire.rb b/decidim-forms/app/commands/decidim/forms/answer_questionnaire.rb
index 95b234768fc9f..16dbd33df52aa 100644
--- a/decidim-forms/app/commands/decidim/forms/answer_questionnaire.rb
+++ b/decidim-forms/app/commands/decidim/forms/answer_questionnaire.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # This command is executed when the user answers a Questionnaire.
-    class AnswerQuestionnaire < Rectify::Command
+    class AnswerQuestionnaire < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
 
       # Initializes a AnswerQuestionnaire Command.
diff --git a/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb b/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
index 4f81f210e924f..fd17d5e49d448 100644
--- a/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
+++ b/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
@@ -22,7 +22,7 @@ module HasQuestionnaire
 
             if defined? Decidim::Templates::Admin
               include Decidim::Templates::Admin::Concerns::Templatable
-              helper Decidim::Templates::Admin::TemplatesHelper
+              helper Decidim::DatalistSelectHelper
 
               def templatable_type
                 "Decidim::Forms::Questionnaire"
@@ -47,7 +47,7 @@ def update
               params["published_at"] = Time.current if params.has_key? "save_and_publish"
               @form = form(Admin::QuestionnaireForm).from_params(params)
 
-              Admin::UpdateQuestionnaire.call(@form, questionnaire) do
+              Admin::UpdateQuestionnaire.call(@form, questionnaire, current_user) do
                 on(:ok) do
                   # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.success")
                   flash[:notice] = I18n.t("update.success", scope: i18n_flashes_scope)
diff --git a/decidim-forms/app/forms/decidim/forms/admin/display_condition_form.rb b/decidim-forms/app/forms/decidim/forms/admin/display_condition_form.rb
index 4f0590609f157..8634cf2b1977f 100644
--- a/decidim-forms/app/forms/decidim/forms/admin/display_condition_form.rb
+++ b/decidim-forms/app/forms/decidim/forms/admin/display_condition_form.rb
@@ -55,21 +55,21 @@ def questions_for_select(questionnaire, id)
         #
         # Returns a Decidim::Forms::Question
         def question
-          @question ||= Question.find_by(id: @decidim_question_id)
+          @question ||= Question.find_by(id: decidim_question_id)
         end
 
         # Finds the Condition Question from the given decidim_condition_question_id
         #
         # Returns a Decidim::Forms::Question
         def condition_question
-          @condition_question ||= Question.find_by(id: @decidim_condition_question_id)
+          @condition_question ||= Question.find_by(id: decidim_condition_question_id)
         end
 
         # Finds the Answer Option from the given decidim_answer_option_id
         #
         # Returns a Decidim::Forms::AnswerOption
         def answer_option
-          @answer_option ||= AnswerOption.find_by(id: @decidim_answer_option_id)
+          @answer_option ||= AnswerOption.find_by(id: decidim_answer_option_id)
         end
 
         private
diff --git a/decidim-forms/app/models/decidim/forms/answer.rb b/decidim-forms/app/models/decidim/forms/answer.rb
index 3496a3e26337c..7c43671feae4e 100644
--- a/decidim-forms/app/models/decidim/forms/answer.rb
+++ b/decidim-forms/app/models/decidim/forms/answer.rb
@@ -4,7 +4,7 @@ module Decidim
   module Forms
     # The data store for an Answer in the Decidim::Forms
     class Answer < Forms::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
       include Decidim::HasAttachments
 
@@ -29,7 +29,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::Forms::DataPortabilityUserAnswersSerializer
+        Decidim::Forms::DownloadYourDataUserAnswersSerializer
       end
 
       def self.newsletter_participant_ids(component)
diff --git a/decidim-forms/app/models/decidim/forms/display_condition.rb b/decidim-forms/app/models/decidim/forms/display_condition.rb
index d0805e37f58dd..12dc77e7158c1 100644
--- a/decidim-forms/app/models/decidim/forms/display_condition.rb
+++ b/decidim-forms/app/models/decidim/forms/display_condition.rb
@@ -33,7 +33,7 @@ def fulfilled?(answer_form)
         when "not_equal"
           answer_form.choices.pluck(:answer_option_id).exclude?(answer_option.id)
         when "match"
-          condition_value.values.reject(&:blank?).any? { |value| answer_form_matches?(answer_form, value) }
+          condition_value.values.compact_blank.any? { |value| answer_form_matches?(answer_form, value) }
         end
       end
 
diff --git a/decidim-forms/app/models/decidim/forms/questionnaire.rb b/decidim-forms/app/models/decidim/forms/questionnaire.rb
index 10539cb86141a..8ceb5eb28112b 100644
--- a/decidim-forms/app/models/decidim/forms/questionnaire.rb
+++ b/decidim-forms/app/models/decidim/forms/questionnaire.rb
@@ -7,6 +7,7 @@ class Questionnaire < Forms::ApplicationRecord
       include Decidim::Templates::Templatable if defined? Decidim::Templates::Templatable
       include Decidim::Publicable
       include Decidim::TranslatableResource
+      include Decidim::Traceable
 
       translatable_fields :title, :description, :tos
       belongs_to :questionnaire_for, polymorphic: true
@@ -16,6 +17,8 @@ class Questionnaire < Forms::ApplicationRecord
 
       after_initialize :set_default_salt
 
+      attr_accessor :questionnaire_template_id
+
       # Public: returns whether the questionnaire questions can be modified or not.
       def questions_editable?
         has_component = questionnaire_for.respond_to? :component
@@ -32,6 +35,10 @@ def pristine?
         created_at.to_i == updated_at.to_i && questions.empty?
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Forms::AdminLog::QuestionnairePresenter
+      end
+
       private
 
       # salt is used to generate secure hash in anonymous answers
diff --git a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
index 2604e50456c06..05d4a508033f4 100644
--- a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
+++ b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
@@ -6,10 +6,18 @@ module Admin
       #
       # Presenter for questionnaire answer
       #
-      class QuestionnaireAnswerPresenter < Rectify::Presenter
+      class QuestionnaireAnswerPresenter < SimpleDelegator
+        delegate :content_tag, :safe_join, :link_to, :number_to_human_size, to: :view_context
+
         include Decidim::TranslatableAttributes
 
-        attribute :answer, Decidim::Forms::Answer
+        def answer
+          __getobj__.fetch(:answer)
+        end
+
+        def view_context
+          __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+        end
 
         def question
           translated_attribute(answer.question.body)
diff --git a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb
index ea58035830535..bdbabd8d48528 100644
--- a/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb
+++ b/decidim-forms/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb
@@ -6,8 +6,10 @@ module Admin
       #
       # Presenter for questionnaire response
       #
-      class QuestionnaireParticipantPresenter < Rectify::Presenter
-        attribute :participant, Decidim::Forms::Answer
+      class QuestionnaireParticipantPresenter < SimpleDelegator
+        def participant
+          __getobj__.fetch(:participant)
+        end
 
         def session_token
           participant.session_token || "-"
@@ -28,7 +30,7 @@ def registered?
         end
 
         def status
-          t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
+          I18n.t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
         end
 
         def answers
diff --git a/decidim-forms/app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb b/decidim-forms/app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb
new file mode 100644
index 0000000000000..c197838594178
--- /dev/null
+++ b/decidim-forms/app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Forms::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.forms.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-forms/app/queries/decidim/forms/questionnaire_participant.rb b/decidim-forms/app/queries/decidim/forms/questionnaire_participant.rb
index bd597f1d5c875..652754f33fa09 100644
--- a/decidim-forms/app/queries/decidim/forms/questionnaire_participant.rb
+++ b/decidim-forms/app/queries/decidim/forms/questionnaire_participant.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipant < Rectify::Query
+    class QuestionnaireParticipant < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object
diff --git a/decidim-forms/app/queries/decidim/forms/questionnaire_participants.rb b/decidim-forms/app/queries/decidim/forms/questionnaire_participants.rb
index 82e2b27340ff6..fa58e8dd2fc3a 100644
--- a/decidim-forms/app/queries/decidim/forms/questionnaire_participants.rb
+++ b/decidim-forms/app/queries/decidim/forms/questionnaire_participants.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipants < Rectify::Query
+    class QuestionnaireParticipants < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object
diff --git a/decidim-forms/app/queries/decidim/forms/questionnaire_user_answers.rb b/decidim-forms/app/queries/decidim/forms/questionnaire_user_answers.rb
index 75ef9abcbe99f..d8c327c2e4639 100644
--- a/decidim-forms/app/queries/decidim/forms/questionnaire_user_answers.rb
+++ b/decidim-forms/app/queries/decidim/forms/questionnaire_user_answers.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object
diff --git a/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb b/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
index 3f9b58a30e239..c243f1be83540 100644
--- a/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
+++ b/decidim-forms/app/views/decidim/forms/questionnaires/show.html.erb
@@ -151,4 +151,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_forms" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_forms" %>
+<% end %>
diff --git a/decidim-forms/config/locales/ar.yml b/decidim-forms/config/locales/ar.yml
index 85a5176a519eb..5fb133276a324 100644
--- a/decidim-forms/config/locales/ar.yml
+++ b/decidim-forms/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/bg.yml b/decidim-forms/config/locales/bg.yml
index ad31e28a4ef66..778c0f37d1302 100644
--- a/decidim-forms/config/locales/bg.yml
+++ b/decidim-forms/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/ca.yml b/decidim-forms/config/locales/ca.yml
index d0ef40cabdb70..6a989a8e1e27e 100644
--- a/decidim-forms/config/locales/ca.yml
+++ b/decidim-forms/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ ca:
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} ha actualitzat el qüestionari %{resource_name}"
       errors:
         answer:
           body: El camp no pot estar en blanc
-      files:
-        extension_allowlist: 'Formats d''arxiu acceptats:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Aquesta imatge medirà:'
         processors:
-          resize_and_pad: Redimensionat i ajustat a
-          resize_to_fit: Redimensionada per ajustar-la
+          resize_and_pad: Aquesta imatge serà redimensionada i ajustada a %{dimensions}.
+          resize_to_fit: Aquesta imatge serà redimensionada per ajustar-se a %{dimensions}.
       question_types:
         files: Arxius
         long_answer: Resposta llarga
@@ -174,7 +175,7 @@ ca:
           tos_agreement: En participar acceptes els Termes i condicions d'ús
       step_navigation:
         show:
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Estàs segura?
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Segur?
           back: Enrere
           continue: Continuar
           submit: Enviar respostes
diff --git a/decidim-forms/config/locales/cs.yml b/decidim-forms/config/locales/cs.yml
index fe2c3efca2740..f128346714d01 100644
--- a/decidim-forms/config/locales/cs.yml
+++ b/decidim-forms/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ cs:
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} aktualizoval dotazník %{resource_name}"
       errors:
         answer:
           body: Tělo nemůže být prázdné
-      files:
-        extension_allowlist: 'Akceptované formáty:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Tento obrázek bude:'
         processors:
-          resize_and_pad: Zmenšeno a odsazeno k
-          resize_to_fit: Upravena velikost na vyplnění
+          resize_and_pad: Tento obrázek bude změněn a vyplněn na %{dimensions}.
+          resize_to_fit: Tento obrázek bude změněn a vyplněn na %{dimensions}.
       question_types:
         files: Soubory
         long_answer: Dlouhá odpově�
diff --git a/decidim-forms/config/locales/de.yml b/decidim-forms/config/locales/de.yml
index 6ad88321af083..02e09d835b15f 100644
--- a/decidim-forms/config/locales/de.yml
+++ b/decidim-forms/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ de:
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} hat die Umfrage %{resource_name} aktualisiert"
       errors:
         answer:
           body: Körper kann nicht leer sein
-      files:
-        extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Das Bild wird:'
         processors:
-          resize_and_pad: in der Größe angepasst und gepolstert zu
-          resize_to_fit: in der Größe verändert, damit es passt
+          resize_and_pad: Dieses Bild wird skaliert und an %{dimensions} angepasst.
+          resize_to_fit: Dieses Bild wird auf %{dimensions} skaliert.
       question_types:
         files: Dateien
         long_answer: Lange Antwort
diff --git a/decidim-forms/config/locales/el.yml b/decidim-forms/config/locales/el.yml
index d104ff58b25f0..52b2b41f7f910 100644
--- a/decidim-forms/config/locales/el.yml
+++ b/decidim-forms/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -65,14 +66,8 @@ el:
       errors:
         answer:
           body: Το σώμα δεν μπο�εί να είναι κενό
-      files:
-        extension_allowlist: 'Αποδεκτές μο�φές:'
       images:
         dimensions: "Π %{width} x Υ %{height} px"
-        dimensions_info: 'Για αυτήν την εικόνα θα:'
-        processors:
-          resize_and_pad: Αλλάξει το μέγεθος και θα συμπλη�ωθεί σε
-          resize_to_fit: Αλλάξει το μέγεθος για π�οσα�μογή
       question_types:
         long_answer: Μεγάλη απάντηση
         matrix_multiple: Πίνακας (πολλαπλή επιλογή)
diff --git a/decidim-forms/config/locales/en.yml b/decidim-forms/config/locales/en.yml
index c4a6af3487397..5771c6193a6fd 100644
--- a/decidim-forms/config/locales/en.yml
+++ b/decidim-forms/config/locales/en.yml
@@ -122,17 +122,17 @@ en:
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} updated the %{resource_name} questionnaire"
       errors:
         answer:
           body: Body can't be blank
-      files:
-        extension_allowlist: 'Accepted formats:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'This image will be:'
         processors:
-          resize_and_pad: Resized and padded to
-          resize_to_fit: Resized to fit
+          resize_and_pad: This image will be resized and padded to %{dimensions}.
+          resize_to_fit: This image will be resized to fit %{dimensions}.
       question_types:
         files: Files
         long_answer: Long answer
diff --git a/decidim-forms/config/locales/es-MX.yml b/decidim-forms/config/locales/es-MX.yml
index 054c51fb2d2b5..c2617f584f11a 100644
--- a/decidim-forms/config/locales/es-MX.yml
+++ b/decidim-forms/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ es-MX:
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
-      files:
-        extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionado y ajustado a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga
diff --git a/decidim-forms/config/locales/es-PY.yml b/decidim-forms/config/locales/es-PY.yml
index 5463cb8aa4764..eade16bd8d6f7 100644
--- a/decidim-forms/config/locales/es-PY.yml
+++ b/decidim-forms/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ es-PY:
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
-      files:
-        extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionado y ajustado a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga
diff --git a/decidim-forms/config/locales/es.yml b/decidim-forms/config/locales/es.yml
index 9a2260c0ef139..7cf47130d2c6c 100644
--- a/decidim-forms/config/locales/es.yml
+++ b/decidim-forms/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ es:
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
-      files:
-        extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionada y ajustada a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga
diff --git a/decidim-forms/config/locales/eu.yml b/decidim-forms/config/locales/eu.yml
index 4739da9fc8908..b858e0340e8de 100644
--- a/decidim-forms/config/locales/eu.yml
+++ b/decidim-forms/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -9,7 +10,7 @@ eu:
         max_choices: Gehienezko aukera kopurua
         question_type: Mota
       questionnaire_question:
-        mandatory: derrigorrezko
+        mandatory: Derrigorrezkoa
         max_characters: Karaktereen muga (utzi 0 mugarik ez badago)
     errors:
       models:
@@ -29,7 +30,7 @@ eu:
       admin:
         models:
           components:
-            description: deskribapena
+            description: Deskribapena
             tos: Zerbitzu-baldintzak
         questionnaires:
           actions:
@@ -39,7 +40,7 @@ eu:
             answer_option: Erantzun aukera
             free_text: Testu librea
             remove: Kendu
-            statement: adierazpena
+            statement: Adierazpena
           answers:
             actions:
               back: Itzuli erantzunetara
@@ -74,12 +75,13 @@ eu:
             select_condition_question: Hautatu galdera bat
             select_condition_type: Hautatu baldintza mota bat
           edit:
-            save: Save
+            save: Gorde
             title: Editatu galdetegia
           form:
             add_question: Gehitu galdera
             add_separator: Gehitu banatzailea
-            already_answered_warning: Galdetegia dagoeneko erantzun dio erabiltzaile batzuek, beraz, ezin dituzu bere galderak aldatu.
+            add_title_and_description: Editatu izenburua eta deskribapena
+            already_answered_warning: Formularioa erabiltzaile batzuek erantzuten dute, beraz, ezin dira galderak aldatu.
             collapse: Bildu galdera guztiak
             expand: Zabaldu galdera guztiak
             preview: Aurreikusi
@@ -88,7 +90,7 @@ eu:
           matrix_row:
             matrix_row: Errenkada
             remove: Kendu
-            statement: adierazpena
+            statement: Adierazpena
           question:
             add_answer_option: Gehitu erantzun aukera
             add_display_condition: Gehitu bistaratzeko baldintza
@@ -108,20 +110,29 @@ eu:
             remove: Kendu
             separator: Bereizlea
             up: Igo
+          title_and_description:
+            collapse: Tolestu
+            description: Deskribapena
+            down: Behera
+            expand: Zabaldu
+            remove: Kendu
+            title: Izenburua
+            title_and_description: Izenburua eta deskribapena
+            up: Gora
           update:
             invalid: Akatsik egon da galdeketa gordetzean.
             success: Galdetegia zuzen gorde da.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} -k%{resource_name} galdetegia eguneratu du"
       errors:
         answer:
-          body: Gorputza ezin da hutsik egon
-      files:
-        extension_allowlist: 'Onartutako formatuak:'
+          body: Testua ezin da hutsik egon
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Irudi honek neurtuko du:'
         processors:
-          resize_and_pad: Birdimentsionatua eta honi egokitua
-          resize_to_fit: Birdimentsionatua egokitzeko
+          resize_and_pad: Irudi hau bigunduko eta birdimentsionatuko da %{dimensions} nehurrira.
+          resize_to_fit: Irudi hau bigunduko eta birdimentsionatuko da %{dimensions} nehurrira.
       question_types:
         files: Fitxategiak
         long_answer: Erantzun luzea
@@ -131,6 +142,9 @@ eu:
         short_answer: Erantzun laburra
         single_option: Aukera bakarra
         sorting: Lazcoz
+        title_and_description: Izenburua eta deskribapena
+      questionnaire_answer_presenter:
+        download_attachment: Deskargatu eranskina
       questionnaires:
         answer:
           invalid: Akatsik egon da galdeketa erantzutean.
@@ -146,7 +160,7 @@ eu:
           of_total_steps: '%{total_steps} etik'
           questionnaire_answered:
             body: Galdeketa honi erantzun dio.
-            title: Dagoeneko erantzun
+            title: Dagoeneko erantzunda
           questionnaire_closed:
             body: Galdetegia itxita dago eta ezin da erantzun.
             title: Galdeketa itxia
@@ -156,7 +170,9 @@ eu:
           questionnaire_js_disabled:
             body: Galdetegi honen ezaugarri batzuk desaktibatu egingo dira. Zure esperientzia hobetzeko, gaitu JavaScript zure nabigatzailean.
             title: Javascript desaktibatuta dago
-          tos_agreement: Zerbitzu-baldintzak onartzen dituzunean parte hartuz
+          questionnaire_not_published:
+            body: Argitalpen hau oraindik ez da argitaratu.
+          tos_agreement: Parte hartzean, haren zerbitzu-baldintzak onartzen dituzu
       step_navigation:
         show:
           are_you_sure: Ekintza hau ezin da desegin eta ezin izango dituzu zure erantzunak editatu. Ziur zaude?
@@ -166,7 +182,7 @@ eu:
       user_answers_serializer:
         body: Erantzuna
         completion: Amaiera
-        created_at: Erantzuna
+        created_at: Erantzunda
         id: Erantzun IDa
         ip_hash: IP Helbidearen Hash
         question: Galdera
diff --git a/decidim-forms/config/locales/fi-plain.yml b/decidim-forms/config/locales/fi-plain.yml
index 5d9aa55b7437d..4552940f6b9e7 100644
--- a/decidim-forms/config/locales/fi-plain.yml
+++ b/decidim-forms/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ fi-pl:
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
-      files:
-        extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus
diff --git a/decidim-forms/config/locales/fi.yml b/decidim-forms/config/locales/fi.yml
index 9f87dcb60e637..b531b97cae27d 100644
--- a/decidim-forms/config/locales/fi.yml
+++ b/decidim-forms/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ fi:
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
-      files:
-        extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus
diff --git a/decidim-forms/config/locales/fr-CA.yml b/decidim-forms/config/locales/fr-CA.yml
index d6c60461e8e06..46a0602f6fb73 100644
--- a/decidim-forms/config/locales/fr-CA.yml
+++ b/decidim-forms/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ fr-CA:
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le formulaire a bien été sauvegardé.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} a modifié le questionnaire %{resource_name}"
       errors:
         answer:
           body: Le corps ne peut pas être vide
-      files:
-        extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Cette image sera :'
         processors:
-          resize_and_pad: Redimensionné et ajustée à
-          resize_to_fit: Redimensionnée pour s'adapter
+          resize_and_pad: Cette image sera redimensionnée et recadrée en %{dimensions}.
+          resize_to_fit: Cette image sera redimensionnée pour s'adapter à %{dimensions}.
       question_types:
         files: Fichiers
         long_answer: Longue réponse
diff --git a/decidim-forms/config/locales/fr.yml b/decidim-forms/config/locales/fr.yml
index 6bba355d9d3db..b16343dec2da8 100644
--- a/decidim-forms/config/locales/fr.yml
+++ b/decidim-forms/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ fr:
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le questionnaire a bien été sauvegardé.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} a modifié le questionnaire %{resource_name}"
       errors:
         answer:
           body: Le corps ne peut pas être vide
-      files:
-        extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Cette image sera :'
         processors:
-          resize_and_pad: Redimensionné et ajustée à
-          resize_to_fit: Redimensionnée pour s'adapter
+          resize_and_pad: Cette image sera redimensionnée et recadrée en %{dimensions}.
+          resize_to_fit: Cette image sera redimensionnée pour s'adapter à %{dimensions}.
       question_types:
         files: Fichiers
         long_answer: Longue réponse
diff --git a/decidim-forms/config/locales/ga-IE.yml b/decidim-forms/config/locales/ga-IE.yml
index dc60ab94cb69d..6e28d0784cef2 100644
--- a/decidim-forms/config/locales/ga-IE.yml
+++ b/decidim-forms/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/gl.yml b/decidim-forms/config/locales/gl.yml
index 35f625e03f452..887a12b2f3da2 100644
--- a/decidim-forms/config/locales/gl.yml
+++ b/decidim-forms/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -60,8 +61,10 @@ gl:
       errors:
         answer:
           body: O corpo non pode estar en branco
-      files:
-        extension_allowlist: 'Formatos aceptados:'
+      images:
+        processors:
+          resize_and_pad: A imaxe axustarase para se encadrar a %{dimensions}.
+          resize_to_fit: A imaxe axustarase para se adaptar a %{dimensions}.
       question_types:
         long_answer: Resposta longa
         multiple_option: Múltipla opción
diff --git a/decidim-forms/config/locales/hu.yml b/decidim-forms/config/locales/hu.yml
index e552c8f0965c7..dd671fa523f90 100644
--- a/decidim-forms/config/locales/hu.yml
+++ b/decidim-forms/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -66,8 +67,9 @@ hu:
       errors:
         answer:
           body: A szövegtörzs nem lehet üres
-      files:
-        extension_allowlist: 'Elfogadott formátumok:'
+      images:
+        processors:
+          resize_to_fit: 'A kép át lesz méretezve erre a méretre: %{dimensions}.'
       question_types:
         long_answer: Hosszú válasz
         multiple_option: Több választási lehetőség
diff --git a/decidim-forms/config/locales/id-ID.yml b/decidim-forms/config/locales/id-ID.yml
index 05c3c9df44591..3edf97b356b54 100644
--- a/decidim-forms/config/locales/id-ID.yml
+++ b/decidim-forms/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/it.yml b/decidim-forms/config/locales/it.yml
index 423e7fbdcd4ed..fb520bab9865f 100644
--- a/decidim-forms/config/locales/it.yml
+++ b/decidim-forms/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -114,14 +115,8 @@ it:
       errors:
         answer:
           body: Il corpo non può essere vuoto
-      files:
-        extension_allowlist: 'Formati accettati:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Questa immagine sarà:'
-        processors:
-          resize_and_pad: Ridimensionato e spaziato a
-          resize_to_fit: Ridimensionato per adattarsi
       question_types:
         files: I file
         long_answer: Risposta lunga
diff --git a/decidim-forms/config/locales/ja.yml b/decidim-forms/config/locales/ja.yml
index e6fde557deeab..f7fa61d59b776 100644
--- a/decidim-forms/config/locales/ja.yml
+++ b/decidim-forms/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ ja:
           update:
             invalid: フォーム��存�失敗����。
             success: フォームを�存����。
+      admin_log:
+        questionnaire:
+          update: "%{user_name} � %{resource_name} アンケートを更新����"
       errors:
         answer:
           body: 本文�空白�����ん
-      files:
-        extension_allowlist: '承��れ�フォーマット:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: '��画��次�よ���り��:'
         processors:
-          resize_and_pad: リサイズ�よ�パッド先
-          resize_to_fit: フィット�るよ��リサイズ����
+          resize_and_pad: ��画��リサイズ�れ� %{dimensions} ����れ��。
+          resize_to_fit: ��画�� %{dimensions} ���よ��リサイズ�れ��。
       question_types:
         files: ファイル
         long_answer: 長�回答
diff --git a/decidim-forms/config/locales/ka-GE.yml b/decidim-forms/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-forms/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-forms/config/locales/lb.yml b/decidim-forms/config/locales/lb.yml
index e3832d16c2433..152bda1cf199b 100644
--- a/decidim-forms/config/locales/lb.yml
+++ b/decidim-forms/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -114,14 +115,8 @@ lb:
       errors:
         answer:
           body: Körper kann nicht leer sein
-      files:
-        extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Das Bild wird:'
-        processors:
-          resize_and_pad: in der Größe angepasst und gepolstert zu
-          resize_to_fit: in der Größe verändert, damit es passt
       question_types:
         files: Dateien
         long_answer: Lange Antwort
diff --git a/decidim-forms/config/locales/lt.yml b/decidim-forms/config/locales/lt.yml
index 81309c4dc4ab5..987b857aded60 100644
--- a/decidim-forms/config/locales/lt.yml
+++ b/decidim-forms/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ lt:
           update:
             invalid: Išsaugant šią formą iškilo problema.
             success: Forma sėkmingai išsaugota.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} atnaujino %{resource_name} klausimynÄ…"
       errors:
         answer:
           body: Pagrindinė dalis negali būti tuš�ia
-      files:
-        extension_allowlist: 'Priimtini formatai:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Å is vaizdas bus:'
         processors:
-          resize_and_pad: Pakeisto dydžio ir užpildytas iki
-          resize_to_fit: Pakeistas dydis, kad tilptų
+          resize_and_pad: Paveikslėlio dydis buvo pakeistas į %{dimensions}.
+          resize_to_fit: Paveikslėlio dydis buvo pakeistas į %{dimensions}.
       question_types:
         files: Dokumentai
         long_answer: Ilgas atsakymas
diff --git a/decidim-forms/config/locales/lv.yml b/decidim-forms/config/locales/lv.yml
index e8fc744ea1ca6..0015eceed5ea3 100644
--- a/decidim-forms/config/locales/lv.yml
+++ b/decidim-forms/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -65,14 +66,8 @@ lv:
       errors:
         answer:
           body: Pamatteksts nevar būt tukšs
-      files:
-        extension_allowlist: 'Pieņemtie form�ti:'
       images:
         dimensions: "%{width} x %{height} pikseļi"
-        dimensions_info: 'Attēlam būs:'
-        processors:
-          resize_and_pad: Mainīts lielums un izveidota robeža
-          resize_to_fit: Mainīts, lai ietilptu
       question_types:
         long_answer: Gar� atbilde
         matrix_multiple: Matrica (vair�ki varianti)
diff --git a/decidim-forms/config/locales/nl.yml b/decidim-forms/config/locales/nl.yml
index 25cb12efd8079..54ce9edef5f27 100644
--- a/decidim-forms/config/locales/nl.yml
+++ b/decidim-forms/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -118,14 +119,8 @@ nl:
       errors:
         answer:
           body: Lichaam mag niet leeg zijn
-      files:
-        extension_allowlist: 'Geaccepteerde formaten:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Deze afbeelding zal zijn:'
-        processors:
-          resize_and_pad: Verkleind en verwijderd naar
-          resize_to_fit: Vergrootst naar pasvorm
       question_types:
         long_answer: Lang antwoord
         matrix_multiple: Matrix (meerdere opties)
diff --git a/decidim-forms/config/locales/no.yml b/decidim-forms/config/locales/no.yml
index a0da1c1439af2..6a33c54928518 100644
--- a/decidim-forms/config/locales/no.yml
+++ b/decidim-forms/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -124,14 +125,8 @@
       errors:
         answer:
           body: Teksten kan ikke være blank
-      files:
-        extension_allowlist: 'Aksepterte formater:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Dette bildet vil være:'
-        processors:
-          resize_and_pad: Endret størrelse og avstand til
-          resize_to_fit: Endret størrelse for å passe
       question_types:
         files: Filer
         long_answer: Langt svar
diff --git a/decidim-forms/config/locales/pl.yml b/decidim-forms/config/locales/pl.yml
index 6f86e9dfc936b..7e85a3fa7618d 100644
--- a/decidim-forms/config/locales/pl.yml
+++ b/decidim-forms/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -114,14 +115,8 @@ pl:
       errors:
         answer:
           body: Treść nie może być pusta
-      files:
-        extension_allowlist: 'Dozwolone formaty:'
       images:
         dimensions: "%{width} × %{height} px"
-        dimensions_info: 'Rozmiar obrazu będzie wynosił:'
-        processors:
-          resize_and_pad: Zmieniony i dopełniony do
-          resize_to_fit: Dopasowany
       question_types:
         files: Pliki
         long_answer: Długa odpowiedź
diff --git a/decidim-forms/config/locales/pt-BR.yml b/decidim-forms/config/locales/pt-BR.yml
index bf6d59a0cc752..43f4af20c0338 100644
--- a/decidim-forms/config/locales/pt-BR.yml
+++ b/decidim-forms/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -114,14 +115,8 @@ pt-BR:
       errors:
         answer:
           body: O corpo não pode ficar em branco
-      files:
-        extension_allowlist: 'Formatos aceitos:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionado e acolchoado para
-          resize_to_fit: Redimensionado para caber
       question_types:
         files: Arquivos
         long_answer: Resposta longa
diff --git a/decidim-forms/config/locales/pt.yml b/decidim-forms/config/locales/pt.yml
index c64cb0864c2d7..b864aebb9d2b0 100644
--- a/decidim-forms/config/locales/pt.yml
+++ b/decidim-forms/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -114,14 +115,8 @@ pt:
       errors:
         answer:
           body: O corpo não pode ficar em branco
-      files:
-        extension_allowlist: 'Formatos aceites:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionada e ajustada para
-          resize_to_fit: Redimensionada para caber
       question_types:
         files: Ficheiros
         long_answer: Resposta longa
diff --git a/decidim-forms/config/locales/ro-RO.yml b/decidim-forms/config/locales/ro-RO.yml
index c262cdf3cf189..5b1ded5cf1a85 100644
--- a/decidim-forms/config/locales/ro-RO.yml
+++ b/decidim-forms/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -121,17 +122,17 @@ ro:
           update:
             invalid: A apărut o eroare la salvarea chestionarului.
             success: Chestionarul a fost salvat cu succes.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} a actualizat chestionarul %{resource_name}"
       errors:
         answer:
           body: Conținutul nu poate fi gol
-      files:
-        extension_allowlist: 'Formate acceptate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Această imagine va fi:'
         processors:
-          resize_and_pad: Redimensionat și padded la
-          resize_to_fit: Redimensionată pentru a se potrivi
+          resize_and_pad: Această imagine va fi redimensionată pentru a se potrivi cu %{dimensions}.
+          resize_to_fit: Această imagine va fi redimensionată pentru a se potrivi cu %{dimensions}.
       question_types:
         files: Fișiere
         long_answer: Răspuns lung
diff --git a/decidim-forms/config/locales/ru.yml b/decidim-forms/config/locales/ru.yml
index 40c8607db0c7f..cc726e2d863bf 100644
--- a/decidim-forms/config/locales/ru.yml
+++ b/decidim-forms/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   decidim:
     forms:
diff --git a/decidim-forms/config/locales/sk.yml b/decidim-forms/config/locales/sk.yml
index 13a2678263a75..0fd9f364a6dd1 100644
--- a/decidim-forms/config/locales/sk.yml
+++ b/decidim-forms/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/sl.yml b/decidim-forms/config/locales/sl.yml
index 0a01c16028783..d13005c551580 100644
--- a/decidim-forms/config/locales/sl.yml
+++ b/decidim-forms/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-forms/config/locales/sv.yml b/decidim-forms/config/locales/sv.yml
index 0f9953217f8e1..c6fc41d1383be 100644
--- a/decidim-forms/config/locales/sv.yml
+++ b/decidim-forms/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -124,14 +125,8 @@ sv:
       errors:
         answer:
           body: Kroppen kan inte vara to
-      files:
-        extension_allowlist: 'Godkända format:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Denna bild kommer att vara:'
-        processors:
-          resize_and_pad: Anpassad och vadderad till
-          resize_to_fit: Anpassad för att passa
       question_types:
         files: Filer
         long_answer: LÃ¥ngt svar
diff --git a/decidim-forms/config/locales/tr-TR.yml b/decidim-forms/config/locales/tr-TR.yml
index 1e9a41a6131b7..19b1ac91be8a1 100644
--- a/decidim-forms/config/locales/tr-TR.yml
+++ b/decidim-forms/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -109,14 +110,8 @@ tr:
       errors:
         answer:
           body: Vücut boş olamaz
-      files:
-        extension_allowlist: 'Kabul edilen biçimler:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Bu resim:'
-        processors:
-          resize_and_pad: Yeniden boyutlandırıldı ve dolduruldu
-          resize_to_fit: Sığacak şekilde yeniden boyutlandırıldı
       question_types:
         long_answer: Uzun cevap
         matrix_multiple: Matris (Çoklu seçenek)
diff --git a/decidim-forms/config/locales/val-ES.yml b/decidim-forms/config/locales/val-ES.yml
index de1227badaf37..5dbb5a9b4d6b7 100644
--- a/decidim-forms/config/locales/val-ES.yml
+++ b/decidim-forms/config/locales/val-ES.yml
@@ -1,3 +1,4 @@
+---
 val:
   decidim:
     forms:
diff --git a/decidim-forms/config/locales/zh-CN.yml b/decidim-forms/config/locales/zh-CN.yml
index b9445dc5fb358..7cbabf9a5422b 100644
--- a/decidim-forms/config/locales/zh-CN.yml
+++ b/decidim-forms/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -108,14 +109,8 @@ zh-CN:
       errors:
         answer:
           body: 主体�能为空
-      files:
-        extension_allowlist: '接�的格�：'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: '这张图片将是：'
-        processors:
-          resize_and_pad: 缩放并填充到
-          resize_to_fit: 调整到适�的
       question_types:
         long_answer: 长答案
         matrix_multiple: 矩阵(多选项)
diff --git a/decidim-forms/decidim-forms.gemspec b/decidim-forms/decidim-forms.gemspec
index c6007398b2d93..055a2d2002663 100644
--- a/decidim-forms/decidim-forms.gemspec
+++ b/decidim-forms/decidim-forms.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-forms"
   s.summary = "Decidim forms"
diff --git a/decidim-forms/lib/decidim/exporters/form_pdf.rb b/decidim-forms/lib/decidim/exporters/form_pdf.rb
index 353e9392de2a3..65fb6f3dc8907 100644
--- a/decidim-forms/lib/decidim/exporters/form_pdf.rb
+++ b/decidim-forms/lib/decidim/exporters/form_pdf.rb
@@ -15,11 +15,11 @@ def controller
       end
 
       def template
-        "decidim/forms/admin/questionnaires/answers/export/pdf.html.erb"
+        "decidim/forms/admin/questionnaires/answers/export/pdf"
       end
 
       def layout
-        "decidim/forms/admin/questionnaires/questionnaire_answers.html.erb"
+        "decidim/forms/admin/questionnaires/questionnaire_answers"
       end
 
       def locals
diff --git a/decidim-forms/lib/decidim/forms.rb b/decidim-forms/lib/decidim/forms.rb
index d1db842e961bc..5c3db346089d2 100644
--- a/decidim-forms/lib/decidim/forms.rb
+++ b/decidim-forms/lib/decidim/forms.rb
@@ -9,7 +9,7 @@ module Decidim
   # This namespace holds the logic of the `Forms`.
   module Forms
     autoload :UserAnswersSerializer, "decidim/forms/user_answers_serializer"
-    autoload :DataPortabilityUserAnswersSerializer, "decidim/forms/data_portability_user_answers_serializer"
+    autoload :DownloadYourDataUserAnswersSerializer, "decidim/forms/download_your_data_user_answers_serializer"
   end
 
   module Exporters
diff --git a/decidim-forms/lib/decidim/forms/data_portability_user_answers_serializer.rb b/decidim-forms/lib/decidim/forms/download_your_data_user_answers_serializer.rb
similarity index 89%
rename from decidim-forms/lib/decidim/forms/data_portability_user_answers_serializer.rb
rename to decidim-forms/lib/decidim/forms/download_your_data_user_answers_serializer.rb
index 6f4be45a74518..a8b007b547133 100644
--- a/decidim-forms/lib/decidim/forms/data_portability_user_answers_serializer.rb
+++ b/decidim-forms/lib/decidim/forms/download_your_data_user_answers_serializer.rb
@@ -2,9 +2,9 @@
 
 module Decidim
   module Forms
-    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataUserAnswersSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
-      # Serializes an user answer for data portability
+      # Serializes an user answer for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-forms/lib/decidim/forms/test/factories.rb b/decidim-forms/lib/decidim/forms/test/factories.rb
index b34657e9bd3a1..fbbede5908bf1 100644
--- a/decidim-forms/lib/decidim/forms/test/factories.rb
+++ b/decidim-forms/lib/decidim/forms/test/factories.rb
@@ -29,38 +29,47 @@
     end
 
     trait :with_all_questions do
-      questions do
+      after(:build) do |questionaire, _evaluator|
         position = 0
-        qs = %w(short_answer long_answer).collect do |text_question_type|
-          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+        %w(short_answer long_answer).collect do |text_question_type|
+          q = create(:questionnaire_question,
+                     question_type: text_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           position += 1
-          q
+          questionaire.questions << q
         end
 
         %w(single_option multiple_option).each do |option_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: option_question_type, position: position)
-          position += 1
-          qs << q
+          q = create(:questionnaire_question, :with_answer_options,
+                     question_type: option_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
 
         %w(matrix_single matrix_multiple).collect do |matrix_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: matrix_question_type, position: position, body: generate_localized_title)
-          position += 1
-          qs << q
+          q = build(:questionnaire_question, :with_answer_options,
+                    question_type: matrix_question_type,
+                    position: position,
+                    body: generate_localized_title,
+                    questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
-        qs
       end
     end
 
diff --git a/decidim-forms/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb b/decidim-forms/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
index c9533be7330ff..694575a4a3543 100644
--- a/decidim-forms/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
+++ b/decidim-forms/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
@@ -344,11 +344,11 @@
   end
 
   context "when a questionnaire has multiple existing questions" do
-    let!(:question_1) do
+    let!(:question1) do
       create(:questionnaire_question, questionnaire: questionnaire, body: first_body, position: 0)
     end
 
-    let!(:question_2) do
+    let!(:question2) do
       create(:questionnaire_question, questionnaire: questionnaire, body: second_body, position: 1)
     end
 
diff --git a/decidim-forms/lib/decidim/forms/user_answers_serializer.rb b/decidim-forms/lib/decidim/forms/user_answers_serializer.rb
index 2fc3c59c4524e..d6d07b5b6d91e 100644
--- a/decidim-forms/lib/decidim/forms/user_answers_serializer.rb
+++ b/decidim-forms/lib/decidim/forms/user_answers_serializer.rb
@@ -79,7 +79,7 @@ def normalize_choices(answer, choices)
       end
 
       def normalize_matrix_choices(answer, choices)
-        answer.question.matrix_rows.map do |matrix_row|
+        answer.question.matrix_rows.to_h do |matrix_row|
           row_body = translated_attribute(matrix_row.body)
 
           row_choices = answer.question.answer_options.map do |answer_option|
@@ -88,7 +88,7 @@ def normalize_matrix_choices(answer, choices)
           end
 
           [row_body, row_choices]
-        end.to_h
+        end
       end
 
       def answer_translated_attribute_name(attribute)
diff --git a/decidim-forms/lib/decidim/forms/version.rb b/decidim-forms/lib/decidim/forms/version.rb
index 29cfffe0b8507..7905dc439c236 100644
--- a/decidim-forms/lib/decidim/forms/version.rb
+++ b/decidim-forms/lib/decidim/forms/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb b/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb
index ffb8e310598b4..852386006ec9a 100644
--- a/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb
+++ b/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb
@@ -9,6 +9,7 @@ module Admin
         let(:current_organization) { create(:organization) }
         let(:participatory_process) { create(:participatory_process, organization: current_organization) }
         let(:questionnaire) { create(:questionnaire, questionnaire_for: participatory_process) }
+        let(:user) { create(:user, organization: current_organization) }
         let(:published_at) { nil }
         let(:form_params) do
           {
@@ -202,11 +203,11 @@ module Admin
             current_organization: current_organization
           )
         end
-        let(:command) { described_class.new(form, questionnaire) }
+        let(:command) { described_class.new(form, questionnaire, user) }
 
         describe "when the form is invalid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -246,24 +247,36 @@ module Admin
             expect(questionnaire.questions[2].max_characters).to eq(0)
 
             expect(questionnaire.questions[3].question_type).to eq("multiple_option")
-            expect(questionnaire.questions[2].answer_options[0].free_text).to eq(false)
+            expect(questionnaire.questions[2].answer_options[0].free_text).to be(false)
             expect(questionnaire.questions[2].max_choices).to be_nil
 
             expect(questionnaire.questions[3].question_type).to eq("multiple_option")
-            expect(questionnaire.questions[3].answer_options[0].free_text).to eq(true)
+            expect(questionnaire.questions[3].answer_options[0].free_text).to be(true)
             expect(questionnaire.questions[3].max_choices).to eq(2)
 
             expect(questionnaire.questions[4].question_type).to eq("matrix_single")
-            expect(questionnaire.questions[4].answer_options[0].free_text).to eq(true)
+            expect(questionnaire.questions[4].answer_options[0].free_text).to be(true)
             (0..1).each do |idx|
               expect(questionnaire.questions[4].matrix_rows[idx].body["en"]).to eq(form_params["questions"]["4"]["matrix_rows"][idx.to_s]["body"]["en"])
               expect(questionnaire.questions[4].matrix_rows[idx].position).to eq(idx)
             end
 
             expect(questionnaire.questions[5].question_type).to eq("matrix_multiple")
-            expect(questionnaire.questions[5].answer_options[0].free_text).to eq(true)
+            expect(questionnaire.questions[5].answer_options[0].free_text).to be(true)
             expect(questionnaire.questions[5].matrix_rows[0].body["en"]).to eq(form_params["questions"]["5"]["matrix_rows"]["0"]["body"]["en"])
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with("update", questionnaire, user)
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
 
         describe "when the questionnaire has an existing question" do
@@ -342,9 +355,9 @@ module Admin
                     "body" => questions[1].body,
                     "position" => 1,
                     "question_type" => "single_option",
-                    "answer_options" => Hash[question_2_answer_options.map do |answer_option|
+                    "answer_options" => question_2_answer_options.to_h do |answer_option|
                       [answer_option.id.to_s, { "id" => answer_option.id, "body" => answer_option.body, "free_text" => answer_option.free_text, "deleted" => false }]
-                    end]
+                    end
                   },
                   "3" => {
                     "id" => questions[2].id,
diff --git a/decidim-forms/spec/commands/decidim/forms/answer_questionnaire_spec.rb b/decidim-forms/spec/commands/decidim/forms/answer_questionnaire_spec.rb
index 768092a0ff95a..708284068d483 100644
--- a/decidim-forms/spec/commands/decidim/forms/answer_questionnaire_spec.rb
+++ b/decidim-forms/spec/commands/decidim/forms/answer_questionnaire_spec.rb
@@ -24,19 +24,19 @@ def tokenize(id)
 
       let(:participatory_process) { create(:participatory_process, organization: current_organization) }
       let(:questionnaire) { create(:questionnaire, questionnaire_for: participatory_process) }
-      let(:question_1) { create(:questionnaire_question, questionnaire: questionnaire) }
-      let(:question_2) { create(:questionnaire_question, questionnaire: questionnaire) }
-      let(:question_3) { create(:questionnaire_question, questionnaire: questionnaire) }
-      let(:answer_options) { create_list(:answer_option, 5, question: question_2) }
+      let(:question1) { create(:questionnaire_question, questionnaire: questionnaire) }
+      let(:question2) { create(:questionnaire_question, questionnaire: questionnaire) }
+      let(:question3) { create(:questionnaire_question, questionnaire: questionnaire) }
+      let(:answer_options) { create_list(:answer_option, 5, question: question2) }
       let(:answer_option_ids) { answer_options.pluck(:id).map(&:to_s) }
-      let(:matrix_rows) { create_list(:question_matrix_row, 3, question: question_2) }
+      let(:matrix_rows) { create_list(:question_matrix_row, 3, question: question2) }
       let(:matrix_row_ids) { matrix_rows.pluck(:id).map(&:to_s) }
       let(:form_params) do
         {
           "responses" => [
             {
               "body" => "This is my first answer",
-              "question_id" => question_1.id
+              "question_id" => question1.id
             },
             {
               "choices" => [
@@ -44,14 +44,14 @@ def tokenize(id)
                 { "answer_option_id" => answer_option_ids[1], "body" => "second", "matrix_row_id" => matrix_row_ids[1] },
                 { "answer_option_id" => answer_option_ids[2], "body" => "answer", "matrix_row_id" => matrix_row_ids[2] }
               ],
-              "question_id" => question_2.id
+              "question_id" => question2.id
             },
             {
               "choices" => [
                 { "answer_option_id" => answer_option_ids[3], "body" => "Third", "position" => 0 },
                 { "answer_option_id" => answer_option_ids[4], "body" => "answer", "position" => 1 }
               ],
-              "question_id" => question_3.id
+              "question_id" => question3.id
             }
           ],
           "tos_agreement" => "1"
@@ -70,7 +70,7 @@ def tokenize(id)
 
       describe "when the form is invalid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -116,20 +116,26 @@ def tokenize(id)
             command.call
 
             expect(Answer.first.session_token).to eq(tokenize(current_user.id))
-            expect(Answer.first.ip_hash).to eq(nil)
+            expect(Answer.first.ip_hash).to be_nil
             expect(Answer.second.session_token).to eq(tokenize(current_user.id))
-            expect(Answer.second.ip_hash).to eq(nil)
+            expect(Answer.second.ip_hash).to be_nil
             expect(Answer.third.session_token).to eq(tokenize(current_user.id))
-            expect(Answer.third.ip_hash).to eq(nil)
+            expect(Answer.third.ip_hash).to be_nil
           end
         end
 
         context "with attachments" do
-          let(:question_1) { create(:questionnaire_question, questionnaire: questionnaire, question_type: :files) }
+          let(:question1) { create(:questionnaire_question, questionnaire: questionnaire, question_type: :files) }
           let(:uploaded_files) do
             [
-              Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-              Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
+              {
+                title: "Picture of the city",
+                file: upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"))
+              },
+              {
+                title: "Example document",
+                file: upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf"))
+              }
             ]
           end
           let(:form_params) do
@@ -137,7 +143,7 @@ def tokenize(id)
               "responses" => [
                 {
                   "add_documents" => uploaded_files,
-                  "question_id" => question_1.id
+                  "question_id" => question1.id
                 }
               ],
               "tos_agreement" => "1"
@@ -155,13 +161,19 @@ def tokenize(id)
           context "when attachments are allowed and file is invalid" do
             let(:uploaded_files) do
               [
-                Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-                Decidim::Dev.test_file("verify_user_groups.csv", "text/csv")
+                {
+                  title: "Picture of the city",
+                  file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg")
+                },
+                {
+                  title: "CSV document",
+                  file: upload_test_file(Decidim::Dev.asset("verify_user_groups.csv"), content_type: "text/csv")
+                }
               ]
             end
 
             it "does not create atachments for the proposal" do
-              expect { command.call }.to change(Decidim::Attachment, :count).by(0)
+              expect { command.call }.not_to change(Decidim::Attachment, :count)
             end
 
             it "broadcasts invalid" do
@@ -170,7 +182,7 @@ def tokenize(id)
           end
 
           context "when the user has answered the survey" do
-            let!(:answer) { create(:answer, questionnaire: questionnaire, question: question_1, user: current_user) }
+            let!(:answer) { create(:answer, questionnaire: questionnaire, question: question1, user: current_user) }
 
             it "doesn't create questionnaire answers" do
               expect { command.call }.not_to change(Answer, :count)
@@ -204,7 +216,7 @@ def tokenize(id)
         end
 
         context "and visitor has answered the survey" do
-          let!(:answer) { create(:answer, questionnaire: questionnaire, question: question_1, session_token: tokenize(session_id)) }
+          let!(:answer) { create(:answer, questionnaire: questionnaire, question: question1, session_token: tokenize(session_id)) }
 
           it "doesn't create questionnaire answers" do
             expect { command.call }.not_to change(Answer, :count)
diff --git a/decidim-forms/spec/forms/decidim/forms/admin/question_form_spec.rb b/decidim-forms/spec/forms/decidim/forms/admin/question_form_spec.rb
index cc8c75cee9bf8..248389a6132e1 100644
--- a/decidim-forms/spec/forms/decidim/forms/admin/question_form_spec.rb
+++ b/decidim-forms/spec/forms/decidim/forms/admin/question_form_spec.rb
@@ -155,7 +155,7 @@ module Admin
               matrix_rows_by_position = subject.matrix_rows_by_position
               (1..3).each do |idx|
                 question_matrix_row_form = matrix_rows_by_position[idx - 1]
-                expect(question_matrix_row_form.body[:en]).to eq(matrix_rows[idx.to_s]["body"]["en"])
+                expect(question_matrix_row_form.body["en"]).to eq(matrix_rows[idx.to_s]["body"]["en"])
               end
             end
           end
@@ -172,7 +172,7 @@ module Admin
               matrix_rows_by_position = subject.matrix_rows_by_position
               (0..2).each do |idx|
                 question_matrix_row_form = matrix_rows_by_position[idx]
-                expect(question_matrix_row_form.body[:en]).to eq(matrix_rows[(idx + 1).to_s]["body"]["en"])
+                expect(question_matrix_row_form.body["en"]).to eq(matrix_rows[(idx + 1).to_s]["body"]["en"])
                 expect(question_matrix_row_form.position).to eq(matrix_rows[(idx + 1).to_s]["position"].to_i)
               end
             end
@@ -195,14 +195,14 @@ module Admin
               # first five rows are the already existing ordered by position
               %w(8 4 5 6 7).each_with_index do |key, idx|
                 question_matrix_row_form = matrix_rows_by_position[idx]
-                expect(question_matrix_row_form.body[:en]).to eq(matrix_rows[key]["body"]["en"])
+                expect(question_matrix_row_form.body["en"]).to eq(matrix_rows[key]["body"]["en"])
                 expect(question_matrix_row_form.position).to eq(matrix_rows[key]["position"].to_i)
               end
 
               # at the end the new rows (no position attribute) by order of reception
               (5..7).each do |idx|
                 question_matrix_row_form = matrix_rows_by_position[idx]
-                expect(question_matrix_row_form.body[:en]).to eq(matrix_rows[(idx - 4).to_s]["body"]["en"])
+                expect(question_matrix_row_form.body["en"]).to eq(matrix_rows[(idx - 4).to_s]["body"]["en"])
                 expect(question_matrix_row_form.position).to be_nil
               end
             end
diff --git a/decidim-forms/spec/helpers/decidim/forms/admin/questionnaire_answers_helper_spec.rb b/decidim-forms/spec/helpers/decidim/forms/admin/questionnaire_answers_helper_spec.rb
index cbe9f6fecaa6f..b2ff90f188087 100644
--- a/decidim-forms/spec/helpers/decidim/forms/admin/questionnaire_answers_helper_spec.rb
+++ b/decidim-forms/spec/helpers/decidim/forms/admin/questionnaire_answers_helper_spec.rb
@@ -7,7 +7,7 @@ module Forms
     module Admin
       describe QuestionnaireAnswersHelper do
         describe "display_percentage" do
-          context "when given a number " do
+          context "when given a number" do
             let(:number) { 84.64 }
 
             it "displays the number formatted as percentage with no decimals" do
diff --git a/decidim-forms/spec/jobs/decidim/forms/export_questionnaire_answers_job_spec.rb b/decidim-forms/spec/jobs/decidim/forms/export_questionnaire_answers_job_spec.rb
index cdd060d7304a3..5b5f3ccc2e687 100644
--- a/decidim-forms/spec/jobs/decidim/forms/export_questionnaire_answers_job_spec.rb
+++ b/decidim-forms/spec/jobs/decidim/forms/export_questionnaire_answers_job_spec.rb
@@ -22,7 +22,7 @@
     let(:mailer) { double :mailer }
 
     it "sends an email" do
-      expect(Decidim::ExportMailer)
+      allow(Decidim::ExportMailer)
         .to receive(:export)
         .and_return(mailer)
       expect(mailer)
@@ -33,7 +33,7 @@
   end
 
   describe "when no answers" do
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       collection = []
 
       expect(Decidim::ExportMailer)
@@ -44,7 +44,7 @@
   end
 
   describe "when no user" do
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       user = nil
 
       expect(Decidim::ExportMailer)
@@ -55,7 +55,7 @@
   end
 
   describe "when user has no email" do
-    it " doesn't send the email" do
+    it "doesn't send the email" do
       user.update(email: "")
 
       expect(Decidim::ExportMailer)
diff --git a/decidim-forms/spec/models/decidim/forms/display_condition_spec.rb b/decidim-forms/spec/models/decidim/forms/display_condition_spec.rb
index 307c8e515ef2f..45ad1b8b1903f 100644
--- a/decidim-forms/spec/models/decidim/forms/display_condition_spec.rb
+++ b/decidim-forms/spec/models/decidim/forms/display_condition_spec.rb
@@ -36,15 +36,15 @@ module Forms
           :match,
           question: question,
           condition_question: condition_question,
-          condition_value: { en: "to Be", es: "o NO", ca: "sEr" }
+          condition_value: { en: "To be", es: "o no", ca: "ser" }
         )
       end
 
       let(:choice_body) do
         {
-          en: "to be or not to be",
-          ca: "Ser o no ser",
-          es: "Ser o no ser"
+          en: "To be or not to be, that is the question",
+          ca: "Ser o no ser, aquesta és la qüestió",
+          es: "Ser o no ser, he ahí el dilema"
         }
       end
       let(:answer_option) { create(:answer_option, question: condition_question, body: choice_body) }
@@ -72,7 +72,7 @@ module Forms
         context "when condition_type is :answered" do
           let(:condition_type) { :answered }
 
-          context "and body is empty" do
+          context "and form is empty" do
             let(:answer_form) { nil }
 
             it "is not fulfilled" do
@@ -100,7 +100,7 @@ module Forms
         context "when condition_type is :not_answered" do
           let(:condition_type) { :not_answered }
 
-          context "and body is empty" do
+          context "and form is empty" do
             let(:answer_form) { nil }
 
             it "is not fulfilled" do
@@ -138,7 +138,7 @@ module Forms
           end
 
           context "and body contains the text in :en" do
-            let(:answer_body) { "To be or not to be" }
+            let(:answer_body) { "To be or not to be, that is the question" }
 
             it "is fulfilled" do
               expect(subject.fulfilled?(answer_form)).to be true
@@ -154,7 +154,7 @@ module Forms
           end
 
           context "and body contains the text in :ca" do
-            let(:answer_body) { "Ser o no ser" }
+            let(:answer_body) { "Ser o no ser, aquesta és la qüestió" }
 
             it "is fulfilled" do
               expect(subject.fulfilled?(answer_form)).to be true
@@ -170,7 +170,7 @@ module Forms
           end
 
           context "and body contains the text in :es" do
-            let(:answer_body) { "Ser o no ser" }
+            let(:answer_body) { "Ser o no ser, he ahí el dilema" }
 
             it "is fulfilled" do
               expect(subject.fulfilled?(answer_form)).to be true
diff --git a/decidim-forms/spec/models/decidim/forms/questionnaire_spec.rb b/decidim-forms/spec/models/decidim/forms/questionnaire_spec.rb
index b27ffa7a5c76a..a963a026c3934 100644
--- a/decidim-forms/spec/models/decidim/forms/questionnaire_spec.rb
+++ b/decidim-forms/spec/models/decidim/forms/questionnaire_spec.rb
@@ -61,7 +61,7 @@ module Forms
 
           context "when questionnaire has no questions" do
             it "returns true" do
-              expect(questionnaire.pristine?).to eq(true)
+              expect(questionnaire.pristine?).to be(true)
             end
           end
 
@@ -69,7 +69,7 @@ module Forms
             let!(:question) { create(:questionnaire_question, questionnaire: questionnaire) }
 
             it "returns false" do
-              expect(questionnaire.pristine?).to eq(false)
+              expect(questionnaire.pristine?).to be(false)
             end
           end
         end
@@ -78,7 +78,7 @@ module Forms
           let(:questionnaire) { create(:questionnaire, created_at: 1.day.ago) }
 
           it "returns false" do
-            expect(questionnaire.pristine?).to eq(false)
+            expect(questionnaire.pristine?).to be(false)
           end
         end
       end
diff --git a/decidim-forms/spec/presenters/decidim/admin/questionnaire_answer_presenter_spec.rb b/decidim-forms/spec/presenters/decidim/admin/questionnaire_answer_presenter_spec.rb
index d8b2eb5fc7ea0..66c11c41025ba 100644
--- a/decidim-forms/spec/presenters/decidim/admin/questionnaire_answer_presenter_spec.rb
+++ b/decidim-forms/spec/presenters/decidim/admin/questionnaire_answer_presenter_spec.rb
@@ -55,21 +55,21 @@ module Decidim
 
       context "when answer has many selected choices" do
         let!(:answer) { create(:answer, body: nil) }
-        let!(:answer_option_1) { create :answer_option, question: answer.question }
-        let!(:answer_option_2) { create :answer_option, question: answer.question }
-        let!(:answer_choice_1) { create :answer_choice, answer: answer, answer_option: answer_option_1, body: translated(answer_option_1.body, locale: I18n.locale) }
-        let!(:answer_choice_2) { create :answer_choice, answer: answer, answer_option: answer_option_2, body: translated(answer_option_2.body, locale: I18n.locale) }
+        let!(:answer_option1) { create :answer_option, question: answer.question }
+        let!(:answer_option2) { create :answer_option, question: answer.question }
+        let!(:answer_choice1) { create :answer_choice, answer: answer, answer_option: answer_option1, body: translated(answer_option1.body, locale: I18n.locale) }
+        let!(:answer_choice2) { create :answer_choice, answer: answer, answer_option: answer_option2, body: translated(answer_option2.body, locale: I18n.locale) }
 
         it "Returns the choices wrapped in <li> elements inside a <ul>" do
-          expect(subject.body).to eq("<ul><li>#{answer_choice_1.body}</li><li>#{answer_choice_2.body}</li></ul>")
+          expect(subject.body).to eq("<ul><li>#{answer_choice1.body}</li><li>#{answer_choice2.body}</li></ul>")
         end
 
         context "and free text is enabled on answer options" do
-          let!(:answer_option_1) { create :answer_option, :free_text_enabled }
-          let!(:answer_option_2) { create :answer_option, :free_text_enabled }
+          let!(:answer_option1) { create :answer_option, :free_text_enabled }
+          let!(:answer_option2) { create :answer_option, :free_text_enabled }
 
           it "returns the choices and question wrapped in <li> elements inside a <ul>" do
-            expect(subject.body).to eq("<ul><li>#{answer_option_1.translated_body}</li><li>#{answer_option_2.translated_body}</li></ul>")
+            expect(subject.body).to eq("<ul><li>#{answer_option1.translated_body}</li><li>#{answer_option2.translated_body}</li></ul>")
           end
         end
       end
diff --git a/decidim-forms/spec/queries/decidim/forms/questionnaire_participants_spec.rb b/decidim-forms/spec/queries/decidim/forms/questionnaire_participants_spec.rb
index aefc3d2f1b3eb..9a561d2dd34c9 100644
--- a/decidim-forms/spec/queries/decidim/forms/questionnaire_participants_spec.rb
+++ b/decidim-forms/spec/queries/decidim/forms/questionnaire_participants_spec.rb
@@ -6,24 +6,24 @@
   subject { described_class.new(questionnaire) }
 
   let!(:questionnaire) { create(:questionnaire) }
-  let!(:user_1) { create(:user, organization: questionnaire.questionnaire_for.organization) }
-  let!(:user_2) { create(:user, organization: questionnaire.questionnaire_for.organization) }
+  let!(:user1) { create(:user, organization: questionnaire.questionnaire_for.organization) }
+  let!(:user2) { create(:user, organization: questionnaire.questionnaire_for.organization) }
   let!(:questions) { 3.downto(1).map { |n| create :questionnaire_question, questionnaire: questionnaire, position: n } }
-  let!(:answers_user_1) { questions.map { |question| create :answer, user: user_1, questionnaire: questionnaire, question: question } }
-  let!(:answers_user_2) { questions.map { |question| create :answer, user: user_2, questionnaire: questionnaire, question: question } }
+  let!(:answers_user1) { questions.map { |question| create :answer, user: user1, questionnaire: questionnaire, question: question } }
+  let!(:answers_user2) { questions.map { |question| create :answer, user: user2, questionnaire: questionnaire, question: question } }
 
   it "returns the user info for each participant" do
     result = subject.query.order(:session_token)
 
-    user_1_info = result.find_by(decidim_user_id: user_1.id)
-    user_2_info = result.find_by(decidim_user_id: user_2.id)
+    user_1_info = result.find_by(decidim_user_id: user1.id)
+    user_2_info = result.find_by(decidim_user_id: user2.id)
 
-    expect(user_1_info.session_token).to eq(answers_user_1.first.session_token)
-    expect(user_1_info.ip_hash).to eq(answers_user_1.first.ip_hash)
-    expect(user_1_info.decidim_user_id).to eq(answers_user_1.first.decidim_user_id)
+    expect(user_1_info.session_token).to eq(answers_user1.first.session_token)
+    expect(user_1_info.ip_hash).to eq(answers_user1.first.ip_hash)
+    expect(user_1_info.decidim_user_id).to eq(answers_user1.first.decidim_user_id)
 
-    expect(user_2_info.session_token).to eq(answers_user_2.first.session_token)
-    expect(user_2_info.ip_hash).to eq(answers_user_2.first.ip_hash)
-    expect(user_2_info.decidim_user_id).to eq(answers_user_2.first.decidim_user_id)
+    expect(user_2_info.session_token).to eq(answers_user2.first.session_token)
+    expect(user_2_info.ip_hash).to eq(answers_user2.first.ip_hash)
+    expect(user_2_info.decidim_user_id).to eq(answers_user2.first.decidim_user_id)
   end
 end
diff --git a/decidim-forms/spec/queries/decidim/forms/questionnaire_user_answers_spec.rb b/decidim-forms/spec/queries/decidim/forms/questionnaire_user_answers_spec.rb
index 0d6b526363c4e..366f10c791699 100644
--- a/decidim-forms/spec/queries/decidim/forms/questionnaire_user_answers_spec.rb
+++ b/decidim-forms/spec/queries/decidim/forms/questionnaire_user_answers_spec.rb
@@ -6,8 +6,8 @@
   subject { described_class.new(questionnaire) }
 
   let!(:questionnaire) { create(:questionnaire) }
-  let!(:user_1) { create(:user, organization: questionnaire.questionnaire_for.organization) }
-  let!(:user_2) { create(:user, organization: questionnaire.questionnaire_for.organization) }
+  let!(:user1) { create(:user, organization: questionnaire.questionnaire_for.organization) }
+  let!(:user2) { create(:user, organization: questionnaire.questionnaire_for.organization) }
   let!(:questions) do
     [
       create(:questionnaire_question, questionnaire: questionnaire, position: 3),
@@ -16,12 +16,12 @@
       create(:questionnaire_question, questionnaire: questionnaire, position: 1)
     ]
   end
-  let!(:answers_user_1) { questions.map { |question| create :answer, user: user_1, questionnaire: questionnaire, question: question } }
-  let!(:answers_user_2) { questions.map { |question| create :answer, user: user_2, questionnaire: questionnaire, question: question } }
+  let!(:answers_user1) { questions.map { |question| create :answer, user: user1, questionnaire: questionnaire, question: question } }
+  let!(:answers_user2) { questions.map { |question| create :answer, user: user2, questionnaire: questionnaire, question: question } }
 
   it "returns the user answers for each user without the separators and title-and-descriptions" do
     result = subject.query
 
-    expect(result).to contain_exactly([answers_user_1.last, answers_user_1.first], [answers_user_2.last, answers_user_2.first])
+    expect(result).to contain_exactly([answers_user1.last, answers_user1.first], [answers_user2.last, answers_user2.first])
   end
 end
diff --git a/decidim-forms/spec/serializers/decidim/forms/user_answers_serializer_spec.rb b/decidim-forms/spec/serializers/decidim/forms/user_answers_serializer_spec.rb
index 5532be8f1a24b..fd5ee749e6217 100644
--- a/decidim-forms/spec/serializers/decidim/forms/user_answers_serializer_spec.rb
+++ b/decidim-forms/spec/serializers/decidim/forms/user_answers_serializer_spec.rb
@@ -76,14 +76,14 @@ module Forms
             )
           end
 
-          serialized_matrix_answer = matrixmultiple_rows.map do |row|
+          serialized_matrix_answer = matrixmultiple_rows.to_h do |row|
             key = translated(row.body, locale: I18n.locale)
             choices = matrixmultiple_answer_options.map do |option|
               matrixmultiple_answer_choices.find { |choice| choice.matrix_row == row && choice.answer_option == option }
             end
 
             [key, choices.map { |choice| choice&.body }]
-          end.to_h
+          end
 
           serialized_files_answer = files_answer.attachments.map(&:url)
 
diff --git a/decidim-forms/spec/services/decidim/forms/data_portability_user_answer_serializer_spec.rb b/decidim-forms/spec/services/decidim/forms/download_your_data_user_answer_serializer_spec.rb
similarity index 98%
rename from decidim-forms/spec/services/decidim/forms/data_portability_user_answer_serializer_spec.rb
rename to decidim-forms/spec/services/decidim/forms/download_your_data_user_answer_serializer_spec.rb
index b4f2e4143deb2..2990f4d62cf71 100644
--- a/decidim-forms/spec/services/decidim/forms/data_portability_user_answer_serializer_spec.rb
+++ b/decidim-forms/spec/services/decidim/forms/download_your_data_user_answer_serializer_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   module Forms
-    describe DataPortabilityUserAnswersSerializer do
+    describe DownloadYourDataUserAnswersSerializer do
       include Decidim::TranslationsHelper
 
       subject do
@@ -61,7 +61,7 @@ module Forms
             )
           end
 
-          it "includes the answer " do
+          it "includes the answer" do
             expect(serialized).to include(answer: answer.attachments.map(&:url))
           end
         end
@@ -110,7 +110,7 @@ module Forms
             )
           end
 
-          it "includes the answer " do
+          it "includes the answer" do
             expect(serialized).to include(answer: answer.body)
           end
         end
diff --git a/decidim-generators/Gemfile b/decidim-generators/Gemfile
index e5959ee3e21c1..ea90b40e5cfff 100644
--- a/decidim-generators/Gemfile
+++ b/decidim-generators/Gemfile
@@ -27,9 +27,9 @@ group :development, :test do
 end
 
 group :development do
-  gem "letter_opener_web", "~> 1.3"
+  gem "letter_opener_web", "~> 2.0"
   gem "listen", "~> 3.1"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "~> 4.0"
+  gem "web-console", "~> 4.2"
 end
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
index 880345e5223da..89fc2603cd4ef 100644
--- a/decidim-generators/Gemfile.lock
+++ b/decidim-generators/Gemfile.lock
@@ -1,62 +1,62 @@
 PATH
   remote: ..
   specs:
-    decidim (0.26.4)
-      decidim-accountability (= 0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-api (= 0.26.4)
-      decidim-assemblies (= 0.26.4)
-      decidim-blogs (= 0.26.4)
-      decidim-budgets (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-debates (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-generators (= 0.26.4)
-      decidim-meetings (= 0.26.4)
-      decidim-pages (= 0.26.4)
-      decidim-participatory_processes (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-      decidim-sortitions (= 0.26.4)
-      decidim-surveys (= 0.26.4)
-      decidim-system (= 0.26.4)
-      decidim-templates (= 0.26.4)
-      decidim-verifications (= 0.26.4)
-    decidim-accountability (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-admin (0.26.4)
+    decidim (0.27.2)
+      decidim-accountability (= 0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-api (= 0.27.2)
+      decidim-assemblies (= 0.27.2)
+      decidim-blogs (= 0.27.2)
+      decidim-budgets (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-debates (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-generators (= 0.27.2)
+      decidim-meetings (= 0.27.2)
+      decidim-pages (= 0.27.2)
+      decidim-participatory_processes (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+      decidim-sortitions (= 0.27.2)
+      decidim-surveys (= 0.27.2)
+      decidim-system (= 0.27.2)
+      decidim-templates (= 0.27.2)
+      decidim-verifications (= 0.27.2)
+    decidim-accountability (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-admin (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-api (0.26.4)
+    decidim-api (0.27.2)
       graphql (~> 1.12, < 1.13)
+      graphql-docs (~> 2.1.0)
       rack-cors (~> 1.0)
+    decidim-assemblies (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-blogs (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-budgets (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-comments (0.27.2)
+      decidim-core (= 0.27.2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-assemblies (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-blogs (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-budgets (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-comments (0.26.4)
-      decidim-core (= 0.26.4)
-      redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-meetings (= 0.26.4)
+    decidim-conferences (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-meetings (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-consultations (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-core (0.26.4)
+    decidim-consultations (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-core (0.27.2)
       active_link_to (~> 1.0)
       acts_as_list (~> 0.9)
       batch-loader (~> 1.2)
@@ -65,17 +65,17 @@ PATH
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
-      date_validator (~> 0.9.0)
-      decidim-api (= 0.26.4)
+      date_validator (~> 0.12.0)
+      decidim-api (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       diffy (~> 3.3)
       doorkeeper (~> 5.1)
       doorkeeper-i18n (~> 4.0)
-      file_validators (~> 2.1)
+      file_validators (~> 3.0)
       fog-local (~> 0.6)
-      foundation_rails_helper
-      geocoder (~> 1.7.5)
+      foundation_rails_helper (~> 4.0)
+      geocoder (~> 1.8)
       hashdiff (>= 0.4.0, < 2.0.0)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
@@ -94,144 +94,145 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.3)
       rack-attack (~> 6.0)
-      rails (~> 6.0.4)
+      rails (~> 6.1.0)
       rails-i18n (~> 6.0)
       ransack (~> 2.4.1)
-      rectify (~> 0.13.0)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      searchlight (~> 4.1)
       seven_zip_ruby (~> 1.3)
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
-    decidim-debates (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-dev (0.26.4)
+    decidim-debates (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-dev (0.27.2)
       axe-core-rspec (~> 4.1.0)
       byebug (~> 11.0)
       capybara (~> 3.24)
       db-query-matchers (~> 0.10.0)
-      decidim (= 0.26.4)
+      decidim (= 0.27.2)
       erb_lint (~> 0.0.35)
       factory_bot_rails (~> 4.8)
       i18n-tasks (~> 0.9.18)
       mdl (~> 0.5)
-      nokogiri (~> 1.12)
+      nokogiri (~> 1.13)
+      parallel_tests (~> 3.7)
       puma (~> 5.0)
       rails-controller-testing (~> 1.0)
-      rspec-cells (~> 0.3.4)
+      rspec-cells (~> 0.3.7)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 4.0)
       rspec-retry (~> 0.6.2)
       rspec_junit_formatter (~> 0.3.0)
-      rubocop (~> 0.92.0)
-      rubocop-rails (~> 2.8)
-      rubocop-rspec (= 1.43.2)
-      selenium-webdriver (~> 3.142)
-      simplecov (~> 0.19.0)
-      simplecov-cobertura (~> 1.3.1)
-      system_test_html_screenshots (~> 0.2)
+      rubocop (~> 1.28.0)
+      rubocop-rails (~> 2.14)
+      rubocop-rspec (~> 2.10)
+      selenium-webdriver (~> 4.1.0)
+      simplecov (~> 0.21.0)
+      simplecov-cobertura (~> 2.1.0)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.26.4)
-      decidim-bulletin_board (= 0.22.3)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-proposals (= 0.26.4)
+    decidim-elections (0.27.2)
+      decidim-bulletin_board (= 0.23)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-proposals (= 0.27.2)
       rack-attack (~> 6.0)
-      voting_schemes-dummy (= 0.22.3)
-      voting_schemes-electionguard (= 0.22.3)
-    decidim-forms (0.26.4)
-      decidim-core (= 0.26.4)
+      voting_schemes-dummy (= 0.23)
+      voting_schemes-electionguard (= 0.23)
+    decidim-forms (0.27.2)
+      decidim-core (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-initiatives (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-verifications (= 0.26.4)
+    decidim-generators (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-initiatives (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-verifications (= 0.27.2)
       origami (~> 2.1)
-      virtus-multiparams (~> 0.1)
+      rexml (~> 3.2.5)
       wicked (~> 1.3)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-meetings (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
+    decidim-meetings (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
       icalendar (~> 2.5)
-    decidim-pages (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-participatory_processes (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-proposals (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      doc2text (~> 0.4.4)
+    decidim-pages (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-participatory_processes (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-proposals (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      doc2text (~> 0.4.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-    decidim-surveys (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-templates (= 0.26.4)
-    decidim-system (0.26.4)
+    decidim-sortitions (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+    decidim-surveys (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-templates (= 0.27.2)
+    decidim-system (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-templates (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-    decidim-verifications (0.26.4)
-      decidim-core (= 0.26.4)
+    decidim-templates (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+    decidim-verifications (0.27.2)
+      decidim-core (= 0.27.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4.1)
-      actionpack (= 6.0.4.1)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -239,31 +240,33 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activestorage (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4.1)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activestorage (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activesupport (= 6.1.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    axe-core-api (4.5.0)
+    axe-core-api (4.6.0)
       dumb_delegator
       virtus
     axe-core-rspec (4.1.0)
@@ -285,9 +288,9 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.7.5)
-      msgpack (~> 1.0)
-    brakeman (5.1.1)
+    bootsnap (1.10.3)
+      msgpack (~> 1.2)
+    brakeman (5.2.2)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -300,7 +303,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (2.2.3)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -320,9 +323,9 @@ GEM
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (18.0.172)
+    chef-utils (18.1.0)
       concurrent-ruby
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coffee-rails (5.0.0)
@@ -333,21 +336,22 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    commonmarker (0.23.8)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.12.0)
+    css_parser (1.14.0)
       addressable
-    date_validator (0.9.0)
-      activemodel
-      activesupport
+    date_validator (0.12.0)
+      activemodel (>= 3)
+      activesupport (>= 3)
     db-query-matchers (0.10.0)
       activesupport (>= 4.0, < 7)
       rspec (~> 3.0)
-    decidim-bulletin_board (0.22.3)
+    decidim-bulletin_board (0.23.0)
       byebug (~> 11.0)
-      graphlient (~> 0.4.0)
+      graphlient (~> 0.5.0)
       jwt (~> 2.2.2)
       rails (~> 6.0, >= 5.0.0)
       wisper (~> 2.0.0)
@@ -364,20 +368,19 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.10.2)
       devise (>= 4.8.0)
-    devise_invitable (2.0.6)
+    devise_invitable (2.0.7)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.0)
     diffy (3.4.2)
-    doc2text (0.4.4)
-      nokogiri (>= 1.12.5, < 1.13.0)
+    doc2text (0.4.5)
+      nokogiri (>= 1.13.2, < 1.14.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.0)
+    doorkeeper (5.6.4)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     dumb_delegator (1.0.0)
-    equalizer (0.0.11)
     erb_lint (0.0.37)
       activesupport
       better_html (~> 1.0.7)
@@ -389,16 +392,19 @@ GEM
     erbse (0.1.4)
       temple
     erubi (1.10.0)
-    excon (0.94.0)
+    escape_utils (1.3.0)
+    excon (0.99.0)
     execjs (2.8.1)
+    extended-markdown-filter (0.7.0)
+      html-pipeline (~> 2.9)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (2.18.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -423,8 +429,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.1)
-    file_validators (2.3.0)
+    ffi (1.15.5)
+    file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
     fog-core (2.3.0)
@@ -440,10 +446,11 @@ GEM
       activemodel (>= 4.1, < 7.1)
       activesupport (>= 4.1, < 7.1)
       railties (>= 4.1, < 7.1)
-    geocoder (1.7.5)
-    globalid (0.5.2)
+    gemoji (3.0.1)
+    geocoder (1.8.1)
+    globalid (1.0.0)
       activesupport (>= 5.0)
-    graphlient (0.4.0)
+    graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
@@ -451,12 +458,24 @@ GEM
     graphql-client (0.18.0)
       activesupport (>= 3.0)
       graphql
+    graphql-docs (2.1.0)
+      commonmarker (~> 0.16)
+      escape_utils (~> 1.2)
+      extended-markdown-filter (~> 0.4)
+      gemoji (~> 3.0)
+      graphql (~> 1.12)
+      html-pipeline (~> 2.9)
+      sass (~> 3.4)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    highline (2.0.3)
+    highline (2.1.0)
+    hkdf (0.3.0)
+    html-pipeline (2.14.3)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -477,7 +496,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    json (2.6.2)
+    json (2.6.3)
     jwt (2.2.3)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -497,13 +516,14 @@ GEM
       kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    letter_opener_web (1.4.0)
-      actionmailer (>= 3.2)
-      letter_opener (~> 1.0)
-      railties (>= 3.2)
-    listen (3.5.1)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
+      rexml
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.1)
@@ -523,26 +543,26 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    msgpack (1.4.2)
+    msgpack (1.4.5)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     mustache (1.1.1)
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -557,7 +577,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -587,13 +607,15 @@ GEM
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel_tests (3.13.0)
+      parallel
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.1.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    premailer (1.18.0)
+    premailer (1.19.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -601,35 +623,35 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    public_suffix (4.0.6)
-    puma (5.5.2)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (3.0.3)
+    rack-protection (3.0.5)
       rack
-    rack-proxy (0.7.4)
+    rack-proxy (0.7.6)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.1)
-      actioncable (= 6.0.4.1)
-      actionmailbox (= 6.0.4.1)
-      actionmailer (= 6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actiontext (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.4.1)
+    rails (6.1.6)
+      actioncable (= 6.1.6)
+      actionmailbox (= 6.1.6)
+      actionmailer (= 6.1.6)
+      actionpack (= 6.1.6)
+      actiontext (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activemodel (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -643,35 +665,29 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rectify (0.13.0)
-      activemodel (>= 4.1.0)
-      activerecord (>= 4.1.0)
-      activesupport (>= 4.1.0)
-      virtus (~> 1.0.5)
-      wisper (>= 1.6.1)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
     redis (4.8.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.2)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -680,15 +696,15 @@ GEM
     rspec-cells (0.3.8)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (>= 3.0.0, < 6.1.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (4.1.2)
@@ -704,23 +720,23 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.92.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.23.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
@@ -729,18 +745,26 @@ GEM
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    searchlight (4.1.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     seven_zip_ruby (1.3.0)
-    simplecov (0.19.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-cobertura (1.3.1)
-      simplecov (~> 0.8)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
@@ -759,34 +783,29 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.1)
-    system_test_html_screenshots (0.2.0)
-      actionpack (>= 5.2, < 6.1.a)
-    temple (0.9.1)
+    temple (0.10.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
-    timeout (0.3.0)
+    timeout (0.3.1)
     tomlrb (2.0.3)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
     version_gem (1.1.1)
-    virtus (1.0.5)
+    virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    virtus-multiparams (0.1.1)
-      virtus (~> 1.0)
-    voting_schemes-dummy (0.22.3)
+    voting_schemes-dummy (0.23.0)
       rails (>= 5.0.0)
-    voting_schemes-electionguard (0.22.3)
+    voting_schemes-electionguard (0.23.0)
       rails (>= 5.0.0)
     w3c_rspec_validators (0.3.0)
       rails
@@ -798,7 +817,7 @@ GEM
       rexml (~> 3.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.1.0)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -812,6 +831,9 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webpush (1.1.0)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -821,10 +843,10 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -841,16 +863,16 @@ DEPENDENCIES
   decidim-initiatives!
   decidim-templates!
   faker (~> 2.14)
-  letter_opener_web (~> 1.3)
+  letter_opener_web (~> 2.0)
   listen (~> 3.1)
   puma (>= 5.0.0)
   spring (~> 2.0)
   spring-watcher-listen (~> 2.0)
-  web-console (~> 4.0)
+  web-console (~> 4.2)
   wicked_pdf (~> 2.1)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.5
+   2.3.20
diff --git a/decidim-generators/decidim-generators.gemspec b/decidim-generators/decidim-generators.gemspec
index de24b78c299fd..bbf1637f4d0f1 100644
--- a/decidim-generators/decidim-generators.gemspec
+++ b/decidim-generators/decidim-generators.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-generators"
 
@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim::Generators.version
 
-  s.add_development_dependency "bundler", "~> 1.12"
+  s.add_development_dependency "bundler", "~> 2.2"
 end
diff --git a/decidim-generators/exe/decidim b/decidim-generators/exe/decidim
index 33c49f5eb6228..10f7cb3d84ce6 100755
--- a/decidim-generators/exe/decidim
+++ b/decidim-generators/exe/decidim
@@ -28,7 +28,34 @@ Options:
   --help                   display this help and exit
   --version                output version information and exit
   --component [name]       creates a component for Decidim
-  [name]                   creates an application based on Decidim"
+  [name]                   creates an application based on Decidim
+
+App generation extra options (ignored if the --component flag is on):
+  --storage [provider]     Setup the Gemfile with the appropiate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure
+  --queue [provider]       Setup the Gemfile with the appropiate gem to handle a job queue backend. Only 'sidekiq' is supported as option for now.
+  --force_ssl [true|false] Enables or disables mandatory redirection to HTTPS (defaults to enabled)
+  --locales [locales]      Force the available locales to the ones specified. Separate with comas
+                           Warning: this option disables the ENV var DECIDIM_AVAILABLE_LOCALES used to setup this configuration by default.
+  --profiling              Adds profiling gems for development
+  --path                   Use a local path for the Gemfile instead of the last decidim gem version available
+  --edge                   Use GitHub's develop branch instead of the last decidim gem version available
+  --branch [branch]        Use GitHub's specified branch instead of the last decidim gem version available
+  --repository             Use a custom GIT repository instead of the default https::/github.com/decidim/decidim
+  --skip_gemfile           Skip Gemfile processing
+  --skip_bundle            Do not run bundle install
+  --skip_webpack_install   Do not run webpacker initialization (webpack install)
+  --demo                   Create a demo application, with seeds, all the optional modules enabled and some authorization examples
+  --seed_db [true|false]   Seed the database: generate demo data for each participatory space and component
+  --recreate_db            Recreate the database after installing Decidim
+
+Examples:
+  decidim my-application
+  decidim --storage=s3 my-application
+  decidim --storage=s3,gcs --profiling --force_ssl=false my-application
+  decidim --locales=en,ca,es,fr my-application
+  decidim --queue sidekiq my-application
+  decidim --queue sidekiq --storage s3 my-application
+"
 else
   require "decidim/generators/app_generator"
 
diff --git a/decidim-generators/lib/decidim/generators/app_generator.rb b/decidim-generators/lib/decidim/generators/app_generator.rb
index c0377571e7fa0..697d70ceed3aa 100644
--- a/decidim-generators/lib/decidim/generators/app_generator.rb
+++ b/decidim-generators/lib/decidim/generators/app_generator.rb
@@ -41,6 +41,10 @@ def source_paths
                             default: nil,
                             desc: "Use a specific branch from GitHub's version"
 
+      class_option :repository, type: :string,
+                                default: "https://github.com/decidim/decidim.git",
+                                desc: "Use a specific GIT repository (valid in conjunction with --edge or --branch)"
+
       class_option :recreate_db, type: :boolean,
                                  default: false,
                                  desc: "Recreate test database"
@@ -50,7 +54,7 @@ def source_paths
                              desc: "Seed test database"
 
       class_option :skip_bundle, type: :boolean,
-                                 default: true,
+                                 default: true, # this is to avoid installing gems in this step yet (done by InstallGenerator)
                                  desc: "Don't run bundle install"
 
       class_option :skip_gemfile, type: :boolean,
@@ -69,10 +73,26 @@ def source_paths
                                default: "true",
                                desc: "Doesn't force to use ssl"
 
+      class_option :locales, type: :string,
+                             default: "",
+                             desc: "Force the available locales to the ones specified. Separate with comas"
+
+      class_option :storage, type: :string,
+                             default: "local",
+                             desc: "Setup the Gemfile with the appropiate gem to handle a storage provider. Supported options are: local (default), s3, gcs, azure"
+
+      class_option :queue, type: :string,
+                           default: "",
+                           desc: "Setup the Gemfile with the appropiate gem to handle a queue adapter provider. Supported options are: (empty, does nothing) and sidekiq"
+
       class_option :skip_webpack_install, type: :boolean,
                                           default: true,
                                           desc: "Don't run Webpack install"
 
+      class_option :dev_ssl, type: :boolean,
+                             default: false,
+                             desc: "Don't add Puma development SSL configuration options"
+
       def database_yml
         template "database.yml.erb", "config/database.yml", force: true
       end
@@ -115,19 +135,72 @@ def gemfile
 
         gsub_file "Gemfile", /gem "#{current_gem}".*/, "gem \"#{current_gem}\", #{gem_modifier}"
 
-        if current_gem == "decidim"
-          gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}"
+        return unless current_gem == "decidim"
+
+        gsub_file "Gemfile", /gem "decidim-dev".*/, "gem \"decidim-dev\", #{gem_modifier}"
+
+        %w(conferences consultations elections initiatives templates).each do |component|
+          if options[:demo]
+            gsub_file "Gemfile", /gem "decidim-#{component}".*/, "gem \"decidim-#{component}\", #{gem_modifier}"
+          else
+            gsub_file "Gemfile", /gem "decidim-#{component}".*/, "# gem \"decidim-#{component}\", #{gem_modifier}"
+          end
+        end
+      end
+
+      def add_storage_provider
+        template "storage.yml.erb", "config/storage.yml", force: true
+
+        providers = options[:storage].split(",")
+
+        abort("#{providers} is not supported as storage provider, please use local, s3, gcs or azure") unless (providers - %w(local s3 gcs azure)).empty?
+        gsub_file "config/environments/production.rb",
+                  /config.active_storage.service = :local/,
+                  "config.active_storage.service = Rails.application.secrets.dig(:storage, :provider) || :local"
+
+        add_production_gems do
+          gem "aws-sdk-s3", require: false if providers.include?("s3")
+          gem "azure-storage-blob", require: false if providers.include?("azure")
+          gem "google-cloud-storage", "~> 1.11", require: false if providers.include?("gcs")
+        end
+      end
+
+      def add_queue_adapter
+        adapter = options[:queue]
+
+        abort("#{adapter} is not supported as a queue adapter, please use sidekiq for the moment") unless adapter.in?(["", "sidekiq"])
+
+        return unless adapter == "sidekiq"
+
+        template "sidekiq.yml.erb", "config/sidekiq.yml", force: true
+
+        gsub_file "config/environments/production.rb",
+                  /# config.active_job.queue_adapter     = :resque/,
+                  "config.active_job.queue_adapter = ENV['QUEUE_ADAPTER'] if ENV['QUEUE_ADAPTER'].present?"
 
-          %w(conferences consultations elections initiatives templates).each do |component|
-            if options[:demo]
-              gsub_file "Gemfile", /gem "decidim-#{component}".*/, "gem \"decidim-#{component}\", #{gem_modifier}"
-            else
-              gsub_file "Gemfile", /gem "decidim-#{component}".*/, "# gem \"decidim-#{component}\", #{gem_modifier}"
-            end
+        prepend_file "config/routes.rb", "require \"sidekiq/web\"\n\n"
+        route <<~RUBY
+          authenticate :user, ->(u) { u.admin? } do
+            mount Sidekiq::Web => "/sidekiq"
           end
+        RUBY
+
+        add_production_gems do
+          gem "sidekiq"
         end
+      end
 
-        run "bundle install"
+      def add_production_gems(&block)
+        return if options[:skip_gemfile]
+
+        if block
+          @production_gems ||= []
+          @production_gems << block
+        elsif @production_gems.present?
+          gem_group :production do
+            @production_gems.map(&:call)
+          end
+        end
       end
 
       def tweak_bootsnap
@@ -146,6 +219,30 @@ def tweak_bootsnap
         RUBY
       end
 
+      def tweak_spring
+        return unless File.exist?("config/spring.rb")
+
+        prepend_to_file "config/spring.rb", "require \"decidim/spring\"\n\n"
+      end
+
+      def puma_ssl_options
+        return unless options[:dev_ssl]
+
+        append_file "config/puma.rb", <<~CONFIG
+
+          # Development SSL
+          if ENV["DEV_SSL"] && defined?(Bundler) && (dev_gem = Bundler.load.specs.find { |spec| spec.name == "decidim-dev" })
+            cert_dir = ENV.fetch("DEV_SSL_DIR") { "\#{dev_gem.full_gem_path}/lib/decidim/dev/assets" }
+            ssl_bind(
+              "0.0.0.0",
+              ENV.fetch("DEV_SSL_PORT") { 3443 },
+              cert_pem: File.read("\#{cert_dir}/ssl-cert.pem"),
+              key_pem: File.read("\#{cert_dir}/ssl-key.pem")
+            )
+          end
+        CONFIG
+      end
+
       def add_ignore_uploads
         append_file ".gitignore", "\n# Ignore public uploads\npublic/uploads" unless options["skip_git"]
       end
@@ -158,11 +255,27 @@ def remove_default_error_pages
       def decidim_initializer
         copy_file "initializer.rb", "config/initializers/decidim.rb"
 
+        gsub_file "config/environments/production.rb",
+                  /config.log_level = :info/,
+                  "config.log_level = %w(debug info warn error fatal).include?(ENV['RAILS_LOG_LEVEL']) ? ENV['RAILS_LOG_LEVEL'] : :info"
+
+        gsub_file "config/environments/production.rb",
+                  %r{# config.asset_host = 'http://assets.example.com'},
+                  "config.asset_host = ENV['RAILS_ASSET_HOST'] if ENV['RAILS_ASSET_HOST'].present?"
+
         if options[:force_ssl] == "false"
           gsub_file "config/initializers/decidim.rb",
                     /# config.force_ssl = true/,
                     "config.force_ssl = false"
         end
+        return if options[:locales].blank?
+
+        gsub_file "config/initializers/decidim.rb",
+                  /#{Regexp.escape("# config.available_locales = %w(en ca es)")}/,
+                  "config.available_locales = %w(#{options[:locales].gsub(",", " ")})"
+        gsub_file "config/initializers/decidim.rb",
+                  /#{Regexp.escape("config.available_locales = Rails.application.secrets.decidim[:available_locales].presence || [:en]")}/,
+                  "# config.available_locales = Rails.application.secrets.decidim[:available_locales].presence || [:en]"
       end
 
       def authorization_handler
@@ -230,11 +343,11 @@ def install
 
       def gem_modifier
         @gem_modifier ||= if options[:path]
-                            "path: \"#{options[:path]}\""
+                            %(path: "#{options[:path]}")
                           elsif branch.present?
-                            "git: \"https://github.com/decidim/decidim.git\", branch: \"#{branch}\""
+                            %(git: "#{repository}", branch: "#{branch}")
                           else
-                            "\"#{Decidim::Generators.version}\""
+                            %("#{Decidim::Generators.version}")
                           end
       end
 
@@ -244,6 +357,10 @@ def branch
         @branch ||= options[:edge] ? Decidim::Generators.edge_git_branch : options[:branch].presence
       end
 
+      def repository
+        @repository ||= options[:repository] || "https://github.com/decidim/decidim.git"
+      end
+
       def app_name
         options[:app_name] || super
       end
diff --git a/decidim-generators/lib/decidim/generators/app_templates/database.yml.erb b/decidim-generators/lib/decidim/generators/app_templates/database.yml.erb
index 26a00097fb8da..d697ccaecf133 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/database.yml.erb
+++ b/decidim-generators/lib/decidim/generators/app_templates/database.yml.erb
@@ -63,7 +63,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: <%= app_name %>_test
+  database: <%= app_name %>_test<%%= ENV.fetch('TEST_ENV_NUMBER', "") %>
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is
diff --git a/decidim-generators/lib/decidim/generators/app_templates/dummy_authorization_handler.rb b/decidim-generators/lib/decidim/generators/app_templates/dummy_authorization_handler.rb
index eabb80226bdf5..49b9bcc3329d0 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/dummy_authorization_handler.rb
+++ b/decidim-generators/lib/decidim/generators/app_templates/dummy_authorization_handler.rb
@@ -21,7 +21,7 @@
 # See Decidim::AuthorizationHandler for more documentation.
 class DummyAuthorizationHandler < Decidim::AuthorizationHandler
   # Define the attributes you need for this authorization handler. Attributes
-  # are defined using Virtus.
+  # are defined using Decidim::AttributeObject.
   #
   attribute :name_and_surname, String
   attribute :document_number, String
diff --git a/decidim-generators/lib/decidim/generators/app_templates/initializer.rb b/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
index 1f5871ad77784..7d2659cb15546 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
+++ b/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
@@ -2,27 +2,29 @@
 
 Decidim.configure do |config|
   # The name of the application
-  config.application_name = "My Application Name"
+  config.application_name = Rails.application.secrets.decidim[:application_name]
 
   # The email that will be used as sender in all emails from Decidim
-  config.mailer_sender = "change-me@example.org"
+  config.mailer_sender = Rails.application.secrets.decidim[:mailer_sender]
 
   # Sets the list of available locales for the whole application.
   #
   # When an organization is created through the System area, system admins will
   # be able to choose the available languages for that organization. That list
   # of languages will be equal or a subset of the list in this file.
-  config.available_locales = [:en, :ca, :es]
+  config.available_locales = Rails.application.secrets.decidim[:available_locales].presence || [:en]
+  # Or block set it up manually and prevent ENV manipulation:
+  # config.available_locales = %w(en ca es)
 
   # Sets the default locale for new organizations. When creating a new
   # organization from the System area, system admins will be able to overwrite
   # this value for that specific organization.
-  config.default_locale = :en
+  config.default_locale = Rails.application.secrets.decidim[:default_locale].presence || :en
 
   # Restrict access to the system part with an authorized ip list.
   # You can use a single ip like ("1.2.3.4"), or an ip subnet like ("1.2.3.4/24")
   # You may specify multiple ip in an array ["1.2.3.4", "1.2.3.4/24"]
-  # config.system_accesslist_ips = ["127.0.0.1"]
+  config.system_accesslist_ips = Rails.application.secrets.decidim[:system_accesslist_ips] if Rails.application.secrets.decidim[:system_accesslist_ips].present?
 
   # Defines a list of custom content processors. They are used to parse and
   # render specific tags inside some user-provided content. Check the docs for
@@ -30,8 +32,14 @@
   # config.content_processors = []
 
   # Whether SSL should be enabled or not.
+  # if this var is not defined, it is decided automatically per-rails-environment
+  config.force_ssl = Rails.application.secrets.decidim[:force_ssl].present? unless Rails.application.secrets.decidim[:force_ssl] == "auto"
+  # or set it up manually and prevent any ENV manipulation:
   # config.force_ssl = true
 
+  # Enable the service worker. By default is disabled in development and enabled in the rest of environments
+  config.service_worker_enabled = Rails.application.secrets.decidim[:service_worker_enabled].present?
+
   # Map and Geocoder configuration
   #
   # == HERE Maps ==
@@ -98,6 +106,40 @@
   #   cache: Redis.new,
   #   cache_prefix: "..."
   # }
+  if Rails.application.secrets.maps.present? && Rails.application.secrets.maps[:static_provider].present?
+    static_provider = Rails.application.secrets.maps[:static_provider]
+    dynamic_provider = Rails.application.secrets.maps[:dynamic_provider]
+    dynamic_url = Rails.application.secrets.maps[:dynamic_url]
+    static_url = Rails.application.secrets.maps[:static_url]
+    static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
+    config.maps = {
+      provider: static_provider,
+      api_key: Rails.application.secrets.maps[:static_api_key],
+      static: { url: static_url },
+      dynamic: {
+        provider: dynamic_provider,
+        api_key: Rails.application.secrets.maps[:dynamic_api_key]
+      }
+    }
+    config.maps[:geocoding] = { host: Rails.application.secrets.maps[:geocoding_host], use_https: true } if Rails.application.secrets.maps[:geocoding_host]
+    config.maps[:dynamic][:tile_layer] = {}
+    config.maps[:dynamic][:tile_layer][:url] = dynamic_url if dynamic_url
+    config.maps[:dynamic][:tile_layer][:attribution] = Rails.application.secrets.maps[:attribution] if Rails.application.secrets.maps[:attribution]
+    if Rails.application.secrets.maps[:extra_vars].present?
+      vars = URI.decode_www_form(Rails.application.secrets.maps[:extra_vars])
+      vars.each do |key, value|
+        # perform a naive type conversion
+        config.maps[:dynamic][:tile_layer][key] = case value
+                                                  when /^true$|^false$/i
+                                                    value.downcase == "true"
+                                                  when /\A[-+]?\d+\z/
+                                                    value.to_i
+                                                  else
+                                                    value
+                                                  end
+      end
+    end
+  end
 
   # Custom resource reference generator method. Check the docs for more info.
   # config.reference_generator = lambda do |resource, component|
@@ -106,14 +148,20 @@
   # end
 
   # Currency unit
-  # config.currency_unit = "€"
+  config.currency_unit = Rails.application.secrets.decidim[:currency_unit] if Rails.application.secrets.decidim[:currency_unit].present?
+
+  # Workaround to enable SVG assets cors
+  config.cors_enabled = Rails.application.secrets.decidim[:cors_enabled].present?
 
   # Defines the quality of image uploads after processing. Image uploads are
   # processed by Decidim, this value helps reduce the size of the files.
-  # config.image_uploader_quality = 80
+  config.image_uploader_quality = Rails.application.secrets.decidim[:image_uploader_quality].to_i
+
+  config.maximum_attachment_size = Rails.application.secrets.decidim[:maximum_attachment_size].to_i.megabytes
+  config.maximum_avatar_size = Rails.application.secrets.decidim[:maximum_avatar_size].to_i.megabytes
 
   # The number of reports which a resource can receive before hiding it
-  # config.max_reports_before_hiding = 3
+  config.max_reports_before_hiding = Rails.application.secrets.decidim[:max_reports_before_hiding].to_i
 
   # Custom HTML Header snippets
   #
@@ -128,22 +176,22 @@
   # that an organization's administrator injects malicious scripts to spy on or
   # take over user accounts.
   #
-  config.enable_html_header_snippets = false
+  config.enable_html_header_snippets = Rails.application.secrets.decidim[:enable_html_header_snippets].present?
 
   # Allow organizations admins to track newsletter links.
-  # config.track_newsletter_links = true
+  config.track_newsletter_links = Rails.application.secrets.decidim[:track_newsletter_links].present? unless Rails.application.secrets.decidim[:track_newsletter_links] == "auto"
 
-  # Amount of time that the data portability files will be available in the server.
-  # config.data_portability_expiry_time = 7.days
+  # Amount of time that the download your data files will be available in the server.
+  config.download_your_data_expiry_time = Rails.application.secrets.decidim[:download_your_data_expiry_time].to_i.days
 
   # Max requests in a time period to prevent DoS attacks. Only applied on production.
-  # config.throttling_max_requests = 100
+  config.throttling_max_requests = Rails.application.secrets.decidim[:throttling_max_requests].to_i
 
   # Time window in which the throttling is applied.
-  # config.throttling_period = 1.minute
+  config.throttling_period = Rails.application.secrets.decidim[:throttling_period].to_i.minutes
 
   # Time window were users can access the website even if their email is not confirmed.
-  # config.unconfirmed_access_for = 2.days
+  config.unconfirmed_access_for = Rails.application.secrets.decidim[:unconfirmed_access_for].to_i.days
 
   # A base path for the uploads. If set, make sure it ends in a slash.
   # Uploads will be set to `<base_path>/uploads/`. This can be useful if you
@@ -151,7 +199,7 @@
   # environments, but in different folders.
   #
   # If not set, it will be ignored.
-  # config.base_uploads_path = nil
+  config.base_uploads_path = Rails.application.secrets.decidim[:base_uploads_path] if Rails.application.secrets.decidim[:base_uploads_path].present?
 
   # SMS gateway configuration
   #
@@ -198,6 +246,7 @@
   #   end
   # end
   #
+  #
   # config.timestamp_service = "MyTimestampService"
 
   # PDF signature service configuration
@@ -228,14 +277,16 @@
   # Only needed if you want to have Etherpad integration with Decidim. See
   # Decidim docs at https://docs.decidim.org/en/services/etherpad/ in order to set it up.
   #
-  # config.etherpad = {
-  #   server: Rails.application.secrets.etherpad[:server],
-  #   api_key: Rails.application.secrets.etherpad[:api_key],
-  #   api_version: Rails.application.secrets.etherpad[:api_version]
-  # }
+  if Rails.application.secrets.etherpad.present? && Rails.application.secrets.etherpad[:server].present?
+    config.etherpad = {
+      server: Rails.application.secrets.etherpad[:server],
+      api_key: Rails.application.secrets.etherpad[:api_key],
+      api_version: Rails.application.secrets.etherpad[:api_version]
+    }
+  end
 
   # Sets Decidim::Exporters::CSV's default column separator
-  # config.default_csv_col_sep = ";"
+  config.default_csv_col_sep = Rails.application.secrets.decidim[:default_csv_col_sep] if Rails.application.secrets.decidim[:default_csv_col_sep].present?
 
   # The list of roles a user can have, not considering the space-specific roles.
   # config.user_roles = %w(admin user_manager)
@@ -284,7 +335,147 @@
 
   # Defines the name of the cookie used to check if the user allows Decidim to
   # set cookies.
-  # config.consent_cookie_name = "decidim-cc"
+  config.consent_cookie_name = Rails.application.secrets.decidim[:consent_cookie_name] if Rails.application.secrets.decidim[:consent_cookie_name].present?
+
+  # Defines data consent categories and the data stored in each category.
+  # config.consent_categories = [
+  #   {
+  #     slug: "essential",
+  #     mandatory: true,
+  #     items: [
+  #       {
+  #         type: "cookie",
+  #         name: "_session_id"
+  #       },
+  #       {
+  #         type: "cookie",
+  #         name: Decidim.consent_cookie_name
+  #       }
+  #     ]
+  #   },
+  #   {
+  #     slug: "preferences",
+  #     mandatory: false
+  #   },
+  #   {
+  #     slug: "analytics",
+  #     mandatory: false
+  #   },
+  #   {
+  #     slug: "marketing",
+  #     mandatory: false
+  #   }
+  # ]
+
+  # Admin admin password configurations
+  Rails.application.secrets.dig(:decidim, :admin_password, :strong).tap do |strong_pw|
+    # When the strong password is not configured, default to true
+    config.admin_password_strong = strong_pw.nil? ? true : strong_pw.present?
+  end
+  config.admin_password_expiration_days = Rails.application.secrets.dig(:decidim, :admin_password, :expiration_days).presence || 90
+  config.admin_password_min_length = Rails.application.secrets.dig(:decidim, :admin_password, :min_length).presence || 15
+  config.admin_password_repetition_times = Rails.application.secrets.dig(:decidim, :admin_password, :repetition_times).presence || 5
+
+  # Additional optional configurations (see decidim-core/lib/decidim/core.rb)
+  config.cache_key_separator = Rails.application.secrets.decidim[:cache_key_separator] if Rails.application.secrets.decidim[:cache_key_separator].present?
+  config.expire_session_after = Rails.application.secrets.decidim[:expire_session_after].to_i.minutes if Rails.application.secrets.decidim[:expire_session_after].present?
+  config.enable_remember_me = Rails.application.secrets.decidim[:enable_remember_me].present? unless Rails.application.secrets.decidim[:enable_remember_me] == "auto"
+  if Rails.application.secrets.decidim[:session_timeout_interval].present?
+    config.session_timeout_interval = Rails.application.secrets.decidim[:session_timeout_interval].to_i.seconds
+  end
+  config.follow_http_x_forwarded_host = Rails.application.secrets.decidim[:follow_http_x_forwarded_host].present?
+  config.maximum_conversation_message_length = Rails.application.secrets.decidim[:maximum_conversation_message_length].to_i
+  config.password_blacklist = Rails.application.secrets.decidim[:password_blacklist] if Rails.application.secrets.decidim[:password_blacklist].present?
+  config.allow_open_redirects = Rails.application.secrets.decidim[:allow_open_redirects] if Rails.application.secrets.decidim[:allow_open_redirects].present?
+end
+
+if Decidim.module_installed? :api
+  Decidim::Api.configure do |config|
+    config.schema_max_per_page = Rails.application.secrets.dig(:decidim, :api, :schema_max_per_page).presence || 50
+    config.schema_max_complexity = Rails.application.secrets.dig(:decidim, :api, :schema_max_complexity).presence || 5000
+    config.schema_max_depth = Rails.application.secrets.dig(:decidim, :api, :schema_max_depth).presence || 15
+  end
+end
+
+if Decidim.module_installed? :proposals
+  Decidim::Proposals.configure do |config|
+    config.similarity_threshold = Rails.application.secrets.dig(:decidim, :proposals, :similarity_threshold).presence || 0.25
+    config.similarity_limit = Rails.application.secrets.dig(:decidim, :proposals, :similarity_limit).presence || 10
+    config.participatory_space_highlighted_proposals_limit = Rails.application.secrets.dig(:decidim, :proposals, :participatory_space_highlighted_proposals_limit).presence || 4
+    config.process_group_highlighted_proposals_limit = Rails.application.secrets.dig(:decidim, :proposals, :process_group_highlighted_proposals_limit).presence || 3
+  end
+end
+
+if Decidim.module_installed? :meetings
+  Decidim::Meetings.configure do |config|
+    config.upcoming_meeting_notification = Rails.application.secrets.dig(:decidim, :meetings, :upcoming_meeting_notification).to_i.days
+    if Rails.application.secrets.dig(:decidim, :meetings, :embeddable_services).present?
+      config.embeddable_services = Rails.application.secrets.dig(:decidim, :meetings, :embeddable_services)
+    end
+    unless Rails.application.secrets.dig(:decidim, :meetings, :enable_proposal_linking) == "auto"
+      config.enable_proposal_linking = Rails.application.secrets.dig(:decidim, :meetings, :enable_proposal_linking).present?
+    end
+  end
+end
+
+if Decidim.module_installed? :budgets
+  Decidim::Budgets.configure do |config|
+    unless Rails.application.secrets.dig(:decidim, :budgets, :enable_proposal_linking) == "auto"
+      config.enable_proposal_linking = Rails.application.secrets.dig(:decidim, :budgets, :enable_proposal_linking).present?
+    end
+  end
+end
+
+if Decidim.module_installed? :accountability
+  Decidim::Accountability.configure do |config|
+    unless Rails.application.secrets.dig(:decidim, :accountability, :enable_proposal_linking) == "auto"
+      config.enable_proposal_linking = Rails.application.secrets.dig(:decidim, :accountability, :enable_proposal_linking).present?
+    end
+  end
+end
+
+if Decidim.module_installed? :consultations
+  Decidim::Consultations.configure do |config|
+    config.stats_cache_expiration_time = Rails.application.secrets.dig(:decidim, :consultations, :stats_cache_expiration_time).to_i.minutes
+  end
+end
+
+if Decidim.module_installed? :initiatives
+  Decidim::Initiatives.configure do |config|
+    unless Rails.application.secrets.dig(:decidim, :initiatives, :creation_enabled) == "auto"
+      config.creation_enabled = Rails.application.secrets.dig(:decidim, :initiatives, :creation_enabled).present?
+    end
+    config.similarity_threshold = Rails.application.secrets.dig(:decidim, :initiatives, :similarity_threshold).presence || 0.25
+    config.similarity_limit = Rails.application.secrets.dig(:decidim, :initiatives, :similarity_limit).presence || 5
+    config.minimum_committee_members = Rails.application.secrets.dig(:decidim, :initiatives, :minimum_committee_members).presence || 2
+    config.default_signature_time_period_length = Rails.application.secrets.dig(:decidim, :initiatives, :default_signature_time_period_length).presence || 120
+    config.default_components = Rails.application.secrets.dig(:decidim, :initiatives, :default_components)
+    config.first_notification_percentage = Rails.application.secrets.dig(:decidim, :initiatives, :first_notification_percentage).presence || 33
+    config.second_notification_percentage = Rails.application.secrets.dig(:decidim, :initiatives, :second_notification_percentage).presence || 66
+    config.stats_cache_expiration_time = Rails.application.secrets.dig(:decidim, :initiatives, :stats_cache_expiration_time).to_i.minutes
+    config.max_time_in_validating_state = Rails.application.secrets.dig(:decidim, :initiatives, :max_time_in_validating_state).to_i.days
+    unless Rails.application.secrets.dig(:decidim, :initiatives, :print_enabled) == "auto"
+      config.print_enabled = Rails.application.secrets.dig(:decidim, :initiatives, :print_enabled).present?
+    end
+    config.do_not_require_authorization = Rails.application.secrets.dig(:decidim, :initiatives, :do_not_require_authorization).present?
+  end
+end
+
+if Decidim.module_installed? :elections
+  Decidim::Elections.configure do |config|
+    config.setup_minimum_hours_before_start = Rails.application.secrets.dig(:elections, :setup_minimum_hours_before_start).presence || 3
+    config.start_vote_maximum_hours_before_start = Rails.application.secrets.dig(:elections, :start_vote_maximum_hours_before_start).presence || 6
+    config.voter_token_expiration_minutes = Rails.application.secrets.dig(:elections, :voter_token_expiration_minutes).presence || 120
+  end
+
+  Decidim::Votings.configure do |config|
+    config.check_census_max_requests = Rails.application.secrets.dig(:elections, :votings, :check_census_max_requests).presence || 5
+    config.throttling_period = Rails.application.secrets.dig(:elections, :votings, :throttling_period).to_i.minutes
+  end
+
+  Decidim::Votings::Census.configure do |config|
+    config.census_access_codes_export_expiry_time = Rails.application.secrets.dig(:elections, :votings, :census, :access_codes_export_expiry_time).to_i.days
+  end
 end
 
 Rails.application.config.i18n.available_locales = Decidim.available_locales
diff --git a/decidim-generators/lib/decidim/generators/app_templates/secrets.yml.erb b/decidim-generators/lib/decidim/generators/app_templates/secrets.yml.erb
index 07ab7459482b9..6b41fa6bf8759 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/secrets.yml.erb
+++ b/decidim-generators/lib/decidim/generators/app_templates/secrets.yml.erb
@@ -10,8 +10,77 @@
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 
+decidim_default: &decidim_default
+  application_name: <%%= Decidim::Env.new("DECIDIM_APPLICATION_NAME", "My Application Name").to_json %>
+  mailer_sender: <%%= Decidim::Env.new("DECIDIM_MAILER_SENDER", "change-me@example.org").to_s %>
+  available_locales: <%%= Decidim::Env.new("DECIDIM_AVAILABLE_LOCALES", "ca,cs,de,en,es,eu,fi,fr,it,ja,nl,pl,pt,ro").to_array.to_json %>
+  default_locale: <%%= Decidim::Env.new("DECIDIM_DEFAULT_LOCALE", "en").to_s %>
+  force_ssl: <%%= Decidim::Env.new("DECIDIM_FORCE_SSL", "auto").default_or_present_if_exists.to_s %>
+  enable_html_header_snippets: <%%= Decidim::Env.new("DECIDIM_ENABLE_HTML_HEADER_SNIPPETS").to_boolean_string %>
+  currency_unit: <%%= Decidim::Env.new("DECIDIM_CURRENCY_UNIT", "€").to_s %>
+  cors_enabled: <%%= Decidim::Env.new("DECIDIM_CORS_ENABLED").to_boolean_string %>
+  image_uploader_quality: <%%= Decidim::Env.new("DECIDIM_IMAGE_UPLOADER_QUALITY", "80").to_i %>
+  maximum_attachment_size: <%%= Decidim::Env.new("DECIDIM_MAXIMUM_ATTACHMENT_SIZE", "10").to_i %>
+  maximum_avatar_size: <%%= Decidim::Env.new("DECIDIM_MAXIMUM_AVATAR_SIZE", "5").to_i %>
+  max_reports_before_hiding: <%%= Decidim::Env.new("DECIDIM_MAX_REPORTS_BEFORE_HIDING", "3").to_i %>
+  track_newsletter_links: <%%= Decidim::Env.new("DECIDIM_TRACK_NEWSLETTER_LINKS", "auto").default_or_present_if_exists.to_s %>
+  download_your_data_expiry_time: <%%= Decidim::Env.new("DECIDIM_DOWNLOAD_YOUR_DATA_EXPIRY_TIME", "7").to_i %>
+  throttling_max_requests: <%%= Decidim::Env.new("DECIDIM_THROTTLING_MAX_REQUESTS", "100").to_i %>
+  throttling_period: <%%= Decidim::Env.new("DECIDIM_THROTTLING_PERIOD", "1").to_i %>
+  unconfirmed_access_for: <%%= Decidim::Env.new("DECIDIM_UNCONFIRMED_ACCESS_FOR", "0").to_i %>
+  system_accesslist_ips: <%%= Decidim::Env.new("DECIDIM_SYSTEM_ACCESSLIST_IPS").to_array.to_json %>
+  base_uploads_path: <%%= Decidim::Env.new("DECIDIM_BASE_UPLOADS_PATH").to_json %>
+  default_csv_col_sep: <%%= Decidim::Env.new("DECIDIM_DEFAULT_CSV_COL_SEP", ";").to_json %>
+  consent_cookie_name: <%%= Decidim::Env.new("DECIDIM_CONSENT_COOKIE_NAME", "decidim-consent").to_json %>
+  cache_key_separator: <%%= Decidim::Env.new("DECIDIM_CACHE_KEY_SEPARATOR", "/").to_json %>
+  expire_session_after: <%%= Decidim::Env.new("DECIDIM_EXPIRE_SESSION_AFTER", "30").to_i %>
+  session_timeout_interval: <%%= Decidim::Env.new("DECIDIM_SESSION_TIMEOUT_INTERVAL", "10").to_i %>
+  enable_remember_me: <%%= Decidim::Env.new("DECIDIM_ENABLE_REMEMBER_ME", "auto").default_or_present_if_exists.to_s %>
+  follow_http_x_forwarded_host: <%%= Decidim::Env.new("DECIDIM_FOLLOW_HTTP_X_FORWARDED_HOST").to_boolean_string %>
+  maximum_conversation_message_length: <%%= Decidim::Env.new("DECIDIM_MAXIMUM_CONVERSATION_MESSAGE_LENGTH", "1000").to_i %>
+  password_blacklist: <%%= Decidim::Env.new("DECIDIM_PASSWORD_BLACKLIST").to_array(separator: ", ").to_json %>
+  allow_open_redirects: <%%= Decidim::Env.new("DECIDIM_ALLOW_OPEN_REDIRECTS").to_boolean_string %>
+  service_worker_enabled: <%%= Decidim::Env.new("DECIDIM_SERVICE_WORKER_ENABLED", Rails.env.exclude?("development")).to_boolean_string %>
+  admin_password:
+    expiration_days: <%%= Decidim::Env.new("DECIDIM_ADMIN_PASSWORD_EXPIRATION_DAYS", 90).to_i %>
+    min_length: <%%= Decidim::Env.new("DECIDIM_ADMIN_PASSWORD_MIN_LENGTH", 15).to_i %>
+    repetition_times: <%%= Decidim::Env.new("DECIDIM_ADMIN_PASSWORD_REPETITION_TIMES", 5).to_i %>
+    strong: <%%= Decidim::Env.new("DECIDIM_ADMIN_PASSWORD_STRONG", true).to_boolean_string %>
+  api:
+    schema_max_per_page: <%%= Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i %>
+    schema_max_complexity: <%%= Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i %>
+    schema_max_depth: <%%= Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i %>
+  proposals:
+    similarity_threshold: <%%= Decidim::Env.new("PROPOSALS_SIMILARITY_THRESHOLD", 0.25).to_f %>
+    similarity_limit: <%%= Decidim::Env.new("PROPOSALS_SIMILARITY_LIMIT", 10).to_i %>
+    participatory_space_highlighted_proposals_limit: <%%= Decidim::Env.new("PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT", 4).to_i %>
+    process_group_highlighted_proposals_limit: <%%= Decidim::Env.new("PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT", 3).to_i %>
+  meetings:
+    upcoming_meeting_notification: <%%= Decidim::Env.new("MEETINGS_UPCOMING_MEETING_NOTIFICATION", 2).to_i %>
+    enable_proposal_linking: <%%= Decidim::Env.new("MEETINGS_ENABLE_PROPOSAL_LINKING", "auto").default_or_present_if_exists.to_s %>
+    embeddable_services: <%%= Decidim::Env.new("MEETINGS_EMBEDDABLE_SERVICES").to_array(separator: " ").to_json %>
+  budgets:
+    enable_proposal_linking: <%%= Decidim::Env.new("BUDGETS_ENABLE_PROPOSAL_LINKING", "auto").default_or_present_if_exists.to_s %>
+  accountability:
+    enable_proposal_linking: <%%= Decidim::Env.new("ACCOUNTABILITY_ENABLE_PROPOSAL_LINKING", "auto").default_or_present_if_exists.to_s %>
+  consultations:
+    stats_cache_expiration_time: <%%= Decidim::Env.new("CONSULTATIONS_STATS_CACHE_EXPIRATION_TIME", 5).to_i %>
+  initiatives:
+    creation_enabled: <%%= Decidim::Env.new("INITIATIVES_CREATION_ENABLED", "auto").default_or_present_if_exists.to_s %>
+    similarity_threshold: <%%= Decidim::Env.new("INITIATIVES_SIMILARITY_THRESHOLD", 0.25).to_f %>
+    similarity_limit: <%%= Decidim::Env.new("INITIATIVES_SIMILARITY_LIMIT", 5).to_i %>
+    minimum_committee_members: <%%= Decidim::Env.new("INITIATIVES_MINIMUM_COMMITTEE_MEMBERS", 2).to_i %>
+    default_signature_time_period_length: <%%= Decidim::Env.new("INITIATIVES_DEFAULT_SIGNATURE_TIME_PERIOD_LENGTH", 120).to_i %>
+    default_components: <%%= Decidim::Env.new("INITIATIVES_DEFAULT_COMPONENTS", "pages, meetings").to_array.to_json %>
+    first_notification_percentage: <%%= Decidim::Env.new("INITIATIVES_FIRST_NOTIFICATION_PERCENTAGE", 33).to_i %>
+    second_notification_percentage: <%%= Decidim::Env.new("INITIATIVES_SECOND_NOTIFICATION_PERCENTAGE", 66).to_i %>
+    stats_cache_expiration_time: <%%= Decidim::Env.new("INITIATIVES_STATS_CACHE_EXPIRATION_TIME", 5).to_i %>
+    max_time_in_validating_state: <%%= Decidim::Env.new("INITIATIVES_MAX_TIME_IN_VALIDATING_STATE", 60).to_i %>
+    print_enabled: <%%= Decidim::Env.new("INITIATIVES_PRINT_ENABLED", "auto").default_or_present_if_exists.to_s %>
+    do_not_require_authorization: <%%= Decidim::Env.new("INITIATIVES_DO_NOT_REQUIRE_AUTHORIZATION").to_boolean_string %>
+
 elections_default: &elections_default
-  bulletin_board_server: <%%= ENV["ELECTIONS_BULLETIN_BOARD_SERVER"] || 'http://bulletin-board.lvh.me:8000/api' %>
+  bulletin_board_server: <%%= Decidim::Env.new("ELECTIONS_BULLETIN_BOARD_SERVER", 'http://bulletin-board.lvh.me:8000/api').to_s %>
   bulletin_board_public_key: {"kty":"RSA","n":"zMXsZpYPKkDlSmezX898y7zNOaJ7ENIN4kj4UhQ95Vm4HlgTpIs2VMMsO0eqynMaOR_G1mXdqbpbaJtXijBe4V8323QwGm6WVAa71E7pDXa5g6-uo5f8GePitN0YER9y2yNQN4uTaNzJiWV2uLBUYfMdj3SIif31YwLULHAOj3B_oleFK8coE_Qr3NzATcYBmsqE8AR4NljxTO6KDmP1SLdf5GBOBhOAIFbnL_Kpj2xkm7MS3hjMVKpiRhqA1UgX5oKZ8ixBv46fNJF0pBsHi3fHNjK9oZzgdx_AI-YFpdE_40-8bh_g9sWzxacqOM2-MdQLHbvRPEVltO3E8tr6I5YWrylcP7l9VD8OJeqjq2qFYHnGYdmLoD2XuXmI9EuBvSb9H4-qcartxZSIQCimKib_fxZvgrG1FSRRhK6YpvIdGv4-G2zfCCRsC4XD80TYI2bf-oYCoy7eU3_eVHFMV2yg4p1Wnuw2Vgq0edPL_bKaV9JvGx7F-U5juxNN0WZR9LzbPl4ReejzN95lyHgbj0nTH_u3bSpZmgJrQF-PwdnPcG46deVjJgUeosrlC4lQxVrRz0GL58BuFunnz2uYDBDrcJCiG60EbdkAFHjOcXU4wrUWATin7je_aqdBXhSnkTafcJAMvL7Y2Ld7vDge8nLqjAVlAi5am3rN0kqKT6M","e":"AQAB","kid":"a8e86f02ca27e1861bfc49e2a9a4614ca9068f8efdb6d42d19d3aab0eb2a31be"}
   authority_private_key: {"kty":"RSA","n":"pNgMt8lnPDD3TlWYGhRiV1oZkPQmnLdiUzwyb_-35qKD9k-HU86xo0uSgoOUWkBtnvFscq8zNDPAGAlZVokaN_z9ksZblSce0LEl8lJa3ICgghg7e8vg_7Lz5dyHSQ3PCLgenyFGcL401aglDde1Xo4ujdz33Lklc4U9zoyoLUI2_viYmNOU6n5Mn0sJd30FeICMrLD2gX46pGe3MGug6groT9EvpKcdOoJHKoO5yGSVaeY5-Bo3gngvlgjlS2mfwjCtF4NYwIQSd2al-p4BKnuYAVKRSgr8rYnnjhWfJ4GsCaqiyXNi5NPYRV6gl_cx_1jUcA1rRJqQR32I8c8QbAXm5qNO4URcdaKys9tNcVgXBL1FsSdbrLVVFWen1tfWNfHm-8BjiWCWD79-uk5gI0SjC9tWvTzVvswWXI5weNqqVXqpDydr46AsHE2sG40HRCR3UF3LupT-HwXTcYcOZr5dJClJIsU3Hrvy4wLssub69YSNR1Jxn-KX2vUc06xY8CNIuSMpfufEq5cZopL6O2l1pRsW1FQnF3s078_Y9MaQ1gPyBo0IipLBVUj5IjEIfPuiEk4jxkiUYDeqzf7bAvSFckp94yLkRWTs_pEZs7b_ogwRG6WMHjtcaNYe4CufhIm9ekkKDeAWOPRTHfKNmohRBh09XuvSjqrx5Z7rqb8","e":"AQAB","kid":"b8dba1459df956d60107690c34fa490db681eac4f73ffaf6e4055728c02ddc8e","d":"Uh3KIBe1VJez6pLbBUrYPlmE2N-3CGSWF46qNX62lq6ofB_b8xTJCuaPonJ3iYoE0aPEeVDrefq5m3-0wFXl-LQPgXlMj_1_7UgB9jeuSZ_N1WDK6P2EJPx5YS09O1gkpVxK7Mx_sZQe77wmUUH-eI7tg__qfUrB7E0Yn_cTpBATI2qlYaQsz6-A7e1MVvixq_ilmzVAZvuBrPp5mCZVb6FlXrV_PU9-UPIrD3O1La1lfO6SPBSbSGQkmGHwD2QbkHn9D_R_Vs-z_0TkM_dX71jIPQhrle3pN222KuJ8eQqwr9QP6biQMBuT5eKgr3MVtfUDRpp4sCEq9GIFwSd8LvbmGPrOoz8ueOEQ05nisIBQuOTYiWpYs2CEV062HR1bLFRLDUcSlflGNr0bgiXTUFx4wxRG06OaI-rQ6nG3M8TE0I0phMNCG3c7YyV28z_k2I65oQF9aKtiwFwc0YsUSGPTOFZGWHuCCPLm0lFeebpI_JIYqIv70NJxbSZEBY8DAIqZPqP6y_CRo2_C7piCgsjg9pnF8cp45vz4L6DWZ0Tumc_5aRuqIBkYXXwP9TjqhzxL-2SQHIqUAjj6Y6S35tZT6ekZSbnPIKX_e42y6bDT_Ztf01QfKiTkcx3_I8RwOuh6CzJzr72AykQpU3XKOKF1x1GBtYyrno4jG5LgaGE","p":"1UARZ-rRnpKG5NHKlXTys3irCy-d91edHL3fEIzDKvhMRQCIWh7dt8l0_sIpcBF-EbVilbFKj7yfgZBTr8EkAXHgweayK8rnlMqi2jte1_u-5DBtrGVVUTSQltSLDOZHK5QfUxVK6Bbk8K5ROLvef91oNgnSNWNOeoCZdlS55nMZcAgY_6mxSuuMq54Tgy8o4Ip890-ZEYY6OSFXhU-ieoGO4Jw--c6QzmCa3gGo2oVClidMNaM1jquK4Pj6xaoxR2NWeIX9Ix7k1P2B24pegyHXjSIpQ6JYdn352VViXi2tx7TTJh6ClNVjgoRmL4Gfy_IJNx0GhF5OB3yughUc7w","q":"xePJGBt466qM9F0BPxWFjyWbIs_GNXr-lBGASui0Z94cfgFbsZwqRsWQEf7jDVQsDNVnPSWZ_Wd6UqoQaIxc0tE8gaokPG6A4EUDyoLaZ231ZydDVoWof8FnPDaJwrcPwZ4R6ZLKGmkfytCZuU9I_9B4uuV0dyjEzKfS-Os3UcLumKPlgJ71OZAb49GTqUHuTePcSJjyYOYXx6eE7i_1m8TjU9Ut18BJNQhLqWmerA6X1ijbR2_syY6GXhGSfciSBH8xVkiUnqXb2jt1bE8nwWw-Sam5ikjzNbXqqs978IcCE5HTddQmy99bwuArA8PLqIFj3OOO1CSo8oyn2XDgMQ","dp":"Diky_rOZN-6DBq7nxQT_GOvqb9O5qbMnu8DgDzlJvJDAf9SJOXLTRmEaY9CA7_A5bvOcmFQtn13nObNb20_4FCB7zGSFcGMI_dh2-Ab5RV5yTrTok4onID1dXKbAlRq1ny825U2Eq-TZTyJEQoA3RkZtpSkBzInLrFbd2f3GWodKKSZggpnCLDd4H-1fXlbDYCXSJpoikAdZ1nFgXnnrUDdKRaAajnwpIYtIvXVewSQYR-BULzunUtIRZt8hx_6FRzhRha9gH_TtPTeYZ_vISuz0Y2rhUpx1Q2kaLlR9M8PUxm47l0xvX3LMKN6h6oWxFtn7wq0qwZ-Bjv24mOrOAQ","dq":"nXGD10hURrwk9W7hxP0sjB2Rdnr06iv3THs4JWFL16_h32bZO1BSWoho_chbgYlMmtFXGFFIWVLxAcAI2gWC_MA4cbmapvIMW2LNh1vgxJW5v95_NuGUlECeEEwcAu1-_b7z5XBCmAy3nLem9sbb_5wv0hMpPH0VRvbnZeBO3SBIkO0lddYCqU-8wN9HqkyoexQleSUnAm1O0iy4GIHT2aEmdNaRaKy2EhmNiTZdZeseZueOvyGPtTVONp2ofacMdcN0z39jr22qo9DWtdusd7nVPOpqkllEF6GrGUeHBnGD92n4YjDuxRnqefu8fXxUFrcLav0p8CNSv9ek291woQ","qi":"w6hfKEBLLHRWPkjajgxZyyetj-UFfVkILRT0plOllJ2JV8whcOXRXbiXH2r8zqMeyMFrrMwmuvv4TVQaruKB0ZQOG7Tz5Lw0RZEREOLnBwc3vSi_iLd-jBz01LdExTpqsAHMkaMQR9x62J8DE1ZNxVdn3ELYKik0f1L2r_WErzhvT1uq69HAybUp6WHcFYH0PSqHg4LOneXAdU1_g-ji2Zn9dlA_2oYGQ5S6JXPV7v2IVbEFpxyVD1lPbFT0iKhyZZevictjgD_JGHveIVqsq5w0Csyz08h0oEW9hYEq-4bquMxSf18gjldoS5uQPD7FUECgL8bxsCdc4hP6UEKYGw"}
   authority_name: "Decidim Test Authority"
@@ -20,30 +89,72 @@ elections_default: &elections_default
   quorum: 2
   number_of_trustees: 3
 
+storage_default: &storage_default
+  provider: <%%= Decidim::Env.new("STORAGE_PROVIDER", "local").to_s %>
+  cdn_host: <%%= ENV["STORAGE_CDN_HOST"] %>
+  s3:
+    access_key_id: <%%= ENV["AWS_ACCESS_KEY_ID"] %>
+    secret_access_key: <%%= ENV["AWS_SECRET_ACCESS_KEY"] %>
+    region: <%%= ENV["AWS_REGION"] %>
+    bucket: <%%= ENV["AWS_BUCKET"] %>
+    endpoint: <%%= ENV["AWS_ENDPOINT"] %>
+  azure:
+    storage_access_key: <%%= ENV["AZURE_STORAGE_ACCESS_KEY"] %>
+    storage_account_name: <%%= ENV["AZURE_STORAGE_ACCOUNT_NAME"] %>
+    container: <%%= ENV["AZURE_CONTAINER"] %>
+  gcs:
+    project: <%%= ENV["GCS_PROJECT"] %>
+    bucket: <%%= ENV["GCS_BUCKET"] %>
+    type: <%%= Decidim::Env.new("GCS_TYPE", "service_account").to_s %>
+    project_id: <%%= Decidim::Env.new("GCS_PROJECT_ID").to_s %>
+    private_key_id: <%%= Decidim::Env.new("GCS_PRIVATE_KEY_ID").to_s %>
+    private_key: <%%= Decidim::Env.new("GCS_PRIVATE_KEY").to_s %>
+    client_email: <%%= Decidim::Env.new("GCS_CLIENT_EMAIL").to_s %>
+    client_id: <%%= Decidim::Env.new("GCS_CLIENT_ID").to_s %>
+    auth_uri: <%%= Decidim::Env.new("GCS_AUTH_URI", "https://accounts.google.com/o/oauth2/auth").to_s %>
+    token_uri: <%%= Decidim::Env.new("GCS_TOKEN_URI", "https://accounts.google.com/o/oauth2/token").to_s %>
+    auth_provider_x509_cert_url: <%%= Decidim::Env.new("GCS_AUTH_PROVIDER_X509_CERT_URL", "https://www.googleapis.com/oauth2/v1/certs").to_s %>
+    client_x509_cert_url: <%%= Decidim::Env.new("GCS_CLIENT_X509_CERT_URL").to_s %>
+
 default: &default
+  decidim:
+    <<: *decidim_default
   omniauth:
     facebook:
-      # It must be a boolean. Remember ENV variables doesn't support booleans.
-      enabled: false
+      enabled: <%%= Decidim::Env.new("OMNIAUTH_FACEBOOK_APP_ID").to_boolean_string %>
       app_id: <%%= ENV["OMNIAUTH_FACEBOOK_APP_ID"] %>
       app_secret: <%%= ENV["OMNIAUTH_FACEBOOK_APP_SECRET"] %>
     twitter:
-      enabled: false
+      enabled: <%%= Decidim::Env.new("OMNIAUTH_TWITTER_API_KEY").to_boolean_string %>
       api_key: <%%= ENV["OMNIAUTH_TWITTER_API_KEY"] %>
       api_secret: <%%= ENV["OMNIAUTH_TWITTER_API_SECRET"] %>
     google_oauth2:
-      enabled: false
+      enabled: <%%= Decidim::Env.new("OMNIAUTH_GOOGLE_CLIENT_ID").to_boolean_string %>
       icon_path: decidim/brands/google.svg
       client_id: <%%= ENV["OMNIAUTH_GOOGLE_CLIENT_ID"] %>
       client_secret: <%%= ENV["OMNIAUTH_GOOGLE_CLIENT_SECRET"] %>
   maps:
-    api_key: <%%= ENV["MAPS_API_KEY"] %>
+    dynamic_provider: <%%= Decidim::Env.new("MAPS_DYNAMIC_PROVIDER", ENV["MAPS_PROVIDER"]).to_s %>
+    static_provider: <%%= Decidim::Env.new("MAPS_STATIC_PROVIDER", ENV["MAPS_PROVIDER"]).to_s  %>
+    static_api_key: <%%= Decidim::Env.new("MAPS_STATIC_API_KEY", ENV["MAPS_API_KEY"]).to_s %>
+    dynamic_api_key: <%%= Decidim::Env.new("MAPS_DYNAMIC_API_KEY", ENV["MAPS_API_KEY"]).to_s %>
+    dynamic_url: <%%= ENV["MAPS_DYNAMIC_URL"] %>
+    static_url: <%%= ENV["MAPS_STATIC_URL"] %>
+    attribution: <%%= ENV["MAPS_ATTRIBUTION"].to_json %>
+    extra_vars: <%%= ENV["MAPS_EXTRA_VARS"].to_json %>
+    geocoding_host: <%%= ENV["MAPS_GEOCODING_HOST"] %>
   etherpad:
     server: <%%= ENV["ETHERPAD_SERVER"] %>
     api_key: <%%= ENV["ETHERPAD_API_KEY"] %>
-    api_version: "1.2.1"
+    api_version: <%%= Decidim::Env.new("ETHERPAD_API_VERSION", "1.2.1") %>
   elections:
     <<: *elections_default
+  storage:
+    <<: *storage_default
+  vapid:
+    enabled: <%%= Decidim::Env.new("VAPID_PUBLIC_KEY").to_boolean_string %>
+    public_key: <%%= ENV["VAPID_PUBLIC_KEY"] %>
+    private_key: <%%= ENV["VAPID_PRIVATE_KEY"] %>
 
 development:
   <<: *default
@@ -71,7 +182,7 @@ test:
       client_secret:
   elections:
     <<: *elections_default
-    bulletin_board_server: <%%= ENV["ELECTIONS_BULLETIN_BOARD_SERVER"] || 'http://bulletin-board.lvh.me:5017/api' %>
+    bulletin_board_server: <%%= Decidim::Env.new("ELECTIONS_BULLETIN_BOARD_SERVER", 'http://bulletin-board.lvh.me:5017/api').to_s %>
 
 
 # Do not keep production secrets in the repository,
@@ -83,15 +194,23 @@ production:
   smtp_password: <%%= ENV["SMTP_PASSWORD"] %>
   smtp_address: <%%= ENV["SMTP_ADDRESS"] %>
   smtp_domain: <%%= ENV["SMTP_DOMAIN"] %>
-  smtp_port: "587"
-  smtp_starttls_auto: true
-  smtp_authentication: "plain"
+  smtp_port: <%%= Decidim::Env.new("SMTP_PORT", 587).to_i %>
+  smtp_starttls_auto: <%%= Decidim::Env.new("SMTP_STARTTLS_AUTO").to_boolean_string %>
+  smtp_authentication: <%%= Decidim::Env.new("SMTP_AUTHENTICATION", "plain").to_s %>
   elections:
     bulletin_board_server: <%%= ENV["BULLETIN_BOARD_SERVER"] %>
     bulletin_board_public_key: <%%= ENV["BULLETIN_BOARD_PUBLIC_KEY"] %>
     authority_api_key: <%%= ENV["BULLETIN_BOARD_API_KEY"] %>
     authority_name: <%%= ENV["AUTHORITY_NAME"] %>
     authority_private_key: <%%= ENV["AUTHORITY_PRIVATE_KEY"] %>
-    scheme_name: <%%= ENV["ELECTIONS_SCHEME_NAME"] %>
-    number_of_trustees: <%%= ENV["ELECTIONS_NUMBER_OF_TRUSTEES"] %>
-    quorum: <%%= ENV["ELECTIONS_QUORUM"] %>
+    scheme_name: <%%= Decidim::Env.new("ELECTIONS_SCHEME_NAME", "electionguard").to_s %>
+    number_of_trustees: <%%= Decidim::Env.new("ELECTIONS_NUMBER_OF_TRUSTEES").to_i %>
+    quorum: <%%= Decidim::Env.new("ELECTIONS_QUORUM").to_i %>
+    setup_minimum_hours_before_start: <%%= Decidim::Env.new("ELECTIONS_SETUP_MINIMUM_HOURS_BEFORE_START", 3).to_i %>
+    start_vote_maximum_hours_before_start: <%%= Decidim::Env.new("ELECTIONS_START_VOTE_MAXIMUM_HOURS_BEFORE_START", 6).to_i %>
+    voter_token_expiration_minutes: <%%= Decidim::Env.new("ELECTIONS_VOTER_TOKEN_EXPIRATION_MINUTES", 120).to_i %>
+    votings:
+      check_census_max_requests: <%%= Decidim::Env.new("VOTINGS_CHECK_CENSUS_MAX_REQUESTS", 5).to_i %>
+      throttling_period: <%%= Decidim::Env.new("VOTINGS_THROTTLING_PERIOD", 1).to_i %>
+      census:
+        access_codes_export_expiry_time: <%%= Decidim::Env.new("VOTINGS_CENSUS_ACCESS_CODES_EXPORT_EXPIRY_TIME", 2).to_i %>
diff --git a/decidim-generators/lib/decidim/generators/app_templates/sidekiq.yml.erb b/decidim-generators/lib/decidim/generators/app_templates/sidekiq.yml.erb
new file mode 100644
index 0000000000000..77767f1330ba3
--- /dev/null
+++ b/decidim-generators/lib/decidim/generators/app_templates/sidekiq.yml.erb
@@ -0,0 +1,16 @@
+:concurrency: <%%= ENV.fetch("SIDEKIQ_CONCURRENCY", 5) %>
+:queues:
+  - [mailers, 4]
+  - [vote_reminder, 2]
+  - [reminders, 2]
+  - [default, 2]
+  - [newsletter, 2]
+  - [newsletters_opt_in, 2]
+  - [conference_diplomas, 2]
+  - [events, 2]
+  - [translations, 2]
+  - [user_report, 2]
+  - [block_user, 2]
+  - [metrics, 1]
+  - [exports, 1]
+  - [close_meeting_reminder, 1]
diff --git a/decidim-generators/lib/decidim/generators/app_templates/storage.yml.erb b/decidim-generators/lib/decidim/generators/app_templates/storage.yml.erb
new file mode 100644
index 0000000000000..0354d61650d6a
--- /dev/null
+++ b/decidim-generators/lib/decidim/generators/app_templates/storage.yml.erb
@@ -0,0 +1,42 @@
+test:
+  service: Disk
+  root: <%%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%%= Rails.root.join("storage") %>
+
+s3:
+  service: S3
+  access_key_id: <%%= Rails.application.secrets.dig(:storage, :s3, :access_key_id) %>
+  secret_access_key: <%%= Rails.application.secrets.dig(:storage, :s3, :secret_access_key) %>
+  bucket: <%%= Rails.application.secrets.dig(:storage, :s3, :bucket) %>
+  <%%= "region: #{Rails.application.secrets.dig(:storage, :s3, :region)}" if Rails.application.secrets.dig(:storage, :s3, :region) %>
+  <%%= "endpoint: #{Rails.application.secrets.dig(:storage, :s3, :endpoint)}" if Rails.application.secrets.dig(:storage, :s3, :endpoint) %>
+
+azure:
+  service: AzureStorage
+  storage_account_name: <%%= Rails.application.secrets.dig(:storage, :azure, :storage_account_name) %>
+  storage_access_key: <%%= Rails.application.secrets.dig(:storage, :azure, :storage_access_key) %>
+  container: <%%= Rails.application.secrets.dig(:storage, :azure, :container) %>
+
+gcs:
+  service: GCS
+  project: <%%= Rails.application.secrets.dig(:storage, :gcs, :project) %>
+  bucket: <%%= Rails.application.secrets.dig(:storage, :gcs, :bucket) %>
+  credentials:
+    type: <%%= Rails.application.secrets.dig(:storage, :gcs, :type) %>
+    project_id: <%%= Rails.application.secrets.dig(:storage, :gcs, :project_id) %>
+    private_key_id: <%%= Rails.application.secrets.dig(:storage, :gcs, :private_key_id) %>
+    private_key: <%%= Rails.application.secrets.dig(:storage, :gcs, :private_key) %>
+    client_email: <%%= Rails.application.secrets.dig(:storage, :gcs, :client_email) %>
+    client_id: <%%= Rails.application.secrets.dig(:storage, :gcs, :client_id) %>
+    auth_uri: <%%= Rails.application.secrets.dig(:storage, :gcs, :auth_uri) %>
+    token_uri: <%%= Rails.application.secrets.dig(:storage, :gcs, :token_uri) %>
+    auth_provider_x509_cert_url: <%%= Rails.application.secrets.dig(:storage, :gcs, :auth_provider_x509_cert_url) %>
+    client_x509_cert_url: <%%= Rails.application.secrets.dig(:storage, :gcs, :client_x509_cert_url) %>
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ s3, gcs, azure ]
diff --git a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
index 12fd1e9f2a961..943b3f94bbd7c 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
@@ -18,9 +18,9 @@ end
 
 group :development do
   gem "faker", "~> 2.14"
-  gem "letter_opener_web", "~> 1.3"
+  gem "letter_opener_web", "~> 2.0"
   gem "listen", "~> 3.1"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "~> 4.0"
+  gem "web-console", "~> 4.2"
 end
diff --git a/decidim-generators/lib/decidim/generators/component_templates/decidim-component.gemspec.erb b/decidim-generators/lib/decidim/generators/component_templates/decidim-component.gemspec.erb
index a40b62a04d3de..140a951986e2e 100644
--- a/decidim-generators/lib/decidim/generators/component_templates/decidim-component.gemspec.erb
+++ b/decidim-generators/lib/decidim/generators/component_templates/decidim-component.gemspec.erb
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["<%= %x[git config user.email].chomp %>"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim-module-<%= component_name %>"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-<%= component_name %>"
   s.summary = "A decidim <%= component_name %> module"
diff --git a/decidim-generators/lib/decidim/generators/install_generator.rb b/decidim-generators/lib/decidim/generators/install_generator.rb
index 03cdf6bce3b4f..911557f8827b1 100644
--- a/decidim-generators/lib/decidim/generators/install_generator.rb
+++ b/decidim-generators/lib/decidim/generators/install_generator.rb
@@ -93,12 +93,17 @@ def install_decidim_webpacker
 
         # Regenerate webpacker binstubs
         remove_file "bin/yarn"
+        bundle_install
         rails "webpacker:binstubs"
 
         # Run Decidim custom webpacker installation
         rails "decidim:webpacker:install"
       end
 
+      def build_api_docs
+        rails "decidim_api:generate_docs"
+      end
+
       def remove_old_assets
         remove_file "config/initializers/assets.rb"
         remove_dir("app/assets")
@@ -161,7 +166,9 @@ def profiling_gems
 
         copy_file "bullet_initializer.rb", "config/initializers/bullet.rb"
         copy_file "rack_profiler_initializer.rb", "config/initializers/rack_profiler.rb"
+      end
 
+      def bundle_install
         run "bundle install"
       end
 
diff --git a/decidim-generators/lib/decidim/generators/test/generator_examples.rb b/decidim-generators/lib/decidim/generators/test/generator_examples.rb
new file mode 100644
index 0000000000000..ed472c9f90918
--- /dev/null
+++ b/decidim-generators/lib/decidim/generators/test/generator_examples.rb
@@ -0,0 +1,1074 @@
+# frozen_string_literal: true
+
+shared_examples_for "a new production application" do
+  it "includes optional plugins commented out in Gemfile" do
+    expect(result[1]).to be_success, result[0]
+
+    expect(File.read("#{test_app}/Gemfile"))
+      .to match(/^# gem "decidim-initiatives"/)
+      .and match(/^# gem "decidim-consultations"/)
+      .and match(/^# gem "decidim-elections"/)
+      .and match(/^# gem "decidim-conferences"/)
+      .and match(/^# gem "decidim-templates"/)
+  end
+end
+
+shared_examples_for "a new development application" do
+  it "includes optional plugins uncommented in Gemfile" do
+    expect(result[1]).to be_success, result[0]
+
+    expect(File.read("#{test_app}/Gemfile"))
+      .to match(/^gem "decidim-initiatives"/)
+      .and match(/^gem "decidim-consultations"/)
+      .and match(/^gem "decidim-elections"/)
+      .and match(/^gem "decidim-conferences"/)
+      .and match(/^gem "decidim-templates"/)
+
+    # Checks that every table from a migration is included in the generated schema
+    schema = File.read("#{test_app}/db/schema.rb")
+    tables = []
+    dropped = []
+    Decidim::GemManager.plugins.each do |plugin|
+      Dir.glob("#{plugin}db/migrate/*.rb").each do |migration|
+        lines = File.readlines(migration)
+        tables.concat(lines.filter { |line| line.match? "create_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
+        dropped.concat(lines.filter { |line| line.match? "drop_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
+        tables.concat(lines.filter { |line| line.match? "rename_table" }.map { |line| line.match(/(, :)([a-z_0-9]+)/)[2] })
+        dropped.concat(lines.filter { |line| line.match? "rename_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
+      end
+    end
+    tables.each do |table|
+      next if dropped.include? table
+
+      expect(schema).to match(/create_table "#{table}"|create_table :#{table}/)
+    end
+
+    # Check that important node modules were installed
+    expect(Pathname.new("#{test_app}/node_modules/@rails/webpacker")).to be_directory
+
+    # Check that the configuration tweaks are applied properly
+    expect(File.read("#{test_app}/config/spring.rb")).to match(%r{^require "decidim/spring"})
+  end
+end
+
+shared_context "with application env vars" do
+  # ensure that empty env behave like non-defined envs
+  let(:env_off) do
+    {
+      "RAILS_ENV" => "production",
+      "OMNIAUTH_FACEBOOK_APP_ID" => "",
+      "OMNIAUTH_FACEBOOK_APP_SECRET" => "",
+      "OMNIAUTH_TWITTER_API_KEY" => "",
+      "OMNIAUTH_TWITTER_API_SECRET" => "",
+      "OMNIAUTH_GOOGLE_CLIENT_ID" => "",
+      "OMNIAUTH_GOOGLE_CLIENT_SECRET" => "",
+      "MAPS_API_KEY" => "",
+      "ETHERPAD_SERVER" => "",
+      "ETHERPAD_API_KEY" => "",
+      "DECIDIM_APPLICATION_NAME" => "",
+      "DECIDIM_MAILER_SENDER" => "",
+      "DECIDIM_AVAILABLE_LOCALES" => "",
+      "DECIDIM_DEFAULT_LOCALE" => "",
+      "DECIDIM_ENABLE_HTML_HEADER_SNIPPETS" => "",
+      "DECIDIM_CURRENCY_UNIT" => "",
+      "DECIDIM_IMAGE_UPLOADER_QUALITY" => "",
+      "DECIDIM_MAXIMUM_ATTACHMENT_SIZE" => "",
+      "DECIDIM_MAXIMUM_AVATAR_SIZE" => "",
+      "DECIDIM_MAX_REPORTS_BEFORE_HIDING" => "",
+      "DECIDIM_THROTTLING_MAX_REQUESTS" => "",
+      "DECIDIM_THROTTLING_PERIOD" => "",
+      "DECIDIM_UNCONFIRMED_ACCESS_FOR" => "",
+      "DECIDIM_SYSTEM_ACCESSLIST_IPS" => "",
+      "DECIDIM_BASE_UPLOADS_PATH" => "",
+      "DECIDIM_DEFAULT_CSV_COL_SEP" => "",
+      "DECIDIM_CORS_ENABLED" => "",
+      "DECIDIM_ADMIN_PASSWORD_EXPIRATION_DAYS" => "",
+      "DECIDIM_ADMIN_PASSWORD_MIN_LENGTH" => "",
+      "DECIDIM_ADMIN_PASSWORD_REPETITION_TIMES" => "",
+      "DECIDIM_ADMIN_PASSWORD_STRONG" => "",
+      "DECIDIM_SERVICE_WORKER_ENABLED" => "",
+      "RAILS_LOG_LEVEL" => "nonsense",
+      "STORAGE_PROVIDER" => ""
+    }
+  end
+
+  let(:env_false) do
+    {
+      "RAILS_ENV" => "production",
+      "OMNIAUTH_FACEBOOK_APP_ID" => "false",
+      "OMNIAUTH_FACEBOOK_APP_SECRET" => "false",
+      "OMNIAUTH_TWITTER_API_KEY" => "no",
+      "OMNIAUTH_TWITTER_API_SECRET" => "false",
+      "OMNIAUTH_GOOGLE_CLIENT_ID" => "FalSe",
+      "OMNIAUTH_GOOGLE_CLIENT_SECRET" => "false",
+      "MAPS_API_KEY" => "0",
+      "ETHERPAD_SERVER" => "No",
+      "ETHERPAD_API_KEY" => "false",
+      "DECIDIM_AVAILABLE_LOCALES" => "false",
+      "DECIDIM_DEFAULT_LOCALE" => "false",
+      "DECIDIM_ENABLE_HTML_HEADER_SNIPPETS" => "FalSe",
+      "DECIDIM_CURRENCY_UNIT" => "false",
+      "DECIDIM_IMAGE_UPLOADER_QUALITY" => "false",
+      "DECIDIM_MAXIMUM_ATTACHMENT_SIZE" => "false",
+      "DECIDIM_MAXIMUM_AVATAR_SIZE" => "false",
+      "DECIDIM_MAX_REPORTS_BEFORE_HIDING" => "false",
+      "DECIDIM_THROTTLING_MAX_REQUESTS" => "false",
+      "DECIDIM_THROTTLING_PERIOD" => "false",
+      "DECIDIM_UNCONFIRMED_ACCESS_FOR" => "false",
+      "DECIDIM_SYSTEM_ACCESSLIST_IPS" => "false",
+      "DECIDIM_CORS_ENABLED" => "false",
+      "DECIDIM_SERVICE_WORKER_ENABLED" => "false"
+    }
+  end
+
+  let(:env_on) do
+    {
+      "RAILS_ENV" => "production",
+      "OMNIAUTH_FACEBOOK_APP_ID" => "a-facebook-id",
+      "OMNIAUTH_FACEBOOK_APP_SECRET" => "a-facebook-secret",
+      "OMNIAUTH_TWITTER_API_KEY" => "a-twitter-api-key",
+      "OMNIAUTH_TWITTER_API_SECRET" => "a-twitter-api-secret",
+      "OMNIAUTH_GOOGLE_CLIENT_ID" => "a-google-client-id",
+      "OMNIAUTH_GOOGLE_CLIENT_SECRET" => "a-google-client-secret",
+      "SECRET_KEY_BASE" => "a-secret-key-base",
+      "SMTP_USERNAME" => "a-smtp-username",
+      "SMTP_PASSWORD" => "a-smtp-password",
+      "SMTP_ADDRESS" => "a-smtp-address",
+      "SMTP_DOMAIN" => "a-smtp-domain",
+      "SMTP_PORT" => "12345",
+      "SMTP_STARTTLS_AUTO" => "a-smtp-starttls-auto",
+      "SMTP_AUTHENTICATION" => "a-smtp-authentication",
+      "DECIDIM_APPLICATION_NAME" => "\"A test\" {application}",
+      "DECIDIM_MAILER_SENDER" => "noreply@example.org",
+      "DECIDIM_AVAILABLE_LOCALES" => "de, fr, zh-CN",
+      "DECIDIM_DEFAULT_LOCALE" => "zh-CN",
+      "DECIDIM_FORCE_SSL" => "",
+      "DECIDIM_ENABLE_HTML_HEADER_SNIPPETS" => "true",
+      "DECIDIM_CURRENCY_UNIT" => "$",
+      "DECIDIM_IMAGE_UPLOADER_QUALITY" => "91",
+      "DECIDIM_MAXIMUM_ATTACHMENT_SIZE" => "25",
+      "DECIDIM_MAXIMUM_AVATAR_SIZE" => "11",
+      "DECIDIM_MAX_REPORTS_BEFORE_HIDING" => "4",
+      "DECIDIM_TRACK_NEWSLETTER_LINKS" => "",
+      "DECIDIM_DOWNLOAD_YOUR_DATA_EXPIRY_TIME" => "2",
+      "DECIDIM_THROTTLING_MAX_REQUESTS" => "99",
+      "DECIDIM_THROTTLING_PERIOD" => "2",
+      "DECIDIM_UNCONFIRMED_ACCESS_FOR" => "3",
+      "DECIDIM_SYSTEM_ACCESSLIST_IPS" => "127.0.0.1,172.26.0.1/24",
+      "DECIDIM_BASE_UPLOADS_PATH" => "some-path/",
+      "DECIDIM_DEFAULT_CSV_COL_SEP" => ",",
+      "DECIDIM_CORS_ENABLED" => "true",
+      "DECIDIM_SERVICE_WORKER_ENABLED" => "true",
+      "DECIDIM_CONSENT_COOKIE_NAME" => ":weird-consent-cookie-name:",
+      "DECIDIM_CACHE_KEY_SEPARATOR" => ":",
+      "DECIDIM_EXPIRE_SESSION_AFTER" => "45",
+      "DECIDIM_ENABLE_REMEMBER_ME" => "",
+      "DECIDIM_SESSION_TIMEOUT_INTERVAL" => "33",
+      "DECIDIM_FOLLOW_HTTP_X_FORWARDED_HOST" => "true",
+      "DECIDIM_MAXIMUM_CONVERSATION_MESSAGE_LENGTH" => "1234",
+      "DECIDIM_PASSWORD_BLACKLIST" => "i-dont-like-this-password, i-dont,like,this,one,either, password123456",
+      "DECIDIM_ALLOW_OPEN_REDIRECTS" => "true",
+      "DECIDIM_ADMIN_PASSWORD_EXPIRATION_DAYS" => "93",
+      "DECIDIM_ADMIN_PASSWORD_MIN_LENGTH" => "18",
+      "DECIDIM_ADMIN_PASSWORD_REPETITION_TIMES" => "8",
+      "DECIDIM_ADMIN_PASSWORD_STRONG" => "false",
+      "RAILS_LOG_LEVEL" => "fatal",
+      "RAILS_ASSET_HOST" => "http://assets.example.org",
+      "ETHERPAD_SERVER" => "http://a-etherpad-server.com",
+      "ETHERPAD_API_KEY" => "an-etherpad-key",
+      "ETHERPAD_API_VERSION" => "1.2.2",
+      "MAPS_PROVIDER" => "here",
+      "MAPS_API_KEY" => "a-maps-api-key",
+      "VAPID_PUBLIC_KEY" => "a-vapid-public-key",
+      "VAPID_PRIVATE_KEY" => "a-vapid-private-key",
+      "STORAGE_PROVIDER" => "test",
+      "STORAGE_CDN_HOST" => "https://cdn.example.org",
+      "API_SCHEMA_MAX_PER_PAGE" => "31",
+      "API_SCHEMA_MAX_COMPLEXITY" => "3001",
+      "API_SCHEMA_MAX_DEPTH" => "11",
+      "PROPOSALS_SIMILARITY_THRESHOLD" => "0.99",
+      "PROPOSALS_SIMILARITY_LIMIT" => "3",
+      "PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT" => "6",
+      "PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT" => "5",
+      "MEETINGS_UPCOMING_MEETING_NOTIFICATION" => "3",
+      "MEETINGS_ENABLE_PROPOSAL_LINKING" => "false",
+      "MEETINGS_EMBEDDABLE_SERVICES" => "www.youtube.com www.twitch.tv meet.jit.si 8x8.vc",
+      "BUDGETS_ENABLE_PROPOSAL_LINKING" => "false",
+      "ACCOUNTABILITY_ENABLE_PROPOSAL_LINKING" => "false",
+      "CONSULTATIONS_STATS_CACHE_EXPIRATION_TIME" => "7",
+      "INITIATIVES_CREATION_ENABLED" => "false",
+      "INITIATIVES_SIMILARITY_THRESHOLD" => "0.99",
+      "INITIATIVES_SIMILARITY_LIMIT" => "10",
+      "INITIATIVES_MINIMUM_COMMITTEE_MEMBERS" => "3",
+      "INITIATIVES_DEFAULT_SIGNATURE_TIME_PERIOD_LENGTH" => "133",
+      "INITIATIVES_DEFAULT_COMPONENTS" => "pages, proposals,budgets",
+      "INITIATIVES_FIRST_NOTIFICATION_PERCENTAGE" => "10",
+      "INITIATIVES_SECOND_NOTIFICATION_PERCENTAGE" => "70",
+      "INITIATIVES_STATS_CACHE_EXPIRATION_TIME" => "7",
+      "INITIATIVES_MAX_TIME_IN_VALIDATING_STATE" => "50",
+      "INITIATIVES_PRINT_ENABLED" => "false",
+      "INITIATIVES_DO_NOT_REQUIRE_AUTHORIZATION" => "true",
+      "BULLETIN_BOARD_SERVER" => "a-bulletin-board-server",
+      "BULLETIN_BOARD_PUBLIC_KEY" => "a-bulletin-public-key",
+      "BULLETIN_BOARD_API_KEY" => "an-authority-api-key",
+      "AUTHORITY_NAME" => "an-authority-name",
+      "AUTHORITY_PRIVATE_KEY" => "an-authority-private-key",
+      "ELECTIONS_SCHEME_NAME" => "an-elections-scheme-name",
+      "ELECTIONS_NUMBER_OF_TRUSTEES" => "345",
+      "ELECTIONS_QUORUM" => "987",
+      "ELECTIONS_SETUP_MINIMUM_HOURS_BEFORE_START" => "4",
+      "ELECTIONS_START_VOTE_MAXIMUM_HOURS_BEFORE_START" => "7",
+      "ELECTIONS_VOTER_TOKEN_EXPIRATION_MINUTES" => "123",
+      "VOTINGS_CHECK_CENSUS_MAX_REQUESTS" => "6",
+      "VOTINGS_THROTTLING_PERIOD" => "2",
+      "VOTINGS_CENSUS_ACCESS_CODES_EXPORT_EXPIRY_TIME" => "3"
+    }
+  end
+
+  let(:env_maps_osm) do
+    {
+      "RAILS_ENV" => "production",
+      "MAPS_PROVIDER" => "osm",
+      "MAPS_API_KEY" => "another-maps-api-key",
+      "MAPS_DYNAMIC_URL" => "https://tiles.example.org/{z}/{x}/{y}.png?key={apiKey}&{foo}",
+      "MAPS_STATIC_URL" => "https://staticmap.example.org/",
+      "MAPS_ATTRIBUTION" => '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors',
+      "MAPS_GEOCODING_HOST" => "nominatim.example.org"
+    }
+  end
+
+  let(:env_maps_mix) do
+    {
+      "RAILS_ENV" => "production",
+      "MAPS_STATIC_PROVIDER" => "here",
+      "MAPS_DYNAMIC_PROVIDER" => "osm",
+      "MAPS_STATIC_API_KEY" => "a-maps-api-key",
+      "MAPS_DYNAMIC_API_KEY" => "another-maps-api-key",
+      "MAPS_DYNAMIC_URL" => "https://tiles.example.org/{z}/{x}/{y}.png?key={apiKey}&{foo}",
+      "MAPS_ATTRIBUTION" => '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors',
+      "MAPS_GEOCODING_HOST" => "nominatim.example.org",
+      "MAPS_EXTRA_VARS" => URI.encode_www_form({ api_key: true, num: 123, foo: "bar=baz" })
+    }
+  end
+end
+
+shared_examples_for "an application with configurable env vars" do
+  include_context "with application env vars"
+
+  let(:secrets_off) do
+    {
+      %w(omniauth facebook enabled) => false,
+      %w(omniauth twitter enabled) => false,
+      %w(omniauth google_oauth2 enabled) => false,
+      %w(decidim application_name) => "My Application Name",
+      %w(decidim mailer_sender) => "change-me@example.org",
+      %w(decidim available_locales) => %w(ca cs de en es eu fi fr it ja nl pl pt ro),
+      %w(decidim default_locale) => "en",
+      %w(decidim force_ssl) => "auto",
+      %w(decidim enable_html_header_snippets) => false,
+      %w(decidim currency_unit) => "€",
+      %w(decidim image_uploader_quality) => 80,
+      %w(decidim maximum_attachment_size) => 10,
+      %w(decidim maximum_avatar_size) => 5,
+      %w(decidim max_reports_before_hiding) => 3,
+      %w(decidim track_newsletter_links) => "auto",
+      %w(decidim download_your_data_expiry_time) => 7,
+      %w(decidim throttling_max_requests) => 100,
+      %w(decidim throttling_period) => 1,
+      %w(decidim unconfirmed_access_for) => 0,
+      %w(decidim system_accesslist_ips) => [],
+      %w(decidim base_uploads_path) => nil,
+      %w(decidim default_csv_col_sep) => ";",
+      %w(decidim cors_enabled) => false,
+      %w(decidim service_worker_enabled) => true,
+      %w(decidim consent_cookie_name) => "decidim-consent",
+      %w(decidim cache_key_separator) => "/",
+      %w(decidim expire_session_after) => 30,
+      %w(decidim enable_remember_me) => "auto",
+      %w(decidim session_timeout_interval) => 10,
+      %w(decidim follow_http_x_forwarded_host) => false,
+      %w(decidim maximum_conversation_message_length) => 1000,
+      %w(decidim password_blacklist) => [],
+      %w(decidim allow_open_redirects) => false,
+      %w(decidim admin_password expiration_days) => 90,
+      %w(decidim admin_password min_length) => 15,
+      %w(decidim admin_password repetition_times) => 5,
+      %w(decidim admin_password strong) => true,
+      %w(etherpad server) => nil,
+      %w(etherpad api_key) => nil,
+      %w(etherpad api_version) => "1.2.1",
+      %w(maps dynamic_provider) => nil,
+      %w(maps static_provider) => nil,
+      %w(maps static_api_key) => nil,
+      %w(maps dynamic_api_key) => nil,
+      %w(maps static_url) => nil,
+      %w(maps dynamic_url) => nil,
+      %w(maps attribution) => nil,
+      %w(maps extra_vars) => nil,
+      %w(maps geocoding_host) => nil,
+      %w(vapid enabled) => false,
+      %w(vapid public_key) => nil,
+      %w(vapid private_key) => nil,
+      %w(storage provider) => "local",
+      %w(storage cdn_host) => nil,
+      %w(decidim api schema_max_per_page) => 50,
+      %w(decidim api schema_max_complexity) => 5000,
+      %w(decidim api schema_max_depth) => 15,
+      %w(decidim proposals similarity_threshold) => 0.25,
+      %w(decidim proposals similarity_limit) => 10,
+      %w(decidim proposals participatory_space_highlighted_proposals_limit) => 4,
+      %w(decidim proposals process_group_highlighted_proposals_limit) => 3,
+      %w(decidim meetings upcoming_meeting_notification) => 2,
+      %w(decidim meetings enable_proposal_linking) => "auto",
+      %w(decidim meetings embeddable_services) => [],
+      %w(decidim budgets enable_proposal_linking) => "auto",
+      %w(decidim accountability enable_proposal_linking) => "auto",
+      %w(decidim consultations stats_cache_expiration_time) => 5,
+      %w(decidim initiatives creation_enabled) => "auto",
+      %w(decidim initiatives similarity_threshold) => 0.25,
+      %w(decidim initiatives similarity_limit) => 5,
+      %w(decidim initiatives minimum_committee_members) => 2,
+      %w(decidim initiatives default_signature_time_period_length) => 120,
+      %w(decidim initiatives default_components) => %w(pages meetings),
+      %w(decidim initiatives first_notification_percentage) => 33,
+      %w(decidim initiatives second_notification_percentage) => 66,
+      %w(decidim initiatives stats_cache_expiration_time) => 5,
+      %w(decidim initiatives max_time_in_validating_state) => 60,
+      %w(decidim initiatives print_enabled) => "auto",
+      %w(decidim initiatives do_not_require_authorization) => false,
+      %w(elections setup_minimum_hours_before_start) => 3,
+      %w(elections start_vote_maximum_hours_before_start) => 6,
+      %w(elections voter_token_expiration_minutes) => 120,
+      %w(elections votings check_census_max_requests) => 5,
+      %w(elections votings throttling_period) => 1,
+      %w(elections votings census access_codes_export_expiry_time) => 2
+    }
+  end
+
+  let(:secrets_on) do
+    {
+      %w(omniauth facebook enabled) => true,
+      %w(omniauth facebook app_id) => "a-facebook-id",
+      %w(omniauth facebook app_secret) => "a-facebook-secret",
+      %w(omniauth twitter enabled) => true,
+      %w(omniauth twitter api_key) => "a-twitter-api-key",
+      %w(omniauth twitter api_secret) => "a-twitter-api-secret",
+      %w(omniauth google_oauth2 enabled) => true,
+      %w(omniauth google_oauth2 client_id) => "a-google-client-id",
+      %w(omniauth google_oauth2 client_secret) => "a-google-client-secret",
+      %w(secret_key_base) => "a-secret-key-base",
+      %w(smtp_username) => "a-smtp-username",
+      %w(smtp_password) => "a-smtp-password",
+      %w(smtp_address) => "a-smtp-address",
+      %w(smtp_domain) => "a-smtp-domain",
+      %w(smtp_port) => 12_345,
+      %w(smtp_starttls_auto) => true,
+      %w(smtp_authentication) => "a-smtp-authentication",
+      %w(decidim application_name) => "\"A test\" {application}",
+      %w(decidim mailer_sender) => "noreply@example.org",
+      %w(decidim available_locales) => %w(de fr zh-CN),
+      %w(decidim default_locale) => "zh-CN",
+      %w(decidim force_ssl) => false,
+      %w(decidim enable_html_header_snippets) => true,
+      %w(decidim currency_unit) => "$",
+      %w(decidim image_uploader_quality) => 91,
+      %w(decidim maximum_attachment_size) => 25,
+      %w(decidim maximum_avatar_size) => 11,
+      %w(decidim max_reports_before_hiding) => 4,
+      %w(decidim track_newsletter_links) => false,
+      %w(decidim download_your_data_expiry_time) => 2,
+      %w(decidim throttling_max_requests) => 99,
+      %w(decidim throttling_period) => 2,
+      %w(decidim unconfirmed_access_for) => 3,
+      %w(decidim system_accesslist_ips) => ["127.0.0.1", "172.26.0.1/24"],
+      %w(decidim base_uploads_path) => "some-path/",
+      %w(decidim default_csv_col_sep) => ",",
+      %w(decidim cors_enabled) => true,
+      %w(decidim service_worker_enabled) => true,
+      %w(decidim consent_cookie_name) => ":weird-consent-cookie-name:",
+      %w(decidim cache_key_separator) => ":",
+      %w(decidim expire_session_after) => 45,
+      %w(decidim enable_remember_me) => false,
+      %w(decidim session_timeout_interval) => 33,
+      %w(decidim follow_http_x_forwarded_host) => true,
+      %w(decidim maximum_conversation_message_length) => 1234,
+      %w(decidim password_blacklist) => ["i-dont-like-this-password", "i-dont,like,this,one,either", "password123456"],
+      %w(decidim allow_open_redirects) => true,
+      %w(decidim admin_password expiration_days) => 93,
+      %w(decidim admin_password min_length) => 18,
+      %w(decidim admin_password repetition_times) => 8,
+      %w(decidim admin_password strong) => false,
+      %w(etherpad server) => "http://a-etherpad-server.com",
+      %w(etherpad api_key) => "an-etherpad-key",
+      %w(etherpad api_version) => "1.2.2",
+      %w(maps dynamic_provider) => "here",
+      %w(maps static_provider) => "here",
+      %w(maps static_api_key) => "a-maps-api-key",
+      %w(maps dynamic_api_key) => "a-maps-api-key",
+      %w(maps static_url) => nil,
+      %w(maps dynamic_url) => nil,
+      %w(maps attribution) => nil,
+      %w(maps extra_vars) => nil,
+      %w(maps geocoding_host) => nil,
+      %w(vapid enabled) => true,
+      %w(vapid public_key) => "a-vapid-public-key",
+      %w(vapid private_key) => "a-vapid-private-key",
+      %w(storage provider) => "test",
+      %w(storage cdn_host) => "https://cdn.example.org",
+      %w(decidim api schema_max_per_page) => 31,
+      %w(decidim api schema_max_complexity) => 3001,
+      %w(decidim api schema_max_depth) => 11,
+      %w(decidim proposals similarity_threshold) => 0.99,
+      %w(decidim proposals similarity_limit) => 3,
+      %w(decidim proposals participatory_space_highlighted_proposals_limit) => 6,
+      %w(decidim proposals process_group_highlighted_proposals_limit) => 5,
+      %w(decidim meetings upcoming_meeting_notification) => 3,
+      %w(decidim meetings enable_proposal_linking) => false,
+      %w(decidim meetings embeddable_services) => %w(www.youtube.com www.twitch.tv meet.jit.si 8x8.vc),
+      %w(decidim budgets enable_proposal_linking) => false,
+      %w(decidim accountability enable_proposal_linking) => false,
+      %w(decidim consultations stats_cache_expiration_time) => 7,
+      %w(decidim initiatives creation_enabled) => false,
+      %w(decidim initiatives similarity_threshold) => 0.99,
+      %w(decidim initiatives similarity_limit) => 10,
+      %w(decidim initiatives minimum_committee_members) => 3,
+      %w(decidim initiatives default_signature_time_period_length) => 133,
+      %w(decidim initiatives default_components) => %w(pages proposals budgets),
+      %w(decidim initiatives first_notification_percentage) => 10,
+      %w(decidim initiatives second_notification_percentage) => 70,
+      %w(decidim initiatives stats_cache_expiration_time) => 7,
+      %w(decidim initiatives max_time_in_validating_state) => 50,
+      %w(decidim initiatives print_enabled) => false,
+      %w(decidim initiatives do_not_require_authorization) => true,
+      %w(elections bulletin_board_server) => "a-bulletin-board-server",
+      %w(elections bulletin_board_public_key) => "a-bulletin-public-key",
+      %w(elections authority_api_key) => "an-authority-api-key",
+      %w(elections authority_name) => "an-authority-name",
+      %w(elections authority_private_key) => "an-authority-private-key",
+      %w(elections scheme_name) => "an-elections-scheme-name",
+      %w(elections number_of_trustees) => 345,
+      %w(elections quorum) => 987,
+      %w(elections setup_minimum_hours_before_start) => 4,
+      %w(elections start_vote_maximum_hours_before_start) => 7,
+      %w(elections voter_token_expiration_minutes) => 123,
+      %w(elections votings check_census_max_requests) => 6,
+      %w(elections votings throttling_period) => 2,
+      %w(elections votings census access_codes_export_expiry_time) => 3
+    }
+  end
+
+  let(:initializer_off) do
+    {
+      "application_name" => "My Application Name",
+      "mailer_sender" => "change-me@example.org",
+      "available_locales" => %w(ca cs de en es eu fi fr it ja nl pl pt ro),
+      "default_locale" => "en",
+      "force_ssl" => true,
+      "enable_html_header_snippets" => false,
+      "currency_unit" => "€",
+      "image_uploader_quality" => 80,
+      "maximum_attachment_size" => 10_485_760, # 10 megabytes
+      "maximum_avatar_size" => 5_242_880, # 5 megabytes
+      "max_reports_before_hiding" => 3,
+      "track_newsletter_links" => true,
+      "download_your_data_expiry_time" => 604_800, # 7 days
+      "throttling_max_requests" => 100,
+      "throttling_period" => 60, # 1 minute
+      "unconfirmed_access_for" => 0,
+      "system_accesslist_ips" => [],
+      "base_uploads_path" => nil,
+      "default_csv_col_sep" => ";",
+      "cors_enabled" => false,
+      "consent_cookie_name" => "decidim-consent",
+      "cache_key_separator" => "/",
+      "expire_session_after" => 1800, # 30 minutes
+      "enable_remember_me" => true,
+      "session_timeout_interval" => 10,
+      "follow_http_x_forwarded_host" => false,
+      "maximum_conversation_message_length" => 1000,
+      "password_blacklist" => [],
+      "allow_open_redirects" => false,
+      "etherpad" => nil,
+      "maps" => nil
+    }
+  end
+
+  let(:initializer_on) do
+    {
+      "application_name" => "\"A test\" {application}",
+      "mailer_sender" => "noreply@example.org",
+      "available_locales" => %w(de fr zh-CN),
+      "default_locale" => "zh-CN",
+      "force_ssl" => false,
+      "enable_html_header_snippets" => true,
+      "currency_unit" => "$",
+      "image_uploader_quality" => 91,
+      "maximum_attachment_size" => 26_214_400, # 25 megabytes
+      "maximum_avatar_size" => 11_534_336, # 11 megabytes
+      "max_reports_before_hiding" => 4,
+      "track_newsletter_links" => false,
+      "download_your_data_expiry_time" => 172_800, # 2 days
+      "throttling_max_requests" => 99,
+      "throttling_period" => 120, # 2 minutes
+      "unconfirmed_access_for" => 259_200, # 3 days
+      "system_accesslist_ips" => ["127.0.0.1", "172.26.0.1/24"],
+      "base_uploads_path" => "some-path/",
+      "default_csv_col_sep" => ",",
+      "cors_enabled" => true,
+      "consent_cookie_name" => ":weird-consent-cookie-name:",
+      "cache_key_separator" => ":",
+      "expire_session_after" => 2700, # 45 minutes
+      "enable_remember_me" => false,
+      "session_timeout_interval" => 33,
+      "follow_http_x_forwarded_host" => true,
+      "maximum_conversation_message_length" => 1234,
+      "password_blacklist" => ["i-dont-like-this-password", "i-dont,like,this,one,either", "password123456"],
+      "allow_open_redirects" => true,
+      "etherpad" => {
+        "server" => "http://a-etherpad-server.com",
+        "api_key" => "an-etherpad-key",
+        "api_version" => "1.2.2"
+      },
+      "maps" => {
+        "provider" => "here",
+        "api_key" => "a-maps-api-key",
+        "static" => {
+          "url" => "https://image.maps.ls.hereapi.com/mia/1.6/mapview"
+        },
+        "dynamic" => {
+          "provider" => "here",
+          "api_key" => "a-maps-api-key",
+          "tile_layer" => {}
+        }
+      }
+    }
+  end
+
+  let(:initializer_maps_osm) do
+    {
+      "maps" => {
+        "provider" => "osm",
+        "api_key" => "another-maps-api-key",
+        "static" => {
+          "url" => "https://staticmap.example.org/"
+        },
+        "dynamic" => {
+          "provider" => "osm",
+          "api_key" => "another-maps-api-key",
+          "tile_layer" => {
+            "url" => "https://tiles.example.org/{z}/{x}/{y}.png?key={apiKey}&{foo}",
+            "attribution" => '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors'
+          }
+        },
+        "geocoding" => {
+          "host" => "nominatim.example.org",
+          "use_https" => true
+        }
+      }
+    }
+  end
+
+  let(:initializer_maps_mix) do
+    {
+      "maps" => {
+        "provider" => "here",
+        "api_key" => "a-maps-api-key",
+        "static" => {
+          "url" => "https://image.maps.ls.hereapi.com/mia/1.6/mapview"
+        },
+        "dynamic" => {
+          "provider" => "osm",
+          "api_key" => "another-maps-api-key",
+          "tile_layer" => {
+            "url" => "https://tiles.example.org/{z}/{x}/{y}.png?key={apiKey}&{foo}",
+            "attribution" => '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors',
+            "api_key" => true,
+            "num" => 123,
+            "foo" => "bar=baz"
+          }
+        },
+        "geocoding" => {
+          "host" => "nominatim.example.org",
+          "use_https" => true
+        }
+      }
+    }
+  end
+
+  let(:api_initializer_off) do
+    {
+      "schema_max_per_page" => 50,
+      "schema_max_complexity" => 5000,
+      "schema_max_depth" => 15
+    }
+  end
+
+  let(:api_initializer_on) do
+    {
+      "schema_max_per_page" => 31,
+      "schema_max_complexity" => 3001,
+      "schema_max_depth" => 11
+    }
+  end
+
+  let(:proposals_initializer_off) do
+    {
+      "similarity_threshold" => 0.25,
+      "similarity_limit" => 10,
+      "participatory_space_highlighted_proposals_limit" => 4,
+      "process_group_highlighted_proposals_limit" => 3
+    }
+  end
+
+  let(:proposals_initializer_on) do
+    {
+      "similarity_threshold" => 0.99,
+      "similarity_limit" => 3,
+      "participatory_space_highlighted_proposals_limit" => 6,
+      "process_group_highlighted_proposals_limit" => 5
+    }
+  end
+
+  let(:meetings_initializer_off) do
+    {
+      "upcoming_meeting_notification" => 172_800, # 2.days
+      "enable_proposal_linking" => true,
+      "embeddable_services" => %w(www.youtube.com www.twitch.tv meet.jit.si)
+    }
+  end
+
+  let(:meetings_initializer_on) do
+    {
+      "upcoming_meeting_notification" => 259_200, # 3.days
+      "enable_proposal_linking" => false,
+      "embeddable_services" => %w(www.youtube.com www.twitch.tv meet.jit.si 8x8.vc)
+    }
+  end
+
+  let(:budgets_initializer_off) do
+    {
+      "enable_proposal_linking" => true
+    }
+  end
+
+  let(:budgets_initializer_on) do
+    {
+      "enable_proposal_linking" => false
+    }
+  end
+
+  let(:accountability_initializer_off) do
+    {
+      "enable_proposal_linking" => true
+    }
+  end
+
+  let(:accountability_initializer_on) do
+    {
+      "enable_proposal_linking" => false
+    }
+  end
+
+  # The logs settings have changed between Rails 6.0 abd 6.1 and this may be here
+  # https://github.com/rails/rails/commit/73079940111e8b85bf87953e5ef9fafeece5b5da
+  let(:rails_off) do
+    {
+      "Rails.logger.level" => 1,
+      "Rails.application.config.log_level" => "info",
+      "Rails.application.config.action_controller.asset_host" => nil,
+      "Rails.application.config.active_storage.service" => "local",
+      "Decidim::EngineRouter.new(nil, {}).send(:configured_default_url_options)" => { "protocol" => "https" }
+    }
+  end
+
+  let(:rails_on) do
+    {
+      "Rails.logger.level" => 4,
+      "Rails.application.config.log_level" => "fatal",
+      "Rails.application.config.action_controller.asset_host" => "http://assets.example.org",
+      "Rails.application.config.active_storage.service" => "test",
+      "Decidim::AssetRouter::Storage.new(nil).send(:default_options)" => { "host" => "https://cdn.example.org" },
+      "Decidim::Api::Schema.default_max_page_size" => 31,
+      "Decidim::Api::Schema.max_complexity" => 3001,
+      "Decidim::Api::Schema.max_depth" => 11
+    }
+  end
+
+  # This is using a big example to avoid recreating the application every time
+  it "env vars generate secrets application" do
+    expect(result[1]).to be_success, result[0]
+    # Test onto the secret generated when ENV vars are empty strings or undefined
+    json_off = json_secrets_for(test_app, env_off)
+    secrets_off.each do |keys, value|
+      current = json_off.dig(*keys)
+      expect(current).to eq(value), "Secret #{keys} = (#{current}) expected to match Env:OFF (#{value})"
+    end
+
+    # Test onto the secret generated when ENV vars are set
+    json_on = json_secrets_for(test_app, env_on)
+    secrets_on.each do |keys, value|
+      current = json_on.dig(*keys)
+      expect(current).to eq(value), "Secret #{keys} = (#{current}) expected to match Env:ON (#{value})"
+    end
+
+    # Test onto the initializer when ENV vars are empty strings or undefined
+    json_off = initializer_config_for(test_app, env_off)
+    initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:OFF (#{value})"
+    end
+
+    # Test onto the initializer when ENV vars are set to the string "false"
+    json_false = initializer_config_for(test_app, env_false)
+    initializer_off.each do |key, value|
+      current = json_false[key]
+      expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:FALSE (#{value})"
+    end
+
+    # Test onto the initializer when ENV vars are set
+    json_on = initializer_config_for(test_app, env_on)
+    initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:ON (#{value})"
+    end
+
+    # Test onto the initializer when ENV vars are set to OpenstreetMap configuration
+    json_on = initializer_config_for(test_app, env_maps_osm)
+    initializer_maps_osm.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:Maps OSM (#{value})"
+    end
+
+    # Test onto the initializer when ENV vars are set to OpenstreetMap-HERE mix configuration
+    json_on = initializer_config_for(test_app, env_maps_mix)
+    initializer_maps_mix.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Initializer (#{key}) = (#{current}) expected to match Env:Maps MIX (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the API module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Api")
+    api_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "API Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the API module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Api")
+    api_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "API Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Proposals module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Proposals")
+    proposals_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Proposals Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Proposals module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Proposals")
+    proposals_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Proposals Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Meetings module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Meetings")
+    meetings_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Meetings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Meetings module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Meetings")
+    meetings_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Meetings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Budgets module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Budgets")
+    budgets_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Budgets Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Budgets module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Budgets")
+    budgets_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Budgets Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Accountability module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Accountability")
+    accountability_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Accountability Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Accountability module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Accountability")
+    accountability_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Accountability Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto some extra Rails configs when ENV vars are empty or undefined
+    rails_off.each do |key, value|
+      current = rails_value(key, test_app, env_off)
+      expect(current).to eq(value), "Rails config (#{key}) = (#{current}) expected to match Env:OFF (#{value})"
+    end
+
+    # Test onto some extra Rails configs when ENV vars are set
+    rails_on.each do |key, value|
+      current = rails_value(key, test_app, env_on)
+      expect(current).to eq(value), "Rails config (#{key}) = (#{current}) expected to match Env:ON (#{value})"
+    end
+  end
+end
+
+shared_examples_for "an application with extra configurable env vars" do
+  include_context "with application env vars"
+
+  let(:consultations_initializer_off) do
+    {
+      "stats_cache_expiration_time" => 300 # 5.minutes
+    }
+  end
+
+  let(:consultations_initializer_on) do
+    {
+      "stats_cache_expiration_time" => 420 # 7.minutes
+    }
+  end
+
+  let(:initiatives_initializer_off) do
+    {
+      "creation_enabled" => true,
+      "similarity_threshold" => 0.25,
+      "similarity_limit" => 5,
+      "minimum_committee_members" => 2,
+      "default_signature_time_period_length" => 120,
+      "default_components" => %w(pages meetings),
+      "first_notification_percentage" => 33,
+      "second_notification_percentage" => 66,
+      "stats_cache_expiration_time" => 300, # 5.minutes
+      "max_time_in_validating_state" => 5_184_000, # 60.days
+      "print_enabled" => true,
+      "do_not_require_authorization" => false
+    }
+  end
+
+  let(:initiatives_initializer_on) do
+    {
+      "creation_enabled" => false,
+      "similarity_threshold" => 0.99,
+      "similarity_limit" => 10,
+      "minimum_committee_members" => 3,
+      "default_signature_time_period_length" => 133,
+      "default_components" => %w(pages proposals budgets),
+      "first_notification_percentage" => 10,
+      "second_notification_percentage" => 70,
+      "stats_cache_expiration_time" => 420, # 7.minutes
+      "max_time_in_validating_state" => 4_320_000, # 50.days
+      "print_enabled" => false,
+      "do_not_require_authorization" => true
+    }
+  end
+
+  let(:elections_initializer_off) do
+    {
+      "setup_minimum_hours_before_start" => 3,
+      "start_vote_maximum_hours_before_start" => 6,
+      "voter_token_expiration_minutes" => 120
+    }
+  end
+
+  let(:elections_initializer_on) do
+    {
+      "setup_minimum_hours_before_start" => 4,
+      "start_vote_maximum_hours_before_start" => 7,
+      "voter_token_expiration_minutes" => 123
+    }
+  end
+
+  let(:votings_initializer_off) do
+    {
+      "check_census_max_requests" => 5,
+      "throttling_period" => 60 # 1.minute
+    }
+  end
+
+  let(:votings_initializer_on) do
+    {
+      "check_census_max_requests" => 6,
+      "throttling_period" => 120 # 2.minutes
+    }
+  end
+
+  let(:census_initializer_off) do
+    {
+      "census_access_codes_export_expiry_time" => 172_800 # 2.days
+    }
+  end
+
+  let(:census_initializer_on) do
+    {
+      "census_access_codes_export_expiry_time" => 259_200 # 3.days
+    }
+  end
+
+  it "env vars generate secrets application" do
+    expect(result[1]).to be_success, result[0]
+
+    # Test onto the initializer with ENV vars OFF for the Consultations module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Consultations")
+    consultations_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Consultations Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Consultations module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Consultations")
+    consultations_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Consultations Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Initiatives module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Initiatives")
+    initiatives_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Initiatives Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Initiatives module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Initiatives")
+    initiatives_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Initiatives Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Elections module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Elections")
+    elections_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Elections Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Elections module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Elections")
+    elections_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Elections Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Votings module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Votings")
+    votings_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Votings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Votings module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Votings")
+    votings_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Votings Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars OFF for the Votings::Census module
+    json_off = initializer_config_for(test_app, env_off, "Decidim::Votings::Census")
+    census_initializer_off.each do |key, value|
+      current = json_off[key]
+      expect(current).to eq(value), "Votings::Census Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+
+    # Test onto the initializer with ENV vars ON for the Votings::Census module
+    json_on = initializer_config_for(test_app, env_on, "Decidim::Votings::Census")
+    census_initializer_on.each do |key, value|
+      current = json_on[key]
+      expect(current).to eq(value), "Votings::Census Initializer (#{key}) = (#{current}) expected to match Env (#{value})"
+    end
+  end
+end
+
+shared_examples_for "an application with wrong cloud storage options" do
+  it "creating fails" do
+    expect(result[1]).not_to be_success, result[0]
+  end
+end
+
+shared_examples_for "an application with cloud storage gems" do
+  let(:services) do
+    %w(local s3 gcs azure)
+  end
+  let(:storage_envs) do
+    {
+      "RAILS_ENV" => "production",
+      "AWS_ACCESS_KEY_ID" => "my-aws-id",
+      "AWS_SECRET_ACCESS_KEY" => "my-aws-secret",
+      "AWS_REGION" => "eu-west-1",
+      # "AWS_ENDPOINT" => "https://s3.amazonaws.com",
+      "AWS_BUCKET" => "test",
+      "AZURE_STORAGE_ACCOUNT_NAME" => "test",
+      "AZURE_STORAGE_ACCESS_KEY" => "dGVzdA==\n", # Base64 of "test"
+      "AZURE_CONTAINER" => "test"
+    }
+  end
+
+  it "includes cloud storage gems in the Gemfile" do
+    expect(result[1]).to be_success, result[0]
+
+    expect(File.read("#{test_app}/Gemfile"))
+      .to match(/gem ["']+aws-sdk-s3["']+/)
+      .and match(/gem ["']+azure-storage-blob["']+/)
+      .and match(/gem ["']+google-cloud-storage["']+/)
+
+    services.each do |service|
+      current = rails_value("Rails.application.config.active_storage.service", test_app, storage_envs.merge({ "STORAGE_PROVIDER" => service }))
+      expect(current).to eq(service), "Rails storage service (#{current}) expected to match provider (#{service})"
+    end
+  end
+end
+
+shared_examples_for "an application with storage and queue gems" do
+  let(:queue_envs_off) do
+    {
+      "RAILS_ENV" => "production"
+    }
+  end
+  let(:queue_envs_on) do
+    {
+      "RAILS_ENV" => "production",
+      "QUEUE_ADAPTER" => "sidekiq",
+      "SIDEKIQ_CONCURRENCY" => "11"
+    }
+  end
+
+  it "includes storage and queue gems in the Gemfile" do
+    expect(result[1]).to be_success, result[0]
+
+    expect(File.read("#{test_app}/Gemfile"))
+      .to match(/gem ["']+aws-sdk-s3["']+/)
+      .and match(/gem ["']+sidekiq["']+/)
+
+    current = rails_value("Rails.application.config.active_job.queue_adapter", test_app, queue_envs_off)
+    expect(current).to eq("async"), "sidekiq queue (#{current}) expected to be async"
+
+    current = rails_value("Rails.application.config.active_job.queue_adapter", test_app, queue_envs_on)
+    expect(current).to eq("sidekiq"), "sidekiq queue (#{current}) expected to be sidekiq"
+    current = rails_value("YAML.load(ERB.new(IO.read(\"config/sidekiq.yml\")).result)", test_app, queue_envs_off)
+    expect(current["concurrency"]).to eq(5), "sidekiq concurrency (#{current["concurrency"]}) expected to eq 5"
+
+    current = rails_value("YAML.load(ERB.new(IO.read(\"config/sidekiq.yml\")).result)", test_app, queue_envs_on)
+    expect(current["concurrency"]).to eq(11), "sidekiq concurrency (#{current["concurrency"]}) expected to eq 11"
+
+    queues = %w(mailers vote_reminder reminders default newsletter newsletters_opt_in conference_diplomas events translations user_report block_user metrics exports
+                close_meeting_reminder)
+    expect(current["queues"].flatten).to include(*queues), "sidekiq queues (#{current["queues"].flatten}) expected to eq containt (#{queues})"
+  end
+end
diff --git a/decidim-generators/lib/decidim/generators/version.rb b/decidim-generators/lib/decidim/generators/version.rb
index 79a60ce4a9d25..2965f8af1775c 100644
--- a/decidim-generators/lib/decidim/generators/version.rb
+++ b/decidim-generators/lib/decidim/generators/version.rb
@@ -4,7 +4,7 @@
 module Decidim
   module Generators
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-generators/spec/runtime/generators_spec.rb b/decidim-generators/spec/runtime/generators_spec.rb
index 6cf1e90b16e4d..39818ec5382cc 100644
--- a/decidim-generators/spec/runtime/generators_spec.rb
+++ b/decidim-generators/spec/runtime/generators_spec.rb
@@ -8,7 +8,10 @@
 end
 
 require "spec_helper"
+require "json"
+require "fileutils"
 require "decidim/gem_manager"
+require "decidim/generators/test/generator_examples"
 
 module Decidim
   describe Generators do
@@ -22,9 +25,9 @@ module Decidim
       #
       if ENV["SIMPLECOV"]
         {
-          "RUBYOPT" => "-rsimplecov #{ENV["RUBYOPT"]}",
-          "RUBYLIB" => "#{repo_root}/decidim-generators/lib:#{ENV["RUBYLIB"]}",
-          "PATH" => "#{repo_root}/decidim-generators/exe:#{ENV["PATH"]}",
+          "RUBYOPT" => "-rsimplecov #{ENV.fetch("RUBYOPT", nil)}",
+          "RUBYLIB" => "#{repo_root}/decidim-generators/lib:#{ENV.fetch("RUBYLIB", nil)}",
+          "PATH" => "#{repo_root}/decidim-generators/exe:#{ENV.fetch("PATH", nil)}",
           "COMMAND_NAME" => example.full_description.tr(" ", "_")
         }
       else
@@ -51,57 +54,11 @@ module Decidim
 
       after { FileUtils.rm_rf(test_app) }
 
-      shared_examples_for "a new production application" do
-        it "includes optional plugins commented out in Gemfile" do
-          expect(result[1]).to be_success, result[0]
-
-          expect(File.read("#{test_app}/Gemfile"))
-            .to match(/^# gem "decidim-initiatives"/)
-            .and match(/^# gem "decidim-consultations"/)
-            .and match(/^# gem "decidim-elections"/)
-            .and match(/^# gem "decidim-conferences"/)
-            .and match(/^# gem "decidim-templates"/)
-        end
-      end
-
-      shared_examples_for "a new development application" do
-        it "includes optional plugins uncommented in Gemfile" do
-          expect(result[1]).to be_success, result[0]
-
-          expect(File.read("#{test_app}/Gemfile"))
-            .to match(/^gem "decidim-initiatives"/)
-            .and match(/^gem "decidim-consultations"/)
-            .and match(/^gem "decidim-elections"/)
-            .and match(/^gem "decidim-conferences"/)
-            .and match(/^gem "decidim-templates"/)
-
-          # Checks that every table from a migration is included in the generated schema
-          schema = File.read("#{test_app}/db/schema.rb")
-          tables = []
-          dropped = []
-          Decidim::GemManager.plugins.each do |plugin|
-            Dir.glob("#{plugin}db/migrate/*.rb").each do |migration|
-              lines = File.readlines(migration)
-              tables.concat(lines.filter { |line| line.match? "create_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
-              dropped.concat(lines.filter { |line| line.match? "drop_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
-              tables.concat(lines.filter { |line| line.match? "rename_table" }.map { |line| line.match(/(, :)([a-z_0-9]+)/)[2] })
-              dropped.concat(lines.filter { |line| line.match? "rename_table" }.map { |line| line.match(/(:)([a-z_0-9]+)/)[2] })
-            end
-          end
-          tables.each do |table|
-            next if dropped.include? table
-
-            expect(schema).to match(/create_table "#{table}"|create_table :#{table}/)
-          end
-
-          expect(Pathname.new("#{test_app}/node_modules/@rails/webpacker")).to be_directory
-        end
-      end
-
       context "without flags" do
         let(:command) { "decidim #{test_app}" }
 
         it_behaves_like "a new production application"
+        it_behaves_like "an application with configurable env vars"
       end
 
       context "with --edge flag" do
@@ -127,6 +84,7 @@ module Decidim
         let(:command) { "decidim #{test_app} --recreate_db --demo" }
 
         it_behaves_like "a new development application"
+        it_behaves_like "an application with extra configurable env vars"
       end
 
       context "with a development application" do
@@ -134,6 +92,24 @@ module Decidim
 
         it_behaves_like "a new development application"
       end
+
+      context "with wrong --storage providers" do
+        let(:command) { "decidim #{test_app} --storage s3,gcs,assure" }
+
+        it_behaves_like "an application with wrong cloud storage options"
+      end
+
+      context "with --storage providers" do
+        let(:command) { "decidim #{test_app} --storage s3,gcs,azure" }
+
+        it_behaves_like "an application with cloud storage gems"
+      end
+
+      context "with --queue providers" do
+        let(:command) { "decidim #{test_app} --storage s3 --queue sidekiq" }
+
+        it_behaves_like "an application with storage and queue gems"
+      end
     end
 
     context "with a component" do
@@ -152,5 +128,23 @@ module Decidim
     def repo_root
       File.expand_path(File.join("..", "..", ".."), __dir__)
     end
+
+    def json_secrets_for(path, env)
+      JSON.parse cmd_capture(path, "bin/rails runner 'puts Rails.application.secrets.to_json'", env: env)
+    end
+
+    def initializer_config_for(path, env, mod = "Decidim")
+      JSON.parse cmd_capture(path, "bin/rails runner 'puts #{mod}.config.to_json'", env: env)
+    end
+
+    def rails_value(value, path, env)
+      JSON.parse cmd_capture(path, "bin/rails runner 'puts #{value}.to_json'", env: env)
+    end
+
+    def cmd_capture(path, cmd, env: {})
+      Bundler.with_unbundled_env do
+        Decidim::GemManager.new(path).capture(cmd, env: env, with_stderr: false)[0]
+      end
+    end
   end
 end
diff --git a/decidim-generators/spec/spec_helper.rb b/decidim-generators/spec/spec_helper.rb
index 043ba3847b448..8306ebc7c71b8 100644
--- a/decidim-generators/spec/spec_helper.rb
+++ b/decidim-generators/spec/spec_helper.rb
@@ -5,5 +5,5 @@
 ENV["RETRY_TIMES"] = "0"
 
 RSpec.configure do |config|
-  config.fail_fast = ENV["FAIL_FAST"] == "true"
+  config.fail_fast = ENV.fetch("FAIL_FAST", nil) == "true"
 end
diff --git a/decidim-initiatives/README.md b/decidim-initiatives/README.md
index da23b15fe02c9..21a3fbf413bf9 100644
--- a/decidim-initiatives/README.md
+++ b/decidim-initiatives/README.md
@@ -1,7 +1,7 @@
 # Decidim::Initiatives
 
-Initiatives is the place on Decidim's where citizens can promote a civic initiative. Unlike
-participatory processes that must be created by an administrator, Civic initiatives can be
+Initiatives is the place on Decidim's where participants can promote an initiative. Unlike
+participatory processes that must be created by an administrator, initiatives can be
 created by any user of the platform.
 
 An initiative will contain attachments and comments from other users as well.
@@ -100,7 +100,7 @@ a mechanism to validate that there are no duplicated signatures. To do so the en
 a functionality that allows exporting the online signatures to validate them against physical
 signatures.
 
-The signatures are exported as a hash string in order to preserve the identity of the signer together with her privacy.
+The signatures are exported as a hash string in order to preserve the identity of the signer together with their privacy.
 Each hash is composed with the following criteria:
 
 * Algorithm used: SHA1
diff --git a/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb b/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
index 812066dd5aa04..27cc156e31c5a 100644
--- a/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
+++ b/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_initiatives" class="wrapper-home home-section">
   <div class="row" id="highlighted-initiatives">
     <h3 class="section-heading"><%= t("active_initiatives", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
index 9bfea7857c624..b2aab5471edcc 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type.rb
@@ -4,12 +4,13 @@ module Decidim
   module Initiatives
     module Admin
       # A command with all the business logic that creates a new initiative type
-      class CreateInitiativeType < Rectify::Command
+      class CreateInitiativeType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
-        def initialize(form)
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -36,11 +37,14 @@ def call
         attr_reader :form
 
         def create_initiative_type
-          initiative_type = InitiativesType.new(
+          initiative_type = Decidim.traceability.create!(
+            InitiativesType,
+            @user,
             organization: form.current_organization,
             title: form.title,
             description: form.description,
             signature_type: form.signature_type,
+            comments_enabled: form.comments_enabled,
             attachments_enabled: form.attachments_enabled,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
             custom_signature_end_date_enabled: form.custom_signature_end_date_enabled,
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb
index 66365fea5aaa0..550c207f5d1ec 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     module Admin
       # A command with all the business logic that creates a new initiative type scope
-      class CreateInitiativeTypeScope < Rectify::Command
+      class CreateInitiativeTypeScope < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -26,8 +26,8 @@ def call
           if initiative_type_scope.persisted?
             broadcast(:ok, initiative_type_scope)
           else
-            initiative_type_scope.errors.each do |attribute, error|
-              form.errors.add(attribute, error)
+            initiative_type_scope.errors.each do |error|
+              form.errors.add(error.attribute, error.message)
             end
 
             broadcast(:invalid)
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/publish_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/publish_initiative.rb
index 337483a9803d6..4687ae2fb6fa6 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/publish_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/publish_initiative.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic that publishes an
       # existing initiative.
-      class PublishInitiative < Rectify::Command
+      class PublishInitiative < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb
index 6aec116bf4ee1..2c01d8d68ea0c 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic that sends an
       # existing initiative to technical validation.
-      class SendInitiativeToTechnicalValidation < Rectify::Command
+      class SendInitiativeToTechnicalValidation < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative
@@ -51,7 +51,7 @@ def notify_admins
             force_send: true
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/unpublish_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/unpublish_initiative.rb
index 7c224fa383003..0adac3df83811 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/unpublish_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/unpublish_initiative.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic that unpublishes an
       # existing initiative.
-      class UnpublishInitiative < Rectify::Command
+      class UnpublishInitiative < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb
index dd6b9b2fbb935..cfed41364f8d7 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic that updates an
       # existing initiative.
-      class UpdateInitiative < Rectify::Command
+      class UpdateInitiative < Decidim::Command
         include Decidim::Initiatives::AttachmentMethods
 
         # Public: Initializes the command.
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_answer.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_answer.rb
index 9854fe7730da7..3bd397067a9dc 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_answer.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_answer.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic to answer
       # initiatives.
-      class UpdateInitiativeAnswer < Rectify::Command
+      class UpdateInitiativeAnswer < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative   - Decidim::Initiative
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
index 0eb565d59d601..6596d835b4a32 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type.rb
@@ -5,14 +5,17 @@ module Initiatives
     module Admin
       # A command with all the business logic that updates an
       # existing initiative type.
-      class UpdateInitiativeType < Rectify::Command
+      class UpdateInitiativeType < Decidim::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # initiative_type: Decidim::InitiativesType
         # form - A form object with the params.
-        def initialize(initiative_type, form)
+        def initialize(initiative_type, form, user)
           @form = form
           @initiative_type = initiative_type
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,13 +27,15 @@ def initialize(initiative_type, form)
         def call
           return broadcast(:invalid) if form.invalid?
 
-          initiative_type.update(attributes)
+          Decidim.traceability.perform_action!("update", initiative_type, @user) do
+            initiative_type.update(attributes)
 
-          if initiative_type.valid?
-            upate_initiatives_signature_type
-            broadcast(:ok, initiative_type)
-          else
-            broadcast(:invalid)
+            if initiative_type.valid?
+              update_initiatives_signature_type
+              broadcast(:ok, initiative_type)
+            else
+              broadcast(:invalid)
+            end
           end
         end
 
@@ -39,11 +44,12 @@ def call
         attr_reader :form, :initiative_type
 
         def attributes
-          result = {
+          {
             title: form.title,
             description: form.description,
             signature_type: form.signature_type,
             attachments_enabled: form.attachments_enabled,
+            comments_enabled: form.comments_enabled,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
             custom_signature_end_date_enabled: form.custom_signature_end_date_enabled,
             area_enabled: form.area_enabled,
@@ -55,13 +61,12 @@ def attributes
             document_number_authorization_handler: form.document_number_authorization_handler,
             child_scope_threshold_enabled: form.child_scope_threshold_enabled,
             only_global_scope_enabled: form.only_global_scope_enabled
-          }
-
-          result[:banner_image] = form.banner_image unless form.banner_image.nil?
-          result
+          }.merge(
+            attachment_attributes(:banner_image)
+          )
         end
 
-        def upate_initiatives_signature_type
+        def update_initiatives_signature_type
           initiative_type.initiatives.signature_type_updatable.each do |initiative|
             initiative.update!(signature_type: initiative_type.signature_type)
           end
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
index 1e492c864ef16..3789bee85590c 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
@@ -5,7 +5,7 @@ module Initiatives
     module Admin
       # A command with all the business logic that updates an
       # existing initiative type scope.
-      class UpdateInitiativeTypeScope < Rectify::Command
+      class UpdateInitiativeTypeScope < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative_type: Decidim::InitiativesTypeScope
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiatives_settings.rb b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiatives_settings.rb
new file mode 100644
index 0000000000000..c8f1547cfce68
--- /dev/null
+++ b/decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiatives_settings.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic when updating initiatives
+      # settings in admin area.
+      class UpdateInitiativesSettings < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # initiatives_settings - A initiatives settings object to update.
+        # form - A form object with the params.
+        def initialize(initiatives_settings, form)
+          @initiatives_settings = initiatives_settings
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form or initiatives_settings isn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid? || initiatives_settings.invalid?
+
+          update_initiatives_settings!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :initiatives_settings
+
+        def update_initiatives_settings!
+          Decidim.traceability.update!(
+            @initiatives_settings,
+            form.current_user,
+            initiatives_order: form.initiatives_order
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/approve_membership_request.rb b/decidim-initiatives/app/commands/decidim/initiatives/approve_membership_request.rb
index 6817f2a1a2651..19677639fe2cc 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/approve_membership_request.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/approve_membership_request.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class ApproveMembershipRequest < Rectify::Command
+    class ApproveMembershipRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # membership_request - A pending committee member
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
index 780d34f2eed36..7fc602acfbb98 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/create_initiative.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class CreateInitiative < Rectify::Command
+    class CreateInitiative < Decidim::Command
       include CurrentLocale
       include ::Decidim::MultipleAttachmentsMethods
 
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/revoke_membership_request.rb b/decidim-initiatives/app/commands/decidim/initiatives/revoke_membership_request.rb
index 9d9bdf0b214ce..67c818de4fab6 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/revoke_membership_request.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/revoke_membership_request.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class RevokeMembershipRequest < Rectify::Command
+    class RevokeMembershipRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # membership_request - A pending committee member
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb b/decidim-initiatives/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb
index ad8a045d5ef8f..69c6788f42ece 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that sends an
     # existing initiative to technical validation.
-    class SendInitiativeToTechnicalValidation < Rectify::Command
+    class SendInitiativeToTechnicalValidation < Decidim::Command
       # Public: Initializes the command.
       #
       # initiative - Decidim::Initiative
@@ -50,7 +50,7 @@ def notify_admins
           force_send: true
         }
 
-        Decidim::EventsManager.publish(data)
+        Decidim::EventsManager.publish(**data)
       end
     end
   end
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/spawn_committee_request.rb b/decidim-initiatives/app/commands/decidim/initiatives/spawn_committee_request.rb
index 7d55a02b34bcb..94b9e95d20be3 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/spawn_committee_request.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/spawn_committee_request.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that creates a new membership
     # request for the committee of an initiative.
-    class SpawnCommitteeRequest < Rectify::Command
+    class SpawnCommitteeRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # form - Decidim::Initiative::CommitteeMemberForm
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/unvote_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/unvote_initiative.rb
index ca8a636eaf206..496edccc91cae 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/unvote_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/unvote_initiative.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic when a user or organization unvotes an initiative.
-    class UnvoteInitiative < Rectify::Command
+    class UnvoteInitiative < Decidim::Command
       # Public: Initializes the command.
       #
       # initiative   - A Decidim::Initiative object.
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
index 046fbc11474a9..4ed342eb686a1 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/update_initiative.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that updates an
     # existing initiative.
-    class UpdateInitiative < Rectify::Command
+    class UpdateInitiative < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
       include ::Decidim::GalleryMethods
       include CurrentLocale
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/validate_mobile_phone.rb b/decidim-initiatives/app/commands/decidim/initiatives/validate_mobile_phone.rb
index 7015bfa597f97..a8bc6ff9d4cec 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/validate_mobile_phone.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/validate_mobile_phone.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # Command to check if mobile phone has an authorization and
     # deliver sms code
-    class ValidateMobilePhone < Rectify::Command
+    class ValidateMobilePhone < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A MobilePhoneForm.
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/validate_sms_code.rb b/decidim-initiatives/app/commands/decidim/initiatives/validate_sms_code.rb
index a06c3b55624ba..ae0e93354e5d6 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/validate_sms_code.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/validate_sms_code.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Command to check if sms code provided by user is valid
-    class ValidateSmsCode < Rectify::Command
+    class ValidateSmsCode < Decidim::Command
       # Public: Initializes the command.
       #
       # form - form containing confirmation_code.
diff --git a/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb b/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb
index 768ac525bdaac..0856ce9abc48c 100644
--- a/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb
+++ b/decidim-initiatives/app/commands/decidim/initiatives/vote_initiative.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic when a user or organization votes an initiative.
-    class VoteInitiative < Rectify::Command
+    class VoteInitiative < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
@@ -101,13 +101,9 @@ def notify_support_threshold_reached(before, after)
           event: "decidim.events.initiatives.support_threshold_reached",
           event_class: Decidim::Initiatives::Admin::SupportThresholdReachedEvent,
           resource: initiative,
-          followers: organization_admins
+          followers: initiative.organization.admins
         )
       end
-
-      def organization_admins
-        Decidim::User.where(organization: initiative.organization, admin: true)
-      end
     end
   end
 end
diff --git a/decidim-initiatives/app/constraints/decidim/initiatives/current_initiative.rb b/decidim-initiatives/app/constraints/decidim/initiatives/current_initiative.rb
index b8a2e8514f917..6d23ed08af4a8 100644
--- a/decidim-initiatives/app/constraints/decidim/initiatives/current_initiative.rb
+++ b/decidim-initiatives/app/constraints/decidim/initiatives/current_initiative.rb
@@ -8,7 +8,7 @@ module Initiatives
     class CurrentInitiative
       include InitiativeSlug
 
-      # Public: Matches the request against an initative and injects it
+      # Public: Matches the request against an initiative and injects it
       #         into the environment.
       #
       # request - The request that holds the initiative relevant
diff --git a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/orderable.rb b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/orderable.rb
index 995fe28dbabae..d0fff03c02661 100644
--- a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/orderable.rb
+++ b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/orderable.rb
@@ -37,6 +37,14 @@ def reorder(initiatives)
             initiatives.order_randomly(random_seed)
           end
         end
+
+        def order
+          @order ||= detect_order(params[:order]) || current_initiatives_settings.initiatives_order || default_order
+        end
+
+        def current_initiatives_settings
+          @current_initiatives_settings ||= Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+        end
       end
     end
   end
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_controller.rb
index fde91ac8bd51c..cb1971de88fd6 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_controller.rb
@@ -110,7 +110,7 @@ def send_to_technical_validation
               redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
                 notice: I18n.t(
                   "success",
-                  scope: %w(decidim initiatives admin initiatives edit)
+                  scope: "decidim.initiatives.admin.initiatives.edit"
                 )
               }
             end
@@ -158,7 +158,8 @@ def export_pdf_signatures
           output = render_to_string(
             pdf: "votes_#{current_initiative.id}",
             layout: "decidim/admin/initiatives_votes",
-            template: "decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb"
+            template: "decidim/initiatives/admin/initiatives/export_pdf_signatures",
+            format: [:pdf]
           )
           output = pdf_signature_service.new(pdf: output).signed_pdf if pdf_signature_service
 
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb
new file mode 100644
index 0000000000000..1fe4dc018a892
--- /dev/null
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # Controller used to manage the initiatives settings for the current
+      # organization.
+      class InitiativesSettingsController < Decidim::Initiatives::Admin::ApplicationController
+        layout "decidim/admin/initiatives"
+
+        # GET /admin/initiatives_settings/edit
+        def edit
+          enforce_permission_to :update, :initiatives_settings, initiatives_settings: current_initiatives_settings
+          @form = initiatives_settings_form.from_model(current_initiatives_settings)
+        end
+
+        # PUT /admin/initiatives_settings
+        def update
+          enforce_permission_to :update, :initiatives_settings, initiatives_settings: current_initiatives_settings
+
+          @form = initiatives_settings_form
+                  .from_params(params, initiatives_settings: current_initiatives_settings)
+
+          UpdateInitiativesSettings.call(current_initiatives_settings, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("initiatives_settings.update.success", scope: "decidim.admin")
+              redirect_to edit_initiatives_setting_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("initiatives_settings.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        private
+
+        def current_initiatives_settings
+          @current_initiatives_settings ||= Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+        end
+
+        def initiatives_settings_form
+          form(Decidim::Initiatives::Admin::InitiativesSettingsForm)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
index c473025a16c6e..52ac554e3ec76 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
@@ -27,7 +27,7 @@ def create
           enforce_permission_to :create, :initiative_type
           @form = initiative_type_form.from_params(params)
 
-          CreateInitiativeType.call(@form) do
+          CreateInitiativeType.call(@form, current_user) do
             on(:ok) do |initiative_type|
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.create.success")
               redirect_to edit_initiatives_type_path(initiative_type)
@@ -55,7 +55,7 @@ def update
           @form = initiative_type_form
                   .from_params(params, initiative_type: current_initiative_type)
 
-          UpdateInitiativeType.call(current_initiative_type, @form) do
+          UpdateInitiativeType.call(current_initiative_type, @form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.update.success")
               redirect_to edit_initiatives_type_path(current_initiative_type)
@@ -71,7 +71,10 @@ def update
         # DELETE /admin/initiatives_types/:id
         def destroy
           enforce_permission_to :destroy, :initiative_type, initiative_type: current_initiative_type
-          current_initiative_type.destroy!
+
+          Decidim.traceability.perform_action!("delete", current_initiative_type, current_user) do
+            current_initiative_type.destroy!
+          end
 
           redirect_to initiatives_types_path, flash: {
             notice: I18n.t("decidim.initiatives.admin.initiatives_types.destroy.success")
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/committee_requests_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/committee_requests_controller.rb
index 5a45b236ec175..cc12703f3e879 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/committee_requests_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/committee_requests_controller.rb
@@ -28,7 +28,7 @@ def spawn
             redirect_to initiatives_path, flash: {
               notice: I18n.t(
                 "success",
-                scope: %w(decidim initiatives committee_requests spawn)
+                scope: "decidim.initiatives.committee_requests.spawn"
               )
             }
           end
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/create_initiative_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/create_initiative_controller.rb
index 683b52bdd111a..201e4370b80ec 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/create_initiative_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/create_initiative_controller.rb
@@ -125,9 +125,9 @@ def similar_initiatives
 
       def build_form(klass, parameters)
         @form = if single_initiative_type?
-                  form(klass).from_params(parameters.merge(type_id: current_organization_initiatives_type.first.id), extra_context)
+                  form(klass).from_params(parameters.except(:id).merge(type_id: current_organization_initiatives_type.first.id), extra_context)
                 else
-                  form(klass).from_params(parameters, extra_context)
+                  form(klass).from_params(parameters.except(:id), extra_context)
                 end
 
         attributes = @form.attributes_with_values
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
index 3aadef6caa9ab..d863e8f52365c 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
@@ -2,7 +2,7 @@
 
 module Decidim
   module Initiatives
-    # This controller contains the logic regarding citizen initiatives
+    # This controller contains the logic regarding participants initiatives
     class InitiativesController < Decidim::Initiatives::ApplicationController
       include ParticipatorySpaceContext
       participatory_space_layout only: [:show]
@@ -33,13 +33,13 @@ class InitiativesController < Decidim::Initiatives::ApplicationController
       # GET /initiatives
       def index
         enforce_permission_to :list, :initiative
-        return unless search.results.blank? && params.dig("filter", "state") != %w(closed)
+        return unless search.result.blank? && params.dig("filter", "with_any_state") != %w(closed)
 
-        @closed_initiatives = search_klass.new(search_params.merge(state: %w(closed)))
+        @closed_initiatives ||= search_with(filter_params.merge(with_any_state: %w(closed)))
 
-        if @closed_initiatives.results.present?
+        if @closed_initiatives.result.present?
           params[:filter] ||= {}
-          params[:filter][:date] = %w(closed)
+          params[:filter][:with_any_state] = %w(closed)
           @forced_closed_initiatives = true
 
           @search = @closed_initiatives
@@ -60,7 +60,7 @@ def send_to_technical_validation
             redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
               notice: I18n.t(
                 "success",
-                scope: %w(decidim initiatives admin initiatives edit)
+                scope: "decidim.initiatives.admin.initiatives.edit"
               )
             }
           end
@@ -119,25 +119,28 @@ def current_participatory_space_manifest
       end
 
       def initiatives
-        @initiatives = search.results.includes(:scoped_type)
+        @initiatives = search.result.includes(:scoped_type)
         @initiatives = reorder(@initiatives)
         @initiatives = paginate(@initiatives)
       end
 
       alias collection initiatives
 
-      def search_klass
-        InitiativeSearch
+      def search_collection
+        Initiative
+          .includes(scoped_type: [:scope])
+          .joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
+          .where(organization: current_organization)
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: ["open"],
-          type_id: default_filter_type_params,
+          search_text_cont: "",
+          with_any_state: %w(open),
+          with_any_type: default_filter_type_params,
           author: "any",
-          scope_id: default_filter_scope_params,
-          area_id: default_filter_area_params
+          with_any_scope: default_filter_scope_params,
+          with_any_area: default_filter_area_params
         }
       end
 
@@ -153,13 +156,6 @@ def default_filter_area_params
         %w(all) + current_organization.areas.pluck(:id).map(&:to_s)
       end
 
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
-        }
-      end
-
       def stats
         @stats ||= InitiativeStatsPresenter.new(initiative: current_initiative)
       end
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb
index 28935c0a0dd79..417a9a57d9a92 100644
--- a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb
+++ b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb
@@ -19,7 +19,7 @@ class InitiativeForm < Form
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
         attribute :hashtag, String
-        attribute :offline_votes, Hash[Symbol => Integer]
+        attribute :offline_votes, Hash
         attribute :state, String
         attribute :attachment, AttachmentForm
 
@@ -47,7 +47,7 @@ def map_model(model)
         def signature_type_updatable?
           @signature_type_updatable ||= begin
             state ||= context.initiative.state
-            state == "validating" && context.current_user.admin? || state == "created"
+            (state == "validating" && context.current_user.admin?) || state == "created"
           end
         end
 
@@ -74,7 +74,7 @@ def area
         # Private: set the in-person signatures to zero for every scope
         def zero_offine_votes_with_scopes_names(model)
           model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
-            all_votes[initiative_scope_type.decidim_scopes_id&.to_s&.to_sym || "global"] = [0, initiative_scope_type.scope_name]
+            all_votes[initiative_scope_type.decidim_scopes_id || "global"] = [0, initiative_scope_type.scope_name]
           end
         end
 
@@ -83,7 +83,7 @@ def offline_votes_with_scopes_names(model)
           model.offline_votes.delete("total")
           model.offline_votes.each_with_object({}) do |(decidim_scope_id, votes), all_votes|
             scope_name = model.votable_initiative_type_scopes.find do |initiative_scope_type|
-              initiative_scope_type.global_scope? && decidim_scope_id == "global" ||
+              (initiative_scope_type.global_scope? && decidim_scope_id == "global") ||
                 initiative_scope_type.decidim_scopes_id == decidim_scope_id.to_i
             end.scope_name
 
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
index 71c4a9a3963e3..0fd17d51718c1 100644
--- a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
+++ b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_type_form.rb
@@ -13,11 +13,12 @@ class InitiativeTypeForm < Decidim::Form
 
         translatable_attribute :title, String
         translatable_attribute :description, String
-        attribute :banner_image, String
+        attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
         attribute :attachments_enabled, Boolean
         attribute :custom_signature_end_date_enabled, Boolean
+        attribute :comments_enabled, Boolean
         attribute :area_enabled, Boolean
         attribute :child_scope_threshold_enabled, Boolean
         attribute :only_global_scope_enabled, Boolean
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/admin/initiatives_settings_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiatives_settings_form.rb
new file mode 100644
index 0000000000000..38c0be9cc4065
--- /dev/null
+++ b/decidim-initiatives/app/forms/decidim/initiatives/admin/initiatives_settings_form.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A form object used to create initiatives settings from the admin dashboard.
+      class InitiativesSettingsForm < Form
+        mimic :initiatives_settings
+
+        attribute :initiatives_order, String
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/app/forms/decidim/initiatives/vote_form.rb b/decidim-initiatives/app/forms/decidim/initiatives/vote_form.rb
index f068706e2d5f1..ef88786c20a09 100644
--- a/decidim-initiatives/app/forms/decidim/initiatives/vote_form.rb
+++ b/decidim-initiatives/app/forms/decidim/initiatives/vote_form.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require "virtus/multiparams"
-
 module Decidim
   module Initiatives
     # A form object used to collect the data for a new initiative.
     class VoteForm < Form
       include TranslatableAttributes
-      include Virtus::Multiparams
 
       mimic :initiatives_vote
 
diff --git a/decidim-initiatives/app/helpers/decidim/initiatives/create_initiative_helper.rb b/decidim-initiatives/app/helpers/decidim/initiatives/create_initiative_helper.rb
index 93e9395f2b732..81636713d1933 100644
--- a/decidim-initiatives/app/helpers/decidim/initiatives/create_initiative_helper.rb
+++ b/decidim-initiatives/app/helpers/decidim/initiatives/create_initiative_helper.rb
@@ -27,7 +27,7 @@ def online_signature_type_options
           [
             I18n.t(
               "online",
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), "online"
           ]
         ]
@@ -38,7 +38,7 @@ def offline_signature_type_options
           [
             I18n.t(
               "offline",
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), "offline"
           ]
         ]
@@ -49,7 +49,7 @@ def all_signature_type_options
           [
             I18n.t(
               type,
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), type
           ]
         end
diff --git a/decidim-initiatives/app/helpers/decidim/initiatives/initiative_helper.rb b/decidim-initiatives/app/helpers/decidim/initiatives/initiative_helper.rb
index 680ba9ae55130..75357b1f67e52 100644
--- a/decidim-initiatives/app/helpers/decidim/initiatives/initiative_helper.rb
+++ b/decidim-initiatives/app/helpers/decidim/initiatives/initiative_helper.rb
@@ -43,7 +43,9 @@ def humanize_admin_state(state)
       def popularity_tag(initiative)
         content_tag(:div, class: "extra__popularity popularity #{popularity_class(initiative)}".strip) do
           5.times do
-            concat(content_tag(:span, class: "popularity__item") {})
+            concat(content_tag(:span, class: "popularity__item") do
+              # empty block
+            end)
           end
 
           concat(content_tag(:span, class: "popularity__desc") do
@@ -89,11 +91,11 @@ def authorized_vote_modal_button(initiative, html_options, &block)
         tag = "button"
         html_options ||= {}
 
-        if !current_user
-          html_options["data-open"] = "loginModal"
-        else
+        if current_user
           html_options["data-open"] = "authorizationModal"
           html_options["data-open-url"] = authorization_sign_modal_initiative_path(initiative)
+        else
+          html_options["data-open"] = "loginModal"
         end
 
         html_options["onclick"] = "event.preventDefault();"
diff --git a/decidim-initiatives/app/mailers/decidim/initiatives/initiatives_mailer.rb b/decidim-initiatives/app/mailers/decidim/initiatives/initiatives_mailer.rb
index 4b8e2bbc59f50..b44a121672a68 100644
--- a/decidim-initiatives/app/mailers/decidim/initiatives/initiatives_mailer.rb
+++ b/decidim-initiatives/app/mailers/decidim/initiatives/initiatives_mailer.rb
@@ -7,8 +7,8 @@ class InitiativesMailer < Decidim::ApplicationMailer
       include Decidim::TranslatableAttributes
       include Decidim::SanitizeHelper
 
-      add_template_helper Decidim::TranslatableAttributes
-      add_template_helper Decidim::SanitizeHelper
+      helper Decidim::TranslatableAttributes
+      helper Decidim::SanitizeHelper
 
       # Notifies initiative creation
       def notify_creation(initiative)
diff --git a/decidim-initiatives/app/models/decidim/initiative.rb b/decidim-initiatives/app/models/decidim/initiative.rb
index b2caa103037f8..7266098029c9b 100644
--- a/decidim-initiatives/app/models/decidim/initiative.rb
+++ b/decidim-initiatives/app/models/decidim/initiative.rb
@@ -22,6 +22,8 @@ class Initiative < ApplicationRecord
     include Decidim::Initiatives::HasArea
     include Decidim::TranslatableResource
     include Decidim::HasResourcePermission
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     translatable_fields :title, :description, :answer
 
@@ -64,9 +66,8 @@ class Initiative < ApplicationRecord
 
     validates :title, :description, :state, :signature_type, presence: true
     validates :hashtag,
-              uniqueness: true,
-              allow_blank: true,
-              case_sensitive: false
+              uniqueness: { allow_blank: true, case_sensitive: false }
+
     validate :signature_type_allowed
 
     scope :open, lambda {
@@ -80,6 +81,8 @@ class Initiative < ApplicationRecord
     scope :published, -> { where.not(published_at: nil) }
     scope :with_state, ->(state) { where(state: state) if state.present? }
 
+    scope_search_multi :with_any_state, [:accepted, :rejected, :answered, :open, :closed]
+
     scope :currently_signable, lambda {
       where("signature_start_date <= ?", Date.current)
         .where("signature_end_date >= ?", Date.current)
@@ -106,6 +109,42 @@ class Initiative < ApplicationRecord
     scope :future_spaces, -> { none }
     scope :past_spaces, -> { closed }
 
+    scope :with_any_type, lambda { |*original_type_ids|
+      type_ids = original_type_ids.flatten
+      return self if type_ids.include?("all")
+
+      types = InitiativesTypeScope.where(decidim_initiatives_types_id: type_ids).pluck(:id)
+      where(scoped_type: types)
+    }
+
+    # Redefine the with_any_scope method as the initiative scope is defined by
+    # the initiative type scope.
+    scope :with_any_scope, lambda { |*original_scope_ids|
+      scope_ids = original_scope_ids.flatten
+      return self if scope_ids.include?("all")
+
+      clean_scope_ids = scope_ids
+
+      conditions = []
+      conditions << "decidim_initiatives_type_scopes.decidim_scopes_id IS NULL" if clean_scope_ids.delete("global")
+      conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+      joins(:scoped_type).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+    }
+
+    scope :authored_by, lambda { |author|
+      co_authoring_initiative_ids = Decidim::InitiativesCommitteeMember.where(
+        decidim_users_id: author
+      ).pluck(:decidim_initiatives_id)
+
+      where(
+        decidim_author_id: author,
+        decidim_author_type: Decidim::UserBaseEntity.name
+      ).or(
+        where(id: co_authoring_initiative_ids)
+      )
+    }
+
     before_update :set_offline_votes_total
     after_commit :notify_state_change
     after_create :notify_creation
@@ -124,6 +163,10 @@ def self.log_presenter_class_for(_log)
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end
 
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_any_state, :with_any_type, :with_any_scope, :with_any_area]
+    end
+
     delegate :document_number_authorization_handler, :promoting_committee_enabled?, to: :type
     delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
 
@@ -135,6 +178,11 @@ def banner_image
       type.attached_uploader(:banner_image)
     end
 
+    # Public: Whether the object's comments are visible or not.
+    def commentable?
+      type.comments_enabled?
+    end
+
     # Public: Check if an initiative has been created by an individual person.
     # If it's false, then it has been created by an authorized organization.
     #
@@ -215,7 +263,7 @@ def publish!
         published_at: Time.current,
         state: "published",
         signature_start_date: Date.current,
-        signature_end_date: signature_end_date || Date.current + Decidim::Initiatives.default_signature_time_period_length
+        signature_end_date: signature_end_date || (Date.current + Decidim::Initiatives.default_signature_time_period_length)
       )
     end
 
@@ -420,6 +468,10 @@ def user_allowed_to_comment?(user)
       ActionAuthorizer.new(user, "comment", self, nil).authorize.ok?
     end
 
+    def self.ransack(params = {}, options = {})
+      Initiatives::InitiativeSearch.new(self, params, options)
+    end
+
     private
 
     # Private: This is just an alias because the naming on InitiativeTypeScope
@@ -453,11 +505,10 @@ def notify_creation
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    [:title, :description].each do |column|
-      ransacker column do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[column], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
-    end
+    [:title, :description].each { |column| ransacker_i18n(column) }
+
+    # Alias search_text as a grouped OR query with all the text searchable fields.
+    ransack_alias :search_text, :id_string_or_title_or_description_or_author_name_or_author_nickname
 
     # Allow ransacker to search on an Enum Field
     ransacker :state, formatter: proc { |int| states[int] }
diff --git a/decidim-initiatives/app/models/decidim/initiatives_settings.rb b/decidim-initiatives/app/models/decidim/initiatives_settings.rb
new file mode 100644
index 0000000000000..356c0a5da5d67
--- /dev/null
+++ b/decidim-initiatives/app/models/decidim/initiatives_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Initiatives setting.
+  class InitiativesSettings < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Initiatives::AdminLog::InitiativesSettingsPresenter
+    end
+  end
+end
diff --git a/decidim-initiatives/app/models/decidim/initiatives_type.rb b/decidim-initiatives/app/models/decidim/initiatives_type.rb
index edaefc3599c2d..a5e1855be01b5 100644
--- a/decidim-initiatives/app/models/decidim/initiatives_type.rb
+++ b/decidim-initiatives/app/models/decidim/initiatives_type.rb
@@ -6,6 +6,7 @@ class InitiativesType < ApplicationRecord
     include Decidim::HasResourcePermission
     include Decidim::TranslatableResource
     include Decidim::HasUploadValidations
+    include Decidim::Traceable
 
     translatable_fields :title, :description, :extra_fields_legal_information
 
@@ -48,5 +49,9 @@ def mounted_admin_engine
     def mounted_params
       { host: organization.host }
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Initiatives::AdminLog::InitiativesTypePresenter
+    end
   end
 end
diff --git a/decidim-initiatives/app/permissions/decidim/initiatives/admin/permissions.rb b/decidim-initiatives/app/permissions/decidim/initiatives/admin/permissions.rb
index fb0d7e44fa834..7276a2f72ee9c 100644
--- a/decidim-initiatives/app/permissions/decidim/initiatives/admin/permissions.rb
+++ b/decidim-initiatives/app/permissions/decidim/initiatives/admin/permissions.rb
@@ -19,6 +19,7 @@ def permissions
             initiative_committee_action?
             initiative_user_action?
             attachment_action?
+            initiatives_settings_action?
 
             return permission_action
           end
@@ -36,6 +37,7 @@ def permissions
           initiative_committee_action?
           initiative_admin_user_action?
           initiative_export_action?
+          initiatives_settings_action?
           moderator_action?
           allow! if permission_action.subject == :attachment
 
@@ -134,12 +136,10 @@ def initiative_admin_user_action?
           case permission_action.action
           when :read
             toggle_allow(Decidim::Initiatives.print_enabled)
-          when :publish
+          when :publish, :discard
             toggle_allow(initiative.validating?)
           when :unpublish
             toggle_allow(initiative.published?)
-          when :discard
-            toggle_allow(initiative.validating?)
           when :export_pdf_signatures
             toggle_allow(initiative.published? || initiative.accepted? || initiative.rejected?)
           when :export_votes
@@ -165,6 +165,13 @@ def initiative_export_action?
           allow! if permission_action.subject == :initiatives && permission_action.action == :export
         end
 
+        def initiatives_settings_action?
+          return unless permission_action.action == :update &&
+                        permission_action.subject == :initiatives_settings
+
+          toggle_allow(user.admin?)
+        end
+
         def moderator_action?
           return unless permission_action.subject == :moderation
 
diff --git a/decidim-initiatives/app/permissions/decidim/initiatives/permissions.rb b/decidim-initiatives/app/permissions/decidim/initiatives/permissions.rb
index 1041aa8be0fb0..429c31d06ce69 100644
--- a/decidim-initiatives/app/permissions/decidim/initiatives/permissions.rb
+++ b/decidim-initiatives/app/permissions/decidim/initiatives/permissions.rb
@@ -107,7 +107,7 @@ def can_request_membership?
       end
 
       def access_request_without_user?
-        !initiative.published? && initiative.promoting_committee_enabled? || Decidim::Initiatives.do_not_require_authorization
+        (!initiative.published? && initiative.promoting_committee_enabled?) || Decidim::Initiatives.do_not_require_authorization
       end
 
       def access_request_membership?
diff --git a/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter.rb b/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter.rb
new file mode 100644
index 0000000000000..c7ffafb1cc9ab
--- /dev/null
+++ b/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module AdminLog
+      # This class holds the logic to present a `Decidim::InitiativesSettings`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    InitiativesSettingsPresenter.new(action_log, view_helpers).present
+      class InitiativesSettingsPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.initiatives.admin_log.initiatives_settings.#{action}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_type_presenter.rb b/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_type_presenter.rb
new file mode 100644
index 0000000000000..497e8d8eddfbc
--- /dev/null
+++ b/decidim-initiatives/app/presenters/decidim/initiatives/admin_log/initiatives_type_presenter.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module AdminLog
+      # This class holds the logic to present a `Decidim::InitiativesType`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    InitiativesTypePresenter.new(action_log, view_helpers).present
+      class InitiativesTypePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "update", "delete"
+            "decidim.initiatives.admin_log.initiatives_type.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            description: :i18n,
+            title: :i18n,
+            extra_fields_legal_information: :i18n,
+            minimum_committee_members: :integer,
+            document_number_authorization_handler: :i18n,
+            undo_online_signatures_enabled: :boolean,
+            promoting_committee_enabled: :boolean
+          }
+        end
+
+        def diff_actions
+          super + %w(update)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/app/presenters/decidim/initiatives/initiative_stats_presenter.rb b/decidim-initiatives/app/presenters/decidim/initiatives/initiative_stats_presenter.rb
index 55e39cc78a026..e790250313861 100644
--- a/decidim-initiatives/app/presenters/decidim/initiatives/initiative_stats_presenter.rb
+++ b/decidim-initiatives/app/presenters/decidim/initiatives/initiative_stats_presenter.rb
@@ -3,8 +3,10 @@
 module Decidim
   module Initiatives
     # A presenter to render statistics in the homepage.
-    class InitiativeStatsPresenter < Rectify::Presenter
-      attribute :initiative, Decidim::Initiative
+    class InitiativeStatsPresenter < SimpleDelegator
+      def initiative
+        __getobj__.fetch(:initiative)
+      end
 
       def comments_count
         Rails.cache.fetch(
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/admin/admin_users.rb b/decidim-initiatives/app/queries/decidim/initiatives/admin/admin_users.rb
index eded57b63dbde..1d97790d17467 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/admin/admin_users.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/admin/admin_users.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     module Admin
       # A class used to find the admins for an initiative or an organization initiatives.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # initiative - Decidim::Initiative
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/admin/manageable_initiatives.rb b/decidim-initiatives/app/queries/decidim/initiatives/admin/manageable_initiatives.rb
index 9b91564235a87..60253a2a0e9cf 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/admin/manageable_initiatives.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/admin/manageable_initiatives.rb
@@ -6,7 +6,7 @@ module Admin
       # Class that retrieves manageable initiatives for the given user.
       # Regular users will get only their initiatives. Administrators will
       # retrieve all initiatives.
-      class ManageableInitiatives < Rectify::Query
+      class ManageableInitiatives < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects
         #
         # user - Decidim::User
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/freetext_initiative_types.rb b/decidim-initiatives/app/queries/decidim/initiatives/freetext_initiative_types.rb
index 22fecf2b845e9..f9222aa5a7bb4 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/freetext_initiative_types.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/freetext_initiative_types.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # This query searches scopes by name.
-    class FreetextInitiativeTypes < Rectify::Query
+    class FreetextInitiativeTypes < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # organization - an Organization context for the initiative type search
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/initiative_types.rb b/decidim-initiatives/app/queries/decidim/initiatives/initiative_types.rb
index e40cf492933b4..9c7793d3928d6 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/initiative_types.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/initiative_types.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Class uses to retrieve the available initiative types.
-    class InitiativeTypes < Rectify::Query
+    class InitiativeTypes < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # organization - Decidim::Organization
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/initiatives_created.rb b/decidim-initiatives/app/queries/decidim/initiatives/initiatives_created.rb
index b326f11f47fe8..1848d14fdf0a5 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/initiatives_created.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/initiatives_created.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Class uses to retrieve the initiatives created by the given user.
-    class InitiativesCreated < Rectify::Query
+    class InitiativesCreated < Decidim::Query
       attr_reader :user
 
       # Syntactic sugar to initialize the class and return the queried objects.
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/initiatives_promoted.rb b/decidim-initiatives/app/queries/decidim/initiatives/initiatives_promoted.rb
index 3883ba8a3843a..da68062fde4ed 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/initiatives_promoted.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/initiatives_promoted.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Class uses to retrieve initiatives promoted by the given  user
-    class InitiativesPromoted < Rectify::Query
+    class InitiativesPromoted < Decidim::Query
       attr_reader :user
 
       # Syntactic sugar to initialize the class and return the queried objects.
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/organization_prioritized_initiatives.rb b/decidim-initiatives/app/queries/decidim/initiatives/organization_prioritized_initiatives.rb
index 80b49d972f514..91e2cf9d1d273 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/organization_prioritized_initiatives.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/organization_prioritized_initiatives.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # This query retrieves the organization prioritized initiatives that will appear in the homepage
-    class OrganizationPrioritizedInitiatives < Rectify::Query
+    class OrganizationPrioritizedInitiatives < Decidim::Query
       attr_reader :organization, :order
 
       def initialize(organization, order)
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/outdated_validating_initiatives.rb b/decidim-initiatives/app/queries/decidim/initiatives/outdated_validating_initiatives.rb
index a75432d38888d..8adb76ad58159 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/outdated_validating_initiatives.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/outdated_validating_initiatives.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # Class uses to retrieve initiatives that have been a long time in
     # validating state
-    class OutdatedValidatingInitiatives < Rectify::Query
+    class OutdatedValidatingInitiatives < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # period_length - Maximum time in validating state
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/similar_initiatives.rb b/decidim-initiatives/app/queries/decidim/initiatives/similar_initiatives.rb
index 8c9056d3f28ac..b817f2fd26cae 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/similar_initiatives.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/similar_initiatives.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Class uses to retrieve similar initiatives types.
-    class SimilarInitiatives < Rectify::Query
+    class SimilarInitiatives < Decidim::Query
       include Decidim::TranslationsHelper
       include CurrentLocale
 
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/support_period_finished_initiatives.rb b/decidim-initiatives/app/queries/decidim/initiatives/support_period_finished_initiatives.rb
index 961dcee8d80d9..82a0bc7aa8fbc 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/support_period_finished_initiatives.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/support_period_finished_initiatives.rb
@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # Class uses to retrieve initiatives that have been a long time in validating
     # state
-    class SupportPeriodFinishedInitiatives < Rectify::Query
+    class SupportPeriodFinishedInitiatives < Decidim::Query
       # Retrieves the initiatives ready to be evaluated to decide if they've been
       # accepted or not.
       def query
diff --git a/decidim-initiatives/app/queries/decidim/initiatives/user_authorizations.rb b/decidim-initiatives/app/queries/decidim/initiatives/user_authorizations.rb
index 17fbb56fa25d1..046d5538443aa 100644
--- a/decidim-initiatives/app/queries/decidim/initiatives/user_authorizations.rb
+++ b/decidim-initiatives/app/queries/decidim/initiatives/user_authorizations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Class used the retrieve the authorizations for a user.
-    class UserAuthorizations < Rectify::Query
+    class UserAuthorizations < Decidim::Query
       attr_reader :user
 
       # Syntactic sugar to initialize the class and return the queried objects.
diff --git a/decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb b/decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb
index ed795ae7104bb..bfbbc7e1e65fe 100644
--- a/decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb
+++ b/decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb
@@ -2,114 +2,23 @@
 
 module Decidim
   module Initiatives
-    # Service that encapsulates all logic related to filtering initiatives.
-    class InitiativeSearch < Searchlight::Search
-      include CurrentLocale
+    # This service scopes the meeting searches with parameters that cannot be
+    # passed from the user interface.
+    class InitiativeSearch < ResourceSearch
+      attr_reader :author
 
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Initiative
-          .includes(scoped_type: [:scope])
-          .joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
-          .where(organization: options[:organization])
-          .published
-      end
+      def build(params)
+        return super if search_context == :admin
 
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(
-              Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%"
-            )
-          )
-          .or(
-            query.where(
-              "cast(decidim_initiatives.id as text) ILIKE ?", "%#{search_text}%"
-            )
-          )
-          .or(
-            query.where(
-              "decidim_users.name ILIKE ? OR decidim_users.nickname ILIKE ?", "%#{search_text}%", "%#{search_text}%"
-            )
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        ids = []
-        ids += state.member?("accepted") ? query.accepted.ids : []
-        ids += state.member?("rejected") ? query.rejected.ids : []
-        ids += state.member?("answered") ? query.answered.ids : []
-        ids += state.member?("open") ? query.open.ids : []
-        ids += state.member?("closed") ? query.closed.ids : []
-
-        query.where(id: ids)
-      end
+        @author = params[:author]
 
-      def search_type_id
-        return query if type_ids.include?("all")
-
-        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type_ids).pluck(:id)
-
-        query.where(scoped_type: types)
-      end
-
-      def search_author
-        if author == "myself" && options[:current_user]
-          co_authoring_initiative_ids = Decidim::InitiativesCommitteeMember.where(
-            decidim_users_id: options[:current_user].id
-          ).pluck(:decidim_initiatives_id)
-
-          query.where(decidim_author_id: options[:current_user].id, decidim_author_type: Decidim::UserBaseEntity.name)
-               .or(query.where(id: co_authoring_initiative_ids))
-               .unscope(where: :published_at)
+        if params[:author] == "myself" && user
+          add_scope(:authored_by, user)
         else
-          query
+          add_scope(:published, nil)
         end
-      end
-
-      def search_scope_id
-        return query if scope_ids.include?("all")
-
-        clean_scope_ids = scope_ids
-
-        conditions = []
-        conditions << "decidim_initiatives_type_scopes.decidim_scopes_id IS NULL" if clean_scope_ids.delete("global")
-        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
-
-        query.joins(:scoped_type).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
-      end
-
-      def search_area_id
-        return query if area_ids.include?("all")
-
-        query.where(decidim_area_id: area_ids)
-      end
-
-      private
-
-      # Private: Returns an array with checked type ids.
-      def type_ids
-        [type_id].flatten
-      end
-
-      # Private: Returns an array with checked scope ids.
-      def scope_ids
-        [scope_id].flatten
-      end
 
-      # Private: Returns an array with checked area ids, handling area_types which are coded as its
-      # areas ids joined by _.
-      def area_ids
-        area_id.map { |id| id.split("_") }.flatten.uniq
+        super
       end
     end
   end
diff --git a/decidim-initiatives/app/services/decidim/initiatives/pdf_signature_example.rb b/decidim-initiatives/app/services/decidim/initiatives/pdf_signature_example.rb
index c8f6c6bdadeee..f5c1a0560ca8c 100644
--- a/decidim-initiatives/app/services/decidim/initiatives/pdf_signature_example.rb
+++ b/decidim-initiatives/app/services/decidim/initiatives/pdf_signature_example.rb
@@ -2,6 +2,7 @@
 
 require "origami"
 require "tempfile"
+require_relative "../../../../lib/gem_overrides/origami/date"
 
 module Decidim
   module Initiatives
@@ -17,23 +18,21 @@ def initialize(args = {})
 
       # Public: PDF signed using a new certificate generated by the service
       def signed_pdf
-        @signed_pdf ||= begin
-          StringIO.open(pdf) do |stream|
-            parsed_pdf = Origami::PDF.read(stream)
-            parsed_pdf.append_page do |page|
-              page.add_annotation(signature_annotation)
-              parsed_pdf.sign(
-                certificate,
-                key,
-                method: "adbe.pkcs7.detached",
-                annotation: signature_annotation,
-                location: location,
-                contact: contact,
-                issuer: issuer
-              )
-            end
-            extract_signed_pdf(parsed_pdf)
+        @signed_pdf ||= StringIO.open(pdf) do |stream|
+          parsed_pdf = Origami::PDF.read(stream)
+          parsed_pdf.append_page do |page|
+            page.add_annotation(signature_annotation)
+            parsed_pdf.sign(
+              certificate,
+              key,
+              method: "adbe.pkcs7.detached",
+              annotation: signature_annotation,
+              location: location,
+              contact: contact,
+              issuer: issuer
+            )
           end
+          extract_signed_pdf(parsed_pdf)
         end
       end
 
diff --git a/decidim-initiatives/app/services/decidim/initiatives/status_change_notifier.rb b/decidim-initiatives/app/services/decidim/initiatives/status_change_notifier.rb
index 5f802735f52f4..197a142194337 100644
--- a/decidim-initiatives/app/services/decidim/initiatives/status_change_notifier.rb
+++ b/decidim-initiatives/app/services/decidim/initiatives/status_change_notifier.rb
@@ -13,7 +13,7 @@ def initialize(args = {})
       # PUBLIC
       # Notifies when an initiative has changed its status.
       #
-      # * created: Notifies the author that his initiative has been created.
+      # * created: Notifies the author that their initiative has been created.
       #
       # * validating: Administrators will be notified about the initiative that
       #   requests technical validation.
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/_form.html.erb
new file mode 100644
index 0000000000000..3a7f14346e024
--- /dev/null
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/_form.html.erb
@@ -0,0 +1,10 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.select :initiatives_order, [[t(".random"),"random"],[t(".date"),"recent"],[t(".signatures"),"most_voted"],[t(".comments"),"most_commented"],[t(".publication_date"),"recently_published"]] %>
+   </div>
+  </div>
+</div>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb
new file mode 100644
index 0000000000000..74bad16503221
--- /dev/null
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb
@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_initiatives_settings" }, url: initiatives_setting_path, method: :put) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
index 0941c845879e3..42729a11086c9 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb
@@ -64,6 +64,10 @@
       </div>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :comments_enabled %>
+    </div>
+
     <div class="row column">
       <%= form.check_box :collect_user_extra_fields %>
     </div>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
index 2504cc22b18ed..8a83aa6d08fa2 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
@@ -34,7 +34,7 @@
             </div>
 
             <div class="field">
-              <%= f.editor :description, lines: 8, toolbar: :full %>
+              <%= text_editor_for(f, :description, lines: 8, toolbar: :full) %>
             </div>
 
             <% signature_type_options = signature_type_options(f.object) %>
@@ -82,7 +82,9 @@
                 <legend><%= t("attachment_legend", scope: "decidim.initiatives.form") %></legend>
 
                 <div class="row column">
-                  <%= f.file_field :add_documents, multiple: true, label: t("add_attachments", scope: "decidim.initiatives.form") %>
+                  <%= f.attachment :documents,
+                    multiple: true,
+                    label: t("add_attachments", scope: "decidim.initiatives.form") %>
                 </div>
               </fieldset>
             <% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb
index c7248118022ad..c2685f2470061 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb
@@ -27,7 +27,7 @@
           </div>
 
           <div class="field">
-            <%= f.editor :description, lines: 8, toolbar: :full %>
+            <%= text_editor_for(f, :description, lines: 8, toolbar: :full) %>
           </div>
 
           <div class="actions">
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_count.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_count.html.erb
index 491de9ce4ef74..1233b8e99f228 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_count.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_count.html.erb
@@ -1 +1 @@
-<%= t(".title", count: initiatives.to_a.count) %>
+<%= t(".title", count: initiatives.total_count) %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb
index 2947d0f29a160..e08250109a587 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb
@@ -2,7 +2,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search") %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search") %>
         <div class="input-group-button">
           <button type="submit" class="button">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -12,15 +12,15 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_states_values, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :with_any_state, filter_states_values, legend_title: t(".state") %>
 
-  <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
+  <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope") %>
 
   <% unless single_initiative_type? %>
-    <%= form.check_boxes_tree :type_id, filter_types_values, legend_title: t(".type") %>
+    <%= form.check_boxes_tree :with_any_type, filter_types_values, legend_title: t(".type") %>
   <% end %>
 
-  <%= form.check_boxes_tree :area_id, filter_areas_values, legend_title: t(".area") %>
+  <%= form.check_boxes_tree :with_any_area, filter_areas_values, legend_title: t(".area") %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :author,
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
index 4242ecb7953ed..ee551366d54cc 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb
@@ -5,7 +5,7 @@
 </div>
 
 <div class="field">
-  <%= form.editor :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.description) %>
+  <%= text_editor_for(form, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.description)) %>
 </div>
 
 <div class="field">
@@ -109,4 +109,6 @@
   <%= render partial: "committee_members" %>
 <% end %>
 
-<%= javascript_pack_tag "decidim_initiatives" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_initiatives" %>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
index 21297ab81b5ca..c39f247d3d1d7 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
@@ -40,7 +40,9 @@ edit_link(
               <%= render partial: "vote_cabin", locals: { initiative: current_initiative } %>
             </div>
           <% end %>
-          <%= render partial: "interactions" %>
+          <% if current_initiative.commentable? %>
+            <%= render partial: "interactions" %>
+          <% end %>
         <% else %>
           <%= link_to t(".edit"),
               edit_initiative_path(current_initiative),
@@ -90,4 +92,4 @@ edit_link(
   </div>
 </div>
 
-<%= comments_for current_initiative if current_initiative.published? %>
+<%= comments_for current_initiative if current_initiative.commentable? && current_initiative.published? %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/_initiative_header_steps.html.erb b/decidim-initiatives/app/views/layouts/decidim/_initiative_header_steps.html.erb
index e611047fe9f86..457ba4a875674 100644
--- a/decidim-initiatives/app/views/layouts/decidim/_initiative_header_steps.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/_initiative_header_steps.html.erb
@@ -2,7 +2,9 @@
   <div class="columns mediumlarge-4">
     <div class="process-header__phase">
       <div>
-        <span class="phase-title"><!-- Step name --></span>
+        <span class="phase-title">
+          <%= t("signature_interval.title", scope: "decidim.initiatives") %>
+        </span>
         <span class="phase-date">
           <%= l(initiative.signature_start_date, format: :default) %>
           -
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
index f7c90d067b7cd..ca22981332549 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
@@ -14,5 +14,8 @@
       </div>
     </div>
   <% end %>
-  <%= javascript_pack_tag "decidim_initiatives" %>
+
+  <% content_for :js_content do %>
+    <%= javascript_pack_tag "decidim_initiatives" %>
+  <% end %>
 <% end %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
index f3a9af9cf322c..04d982b9fea24 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
@@ -8,5 +8,8 @@
     <div class="columns large-3"></div>
   </div>
   </div>
-  <%= javascript_pack_tag "decidim_initiatives" %>
+
+  <% content_for :js_content do %>
+    <%= javascript_pack_tag "decidim_initiatives" %>
+  <% end %>
 <% end %>
diff --git a/decidim-initiatives/config/locales/ar.yml b/decidim-initiatives/config/locales/ar.yml
index ad0faab01aef1..3a34db5f5bfca 100644
--- a/decidim-initiatives/config/locales/ar.yml
+++ b/decidim-initiatives/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -40,13 +41,6 @@ ar:
         name: اكمل الاسم
   activerecord:
     models:
-      decidim/initiative:
-        zero: بعض المبادرات
-        one: بالمبادرة
-        two: بعض المبادرات
-        few: بعض المبادرات
-        many: بعض المبادرات
-        other: بعض المبادرات
       decidim/initiative_comittee:
         zero: Comittees
         one: إحداث الهيئة
@@ -217,7 +211,6 @@ ar:
             destroy: حذ�
             update: تحديث
           form:
-            child_scope_threshold_enabled_help: 'هذا الاعداد لا يدعم التصويت الغير الكترونى, لكنه يدعم المجالات ال�رعيه و يعمل مع مؤثق أصوات مربوط مع مجال المستخدم, تاكد انك قمت بأختيار طرق التوثيق, بالاس�ل أعدادات التوثيق. لكى يعمل مع المجالات تحتاج بظبط الأعدادات بشكل هرمى: ١ أب لكل عدد من الأبناء. لمعلومات أكثر عن كي�يه ظبط الاعدادت، قم بتص�ح هذا <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">الرابط</a>.'
             title: معلومات عامة
           initiative_type_scopes:
             title: نطاقات لنوع المبادرة
diff --git a/decidim-initiatives/config/locales/bg.yml b/decidim-initiatives/config/locales/bg.yml
index 2e58dacc84820..4677627d29d26 100644
--- a/decidim-initiatives/config/locales/bg.yml
+++ b/decidim-initiatives/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-initiatives/config/locales/ca.yml b/decidim-initiatives/config/locales/ca.yml
index 25eabf01c6f8c..daa85a1ebd6ab 100644
--- a/decidim-initiatives/config/locales/ca.yml
+++ b/decidim-initiatives/config/locales/ca.yml
@@ -1,10 +1,15 @@
+---
 ca:
   activemodel:
     attributes:
       initiative:
+        answer: Resposta
+        answer_url: URL de la resposta
         area_id: Àrea
+        decidim_scope_id: Àmbit
         decidim_user_group_id: Autoria
         description: Descripció
+        hashtag: Etiqueta (hashtag)
         offline_votes: Signatures presencials
         offline_votes_for_scope: Signatures presencials per a %{scope_name}
         scope_id: Àmbit
@@ -17,6 +22,7 @@ ca:
           online: Digital
         state: Estat
         title: Títol
+        type_id: Tipus
       initiatives_committee_member:
         user: Membre del comitè
       initiatives_settings:
@@ -27,6 +33,7 @@ ca:
         banner_image: Imatge del bàner
         child_scope_threshold_enabled: Activar signatures per subàmbit
         collect_user_extra_fields: Recopilar les dades personals de la participant amb la signatura
+        comments_enabled: Habilitar comentaris
         custom_signature_end_date_enabled: Permet a les autores triar la fi del període de recollida de signatures
         description: Descripció
         document_number_authorization_handler: Autorització per verificar el número de document en les signatures
@@ -39,6 +46,9 @@ ca:
         title: Títol
         undo_online_signatures_enabled: Permetre a les participants desfer les seves signatures digitals
         validate_sms_code_on_votes: Afegeix el pas de validació mitjançant SMS al procés de signatura
+      initiatives_type_scope:
+        decidim_scopes_id: Àmbits
+        supports_required: Es requereixen suports
       initiatives_vote:
         date_of_birth: Data de naixement
         document_number: Número de document
@@ -88,12 +98,17 @@ ca:
             label: Tipus
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria.
+      initiatives_settings:
+        update:
+          error: S'ha produït un error
+          success: La configuració de les iniciatives s'ha actualitzat correctament
       menu:
         attachments: Adjunts
         committee_members: Membres de la comissió
         components: Components
         information: Informació
         initiatives: Iniciatives
+        initiatives_settings: Configuració
         initiatives_types: Tipus d'iniciatives
         moderations: Moderacions
       models:
@@ -203,7 +218,7 @@ ca:
         committee_requests:
           index:
             approve: Aprova
-            confirm_revoke: Estàs segur?
+            confirm_revoke: Segur?
             invite_to_committee_help: Comparteix aquest enllaç per convidar altres persones al comitè promotor
             no_members_yet: No hi ha membres al comitè promotor
             revoke: Revocar
@@ -220,8 +235,8 @@ ca:
         initiatives:
           edit:
             accept: Accepta la iniciativa
-            confirm: Estàs segur?
-            confirm_send_to_technical_validation: N'estàs segura?
+            confirm: Segur?
+            confirm_send_to_technical_validation: Segur?
             discard: Descarta la iniciativa
             export_pdf_signatures: Exporta PDF de signatures
             export_votes: Exportar signatures
@@ -245,6 +260,16 @@ ca:
           update:
             error: S'ha produït un error
             success: La iniciativa ciutadana s'ha actualitzat correctament
+        initiatives_settings:
+          edit:
+            update: Actualitzar
+          form:
+            comments: Més comentades
+            date: Més recents
+            publication_date: Publicada més recentment
+            random: Aleatori
+            signatures: Més signades
+            title: Configuració d'iniciatives
         initiatives_type_scopes:
           create:
             error: S'ha produït un error
@@ -253,7 +278,7 @@ ca:
             success: L'àmbit s'ha eliminat correctament
           edit:
             back: Torna
-            confirm_destroy: N'estàs segur?
+            confirm_destroy: Segur?
             destroy: Suprimeix
             title: Edita l'àmbit del tipus d'iniciativa
             update: Actualitza
@@ -271,12 +296,12 @@ ca:
           destroy:
             success: S'ha eliminat correctament el tipus d'iniciativa
           edit:
-            confirm_destroy: N'estàs segur?
+            confirm_destroy: Segur?
             destroy: Suprimeix
             update: Actualitza
           form:
             authorizations: Configuració de l'autorització
-            child_scope_threshold_enabled_help: 'Aquest ajust de configuració no admet les votacions sense connexió, habilita els subàmbits i funciona amb un gestor d''autoritzacions que associa un àmbit a la participant, assegureu-vos de seleccionar aquesta autorització, més avall a la configuració d''autoritzacions. Per a que funcioni, els àmbits han de configurar-se de forma jerárquica: 1 Pare - N fills. Per a més informació sobre com funciona aquesta configuració, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">veure aquest enllaç</a>.'
+            child_scope_threshold_enabled_help: 'Aquest ajust de configuració no admet les votacions sense connexió. Habilita els subàmbits i funciona amb un gestor d''autoritzacions que associa un àmbit a la participant. Assegura''t de seleccionar aquesta autorització, més avall a la configuració d''autoritzacions. Per a que funcioni, els àmbits han de configurar-se de forma jerárquica: 1 Pare - N fills. Per a més informació sobre com funciona aquesta configuració, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">veure la documentació sobre l''administració d''iniciatives</a>.'
             only_global_scope_enabled_help: Marca aquesta casella si has habilitat "Activar signatures per subàmbit" i vas configurar l'àmbit global com l'àmbit principal. En habilitar aquesta casella, la selecció del tipus d'iniciativa s'ometrà en l'assistent de creació d'iniciatives. Per a més informació sobre com funciona aquesta configuració, consulta aquest <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">enllaç</a>.
             options: Opcions
             title: Informació general
@@ -294,6 +319,12 @@ ca:
           send_to_technical_validation: "%{user_name} ha enviat la iniciativa %{resource_name} a la validació tècnica"
           unpublish: "%{user_name} ha descartat la iniciativa %{resource_name}"
           update: "%{user_name} ha actualitzat la iniciativa %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} ha actualitzat la configuració de les iniciatives"
+        initiatives_type:
+          create: "%{user_name} ha creat el tipus d'iniciativa %{resource_name}"
+          delete: "%{user_name} ha esborrat el tipus d'iniciativa %{resource_name}"
+          update: "%{user_name} ha actualitzat el tipus d'iniciativa %{resource_name}"
       admin_states:
         accepted: Ha aconseguit les signatures necessàries
         created: Creada
@@ -375,7 +406,7 @@ ca:
       edit:
         accept: Accepta la iniciativa
         back: Tornar
-        confirm: N'estàs segura?
+        confirm: Segur?
         discard: Descarta la iniciativa
         export_pdf_signatures: Exporta PDF de signatures
         export_votes: Exportar signatures
@@ -448,7 +479,7 @@ ca:
             other: i %{count} persones més
         committee_members:
           approve: Aprova
-          confirm_revoke: N'estàs segura?
+          confirm_revoke: Segur?
           invite_to_committee_help: Comparteix aquest enllaç per convidar altres persones a la comissió promotora
           no_members_yet: No hi ha membres a la comissió promotora
           revoke: Revocar
@@ -520,7 +551,7 @@ ca:
           initiative_rejected_reason: Aquesta iniciativa ha estat rebutjada per falta de signatures.
         show:
           any_vote_method: Aquesta iniciativa recull signatures digitals i presencials.
-          confirm: Estàs a punt d'enviar la iniciativa perquè una administradora la revisi i la publiqui. Un cop publicada no la podràs editar. N'estàs segura?
+          confirm: Estàs a punt d'enviar la iniciativa perquè una administradora la revisi i la publiqui. Un cop publicada no la podràs editar. Segur?
           edit: Editar
           follow_description: Rebre una notificació quan hi hagi novetats sobre aquesta iniciativa
           offline_method: Aquesta iniciativa només recull signatures presencials.
@@ -567,6 +598,8 @@ ca:
           published: Publicada
           rejected: No ha aconseguit les signatures
           validating: Validació tècnica
+      signature_interval:
+        title: Període de recollida de signatures
       states:
         accepted: Acceptat
         expired: Vençut
diff --git a/decidim-initiatives/config/locales/cs.yml b/decidim-initiatives/config/locales/cs.yml
index 63b70354bd8df..1b930c104e5ed 100644
--- a/decidim-initiatives/config/locales/cs.yml
+++ b/decidim-initiatives/config/locales/cs.yml
@@ -1,10 +1,15 @@
+---
 cs:
   activemodel:
     attributes:
       initiative:
+        answer: Odpově�
+        answer_url: URL odpovědi
         area_id: Oblast
+        decidim_scope_id: Oblast působnosti
         decidim_user_group_id: Autor
         description: Popis
+        hashtag: Hashtag
         offline_votes: Osobní fyzické podpisy
         offline_votes_for_scope: Podepsané osoby pro %{scope_name}
         scope_id: Rozsah
@@ -17,6 +22,7 @@ cs:
           online: OnLine
         state: Stav
         title: Titul
+        type_id: Typ
       initiatives_committee_member:
         user: Člen výboru
       initiatives_settings:
@@ -27,6 +33,7 @@ cs:
         banner_image: Obrázek banneru
         child_scope_threshold_enabled: Povolit podpisy podřízené oblasti působnosti
         collect_user_extra_fields: Shromaž�ovat osobní údaje ú�astníků při podpisu
+        comments_enabled: Povolit komentáře
         custom_signature_end_date_enabled: Povolit autorům zvolit konec doby sběru podpisů
         description: Popis
         document_number_authorization_handler: Autorizace k ověření �ísla dokumentu pro podpisy
@@ -39,6 +46,9 @@ cs:
         title: Titul
         undo_online_signatures_enabled: Povolit ú�astníkům vrátit zpět své online podpisy
         validate_sms_code_on_votes: Přidejte krok ověření SMS kódu do procesu podpisu
+      initiatives_type_scope:
+        decidim_scopes_id: Oblasti působnosti
+        supports_required: Potřebné podpory
       initiatives_vote:
         date_of_birth: Datum narození
         document_number: Číslo dokumentu
@@ -58,11 +68,6 @@ cs:
               title: Název nesmí být prázdný
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniciativa
-        few: Iniciativy
-        many: Iniciativ
-        other: Iniciativy
       decidim/initiative_comittee:
         one: Výbor
         few: Výbory
@@ -94,12 +99,17 @@ cs:
             label: Typ
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Hledat %{collection} podle názvu, popisu, ID nebo jména autora.
+      initiatives_settings:
+        update:
+          error: Došlo k chybě
+          success: Nastavení iniciativ bylo úspěšně aktualizováno
       menu:
         attachments: Přílohy
         committee_members: Členové výboru
         components: Komponenty
         information: Informace
         initiatives: Iniciativy
+        initiatives_settings: Nastavení
         initiatives_types: Typy iniciativ
         moderations: Moderování
       models:
@@ -251,6 +261,16 @@ cs:
           update:
             error: Došlo k chybě
             success: Iniciativa ob�anů byla úspěšně aktualizována
+        initiatives_settings:
+          edit:
+            update: Aktualizovat
+          form:
+            comments: Nejvíce komentované
+            date: Nejnovější
+            publication_date: Nedávno publikované
+            random: Náhodně
+            signatures: S nejvíce podpisy
+            title: Nastavení pro iniciativy
         initiatives_type_scopes:
           create:
             error: Došlo k chybě
@@ -282,7 +302,7 @@ cs:
             update: Aktualizovat
           form:
             authorizations: Nastavení autorizace
-            child_scope_threshold_enabled_help: 'Tento příznak konfigurace nepodporuje offline hlasování, umožňuje podřízené oblasti působnosti a pracuje s obslužnou rutinou autorizace, která uživateli přiřazuje rozsah, Ujistěte se, že jste vybrali tuto autorizaci, níže v nastavení autorizace. Aby fungovala obblast působnosti, musí být nastavena hierarchickým způsobem: 1 nadřazený - N podřazených. Více informací o tom, jak tato konfigurace funguje, naleznete na tomto <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">odkazu</a>.'
+            child_scope_threshold_enabled_help: 'Tento konfigura�ní příznak nepodporuje offline hlasování. Umožňuje podrozsahy a pracuje s obslužnou rutinou autorizace, která uživateli přiřazuje rozsah. Ujistěte se, že jste vybrali toto oprávnění níže v nastavení oprávnění. Aby to fungovalo, musí být rozsahy nakonfigurovány hierarchickým způsobem: 1 nadřazený – N podřízený. Další informace o tom, jak tato konfigurace funguje, najdete na <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">stránce dokumentace pro administraci iniciativ</a>.'
             only_global_scope_enabled_help: Zaškrtněte tuto poznámku, pokud jste povolili "Podřazená oblast působnosti" a nakonfigurovali globální rozsah jako vaši nadřazenou oblast působnosti. Povolením této možnosti bude výběr typu iniciativy přesko�eno v průvodci vytvořením iniciativy. Více informací o tom, jak tato konfigurace funguje, naleznete na tomto <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">odkazu</a>.
             options: Možnosti
             title: Obecná informace
@@ -300,6 +320,12 @@ cs:
           send_to_technical_validation: "%{user_name} zaslala %{resource_name} iniciativu k technickému ověření"
           unpublish: "%{user_name} zrušil iniciativu %{resource_name}"
           update: "%{user_name} aktualizoval iniciativu %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} aktualizoval nastavení iniciativ"
+        initiatives_type:
+          create: "%{user_name} vytvořil typ iniciativ %{resource_name}"
+          delete: "%{user_name} odstranil typ iniciativ %{resource_name}"
+          update: "%{user_name} aktualizoval typ iniciativ %{resource_name}"
       admin_states:
         accepted: Dostatek podpisů
         created: Vytvořeno
@@ -583,6 +609,8 @@ cs:
           published: Publikováno
           rejected: Nedostatek podpisů
           validating: Technické ověření
+      signature_interval:
+        title: Doba sběru podpisů
       states:
         accepted: Přijato
         expired: Platnost vypršela
diff --git a/decidim-initiatives/config/locales/de.yml b/decidim-initiatives/config/locales/de.yml
index ff8a095d2920b..8feacc46a3ecd 100644
--- a/decidim-initiatives/config/locales/de.yml
+++ b/decidim-initiatives/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -26,6 +27,7 @@ de:
         banner_image: Banner-Bild
         child_scope_threshold_enabled: Unterschriften von Unterbereichen aktivieren
         collect_user_extra_fields: Sammeln Sie persönliche Daten des Benutzers bei der Unterschrift
+        comments_enabled: Kommentare aktivieren
         custom_signature_end_date_enabled: Die Auswahl des Enddatums der Unterschriftensammlung für Autoren freigeben
         description: Beschreibung
         document_number_authorization_handler: Berechtigung zur Überprüfung der Belegnummer bei Abstimmungen
@@ -56,9 +58,6 @@ de:
               title: Der Titel sollte nicht leer sein
   activerecord:
     models:
-      decidim/initiative:
-        one: Initativ
-        other: Initiativen
       decidim/initiative_comittee:
         one: Komitee
         other: Ausschüsse
@@ -86,12 +85,17 @@ de:
             label: Typ
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Suche in %{collection} nach Titel, Beschreibung, ID oder Autoren.
+      initiatives_settings:
+        update:
+          error: Ein Fehler ist aufgetreten
+          success: Die Einstellungen für Initiativen wurden erfolgreich aktualisiert
       menu:
         attachments: Anhänge
         committee_members: Ausschussmitglieder
         components: Komponenten
         information: Information
         initiatives: Initiativen
+        initiatives_settings: Einstellungen
         initiatives_types: Arten von Initiativen
         moderations: Moderationen
       models:
@@ -243,6 +247,16 @@ de:
           update:
             error: Ein Fehler ist aufgetreten
             success: Die Bürgerinitiative wurde erfolgreich aktualisiert
+        initiatives_settings:
+          edit:
+            update: Aktualisieren
+          form:
+            comments: Am meisten kommentiert
+            date: Neuste
+            publication_date: Zuletzt veröffentlicht
+            random: Zufällig
+            signatures: Am häufigsten unterzeichnet
+            title: Einstellungen für Initiativen
         initiatives_type_scopes:
           create:
             error: Ein Fehler ist aufgetreten
@@ -290,6 +304,12 @@ de:
           send_to_technical_validation: "%{user_name} hat die Initiative %{resource_name} zur technischen Validierung gesendet"
           unpublish: "%{user_name} hat die Initiative %{resource_name} verworfen"
           update: "%{user_name} hat die Initiative %{resource_name} aktualisiert"
+        initiatives_settings:
+          update: "%{user_name} hat die Einstellungen für Initiativen aktualisiert"
+        initiatives_type:
+          create: "%{user_name} hat den Initiativentyp %{resource_name} erstellt"
+          delete: "%{user_name} hat den Initiativentyp %{resource_name} gelöscht"
+          update: "%{user_name} hat den Initiativentyp %{resource_name} aktualisiert"
       admin_states:
         accepted: Ausreichend Unterschriften
         created: Erstellt
@@ -562,6 +582,8 @@ de:
           published: Veröffentlicht
           rejected: Ungenügend Unterschriften
           validating: Technische Validierung
+      signature_interval:
+        title: Zeitraum der Unterschriftensammlung
       states:
         accepted: Akzeptiert
         expired: Abgelaufen
diff --git a/decidim-initiatives/config/locales/el.yml b/decidim-initiatives/config/locales/el.yml
index d5c756d373b92..cc6dce8e5df54 100644
--- a/decidim-initiatives/config/locales/el.yml
+++ b/decidim-initiatives/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -51,9 +52,6 @@ el:
               title: Ο τίτλος δεν π�έπει να είναι κενός
   activerecord:
     models:
-      decidim/initiative:
-        one: Π�ωτοβουλία
-        other: Π�ωτοβουλίες
       decidim/initiative_comittee:
         one: Επιτ�οπή
         other: Επιτ�οπές
diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml
index db20580d61706..930963d483f89 100644
--- a/decidim-initiatives/config/locales/en.yml
+++ b/decidim-initiatives/config/locales/en.yml
@@ -3,9 +3,13 @@ en:
   activemodel:
     attributes:
       initiative:
+        answer: Answer
+        answer_url: Answer URL
         area_id: Area
+        decidim_scope_id: Scope
         decidim_user_group_id: Author
         description: Description
+        hashtag: Hashtag
         offline_votes: In-person signatures
         offline_votes_for_scope: In-person signatures for %{scope_name}
         scope_id: Scope
@@ -18,6 +22,7 @@ en:
           online: Online
         state: Status
         title: Title
+        type_id: Type
       initiatives_committee_member:
         user: Committee member
       initiatives_settings:
@@ -28,6 +33,7 @@ en:
         banner_image: Banner image
         child_scope_threshold_enabled: Enable child scope signatures
         collect_user_extra_fields: Collect participant personal data on signature
+        comments_enabled: Enable comments
         custom_signature_end_date_enabled: Enable authors to choose the end of signature collection period
         description: Description
         document_number_authorization_handler: Authorization to verify document number on signatures
@@ -40,6 +46,9 @@ en:
         title: Title
         undo_online_signatures_enabled: Enable participants to undo their online signatures
         validate_sms_code_on_votes: Add SMS code validation step to signature process
+      initiatives_type_scope:
+        decidim_scopes_id: Scopes
+        supports_required: Supports required
       initiatives_vote:
         date_of_birth: Date of birth
         document_number: Document number
@@ -60,8 +69,8 @@ en:
   activerecord:
     models:
       decidim/initiative:
-        one: Initative
-        other: Initatives
+        one: Initiative
+        other: Initiatives
       decidim/initiative_comittee:
         one: Comittee
         other: Comittees
@@ -89,12 +98,17 @@ en:
             label: Type
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Search %{collection} by title, description, ID or author name.
+      initiatives_settings:
+        update:
+          error: An error has occured
+          success: The initiatives settings have been successfully updated
       menu:
         attachments: Attachments
         committee_members: Committee members
         components: Components
         information: Information
         initiatives: Initiatives
+        initiatives_settings: Settings
         initiatives_types: Initiative types
         moderations: Moderations
       models:
@@ -246,6 +260,16 @@ en:
           update:
             error: An error has occurred
             success: The initiative has been successfully updated
+        initiatives_settings:
+          edit:
+            update: Update
+          form:
+            comments: Most commented
+            date: Most recent
+            publication_date: Most recently published
+            random: Random
+            signatures: Most signed
+            title: Settings for initiatives
         initiatives_type_scopes:
           create:
             error: An error has occurred
@@ -277,7 +301,7 @@ en:
             update: Update
           form:
             authorizations: Authorization settings
-            child_scope_threshold_enabled_help: 'This config flag doesn''t support offline votes, it enables sub-scopes and works with an authorization handler that associates a scope to the user, make sure you select that authorization, bellow in authorization settings. For it to work scopes need to be configured in hierarchical way : 1 Parent - N Child. For more info on how this configuration works, see this <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">link</a>.'
+            child_scope_threshold_enabled_help: 'This config flag doesn''t support offline votes. It enables sub-scopes and works with an authorization handler that associates a scope to the user. Make sure you select that authorization, below in authorization settings. For it to work, scopes need to be configured in a hierarchical way: 1 Parent - N Child. For more info on how this configuration works, see <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">initiatives'' admin documentation page</a>.'
             only_global_scope_enabled_help: Tick this flag if you enabled "Child scope signature" and configured the global scope as your parent scope. By enabling this, initiative type selection will be skipped in the initiative creation wizard. For more info on how this configuration works, see this <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">link</a>.
             options: Options
             title: General information
@@ -295,6 +319,12 @@ en:
           send_to_technical_validation: "%{user_name} sent the %{resource_name} initiative to technical validation"
           unpublish: "%{user_name} discarded the %{resource_name} initiative"
           update: "%{user_name} updated the %{resource_name} initiative"
+        initiatives_settings:
+          update: "%{user_name} updated the initiatives settings"
+        initiatives_type:
+          create: "%{user_name} created the %{resource_name} initiatives type"
+          delete: "%{user_name} deleted the %{resource_name} initiatives type"
+          update: "%{user_name} updated the %{resource_name} initiatives type"
       admin_states:
         accepted: Enough signatures
         created: Created
@@ -568,6 +598,8 @@ en:
           published: Published
           rejected: Not enough signatures
           validating: Technical validation
+      signature_interval:
+        title: Signature collection period
       states:
         accepted: Accepted
         expired: Expired
diff --git a/decidim-initiatives/config/locales/es-MX.yml b/decidim-initiatives/config/locales/es-MX.yml
index 1b260aaa2c042..d00cd7b7540a6 100644
--- a/decidim-initiatives/config/locales/es-MX.yml
+++ b/decidim-initiatives/config/locales/es-MX.yml
@@ -1,10 +1,15 @@
+---
 es-MX:
   activemodel:
     attributes:
       initiative:
+        answer: Respuesta
+        answer_url: URL de la respuesta
         area_id: �rea
+        decidim_scope_id: �mbito
         decidim_user_group_id: Autor
         description: Descripción
+        hashtag: Etiqueta (hashtag)
         offline_votes: Apoyo cara a cara
         offline_votes_for_scope: Firmas en persona para %{scope_name}
         scope_id: Alcance
@@ -17,6 +22,7 @@ es-MX:
           online: En línea
         state: Estado
         title: Título
+        type_id: Tipo
       initiatives_committee_member:
         user: Miembro del Comité
       initiatives_settings:
@@ -27,6 +33,7 @@ es-MX:
         banner_image: Imagen de banner
         child_scope_threshold_enabled: Activar firmas por subámbito
         collect_user_extra_fields: Recopilar datos personales del usuario en la firma
+        comments_enabled: Habilitar comentarios
         custom_signature_end_date_enabled: Permitir a las autoras elegir el final del período de la recogida de firmas
         description: Descripción
         document_number_authorization_handler: Autorización para verificar el número de documento en las votaciones.
@@ -39,6 +46,9 @@ es-MX:
         title: Título
         undo_online_signatures_enabled: Permitir a los usuarios deshacer sus firmas en línea
         validate_sms_code_on_votes: Añadir paso de validación de código SMS al proceso de firma
+      initiatives_type_scope:
+        decidim_scopes_id: �mbitos
+        supports_required: Se requieren apoyos
       initiatives_vote:
         date_of_birth: Fecha de nacimiento
         document_number: Número del Documento
@@ -88,12 +98,17 @@ es-MX:
             label: Tipo
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría.
+      initiatives_settings:
+        update:
+          error: Se ha producido un error
+          success: La configuración de las iniciativas se ha actualizado correctamente
       menu:
         attachments: Adjuntos
         committee_members: Miembros de la comisión
         components: Componentes
         information: Información
         initiatives: Iniciativas
+        initiatives_settings: Configuración
         initiatives_types: Tipos de Iniciativa
         moderations: Moderaciones
       models:
@@ -245,6 +260,16 @@ es-MX:
           update:
             error: Se ha producido un error
             success: La iniciativa ciudadana se ha actualizado con éxito
+        initiatives_settings:
+          edit:
+            update: Actualizar
+          form:
+            comments: Más comentadas
+            date: Más recientes
+            publication_date: Publicada más recientemente
+            random: Aleatorio
+            signatures: Más firmadas
+            title: Configuración de iniciativas
         initiatives_type_scopes:
           create:
             error: Se ha producido un error
@@ -276,7 +301,7 @@ es-MX:
             update: Actualizar
           form:
             authorizations: Ajustes de autorización
-            child_scope_threshold_enabled_help: 'Este ajuste de configuración no permite los votos en persona, habilita los sub-ámbitos y funciona con un manejador de autorizaciones que relaciona un ámbito a un usuario, asegúrate que seleccionas la autorización debajo de las configuraciones de autorización. Para que funcione, los ámbitos necesitan ser configurados de manera jerárquica: 1 Padre - N Hijo. Para más información sobre cómo funciona esta configuración, visita esta <a href="https://docs.decidim.org/en/admin/spaces/initiatives">liga</a>.'
+            child_scope_threshold_enabled_help: 'Este ajuste de configuración no admite las votaciones sin conexión. Habilita los subámbitos y funciona con un gestor de autorizaciones que asocia un ámbito al usuario. Asegúrate de seleccionar esa autorización, más abajo en la configuración de autorizaciones. Para que funcione, los ámbitos deben configurarse de forma jerárquica: 1 Padre - N hijos. Para más información sobre cómo funciona esta configuración, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ver la documentación sobre l''administraciónb de iniciativas</a>.'
             only_global_scope_enabled_help: Marca esta casilla si habilitaste "Activar firmas por subámbito" y configuraste el ámbito global como el ámbito principal. Al habilitar esta casilla, la selección del tipo de iniciativa se omitirá en el asistente de creación de iniciativas. Para más información sobre cómo funciona esta configuración, consulta este <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">enlace</a>.
             options: Opciones
             title: Información general
@@ -294,6 +319,12 @@ es-MX:
           send_to_technical_validation: "%{user_name} envió la iniciativa %{resource_name} a validación técnica"
           unpublish: "%{user_name} descartó la iniciativa %{resource_name}"
           update: "%{user_name} actualizó la iniciativa %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} ha actualizado la configuración de las iniciativas"
+        initiatives_type:
+          create: "%{user_name} creó el tipo de iniciativa %{resource_name}"
+          delete: "%{user_name} borró el tipo de iniciativa %{resource_name}"
+          update: "%{user_name} actualizó el tipo de iniciativa %{resource_name}"
       admin_states:
         accepted: Ha conseguido las firmas
         created: Creado
@@ -567,6 +598,8 @@ es-MX:
           published: Publicada
           rejected: No ha conseguido las firmas
           validating: Validación técnica
+      signature_interval:
+        title: Período de recogida de firmas
       states:
         accepted: Aceptado
         expired: Caducado
diff --git a/decidim-initiatives/config/locales/es-PY.yml b/decidim-initiatives/config/locales/es-PY.yml
index 26182fbffed66..d4f27b804ad41 100644
--- a/decidim-initiatives/config/locales/es-PY.yml
+++ b/decidim-initiatives/config/locales/es-PY.yml
@@ -1,10 +1,15 @@
+---
 es-PY:
   activemodel:
     attributes:
       initiative:
+        answer: Respuesta
+        answer_url: URL de la respuesta
         area_id: �rea
+        decidim_scope_id: �mbito
         decidim_user_group_id: Autor
         description: Descripción
+        hashtag: Etiqueta (hashtag)
         offline_votes: Apoyo cara a cara
         offline_votes_for_scope: Firmas en persona para %{scope_name}
         scope_id: Alcance
@@ -17,6 +22,7 @@ es-PY:
           online: En línea
         state: Estado
         title: Título
+        type_id: Tipo
       initiatives_committee_member:
         user: Miembro del Comité
       initiatives_settings:
@@ -27,6 +33,7 @@ es-PY:
         banner_image: Imagen de banner
         child_scope_threshold_enabled: Activar firmas por subámbito
         collect_user_extra_fields: Recopilar datos personales del usuario en la firma
+        comments_enabled: Habilitar comentarios
         custom_signature_end_date_enabled: Permitir a las autoras elegir el final del período de la recogida de firmas
         description: Descripción
         document_number_authorization_handler: Autorización para verificar el número de documento en las votaciones.
@@ -39,6 +46,9 @@ es-PY:
         title: Título
         undo_online_signatures_enabled: Permitir a los usuarios deshacer sus firmas en línea
         validate_sms_code_on_votes: Añadir paso de validación de código SMS al proceso de firma
+      initiatives_type_scope:
+        decidim_scopes_id: �mbitos
+        supports_required: Se requieren apoyos
       initiatives_vote:
         date_of_birth: Fecha de nacimiento
         document_number: Número del Documento
@@ -88,12 +98,17 @@ es-PY:
             label: Tipo
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría.
+      initiatives_settings:
+        update:
+          error: Se ha producido un error
+          success: La configuración de las iniciativas se ha actualizado correctamente
       menu:
         attachments: Adjuntos
         committee_members: Miembros de la comisión
         components: Componentes
         information: Información
         initiatives: Iniciativas
+        initiatives_settings: Configuración
         initiatives_types: Tipos de Iniciativa
         moderations: Moderaciones
       models:
@@ -245,6 +260,16 @@ es-PY:
           update:
             error: Se ha producido un error
             success: La iniciativa ciudadana se ha actualizado con éxito
+        initiatives_settings:
+          edit:
+            update: Actualizar
+          form:
+            comments: Más comentadas
+            date: Más recientes
+            publication_date: Publicada más recientemente
+            random: Aleatorio
+            signatures: Más firmadas
+            title: Configuración de iniciativas
         initiatives_type_scopes:
           create:
             error: Se ha producido un error
@@ -276,7 +301,7 @@ es-PY:
             update: Actualizar
           form:
             authorizations: Ajustes de autorización
-            child_scope_threshold_enabled_help: 'Este ajuste de configuración no admite las votaciones sin conexión, habilita los subámbitos y funciona con un gestor de autorizaciones que asocia un ámbito al usuario, asegúrese de seleccionar esa autorización, más abajo en la configuración de autorizaciones. Para que funcione, los ámbitos deben configurarse de forma jerárquica: 1 Padre - N hijos. Para más información sobre cómo funciona esta configuración, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ver este enlace</a>.'
+            child_scope_threshold_enabled_help: 'Este ajuste de configuración no admite las votaciones sin conexión. Habilita los subámbitos y funciona con un gestor de autorizaciones que asocia un ámbito al usuario. Asegúrate de seleccionar esa autorización, más abajo en la configuración de autorizaciones. Para que funcione, los ámbitos deben configurarse de forma jerárquica: 1 Padre - N hijos. Para más información sobre cómo funciona esta configuración, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ver la documentación sobre l''administraciónb de iniciativas</a>.'
             only_global_scope_enabled_help: Marca esta casilla si habilitaste "Activar firmas por subámbito" y configuraste el ámbito global como el ámbito principal. Al habilitar esta casilla, la selección del tipo de iniciativa se omitirá en el asistente de creación de iniciativas. Para más información sobre cómo funciona esta configuración, consulta este <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">enlace</a>.
             options: Opciones
             title: Información general
@@ -294,6 +319,12 @@ es-PY:
           send_to_technical_validation: "%{user_name} envió la iniciativa %{resource_name} a validación técnica"
           unpublish: "%{user_name} descartó la iniciativa %{resource_name}"
           update: "%{user_name} actualizó la iniciativa %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} ha actualizado la configuración de las iniciativas"
+        initiatives_type:
+          create: "%{user_name} ha creat el tipus d'iniciativa %{resource_name}"
+          delete: "%{user_name} ha eliminado el tipo de iniciativa %{resource_name}"
+          update: "%{user_name} ha actualizado el tipo de iniciativa %{resource_name}"
       admin_states:
         accepted: Ha conseguido las firmas
         created: Creado
@@ -567,6 +598,8 @@ es-PY:
           published: Publicada
           rejected: No ha conseguido las firmas
           validating: Validación técnica
+      signature_interval:
+        title: Período de recogida de firmas
       states:
         accepted: Aceptado
         expired: Caducado
diff --git a/decidim-initiatives/config/locales/es.yml b/decidim-initiatives/config/locales/es.yml
index 6fc42d7c01257..70ab7f4308c32 100644
--- a/decidim-initiatives/config/locales/es.yml
+++ b/decidim-initiatives/config/locales/es.yml
@@ -1,10 +1,15 @@
+---
 es:
   activemodel:
     attributes:
       initiative:
+        answer: Respuesta
+        answer_url: URL de la respuesta
         area_id: �rea
+        decidim_scope_id: �mbito
         decidim_user_group_id: Autoria
         description: Descripción
+        hashtag: Etiqueta (hashtag)
         offline_votes: Firmas presenciales
         offline_votes_for_scope: Firmas en persona para %{scope_name}
         scope_id: �mbito
@@ -17,6 +22,7 @@ es:
           online: Digital
         state: Estado
         title: Título
+        type_id: Tipo
       initiatives_committee_member:
         user: Miembro del Comité
       initiatives_settings:
@@ -27,6 +33,7 @@ es:
         banner_image: Imagen de banner
         child_scope_threshold_enabled: Activar firmas por subámbito
         collect_user_extra_fields: Recopilar datos personales de la participante con la firma
+        comments_enabled: Habilitar comentarios
         custom_signature_end_date_enabled: Permitir a las autoras elegir el final del período de recogida de firmas
         description: Descripción
         document_number_authorization_handler: Autorización para verificar el número de documento en las firmas
@@ -39,6 +46,9 @@ es:
         title: Título
         undo_online_signatures_enabled: Permitir a las participantes deshacer sus firmas digitales
         validate_sms_code_on_votes: Añadir paso de validación mediante SMS al proceso de firma
+      initiatives_type_scope:
+        decidim_scopes_id: �mbitos
+        supports_required: Se requieren apoyos
       initiatives_vote:
         date_of_birth: Fecha de nacimiento
         document_number: Número de documento
@@ -88,12 +98,17 @@ es:
             label: Tipo
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Buscar %{collection} por título, descripción, ID o autoría.
+      initiatives_settings:
+        update:
+          error: Se ha producido un error
+          success: La configuración de las iniciativas se ha actualizado correctamente
       menu:
         attachments: Adjuntos
         committee_members: Miembros de la comisión
         components: Componentes
         information: Información
         initiatives: Iniciativas
+        initiatives_settings: Configuración
         initiatives_types: Tipos de Iniciativa
         moderations: Moderaciones
       models:
@@ -245,6 +260,16 @@ es:
           update:
             error: Se ha producido un error
             success: La iniciativa ciudadana se ha actualizado correctamente
+        initiatives_settings:
+          edit:
+            update: Actualizar
+          form:
+            comments: Más comentadas
+            date: Más recientes
+            publication_date: Publicada más recientemente
+            random: Aleatorio
+            signatures: Más firmadas
+            title: Configuración de iniciativas
         initiatives_type_scopes:
           create:
             error: Se ha producido un error
@@ -276,7 +301,7 @@ es:
             update: Actualizar
           form:
             authorizations: Ajustes de autorización
-            child_scope_threshold_enabled_help: 'Este ajuste de configuración no admite las votaciones sin conexión, habilita los subámbitos y funciona con un gestor de autorizaciones que asocia un ámbito al usuario, asegúrese de seleccionar esa autorización, más abajo en la configuración de autorizaciones. Para que funcione, los ámbitos deben configurarse de forma jerárquica: 1 Padre - N hijos. Para más información sobre cómo funciona esta configuración, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ver este enlace</a>.'
+            child_scope_threshold_enabled_help: 'Este ajuste de configuración no admite las votaciones sin conexión. Habilita los subámbitos y funciona con un gestor de autorizaciones que asocia un ámbito al usuario. Asegúrate de seleccionar esa autorización, más abajo en la configuración de autorizaciones. Para que funcione, los ámbitos deben configurarse de forma jerárquica: 1 Padre - N hijos. Para más información sobre cómo funciona esta configuración, <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ver la documentación sobre l''administraciónb de iniciativas</a>.'
             only_global_scope_enabled_help: Marca esta casilla si habilitaste "Activar firmas por subámbito" y configuraste el ámbito global como el ámbito principal. Al habilitar esta casilla, la selección del tipo de iniciativa se omitirá en el asistente de creación de iniciativas. Para más información sobre cómo funciona esta configuración, consulta este <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">enlace</a>.
             options: Opciones
             title: Información general
@@ -294,6 +319,12 @@ es:
           send_to_technical_validation: "%{user_name} envió la iniciativa %{resource_name} a validación técnica"
           unpublish: "%{user_name} descartó la iniciativa %{resource_name}"
           update: "%{user_name} actualizó la iniciativa %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} ha actualizado la configuración de las iniciativas"
+        initiatives_type:
+          create: "%{user_name} ha creat el tipus d'iniciativa %{resource_name}"
+          delete: "%{user_name} ha eliminado el tipo de iniciativa %{resource_name}"
+          update: "%{user_name} ha actualizado el tipo de iniciativa %{resource_name}"
       admin_states:
         accepted: Ha conseguido las firmas necesarias
         created: Creada
@@ -567,6 +598,8 @@ es:
           published: Publicada
           rejected: No ha conseguido las firmas
           validating: Validación técnica
+      signature_interval:
+        title: Período de recogida de firmas
       states:
         accepted: Aceptado
         expired: Caducado
diff --git a/decidim-initiatives/config/locales/eu.yml b/decidim-initiatives/config/locales/eu.yml
index 67a2b45c16e06..3645c0a7d1603 100644
--- a/decidim-initiatives/config/locales/eu.yml
+++ b/decidim-initiatives/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -56,9 +57,6 @@ eu:
               title: Izenburua ezin da hutsik egon
   activerecord:
     models:
-      decidim/initiative:
-        one: Ekimena
-        other: Initatives
       decidim/initiative_comittee:
         one: Batzordea
         other: Comittees
diff --git a/decidim-initiatives/config/locales/fi-plain.yml b/decidim-initiatives/config/locales/fi-plain.yml
index 05ae100935958..38d49e67ce98d 100644
--- a/decidim-initiatives/config/locales/fi-plain.yml
+++ b/decidim-initiatives/config/locales/fi-plain.yml
@@ -1,10 +1,15 @@
+---
 fi-pl:
   activemodel:
     attributes:
       initiative:
+        answer: Vastaus
+        answer_url: Vastaa URL-osoite
         area_id: Alue
+        decidim_scope_id: Teema
         decidim_user_group_id: Laatija
         description: Kuvaus
+        hashtag: Aihetunniste (hashtag)
         offline_votes: Palvelun ulkopuolella kerätyt kannatukset
         offline_votes_for_scope: Fyysisesti kerätyt allekirjoitukset kohteelle %{scope_name}
         scope_id: Teema
@@ -17,6 +22,7 @@ fi-pl:
           online: Verkossa
         state: Tila
         title: Otsikko
+        type_id: Tyyppi
       initiatives_committee_member:
         user: Komitean jäsen
       initiatives_settings:
@@ -27,6 +33,7 @@ fi-pl:
         banner_image: Bannerikuva
         child_scope_threshold_enabled: Ota käyttöön alateemojen allekirjoitukset
         collect_user_extra_fields: Kerää käyttäjän henkilötietoja allekirjoituksessa
+        comments_enabled: Ota kommentit käyttöön
         custom_signature_end_date_enabled: Salli laatijoiden valita allekirjoitusten keräyksen loppumisaika
         description: Kuvaus
         document_number_authorization_handler: Valtuutus asiakirjanumeron tarkistamiseen äänestyksessä
@@ -39,6 +46,9 @@ fi-pl:
         title: Otsikko
         undo_online_signatures_enabled: Salli käyttäjien peruuttaa verkossa tehdyt allekirjoitukset
         validate_sms_code_on_votes: Lisää tekstiviestikoodin validointivaihe allekirjoitusprosessiin
+      initiatives_type_scope:
+        decidim_scopes_id: Teemat
+        supports_required: Kannatuksia vaaditaan
       initiatives_vote:
         date_of_birth: Syntymäaika
         document_number: Asiakirjan numero
@@ -88,12 +98,17 @@ fi-pl:
             label: Tyyppi
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Etsi kohteita %{collection} otsikon, kuvauksen, ID-numeron tai laatijan nimellä.
+      initiatives_settings:
+        update:
+          error: Tapahtui virhe
+          success: Aloitteiden asetusten päivitys onnistui
       menu:
         attachments: Liitteet
         committee_members: Komitean jäsenet
         components: Komponentit
         information: Tiedot
         initiatives: Aloitteet
+        initiatives_settings: Asetukset
         initiatives_types: Aloitetyypit
         moderations: Moderoinnit
       models:
@@ -245,6 +260,16 @@ fi-pl:
           update:
             error: Tapahtui virhe
             success: Kansalaisaloite on onnistuneesti päivitetty
+        initiatives_settings:
+          edit:
+            update: Päivitä
+          form:
+            comments: Eniten kommentoidut
+            date: Viimeisimmät
+            publication_date: Viimeisimmäksi julkaistut
+            random: Satunnainen
+            signatures: Allekirjoitetuimmat
+            title: Aloitteiden asetukset
         initiatives_type_scopes:
           create:
             error: Tapahtui virhe
@@ -294,6 +319,12 @@ fi-pl:
           send_to_technical_validation: "%{user_name} lähetti aloitteen %{resource_name} tekniseen validointiin"
           unpublish: "%{user_name} hylkäsi aloitteen %{resource_name}"
           update: "%{user_name} päivitti aloitetta %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} päivitti aloitteiden asetuksia"
+        initiatives_type:
+          create: "%{user_name} loi aloitetyypin %{resource_name}"
+          delete: "%{user_name} poisti aloitetyypin %{resource_name}"
+          update: "%{user_name} päivitti aloitetyyppiä %{resource_name}"
       admin_states:
         accepted: Tarpeeksi allekirjoituksia
         created: Luotu
@@ -567,6 +598,8 @@ fi-pl:
           published: Julkaistu
           rejected: Liian vähän allekirjoituksia
           validating: Teknisessä tarkastuksessa
+      signature_interval:
+        title: Allekirjoituksen keräysaika
       states:
         accepted: Hyväksytyt
         expired: Vanhentuneet
diff --git a/decidim-initiatives/config/locales/fi.yml b/decidim-initiatives/config/locales/fi.yml
index 092fbe8b3f917..6bf220beac547 100644
--- a/decidim-initiatives/config/locales/fi.yml
+++ b/decidim-initiatives/config/locales/fi.yml
@@ -1,10 +1,15 @@
+---
 fi:
   activemodel:
     attributes:
       initiative:
+        answer: Vastaus
+        answer_url: Vastaa URL-osoite
         area_id: Alue
+        decidim_scope_id: Teema
         decidim_user_group_id: Laatija
         description: Kuvaus
+        hashtag: Aihetunniste (hashtag)
         offline_votes: Palvelun ulkopuolella kerätyt kannatukset
         offline_votes_for_scope: Fyysisesti kerätyt allekirjoitukset kohteelle %{scope_name}
         scope_id: Teema
@@ -17,14 +22,18 @@ fi:
           online: Verkossa
         state: Tila
         title: Otsikko
+        type_id: Tyyppi
       initiatives_committee_member:
         user: Komitean jäsen
+      initiatives_settings:
+        initiatives_order: Järjestys
       initiatives_type:
         area_enabled: Salli alueen valinta aloitteille
         attachments_enabled: Salli liitteet
         banner_image: Bannerikuva
         child_scope_threshold_enabled: Ota käyttöön alateemojen allekirjoitukset
         collect_user_extra_fields: Kerää käyttäjän henkilötietoja allekirjoituksen yhteydessä
+        comments_enabled: Ota kommentit käyttöön
         custom_signature_end_date_enabled: Salli laatijoiden valita allekirjoitusten keräyksen loppumisaika
         description: Kuvaus
         document_number_authorization_handler: Vahvistustapa asiakirjanumeron tarkistamiseen allekirjoitettaessa
@@ -37,6 +46,9 @@ fi:
         title: Otsikko
         undo_online_signatures_enabled: Verkossa tehtyjen allekirjoitusten peruuttaminen käytössä
         validate_sms_code_on_votes: Lisää tekstiviestikoodin validointivaihe allekirjoitusprosessiin
+      initiatives_type_scope:
+        decidim_scopes_id: Teemat
+        supports_required: Kannatuksia vaaditaan
       initiatives_vote:
         date_of_birth: Syntymäaika
         document_number: Asiakirjan numero
@@ -86,12 +98,17 @@ fi:
             label: Tyyppi
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Etsi kohteita %{collection} otsikon, kuvauksen, ID-numeron tai laatijan nimellä.
+      initiatives_settings:
+        update:
+          error: Tapahtui virhe
+          success: Aloitteiden asetusten päivitys onnistui
       menu:
         attachments: Liitteet
         committee_members: Komitean jäsenet
         components: Komponentit
         information: Tiedot
         initiatives: Aloitteet
+        initiatives_settings: Asetukset
         initiatives_types: Aloitetyypit
         moderations: Moderoinnit
       models:
@@ -243,6 +260,16 @@ fi:
           update:
             error: Tapahtui virhe
             success: Aloitteen päivitys onnistui
+        initiatives_settings:
+          edit:
+            update: Päivitä
+          form:
+            comments: Eniten kommentoidut
+            date: Viimeisimmät
+            publication_date: Viimeisimmäksi julkaistut
+            random: Satunnainen
+            signatures: Allekirjoitetuimmat
+            title: Aloitteiden asetukset
         initiatives_type_scopes:
           create:
             error: Tapahtui virhe
@@ -292,6 +319,12 @@ fi:
           send_to_technical_validation: "%{user_name} lähetti aloitteen %{resource_name} tekniseen tarkastukseen"
           unpublish: "%{user_name} hylkäsi aloitteen %{resource_name}"
           update: "%{user_name} päivitti aloitetta %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} päivitti aloitteiden asetuksia"
+        initiatives_type:
+          create: "%{user_name} loi aloitetyypin %{resource_name}"
+          delete: "%{user_name} poisti aloitetyypin %{resource_name}"
+          update: "%{user_name} päivitti aloitetyyppiä %{resource_name}"
       admin_states:
         accepted: Tarpeeksi allekirjoituksia
         created: Luotu
@@ -565,6 +598,8 @@ fi:
           published: Julkaistu
           rejected: Liian vähän allekirjoituksia
           validating: Teknisessä tarkastuksessa
+      signature_interval:
+        title: Allekirjoituksen keräysaika
       states:
         accepted: Hyväksytyt
         expired: Vanhentuneet
diff --git a/decidim-initiatives/config/locales/fr-CA.yml b/decidim-initiatives/config/locales/fr-CA.yml
index 762110f2225b0..e437c919669be 100644
--- a/decidim-initiatives/config/locales/fr-CA.yml
+++ b/decidim-initiatives/config/locales/fr-CA.yml
@@ -1,10 +1,15 @@
+---
 fr-CA:
   activemodel:
     attributes:
       initiative:
+        answer: Réponse
+        answer_url: URL de la réponse
         area_id: Périmètre d'assemblée
+        decidim_scope_id: Secteur
         decidim_user_group_id: Auteur
         description: Description
+        hashtag: Hashtag
         offline_votes: Votes en présentiel
         offline_votes_for_scope: Signatures en personne pour %{scope_name}
         scope_id: Secteur
@@ -17,6 +22,7 @@ fr-CA:
           online: En ligne
         state: Etat
         title: Titre
+        type_id: Type
       initiatives_committee_member:
         user: Membre du Comité de promotion
       initiatives_settings:
@@ -27,6 +33,7 @@ fr-CA:
         banner_image: Image d'en-tête
         child_scope_threshold_enabled: Activer les signatures de portée enfant
         collect_user_extra_fields: Collecter les données personnelles de l'utilisateur lors de la signature
+        comments_enabled: Activer les commentaires
         custom_signature_end_date_enabled: Permettre aux auteurs de choisir la fin de la période de collecte des signatures
         description: Description
         document_number_authorization_handler: Niveau d'autorisation nécessaire pour signer les initiatives de ce type d'initiative
@@ -39,6 +46,9 @@ fr-CA:
         title: Titre
         undo_online_signatures_enabled: Autoriser les utilisateurs à annuler leurs signatures en ligne
         validate_sms_code_on_votes: Ajouter une étape de validation du code SMS au processus de signature
+      initiatives_type_scope:
+        decidim_scopes_id: Secteurs
+        supports_required: Signatures requises
       initiatives_vote:
         date_of_birth: Date de naissance
         document_number: Numéro de document
@@ -58,9 +68,6 @@ fr-CA:
               title: Le titre ne doit pas être vide
   activerecord:
     models:
-      decidim/initiative:
-        one: Initiative
-        other: Initiatives
       decidim/initiative_comittee:
         one: Comité
         other: Comités
@@ -88,12 +95,17 @@ fr-CA:
             label: Type d'initiative
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description, ID ou nom de l'auteur.
+      initiatives_settings:
+        update:
+          error: Une erreur s'est produite
+          success: Les paramètres des initiatives ont bien été mis à jour
       menu:
         attachments: Pièces jointes
         committee_members: Membres de comité
         components: Fonctionnalités
         information: Informations
         initiatives: Pétitions
+        initiatives_settings: Paramètres
         initiatives_types: Types d'initiatives
         moderations: Modérations
       models:
@@ -245,6 +257,16 @@ fr-CA:
           update:
             error: Une erreur est survenue
             success: L'initiative a été mise à jour avec succès
+        initiatives_settings:
+          edit:
+            update: Mettre à jour
+          form:
+            comments: Les plus commentées
+            date: Les plus récentes
+            publication_date: Publiées le plus récemment
+            random: Aléatoire
+            signatures: Les plus signées
+            title: Paramètres des initiatives
         initiatives_type_scopes:
           create:
             error: Une erreur s'est produite
@@ -276,7 +298,7 @@ fr-CA:
             update: Mettre à jour
           form:
             authorizations: Paramètres d'autorisation
-            child_scope_threshold_enabled_help: 'Cette option de configuration ne gère pas les votes hors-ligne, elle permet d''activer des sous-secteurs et fonctionne avec un gestionnaire d''autorisation qui associe un secteur à l''utilisateur. Assurez-vous de sélectionner cette autorisation dans les paramètres d''autorisation ci-dessous. Pour que cela fonctionne, les secteurs doivent être configurées de manière hiérarchique : 1 Parent - N Enfants. Pour plus d''informations sur le fonctionnement de cette configuration, cliquez <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ici</a>.'
+            child_scope_threshold_enabled_help: 'Cette option de configuration ne prend pas en charge les votes hors-ligne, elle permet d''activer des sous-secteurs et fonctionne avec un gestionnaire d''autorisation qui associe un secteur à l''utilisateur. Assurez-vous de sélectionner cette autorisation dans les paramètres d''autorisation ci-dessous. Pour que cela fonctionne, les secteurs doivent être configurés de manière hiérarchique : 1 Parent - N Enfants. Pour plus d''informations sur le fonctionnement de cette configuration, consultez la <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">documentation sur l''administration des initiatives</a>.'
             only_global_scope_enabled_help: Cochez cette case si vous avez activé "Autoriser les signatures par sous-secteur" et configurer la portée globale comme votre portée parente. En activant cette option, la sélection du type de pétition sera ignorée dans l'assistant de création d'initiative. Pour plus d'informations sur le fonctionnement de cette configuration, voir ce <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">lien</a>.
             options: Paramètres
             title: informations générales
@@ -294,6 +316,12 @@ fr-CA:
           send_to_technical_validation: "%{user_name} a envoyé l'initiative %{resource_name} à la validation technique"
           unpublish: "%{user_name} a dépublié l'initiative %{resource_name}"
           update: "%{user_name} a mis à jour l'initiative %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} a mis à jour les paramètres des initiatives"
+        initiatives_type:
+          create: "%{user_name} a créé le type de pétition %{resource_name}"
+          delete: "%{user_name} a supprimé le type de pétition %{resource_name}"
+          update: "%{user_name} a mis à jour le type de pétition %{resource_name}"
       admin_states:
         accepted: Assez de signatures
         created: Créée
@@ -567,6 +595,8 @@ fr-CA:
           published: Publié
           rejected: Pas assez de signatures
           validating: Validation technique
+      signature_interval:
+        title: Période de collecte des signatures
       states:
         accepted: Acceptées
         expired: Expirées
diff --git a/decidim-initiatives/config/locales/fr.yml b/decidim-initiatives/config/locales/fr.yml
index 2adb290442c22..918ed82752614 100644
--- a/decidim-initiatives/config/locales/fr.yml
+++ b/decidim-initiatives/config/locales/fr.yml
@@ -1,10 +1,15 @@
+---
 fr:
   activemodel:
     attributes:
       initiative:
+        answer: Réponse
+        answer_url: URL de la réponse
         area_id: Périmètre d'assemblée
+        decidim_scope_id: Secteur
         decidim_user_group_id: Auteur
         description: Description
+        hashtag: Hashtag
         offline_votes: Votes en présentiel
         offline_votes_for_scope: Signatures en personne pour %{scope_name}
         scope_id: Secteur
@@ -17,6 +22,7 @@ fr:
           online: En ligne
         state: Etat
         title: Titre
+        type_id: Type
       initiatives_committee_member:
         user: Membre du Comité de promotion
       initiatives_settings:
@@ -27,6 +33,7 @@ fr:
         banner_image: Image d'en-tête
         child_scope_threshold_enabled: Autoriser les signatures par sous-secteur
         collect_user_extra_fields: Collecter les données personnelles de l'utilisateur lors de la signature
+        comments_enabled: Activer les commentaires
         custom_signature_end_date_enabled: Permettre aux auteurs de choisir la fin de la période de collecte des signatures
         description: Description
         document_number_authorization_handler: Niveau d'autorisation nécessaire pour signer les pétitions de ce type de pétition
@@ -39,6 +46,9 @@ fr:
         title: Titre
         undo_online_signatures_enabled: Autoriser les utilisateurs à annuler leurs signatures en ligne
         validate_sms_code_on_votes: Ajouter une étape de validation du code SMS au processus de signature
+      initiatives_type_scope:
+        decidim_scopes_id: Secteurs
+        supports_required: Signatures requises
       initiatives_vote:
         date_of_birth: Date de naissance
         document_number: Numéro de document
@@ -58,9 +68,6 @@ fr:
               title: Le titre ne doit pas être vide
   activerecord:
     models:
-      decidim/initiative:
-        one: Pétition
-        other: Pétitions
       decidim/initiative_comittee:
         one: Comité
         other: Comités
@@ -88,12 +95,17 @@ fr:
             label: Type de pétition
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Rechercher %{collection} par titre, description, ID ou nom de l'auteur.
+      initiatives_settings:
+        update:
+          error: Une erreur s'est produite
+          success: Les paramètres des initiatives ont bien été mis à jour
       menu:
         attachments: Pièces jointes
         committee_members: Membres du comité
         components: Fonctionnalités
         information: Informations
         initiatives: Pétitions
+        initiatives_settings: Paramètres
         initiatives_types: Types de pétitions
         moderations: Modérations
       models:
@@ -245,6 +257,16 @@ fr:
           update:
             error: Une erreur est survenue
             success: La pétition a été mise à jour avec succès
+        initiatives_settings:
+          edit:
+            update: Mettre à jour
+          form:
+            comments: Les plus commentées
+            date: Les plus récentes
+            publication_date: Publiées le plus récemment
+            random: Aléatoire
+            signatures: Les plus signées
+            title: Paramètres des initiatives
         initiatives_type_scopes:
           create:
             error: Une erreur s'est produite
@@ -276,7 +298,7 @@ fr:
             update: Mettre à jour
           form:
             authorizations: Paramètres d'autorisation
-            child_scope_threshold_enabled_help: 'Cette option de configuration ne gère pas les votes hors-ligne, elle permet d''activer des sous-secteurs et fonctionne avec un gestionnaire d''autorisation qui associe un secteur à l''utilisateur. Assurez-vous de sélectionner cette autorisation dans les paramètres d''autorisation ci-dessous. Pour que cela fonctionne, les secteurs doivent être configurées de manière hiérarchique : 1 Parent - N Enfants. Pour plus d''informations sur le fonctionnement de cette configuration, cliquez <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">ici</a>.'
+            child_scope_threshold_enabled_help: 'Cette option de configuration ne prend pas en charge les votes hors-ligne, elle permet d''activer des sous-secteurs et fonctionne avec un gestionnaire d''autorisation qui associe un secteur à l''utilisateur. Assurez-vous de sélectionner cette autorisation dans les paramètres d''autorisation ci-dessous. Pour que cela fonctionne, les secteurs doivent être configurés de manière hiérarchique : 1 Parent - N Enfants. Pour plus d''informations sur le fonctionnement de cette configuration, consultez la <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">documentation sur l''administration des initiatives</a>.'
             only_global_scope_enabled_help: Cochez cette case si vous avez activé "Autoriser les signatures par sous-secteur" et configurer la portée globale comme votre portée parente. En activant cette option, la sélection du type de pétition sera ignorée dans l'assistant de création d'initiative. Pour plus d'informations sur le fonctionnement de cette configuration, voir ce <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">lien</a>.
             options: Paramètres
             title: informations générales
@@ -294,6 +316,12 @@ fr:
           send_to_technical_validation: "%{user_name} a envoyé la pétition %{resource_name} à la validation technique"
           unpublish: "%{user_name} a dépublié la pétition %{resource_name}"
           update: "%{user_name} a mis à jour la pétition %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} a mis à jour les paramètres des initiatives"
+        initiatives_type:
+          create: "%{user_name} a créé le type de pétition %{resource_name}"
+          delete: "%{user_name} a supprimé le type de pétition %{resource_name}"
+          update: "%{user_name} a mis à jour le type de pétition %{resource_name}"
       admin_states:
         accepted: Assez de signatures
         created: Créée
@@ -567,6 +595,8 @@ fr:
           published: Publié
           rejected: Pas assez de signatures
           validating: Validation technique
+      signature_interval:
+        title: Période de collecte des signatures
       states:
         accepted: Acceptées
         expired: Expirées
diff --git a/decidim-initiatives/config/locales/ga-IE.yml b/decidim-initiatives/config/locales/ga-IE.yml
index 179604872112b..c0f259e42a923 100644
--- a/decidim-initiatives/config/locales/ga-IE.yml
+++ b/decidim-initiatives/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-initiatives/config/locales/gl.yml b/decidim-initiatives/config/locales/gl.yml
index cc5bfe9542652..19cf57d40724e 100644
--- a/decidim-initiatives/config/locales/gl.yml
+++ b/decidim-initiatives/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -39,9 +40,6 @@ gl:
         name: Nome completo
   activerecord:
     models:
-      decidim/initiative:
-        one: Initativo
-        other: Iniciais
       decidim/initiative_comittee:
         one: Comite
         other: Comités
diff --git a/decidim-initiatives/config/locales/hu.yml b/decidim-initiatives/config/locales/hu.yml
index 0ae9cfb2eb38e..4e0afea788606 100644
--- a/decidim-initiatives/config/locales/hu.yml
+++ b/decidim-initiatives/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -24,6 +25,7 @@ hu:
         banner_image: Banner kép
         child_scope_threshold_enabled: A gyermek hatókör aláírásainak engedélyezése
         collect_user_extra_fields: Személyes adatok gyűjtése az aláíráskor
+        comments_enabled: Hozzászólások engedélyezése
         custom_signature_end_date_enabled: Lehetővé teszi a szerzők számára, hogy kiválasszák az aláírásgyűjtési időszak végét
         description: Leírás
         document_number_authorization_handler: A dokumentum számának ellenőrzésének engedélyezése a szavazatokon
@@ -54,9 +56,6 @@ hu:
               title: A cím nem lehet üres
   activerecord:
     models:
-      decidim/initiative:
-        one: Kezdeményezés
-        other: Kezdeményezések
       decidim/initiative_comittee:
         one: Bizottság
         other: Bizottságok
@@ -84,12 +83,17 @@ hu:
             label: Típus
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Keresés a(z) %{collection} elemei között cím, leírás, azonosító vagy szerző alapján.
+      initiatives_settings:
+        update:
+          error: Hiba történt
+          success: A kezdeményezés frissítése sikeres volt
       menu:
         attachments: Csatolmányok
         committee_members: Bizottsági tagok
         components: Elemek
         information: Információ
         initiatives: Kezdeményezések
+        initiatives_settings: Beállítások
         initiatives_types: Kezdeményezések típusa
         moderations: Moderálások
       models:
@@ -241,6 +245,16 @@ hu:
           update:
             error: Hiba történt
             success: Az állampolgári kezdeményezés frissítése sikeres
+        initiatives_settings:
+          edit:
+            update: Frissítés
+          form:
+            comments: Legtöbb hozzászólással
+            date: Legfrissebb
+            publication_date: Legfrissebben közzétett
+            random: Véletlenszerű
+            signatures: Legtöbb aláírással rendelkező
+            title: Kezdeményezések beállításai
         initiatives_type_scopes:
           create:
             error: Hiba történt
@@ -272,7 +286,7 @@ hu:
             update: Frissítés
           form:
             authorizations: Hitelesítési beállítások
-            child_scope_threshold_enabled_help: 'Ez a konfigurációs zászló nem támogatja az offline szavazást, engedélyezi az al-hatóköröket, és egy olyan engedélyezési kezelővel működik, amely egy hatókört társít a felhasználóhoz, győződjön meg róla, hogy ezt az engedélyezést választja ki, az engedélyezési beállításoknál. Ahhoz, hogy működjön, a hatóköröket hierarchikusan kell beállítani : 1 szülő - N gyermek. További információért arról, hogy hogyan működik ez a konfiguráció, lásd ezt a cikket<a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">link</a>.'
+            child_scope_threshold_enabled_help: 'Ez a konfigurációs jelző nem támogatja az offline szavazást. Engedélyezi az altartományokat, és egy olyan engedélyezési kezelővel működik, amely egy tartományt társít a felhasználóhoz. Győződjön meg róla, hogy ezt a jogosultságot választja ki, alább az engedélyezési beállításoknál. A működéséhez a hatóköröket hierarchikusan kell konfigurálni: 1 Szülő - N gyermek. A konfiguráció működéséről bővebb információért lásd a következő oldalon <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">kezdeményezések admin dokumentációs oldalán</a>.'
             only_global_scope_enabled_help: Jelölje be ezt a jelölőnégyzetet, ha engedélyezte a "Gyermek hatókör aláírás" opciót, és a globális hatókörét szülő hatókörként konfigurálta. Ennek engedélyezésével a kezdeményezés típusának kiválasztása kihagyásra kerül a kezdeményezés létrehozására szolgáló varázslóban. A konfiguráció működésével kapcsolatos további információkért lásd ezt a cikket<a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">link</a>.
             options: Opciók
             title: �ltalános információk
@@ -290,6 +304,12 @@ hu:
           send_to_technical_validation: "%{user_name} elküldte a(z) %{resource_name} kezdeményezést technikai érvényesítésre"
           unpublish: "%{user_name} elvetette a(z) %{resource_name} kezdeményezést"
           update: "%{user_name} frissítette a(z) %{resource_name} kezdeményezést"
+        initiatives_settings:
+          update: "%{user_name} frissítette a kezdeményezések beállításait"
+        initiatives_type:
+          create: "%{user_name} létrehozta a(z) %{resource_name} kezdeményezés típust"
+          delete: "%{user_name} törölte a(z) %{resource_name} kezdeményezés típust"
+          update: "%{user_name} frissítette a(z) %{resource_name} kezdeményezés típust"
       admin_states:
         accepted: Elegendő aláírás
         created: Létrehozva
@@ -563,6 +583,8 @@ hu:
           published: Közzétéve
           rejected: Nincs elegendő aláírás
           validating: Technikai érvényesítés
+      signature_interval:
+        title: Az aláírásgyűjtési időszak
       states:
         accepted: Elfogadva
         expired: Lejárt
diff --git a/decidim-initiatives/config/locales/id-ID.yml b/decidim-initiatives/config/locales/id-ID.yml
index a5e0beb8afdc1..47978a0c4e009 100644
--- a/decidim-initiatives/config/locales/id-ID.yml
+++ b/decidim-initiatives/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -39,8 +40,6 @@ id:
         name: Nama lengkap
   activerecord:
     models:
-      decidim/initiative:
-        other: Initatives
       decidim/initiative_comittee:
         other: Komite-komite
       decidim/initiative_vote:
diff --git a/decidim-initiatives/config/locales/is-IS.yml b/decidim-initiatives/config/locales/is-IS.yml
index cd60d2e55238d..c11bc6aa828f0 100644
--- a/decidim-initiatives/config/locales/is-IS.yml
+++ b/decidim-initiatives/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       initiative:
diff --git a/decidim-initiatives/config/locales/it.yml b/decidim-initiatives/config/locales/it.yml
index 7ed296567be76..1b963beec8572 100644
--- a/decidim-initiatives/config/locales/it.yml
+++ b/decidim-initiatives/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -54,9 +55,6 @@ it:
               title: Il nome non dovrebbe essere vuoto
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniziativa
-        other: Iniziative
       decidim/initiative_comittee:
         one: Comitato di
         other: COMITATI
diff --git a/decidim-initiatives/config/locales/ja.yml b/decidim-initiatives/config/locales/ja.yml
index 9b1f51d4e806c..2393e78931f47 100644
--- a/decidim-initiatives/config/locales/ja.yml
+++ b/decidim-initiatives/config/locales/ja.yml
@@ -1,10 +1,15 @@
+---
 ja:
   activemodel:
     attributes:
       initiative:
+        answer: 回答
+        answer_url: 回答URL
         area_id: エリア
+        decidim_scope_id: スコープ
         decidim_user_group_id: 作�者
         description: 説明
+        hashtag: �ッシュタグ
         offline_votes: In-personal 署�
         offline_votes_for_scope: '%{scope_name} � In-personal 署�'
         scope_id: スコープ
@@ -17,6 +22,7 @@ ja:
           online: オンライン
         state: ステータス
         title: タイトル
+        type_id: タイプ
       initiatives_committee_member:
         user: 委員会メン�ー
       initiatives_settings:
@@ -27,6 +33,7 @@ ja:
         banner_image: �ナー画�
         child_scope_threshold_enabled: 下層スコープ�署�を有効��る
         collect_user_extra_fields: 署���加者�個人データを�集�る
+        comments_enabled: コメントを有効��る
         custom_signature_end_date_enabled: 著者�署���集期間�終�りを�択��るよ���る
         description: 説明
         document_number_authorization_handler: 署�上�ドキュメント番�を検証�る権�
@@ -39,6 +46,9 @@ ja:
         title: タイトル
         undo_online_signatures_enabled: �加者�オンライン署�を�り消���を有効��る
         validate_sms_code_on_votes: 署�プロセス�SMSコード検証ステップを追加
+      initiatives_type_scope:
+        decidim_scopes_id: スコープ
+        supports_required: 必�サ�ート数
       initiatives_vote:
         date_of_birth: 誕生日
         document_number: ドキュメント番�
@@ -85,12 +95,17 @@ ja:
             label: タイプ
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: '%{collection} をタイトル�説明�ID����著者��検索���。'
+      initiatives_settings:
+        update:
+          error: エラー�発生����
+          success: イニシア�ブ�設定�正常�更新�れ���
       menu:
         attachments: 添付ファイル
         committee_members: 委員会メン�ー
         components: コン�ー�ント
         information: 情報
         initiatives: イニシア�ブ
+        initiatives_settings: 設定
         initiatives_types: イニシア�ブ種別
         moderations: モデレーション
       models:
@@ -242,6 +257,16 @@ ja:
           update:
             error: エラー�発生����
             success: イニシア�ブ�正常�更新�れ���
+        initiatives_settings:
+          edit:
+            update: æ›´æ–°
+          form:
+            comments: コメント数�多�順
+            date: 新�順
+            publication_date: 公開日�新��順
+            random: ランダム
+            signatures: 署�数順
+            title: イニシア�ブ�設定
         initiatives_type_scopes:
           create:
             error: エラー�発生����
@@ -273,7 +298,7 @@ ja:
             update: æ›´æ–°
           form:
             authorizations: �証設定
-            child_scope_threshold_enabled_help: "��設定���対���署��集をサ�ート���サブスコープ�署\n�フラグを有効���スコープ�ユーザーを関連付�る承��ンドラ�連����。オーソリゼーション�設定��下記�オーソリゼーションを必��択������。�れ�機能�る�����1��スコープ - N個�サブスコープ���よ���階層的�構��れ��る必���り��。��設定���よ��機能�る������� <a href=\"https://docs.decidim.org/en/admin/spaces/initiatives/\" target=\"_blank\">��リンク</a> を�照������。"
+            child_scope_threshold_enabled_help: '��設定フラグ�オフライン投票をサ�ート���ら��サブスコープを有効���スコープをユーザ�関連付�る�証�ンドラ�動作���。 �証�設定�間��������を確�������。正��動作��る�����スコープを 親1�����N個�対応�る階層構造�構��る必���り��。 ��設定�仕組������詳細��<a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">イニシア�ブ�管�者ドキュメント</a> を�照������。'
             only_global_scope_enabled_help: '「下層スコープ署��を有効���グロー�ルスコープを親スコープ���設定�る場����フラグを�ェック���。�れを有効��る��イニシア�ブ作�ウィザード�イニシア�ブ種別��択�スキップ�れ��。��設定�仕組������詳細��<a href="https://docs.decidim.org/admin-manual/en/initiatives/" target="_blank">��リンク</a> を�照������。'
             options: オプション
             title: 一般情報
@@ -291,6 +316,12 @@ ja:
           send_to_technical_validation: "%{user_name} � %{resource_name} イニシア�ブを技術的検証��出����"
           unpublish: "%{user_name} � %{resource_name} イニシア�ブを破棄����"
           update: "%{user_name} � %{resource_name} �イニシア�ブを更新����"
+        initiatives_settings:
+          update: "%{user_name} �イニシア�ブ�設定を更新����"
+        initiatives_type:
+          create: "%{user_name} � %{resource_name} イニシア�ブタイプを作�����"
+          delete: "%{user_name} � %{resource_name} イニシア�ブタイプを削除����"
+          update: "%{user_name} � %{resource_name} イニシア�ブタイプを更新����"
       admin_states:
         accepted: �分�署�
         created: 作�済�
@@ -559,6 +590,8 @@ ja:
           published: 公開済�
           rejected: �分�署���り��ん
           validating: 技術的検証
+      signature_interval:
+        title: 署���集期間
       states:
         accepted: 承�済�
         expired: 期�切れ
diff --git a/decidim-initiatives/config/locales/ka-GE.yml b/decidim-initiatives/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-initiatives/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-initiatives/config/locales/lb.yml b/decidim-initiatives/config/locales/lb.yml
index 5481112bd73b5..a7a8e6aacd0b3 100644
--- a/decidim-initiatives/config/locales/lb.yml
+++ b/decidim-initiatives/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -54,9 +55,6 @@ lb:
               title: Der Titel sollte nicht leer sein
   activerecord:
     models:
-      decidim/initiative:
-        one: Initativ
-        other: Initiativen
       decidim/initiative_comittee:
         one: Komitee
         other: Ausschüsse
diff --git a/decidim-initiatives/config/locales/lt.yml b/decidim-initiatives/config/locales/lt.yml
index 553611ce1494b..3ec03c8b24068 100644
--- a/decidim-initiatives/config/locales/lt.yml
+++ b/decidim-initiatives/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -24,6 +25,7 @@ lt:
         banner_image: ReklamjuostÄ—s paveikslÄ—lis
         child_scope_threshold_enabled: Leisti parašus posritėse
         collect_user_extra_fields: Surinkti dalyvio asmens duomenis gavus parašą
+        comments_enabled: Įjungti komentarus
         custom_signature_end_date_enabled: Suteikti autoriams galimybę pasirinkti parašų rinkimo periodo pabaigą
         description: Aprašymas
         document_number_authorization_handler: Leidimas tikrinti dokumento numerį gavus parašą
@@ -54,11 +56,6 @@ lt:
               title: Pavadinimo laukas neturėtų būti tuš�ias
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniciatyva
-        few: Iniciatyvos
-        many: Iniciatyvos
-        other: Iniciatyvos
       decidim/initiative_comittee:
         one: Komitetas
         few: Komitetai
@@ -90,12 +87,17 @@ lt:
             label: Tipas
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Ieškoti %{collection} pagal pavadinimą, aprašymą, ID ar autoriaus vardą ir pavardę.
+      initiatives_settings:
+        update:
+          error: Įvyko klaida
+          success: Iniciatyvų nustatymai atnaujinti
       menu:
         attachments: Priedai
         committee_members: Komiteto nariai
         components: Komponentai
         information: Informacija
         initiatives: Iniciatyvos
+        initiatives_settings: Nustatymai
         initiatives_types: Iniciatyvų tipai
         moderations: Moderavimai
       models:
@@ -247,6 +249,16 @@ lt:
           update:
             error: Įvyko klaida
             success: Iniciatyva sÄ—kmingai atnaujinta
+        initiatives_settings:
+          edit:
+            update: Atnaujinti
+          form:
+            comments: Labiausiai komentuota
+            date: Naujausia
+            publication_date: Naujausiai publikuota
+            random: Atsitiktinai
+            signatures: Surinko daugiausia parašų
+            title: Nustatymai iniciatyvoms
         initiatives_type_scopes:
           create:
             error: Įvyko klaida
@@ -278,7 +290,7 @@ lt:
             update: Atnaujinti
           form:
             authorizations: Autorizacijos nustatymai
-            child_scope_threshold_enabled_help: 'Šis konfigūracijos variantas neleidžia turėti fizinių balsų. Jis leidžia turėti posrites ir dirba su autorizacijų tvarkykle kuri priskiria sritį naudotojui. Įsitikinkite, kad pasirenkate teisingą autorizaciją autorizacijų nustatymuose esan�iuose žemiau. Tam, kad tai veiktų, sritys turi būti sukonfigūruotos hierarchiškai: 1. Motininis - N Jaunesnysis. Daugiau informacijos galite rasti <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank"> iniciatyvų administratorių dokumentacijos puslapyje</a>.'
+            child_scope_threshold_enabled_help: 'Šis konfigūracijos variantas neleidžia turėti fizinių alsų. Jis leidžia turėti posrites ir dirba su autorizacijų tvarkykle kuri priskiria sritį naudotojai. Įsitikinkite, kad pasirenkate teisingą autorizaciją autorizacijų nustatymuose esan�iuose žemiau. Tam, kad tai veiktų, sritys turi būti sukonfigūruotos hierarchiškai: 1. Motininis - N Jaunesnysis. Daugiau informacijų galite rasti <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank"> iniciatyvų administratorių dokumentacijos puslapyje</a>.'
             only_global_scope_enabled_help: Pažymėkite šį laukelį, jei įjungėte "Įgalinti parašus pagal poskyrį" ir nustatėte visuotinę apimtį kaip motininę apimtį. Įjungus šį laukelį iniciatyvos tipo pasirinkimas bus praleistas iniciatyvos kūrimo vedlyje. Jei reikia daugiau informacijos apie tai, kaip veikia ši sąranka, žr. šią <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">nuorodą</a>.
             options: Variantai
             title: Bendra informacija
@@ -296,6 +308,12 @@ lt:
           send_to_technical_validation: "%{user_name} išsiuntė iniciatyvą %{resource_name} techniniam patvirtinimui"
           unpublish: "%{user_name} atmetÄ— iniciatyvÄ… %{resource_name}"
           update: "%{user_name} atnaujino iniciatyvÄ… %{resource_name}"
+        initiatives_settings:
+          update: "%{user_name} atnaujino iniciatyvų nustatymus"
+        initiatives_type:
+          create: "%{user_name} sukūrė %{resource_name} iniciatyvos tipą"
+          delete: "%{user_name} ištrynė %{resource_name} iniciatyvos tipą"
+          update: "%{user_name} atnaujino %{resource_name} iniciatyvos tipÄ…"
       admin_states:
         accepted: Parašų užtenka
         created: Sukurta
@@ -581,6 +599,8 @@ lt:
           published: Publikuota
           rejected: Parašų neužtenka
           validating: Techninis patvirtinimas
+      signature_interval:
+        title: Parašų rinkimo periodas
       states:
         accepted: Priimta
         expired: Nebegalioja
diff --git a/decidim-initiatives/config/locales/lv.yml b/decidim-initiatives/config/locales/lv.yml
index 3643c73a5cbd7..f31db3edba541 100644
--- a/decidim-initiatives/config/locales/lv.yml
+++ b/decidim-initiatives/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -51,10 +52,6 @@ lv:
               title: Virsrakstam nevajadzētu būt tukšam
   activerecord:
     models:
-      decidim/initiative:
-        zero: Iniciatīvas
-        one: Iniciatīva
-        other: Iniciatīvas
       decidim/initiative_comittee:
         zero: Komitejas
         one: Komiteja
diff --git a/decidim-initiatives/config/locales/nl.yml b/decidim-initiatives/config/locales/nl.yml
index 6edbfeab48601..e9d871e04f469 100644
--- a/decidim-initiatives/config/locales/nl.yml
+++ b/decidim-initiatives/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -51,9 +52,6 @@ nl:
               title: Titel mag niet leeg zijn
   activerecord:
     models:
-      decidim/initiative:
-        one: Initatief
-        other: Initatief
       decidim/initiative_comittee:
         one: Commissie
         other: Commissies
diff --git a/decidim-initiatives/config/locales/no.yml b/decidim-initiatives/config/locales/no.yml
index 5898087f77417..4b7ce2ecdad5e 100644
--- a/decidim-initiatives/config/locales/no.yml
+++ b/decidim-initiatives/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -54,9 +55,6 @@
               title: Tittelen bør ikke være tom
   activerecord:
     models:
-      decidim/initiative:
-        one: Initiativ
-        other: Initiativer
       decidim/initiative_comittee:
         one: Komité
         other: Komitér
@@ -84,12 +82,17 @@
             label: Type
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Søk i %{collection} etter tittel, beskrivelse, ID eller forfatternavn.
+      initiatives_settings:
+        update:
+          error: Det oppstod en feil
+          success: Innstillingene for initiativer har blitt oppdatert
       menu:
         attachments: Vedlegg
         committee_members: Utvalgets medlemmer
         components: Komponenter
         information: Informasjon
         initiatives: Initiativer
+        initiatives_settings: Innstillinger
         initiatives_types: Initiativtyper
         moderations: Moderasjoner
       models:
@@ -241,6 +244,16 @@
           update:
             error: Det oppstod en feil
             success: Initiativet er oppdatert
+        initiatives_settings:
+          edit:
+            update: Oppdater
+          form:
+            comments: Flest kommentarer
+            date: Nyeste
+            publication_date: Sist publisert
+            random: Tilfeldig
+            signatures: Flest signeringer
+            title: Innstillinger for initiativer
         initiatives_type_scopes:
           create:
             error: Det oppstod en feil
@@ -288,6 +301,8 @@
           send_to_technical_validation: "%{user_name} sendte %{resource_name} initiativet til teknisk validering"
           unpublish: "%{user_name} forkastet %{resource_name} initiativet"
           update: "%{user_name} oppdaterte %{resource_name} initiativet"
+        initiatives_settings:
+          update: "%{user_name} oppdaterte innstillingene for initiativer"
       admin_states:
         accepted: Nok signaturer
         created: Opprettet
diff --git a/decidim-initiatives/config/locales/pl.yml b/decidim-initiatives/config/locales/pl.yml
index 83b7f2319edd7..5872c44cc50dd 100644
--- a/decidim-initiatives/config/locales/pl.yml
+++ b/decidim-initiatives/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -54,11 +55,6 @@ pl:
               title: Tytuł nie może być pusty
   activerecord:
     models:
-      decidim/initiative:
-        one: Inicjatywa
-        few: Inicjatywy
-        many: Inicjatyw
-        other: Inicjatyw
       decidim/initiative_comittee:
         one: Komitet
         few: Komitety
@@ -278,7 +274,6 @@ pl:
             update: Aktualizuj
           form:
             authorizations: Ustawienia autoryzacji
-            child_scope_threshold_enabled_help: 'Ta konfiguracja nie pozwala na głosowania offline, zezwala na pod-zakresy i działa z procedurą autoryzacji, która łączy zakres z użytkownikiem. Upewnij się, że wybrałeś taką autoryzację w sekcji autoryzacji poniżej. Zakresy muszą być konfigurowane w hierarchii: 1 Rodzic - N element podrzędny. Więcej informacji o działaniu tej konfiguracji znajdziesz pod tym <a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">linkiem</a>.'
             options: Ustawienia
             title: Informacje ogólne
           initiative_type_scopes:
diff --git a/decidim-initiatives/config/locales/pt-BR.yml b/decidim-initiatives/config/locales/pt-BR.yml
index f45efcae0855a..ccdfeffdb32c1 100644
--- a/decidim-initiatives/config/locales/pt-BR.yml
+++ b/decidim-initiatives/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -54,9 +55,6 @@ pt-BR:
               title: O título não pode ficar vazio
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniciativa
-        other: Iniciativas
       decidim/initiative_comittee:
         one: Comissão
         other: Comissões
diff --git a/decidim-initiatives/config/locales/pt.yml b/decidim-initiatives/config/locales/pt.yml
index d1c07a3f09c0e..df908fdf1a3d2 100644
--- a/decidim-initiatives/config/locales/pt.yml
+++ b/decidim-initiatives/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -54,9 +55,6 @@ pt:
               title: O título não deve estar vazio
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniciativa
-        other: Iniciativas
       decidim/initiative_comittee:
         one: Comité
         other: Comités
diff --git a/decidim-initiatives/config/locales/ro-RO.yml b/decidim-initiatives/config/locales/ro-RO.yml
index 45b7264c173dc..6fe1c4a7e7c5f 100644
--- a/decidim-initiatives/config/locales/ro-RO.yml
+++ b/decidim-initiatives/config/locales/ro-RO.yml
@@ -1,7 +1,9 @@
+---
 ro:
   activemodel:
     attributes:
       initiative:
+        decidim_scope_id: Domeniu de interes
         decidim_user_group_id: Autor
         description: Descriere
         offline_votes: Semnături în persoană
@@ -24,6 +26,7 @@ ro:
         banner_image: Imagine banner
         child_scope_threshold_enabled: Activează semnăturile pentru domeniul de interes copil
         collect_user_extra_fields: Colectarea datelor cu caracter personal ale participantului la semnătură
+        comments_enabled: Comentarii activate
         custom_signature_end_date_enabled: Permite autorilor să aleagă sfârșitul perioadei de colectare a semnăturilor
         description: Descriere
         document_number_authorization_handler: Autorizare pentru verificarea numărului documentului pe semnături
@@ -35,6 +38,8 @@ ro:
         title: Titlu
         undo_online_signatures_enabled: Permite participanților să își anuleze semnăturile online
         validate_sms_code_on_votes: Adaugă etapa validării codului SMS la procesul de semnare
+      initiatives_type_scope:
+        decidim_scopes_id: Domenii de interes
       initiatives_vote:
         date_of_birth: Data naÅŸterii
         document_number: Număr document
@@ -54,10 +59,6 @@ ro:
               title: Titlul nu ar trebui să fie gol
   activerecord:
     models:
-      decidim/initiative:
-        one: Inițiativă
-        few: Initații
-        other: Initații
       decidim/initiative_comittee:
         one: Comitet
         few: Grupuri
diff --git a/decidim-initiatives/config/locales/ru.yml b/decidim-initiatives/config/locales/ru.yml
index 03e2a3c3cd6d6..82f2d938639cb 100644
--- a/decidim-initiatives/config/locales/ru.yml
+++ b/decidim-initiatives/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -26,11 +27,6 @@ ru:
         name: Полное им�
   activerecord:
     models:
-      decidim/initiative:
-        one: Почин
-        few: Почина
-        many: Починов
-        other: Починов
       decidim/initiative_comittee:
         one: Рабоча� группа
         few: Рабочих группы
diff --git a/decidim-initiatives/config/locales/sk.yml b/decidim-initiatives/config/locales/sk.yml
index f587effa06708..9301d7b8c2b5e 100644
--- a/decidim-initiatives/config/locales/sk.yml
+++ b/decidim-initiatives/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -40,11 +41,6 @@ sk:
         name: Kompletné meno
   activerecord:
     models:
-      decidim/initiative:
-        one: Iniciatíva
-        few: Iniciatívy
-        many: Iniciatívy
-        other: Iniciatívy
       decidim/initiative_comittee:
         one: Komisia
         few: Komisie
diff --git a/decidim-initiatives/config/locales/sl.yml b/decidim-initiatives/config/locales/sl.yml
index 8900e7e2d7e25..156798eb8de94 100644
--- a/decidim-initiatives/config/locales/sl.yml
+++ b/decidim-initiatives/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-initiatives/config/locales/sv.yml b/decidim-initiatives/config/locales/sv.yml
index 78da502ce9813..3ab2a37af9f37 100644
--- a/decidim-initiatives/config/locales/sv.yml
+++ b/decidim-initiatives/config/locales/sv.yml
@@ -1,9 +1,14 @@
+---
 sv:
   activemodel:
     attributes:
       initiative:
+        answer: Svar
+        area_id: Område
+        decidim_scope_id: Omfång
         decidim_user_group_id: Författare
         description: Beskrivning
+        hashtag: Hashtag
         offline_votes: Fysiska underskrifter
         scope_id: Omfång
         signature_end_date: Insamling av underskrifter avslutas
@@ -15,8 +20,11 @@ sv:
           online: Online
         state: Status
         title: Titel
+        type_id: Typ
       initiatives_committee_member:
         user: Kommittémedlem
+      initiatives_settings:
+        initiatives_order: Ordning
       initiatives_type:
         area_enabled: Gör det möjligt för författare att välja området för deras initiativ
         attachments_enabled: Aktivera bilagor
@@ -33,6 +41,8 @@ sv:
         title: Titel
         undo_online_signatures_enabled: Tillåt deltagare att ångra sina online-underskrifter
         validate_sms_code_on_votes: Lägg till SMS-validering till signeringsprocessen
+      initiatives_type_scope:
+        decidim_scopes_id: Omfång
       initiatives_vote:
         date_of_birth: Födelsedatum
         document_number: Dokumentnummer
@@ -52,9 +62,6 @@ sv:
               title: Titeln bör inte vara tom
   activerecord:
     models:
-      decidim/initiative:
-        one: Intitiativ
-        other: Initiativ
       decidim/initiative_comittee:
         one: Kommitté
         other: Kommittéer
@@ -87,6 +94,7 @@ sv:
         components: Komponenter
         information: Information
         initiatives: Initiativ
+        initiatives_settings: Inställningar
         initiatives_types: Initiativtyper
         moderations: Moderering
       models:
@@ -199,6 +207,7 @@ sv:
             max_results: Högsta antal element att visa
             order:
               default: Standard (Äldste)
+              label: 'Sortera efter:'
               most_recent: Senaste
         exports:
           initiatives: Initiativ
@@ -230,6 +239,12 @@ sv:
           update:
             error: Ett fel har inträffat
             success: Initiativet har uppdaterats
+        initiatives_settings:
+          edit:
+            update: Uppdatera
+          form:
+            comments: Mest kommenterade
+            random: Slumpmässigt
         initiatives_type_scopes:
           create:
             error: Ett fel har inträffat
diff --git a/decidim-initiatives/config/locales/tr-TR.yml b/decidim-initiatives/config/locales/tr-TR.yml
index ec3faa8cef8ce..81d3a10f3d97f 100644
--- a/decidim-initiatives/config/locales/tr-TR.yml
+++ b/decidim-initiatives/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -54,9 +55,6 @@ tr:
               title: Başlık boş olamaz
   activerecord:
     models:
-      decidim/initiative:
-        one: Ä°nisiyatif
-        other: Initatives
       decidim/initiative_comittee:
         one: Komitesi
         other: Kurullar
diff --git a/decidim-initiatives/config/locales/uk.yml b/decidim-initiatives/config/locales/uk.yml
index ebc3491b4bb37..5dac6e0d492d3 100644
--- a/decidim-initiatives/config/locales/uk.yml
+++ b/decidim-initiatives/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -26,11 +27,6 @@ uk:
         name: Повне ім'�
   activerecord:
     models:
-      decidim/initiative:
-        one: Почин
-        few: Почини
-        many: Починів
-        other: Починів
       decidim/initiative_comittee:
         one: Робочий гурт
         few: Робочих гурти
diff --git a/decidim-initiatives/config/locales/zh-CN.yml b/decidim-initiatives/config/locales/zh-CN.yml
index 10134b9cda1a6..06cba28db1712 100644
--- a/decidim-initiatives/config/locales/zh-CN.yml
+++ b/decidim-initiatives/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -54,8 +55,6 @@ zh-CN:
               title: 标题�能为空
   activerecord:
     models:
-      decidim/initiative:
-        other: Initatives
       decidim/initiative_comittee:
         other: 我好
       decidim/initiative_vote:
diff --git a/decidim-initiatives/db/migrate/20220518053612_add_comments_enabled_to_initiative_types.rb b/decidim-initiatives/db/migrate/20220518053612_add_comments_enabled_to_initiative_types.rb
new file mode 100644
index 0000000000000..97ce6cbb3fc3f
--- /dev/null
+++ b/decidim-initiatives/db/migrate/20220518053612_add_comments_enabled_to_initiative_types.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCommentsEnabledToInitiativeTypes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_initiatives_types, :comments_enabled, :boolean, null: false, default: true
+  end
+end
diff --git a/decidim-initiatives/db/migrate/20220527130640_create_decidim_initiatives_settings.rb b/decidim-initiatives/db/migrate/20220527130640_create_decidim_initiatives_settings.rb
new file mode 100644
index 0000000000000..8b350e357dfef
--- /dev/null
+++ b/decidim-initiatives/db/migrate/20220527130640_create_decidim_initiatives_settings.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimInitiativesSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_initiatives_settings do |t|
+      t.string :initiatives_order, default: "random"
+      t.references :decidim_organization, foreign_key: true, index: true
+    end
+  end
+end
diff --git a/decidim-initiatives/decidim-initiatives.gemspec b/decidim-initiatives/decidim-initiatives.gemspec
index e7b110dffcb53..3d38bf7203d1e 100644
--- a/decidim-initiatives/decidim-initiatives.gemspec
+++ b/decidim-initiatives/decidim-initiatives.gemspec
@@ -10,11 +10,11 @@ Gem::Specification.new do |s|
   s.email = ["jsperezg@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-initiatives"
   s.summary = "Decidim initiatives module"
-  s.description = "Citizen initiatives plugin for decidim."
+  s.description = "Participants initiatives plugin for decidim."
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim::Initiatives.version
   s.add_dependency "decidim-verifications", Decidim::Initiatives.version
   s.add_dependency "origami", "~> 2.1"
-  s.add_dependency "virtus-multiparams", "~> 0.1"
+  s.add_dependency "rexml", "~> 3.2.5" # Required for Origami gem to work with Ruby 3.0.0+
   s.add_dependency "wicked", "~> 1.3"
   s.add_dependency "wicked_pdf", "~> 2.1"
   s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
diff --git a/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb b/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb
index 901a6cecd8f90..965cb42816494 100644
--- a/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/admin_engine.rb
@@ -19,6 +19,8 @@ class AdminEngine < ::Rails::Engine
           resources :initiatives_type_scopes, except: [:index, :show]
         end
 
+        resources :initiatives_settings, only: [:edit, :update], controller: "initiatives_settings"
+
         resources :initiatives, only: [:index, :edit, :update], param: :slug do
           member do
             get :send_to_technical_validation
@@ -89,7 +91,12 @@ class AdminEngine < ::Rails::Engine
                         icon_name: "chat",
                         position: 2.4,
                         active: is_active_link?(decidim_admin_initiatives.initiatives_path) ||
-                                is_active_link?(decidim_admin_initiatives.initiatives_types_path),
+                                is_active_link?(decidim_admin_initiatives.initiatives_types_path) ||
+                                is_active_link?(
+                                  decidim_admin_initiatives.edit_initiatives_setting_path(
+                                    Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+                                  )
+                                ),
                         if: allowed_to?(:enter, :space_area, space_name: :initiatives)
         end
       end
@@ -160,6 +167,20 @@ class AdminEngine < ::Rails::Engine
                         decidim_admin_initiatives.initiatives_types_path,
                         active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
                         if: allowed_to?(:manage, :initiative_type)
+
+          menu.add_item :initiatives_settings,
+                        I18n.t("menu.initiatives_settings", scope: "decidim.admin"),
+                        decidim_admin_initiatives.edit_initiatives_setting_path(
+                          Decidim::InitiativesSettings.find_or_create_by!(
+                            organization: current_organization
+                          )
+                        ),
+                        active: is_active_link?(
+                          decidim_admin_initiatives.edit_initiatives_setting_path(
+                            Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+                          )
+                        ),
+                        if: allowed_to?(:update, :initiatives_settings)
         end
       end
     end
diff --git a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
index d932e72b46817..485abb9c069e2 100644
--- a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb
@@ -61,7 +61,7 @@
         title: Decidim::Faker::Localized.sentence(word_count: 5),
         description: Decidim::Faker::Localized.sentence(word_count: 25),
         organization: organization,
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -90,7 +90,7 @@
         signature_type: "online",
         signature_start_date: Date.current - 7.days,
         signature_end_date: Date.current + 7.days,
-        published_at: Time.current - 7.days,
+        published_at: 7.days.ago,
         author: Decidim::User.reorder(Arel.sql("RANDOM()")).first,
         organization: organization
       }
@@ -112,7 +112,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: initiative,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
diff --git a/decidim-initiatives/lib/decidim/initiatives/test/factories.rb b/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
index f020a9f5297da..6d785dff40a57 100644
--- a/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/test/factories.rb
@@ -8,7 +8,14 @@
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
+    # Keep banner_image after organization
+    banner_image do
+      ActiveStorage::Blob.create_and_upload!(
+        io: File.open(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")),
+        filename: "city2.jpeg",
+        content_type: "image/jpeg"
+      ).signed_id
+    end
     signature_type { :online }
     attachments_enabled { true }
     undo_online_signatures_enabled { true }
@@ -18,6 +25,11 @@
     minimum_committee_members { 3 }
     child_scope_threshold_enabled { false }
     only_global_scope_enabled { false }
+    comments_enabled { true }
+
+    trait :with_comments_disabled do
+      comments_enabled { false }
+    end
 
     trait :attachments_enabled do
       attachments_enabled { true }
@@ -264,4 +276,25 @@
       state { "rejected" }
     end
   end
+
+  factory :initiatives_settings, class: "Decidim::InitiativesSettings" do
+    initiatives_order { "random" }
+    organization
+
+    trait :most_recent do
+      initiatives_order { "date" }
+    end
+
+    trait :most_signed do
+      initiatives_order { "signatures" }
+    end
+
+    trait :most_commented do
+      initiatives_order { "comments" }
+    end
+
+    trait :most_recently_published do
+      initiatives_order { "publication_date" }
+    end
+  end
 end
diff --git a/decidim-initiatives/lib/decidim/initiatives/version.rb b/decidim-initiatives/lib/decidim/initiatives/version.rb
index 54ecb8b41256a..8de73e5792543 100644
--- a/decidim-initiatives/lib/decidim/initiatives/version.rb
+++ b/decidim-initiatives/lib/decidim/initiatives/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-initiatives/lib/gem_overrides/origami/date.rb b/decidim-initiatives/lib/gem_overrides/origami/date.rb
new file mode 100644
index 0000000000000..fb2141395d09e
--- /dev/null
+++ b/decidim-initiatives/lib/gem_overrides/origami/date.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: false
+
+module Origami
+  class Date < LiteralString
+    def self.parse(str)
+      #:nodoc:
+      raise InvalidDateError, "Not a valid Date string" unless str =~ REGEXP_TOKEN
+
+      date =
+        {
+          year: $~['year'].to_i
+        }
+
+      date[:month] = $~['month'].to_i if $~['month']
+      date[:day] = $~['day'].to_i if $~['day']
+      date[:hour] = $~['hour'].to_i if $~['hour']
+      date[:min] = $~['min'].to_i if $~['min']
+      date[:sec] = $~['sec'].to_i if $~['sec']
+
+      if %w[+ -].include?($~['ut'])
+        utc_offset = $~['ut_hour_off'].to_i * 3600 + $~['ut_min_off'].to_i * 60
+        utc_offset = -utc_offset if $~['ut'] == '-'
+
+        date[:utc_offset] = utc_offset
+      end
+
+      Origami::Date.new(**date)
+    end
+
+    def self.now
+      now = Time.now.utc
+
+      date =
+        {
+          year: now.strftime("%Y").to_i,
+          month: now.strftime("%m").to_i,
+          day: now.strftime("%d").to_i,
+          hour: now.strftime("%H").to_i,
+          min: now.strftime("%M").to_i,
+          sec: now.strftime("%S").to_i,
+          utc_offset: now.utc_offset
+        }
+
+      Origami::Date.new(**date)
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell_spec.rb b/decidim-initiatives/spec/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell_spec.rb
index d0ac22aa2d3dd..3de82f69fc5bc 100644
--- a/decidim-initiatives/spec/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell_spec.rb
+++ b/decidim-initiatives/spec/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell_spec.rb
@@ -8,7 +8,7 @@
   let(:organization) { create(:organization) }
   let(:content_block) { create :content_block, organization: organization, manifest_name: :highlighted_initiatives, scope_name: :homepage, settings: settings }
   let!(:initiatives) { create_list :initiative, 5, organization: organization }
-  let!(:most_recent_initiative) { create :initiative, published_at: Time.current + 1.day, organization: organization }
+  let!(:most_recent_initiative) { create :initiative, published_at: 1.day.from_now, organization: organization }
   let(:settings) { {} }
 
   let(:highlighted_initiatives) { subject.call.find("#highlighted-initiatives") }
diff --git a/decidim-initiatives/spec/cells/decidim/initiatives/initiative_m_cell_spec.rb b/decidim-initiatives/spec/cells/decidim/initiatives/initiative_m_cell_spec.rb
index 30f00af0ef157..5eb23092cf70d 100644
--- a/decidim-initiatives/spec/cells/decidim/initiatives/initiative_m_cell_spec.rb
+++ b/decidim-initiatives/spec/cells/decidim/initiatives/initiative_m_cell_spec.rb
@@ -11,7 +11,8 @@ module Decidim::Initiatives
     let(:my_cell) { cell("decidim/initiatives/initiative_m", initiative, context: { show_space: show_space }) }
     let(:cell_html) { my_cell.call }
     let(:state) { :published }
-    let!(:initiative) { create(:initiative, hashtag: "my_hashtag", state: state) }
+    let(:organization) { create(:organization) }
+    let!(:initiative) { create(:initiative, organization: organization, hashtag: "my_hashtag", state: state) }
     let(:user) { create :user, organization: initiative.organization }
 
     before do
@@ -76,6 +77,19 @@ module Decidim::Initiatives
 
         it_behaves_like "card does not show signatures"
       end
+
+      context "when comments are disabled on inititiative type" do
+        let!(:initiative) { create(:initiative, hashtag: "my_hashtag", state: state) }
+
+        before do
+          allow(initiative.type).to receive(:comments_enabled?).and_return(false)
+        end
+
+        it "does not render comments" do
+          expect(subject).not_to have_css(".comments_count_status")
+          expect(subject).not_to have_content("0 comments")
+        end
+      end
     end
   end
 end
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
index 1c672da9dbbac..cc5aaf4a9bdf2 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/admin/create_initiative_type_spec.rb
@@ -14,6 +14,7 @@ module Admin
 
         describe "Validation failure" do
           let(:organization) { create(:organization) }
+          let(:user) { create(:user, organization: organization) }
           let!(:initiative_type) do
             build(:initiatives_type, organization: organization)
           end
@@ -27,7 +28,7 @@ module Admin
             ActiveModel::Errors.new(initiative_type)
                                .tap { |e| e.add(:banner_image, "upload error") }
           end
-          let(:command) { described_class.new(form) }
+          let(:command) { described_class.new(form, user) }
 
           it "broadcasts invalid" do
             expect(InitiativesType).to receive(:new).at_least(:once).and_return(initiative_type)
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
index 4fe2063af91e8..bea0e721b7707 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiative_type_spec.rb
@@ -14,14 +14,16 @@ module Admin
 
         context "when validation error" do
           let(:organization) { create(:organization) }
-          let!(:initiative_type) { create(:initiatives_type, organization: organization) }
+          let(:user) { create(:user, organization: organization) }
+          let!(:initiative_type) { create(:initiatives_type, organization: organization, banner_image: banner_image) }
+          let(:banner_image) { upload_test_file(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")) }
           let(:form) do
             form_klass
               .from_model(initiative_type)
               .with_context(current_organization: organization)
           end
 
-          let(:command) { described_class.new(initiative_type, form) }
+          let(:command) { described_class.new(initiative_type, form, user) }
 
           it "broadcasts invalid" do
             expect(initiative_type).to receive(:valid?)
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiatives_settings_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiatives_settings_spec.rb
new file mode 100644
index 0000000000000..2983401047eb7
--- /dev/null
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/admin/update_initiatives_settings_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Initiatives
+    module Admin
+      describe UpdateInitiativesSettings do
+        subject { described_class.new(initiatives_settings, form) }
+
+        let(:organization) { create :organization }
+        let(:user) { create :user, :admin, :confirmed, organization: organization }
+        let(:initiatives_settings) { create :initiatives_settings, organization: organization }
+        let(:initiatives_order) { "date" }
+        let(:form) do
+          double(
+            invalid?: invalid,
+            current_user: user,
+            initiatives_order: initiatives_order
+          )
+        end
+        let(:invalid) { false }
+
+        context "when the form is not valid" do
+          let(:invalid) { true }
+
+          it "is not valid" do
+            expect { subject.call }.to broadcast(:invalid)
+          end
+        end
+
+        context "when the form is valid" do
+          it "broadcasts ok" do
+            expect { subject.call }.to broadcast(:ok)
+          end
+
+          it "updates the initiatives settings" do
+            subject.call
+            expect(initiatives_settings.initiatives_order).to eq(initiatives_order)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/approve_membership_request_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/approve_membership_request_spec.rb
index d27031f80c404..b4f5180c3e228 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/approve_membership_request_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/approve_membership_request_spec.rb
@@ -31,7 +31,7 @@ module Initiatives
           command.call
         end
 
-        it "approves membership requests " do
+        it "approves membership requests" do
           expect do
             command.call
           end.to change(membership_request, :state).from("requested").to("accepted")
diff --git a/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb b/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
index 5d7d10c399f63..cbf124e67b621 100644
--- a/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
+++ b/decidim-initiatives/spec/commands/decidim/initiatives/update_initiative_spec.rb
@@ -44,7 +44,7 @@ module Initiatives
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -75,8 +75,8 @@ module Initiatives
           context "when attachments are allowed" do
             let(:uploaded_files) do
               [
-                Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf"),
-                Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
+                upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")),
+                upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf"))
               ]
             end
 
@@ -113,13 +113,13 @@ module Initiatives
           context "when attachments are allowed and file is invalid" do
             let(:uploaded_files) do
               [
-                Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-                Decidim::Dev.test_file("verify_user_groups.csv", "text/csv")
+                upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")),
+                upload_test_file(Decidim::Dev.test_file("verify_user_groups.csv", "text/csv"))
               ]
             end
 
             it "does not create atachments for the initiative" do
-              expect { command.call }.to change(Decidim::Attachment, :count).by(0)
+              expect { command.call }.not_to change(Decidim::Attachment, :count)
             end
 
             it "broadcasts invalid" do
diff --git a/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_settings_controller_spec.rb b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_settings_controller_spec.rb
new file mode 100644
index 0000000000000..8b249ef85f518
--- /dev/null
+++ b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_settings_controller_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Initiatives
+    module Admin
+      describe InitiativesSettingsController, type: :controller do
+        routes { Decidim::Initiatives::AdminEngine.routes }
+
+        let(:organization) { create(:organization) }
+        let(:current_user) { create(:user, :confirmed, :admin, organization: organization) }
+        let!(:initiatives_settings) { create(:initiatives_settings, organization: organization) }
+
+        before do
+          request.env["decidim.current_organization"] = organization
+          sign_in current_user
+        end
+
+        describe "PATCH update" do
+          let(:initiatives_settings_params) do
+            {
+              initiatives_order: initiatives_settings.initiatives_order
+            }
+          end
+
+          it "updates the initiatives settings" do
+            patch :update, params: { id: initiatives_settings.id, initiatives_settings: initiatives_settings_params }
+
+            expect(response).to redirect_to edit_initiatives_setting_path
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller_spec.rb b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller_spec.rb
index ad4cfa277ce76..7e9584aa74a85 100644
--- a/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller_spec.rb
+++ b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller_spec.rb
@@ -87,7 +87,7 @@ module Admin
                        initiatives_type_id: initiative_type.id,
                        initiatives_type_scope: invalid_attributes
                      }
-              end.to change(InitiativesTypeScope, :count).by(0)
+              end.not_to change(InitiativesTypeScope, :count)
             end
           end
 
@@ -216,7 +216,7 @@ module Admin
                          initiatives_type_id: initiative_type.id,
                          id: initiative_type_scope.to_param
                        }
-              end.to change(InitiativesTypeScope, :count).by(0)
+              end.not_to change(InitiativesTypeScope, :count)
             end
           end
 
diff --git a/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_types_controller_spec.rb b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_types_controller_spec.rb
index 8ef1a3cb8e043..7e1e339a53ecc 100644
--- a/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_types_controller_spec.rb
+++ b/decidim-initiatives/spec/controllers/decidim/initiatives/admin/initiatives_types_controller_spec.rb
@@ -94,7 +94,7 @@ module Admin
             it "fails creation" do
               expect do
                 post :create, params: { initiatives_type: invalid_attributes }
-              end.to change(InitiativesType, :count).by(0)
+              end.not_to change(InitiativesType, :count)
             end
           end
 
@@ -201,7 +201,19 @@ module Admin
 
               expect do
                 delete :destroy, params: { id: initiative_type.id }
-              end.to change(InitiativesType, :count).by(0)
+              end.not_to change(InitiativesType, :count)
+            end
+
+            it "traces the action", versioning: true do
+              expect(Decidim.traceability)
+                .to receive(:perform_action!)
+                .with("delete", initiative_type, admin_user)
+                .and_call_original
+
+              expect { delete :destroy, params: { id: initiative_type.id } }.to change(Decidim::ActionLog, :count)
+              action_log = Decidim::ActionLog.last
+              expect(action_log.action).to eq("delete")
+              expect(action_log.version).to be_present
             end
           end
 
diff --git a/decidim-initiatives/spec/controllers/decidim/initiatives/committee_requests_controller_spec.rb b/decidim-initiatives/spec/controllers/decidim/initiatives/committee_requests_controller_spec.rb
index f90cdf8ca1483..40a83295c58b6 100644
--- a/decidim-initiatives/spec/controllers/decidim/initiatives/committee_requests_controller_spec.rb
+++ b/decidim-initiatives/spec/controllers/decidim/initiatives/committee_requests_controller_spec.rb
@@ -38,7 +38,7 @@ module Initiatives
 
             expect do
               get :spawn, params: { initiative_slug: initiative.slug }
-            end.to change(InitiativesCommitteeMember, :count).by(0)
+            end.not_to change(InitiativesCommitteeMember, :count)
           end
         end
 
@@ -48,7 +48,7 @@ module Initiatives
           it "Membership request is not created" do
             expect do
               get :spawn, params: { initiative_slug: published_initiative.slug }
-            end.to change(InitiativesCommitteeMember, :count).by(0)
+            end.not_to change(InitiativesCommitteeMember, :count)
           end
         end
       end
diff --git a/decidim-initiatives/spec/controllers/decidim/initiatives/initiatives_controller_spec.rb b/decidim-initiatives/spec/controllers/decidim/initiatives/initiatives_controller_spec.rb
index 652ebe0d86388..e7736c98ec5bf 100644
--- a/decidim-initiatives/spec/controllers/decidim/initiatives/initiatives_controller_spec.rb
+++ b/decidim-initiatives/spec/controllers/decidim/initiatives/initiatives_controller_spec.rb
@@ -20,6 +20,18 @@
       expect(subject.helpers.initiatives).not_to include(created_initiative)
     end
 
+    context "when no order is given" do
+      let(:voted_initiative) { create(:initiative, organization: organization) }
+      let!(:vote) { create(:initiative_user_vote, initiative: voted_initiative) }
+      let!(:initiatives_settings) { create(:initiatives_settings, :most_signed) }
+
+      it "return in the default order" do
+        get :index, params: { order: "most_voted" }
+
+        expect(subject.helpers.initiatives.first).to eq(voted_initiative)
+      end
+    end
+
     context "when order by most_voted" do
       let(:voted_initiative) { create(:initiative, organization: organization) }
       let!(:vote) { create(:initiative_user_vote, initiative: voted_initiative) }
@@ -92,12 +104,16 @@
   end
 
   describe "Edit initiative as promoter" do
+    include ActionView::Helpers::TextHelper
+
     before do
       sign_in created_initiative.author, scope: :user
     end
 
     let(:valid_attributes) do
       attrs = attributes_for(:initiative, organization: organization)
+      attrs[:title] = truncate(translated(attrs[:title]), length: 150, omission: "")
+      attrs[:description] = Decidim::HtmlTruncation.new(translated(attrs[:description]), max_length: 150, tail: "").perform
       attrs[:signature_end_date] = I18n.l(attrs[:signature_end_date], format: :decidim_short)
       attrs[:signature_start_date] = I18n.l(attrs[:signature_start_date], format: :decidim_short)
       attrs[:type_id] = created_initiative.type.id
diff --git a/decidim-initiatives/spec/forms/admin/initiative_answer_form_spec.rb b/decidim-initiatives/spec/forms/admin/initiative_answer_form_spec.rb
index 36afeac2f8200..9ae33f413e718 100644
--- a/decidim-initiatives/spec/forms/admin/initiative_answer_form_spec.rb
+++ b/decidim-initiatives/spec/forms/admin/initiative_answer_form_spec.rb
@@ -35,11 +35,11 @@ module Admin
           context "when created" do
             let(:state) { "created" }
 
-            it { is_expected.to eq(false) }
+            it { is_expected.to be(false) }
           end
 
           context "when published" do
-            it { is_expected.to eq(true) }
+            it { is_expected.to be(true) }
           end
         end
       end
diff --git a/decidim-initiatives/spec/forms/admin/initiative_form_spec.rb b/decidim-initiatives/spec/forms/admin/initiative_form_spec.rb
index 6d0f9ce7668d2..ed09ee13c9599 100644
--- a/decidim-initiatives/spec/forms/admin/initiative_form_spec.rb
+++ b/decidim-initiatives/spec/forms/admin/initiative_form_spec.rb
@@ -98,7 +98,7 @@ module Admin
           context "when created" do
             let(:state) { "created" }
 
-            it { is_expected.to eq(true) }
+            it { is_expected.to be(true) }
           end
 
           context "when validating" do
@@ -107,16 +107,16 @@ module Admin
             context "and user current_user is admin" do
               let(:user) { create(:user, :admin, organization: organization) }
 
-              it { is_expected.to eq(true) }
+              it { is_expected.to be(true) }
             end
 
             context "and current_user is not admin" do
-              it { is_expected.to eq(false) }
+              it { is_expected.to be(false) }
             end
           end
 
           context "when any other state" do
-            it { is_expected.to eq(false) }
+            it { is_expected.to be(false) }
           end
         end
 
diff --git a/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb b/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
index 6861c9b41744d..15c9bb0bb5989 100644
--- a/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
+++ b/decidim-initiatives/spec/forms/admin/initiative_type_form_spec.rb
@@ -13,6 +13,7 @@ module Admin
         let(:title) { Decidim::Faker::Localized.sentence(word_count: 5) }
         let(:promoting_committee_enabled) { true }
         let(:minimum_committee_members) { 5 }
+        let(:comments_enabled) { true }
         let(:attributes) do
           {
             title: title,
@@ -22,6 +23,7 @@ module Admin
             custom_signature_end_date_enabled: true,
             undo_online_signatures_enabled: false,
             area_enabled: false,
+            comments_enabled: comments_enabled,
             promoting_committee_enabled: promoting_committee_enabled,
             minimum_committee_members: minimum_committee_members,
             banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
@@ -59,6 +61,12 @@ module Admin
             expect(subject.minimum_committee_members).to eq(0)
           end
         end
+
+        context "when comments are disabled" do
+          let(:comments_enabled) { false }
+
+          it { is_expected.to be_valid }
+        end
       end
     end
   end
diff --git a/decidim-initiatives/spec/forms/admin/initiatives_settings_form_spec.rb b/decidim-initiatives/spec/forms/admin/initiatives_settings_form_spec.rb
new file mode 100644
index 0000000000000..6593371cab516
--- /dev/null
+++ b/decidim-initiatives/spec/forms/admin/initiatives_settings_form_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Initiatives
+    module Admin
+      describe InitiativesSettingsForm do
+        subject { described_class.from_params(attributes).with_context(current_organization: organization) }
+
+        let(:organization) { create :organization }
+        let(:initiatives_order) { "date" }
+
+        let(:attributes) do
+          {
+            "initiatives_order" => initiatives_order
+          }
+        end
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/forms/initiative_form_spec.rb b/decidim-initiatives/spec/forms/initiative_form_spec.rb
index 4c169cb24bb21..6173f58ceff3e 100644
--- a/decidim-initiatives/spec/forms/initiative_form_spec.rb
+++ b/decidim-initiatives/spec/forms/initiative_form_spec.rb
@@ -12,11 +12,11 @@ module Initiatives
       let(:scope) { create(:initiatives_type_scope, type: initiatives_type) }
       let(:attachment_params) { nil }
 
-      let(:title) { Decidim::Faker::Localized.sentence(word_count: 5) }
+      let(:title) { ::Faker::Lorem.sentence(word_count: 5) }
       let(:attributes) do
         {
           title: title,
-          description: Decidim::Faker::Localized.sentence(word_count: 25),
+          description: ::Faker::Lorem.sentence(word_count: 25),
           type_id: initiatives_type.id,
           scope_id: scope&.scope&.id,
           signature_type: "offline",
@@ -105,7 +105,7 @@ module Initiatives
 
           let(:initiative) { create(:initiative, organization: organization, state: "created", scoped_type: scope) }
 
-          it { is_expected.to eq(true) }
+          it { is_expected.to be(true) }
         end
 
         context "when current_user is admin" do
@@ -113,13 +113,13 @@ module Initiatives
 
           let(:user) { create(:user, :admin) }
 
-          it { is_expected.to eq(true) }
+          it { is_expected.to be(true) }
         end
 
         context "when user is not admin and initiative is not created the area is not updatable" do
           subject { described_class.from_model(initiative).with_context(context).area_updatable? }
 
-          it { is_expected.to eq(false) }
+          it { is_expected.to be(false) }
         end
       end
 
@@ -129,7 +129,7 @@ module Initiatives
 
           let(:state) { "created" }
 
-          it { is_expected.to eq(true) }
+          it { is_expected.to be(true) }
         end
 
         context "when not yet created" do
@@ -137,13 +137,13 @@ module Initiatives
 
           let(:state) { nil }
 
-          it { is_expected.to eq(true) }
+          it { is_expected.to be(true) }
         end
 
         context "when any other state" do
           subject { described_class.from_model(initiative).with_context(context).signature_type_updatable? }
 
-          it { is_expected.to eq(false) }
+          it { is_expected.to be(false) }
         end
       end
 
@@ -169,7 +169,7 @@ module Initiatives
           it "adds an error to the `:attachment` field" do
             expect(subject).not_to be_valid
             expect(subject.errors.full_messages).to match_array(["Title can't be blank", "Attachment Needs to be reattached"])
-            expect(subject.errors.keys).to match_array([:title, :attachment])
+            expect(subject.errors.attribute_names).to match_array([:title, :attachment])
           end
         end
       end
diff --git a/decidim-initiatives/spec/forms/vote_form_spec.rb b/decidim-initiatives/spec/forms/vote_form_spec.rb
index 55d366a8cc23e..c9a5ec583c72f 100644
--- a/decidim-initiatives/spec/forms/vote_form_spec.rb
+++ b/decidim-initiatives/spec/forms/vote_form_spec.rb
@@ -11,12 +11,12 @@ module Initiatives
 
       let(:organization) { create(:organization) }
       let!(:city) { create(:scope, organization: organization) }
-      let!(:district_1) { create(:subscope, parent: city) }
-      let!(:district_2) { create(:subscope, parent: city) }
-      let!(:neighbourhood_1) { create(:subscope, parent: district_1) }
-      let!(:neighbourhood_2) { create(:subscope, parent: district_2) }
-      let!(:neighbourhood_3) { create(:subscope, parent: district_1) }
-      let!(:neighbourhood_4) { create(:subscope, parent: district_2) }
+      let!(:district1) { create(:subscope, parent: city) }
+      let!(:district2) { create(:subscope, parent: city) }
+      let!(:neighbourhood1) { create(:subscope, parent: district1) }
+      let!(:neighbourhood2) { create(:subscope, parent: district2) }
+      let!(:neighbourhood3) { create(:subscope, parent: district1) }
+      let!(:neighbourhood4) { create(:subscope, parent: district2) }
       let!(:initiative_type) do
         create(
           :initiatives_type,
@@ -28,11 +28,11 @@ module Initiatives
       end
       let!(:global_initiative_type_scope) { create(:initiatives_type_scope, scope: nil, type: initiative_type) }
       let!(:city_initiative_type_scope) { create(:initiatives_type_scope, scope: city, type: initiative_type) }
-      let!(:district_1_initiative_type_scope) { create(:initiatives_type_scope, scope: district_1, type: initiative_type) }
-      let!(:district_2_initiative_type_scope) { create(:initiatives_type_scope, scope: district_2, type: initiative_type) }
-      let!(:neighbourhood_1_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood_1, type: initiative_type) }
-      let!(:neighbourhood_2_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood_2, type: initiative_type) }
-      let!(:neighbourhood_3_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood_3, type: initiative_type) }
+      let!(:district_1_initiative_type_scope) { create(:initiatives_type_scope, scope: district1, type: initiative_type) }
+      let!(:district_2_initiative_type_scope) { create(:initiatives_type_scope, scope: district2, type: initiative_type) }
+      let!(:neighbourhood_1_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood1, type: initiative_type) }
+      let!(:neighbourhood_2_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood2, type: initiative_type) }
+      let!(:neighbourhood_3_initiative_type_scope) { create(:initiatives_type_scope, scope: neighbourhood3, type: initiative_type) }
       let!(:authorization) do
         create(
           :authorization,
@@ -43,7 +43,7 @@ module Initiatives
           metadata: { document_number: document_number, postal_code: postal_code, scope_id: user_scope.id }
         )
       end
-      let(:user_scope) { district_1 }
+      let(:user_scope) { district1 }
       let(:scoped_type) { district_1_initiative_type_scope }
 
       let(:initiative) do
@@ -65,7 +65,7 @@ module Initiatives
         {
           name_and_surname: "James Morgan McGill",
           document_number: document_number,
-          date_of_birth: 40.years.ago,
+          date_of_birth: 40.years.ago.to_date,
           postal_code: postal_code
         }
       end
@@ -147,7 +147,7 @@ module Initiatives
               authorization.save!
             end
 
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
         end
 
@@ -190,7 +190,7 @@ module Initiatives
           let(:scoped_type) { district_1_initiative_type_scope }
 
           it "returns the scope descendants" do
-            expect(form.authorized_scope_candidates).to match_array([neighbourhood_1, neighbourhood_3, district_1])
+            expect(form.authorized_scope_candidates).to match_array([neighbourhood1, neighbourhood3, district1])
           end
         end
       end
@@ -223,15 +223,15 @@ module Initiatives
               let(:child_scope_threshold_enabled) { true }
 
               context "when the user scope has children" do
-                let(:user_scope) { district_1 }
+                let(:user_scope) { district1 }
 
-                it { is_expected.to match_array([nil, city, district_1]) }
+                it { is_expected.to match_array([nil, city, district1]) }
               end
 
               context "when the user scope is a leaf" do
-                let(:user_scope) { neighbourhood_1 }
+                let(:user_scope) { neighbourhood1 }
 
-                it { is_expected.to match_array([nil, city, district_1, neighbourhood_1]) }
+                it { is_expected.to match_array([nil, city, district1, neighbourhood1]) }
               end
             end
 
@@ -249,22 +249,22 @@ module Initiatives
               let(:child_scope_threshold_enabled) { true }
 
               context "when the user scope has children" do
-                let(:user_scope) { district_1 }
+                let(:user_scope) { district1 }
 
-                it { is_expected.to match_array([district_1]) }
+                it { is_expected.to match_array([district1]) }
               end
 
               context "when the user scope is a leaf" do
-                let(:user_scope) { neighbourhood_1 }
+                let(:user_scope) { neighbourhood1 }
 
-                it { is_expected.to match_array([district_1, neighbourhood_1]) }
+                it { is_expected.to match_array([district1, neighbourhood1]) }
               end
             end
 
             context "when child scope voting is disabled" do
               let(:child_scope_threshold_enabled) { false }
 
-              it { is_expected.to eq([district_1]) }
+              it { is_expected.to eq([district1]) }
             end
           end
         end
diff --git a/decidim-initiatives/spec/lib/query_extensions_spec.rb b/decidim-initiatives/spec/lib/query_extensions_spec.rb
index a71931906b3c5..1521d83cf72bf 100644
--- a/decidim-initiatives/spec/lib/query_extensions_spec.rb
+++ b/decidim-initiatives/spec/lib/query_extensions_spec.rb
@@ -9,16 +9,16 @@ module Initiatives
       include_context "with a graphql class type"
 
       describe "initiativesTypes" do
-        let!(:initiatives_type_1) { create(:initiatives_type, organization: current_organization) }
-        let!(:initiatives_type_2) { create(:initiatives_type, organization: current_organization) }
-        let!(:initiatives_type_3) { create(:initiatives_type) }
+        let!(:initiatives_type1) { create(:initiatives_type, organization: current_organization) }
+        let!(:initiatives_type2) { create(:initiatives_type, organization: current_organization) }
+        let!(:initiatives_type3) { create(:initiatives_type) }
 
         let(:query) { %({ initiativesTypes { id }}) }
 
         it "returns all the groups" do
-          expect(response["initiativesTypes"]).to include("id" => initiatives_type_1.id.to_s)
-          expect(response["initiativesTypes"]).to include("id" => initiatives_type_2.id.to_s)
-          expect(response["initiativesTypes"]).not_to include("id" => initiatives_type_3.id.to_s)
+          expect(response["initiativesTypes"]).to include("id" => initiatives_type1.id.to_s)
+          expect(response["initiativesTypes"]).to include("id" => initiatives_type2.id.to_s)
+          expect(response["initiativesTypes"]).not_to include("id" => initiatives_type3.id.to_s)
         end
       end
 
diff --git a/decidim-initiatives/spec/lib/tasks/decidim_initiatives_check_validating_spec.rb b/decidim-initiatives/spec/lib/tasks/decidim_initiatives_check_validating_spec.rb
index f0701d64de709..78377072fb374 100644
--- a/decidim-initiatives/spec/lib/tasks/decidim_initiatives_check_validating_spec.rb
+++ b/decidim-initiatives/spec/lib/tasks/decidim_initiatives_check_validating_spec.rb
@@ -14,7 +14,7 @@
   end
 
   context "when initiatives without changes" do
-    let(:initiative) { create(:initiative, :validating, updated_at: Time.current - 1.year) }
+    let(:initiative) { create(:initiative, :validating, updated_at: 1.year.ago) }
 
     it "Are marked as discarded" do
       expect(initiative.updated_at).to be < threshold
diff --git a/decidim-initiatives/spec/lib/tasks/decidim_initiatives_notify_progress_spec.rb b/decidim-initiatives/spec/lib/tasks/decidim_initiatives_notify_progress_spec.rb
index 317f676a445a6..c87963ea82228 100644
--- a/decidim-initiatives/spec/lib/tasks/decidim_initiatives_notify_progress_spec.rb
+++ b/decidim-initiatives/spec/lib/tasks/decidim_initiatives_notify_progress_spec.rb
@@ -32,7 +32,7 @@
     let(:initiative) do
       initiative = create(:initiative)
 
-      votes_needed = initiative.supports_required * (Decidim::Initiatives.first_notification_percentage / 100.0) + 1
+      votes_needed = (initiative.supports_required * (Decidim::Initiatives.first_notification_percentage / 100.0)) + 1
       initiative.online_votes["total"] = votes_needed
       initiative.save!
 
@@ -71,7 +71,7 @@
     let(:initiative) do
       initiative = create(:initiative, first_progress_notification_at: Time.current)
 
-      votes_needed = initiative.supports_required * (Decidim::Initiatives.second_notification_percentage / 100.0) + 1
+      votes_needed = (initiative.supports_required * (Decidim::Initiatives.second_notification_percentage / 100.0)) + 1
 
       initiative.online_votes["total"] = votes_needed
       initiative.save!
diff --git a/decidim-initiatives/spec/models/decidim/initiative_spec.rb b/decidim-initiatives/spec/models/decidim/initiative_spec.rb
index db9b38a873183..717f55ed2ff69 100644
--- a/decidim-initiatives/spec/models/decidim/initiative_spec.rb
+++ b/decidim-initiatives/spec/models/decidim/initiative_spec.rb
@@ -254,13 +254,13 @@ module Decidim
       context "when enough members" do
         before { create_list(:initiatives_committee_member, initiatives_type_minimum_committee_members, initiative: initiative) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when not enough members" do
         before { create_list(:initiatives_committee_member, initiatives_type_minimum_committee_members - 1, initiative: initiative) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
diff --git a/decidim-initiatives/spec/models/decidim/initiatives_settings_spec.rb b/decidim-initiatives/spec/models/decidim/initiatives_settings_spec.rb
new file mode 100644
index 0000000000000..19250855b2f76
--- /dev/null
+++ b/decidim-initiatives/spec/models/decidim/initiatives_settings_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe InitiativesSettings do
+    subject(:initiatives_settings) { create(:initiatives_settings) }
+
+    it { is_expected.to be_valid }
+
+    it "overwrites the log presenter" do
+      expect(described_class.log_presenter_class_for(:foo))
+        .to eq Decidim::Initiatives::AdminLog::InitiativesSettingsPresenter
+    end
+
+    context "without organization" do
+      before do
+        initiatives_settings.organization = nil
+      end
+
+      it { is_expected.to be_invalid }
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/permissions/decidim/initiatives/admin/permissions_spec.rb b/decidim-initiatives/spec/permissions/decidim/initiatives/admin/permissions_spec.rb
index 3cfa82d8e7584..340a6c9c64120 100644
--- a/decidim-initiatives/spec/permissions/decidim/initiatives/admin/permissions_spec.rb
+++ b/decidim-initiatives/spec/permissions/decidim/initiatives/admin/permissions_spec.rb
@@ -9,7 +9,8 @@
   let(:organization) { create :organization }
   let(:initiative) { create :initiative, organization: organization }
   let(:context) { { initiative: initiative } }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
+  let(:initiatives_settings) { create :initiatives_settings, organization: organization }
   let(:action) do
     { scope: :admin, action: action_name, subject: action_subject }
   end
@@ -20,13 +21,13 @@
     context "when initiative is #{valid_trait}" do
       let(:initiative) { create :initiative, valid_trait, organization: organization }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when initiative is not #{valid_trait}" do
       let(:initiative) { create :initiative, invalid_trait, organization: organization }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -36,7 +37,7 @@
     context "when indexing" do
       let(:action_name) { :index }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when approving" do
@@ -46,13 +47,13 @@
       context "when request is not accepted yet" do
         let(:request) { create :initiatives_committee_member, :requested, initiative: initiative }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when request is already accepted" do
         let(:request) { create :initiatives_committee_member, :accepted, initiative: initiative }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -63,13 +64,13 @@
       context "when request is not revoked yet" do
         let(:request) { create :initiatives_committee_member, :accepted, initiative: initiative }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when request is already revoked" do
         let(:request) { create :initiatives_committee_member, :rejected, initiative: initiative }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -108,7 +109,7 @@
 
       before { initiative }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when user promoted an initiative" do
@@ -116,13 +117,13 @@
         create :initiatives_committee_member, initiative: initiative, user: user
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when user is admin" do
       let(:user) { create :user, :admin, organization: organization }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when space name is not set" do
@@ -152,13 +153,13 @@
         context "when print is disabled" do
           let(:print_enabled) { false }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when print is enabled" do
           let(:print_enabled) { true }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -168,11 +169,11 @@
         context "when initiative is created" do
           let(:initiative) { create :initiative, :created, organization: organization }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when initiative is not created" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
@@ -189,7 +190,7 @@
               initiative.update(decidim_user_group_id: user_group.id)
             end
 
-            it { is_expected.to eq true }
+            it { is_expected.to be true }
           end
 
           context "when initiative has enough approved members" do
@@ -197,7 +198,7 @@
               allow(initiative).to receive(:enough_committee_members?).and_return(true)
             end
 
-            it { is_expected.to eq true }
+            it { is_expected.to be true }
           end
 
           context "when initiative has not enough approved members" do
@@ -205,43 +206,50 @@
               allow(initiative).to receive(:enough_committee_members?).and_return(false)
             end
 
-            it { is_expected.to eq false }
+            it { is_expected.to be false }
           end
         end
 
         context "when initiative is discarded" do
           let(:initiative) { create :initiative, :discarded, organization: organization }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when initiative is not created or discarded" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
       context "when editing" do
         let(:action_name) { :edit }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when previewing" do
         let(:action_name) { :preview }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when managing memberships" do
         let(:action_name) { :manage_membership }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
+      end
+
+      context "when reading a initiatives settings" do
+        let(:action_subject) { :initiatives_settings }
+        let(:action_name) { :update }
+
+        it { is_expected.to be false }
       end
 
       context "when any other action" do
         let(:action_name) { :foo }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -256,13 +264,13 @@
           context "when attached to an initiative" do
             let(:attachment) { create :attachment, attached_to: initiative }
 
-            it { is_expected.to eq true }
+            it { is_expected.to be true }
           end
 
           context "when attached to something else" do
             let(:attachment) { create :attachment }
 
-            it { is_expected.to eq false }
+            it { is_expected.to be false }
           end
         end
       end
@@ -270,13 +278,13 @@
       context "when reading" do
         let(:action_name) { :read }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when creating" do
         let(:action_name) { :create }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       it_behaves_like "attached to an initiative", :update
@@ -293,7 +301,7 @@
       let(:action_subject) { :attachment }
       let(:action_name) { :foo }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when managing initiative types" do
@@ -316,7 +324,7 @@
             ]
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when its scopes are not empty" do
@@ -326,14 +334,14 @@
             ]
           end
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
       context "when any random action" do
         let(:action_name) { :foo }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -354,7 +362,7 @@
             []
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when it has some initiatives" do
@@ -362,14 +370,14 @@
             [1, 2, 3]
           end
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
       context "when any random action" do
         let(:action_name) { :foo }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -386,13 +394,13 @@
         context "when print is disabled" do
           let(:print_enabled) { false }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when print is enabled" do
           let(:print_enabled) { true }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
 
@@ -411,24 +419,24 @@
           allow(initiative).to receive(:supports_goal_reached?).and_return(goal_reached)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
 
         context "when the initiative is not published" do
           let(:initiative) { create :initiative, :validating, organization: organization }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the initiative signature time is not finished" do
           let(:initiative) { create :initiative, signature_end_date: 2.days.from_now, organization: organization }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the initiative percentage is not complete" do
           let(:goal_reached) { false }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
 
@@ -441,27 +449,34 @@
           allow(initiative).to receive(:supports_goal_reached?).and_return(goal_reached)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
 
         context "when the initiative is not published" do
           let(:initiative) { create :initiative, :validating, organization: organization }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the initiative signature time is not finished" do
           let(:initiative) { create :initiative, signature_end_date: 2.days.from_now, organization: organization }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the initiative percentage is complete" do
           let(:goal_reached) { true }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
+
+    context "when reading a initiatives settings" do
+      let(:action_subject) { :initiatives_settings }
+      let(:action_name) { :update }
+
+      it { is_expected.to be true }
+    end
   end
 
   context "when any other condition" do
diff --git a/decidim-initiatives/spec/permissions/decidim/initiatives/permissions_spec.rb b/decidim-initiatives/spec/permissions/decidim/initiatives/permissions_spec.rb
index 2403095ef64d9..a7200a62559d5 100644
--- a/decidim-initiatives/spec/permissions/decidim/initiatives/permissions_spec.rb
+++ b/decidim-initiatives/spec/permissions/decidim/initiatives/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:organization) { create :organization }
   let(:initiative) { create(:initiative, organization: organization) }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   shared_examples "votes permissions" do
     let(:organization) { create(:organization, available_authorizations: authorizations) }
@@ -27,13 +27,13 @@
     context "when initiative has votes disabled" do
       let(:votes_enabled?) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user belongs to another organization" do
       let(:user) { create :user }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has already voted the initiative" do
@@ -41,7 +41,7 @@
         create(:initiative_user_vote, initiative: initiative, author: user)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has verified user groups" do
@@ -49,7 +49,7 @@
         create :user_group, :verified, users: [user], organization: user.organization
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when the initiative type has permissions to vote" do
@@ -67,7 +67,7 @@
       end
 
       context "when user is not verified" do
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is not fully verified" do
@@ -75,7 +75,7 @@
           create(:authorization, name: "dummy_authorization_handler", user: user, granted_at: 2.seconds.ago)
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is fully verified" do
@@ -84,7 +84,7 @@
           create(:authorization, name: "another_dummy_authorization_handler", user: user, granted_at: 2.seconds.ago)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -109,31 +109,31 @@
     context "when initiative is published" do
       let(:initiative) { create(:initiative, :published, organization: organization) }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when initiative is rejected" do
       let(:initiative) { create(:initiative, :rejected, organization: organization) }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when initiative is accepted" do
       let(:initiative) { create(:initiative, :accepted, organization: organization) }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when user is admin" do
       let(:user) { create :user, :admin, organization: organization }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when user is author of the initiative" do
       let(:initiative) { create(:initiative, author: user, organization: organization) }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when user is committee member of the initiative" do
@@ -141,11 +141,11 @@
         create(:initiatives_committee_member, initiative: initiative, user: user)
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when any other condition" do
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -158,7 +158,7 @@
       { initiative: initiative }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when approving committee member of the initiative as author" do
@@ -170,7 +170,7 @@
       { initiative: initiative }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when revoking committee member of the initiative as author" do
@@ -182,7 +182,7 @@
       { initiative: initiative }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when sending initiative to technical validation as author" do
@@ -194,7 +194,7 @@
       { initiative: initiative }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when creating an initiative" do
@@ -209,7 +209,7 @@
           .and_return(true)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
 
       context "when authorizations are not required" do
         before do
@@ -218,7 +218,7 @@
             .and_return(true)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user is authorized" do
@@ -226,7 +226,7 @@
           create :authorization, :granted, user: user
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user belongs to a verified user group" do
@@ -234,7 +234,7 @@
           create :user_group, :verified, users: [user], organization: user.organization
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -245,7 +245,7 @@
           .and_return(false)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -264,7 +264,7 @@
       context "when initiative is not created" do
         let(:initiative) { create(:initiative, author: user, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is a committee member" do
@@ -274,20 +274,20 @@
           create(:initiatives_committee_member, initiative: initiative, user: user)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user is not an initiative author" do
         let(:initiative) { create(:initiative, :created, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is admin" do
         let(:user) { create :user, :admin, organization: organization }
         let(:initiative) { create(:initiative, :created, author: user, organization: organization) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -303,7 +303,7 @@
       context "when initiative is not created" do
         let(:initiative) { create(:initiative, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is a committee member" do
@@ -313,20 +313,20 @@
           create(:initiatives_committee_member, user: user, initiative: initiative)
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when user is not an initiative author" do
         let(:initiative) { create(:initiative, :created, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is admin" do
         let(:user) { create :user, :admin, organization: organization }
         let(:initiative) { create(:initiative, :created, author: user, organization: organization) }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -343,20 +343,20 @@
     context "when initiative is published" do
       let(:initiative) { create(:initiative, :published, organization: organization) }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when initiative is not published" do
       context "when user is member" do
         let(:initiative) { create(:initiative, :discarded, author: user, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is not a member" do
         let(:initiative) { create(:initiative, :discarded, organization: organization) }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
 
         context "when authorizations are not required" do
           before do
@@ -365,7 +365,7 @@
               .and_return(true)
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when user is authorized" do
@@ -373,7 +373,7 @@
             create :authorization, :granted, user: user
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when user belongs to a verified user group" do
@@ -381,13 +381,13 @@
             create :user_group, :verified, users: [user], organization: user.organization
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
 
         context "when user is not connected" do
           let(:user) { nil }
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -434,7 +434,7 @@
           create :user_group, :verified, users: [user], organization: user.organization
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when the initiative type has permissions to vote" do
@@ -457,7 +457,7 @@
             create(:authorization, name: "another_dummy_authorization_handler", user: user, granted_at: 2.seconds.ago)
           end
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
@@ -482,23 +482,23 @@
     context "when initiative has votes disabled" do
       let(:votes_enabled?) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when initiative has unvotes disabled" do
       let(:accepts_online_unvotes?) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user belongs to another organization" do
       let(:user) { create :user }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has not voted the initiative" do
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has verified user groups" do
@@ -507,7 +507,7 @@
         create(:initiative_user_vote, initiative: initiative, author: user)
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 end
diff --git a/decidim-initiatives/spec/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter_spec.rb b/decidim-initiatives/spec/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter_spec.rb
new file mode 100644
index 0000000000000..1e4c321d6efee
--- /dev/null
+++ b/decidim-initiatives/spec/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Initiatives
+    module AdminLog
+      describe InitiativesSettingsPresenter, type: :helper do
+        subject { described_class.new(action_log, helper) }
+
+        let(:action_log) do
+          create(
+            :action_log,
+            action: action
+          )
+        end
+        let(:action) { :update }
+
+        before do
+          helper.extend(Decidim::ApplicationHelper)
+          helper.extend(Decidim::TranslationsHelper)
+        end
+
+        describe "#present" do
+          context "when the setting is updated" do
+            it "shows the settings has been updated" do
+              expect(subject.present).to include("updated the initiatives settings")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/queries/decidim/initiatives/organization_prioritized_initiatives_spec.rb b/decidim-initiatives/spec/queries/decidim/initiatives/organization_prioritized_initiatives_spec.rb
index e3f9dc87eff53..b9bf54b53f8c7 100644
--- a/decidim-initiatives/spec/queries/decidim/initiatives/organization_prioritized_initiatives_spec.rb
+++ b/decidim-initiatives/spec/queries/decidim/initiatives/organization_prioritized_initiatives_spec.rb
@@ -10,7 +10,7 @@ module Initiatives
       let(:organization) { create(:organization) }
       let!(:user) { create(:user, :confirmed, organization: organization) }
       let!(:initiatives) { create_list :initiative, 5, organization: organization }
-      let!(:most_recent_initiative) { create :initiative, published_at: Time.current + 1.day, organization: organization }
+      let!(:most_recent_initiative) { create :initiative, published_at: 1.day.from_now, organization: organization }
 
       context "when querying by default order" do
         let(:order) { "default" }
diff --git a/decidim-initiatives/spec/requests/initiative_search_spec.rb b/decidim-initiatives/spec/requests/initiative_search_spec.rb
new file mode 100644
index 0000000000000..6902320e57ac9
--- /dev/null
+++ b/decidim-initiatives/spec/requests/initiative_search_spec.rb
@@ -0,0 +1,444 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Initiative search", type: :request do
+  subject { response.body }
+
+  let(:organization) { create :organization }
+  let(:type1) { create :initiatives_type, organization: organization }
+  let(:type2) { create :initiatives_type, organization: organization }
+  let(:scoped_type1) { create :initiatives_type_scope, type: type1 }
+  let(:scoped_type2) { create :initiatives_type_scope, type: type2 }
+  let(:user1) { create(:user, :confirmed, organization: organization, name: "John McDoggo", nickname: "john_mcdoggo") }
+  let(:user2) { create(:user, :confirmed, organization: organization, nickname: "doggotrainer") }
+  let(:group1) { create(:user_group, :confirmed, organization: organization, name: "The Doggo House", nickname: "the_doggo_house") }
+  let(:group2) { create(:user_group, :confirmed, organization: organization, nickname: "thedoggokeeper") }
+  let(:area1) { create(:area, organization: organization) }
+  let(:area2) { create(:area, organization: organization) }
+
+  let!(:initiative1) { create(:initiative, id: 999_999, title: { en: "A doggo" }, scoped_type: scoped_type1, organization: organization) }
+  let!(:initiative2) { create(:initiative, description: { en: "There is a doggo in the office" }, scoped_type: scoped_type2, organization: organization) }
+  let!(:initiative3) { create(:initiative, organization: organization) }
+  let!(:area1_initiative) { create(:initiative, organization: organization, area: area1) }
+  let!(:area2_initiative) { create(:initiative, organization: organization, area: area2) }
+  let!(:user1_initiative) { create(:initiative, organization: organization, author: user1) }
+  let!(:user2_initiative) { create(:initiative, organization: organization, author: user2) }
+  let!(:group1_initiative) { create(:initiative, organization: organization, author: group1) }
+  let!(:group2_initiative) { create(:initiative, organization: organization, author: group2) }
+  let!(:closed_initiative) { create(:initiative, :acceptable, organization: organization) }
+  let!(:accepted_initiative) { create(:initiative, :accepted, organization: organization) }
+  let!(:rejected_initiative) { create(:initiative, :rejected, organization: organization) }
+  let!(:answered_rejected_initiative) { create(:initiative, :rejected, organization: organization, answered_at: Time.current) }
+  let!(:created_initiative) { create(:initiative, :created, organization: organization) }
+  let!(:user1_created_initiative) { create(:initiative, :created, organization: organization, author: user1, signature_start_date: Date.current + 2.days, signature_end_date: Date.current + 22.days) }
+
+  let(:filter_params) { {} }
+  let(:request_path) { decidim_initiatives.initiatives_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all published open initiatives by default" do
+    expect(subject).to include(translated(initiative1.title))
+    expect(subject).to include(translated(initiative2.title))
+    expect(subject).to include(translated(initiative3.title))
+    expect(subject).to include(translated(area1_initiative.title))
+    expect(subject).to include(translated(area2_initiative.title))
+    expect(subject).to include(translated(user1_initiative.title))
+    expect(subject).to include(translated(user2_initiative.title))
+    expect(subject).to include(translated(group1_initiative.title))
+    expect(subject).to include(translated(group2_initiative.title))
+    expect(subject).not_to include(translated(closed_initiative.title))
+    expect(subject).not_to include(translated(accepted_initiative.title))
+    expect(subject).not_to include(translated(rejected_initiative.title))
+    expect(subject).not_to include(translated(answered_rejected_initiative.title))
+    expect(subject).not_to include(translated(created_initiative.title))
+    expect(subject).not_to include(translated(user1_created_initiative.title))
+  end
+
+  context "when filtering by text" do
+    let(:filter_params) { { search_text_cont: search_text } }
+    let(:search_text) { "doggo" }
+
+    it "displays the initiatives containing the search in the title or the body or the author name or nickname" do
+      expect(subject).to include(translated(initiative1.title))
+      expect(subject).to include(translated(initiative2.title))
+      expect(subject).not_to include(translated(initiative3.title))
+      expect(subject).not_to include(translated(area1_initiative.title))
+      expect(subject).not_to include(translated(area2_initiative.title))
+      expect(subject).to include(translated(user1_initiative.title))
+      expect(subject).to include(translated(user2_initiative.title))
+      expect(subject).to include(translated(group1_initiative.title))
+      expect(subject).to include(translated(group2_initiative.title))
+      expect(subject).not_to include(translated(closed_initiative.title))
+      expect(subject).not_to include(translated(accepted_initiative.title))
+      expect(subject).not_to include(translated(rejected_initiative.title))
+      expect(subject).not_to include(translated(answered_rejected_initiative.title))
+      expect(subject).not_to include(translated(created_initiative.title))
+      expect(subject).not_to include(translated(user1_created_initiative.title))
+    end
+
+    context "and the search_text is an initiative id" do
+      let(:search_text) { initiative1.id.to_s }
+
+      it "returns the initiative with the searched id" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+
+  context "when filtering by state" do
+    let(:filter_params) { { with_any_state: state } }
+
+    context "and state is open" do
+      let(:state) { %w(open) }
+
+      it "displays only open initiatives" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).to include(translated(initiative2.title))
+        expect(subject).to include(translated(initiative3.title))
+        expect(subject).to include(translated(area1_initiative.title))
+        expect(subject).to include(translated(area2_initiative.title))
+        expect(subject).to include(translated(user1_initiative.title))
+        expect(subject).to include(translated(user2_initiative.title))
+        expect(subject).to include(translated(group1_initiative.title))
+        expect(subject).to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and state is closed" do
+      let(:state) { %w(closed) }
+
+      it "displays only closed initiatives" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).to include(translated(closed_initiative.title))
+        expect(subject).to include(translated(accepted_initiative.title))
+        expect(subject).to include(translated(rejected_initiative.title))
+        expect(subject).to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and state is accepted" do
+      let(:state) { %w(accepted) }
+
+      it "returns only accepted initiatives" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and state is rejected" do
+      let(:state) { %w(rejected) }
+
+      it "returns only rejected initiatives" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).to include(translated(rejected_initiative.title))
+        expect(subject).to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and state is answered" do
+      let(:state) { %w(answered) }
+
+      it "returns only answered initiatives" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and state is open or closed" do
+      let(:state) { %w(open closed) }
+
+      it "displays only closed initiatives" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).to include(translated(initiative2.title))
+        expect(subject).to include(translated(initiative3.title))
+        expect(subject).to include(translated(area1_initiative.title))
+        expect(subject).to include(translated(area2_initiative.title))
+        expect(subject).to include(translated(user1_initiative.title))
+        expect(subject).to include(translated(user2_initiative.title))
+        expect(subject).to include(translated(group1_initiative.title))
+        expect(subject).to include(translated(group2_initiative.title))
+        expect(subject).to include(translated(closed_initiative.title))
+        expect(subject).to include(translated(accepted_initiative.title))
+        expect(subject).to include(translated(rejected_initiative.title))
+        expect(subject).to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+
+  context "when filtering by scope" do
+    let(:filter_params) { { with_any_scope: scope_id } }
+
+    context "and a single scope id is provided" do
+      let(:scope_id) { [scoped_type1.scope.id] }
+
+      it "displays initiatives by scope" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and multiple scope ids are provided" do
+      let(:scope_id) { [scoped_type2.scope.id, scoped_type1.scope.id] }
+
+      it "displays initiatives by scope" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+
+  context "when filtering by author" do
+    let(:filter_params) { { with_any_state: %w(open closed), author: author } }
+
+    before do
+      login_as user1, scope: :user
+
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => organization.host }
+      )
+    end
+
+    context "and author is any" do
+      let(:author) { "any" }
+
+      it "displays all initiatives except the created ones" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).to include(translated(initiative2.title))
+        expect(subject).to include(translated(initiative3.title))
+        expect(subject).to include(translated(area1_initiative.title))
+        expect(subject).to include(translated(area2_initiative.title))
+        expect(subject).to include(translated(user1_initiative.title))
+        expect(subject).to include(translated(user2_initiative.title))
+        expect(subject).to include(translated(group1_initiative.title))
+        expect(subject).to include(translated(group2_initiative.title))
+        expect(subject).to include(translated(closed_initiative.title))
+        expect(subject).to include(translated(accepted_initiative.title))
+        expect(subject).to include(translated(rejected_initiative.title))
+        expect(subject).to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and author is myself" do
+      let(:author) { "myself" }
+
+      it "contains only initiatives of the author, including their created upcoming initiative" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+
+  context "when filtering by type" do
+    let(:filter_params) { { with_any_type: type_id } }
+    let(:type_id) { [initiative1.type.id] }
+
+    it "displays initiatives of correct type" do
+      expect(subject).to include(translated(initiative1.title))
+      expect(subject).not_to include(translated(initiative2.title))
+      expect(subject).not_to include(translated(initiative3.title))
+      expect(subject).not_to include(translated(area1_initiative.title))
+      expect(subject).not_to include(translated(area2_initiative.title))
+      expect(subject).not_to include(translated(user1_initiative.title))
+      expect(subject).not_to include(translated(user2_initiative.title))
+      expect(subject).not_to include(translated(group1_initiative.title))
+      expect(subject).not_to include(translated(group2_initiative.title))
+      expect(subject).not_to include(translated(closed_initiative.title))
+      expect(subject).not_to include(translated(accepted_initiative.title))
+      expect(subject).not_to include(translated(rejected_initiative.title))
+      expect(subject).not_to include(translated(answered_rejected_initiative.title))
+      expect(subject).not_to include(translated(created_initiative.title))
+      expect(subject).not_to include(translated(user1_created_initiative.title))
+    end
+
+    context "and providing multiple types" do
+      let(:type_id) { [initiative1.type.id, initiative2.type.id] }
+
+      it "displays initiatives of correct type" do
+        expect(subject).to include(translated(initiative1.title))
+        expect(subject).to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).not_to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+
+  context "when filtering by area" do
+    let(:filter_params) { { with_any_area: area_id } }
+
+    context "when an area id is being sent" do
+      let(:area_id) { [area1.id.to_s] }
+
+      it "displays initiatives by area" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).to include(translated(area1_initiative.title))
+        expect(subject).not_to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+
+    context "and providing multiple ids" do
+      let(:area_id) { [area1.id.to_s, area2.id.to_s] }
+
+      it "displays initiatives by area" do
+        expect(subject).not_to include(translated(initiative1.title))
+        expect(subject).not_to include(translated(initiative2.title))
+        expect(subject).not_to include(translated(initiative3.title))
+        expect(subject).to include(translated(area1_initiative.title))
+        expect(subject).to include(translated(area2_initiative.title))
+        expect(subject).not_to include(translated(user1_initiative.title))
+        expect(subject).not_to include(translated(user2_initiative.title))
+        expect(subject).not_to include(translated(group1_initiative.title))
+        expect(subject).not_to include(translated(group2_initiative.title))
+        expect(subject).not_to include(translated(closed_initiative.title))
+        expect(subject).not_to include(translated(accepted_initiative.title))
+        expect(subject).not_to include(translated(rejected_initiative.title))
+        expect(subject).not_to include(translated(answered_rejected_initiative.title))
+        expect(subject).not_to include(translated(created_initiative.title))
+        expect(subject).not_to include(translated(user1_created_initiative.title))
+      end
+    end
+  end
+end
diff --git a/decidim-initiatives/spec/services/decidim/initiatives/initiative_search_spec.rb b/decidim-initiatives/spec/services/decidim/initiatives/initiative_search_spec.rb
deleted file mode 100644
index a466de60b6214..0000000000000
--- a/decidim-initiatives/spec/services/decidim/initiatives/initiative_search_spec.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Initiatives
-    describe InitiativeSearch do
-      let(:organization) { create :organization }
-      let(:type1) { create :initiatives_type, organization: organization }
-      let(:type2) { create :initiatives_type, organization: organization }
-      let(:scoped_type1) { create :initiatives_type_scope, type: type1 }
-      let(:scoped_type2) { create :initiatives_type_scope, type: type2 }
-      let(:user1) { create(:user, organization: organization, name: "John McDog", nickname: "john_mcdog") }
-      let(:user2) { create(:user, organization: organization, nickname: "dogtrainer") }
-      let(:group1) { create(:user_group, organization: organization, name: "The Dog House", nickname: "the_dog_house") }
-      let(:group2) { create(:user_group, organization: organization, nickname: "thedogkeeper") }
-      let(:area1) { create(:area, organization: organization) }
-      let(:area2) { create(:area, organization: organization) }
-
-      describe "results" do
-        subject do
-          described_class.new(
-            search_text: search_text,
-            state: state,
-            type_id: type_id,
-            author: author,
-            scope_id: scope_id,
-            area_id: area_id,
-            current_user: user1,
-            organization: organization
-          ).results
-        end
-
-        let(:search_text) { nil }
-        let(:state) { nil }
-        let(:type_id) { ["all"] }
-        let(:author) { nil }
-        let(:scope_id) { nil }
-        let(:area_id) { ["all"] }
-
-        context "when the filter includes search_text" do
-          let(:search_text) { "dog" }
-
-          before do
-            create_list(:initiative, 3, organization: organization)
-            create(:initiative, title: { en: "A dog" }, organization: organization)
-            create(:initiative, description: { en: "There is a dog in the office" }, organization: organization)
-            create(:initiative, organization: organization, author: user1)
-            create(:initiative, organization: organization, author: user2)
-            create(:initiative, organization: organization, author: group1)
-            create(:initiative, organization: organization, author: group2)
-          end
-
-          it "returns the initiatives containing the search in the title or the body or the author name or nickname" do
-            expect(subject.size).to eq(6)
-          end
-
-          context "when the search_text is an initiative id" do
-            let(:initiative) { create(:initiative, organization: organization) }
-            let(:search_text) { initiative.id.to_s }
-
-            it "returns the initiative with the searched id" do
-              expect(subject).to contain_exactly(initiative)
-            end
-          end
-        end
-
-        context "when the filter includes state" do
-          context "and filtering open initiatives" do
-            let(:state) { ["open"] }
-
-            it "returns only open initiatives" do
-              open_initiatives = create_list(:initiative, 3, organization: organization)
-              create_list(:initiative, 3, :acceptable, organization: organization)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(open_initiatives)
-            end
-          end
-
-          context "and filtering closed initiatives" do
-            let(:state) { ["closed"] }
-
-            it "returns only closed initiatives" do
-              create_list(:initiative, 3, organization: organization)
-              closed_initiatives = create_list(:initiative, 3, :acceptable, organization: organization)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(closed_initiatives)
-            end
-          end
-
-          context "and filtering accepted initiatives" do
-            let(:state) { ["accepted"] }
-
-            it "returns only accepted initiatives" do
-              create_list(:initiative, 3, organization: organization)
-              accepted_initiatives = create_list(:initiative, 3, :accepted, organization: organization)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(accepted_initiatives)
-            end
-          end
-
-          context "and filtering rejected initiatives" do
-            let(:state) { ["rejected"] }
-
-            it "returns only rejected initiatives" do
-              create_list(:initiative, 3, organization: organization)
-              rejected_initiatives = create_list(:initiative, 3, :rejected, organization: organization)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(rejected_initiatives)
-            end
-          end
-
-          context "and filtering answered initiatives" do
-            let(:state) { ["answered"] }
-
-            it "returns only answered initiatives" do
-              create_list(:initiative, 3, organization: organization)
-              answered_initiatives = create_list(:initiative, 3, :rejected, organization: organization, answered_at: Time.current)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(answered_initiatives)
-            end
-          end
-        end
-
-        context "when the filter includes scope_id" do
-          let!(:initiative) { create(:initiative, scoped_type: scoped_type1, organization: organization) }
-          let!(:initiative2) { create(:initiative, scoped_type: scoped_type2, organization: organization) }
-
-          context "when a scope id is being sent" do
-            let(:scope_id) { [scoped_type1.scope.id] }
-
-            it "filters initiatives by scope" do
-              expect(subject).to match_array [initiative]
-            end
-          end
-
-          context "when multiple ids are sent" do
-            let(:scope_id) { [scoped_type2.scope.id, scoped_type1.scope.id] }
-
-            it "filters initiatives by scope" do
-              expect(subject).to match_array [initiative, initiative2]
-            end
-          end
-        end
-
-        context "when the filter includes author" do
-          let!(:initiative) { create(:initiative, organization: organization) }
-          let!(:initiative2) { create(:initiative, organization: organization, author: user1) }
-          let!(:created_initiative) { create(:initiative, :created, organization: organization, author: user1) }
-
-          context "and any author" do
-            it "contains all initiatives" do
-              expect(subject).to match_array [initiative, initiative2]
-            end
-          end
-
-          context "and my initiatives" do
-            let(:author) { "myself" }
-
-            it "contains only initiatives of the author" do
-              expect(subject).to match_array [initiative2, created_initiative]
-            end
-          end
-        end
-
-        context "when the filter includes type_id" do
-          let!(:initiative) { create(:initiative, organization: organization) }
-          let!(:initiative2) { create(:initiative, organization: organization) }
-          let(:type_id) { [initiative.type.id] }
-
-          it "filters by initiative type" do
-            expect(subject).to match_array [initiative]
-          end
-
-          context "with multiple types" do
-            let(:type_id) { [initiative.type.id, initiative2.type.id] }
-
-            it "filters by initiative type" do
-              expect(subject).to match_array [initiative, initiative2]
-            end
-          end
-        end
-
-        context "when the filter includes area_id" do
-          let!(:initiative) { create(:initiative, area: area1, organization: organization) }
-          let!(:initiative2) { create(:initiative, area: area2, organization: organization) }
-
-          context "when an area id is being sent" do
-            let(:area_id) { [area1.id.to_s] }
-
-            it "filters initiatives by area" do
-              expect(subject).to match_array [initiative]
-            end
-          end
-
-          context "when multiple ids are sent" do
-            let(:area_id) { [area1.id.to_s, area2.id.to_s] }
-
-            it "filters initiatives by scope" do
-              expect(subject).to match_array [initiative, initiative2]
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb b/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
index a139ed9d01517..e2c9c4496950f 100644
--- a/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
+++ b/decidim-initiatives/spec/services/decidim/initiatives/progress_notifier_spec.rb
@@ -18,7 +18,8 @@ module Initiatives
           committee_members: double("committee_members", approved: approved_committee_members)
         )
       end
-      let!(:subject) { described_class.new(initiative: initiative) }
+
+      subject { described_class.new(initiative: initiative) }
 
       before do
         allow(message_delivery).to receive(:deliver_later)
diff --git a/decidim-initiatives/spec/services/decidim/initiatives/searchable_initiative_resource_spec.rb b/decidim-initiatives/spec/services/decidim/initiatives/searchable_initiative_resource_spec.rb
index 42c0fe1c93604..f29e7c0fa7a81 100644
--- a/decidim-initiatives/spec/services/decidim/initiatives/searchable_initiative_resource_spec.rb
+++ b/decidim-initiatives/spec/services/decidim/initiatives/searchable_initiative_resource_spec.rb
@@ -11,19 +11,19 @@ module Decidim
           :unpublished,
           organization: organization,
           title: Decidim::Faker::Localized.name,
-          description: description_1
+          description: description1
         )
       end
       let(:participatory_space) { initiative }
-      let(:initiative_2) do
+      let(:initiative2) do
         create(
           :initiative,
           organization: organization,
           title: Decidim::Faker::Localized.name,
-          description: description_2
+          description: description2
         )
       end
-      let(:participatory_space2) { initiative_2 }
+      let(:participatory_space2) { initiative2 }
       let(:searchable_resource_attrs_mapper) do
         lambda { |space, locale|
           {
diff --git a/decidim-initiatives/spec/services/decidim/initiatives/status_change_notifier_spec.rb b/decidim-initiatives/spec/services/decidim/initiatives/status_change_notifier_spec.rb
index d1c40195f5d73..1e739cda71e91 100644
--- a/decidim-initiatives/spec/services/decidim/initiatives/status_change_notifier_spec.rb
+++ b/decidim-initiatives/spec/services/decidim/initiatives/status_change_notifier_spec.rb
@@ -32,7 +32,7 @@ module Initiatives
         )
       end
 
-      let!(:subject) { described_class.new(initiative: initiative) }
+      subject { described_class.new(initiative: initiative) }
 
       before do
         allow(message_delivery).to receive(:deliver_later)
diff --git a/decidim-initiatives/spec/shared/create_initiative_example.rb b/decidim-initiatives/spec/shared/create_initiative_example.rb
index 6d11bb7a15fc2..77d9a2c32b386 100644
--- a/decidim-initiatives/spec/shared/create_initiative_example.rb
+++ b/decidim-initiatives/spec/shared/create_initiative_example.rb
@@ -33,7 +33,7 @@
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
@@ -55,13 +55,13 @@
       it "creates a new initiative" do
         expect do
           command.call
-        end.to change { Decidim::Initiative.count }.by(1)
+        end.to change(Decidim::Initiative, :count).by(1)
       end
 
       context "when attachment is present" do
         let(:uploaded_files) do
           [
-            Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
+            upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf"))
           ]
         end
 
@@ -82,8 +82,8 @@
       context "when has multiple attachments" do
         let(:uploaded_files) do
           [
-            Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-            Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
+            upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")),
+            upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf"))
           ]
         end
 
diff --git a/decidim-initiatives/spec/shared/create_initiative_type_example.rb b/decidim-initiatives/spec/shared/create_initiative_type_example.rb
index 9c363ce1a693a..19f863324734d 100644
--- a/decidim-initiatives/spec/shared/create_initiative_type_example.rb
+++ b/decidim-initiatives/spec/shared/create_initiative_type_example.rb
@@ -2,6 +2,7 @@
 
 shared_examples "create an initiative type" do
   let(:organization) { create(:organization) }
+  let(:user) { create(:user, organization: organization) }
 
   let(:form) do
     form_klass.from_params(
@@ -22,6 +23,7 @@
         undo_online_signatures_enabled: true,
         custom_signature_end_date_enabled: true,
         area_enabled: true,
+        comments_enabled: true,
         promoting_committee_enabled: true,
         minimum_committee_members: 7,
         banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"),
@@ -32,11 +34,11 @@
       }
     end
 
-    let(:command) { described_class.new(form) }
+    let(:command) { described_class.new(form, user) }
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
@@ -58,7 +60,19 @@
       it "creates a new initiative type" do
         expect do
           command.call
-        end.to change { Decidim::InitiativesType.count }.by(1)
+        end.to change(Decidim::InitiativesType, :count).by(1)
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with(:create, Decidim::InitiativesType, user, {})
+          .and_call_original
+
+        expect { command.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("create")
+        expect(action_log.version).to be_present
       end
     end
   end
diff --git a/decidim-initiatives/spec/shared/create_initiative_type_scope_example.rb b/decidim-initiatives/spec/shared/create_initiative_type_scope_example.rb
index ce0d7eb988197..9aa60b8dfd236 100644
--- a/decidim-initiatives/spec/shared/create_initiative_type_scope_example.rb
+++ b/decidim-initiatives/spec/shared/create_initiative_type_scope_example.rb
@@ -25,7 +25,7 @@
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
@@ -47,7 +47,7 @@
       it "creates a new initiative type scope" do
         expect do
           command.call
-        end.to change { Decidim::InitiativesTypeScope.count }.by(1)
+        end.to change(Decidim::InitiativesTypeScope, :count).by(1)
       end
     end
   end
diff --git a/decidim-initiatives/spec/shared/initiative_administration.rb b/decidim-initiatives/spec/shared/initiative_administration_shared_context.rb
similarity index 100%
rename from decidim-initiatives/spec/shared/initiative_administration.rb
rename to decidim-initiatives/spec/shared/initiative_administration_shared_context.rb
diff --git a/decidim-initiatives/spec/shared/update_initiative_answer_example.rb b/decidim-initiatives/spec/shared/update_initiative_answer_example.rb
index a3e674c206a2f..5eab0777864ea 100644
--- a/decidim-initiatives/spec/shared/update_initiative_answer_example.rb
+++ b/decidim-initiatives/spec/shared/update_initiative_answer_example.rb
@@ -28,7 +28,7 @@
   describe "call" do
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-initiatives/spec/shared/update_initiative_example.rb b/decidim-initiatives/spec/shared/update_initiative_example.rb
index 6b028f214d67b..b02196be980fd 100644
--- a/decidim-initiatives/spec/shared/update_initiative_example.rb
+++ b/decidim-initiatives/spec/shared/update_initiative_example.rb
@@ -37,7 +37,7 @@
   describe "call" do
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-initiatives/spec/shared/update_initiative_type_example.rb b/decidim-initiatives/spec/shared/update_initiative_type_example.rb
index 1d0d47620b80f..3861797954283 100644
--- a/decidim-initiatives/spec/shared/update_initiative_type_example.rb
+++ b/decidim-initiatives/spec/shared/update_initiative_type_example.rb
@@ -2,6 +2,7 @@
 
 shared_examples "update an initiative type" do
   let(:organization) { create(:organization) }
+  let(:user) { create(:user) }
   let(:initiative_type) do
     create(:initiatives_type,
            :online_signature_enabled,
@@ -30,6 +31,7 @@
         undo_online_signatures_enabled: false,
         custom_signature_end_date_enabled: true,
         area_enabled: true,
+        comments_enabled: true,
         promoting_committee_enabled: true,
         minimum_committee_members: 7,
         banner_image: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"),
@@ -41,11 +43,11 @@
       }
     end
 
-    let(:command) { described_class.new(initiative_type, form) }
+    let(:command) { described_class.new(initiative_type, form, user) }
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
@@ -102,6 +104,18 @@
 
         expect(initiative.signature_type).to eq("online")
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("update", initiative_type, user)
+          .and_call_original
+
+        expect { command.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("update")
+        expect(action_log.version).to be_present
+      end
     end
   end
 end
diff --git a/decidim-initiatives/spec/shared/update_initiative_type_scope_example.rb b/decidim-initiatives/spec/shared/update_initiative_type_scope_example.rb
index dd50d971e89e7..c1bf7c5fc16b5 100644
--- a/decidim-initiatives/spec/shared/update_initiative_type_scope_example.rb
+++ b/decidim-initiatives/spec/shared/update_initiative_type_scope_example.rb
@@ -24,7 +24,7 @@
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_comments_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_comments_spec.rb
index 6e5e0d77a53ec..3b98f9935c0ce 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_comments_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_comments_spec.rb
@@ -21,6 +21,17 @@
     visit decidim_admin_initiatives.initiatives_path
   end
 
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:comment, 17, commentable: commentable) }
+    let!(:moderations) do
+      reportables.first(reportables.length - 1).map do |reportable|
+        moderation = create(:moderation, reportable: reportable, participatory_space: commentable, report_count: 1)
+        create(:report, moderation: moderation)
+        moderation
+      end
+    end
+  end
+
   it_behaves_like "manage moderations" do
     let!(:moderations) do
       reportables.first(reportables.length - 1).map do |reportable|
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_scopes_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_scopes_spec.rb
index c8c844640730e..ad0eefefdfe4e 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_scopes_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_scopes_spec.rb
@@ -55,14 +55,6 @@
         expect(page).to have_content("The scope has been successfully updated")
       end
     end
-  end
-
-  context "when editing an initiative type scope" do
-    let!(:initiative_type_scope) { create :initiatives_type_scope, type: initiatives_type }
-
-    before do
-      visit decidim_admin_initiatives.edit_initiatives_type_path(initiatives_type)
-    end
 
     it "removes the initiative type scope" do
       click_link "Configure"
diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
index 580b7367b87c1..75a65894fd5fe 100644
--- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
+++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_types_spec.rb
@@ -37,7 +37,7 @@
 
       select("Online", from: "Signature type")
 
-      attach_file "Banner image", Decidim::Dev.asset("city2.jpeg")
+      dynamically_attach_file(:initiatives_type_banner_image, Decidim::Dev.asset("city2.jpeg"))
 
       click_button "Create"
 
@@ -64,6 +64,7 @@
       uncheck "Enable participants to undo their online signatures"
       check "Enable authors to choose the end of signature collection period"
       check "Enable authors to choose the area for their initiative"
+      uncheck "Enable comments"
 
       click_button "Update"
 
diff --git a/decidim-initiatives/spec/system/create_initiative_spec.rb b/decidim-initiatives/spec/system/create_initiative_spec.rb
index 28747237b13bd..0a120c9bbadcb 100644
--- a/decidim-initiatives/spec/system/create_initiative_spec.rb
+++ b/decidim-initiatives/spec/system/create_initiative_spec.rb
@@ -34,7 +34,7 @@
       end
 
       context "and they aren't verified" do
-        let(:authorization) {}
+        let(:authorization) { nil }
 
         it "they need to verify" do
           click_button "New initiative"
@@ -64,7 +64,7 @@
         it "they are redirected to the initiative form after log in" do
           click_button "New initiative"
           fill_in "Email", with: authorized_user.email
-          fill_in "Password", with: "decidim123456"
+          fill_in "Password", with: "decidim123456789"
           click_button "Log in"
 
           expect(page).to have_content("Which initiative do you want to launch")
@@ -79,7 +79,7 @@
         it "they are shown an error" do
           click_button "New initiative"
           fill_in "Email", with: authorized_user.email
-          fill_in "Password", with: "decidim123456"
+          fill_in "Password", with: "decidim123456789"
           click_button "Log in"
 
           expect(page).to have_content("You are not authorized to perform this action")
@@ -88,6 +88,30 @@
     end
   end
 
+  context "when rich text editor is enabled for participants" do
+    let(:initiative_type_minimum_committee_members) { 2 }
+    let(:signature_type) { "any" }
+    let(:initiative_type_promoting_committee_enabled) { true }
+    let(:initiative_type) do
+      create(:initiatives_type,
+             organization: organization,
+             minimum_committee_members: initiative_type_minimum_committee_members,
+             promoting_committee_enabled: initiative_type_promoting_committee_enabled,
+             signature_type: signature_type)
+    end
+    let!(:other_initiative_type) { create(:initiatives_type, organization: organization) }
+    let!(:initiative_type_scope) { create(:initiatives_type_scope, type: initiative_type) }
+    let!(:other_initiative_type_scope) { create(:initiatives_type_scope, type: initiative_type) }
+
+    before do
+      organization.update(rich_text_editor_in_public_views: true)
+      click_link "New initiative"
+      find_button("I want to promote this initiative").click
+    end
+
+    it_behaves_like "having a rich text editor", "new_initiative_previous_form", "full"
+  end
+
   describe "creating an initiative" do
     context "without validation" do
       let(:initiative_type_minimum_committee_members) { 2 }
@@ -142,7 +166,7 @@
 
         it "have fields for title and description" do
           expect(page).to have_xpath("//input[@id='initiative_title']")
-          expect(page).to have_xpath("//input[@id='initiative_description']", visible: :all)
+          expect(page).to have_xpath("//textarea[@id='initiative_description']", visible: :all)
         end
 
         it "offers contextual help" do
@@ -172,7 +196,7 @@
 
         it "have fields for title and description" do
           expect(page).to have_xpath("//input[@id='initiative_title']")
-          expect(page).to have_xpath("//input[@id='initiative_description']", visible: :all)
+          expect(page).to have_xpath("//textarea[@id='initiative_description']", visible: :all)
         end
 
         it "offers contextual help" do
@@ -188,7 +212,7 @@
         before do
           find_button("I want to promote this initiative").click
           fill_in "Title", with: translated(initiative.title, locale: :en)
-          fill_in_editor "initiative_description", with: translated(initiative.description, locale: :en)
+          fill_in "initiative_description", with: translated(initiative.description, locale: :en)
           find_button("Continue").click
         end
 
@@ -219,7 +243,7 @@
 
           before do
             fill_in "Title", with: translated(initiative.title, locale: :en)
-            fill_in_editor "initiative_description", with: translated(initiative.description, locale: :en)
+            fill_in "initiative_description", with: translated(initiative.description, locale: :en)
             find_button("Continue").click
           end
 
@@ -233,7 +257,7 @@
           before do
             find_button("I want to promote this initiative").click
             fill_in "Title", with: translated(initiative.title, locale: :en)
-            fill_in_editor "initiative_description", with: translated(initiative.description, locale: :en)
+            fill_in "initiative_description", with: translated(initiative.description, locale: :en)
             find_button("Continue").click
           end
 
@@ -252,7 +276,7 @@
           it "shows information collected in previous steps already filled" do
             expect(find(:xpath, "//input[@id='initiative_type_id']", visible: :all).value).to eq(initiative_type.id.to_s)
             expect(find(:xpath, "//input[@id='initiative_title']").value).to eq(translated(initiative.title, locale: :en))
-            expect(find(:xpath, "//input[@id='initiative_description']", visible: :all).value).to eq(translated(initiative.description, locale: :en))
+            expect(find(:xpath, "//textarea[@id='initiative_description']", visible: :all).value).to eq(translated(initiative.description, locale: :en))
           end
 
           context "when only one signature collection and scope are available" do
@@ -312,7 +336,7 @@
           find_button("I want to promote this initiative").click
 
           fill_in "Title", with: translated(initiative.title, locale: :en)
-          fill_in_editor "initiative_description", with: translated(initiative.description, locale: :en)
+          fill_in "initiative_description", with: translated(initiative.description, locale: :en)
           find_button("Continue").click
 
           select("Online", from: "Signature collection type")
@@ -366,12 +390,12 @@
           find_button("I want to promote this initiative").click
 
           fill_in "Title", with: translated(initiative.title, locale: :en)
-          fill_in_editor "initiative_description", with: translated(initiative.description, locale: :en)
+          fill_in "initiative_description", with: translated(initiative.description, locale: :en)
           find_button("Continue").click
 
           select(translated(initiative_type_scope.scope.name, locale: :en), from: "Scope")
           select("Online", from: "Signature collection type")
-          attach_file :initiative_add_documents, Decidim::Dev.asset("Exampledocument.pdf")
+          dynamically_attach_file(:initiative_documents, Decidim::Dev.asset("Exampledocument.pdf"))
           find_button("Continue").click
         end
 
diff --git a/decidim-initiatives/spec/system/filter_initiatives_spec.rb b/decidim-initiatives/spec/system/filter_initiatives_spec.rb
index 59e03fc22c908..0f2096e5fa6da 100644
--- a/decidim-initiatives/spec/system/filter_initiatives_spec.rb
+++ b/decidim-initiatives/spec/system/filter_initiatives_spec.rb
@@ -37,7 +37,7 @@
 
     context "when selecting all scopes" do
       it "lists all initiatives", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           check "All"
         end
 
@@ -48,7 +48,7 @@
 
     context "when selecting the global scope" do
       it "lists the filtered initiatives", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check "Global"
         end
@@ -60,7 +60,7 @@
 
     context "when selecting one scope" do
       it "lists the filtered initiatives", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check scoped_type1.scope_name[I18n.locale.to_s]
         end
@@ -90,7 +90,7 @@
 
     context "when selecting all states" do
       it "lists all initiatives", :slow do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           check "All"
         end
@@ -102,7 +102,7 @@
 
     context "when selecting the open state" do
       it "lists the open initiatives", :slow do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           check "Open"
         end
@@ -114,7 +114,7 @@
 
     context "when selecting the closed state" do
       it "lists the closed initiatives" do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           check "Closed"
         end
@@ -126,7 +126,7 @@
 
     context "when selecting the accepted state" do
       it "lists the accepted initiatives" do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           within ".filters__has-subfilters" do
             click_button
@@ -141,7 +141,7 @@
 
     context "when selecting the rejected state" do
       it "lists the rejected initiatives" do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           within ".filters__has-subfilters" do
             click_button
@@ -156,7 +156,7 @@
 
     context "when selecting the answered state" do
       it "lists the answered initiatives" do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           uncheck "All"
           check "Answered"
         end
@@ -182,7 +182,7 @@
 
       it "doesn't display TYPE filter" do
         expect(page).not_to have_content(/Type/i)
-        expect(page).not_to have_css(".filters__section.type_id_check_boxes_tree_filter")
+        expect(page).not_to have_css(".filters__section.with_any_type_check_boxes_tree_filter")
       end
 
       it "lists all initiatives", :slow do
@@ -207,7 +207,7 @@
 
       context "when selecting all types" do
         it "lists all initiatives", :slow do
-          within ".filters .type_id_check_boxes_tree_filter" do
+          within ".filters .with_any_type_check_boxes_tree_filter" do
             check "All"
           end
 
@@ -218,7 +218,7 @@
 
       context "when selecting one type" do
         it "lists the filtered initiatives", :slow do
-          within ".filters .type_id_check_boxes_tree_filter" do
+          within ".filters .with_any_type_check_boxes_tree_filter" do
             uncheck "All"
             check type1.title[I18n.locale.to_s]
           end
@@ -247,7 +247,7 @@
 
     context "when selecting all areas" do
       it "lists all initiatives", :slow do
-        within ".filters .area_id_check_boxes_tree_filter" do
+        within ".filters .with_any_area_check_boxes_tree_filter" do
           uncheck "All"
           check "All"
         end
@@ -259,7 +259,7 @@
 
     context "when selecting one area" do
       it "lists the filtered initiatives", :slow do
-        within ".filters .area_id_check_boxes_tree_filter" do
+        within ".filters .with_any_area_check_boxes_tree_filter" do
           uncheck "All"
           within all(".filters__has-subfilters").first do
             click_button
@@ -277,7 +277,7 @@
 
     context "when selecting one area type" do
       it "lists the filtered initiatives", :slow do
-        within ".filters .area_id_check_boxes_tree_filter" do
+        within ".filters .with_any_area_check_boxes_tree_filter" do
           uncheck "All"
           check area_type1.name[I18n.locale.to_s]
         end
diff --git a/decidim-initiatives/spec/system/initiative_spec.rb b/decidim-initiatives/spec/system/initiative_spec.rb
index d099db3cc0840..463e1192ccf7e 100644
--- a/decidim-initiatives/spec/system/initiative_spec.rb
+++ b/decidim-initiatives/spec/system/initiative_spec.rb
@@ -58,6 +58,24 @@
         end
       end
 
+      context "when signature interval is defined" do
+        let(:base_initiative) do
+          create(:initiative,
+                 organization: organization,
+                 signature_start_date: 1.day.ago,
+                 signature_end_date: 1.day.from_now,
+                 state: state)
+        end
+
+        it "displays collection period" do
+          within ".process-header__phase" do
+            expect(page).to have_content("Signature collection period")
+            expect(page).to have_content(1.day.ago.strftime("%Y-%m-%d"))
+            expect(page).to have_content(1.day.from_now.strftime("%Y-%m-%d"))
+          end
+        end
+      end
+
       it_behaves_like "initiative shows signatures"
 
       it "shows the author name once in the authors list" do
@@ -98,6 +116,30 @@
       end
 
       it_behaves_like "has attachments"
+
+      it "displays comments section" do
+        expect(page).to have_css(".comments")
+        expect(page).to have_content("0 Comments")
+      end
+
+      context "when comments are disabled" do
+        let(:base_initiative) do
+          create(:initiative, organization: organization, state: state, scoped_type: scoped_type)
+        end
+
+        let(:scoped_type) do
+          create(:initiatives_type_scope,
+                 type: create(:initiatives_type,
+                              :with_comments_disabled,
+                              organization: organization,
+                              signature_type: "online"))
+        end
+
+        it "does not have comments" do
+          expect(page).not_to have_css(".comments")
+          expect(page).not_to have_content("0 Comments")
+        end
+      end
     end
   end
 
diff --git a/decidim-initiatives/spec/system/initiatives_spec.rb b/decidim-initiatives/spec/system/initiatives_spec.rb
index 1c14a5c24210a..3b0cf5d4dc3c5 100644
--- a/decidim-initiatives/spec/system/initiatives_spec.rb
+++ b/decidim-initiatives/spec/system/initiatives_spec.rb
@@ -83,7 +83,7 @@
         let!(:closed_initiative) do
           create(:initiative, :discarded, organization: organization)
         end
-        let(:base_initiative) {}
+        let(:base_initiative) { nil }
 
         before do
           visit decidim_initiatives.initiatives_path
@@ -141,4 +141,17 @@
       end
     end
   end
+
+  context "when there are more than 20 initiatives" do
+    before do
+      create_list(:initiative, 21, organization: organization)
+      visit decidim_initiatives.initiatives_path
+    end
+
+    it "shows the correct initiatives count" do
+      within "#initiatives-count" do
+        expect(page).to have_content("21")
+      end
+    end
+  end
 end
diff --git a/decidim-initiatives/spec/types/initiative_type_spec.rb b/decidim-initiatives/spec/types/initiative_type_spec.rb
index 3cf69c386f953..1eef4e1da9c73 100644
--- a/decidim-initiatives/spec/types/initiative_type_spec.rb
+++ b/decidim-initiatives/spec/types/initiative_type_spec.rb
@@ -77,7 +77,7 @@ module Initiatives
       describe "signatureStartDate" do
         let(:query) { "{ signatureStartDate }" }
 
-        it "returns the signature start date of the initiative " do
+        it "returns the signature start date of the initiative" do
           expect(response["signatureStartDate"]).to eq(model.signature_start_date.to_date.iso8601)
         end
       end
diff --git a/decidim-meetings/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb b/decidim-meetings/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb
index 72d4eaf483b3d..c74750e298bd4 100644
--- a/decidim-meetings/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb
@@ -10,7 +10,7 @@ def base_relation
             .published
             .not_hidden
             .upcoming
-            .visible_meeting_for(current_user)
+            .visible_for(current_user)
             .where(component: published_components)
         end
 
diff --git a/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb b/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb
index 5d065025fee55..6be4aa973b1a6 100644
--- a/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home upcoming-meetings home-section">
+<section id="upcoming_meetings" class="wrapper-home upcoming-meetings home-section">
   <div class="row">
     <h3 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_meetings.upcoming_meetings") %></h3>
     <div class="row">
diff --git a/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb b/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb
index a23549a2ad79c..3ac8bb65881b5 100644
--- a/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb
@@ -14,9 +14,9 @@ def show
 
         def upcoming_meetings
           @upcoming_meetings ||= Decidim::Meetings::Meeting
-                                 .includes(component: :participatory_space)
+                                 .includes(:author, component: :participatory_space)
                                  .where(component: meeting_components)
-                                 .visible_meeting_for(current_user)
+                                 .visible_for(current_user)
                                  .published
                                  .where("end_time >= ?", Time.current)
                                  .except_withdrawn
diff --git a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
index f6d3f053741b2..ebcf7290b9310 100644
--- a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
@@ -22,7 +22,7 @@ def meetings
                                                 .except_withdrawn
                                                 .published
                                                 .not_hidden
-                                                .visible_meeting_for(current_user)
+                                                .visible_for(current_user)
       end
 
       def past_meetings
@@ -44,6 +44,15 @@ def past_meetings_count
       def upcoming_meetings_count
         @upcoming_meetings_count ||= meetings.upcoming.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/meetings/highlighted_meetings_for_component"
+        hash << meetings.cache_key_with_version
+        hash.push(current_user.try(:id))
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb
index a3181fca229e3..f0a5e6b2e05fc 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/close_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user closes a Meeting from the admin
       # panel.
-      class CloseMeeting < Rectify::Command
+      class CloseMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
index 2c2e9e398a7cb..c9444c97dd31a 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # A command with all the business logic when copying a meeting
       # in the system.
-      class CopyMeeting < Rectify::Command
+      class CopyMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -44,8 +44,8 @@ def copy_meeting!
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
             form.current_user,
-            scope: meeting.scope,
-            category: meeting.category,
+            scope: form.scope,
+            category: form.category,
             title: parsed_title,
             description: parsed_description,
             end_time: form.end_time,
@@ -60,10 +60,29 @@ def copy_meeting!
             transparent: form.transparent,
             author: form.current_organization,
             questionnaire: form.questionnaire,
+            online_meeting_url: form.online_meeting_url,
+            type_of_meeting: form.type_of_meeting,
+            iframe_embed_type: form.iframe_embed_type,
+            iframe_access_level: form.iframe_access_level,
+            comments_enabled: form.comments_enabled,
+            comments_start_time: form.comments_start_time,
+            comments_end_time: form.comments_end_time,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            **fields_from_meeting
+          )
+        end
+
+        def fields_from_meeting
+          {
             registrations_enabled: meeting.registrations_enabled,
             available_slots: meeting.available_slots,
-            registration_terms: meeting.registration_terms
-          )
+            registration_terms: meeting.registration_terms,
+            reserved_slots: meeting.reserved_slots,
+            customize_registration_email: meeting.customize_registration_email,
+            registration_form_enabled: meeting.registration_form_enabled,
+            registration_email_custom_content: meeting.registration_email_custom_content
+          }
         end
 
         def copy_services!
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/create_agenda.rb b/decidim-meetings/app/commands/decidim/meetings/admin/create_agenda.rb
index db0769d7ce10c..de3e479252191 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/create_agenda.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/create_agenda.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateAgenda < Rectify::Command
+      class CreateAgenda < Decidim::Command
         def initialize(form, meeting)
           @form = form
           @meeting = meeting
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/create_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/create_meeting.rb
index 20df58623580d..61d3b7673e892 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/create_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/create_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateMeeting < Rectify::Command
+      class CreateMeeting < Decidim::Command
         def initialize(form)
           @form = form
         end
@@ -42,7 +42,6 @@ def create_meeting!
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -55,8 +54,6 @@ def create_meeting!
             registration_terms: form.current_component.settings.default_registration_terms,
             component: form.current_component,
             questionnaire: Decidim::Forms::Questionnaire.new,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/destroy_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/destroy_meeting.rb
index b83adcce7b35c..ab4d0d57a3506 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/destroy_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/destroy_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user destroys a Meeting from the admin
       # panel.
-      class DestroyMeeting < Rectify::Command
+      class DestroyMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # meeting - The current instance of the page to be closed.
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/export_meeting_registrations.rb b/decidim-meetings/app/commands/decidim/meetings/admin/export_meeting_registrations.rb
index 346bd9218f784..f0d6ae003511e 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/export_meeting_registrations.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/export_meeting_registrations.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user exports the registrations of
       # a Meeting from the admin panel.
-      class ExportMeetingRegistrations < Rectify::Command
+      class ExportMeetingRegistrations < Decidim::Command
         # meeting - The current instance of the page to be closed.
         # format - a string representing the export format
         # current_user - the user performing the action
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb
index eb21064ef682f..a0d230f049434 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # A command with all the business logic to invite users to join a meeting.
       #
-      class InviteUserToJoinMeeting < Rectify::Command
+      class InviteUserToJoinMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -86,16 +86,14 @@ def invite_user
         end
 
         def user
-          @user ||= begin
-            if form.existing_user
-              form.user
-            else
-              Decidim::User.find_or_initialize_by(
-                organization: form.current_organization,
-                email: form.email.downcase
-              )
-            end
-          end
+          @user ||= if form.existing_user
+                      form.user
+                    else
+                      Decidim::User.find_or_initialize_by(
+                        organization: form.current_organization,
+                        email: form.email.downcase
+                      )
+                    end
         end
 
         def invite_user_to_sign_up
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/publish_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/publish_meeting.rb
index 552a159faa331..67e973b925965 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/publish_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/publish_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # A command with all the business logic that publishes an
       # existing meeting.
-      class PublishMeeting < Rectify::Command
+      class PublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/unpublish_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/unpublish_meeting.rb
index f7b549c704b8b..a57a1452295e2 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/unpublish_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/unpublish_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # A command with all the business logic that unpublishes an
       # existing meeting.
-      class UnpublishMeeting < Rectify::Command
+      class UnpublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_agenda.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_agenda.rb
index 1bb1e7e3c8734..476f5061a502f 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_agenda.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_agenda.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class UpdateAgenda < Rectify::Command
+      class UpdateAgenda < Decidim::Command
         def initialize(form, agenda)
           @form = form
           @agenda = agenda
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb
index 9524e3f8114ed..02055ae047714 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_meeting.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user changes a Meeting from the admin
       # panel.
-      class UpdateMeeting < Rectify::Command
+      class UpdateMeeting < Decidim::Command
         # Initializes a UpdateMeeting Command.
         #
         # form - The form from which to get the data.
@@ -51,7 +51,6 @@ def update_meeting!
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -60,8 +59,6 @@ def update_meeting!
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
             transparent: form.transparent,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_question_status.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_question_status.rb
index dee4795fdab15..2d60e97759c7e 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_question_status.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_question_status.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionStatus < Rectify::Command
+      class UpdateQuestionStatus < Decidim::Command
         class InvalidStatus < StandardError; end
 
         # Initializes a UpdateQuestionnaire Command.
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_questionnaire.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_questionnaire.rb
index 2b588704dbfd5..46590217bc14d 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_questionnaire.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_questionnaire.rb
@@ -5,7 +5,7 @@ module Meetings
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
@@ -21,12 +21,15 @@ def initialize(form, questionnaire)
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          Decidim::Meetings::Questionnaire.transaction do
-            create_questionnaire_for
-            create_questionaire
-            if @questionnaire.questions_editable?
-              update_questionnaire_questions
-              delete_answers
+          Decidim.traceability.perform_action!("update", Decidim::Meetings::Questionnaire, @form.current_user, { meeting: @questionnaire.questionnaire_for.try(:meeting) }) do
+            Decidim::Meetings::Questionnaire.transaction do
+              create_questionnaire_for
+              create_questionaire
+              if @questionnaire.questions_editable?
+                update_questionnaire_questions
+                delete_answers
+              end
+              @questionnaire
             end
           end
 
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
index 262128076bc76..987a790a2ccaa 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the user updates the meeting registrations.
-      class UpdateRegistrations < Rectify::Command
+      class UpdateRegistrations < Decidim::Command
         # Initializes a UpdateRegistrations Command.
         #
         # form - The form from which to get the data.
@@ -18,9 +18,9 @@ def initialize(form, meeting)
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          meeting.with_lock do
-            return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid?
 
+          meeting.with_lock do
             update_meeting_registrations
             send_notification if should_notify_followers?
           end
@@ -40,6 +40,8 @@ def update_meeting_registrations
             meeting.available_slots = form.available_slots
             meeting.reserved_slots = form.reserved_slots
             meeting.registration_terms = form.registration_terms
+            meeting.customize_registration_email = form.customize_registration_email
+            meeting.registration_email_custom_content = form.registration_email_custom_content if form.customize_registration_email
           end
 
           meeting.save!
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/validate_registration_code.rb b/decidim-meetings/app/commands/decidim/meetings/admin/validate_registration_code.rb
index acc22a0b15586..6a989d12b22fd 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/validate_registration_code.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/validate_registration_code.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the admin validates a registration code in the admin panel.
-      class ValidateRegistrationCode < Rectify::Command
+      class ValidateRegistrationCode < Decidim::Command
         # Initializes a ValidateRegistrationCode Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-meetings/app/commands/decidim/meetings/close_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/close_meeting.rb
index 734bf11454929..41e9a00d87218 100644
--- a/decidim-meetings/app/commands/decidim/meetings/close_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/close_meeting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user closes a Meeting from the public
     # views.
-    class CloseMeeting < Rectify::Command
+    class CloseMeeting < Decidim::Command
       # Initializes a CloseMeeting Command.
       #
       # form - The form from which to get the data.
diff --git a/decidim-meetings/app/commands/decidim/meetings/create_answer.rb b/decidim-meetings/app/commands/decidim/meetings/create_answer.rb
index d18ad508f6e40..cda46268188f8 100644
--- a/decidim-meetings/app/commands/decidim/meetings/create_answer.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/create_answer.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user creates an Answer in a meeting poll.
-    class CreateAnswer < Rectify::Command
+    class CreateAnswer < Decidim::Command
       def initialize(form, current_user, questionnaire)
         @form = form
         @current_user = current_user
diff --git a/decidim-meetings/app/commands/decidim/meetings/create_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/create_meeting.rb
index ec260d319b400..841cf3bc4e3de 100644
--- a/decidim-meetings/app/commands/decidim/meetings/create_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/create_meeting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when a participant or user group creates a Meeting from the public
     # views.
-    class CreateMeeting < Rectify::Command
+    class CreateMeeting < Decidim::Command
       def initialize(form)
         @form = form
       end
diff --git a/decidim-meetings/app/commands/decidim/meetings/decline_invitation.rb b/decidim-meetings/app/commands/decidim/meetings/decline_invitation.rb
index 0c9f071420a11..b435ca1e6c47e 100644
--- a/decidim-meetings/app/commands/decidim/meetings/decline_invitation.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/decline_invitation.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user declines an invite to the meeting.
-    class DeclineInvitation < Rectify::Command
+    class DeclineInvitation < Decidim::Command
       # Initializes a DeclineInvitation Command.
       #
       # meeting - The current instance of the meeting where user has been invited.
diff --git a/decidim-meetings/app/commands/decidim/meetings/join_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/join_meeting.rb
index e4395a1b4e263..2f024114fe253 100644
--- a/decidim-meetings/app/commands/decidim/meetings/join_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/join_meeting.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user joins a meeting.
-    class JoinMeeting < Rectify::Command
+    class JoinMeeting < Decidim::Command
       # Initializes a JoinMeeting Command.
       #
       # meeting - The current instance of the meeting to be joined.
@@ -21,12 +21,11 @@ def initialize(meeting, user, registration_form)
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        meeting.with_lock do
-          return broadcast(:invalid) unless can_join_meeting?
-          return broadcast(:invalid_form) unless registration_form.valid?
-
-          return broadcast(:invalid) if answer_questionnaire == :invalid
+        return broadcast(:invalid) unless can_join_meeting?
+        return broadcast(:invalid_form) unless registration_form.valid?
+        return broadcast(:invalid) if answer_questionnaire == :invalid
 
+        meeting.with_lock do
           create_registration
           accept_invitation
           send_email_confirmation
@@ -132,7 +131,7 @@ def occupied_slots_over?(percentage)
       end
 
       def questionnaire?
-        registration_form.model_name == "Questionnaire"
+        registration_form.model_name == "questionnaire"
       end
     end
   end
diff --git a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
index 5b947bfc1e482..c592030d8e164 100644
--- a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user leaves a meeting.
-    class LeaveMeeting < Rectify::Command
+    class LeaveMeeting < Decidim::Command
       # Initializes a LeaveMeeting Command.
       #
       # meeting - The current instance of the meeting to be left.
@@ -18,9 +18,9 @@ def initialize(meeting, user)
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        @meeting.with_lock do
-          return broadcast(:invalid) unless registration
+        return broadcast(:invalid) unless registration
 
+        @meeting.with_lock do
           destroy_registration
           destroy_questionnaire_answers
           decrement_score
diff --git a/decidim-meetings/app/commands/decidim/meetings/update_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/update_meeting.rb
index 61f5d6f605eba..3bc92672e1717 100644
--- a/decidim-meetings/app/commands/decidim/meetings/update_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/update_meeting.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user changes a Meeting from the admin
     # panel.
-    class UpdateMeeting < Rectify::Command
+    class UpdateMeeting < Decidim::Command
       # Initializes a UpdateMeeting Command.
       #
       # form - The form from which to get the data.
diff --git a/decidim-meetings/app/commands/decidim/meetings/withdraw_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/withdraw_meeting.rb
index 2406d96a99616..4ddb418c85a7f 100644
--- a/decidim-meetings/app/commands/decidim/meetings/withdraw_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/withdraw_meeting.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A command with all the business logic when a user withdraws a new proposal.
-    class WithdrawMeeting < Rectify::Command
+    class WithdrawMeeting < Decidim::Command
       # Public: Initializes the command.
       #
       # meeting     - The meeting to withdraw.
diff --git a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb
index e327131ea109a..3ff31bcabc1c1 100644
--- a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb
+++ b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb
@@ -21,23 +21,23 @@ def base_query
 
           def filters
             [
-              :type_eq,
+              :with_any_type,
               :is_upcoming_true,
               :scope_id_eq,
               :category_id_eq,
-              :origin_eq,
+              :with_any_origin,
               :closed_at_present
             ]
           end
 
           def filters_with_values
             {
-              type_eq: meeting_types,
+              with_any_type: meeting_types,
               scope_id_eq: scope_ids_hash(scopes.top_level),
               category_id_eq: category_ids_hash(categories.first_class),
               closed_at_present: %w(true false),
               is_upcoming_true: %w(true false),
-              origin_eq: %w(citizen official user_group)
+              with_any_origin: %w(participants official user_group)
             }
           end
 
diff --git a/decidim-meetings/app/controllers/concerns/decidim/meetings/filterable.rb b/decidim-meetings/app/controllers/concerns/decidim/meetings/filterable.rb
index c34c9197235fb..12399ac9872b5 100644
--- a/decidim-meetings/app/controllers/concerns/decidim/meetings/filterable.rb
+++ b/decidim-meetings/app/controllers/concerns/decidim/meetings/filterable.rb
@@ -15,14 +15,8 @@ def default_filter_type_params
           %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
         end
 
-        def default_search_params
-          {
-            scope: Meeting.not_hidden.visible_meeting_for(current_user)
-          }
-        end
-
         def default_filter_origin_params
-          filter_origin_params = %w(citizens)
+          filter_origin_params = %w(participants)
           filter_origin_params << "official"
           filter_origin_params << "user_group" if current_organization.user_groups_enabled?
           filter_origin_params
diff --git a/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb
index 48937825dfeb4..7f6d356d3a142 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb
@@ -11,13 +11,13 @@ class MeetingCopiesController < Admin::ApplicationController
         def new
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingCopyForm).from_model(meeting)
+          @form = form(MeetingForm).from_model(meeting)
         end
 
         def create
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingCopyForm).from_params(params, current_component: current_component)
+          @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           CopyMeeting.call(@form, meeting) do
             on(:ok) do
diff --git a/decidim-meetings/app/controllers/decidim/meetings/calendars_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/calendars_controller.rb
index 64813a8d69796..4f953a48485e4 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/calendars_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/calendars_controller.rb
@@ -11,7 +11,7 @@ class CalendarsController < Decidim::Meetings::ApplicationController
       skip_around_action :use_organization_time_zone
 
       def show
-        render plain: CalendarRenderer.for(current_component), content_type: "type/calendar"
+        render plain: CalendarRenderer.for(current_component, params[:filter]), content_type: "type/calendar"
       end
 
       def meeting_calendar
diff --git a/decidim-meetings/app/controllers/decidim/meetings/directory/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/directory/meetings_controller.rb
index 04aef3c17464e..b689004a92527 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/directory/meetings_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/directory/meetings_controller.rb
@@ -15,34 +15,40 @@ class MeetingsController < Decidim::Meetings::Directory::ApplicationController
         helper Decidim::FiltersHelper
         helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
+        helper Decidim::ShortLinkHelper
 
         helper_method :meetings, :search
 
         def calendar
-          render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
+          render plain: CalendarRenderer.for(current_organization, params[:filter]), content_type: "type/calendar"
         end
 
         private
 
         def meetings
-          is_past_meetings = params.dig("filter", "date")&.include?("past")
-          @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
+          is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
+          @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))
         end
 
-        def search_klass
-          ::Decidim::Meetings::Directory::MeetingSearch
+        def search_collection
+          Meeting.where(component: meeting_components).published.not_hidden.visible_for(current_user).with_availability(
+            filter_params[:availability]
+          ).includes(
+            :component,
+            attachments: :file_attachment
+          )
         end
 
         def default_filter_params
           {
-            date: "upcoming",
-            search_text: "",
+            with_any_date: "upcoming",
+            title_or_description_cont: "",
             activity: "all",
-            scope_id: default_filter_scope_params,
-            space: default_filter_space_params,
-            type: default_filter_type_params,
-            origin: default_filter_origin_params,
-            category_id: default_filter_category_params
+            with_any_scope: default_filter_scope_params,
+            with_any_space: default_filter_space_params,
+            with_any_type: default_filter_type_params,
+            with_any_origin: default_filter_origin_params,
+            with_any_global_category: default_filter_category_params
           }
         end
 
@@ -69,10 +75,6 @@ def default_filter_scope_params
           %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
         end
 
-        def context_params
-          { component: meeting_components, organization: current_organization, current_user: current_user }
-        end
-
         def meeting_components
           @meeting_components ||= Decidim::Component
                                   .where(manifest_name: "meetings")
diff --git a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
index a16e9c985f3d1..8584000a2721e 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
@@ -13,6 +13,7 @@ class MeetingsController < Decidim::Meetings::ApplicationController
 
       helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceVersionsHelper
+      helper Decidim::ShortLinkHelper
 
       helper_method :meetings, :meeting, :registration, :search
 
@@ -41,13 +42,13 @@ def create
       end
 
       def index
-        return unless search.results.blank? && params.dig("filter", "date") != %w(past)
+        return unless search.result.blank? && params.dig("filter", "date") != %w(past)
 
-        @past_meetings = search_klass.new(search_params.merge(date: %w(past)))
+        @past_meetings ||= search_with(filter_params.merge(with_any_date: %w(past)))
 
-        if @past_meetings.results.present?
+        if @past_meetings.result.present?
           params[:filter] ||= {}
-          params[:filter][:date] = %w(past)
+          params[:filter][:with_any_date] = %w(past)
           @forced_past_meetings = true
           @search = @past_meetings
         end
@@ -108,16 +109,21 @@ def meeting
       end
 
       def meetings
-        is_past_meetings = params.dig("filter", "date")&.include?("past")
-        @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
+        is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
+        @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))
       end
 
       def registration
         @registration ||= meeting.registrations.find_by(user: current_user)
       end
 
-      def search_klass
-        MeetingSearch
+      def search_collection
+        Meeting.where(component: current_component).published.not_hidden.visible_for(current_user).with_availability(
+          filter_params[:with_availability]
+        ).includes(
+          :component,
+          attachments: :file_attachment
+        )
       end
 
       def meeting_form
@@ -126,14 +132,15 @@ def meeting_form
 
       def default_filter_params
         {
-          search_text: "",
-          date: "upcoming",
+          search_text_cont: "",
+          with_any_date: "upcoming",
           activity: "all",
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params,
-          state: nil,
-          origin: default_filter_origin_params,
-          type: default_filter_type_params
+          with_availability: "",
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params,
+          with_any_state: nil,
+          with_any_origin: default_filter_origin_params,
+          with_any_type: default_filter_type_params
         }
       end
     end
diff --git a/decidim-meetings/app/events/decidim/meetings/meeting_registration_notification_event.rb b/decidim-meetings/app/events/decidim/meetings/meeting_registration_notification_event.rb
index 6c419264a1689..c4b0e1176d8e0 100644
--- a/decidim-meetings/app/events/decidim/meetings/meeting_registration_notification_event.rb
+++ b/decidim-meetings/app/events/decidim/meetings/meeting_registration_notification_event.rb
@@ -6,7 +6,7 @@ class MeetingRegistrationNotificationEvent < Decidim::Events::BaseEvent
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/close_meeting_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/close_meeting_form.rb
index 377c4c0584410..c82c4d742d4c6 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/close_meeting_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/close_meeting_form.rb
@@ -16,7 +16,7 @@ class CloseMeetingForm < Decidim::Form
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
         attribute :proposals
-        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
 
         validates :closing_report, translatable_presence: true
         validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_copy_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_copy_form.rb
deleted file mode 100644
index 823a32cc94b39..0000000000000
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_copy_form.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    module Admin
-      # A form object used to copy a meeting from the admin
-      # dashboard.
-      #
-      class MeetingCopyForm < ::Decidim::Meetings::BaseMeetingForm
-        include TranslatableAttributes
-
-        translatable_attribute :title, String
-        translatable_attribute :description, String
-        translatable_attribute :location, String
-        translatable_attribute :location_hints, String
-
-        attribute :show_embedded_iframe, Boolean, default: false
-        attribute :private_meeting, Boolean
-        attribute :transparent, Boolean
-        attribute :services, Array[MeetingServiceForm]
-
-        mimic :meeting
-
-        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
-        validates :title, translatable_presence: true
-        validates :description, translatable_presence: true
-        validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
-
-        def map_model(model)
-          self.services = model.services.map do |service|
-            MeetingServiceForm.new(service.attributes)
-          end
-        end
-
-        def services_to_persist
-          services.reject(&:deleted)
-        end
-
-        def number_of_services
-          services.size
-        end
-
-        alias component current_component
-
-        def questionnaire
-          Decidim::Forms::Questionnaire.new
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb
index 7118c70ba1163..f3dd956eaf29b 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb
@@ -14,7 +14,6 @@ class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
         attribute :transparent, Boolean
         attribute :registration_type, String
         attribute :registration_url, String
-        attribute :available_slots, Integer, default: 0
         attribute :customize_registration_email, Boolean
         attribute :iframe_embed_type, String, default: "none"
         attribute :comments_enabled, Boolean, default: true
@@ -26,13 +25,11 @@ class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
-        translatable_attribute :registration_email_custom_content, String
 
         validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :registration_type, presence: true
-        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
         validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
         validates :type_of_meeting, presence: true
         validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
@@ -75,14 +72,14 @@ def number_of_services
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category
@@ -95,15 +92,6 @@ def clean_type_of_meeting
           type_of_meeting.presence
         end
 
-        def type_of_meeting_select
-          Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
-            [
-              I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
-              type
-            ]
-          end
-        end
-
         def iframe_access_level_select
           Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
             [
@@ -122,6 +110,11 @@ def iframe_embed_type_select
           end
         end
 
+        # Support for copy meeting
+        def questionnaire
+          Decidim::Forms::Questionnaire.new
+        end
+
         def on_this_platform?
           registration_type == "on_this_platform"
         end
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb
index 6d2d2eb1adfb7..e371576823a9b 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb
@@ -12,7 +12,7 @@ class MeetingRegistrationInviteForm < Form
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
index a4b3e40cd8038..dccfb96e12d03 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
@@ -11,9 +11,12 @@ class MeetingRegistrationsForm < Decidim::Form
 
         attribute :registrations_enabled, Boolean
         attribute :registration_form_enabled, Boolean
+        attribute :customize_registration_email, Boolean
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
+
         translatable_attribute :registration_terms, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }
diff --git a/decidim-meetings/app/forms/decidim/meetings/answer_form.rb b/decidim-meetings/app/forms/decidim/meetings/answer_form.rb
index f6111d8fcb1cb..4a2056e328ecf 100644
--- a/decidim-meetings/app/forms/decidim/meetings/answer_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/answer_form.rb
@@ -10,7 +10,6 @@ class AnswerForm < Decidim::Form
       attribute :body, String
       attribute :choices, Array[AnswerChoiceForm]
       attribute :current_user, Decidim::User
-      attribute :answer, Decidim::Meetings::Answer
 
       validates :selected_choices, presence: true
       validate :max_choices, if: -> { question.max_choices }
diff --git a/decidim-meetings/app/forms/decidim/meetings/close_meeting_form.rb b/decidim-meetings/app/forms/decidim/meetings/close_meeting_form.rb
index fa8feb35f8d59..63f869f10f9fb 100644
--- a/decidim-meetings/app/forms/decidim/meetings/close_meeting_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/close_meeting_form.rb
@@ -7,7 +7,7 @@ class CloseMeetingForm < Decidim::Form
       attribute :closing_report, String
       attribute :proposal_ids, Array[Integer]
       attribute :proposals
-      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
       attribute :attendees_count, Integer, default: 0
 
       validates :closing_report, presence: true
diff --git a/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb b/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
index b7201c36dc278..7bef17fe9bdd5 100644
--- a/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/meeting_form.rb
@@ -60,14 +60,14 @@ def map_model(model)
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+        @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the meeting
       def decidim_scope_id
-        @decidim_scope_id || scope&.id
+        super || scope&.id
       end
 
       def category
diff --git a/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb b/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb
index a008603313d11..1c84469f7ac3f 100644
--- a/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb
+++ b/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb
@@ -16,7 +16,7 @@ module ApplicationHelper
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-        origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
+        origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants")) # todo
         if current_organization.user_groups_enabled?
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
         end
@@ -65,7 +65,12 @@ def safe_content?
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_meeting_body(meeting)
-        Decidim::ContentProcessor.render(render_sanitized_content(meeting, :description), "div")
+        sanitized = render_sanitized_content(meeting, :description)
+        if safe_content?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
       end
 
       def prevent_timeout_seconds
diff --git a/decidim-meetings/app/helpers/decidim/meetings/directory/application_helper.rb b/decidim-meetings/app/helpers/decidim/meetings/directory/application_helper.rb
index 550484b316d4f..f4cdd42a25492 100644
--- a/decidim-meetings/app/helpers/decidim/meetings/directory/application_helper.rb
+++ b/decidim-meetings/app/helpers/decidim/meetings/directory/application_helper.rb
@@ -107,7 +107,7 @@ def directory_filter_categories_values
         def directory_filter_origin_values
           origin_values = []
           origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-          origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens"))
+          origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants"))
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) if current_organization.user_groups_enabled?
 
           TreeNode.new(
diff --git a/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb b/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb
index 12a78643099f4..1c7e43972a7bb 100644
--- a/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb
+++ b/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb
@@ -30,12 +30,10 @@ def meeting_description(meeting, max_length = 120)
       # Returns a String.
       def meeting_type_badge_css_class(type)
         case type
-        when "private"
+        when "private", "withdraw"
           "alert"
         when "transparent"
           "secondary"
-        when "withdraw"
-          "alert"
         end
       end
 
diff --git a/decidim-meetings/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb b/decidim-meetings/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb
new file mode 100644
index 0000000000000..c783c67d050f7
--- /dev/null
+++ b/decidim-meetings/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class SendCloseMeetingReminderJob < ApplicationJob
+      queue_as :close_meeting_reminder
+
+      def perform(record)
+        return if record.remindable.closed?
+
+        ::Decidim::ReminderDelivery.create(reminder: record.reminder)
+        ::Decidim::Meetings::CloseMeetingReminderMailer.close_meeting_reminder(record).deliver_now
+        record.update(state: "completed")
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb b/decidim-meetings/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb
new file mode 100644
index 0000000000000..a9f9cb8bc7591
--- /dev/null
+++ b/decidim-meetings/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A custom mailer for sending notifications for overdue meetings
+    class CloseMeetingReminderMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include ActionView::Helpers::SanitizeHelper
+      include Decidim::ApplicationHelper
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
+
+      helper_method :routes
+
+      # Send the user an email reminder to close the meetings
+      #
+      # record - the reminder record specific to a past meeting.
+      def close_meeting_reminder(record)
+        @reminder = record.reminder
+        @user = record.reminder.user
+        with_user(@user) do
+          @meeting = record.remindable
+          @organization = @user.organization
+          mail(
+            to: @user.email,
+            subject: I18n.t(
+              "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.subject",
+              organization_name: @organization.name
+            )
+          )
+        end
+      end
+
+      private
+
+      def routes
+        @routes ||= Decidim::EngineRouter.main_proxy(@reminder.component)
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/models/decidim/meetings/answer.rb b/decidim-meetings/app/models/decidim/meetings/answer.rb
index fd0ea2e623cbd..e5abc929ab97a 100644
--- a/decidim-meetings/app/models/decidim/meetings/answer.rb
+++ b/decidim-meetings/app/models/decidim/meetings/answer.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for an Answer in the Decidim::Meetings
     class Answer < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id", optional: true
       belongs_to :questionnaire, class_name: "Decidim::Meetings::Questionnaire", foreign_key: "decidim_questionnaire_id"
@@ -24,7 +24,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityUserAnswersSerializer
+        Decidim::Meetings::DownloadYourDataUserAnswersSerializer
       end
 
       def organization
diff --git a/decidim-meetings/app/models/decidim/meetings/invite.rb b/decidim-meetings/app/models/decidim/meetings/invite.rb
index 86bec395de162..bd4307a20ecac 100644
--- a/decidim-meetings/app/models/decidim/meetings/invite.rb
+++ b/decidim-meetings/app/models/decidim/meetings/invite.rb
@@ -6,7 +6,7 @@ module Meetings
     class Invite < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -14,7 +14,7 @@ class Invite < Meetings::ApplicationRecord
       validates :user, uniqueness: { scope: :meeting }
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityInviteSerializer
+        Decidim::Meetings::DownloadYourDataInviteSerializer
       end
 
       def self.log_presenter_class_for(_log)
diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index d79fa1efc3500..dc4089cb47bb0 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -25,6 +25,7 @@ class Meeting < Meetings::ApplicationRecord
       include Decidim::Authorable
       include Decidim::TranslatableResource
       include Decidim::Publicable
+      include Decidim::FilterableResource
 
       TYPE_OF_MEETING = %w(in_person online hybrid).freeze
       REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
@@ -59,8 +60,26 @@ class Meeting < Meetings::ApplicationRecord
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
       scope :withdrawn, -> { where(state: "withdrawn") }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
+      scope :with_availability, lambda { |state_key|
+        case state_key
+        when "withdrawn"
+          withdrawn
+        else
+          except_withdrawn
+        end
+      }
+      scope_search_multi :with_any_date, [:upcoming, :past]
+      scope :with_any_space, lambda { |*target_space|
+        target_spaces = target_space.compact.compact_blank
+
+        return self if target_spaces.blank? || target_spaces.include?("all")
 
-      scope :visible_meeting_for, lambda { |user|
+        joins(:component).where(
+          decidim_components: { participatory_space_type: target_spaces.map(&:classify) }
+        )
+      }
+
+      scope :visible_for, lambda { |user|
         (all.distinct if user&.admin?) ||
           if user.present?
             spaces = Decidim.participatory_space_registry.manifests.filter_map do |manifest|
@@ -112,6 +131,10 @@ class Meeting < Meetings::ApplicationRecord
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
+      scope :authored_by, ->(author) { where(decidim_author_id: author) }
+
+      scope_search_multi :with_any_type, TYPE_OF_MEETING.map(&:to_sym)
+
       TYPE_OF_MEETING.each do |type|
         scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
         scope "not_#{type}".to_sym, -> { where.not(type_of_meeting: type.to_sym) }
@@ -218,7 +241,7 @@ def can_participate?(user)
       end
 
       def current_user_can_visit_meeting?(user)
-        Decidim::Meetings::Meeting.visible_meeting_for(user).exists?(id: id)
+        Decidim::Meetings::Meeting.visible_for(user).exists?(id: id)
       end
 
       def iframe_access_level_allowed_for_user?(user)
@@ -345,13 +368,9 @@ def self.sort_by_translated_title_desc
         order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("DESC")))
       end
 
-      ransacker :type do
-        Arel.sql(%("decidim_meetings_meetings"."type_of_meeting"))
-      end
-
-      ransacker :title do
-        Arel.sql(%{cast("decidim_meetings_meetings"."title" as text)})
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       ransacker :id_string do
         Arel.sql(%{cast("decidim_meetings_meetings"."id" as text)})
@@ -361,13 +380,12 @@ def self.sort_by_translated_title_desc
         Arel.sql("(start_time > NOW())")
       end
 
-      ransacker :origin do
-        Arel.sql("CASE
-            WHEN decidim_author_type = 'Decidim::Organization' THEN 'official'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NOT NULL THEN 'user_group'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NULL THEN 'citizen'
-            ELSE 'unknown' END
-        ")
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_scope, :with_any_category, :with_any_global_category]
+      end
+
+      def self.ransack(params = {}, options = {})
+        MeetingSearch.new(self, params, options)
       end
 
       private
diff --git a/decidim-meetings/app/models/decidim/meetings/questionnaire.rb b/decidim-meetings/app/models/decidim/meetings/questionnaire.rb
index a9391f0beb632..ad498500e85bc 100644
--- a/decidim-meetings/app/models/decidim/meetings/questionnaire.rb
+++ b/decidim-meetings/app/models/decidim/meetings/questionnaire.rb
@@ -4,6 +4,8 @@ module Decidim
   module Meetings
     # The data store for a Questionnaire in the Decidim::Meetings component.
     class Questionnaire < Meetings::ApplicationRecord
+      include Decidim::Traceable
+
       belongs_to :questionnaire_for, polymorphic: true
 
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
@@ -18,6 +20,10 @@ def questions_editable?
       def all_questions_unpublished?
         questions.all?(&:unpublished?)
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Meetings::AdminLog::QuestionnairePresenter
+      end
     end
   end
 end
diff --git a/decidim-meetings/app/models/decidim/meetings/registration.rb b/decidim-meetings/app/models/decidim/meetings/registration.rb
index 57b0782a48402..090c7b8c2dd5c 100644
--- a/decidim-meetings/app/models/decidim/meetings/registration.rb
+++ b/decidim-meetings/app/models/decidim/meetings/registration.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for a Registration in the Decidim::Meetings component.
     class Registration < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -23,7 +23,7 @@ def self.user_collection(user)
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityRegistrationSerializer
+        Decidim::Meetings::DownloadYourDataRegistrationSerializer
       end
 
       # Pluck all Decidim::UserGroup ID's
diff --git a/decidim-meetings/app/packs/src/decidim/meetings/admin/meetings_form.js b/decidim-meetings/app/packs/src/decidim/meetings/admin/meetings_form.js
index 39027991a3057..aeca2717f6911 100644
--- a/decidim-meetings/app/packs/src/decidim/meetings/admin/meetings_form.js
+++ b/decidim-meetings/app/packs/src/decidim/meetings/admin/meetings_form.js
@@ -102,9 +102,7 @@ $(() => {
     attachGeocoding($form.find("#meeting_address"));
 
     const $meetingRegistrationType = $form.find("#meeting_registration_type");
-    const $meetingRegistrationTerms = $form.find("#meeting_registration_terms");
     const $meetingRegistrationUrl = $form.find("#meeting_registration_url");
-    const $meetingAvailableSlots = $form.find("#meeting_available_slots");
 
     const toggleDependsOnSelect = ($target, $showDiv, type) => {
       const value = $target.val();
@@ -113,8 +111,6 @@ $(() => {
 
     $meetingRegistrationType.on("change", (ev) => {
       const $target = $(ev.target);
-      toggleDependsOnSelect($target, $meetingAvailableSlots, "on_this_platform");
-      toggleDependsOnSelect($target, $meetingRegistrationTerms, "on_this_platform");
       toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
     });
 
diff --git a/decidim-meetings/app/packs/src/decidim/meetings/admin/registrations_form.js b/decidim-meetings/app/packs/src/decidim/meetings/admin/registrations_form.js
index 17c13e8aeecf6..909d3a05f315a 100644
--- a/decidim-meetings/app/packs/src/decidim/meetings/admin/registrations_form.js
+++ b/decidim-meetings/app/packs/src/decidim/meetings/admin/registrations_form.js
@@ -5,11 +5,13 @@ $(() => {
     const $registrationsEnabled = $form.find("#meeting_registrations_enabled");
     const $availableSlots = $form.find("#meeting_available_slots");
     const $reservedSlots = $form.find("#meeting_reserved_slots");
+    const $customizeRegistrationEmail = $form.find("#meeting_customize_registration_email");
 
     const toggleDisabledFields = () => {
       const enabled = $registrationsEnabled.prop("checked");
       $availableSlots.attr("disabled", !enabled);
       $reservedSlots.attr("disabled", !enabled);
+      $customizeRegistrationEmail.attr("disabled", !enabled);
 
       $form.find(".editor-container").each((idx, node) => {
         const quill = Quill.find(node);
diff --git a/decidim-meetings/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb b/decidim-meetings/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb
new file mode 100644
index 0000000000000..8ad6aee44fb15
--- /dev/null
+++ b/decidim-meetings/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Meetings::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.meetings.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def resource_presenter
+          @resource_presenter ||= Decidim::Log::ResourcePresenter.new(action_log.resource.questionnaire_for.meeting, h, action_log.resource.questionnaire_for.meeting)
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb b/decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb
index f3919fd3539c7..0a8ccb82f0c48 100644
--- a/decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb
+++ b/decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb
@@ -31,12 +31,7 @@ def title(links: false, html_escape: false, all_locales: false)
       def description(links: false, extras: true, strip_tags: false, all_locales: false)
         return unless meeting
 
-        new_description = handle_locales(meeting.description, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
-          renderer.render(links: links).html_safe
-        end
-
-        content_handle_locale(new_description, all_locales, extras, links, strip_tags)
+        content_handle_locale(meeting.description, all_locales, extras, links, strip_tags)
       end
 
       def location(all_locales: false)
diff --git a/decidim-meetings/app/queries/decidim/meetings/admin/invites.rb b/decidim-meetings/app/queries/decidim/meetings/admin/invites.rb
index 570f205168e73..9cab6f3134aaa 100644
--- a/decidim-meetings/app/queries/decidim/meetings/admin/invites.rb
+++ b/decidim-meetings/app/queries/decidim/meetings/admin/invites.rb
@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # A class used to find the Invites by their status status.
-      class Invites < Rectify::Query
+      class Invites < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # invites - the initial Invites relation that needs to be filtered.
diff --git a/decidim-meetings/app/queries/decidim/meetings/filtered_meetings.rb b/decidim-meetings/app/queries/decidim/meetings/filtered_meetings.rb
index 0f05bb0f9724e..45adfcb763010 100644
--- a/decidim-meetings/app/queries/decidim/meetings/filtered_meetings.rb
+++ b/decidim-meetings/app/queries/decidim/meetings/filtered_meetings.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to find meetings filtered by components and a date range
-    class FilteredMeetings < Rectify::Query
+    class FilteredMeetings < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component
diff --git a/decidim-meetings/app/queries/decidim/meetings/questionnaire_user_answers.rb b/decidim-meetings/app/queries/decidim/meetings/questionnaire_user_answers.rb
index 4e336aa47baad..d8511099d7d30 100644
--- a/decidim-meetings/app/queries/decidim/meetings/questionnaire_user_answers.rb
+++ b/decidim-meetings/app/queries/decidim/meetings/questionnaire_user_answers.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object
diff --git a/decidim-meetings/app/serializers/decidim/meetings/data_portability_invite_serializer.rb b/decidim-meetings/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb
similarity index 89%
rename from decidim-meetings/app/serializers/decidim/meetings/data_portability_invite_serializer.rb
rename to decidim-meetings/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb
index f8d2689cfa5c8..bbd95f12583e1 100644
--- a/decidim-meetings/app/serializers/decidim/meetings/data_portability_invite_serializer.rb
+++ b/decidim-meetings/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityInviteSerializer < Decidim::Exporters::Serializer
-      # Serializes an invite for data portability
+    class DownloadYourDataInviteSerializer < Decidim::Exporters::Serializer
+      # Serializes an invite for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-meetings/app/serializers/decidim/meetings/data_portability_registration_serializer.rb b/decidim-meetings/app/serializers/decidim/meetings/download_your_data_registration_serializer.rb
similarity index 88%
rename from decidim-meetings/app/serializers/decidim/meetings/data_portability_registration_serializer.rb
rename to decidim-meetings/app/serializers/decidim/meetings/download_your_data_registration_serializer.rb
index 1bacc4003da46..60cc8734a8a92 100644
--- a/decidim-meetings/app/serializers/decidim/meetings/data_portability_registration_serializer.rb
+++ b/decidim-meetings/app/serializers/decidim/meetings/download_your_data_registration_serializer.rb
@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityRegistrationSerializer < Decidim::Exporters::Serializer
-      # Serializes a registration for data portability
+    class DownloadYourDataRegistrationSerializer < Decidim::Exporters::Serializer
+      # Serializes a registration for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-meetings/app/services/decidim/meetings/calendar/base_calendar.rb b/decidim-meetings/app/services/decidim/meetings/calendar/base_calendar.rb
index 67c5da29422c7..4a15ed81ba2d3 100644
--- a/decidim-meetings/app/services/decidim/meetings/calendar/base_calendar.rb
+++ b/decidim-meetings/app/services/decidim/meetings/calendar/base_calendar.rb
@@ -14,15 +14,16 @@ class BaseCalendar
         # resource - a resource that has meetings.
         #
         # Returns a String.
-        def self.for(resource)
-          new(resource).calendar
+        def self.for(resource, filters = nil)
+          new(resource, filters).calendar
         end
 
         # Initializes the class.
         #
         # resource - a resource that has meetings.
-        def initialize(resource)
+        def initialize(resource, filters = nil)
           @resource = resource
+          @filters = filters
         end
 
         # Converts the resource meetings to the ICalendar format.
diff --git a/decidim-meetings/app/services/decidim/meetings/calendar/component_calendar.rb b/decidim-meetings/app/services/decidim/meetings/calendar/component_calendar.rb
index 8537034751368..dea207358dc40 100644
--- a/decidim-meetings/app/services/decidim/meetings/calendar/component_calendar.rb
+++ b/decidim-meetings/app/services/decidim/meetings/calendar/component_calendar.rb
@@ -11,11 +11,9 @@ class ComponentCalendar < BaseCalendar
         #
         # Returns a String.
         def events
-          Rails.cache.fetch(cache_key) do
-            meetings.map do |meeting|
-              MeetingCalendar.new(meeting).events
-            end.compact.join
-          end
+          filtered_meetings.map do |meeting|
+            MeetingCalendar.new(meeting).events
+          end.compact.join
         end
 
         private
@@ -29,11 +27,11 @@ def meetings
           Decidim::Meetings::Meeting.where(component: component)
         end
 
-        # Defines the cache key for the given component.
+        # Finds the component meetings.
         #
-        # Returns a String.
-        def cache_key
-          "meetings-calendar-component-#{component.id}-#{component.updated_at.to_i}"
+        # Returns a collection of Meetings filtered based on provided params.
+        def filtered_meetings
+          meetings.not_hidden.published.except_withdrawn.ransack(@filters).result
         end
       end
     end
diff --git a/decidim-meetings/app/services/decidim/meetings/calendar/organization_calendar.rb b/decidim-meetings/app/services/decidim/meetings/calendar/organization_calendar.rb
index 1f37556aeca22..b3a1deec0405c 100644
--- a/decidim-meetings/app/services/decidim/meetings/calendar/organization_calendar.rb
+++ b/decidim-meetings/app/services/decidim/meetings/calendar/organization_calendar.rb
@@ -13,7 +13,7 @@ class OrganizationCalendar < BaseCalendar
         # Returns a String.
         def events
           @events ||= components.map do |component|
-            ComponentCalendar.new(component).events
+            ComponentCalendar.new(component, @filters).events
           end.compact.join
         end
 
diff --git a/decidim-meetings/app/services/decidim/meetings/calendar_renderer.rb b/decidim-meetings/app/services/decidim/meetings/calendar_renderer.rb
index cdf00d72d6237..ad6c8867a5e6e 100644
--- a/decidim-meetings/app/services/decidim/meetings/calendar_renderer.rb
+++ b/decidim-meetings/app/services/decidim/meetings/calendar_renderer.rb
@@ -3,14 +3,14 @@
 module Decidim
   module Meetings
     class CalendarRenderer
-      def self.for(resource)
+      def self.for(resource, filters = nil)
         case resource
         when Decidim::Organization
-          Calendar::OrganizationCalendar.for(resource)
+          Calendar::OrganizationCalendar.for(resource, filters)
         when Decidim::Component
-          Calendar::ComponentCalendar.for(resource)
+          Calendar::ComponentCalendar.for(resource, filters)
         when Decidim::Meetings::Meeting
-          Calendar::MeetingCalendar.for(resource)
+          Calendar::MeetingCalendar.for(resource, filters)
         end
       end
     end
diff --git a/decidim-meetings/app/services/decidim/meetings/close_meeting_reminder_generator.rb b/decidim-meetings/app/services/decidim/meetings/close_meeting_reminder_generator.rb
new file mode 100644
index 0000000000000..7a1224084e687
--- /dev/null
+++ b/decidim-meetings/app/services/decidim/meetings/close_meeting_reminder_generator.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class is the generator class which creates and updates meetings related reminders,
+    # after reminder is generated it is send to user who have not closed past meetings.
+    class CloseMeetingReminderGenerator
+      attr_reader :reminder_jobs_queued
+
+      def initialize
+        @reminder_manifest = Decidim.reminders_registry.for(:close_meeting)
+        @reminder_jobs_queued = 0
+      end
+
+      # Creates reminders and updates them if they already exists.
+      def generate
+        Decidim::Component.where(manifest_name: "meetings").published.each do |component|
+          send_reminders(component)
+        end
+      end
+
+      private
+
+      attr_reader :reminder_manifest
+
+      def finder_query(component_id, interval)
+        Decidim::Meetings::Meeting
+          .published
+          .not_hidden
+          .except_withdrawn
+          .where(
+            "decidim_component_id = ? AND end_time >= ? AND end_time <= ? AND closed_at IS NULL",
+            component_id,
+            interval.ago.beginning_of_day,
+            interval.ago.end_of_day
+          )
+      end
+
+      def send_reminders(component)
+        intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
+        space_admins = Decidim::ParticipatoryProcessUserRole.where(decidim_participatory_process_id: component.participatory_space_id, role: "admin").collect(&:user)
+        space_admins = (global_admins + space_admins).uniq
+        intervals.each do |interval|
+          finder_query(component.id, interval).find_each do |meeting|
+            authors = meeting.official? ? space_admins : [meeting.author]
+            authors.each do |author|
+              send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
+              next unless send_notif == "1"
+
+              reminder = Decidim::Reminder.find_or_create_by(user: author, component: component)
+              record = Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: meeting)
+              record.update(state: "active") unless record.active?
+              reminder.records << record
+              reminder.save!
+
+              Decidim::Meetings::SendCloseMeetingReminderJob.perform_later(record)
+              @reminder_jobs_queued += 1
+            end
+          end
+        end
+      end
+
+      def global_admins
+        @global_admins ||= Decidim::User.where(admin: true).all
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/services/decidim/meetings/directory/meeting_search.rb b/decidim-meetings/app/services/decidim/meetings/directory/meeting_search.rb
deleted file mode 100644
index e2d2eafa31d58..0000000000000
--- a/decidim-meetings/app/services/decidim/meetings/directory/meeting_search.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    module Directory
-      class MeetingSearch < Decidim::Meetings::MeetingSearch
-        text_search_fields :title, :description
-
-        def search_space
-          return query if options[:space].blank? || options[:space] == "all"
-
-          query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].collect(&:classify) })
-        end
-
-        private
-
-        # Private: Creates an array of category ids.
-        # It contains categories' subcategories ids as well.
-        def all_category_ids
-          cat_ids = fetch_category_ids
-
-          component.flat_map do |comp|
-            comp
-              .categories
-              .where(id: cat_ids)
-              .or(comp.categories.where(parent_id: cat_ids))
-              .pluck(:id).tap { |ids| ids.prepend(nil) if category_ids.include?("without") }
-          end
-        end
-
-        # take a param list like ["2", "10", "Decidim__Assembly4", "Decidim__Assembly2"]
-        # return a param list like [47, 48, 43, 44, 45, 46, 41, 42, 27, 28, 32, 31, 29, 30, 26, 25]
-        def fetch_category_ids
-          cat_ids = category_ids.without("without")
-
-          additional_ids = cat_ids.select { |a| a =~ /Decidim__/ }
-
-          additional_ids = parse_category_ids(additional_ids)
-          cat_ids.collect(&:to_i).without(0).push(*additional_ids)
-        end
-
-        # this function expects an array of the following format : [ "Decidim__Assembly4", "Decidim__Assembly2"]
-        # It will transform each parameter into an array of class_name and id [["Decidim::Assembly", "4"], ["Decidim::Assembly", "2"]]
-        # After we rebuild the find query and retrun the category_ids for each participatory space
-        def parse_category_ids(additional_ids)
-          additional_ids = additional_ids.map { |a| a.gsub("__", "::").gsub(/(\d+)/, '.\1').split(".") }
-          additional_ids = additional_ids.map { |v| v.first.safe_constantize.send(:find, v.last.to_i).category_ids }
-          additional_ids.flatten
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-meetings/app/services/decidim/meetings/meeting_iframe_embedder.rb b/decidim-meetings/app/services/decidim/meetings/meeting_iframe_embedder.rb
index 409cb95584327..10f0088c251d4 100644
--- a/decidim-meetings/app/services/decidim/meetings/meeting_iframe_embedder.rb
+++ b/decidim-meetings/app/services/decidim/meetings/meeting_iframe_embedder.rb
@@ -30,28 +30,31 @@ def embed_transformed_url(request_host)
       def embeddable?
         return nil if parsed_online_meeting_uri.nil?
 
-        EMBEDDABLE_SERVICES.include?(parsed_online_meeting_uri.host)
+        embeddable_services.include?(parsed_online_meeting_uri.host)
       end
 
       def embed_code(request_host)
         return nil if parsed_online_meeting_uri.nil?
 
-        %(
-<iframe
-  allow="camera; microphone; fullscreen; display-capture; autoplay"
-  loading="lazy"
-  src="#{embed_transformed_url(request_host)}"
-  style="height: 100%; width: 100%; border: 0px;"
-></iframe>
-        )
+        <<~HTML
+          <div class="disabled-iframe">
+            <!-- <iframe
+              allow="camera; microphone; fullscreen; display-capture; autoplay"
+              loading="lazy"
+              src="#{embed_transformed_url(request_host)}"
+              style="height: 100%; width: 100%; border: 0px;"></iframe> -->
+          </div>
+        HTML
       end
 
       private
 
-      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv meet.jit.si )
-
       attr_accessor :online_meeting_service_url
 
+      def embeddable_services
+        @embeddable_services ||= Meetings.embeddable_services
+      end
+
       # Youtube transformation consists on:
       # 1. extract the video id from the parameter v
       # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
@@ -59,7 +62,8 @@ def embed_code(request_host)
       def transform_youtube_url(uri)
         return online_meeting_service_url if uri.query.blank?
 
-        video_id = CGI.parse(uri.query).fetch("v")&.first
+        parsed_query = CGI.parse(uri.query)
+        video_id = parsed_query.has_key?("v") ? CGI.parse(uri.query).fetch("v")&.first : nil
 
         return online_meeting_service_url if video_id.blank?
 
diff --git a/decidim-meetings/app/services/decidim/meetings/meeting_search.rb b/decidim-meetings/app/services/decidim/meetings/meeting_search.rb
index 2748a31addba9..809e7ce7ef2ae 100644
--- a/decidim-meetings/app/services/decidim/meetings/meeting_search.rb
+++ b/decidim-meetings/app/services/decidim/meetings/meeting_search.rb
@@ -2,63 +2,17 @@
 
 module Decidim
   module Meetings
-    # This class handles search and filtering of meetings. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the meetings.
+    # This service scopes the meeting searches with parameters that cannot be
+    # passed from the user interface.
     class MeetingSearch < ResourceSearch
-      text_search_fields :title, :description
+      attr_reader :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the meetings from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of meetings to return per page.
-      def initialize(options = {})
-        options[:scope] = options.fetch(:scope, Meeting.published)
-        options[:scope] = options[:state] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        options[:scope] = options[:scope].includes(:component, :attachments)
-        super(options[:scope], options)
-      end
-
-      # Handle the date filter
-      def search_date
-        apply_scopes(%w(upcoming past), date)
-      end
-
-      def search_space
-        return query if options[:space].blank? || options[:space] == "all"
-
-        query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
-      end
+      def build(params)
+        @activity = params[:activity]
 
-      def search_type
-        fields = Decidim::Meetings::Meeting::TYPE_OF_MEETING
-        filtered = []
-        options[:type].each do |inquiry|
-          filtered.push(inquiry) if fields.include?(inquiry)
-        end
-        filtered.size.positive? ? query.where(decidim_meetings_meetings: { type_of_meeting: filtered }) : query
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "my_meetings"
-          query
-            .where(decidim_author_id: user.id)
-        else
-          query
-        end
-      end
-
-      # Handle the state filter
-      def search_state
-        return query.withdrawn if state == "withdrawn"
-
-        query.except_withdrawn
-      end
+        add_scope(:authored_by, user) if params[:activity] == "my_meetings" && user
 
-      def results
-        super.includes(attachments: :file_attachment, component: { participatory_space: :organization })
+        super
       end
     end
   end
diff --git a/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb b/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb
index 04a53e6f8befe..4aaedbe84d04d 100644
--- a/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb
@@ -2,12 +2,29 @@
   <%= t(".export_calendar") %>
   <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
+
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
+    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
+
+  <div class="calendar-url-description"><%= t(".copy_calendar_url_description") %></div>
+  <div class="calendar-url-explanation"><%= t(".copy_calendar_url_explanation") %></div>
+
+  <div class="input-group calendar_url_input">
+    <input id="urlCalendarUrl" class="input-group-field" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
+    <div class="input-group-button">
+      <button class="button primary"
+              data-clipboard-copy="#urlCalendarUrl"
+              data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
+              data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
+              aria-label="<%= t(".copy_calendar_url_clarification") %>">
+        <%= icon "clipboard", role: "img", "aria-hidden": true %>
+        <%= t(".copy_calendar_url") %>
+      </button>
+    </div>
+  </div>
 </div>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb
deleted file mode 100644
index 446307ecc2377..0000000000000
--- a/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="card" id="meetings">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column hashtags__container">
-      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, value: @meeting.present? ? present(@meeting).title(all_locales: true) : @form.title.with_indifferent_access %>
-    </div>
-
-    <div class="row column hashtags__container">
-      <%= form.translated :editor, :description, hashtaggable: true, value: @meeting.present? ? present(@meeting).description(all_locales: true) : @form.description.with_indifferent_access %>
-    </div>
-
-    <div class="row column">
-      <%= form.select :type_of_meeting,
-                      @form.type_of_meeting_select,
-                      { include_blank: t(".select_a_meeting_type") },
-                      { multiple: false } %>
-    </div>
-
-    <div class="row column field" data-meeting-type="in_person">
-      <%= form.geocoding_field :address %>
-    </div>
-
-    <div class="row column field" data-meeting-type="in_person">
-      <%= form.translated :text_area, :location %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :text_area, :location_hints %>
-    </div>
-
-    <div class="row column field" data-meeting-type="online">
-      <%= form.text_field :online_meeting_url %>
-    </div>
-
-    <div class="row column field" data-meeting-type="online">
-      <%= form.check_box :show_embedded_iframe %>
-    </div>
-
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.datetime_field :start_time %>
-      </div>
-
-      <div class="columns xlarge-6">
-        <%= form.datetime_field :end_time %>
-      </div>
-    </div>
-
-    <div class="row column" id="private_meeting">
-      <%= form.check_box :private_meeting %>
-    </div>
-
-    <div class="row column" id="transparent">
-      <%= form.check_box :transparent %>
-    </div>
-  </div>
-</div>
-
-<%= render "decidim/meetings/admin/meetings/services", form: form %>
-
-<%= javascript_pack_tag "decidim_meetings_admin" %>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/new.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/new.html.erb
index e2aa2225cf71f..91b4bb0501c0e 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/new.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meeting_copies/new.html.erb
@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings " }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
+  <%= render partial: "decidim/meetings/admin/meetings/form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t("meeting_copies.new.copy", scope: "decidim.admin") %>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb
index 2b3e972ea7ad1..2fa6372ca17ed 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb
@@ -43,7 +43,7 @@
         <%= form.select :iframe_embed_type,
           @form.iframe_embed_type_select,
           { multiple: false } %>
-        <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+        <p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
       </div>
 
       <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
@@ -82,15 +82,12 @@
         { multiple: false } %>
     </div>
 
-    <div class="row column" id="meeting_available_slots">
-      <%= form.number_field :available_slots %>
-      <p class="help-text"><%= t(".available_slots_help") %></p>
-    </div>
-
     <div class="field" id="meeting_registration_url">
       <%= form.text_field :registration_url %>
       <p class="help-text"><%= t(".registration_url_help") %></p>
-      <label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
+      <div class="callout alert">
+        <%= t(".disclaimer", organization: current_component.organization.name) %>
+      </div>
     </div>
 
     <div class="row column" id="private_meeting">
@@ -101,19 +98,10 @@
       <%= form.check_box :transparent %>
     </div>
 
-    <div class="row column">
-      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
-    </div>
-
-    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
-      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
-      <p class="help-text"><%= t(".registration_email_help") %></p>
-    </div>
-
     <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: form } %>
   </div>
 </div>
 
-<%= render "services", form: form, id: tabs_id_for_service(blank_service) %>
+<%= render "decidim/meetings/admin/meetings/services", form: form, id: tabs_id_for_service(blank_service) %>
 
 <%= javascript_pack_tag "decidim_meetings_admin" %>
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
index ae0695889fa6a..65c6a4faf178b 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
@@ -41,6 +41,15 @@
       <p class="help-text"><%= t(".reserved_slots_help") %></p>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
+    </div>
+
+    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
+      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
+      <p class="help-text"><%= t(".registration_email_help") %></p>
+    </div>
+
     <div class="row column">
       <%= form.translated :editor, :registration_terms %>
     </div>
diff --git a/decidim-meetings/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb b/decidim-meetings/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb
new file mode 100644
index 0000000000000..78a55efd46fbe
--- /dev/null
+++ b/decidim-meetings/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb
@@ -0,0 +1,5 @@
+<p class="email-greeting"><%= t "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.hello", username: @user.name %></p>
+
+<p class="email-instructions"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.body", meeting_title: translated_attribute(@meeting.title), meeting_path: @meeting.reported_content_url).html_safe %></p>
+
+<p class="email-closing"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
diff --git a/decidim-meetings/app/views/decidim/meetings/directory/meetings/_filters.html.erb b/decidim-meetings/app/views/decidim/meetings/directory/meetings/_filters.html.erb
index 0280c870a46d6..d4506ce139a5f 100644
--- a/decidim-meetings/app/views/decidim/meetings/directory/meetings/_filters.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/directory/meetings/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :title_or_description_cont, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t("decidim.meetings.meetings.filters.search"), role: "img" %>
@@ -15,18 +15,18 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
+    <%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
   <% end %>
 
-  <%= form.check_boxes_tree :type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
+  <%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
 
-  <%= form.check_boxes_tree :scope_id, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
+  <%= form.check_boxes_tree :with_any_scope, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
 
-  <%= form.check_boxes_tree :category_id, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
+  <%= form.check_boxes_tree :with_any_global_category, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
 
-  <%= form.check_boxes_tree :origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
+  <%= form.check_boxes_tree :with_any_origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
 
-  <%= form.check_boxes_tree :space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
+  <%= form.check_boxes_tree :with_any_space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t("decidim.meetings.meetings.filters.activity") }, "aria-controls": "meetings" %>
diff --git a/decidim-meetings/app/views/decidim/meetings/directory/meetings/_meetings.html.erb b/decidim-meetings/app/views/decidim/meetings/directory/meetings/_meetings.html.erb
index 23a17964ce2fa..666bb4eb78540 100644
--- a/decidim-meetings/app/views/decidim/meetings/directory/meetings/_meetings.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/directory/meetings/_meetings.html.erb
@@ -8,7 +8,12 @@
       <%= render partial: "decidim/shared/results_per_page" %>
     </div>
     <div class="column">
-      <%= render partial: "decidim/meetings/calendar_modal", locals: { path: calendar_url } %>
+      <%= render partial: "decidim/meetings/calendar_modal", locals: {
+        path: short_url(
+          route_name: "calendar",
+          params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+        )
+      } %>
     </div>
   </div>
 
diff --git a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
index 848406aeb84dd..5cc70f7bfcd06 100644
--- a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
@@ -6,7 +6,7 @@
       <%= render partial: "decidim/meetings/meetings/count" %>
     </h1>
 
-    <%= cell "decidim/meetings/meetings_map", search.results %>
+    <%= cell "decidim/meetings/meetings_map", search.result %>
 
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">
diff --git a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.js.erb b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.js.erb
index 8bbf337ab7f6e..a147a052d9374 100644
--- a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.js.erb
+++ b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.js.erb
@@ -1,13 +1,19 @@
 var $meetings = $('#meetings');
 var $meetingsCount = $('#meetings-count');
 
+// make sure that calendar modal will use the updated filter values
+var $calendarShare = $('#calendarShare');
+$calendarShare.remove();
+
 $meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
 $meetingsCount.html('<%= j(render partial: "decidim/meetings/meetings/count").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>');
+$("#calendarShare").foundation(); // initialize export calendar on the page
+
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
 
 var $map = $("#map");
 var controller = $map.data("map-controller");
diff --git a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
index 61a86d078c066..6aa142ec43009 100644
--- a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
@@ -3,12 +3,13 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
-    <%= javascript_pack_tag "decidim_meetings" %>
-    <%= render partial: "layouts/decidim/js_configuration" %>
   </head>
 
   <body>
     <%= render partial: "layouts/decidim/timeout_modal" %>
+    <%= render partial: "layouts/decidim/data_consent_warning" %>
+    <%= cell("decidim/data_consent", current_organization) %>
+
     <header class="meeting-polls__header">
       <% if current_user && poll %>
         <div class="flex--cc">
@@ -47,5 +48,8 @@
       <aside class="meeting-polls__aside" id="admin-meeting-poll-aside" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'></aside>
       <%= yield %>
     </main>
+
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
+    <%= javascript_pack_tag "decidim_meetings" %>
   </body>
 </html>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_count.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_count.html.erb
index bbd858e6ede67..1cbfa163ec8a3 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_count.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_count.html.erb
@@ -1 +1 @@
-<%= t(".meetings_count", count: search.results.count) %>
+<%= t(".meetings_count", count: search.result.count) %>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb
index ee7121455ad87..aeab32082d3ca 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,24 +14,24 @@
     </div>
   </div>
 
-  <%= form.hidden_field "state", value: params.dig("filter", "state") %>
+  <%= form.hidden_field "with_availability", value: params.dig("filter", "with_availability") %>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t(".date") %>
+    <%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, legend_title: t(".date") %>
   <% end %>
 
-  <%= form.check_boxes_tree :type, filter_type_values, legend_title: t(".type") %>
+  <%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t(".type") %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope") %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category") %>
   <% end %>
 
   <% if component_settings.creation_enabled_for_participants? %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin") %>
+    <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin") %>
   <% end %>
 
   <% if current_user %>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_form.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_form.html.erb
index b4ee7254ffdbe..e655fe5a2fe49 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_form.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_form.html.erb
@@ -38,7 +38,7 @@
     <%= form.select :iframe_embed_type,
       @form.iframe_embed_type_select,
       { multiple: false } %>
-    <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+    <p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
   </div>
 
   <div class="field iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
@@ -98,4 +98,6 @@
   ) %>
 </div>
 
-<%= javascript_pack_tag "decidim_meetings" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_meetings" %>
+<% end %>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb
index b64145ced68e5..8d17f3a6a5d77 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb
@@ -1,7 +1,7 @@
-<% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <div class="callout warning">
     <%= t("decidim.meetings.meetings.index.text_banner",
-          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[state]" => nil)),
+          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[with_availability]" => nil)),
           ).html_safe %>
   </div>
 <% end %>
@@ -21,7 +21,12 @@
     <%= render partial: "decidim/shared/results_per_page" %>
   </div>
   <div class="column">
-    <%= render partial: "decidim/meetings/calendar_modal", locals: { path: calendar_url } %>
+    <%= render partial: "decidim/meetings/calendar_modal", locals: {
+      path: short_url(
+        route_name: "calendar",
+        params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+      )
+    } %>
   </div>
 </div>
 
@@ -34,10 +39,10 @@
 
 <div class="row">
   <div class="text-right">
-    <% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
-      <%= link_to t("decidim.meetings.meetings.index.see_all"), meetings_path("filter[state]" => nil) %>
+    <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+      <%= link_to t("decidim.meetings.meetings.index.see_all"), meetings_path("filter[with_availability]" => nil) %>
     <% else %>
-      <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[state]" => "withdrawn") %>
+      <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[with_availability]" => "withdrawn") %>
     <% end %>
   </div>
 </div>
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
index c4db8b10ac063..cbdba99117746 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
@@ -1,7 +1,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<% if current_component.settings.maps_enabled? && search.results.not_online.exists? %>
-  <%= cell "decidim/meetings/meetings_map", search.results %>
+<% if current_component.settings.maps_enabled? && search.result.not_online.exists? %>
+  <%= cell "decidim/meetings/meetings_map", search.result %>
 <% end %>
 
 <div class="row columns">
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb b/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb
index a7588f69add44..21edd47a1202f 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb
@@ -11,9 +11,9 @@ $meetingsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-$("#calendarShare").foundation(); // initialize export calendar on the page
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result.select(&:geocoded_and_valid?)).to_json.html_safe %>');
 
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded_and_valid?)).to_json.html_safe %>');
+$("#calendarShare").foundation(); // initialize export calendar on the page
 
 var $map = $("#map");
 var controller = $map.data("map-controller");
diff --git a/decidim-meetings/config/locales/ar.yml b/decidim-meetings/config/locales/ar.yml
index e1303e2b1eb2a..0b9ce2e975e11 100644
--- a/decidim-meetings/config/locales/ar.yml
+++ b/decidim-meetings/config/locales/ar.yml
@@ -1,10 +1,7 @@
+---
 ar:
   activemodel:
     attributes:
-      agenda:
-        description: وص�
-        duration: المدة الزمنية
-        title: عنوان
       close_meeting:
         attendees_count: عدد الحضور
         attending_organizations: قائمة المنظمات التي حضرت
@@ -18,7 +15,6 @@ ar:
         decidim_category_id: ال�ئة
         decidim_scope_id: نطاق
         description: وص�
-        end_time: وقت النهاية
         location: موقعك
         location_hints: تلميحات الموقع
         organizer_id: منظم
@@ -26,7 +22,6 @@ ar:
         registration_form_enabled: تم تمكين نموذج التسجيل
         registration_terms: شروط التسجيل
         registrations_enabled: تم تمكين التسجيلات
-        start_time: وقت البدء
         title: عنوان
         transparent: ش�ا�
     errors:
@@ -76,11 +71,10 @@ ar:
         meetings:
           category_id_eq:
             label: ال�ئة
-          origin_eq:
+          with_any_origin:
             values:
-              citizen: المواطن
               user_group: مجموعات المستخدمين
-          type_eq:
+          with_any_type:
             label: نوع الاجتماع
             values:
               in_person: وجهًا لوجه
@@ -251,8 +245,6 @@ ar:
             success: تم حذ� الاجتماع بنجاح
           edit:
             update: تحديث
-          form:
-            registration_email_help: سيظهر هذا النص �ي منتص� البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
           index:
             title: اجتماعات
           new:
@@ -282,6 +274,7 @@ ar:
           form:
             available_slots_help: اتركه إلى 0 إذا كان لديك �تحات غير محدودة المتاحة.
             invites: دعوات
+            registration_email_help: سيظهر هذا النص �ي منتص� البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
             registration_form: إستمارة تسجيل
             registrations_count:
               zero: كان هناك %{count} التسجيلات.
@@ -344,8 +337,6 @@ ar:
         filters:
           category: ال�ئة
           date: تاريخ
-          origin_values:
-            citizens: المواطنون
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط
diff --git a/decidim-meetings/config/locales/bg.yml b/decidim-meetings/config/locales/bg.yml
index a8171f687e2a3..5280465c0bd32 100644
--- a/decidim-meetings/config/locales/bg.yml
+++ b/decidim-meetings/config/locales/bg.yml
@@ -1,10 +1,5 @@
+---
 bg:
-  activemodel:
-    attributes:
-      agenda:
-        description: Опи�ание
-        duration: Продължително�т
-        title: Заглавие
   decidim:
     meetings:
       actions:
diff --git a/decidim-meetings/config/locales/ca.yml b/decidim-meetings/config/locales/ca.yml
index 344a399babedc..00519f51d5116 100644
--- a/decidim-meetings/config/locales/ca.yml
+++ b/decidim-meetings/config/locales/ca.yml
@@ -1,10 +1,7 @@
+---
 ca:
   activemodel:
     attributes:
-      agenda:
-        description: Descripció
-        duration: Durada
-        title: Títol
       close_meeting:
         attendees_count: Nombre d'assistents
         attending_organizations: Llista d'organitzacions que han participat
@@ -22,8 +19,9 @@ ca:
         decidim_scope_id: Àmbit
         decidim_user_group_id: Grup d'usuàries
         description: Descripció
-        end_time: Hora de finalització
+        end_time: Dia i hora de finalització
         id: ID
+        iframe_embed_type: Visualització de la sala de videoconferència
         location: Ubicació
         location_hints: Detalls d'ubicació
         online_meeting_url: URL de trobada en línia
@@ -33,13 +31,26 @@ ca:
         registration_email_custom_content: Contingut personalitzat del correu d'inscripció
         registration_form_enabled: Formulari d'inscripcions habilitat
         registration_terms: Termes i condicions d'inscripció
+        registration_type: Tipus d'inscripció
         registration_url: URL d'inscripció
         registrations_enabled: Inscripcions obertes
-        show_embedded_iframe: Mostrar iframe incrustat per aquesta URL
-        start_time: Hora d'inici
+        reserved_slots: Places reservades per aquesta trobada
+        start_time: Dia i hora d'inici
         title: Títol
         transparent: Transparent
         type_of_meeting: Tipus
+      meeting_agenda:
+        title: Títol
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripció
+        duration: Durada
+        title: Títol
+      meeting_registration_invite:
+        email: Correu electrònic
+        name: Nom
+      validate_registration_code:
+        code: Codi
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ ca:
             values:
               'false': Passades
               'true': Properes
-          origin_eq:
+          scope_id_eq:
+            label: Àmbit
+          with_any_origin:
             label: Origen
             values:
-              citizen: Ciutadania
               official: Oficial
+              participants: Participant
               user_group: Grups
-          scope_id_eq:
-            label: Àmbit
-          type_eq:
+          with_any_type:
             label: Tipus de trobada
             values:
               hybrid: Híbrida
@@ -282,9 +293,6 @@ ca:
           edit:
             close: Tancar
             title: Tancar trobada
-        meeting_copies:
-          form:
-            select_a_meeting_type: Si us plau, selecciona un tipus de trobada
         meetings:
           close:
             invalid: S'ha produït un error en tancar aquesta trobada
@@ -303,17 +311,15 @@ ca:
             update: Actualitzar
           form:
             address_help: 'Adreça: que farà servir per Geocoder per a trobar la localització'
-            available_slots_help: Deixa-ho a 0 si les places disponibles són il·limitades
             disclaimer: 'Descàrrec de responsabilitat: en utilitzar un sistema d''inscripcions extern, ets conscient que els organitzadors de %{organization} no són responsables de les dades proporcionades per les usuàries al servei extern.'
             location_help: 'Localització: missatge dirigit a les participants indicant el lloc on trobar-se'
             location_hints_help: 'Detalls d''ubicació: informació addicional. Exemple: la planta de l''edifici si es tracta d''una reunió presencial, o la contrasenya de la reunió si es tracta d''una reunió en línia amb accés restringit.'
             online_meeting_url_help: 'Enllaç: permetre que les participants es connectin directament a la teva trobada'
-            registration_email_help: Aquest text apareixerà enmig del correu de confirmació de la inscripció. Just a sota del codi d'inscripció.
             registration_url_help: 'Enllaç: permetre a les participants anar al servei extern que estàs utilitzant per a les inscripcions'
             select_a_meeting_type: Si us plau selecciona un tipus de trobada
             select_a_registration_type: Si us plau selecciona un tipus d'inscripció
             select_an_iframe_access_level: Si us plau, selecciona el nivell d'accés a l'iframe
-            show_embedded_iframe_help: Només uns quants serveis es poden incrustar a una trobada o esdeveniment en directe (YouTube, Twitch i Jitsi)
+            show_embedded_iframe_help: 'Només uns quants serveis es poden incrustar a una trobada o esdeveniment en directe des dels següents dominis: %{domains}'
           index:
             title: Trobades
           new:
@@ -356,6 +362,7 @@ ca:
             available_slots_help: Deixar a 0 si les inscripcions són il·limitades.
             invites: Invitacions
             recommendation_message: Per raons de privacitat et recomanem que esborris aquest formulari d'inscripció quan ja no el necessitis. Per defecte això és 3 mesos després que la reunió hagi finalitzat.
+            registration_email_help: Aquest text apareixerà enmig del correu de confirmació de la inscripció. Just a sota del codi d'inscripció.
             registration_form: Formulari d'inscripció
             registrations_count:
               one: Hi ha hagut %{count} inscripció.
@@ -383,6 +390,8 @@ ca:
           value_types:
             organizer_presenter:
               not_found: 'L''organitzador no s''ha trobat a la base de dades (identificació: %{id})'
+        questionnaire:
+          update: "%{user_name} ha actualitzat el qüestionari per a la trobada %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Totes
@@ -393,7 +402,19 @@ ca:
       calendar_modal:
         calendar_url: URL del calendari
         close_window: Tanca la finestra
+        copy_calendar_url: Copiar
+        copy_calendar_url_clarification: Copiar l'URL del calendari al porta-retalls
+        copy_calendar_url_copied: Copiat!
+        copy_calendar_url_description: Pots veure totes les reunions publicades a la teva aplicació o preveïdor de calendari. Copia i enganxa aquesta URL al teu calendari fent servir l'opció "Afegir nou calendari des d'una URL".
+        copy_calendar_url_explanation: Tingues en compte que estàs exportant una selecció de reunions, ja que hi ha filtres activats. Si vols exportar-les totes, primer elimina tots els filtres.
+        copy_calendar_url_message: S'ha copiat l'enllaç al porta-retalls correctament.
         export_calendar: Exporta el calendari
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: La trobada <a href="%{meeting_path}">"%{meeting_title}"</a> està pendent de tancar-se. Si us plau, afegiu un informe de la reunió fent servir el botó "Tancar trobada".
+          greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hola %{username},
+          subject: Ara pots tancar la trobada amb un informe a la plataforma %{organization_name}
       conference_venues: Seus de les jornades
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ ca:
           origin: Origen
           origin_values:
             all: Tots
-            citizens: Ciutadania
             official: Oficial
+            participants: Participants
             user_groups: Grups
           scope: Àmbit
           search: Cerca
@@ -497,7 +518,7 @@ ca:
           select_a_meeting_type: Si us plau selecciona un tipus de trobada
           select_a_registration_type: Si us plau selecciona un tipus d'inscripció
           select_an_iframe_access_level: Si us plau, selecciona el nivell d'accés a l'iframe
-          show_embedded_iframe_help: Només uns quants serveis es poden incrustar a una trobada o esdeveniment en directe (YouTube, Twitch i Jitsi)
+          show_embedded_iframe_help: 'Només uns quants serveis es poden incrustar a una trobada o esdeveniment en directe des dels següents dominis: %{domains}'
         index:
           click_here: Veure totes les trobades
           new_meeting: Nova trobada
diff --git a/decidim-meetings/config/locales/cs.yml b/decidim-meetings/config/locales/cs.yml
index a6802a59f410e..b0e00a7531b26 100644
--- a/decidim-meetings/config/locales/cs.yml
+++ b/decidim-meetings/config/locales/cs.yml
@@ -1,10 +1,7 @@
+---
 cs:
   activemodel:
     attributes:
-      agenda:
-        description: Popis
-        duration: Doba trvání
-        title: Název
       close_meeting:
         attendees_count: Po�et ú�astníků
         attending_organizations: Seznam organizací, které se zú�astnily
@@ -24,6 +21,7 @@ cs:
         description: Popis
         end_time: Čas ukon�ení
         id: ID
+        iframe_embed_type: Typ vloženého rámu
         location: Umístění
         location_hints: Nápověda k poloze
         online_meeting_url: URL online schůzky
@@ -33,13 +31,26 @@ cs:
         registration_email_custom_content: Přizpůsobený obsah registra�ního e-mailu
         registration_form_enabled: Registra�ní formulář je povolen
         registration_terms: Podmínky registrace
+        registration_type: Typ registrace
         registration_url: URL registrace
         registrations_enabled: Registrace povoleny
-        show_embedded_iframe: Zobrazit vložený iframe pro tuto URL
+        reserved_slots: Rezervované sloty pro tuto schůzku
         start_time: Čas zahájení
         title: Název
         transparent: Transparentní
         type_of_meeting: Typ
+      meeting_agenda:
+        title: Název
+        visible: Viditelné
+      meeting_agenda_items:
+        description: Popis
+        duration: Doba trvání
+        title: Název
+      meeting_registration_invite:
+        email: E-mail
+        name: Jméno
+      validate_registration_code:
+        code: Kód
     errors:
       models:
         meeting:
@@ -95,15 +106,15 @@ cs:
             values:
               'false': Minulé
               'true': Nadcházející
-          origin_eq:
+          scope_id_eq:
+            label: Oblast působnosti
+          with_any_origin:
             label: Původ
             values:
-              citizen: Ob�ané
               official: Úředník
+              participants: Ú�astník
               user_group: Skupiny uživatelů
-          scope_id_eq:
-            label: Oblast působnosti
-          type_eq:
+          with_any_type:
             label: Typ schůzky
             values:
               hybrid: Hybridní
@@ -290,9 +301,6 @@ cs:
           edit:
             close: Zavřít
             title: Zavřete schůzku
-        meeting_copies:
-          form:
-            select_a_meeting_type: Vyberte prosím typ schůzky
         meetings:
           close:
             invalid: Při setkání došlo k problému
@@ -313,17 +321,15 @@ cs:
             update: Aktualizace
           form:
             address_help: 'Adresa: použita Geocoderem k nalezení polohy'
-            available_slots_help: Ponechte 0, pokud máte k dispozici neomezený po�et slotů
             disclaimer: 'Prohlášení o zřeknutí: Použitím externího registra�ního systému jste si vědomi toho, že organizátoři %{organization} nejsou odpovědní za data poskytovaná uživateli externí službě.'
             location_help: 'Poloha: zpráva ur�ená uživatelům, kteří předávají místo, aby se setkali'
             location_hints_help: 'Upřesnění k místu: dodate�né informace. Příklad: patro budovy, pokud se jedná o osobní schůzku, nebo vstupní heslo pro schůzku, pokud se jedná o schůzku s omezeným přístupem.'
             online_meeting_url_help: 'Odkaz: Umožnit ú�astníkům připojení přímo k vaší schůzce'
-            registration_email_help: Tento text se zobrazí uprostřed potvrzení registra�ním e-mailem. Hned za registra�ním kódem.
             registration_url_help: 'Odkaz: umožnit ú�astníkům jít na externí službu, kterou používáte pro registrace'
             select_a_meeting_type: Vyberte prosím typ schůzky
             select_a_registration_type: Vyberte prosím typ registrace
             select_an_iframe_access_level: Vyberte prosím úroveň přístupu iframe
-            show_embedded_iframe_help: Pouze pár služeb umožňuje vložení do schůzky nebo živé události (YouTube, Twitch a Jitsi)
+            show_embedded_iframe_help: 'Pouze pár služeb umožňuje vložení do schůzky nebo živé události z následujících domén: %{domains}'
           index:
             title: Setkání
           new:
@@ -366,6 +372,7 @@ cs:
             available_slots_help: Nechte to na 0, pokud máte k dispozici neomezené sloty.
             invites: Pozvánky
             recommendation_message: Z důvodu ochrany osobních údajů doporu�ujeme odstranit tento nadepsaný formulář, když jej již nepotřebujete. Ve výchozím nastavení je to 3 měsíce po ukon�ení schůzky.
+            registration_email_help: Tento text se zobrazí uprostřed potvrzení registra�ním e-mailem. Hned za registra�ním kódem.
             registration_form: Registra�ní formulář
             registrations_count:
               one: Byla zde registrace %{count}.
@@ -395,6 +402,8 @@ cs:
           value_types:
             organizer_presenter:
               not_found: 'Organizátor nebyl nalezen v databázi (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} aktualizoval dotazník pro schůzku %{meeting_name}"
       application_helper:
         filter_category_values:
           all: VÅ¡e
@@ -405,7 +414,19 @@ cs:
       calendar_modal:
         calendar_url: Adresa URL kalendáře
         close_window: Zavřete okno
+        copy_calendar_url: Kopírovat
+        copy_calendar_url_clarification: Kopírovat URL kalendáře do schránky
+        copy_calendar_url_copied: Zkopírováno!
+        copy_calendar_url_description: Všechny zveřejněné schůzky můžete vidět v aplikaci nebo poskytovateli kalendáře. Zkopírujte a vložte tuto URL do kalendáře pomocí možnosti "Přidat nový kalendář z URL".
+        copy_calendar_url_explanation: Vezměte prosím na vědomí, že exportujete výběr schůzek, protože existují aktivní filtry. Pokud si přejete exportovat všechny, resetujte nejprve všechny filtry.
+        copy_calendar_url_message: URL byla úspěšně zkopírována do schránky.
         export_calendar: Exportovat kalendář
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: Schůzka <a href="%{meeting_path}">"%{meeting_title}"</a> �eká na ukon�ení. Přidejte prosím zprávu o schůzce pomocí tla�ítka "Zavřít schůzku".
+          greetings: Dobrý den,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Dobrý den %{username},
+          subject: Nyní můžete svou schůzku uzavřít se zprávou o platformě %{organization_name}
       conference_venues: Konferen�ní prostory
       content_blocks:
         upcoming_meetings:
@@ -482,8 +503,8 @@ cs:
           origin: Původ
           origin_values:
             all: VÅ¡e
-            citizens: Ob�ané
             official: Úředník
+            participants: Ú�astníci
             user_groups: Skupiny
           scope: Oblast působnosti
           search: Vyhledávání
@@ -511,7 +532,7 @@ cs:
           select_a_meeting_type: Vyberte prosím typ schůzky
           select_a_registration_type: Vyberte prosím typ registrace
           select_an_iframe_access_level: Vyberte prosím úroveň přístupu iframe
-          show_embedded_iframe_help: Pouze pár služeb umožňuje vložení do schůzky nebo živé události (YouTube, Twitch a Jitsi)
+          show_embedded_iframe_help: 'Pouze pár služeb umožňuje vložení do schůzky nebo živé události z následujících domén: %{domains}'
         index:
           click_here: Zobrazit všechny schůzky
           new_meeting: Nová schůzka
diff --git a/decidim-meetings/config/locales/de.yml b/decidim-meetings/config/locales/de.yml
index 8988b0303014f..772c599375fd6 100644
--- a/decidim-meetings/config/locales/de.yml
+++ b/decidim-meetings/config/locales/de.yml
@@ -1,10 +1,7 @@
+---
 de:
   activemodel:
     attributes:
-      agenda:
-        description: Beschreibung
-        duration: Dauer
-        title: Titel
       close_meeting:
         attendees_count: Anzahl der Teilnehmer
         attending_organizations: Liste der Organisationen, die teilgenommen haben
@@ -22,7 +19,6 @@ de:
         decidim_scope_id: Umfang
         decidim_user_group_id: Benutzergruppe
         description: Beschreibung
-        end_time: Endzeit
         id: ID
         location: Ort
         location_hints: Standorthinweise
@@ -35,11 +31,21 @@ de:
         registration_terms: Registrierungsbedingungen
         registration_url: Registrierungs-URL
         registrations_enabled: Registrierungen aktiviert
-        show_embedded_iframe: Eingebetteten Iframe für diese URL anzeigen
-        start_time: Startzeit
         title: Titel
         transparent: Transparent
         type_of_meeting: Art
+      meeting_agenda:
+        title: Titel
+        visible: Sichtbar
+      meeting_agenda_items:
+        description: Beschreibung
+        duration: Dauer
+        title: Titel
+      meeting_registration_invite:
+        email: E-Mail
+        name: Name
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting_agenda:
@@ -85,15 +91,15 @@ de:
             values:
               'false': Vergangenheit
               'true': Anstehend
-          origin_eq:
+          scope_id_eq:
+            label: Umfang
+          with_any_origin:
             label: Ursprung
             values:
-              citizen: Bürger
               official: Offiziell
+              participants: Teilnehmer
               user_group: Benutzergruppen
-          scope_id_eq:
-            label: Umfang
-          type_eq:
+          with_any_type:
             label: Art des Treffens
             values:
               hybrid: Hybrid
@@ -278,9 +284,6 @@ de:
           edit:
             close: Schließen
             title: Sitzung beenden
-        meeting_copies:
-          form:
-            select_a_meeting_type: Bitte eine Meeting-Typ auswählen
         meetings:
           close:
             invalid: Beim Schließen dieses Meetings ist ein Problem aufgetreten
@@ -299,16 +302,13 @@ de:
             update: Aktualisieren
           form:
             address_help: 'Adresse: wird von Geocoder zur Lokalisierung verwendet'
-            available_slots_help: Belassen Sie es auf 0, wenn Sie unbegrenzte Plätze zur Verfügung haben
             disclaimer: 'Haftungsausschluss: Durch Verwendung eines externen Registrierungssystems wissen Sie, dass die Organisatoren von %{organization} nicht für die Daten verantwortlich sind, welche die Benutzer dem externen Dienst zur Verfügung stellen.'
             location_help: 'Ort: an die Benutzer gerichtete Nachricht mit dem Treffpunkt'
             location_hints_help: 'Hinweise zum Standort: Zusätzliche Informationen. Beispiel: das Stockwerk im Gebäude wenn es eine Sitzung vor Ort ist, oder das Passwort wenn es eine Online-Sitzung mit eingeschränktem Zugriff ist.'
             online_meeting_url_help: 'Link: Erlaubt Teilnehmern, sich direkt mit Ihrem Meeting zu verbinden'
-            registration_email_help: Dieser Text erscheint in der Mitte der Registrierungs-E-Mail, direkt nach dem Registrierungscode.
             registration_url_help: 'Link: Erlaubt den Teilnehmern den externen Service zu nutzen, den Sie für die Registrierung verwenden'
             select_a_meeting_type: Bitte eine Meeting-Typ auswählen
             select_a_registration_type: Bitte wählen Sie eine Registrierungsart aus
-            show_embedded_iframe_help: Nur wenige Dienste erlauben das Einbetten einer Veranstaltung oder eines Livestreams (Youtube, Twitch und Jitsi)
           index:
             title: Meetings
           new:
@@ -348,6 +348,7 @@ de:
             available_slots_help: Belassen Sie es auf 0, wenn Sie unbegrenzte Plätze zur Verfügung haben.
             invites: Lädt ein
             recommendation_message: Aus Datenschutzgründen empfehlen wir, dass Sie dieses Einschreibeformular löschen, wenn es nicht länger benötigt wird. Standardmäßig ist das 3 Monate nachdem die Besprechung durchgeführt wurde.
+            registration_email_help: Dieser Text erscheint in der Mitte der Registrierungs-E-Mail, direkt nach dem Registrierungscode.
             registration_form: Anmeldeformular
             registrations_count:
               one: Es wurde %{count} registriert.
@@ -385,7 +386,16 @@ de:
       calendar_modal:
         calendar_url: Kalender-URL
         close_window: Fenster schließen
+        copy_calendar_url: Kopieren
+        copy_calendar_url_clarification: Kalender-URL in Zwischenablage kopieren
+        copy_calendar_url_copied: Kopiert!
+        copy_calendar_url_description: Sie können alle veröffentlichten Meetings in Ihrer Kalenderanwendung oder bei Ihrem Kalender-Anbieter sehen. Kopieren und fügen Sie diese URL mit der Option "Neuen Kalender von einer URL hinzufügen" in Ihren Kalender ein.
+        copy_calendar_url_explanation: Bitte beachten Sie, dass Sie eine Auswahl von Meetings exportieren, da es aktive Filter gibt. Wenn Sie alle exportieren möchten, setzen Sie zuerst alle Filter zurück.
+        copy_calendar_url_message: Die URL wurde erfolgreich in die Zwischenablage kopiert.
         export_calendar: Kalender exportieren
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          hello: Hallo %{username},
       conference_venues: Tagungsstätten
       content_blocks:
         upcoming_meetings:
@@ -460,8 +470,8 @@ de:
           origin: Ursprung
           origin_values:
             all: Alle
-            citizens: Einzelpersonen
             official: Offiziell
+            participants: Teilnehmer
             user_groups: Gruppen
           scope: Umfang
           search: Suche
@@ -488,7 +498,6 @@ de:
           select_a_category: Bitte wählen sie eine Kategorie
           select_a_meeting_type: Bitte eine Meeting-Art auswählen
           select_a_registration_type: Bitte wählen Sie eine Registrierungsart aus
-          show_embedded_iframe_help: Nur wenige Dienste erlauben das Einbetten einer Veranstaltung oder eines Livestreams (Youtube, Twitch und Jitsi)
         index:
           click_here: Alle Treffen anzeigen
           new_meeting: Neue Besprechung
diff --git a/decidim-meetings/config/locales/el.yml b/decidim-meetings/config/locales/el.yml
index 641787312a250..49e51fdc7a119 100644
--- a/decidim-meetings/config/locales/el.yml
+++ b/decidim-meetings/config/locales/el.yml
@@ -1,10 +1,7 @@
+---
 el:
   activemodel:
     attributes:
-      agenda:
-        description: Πε�ιγ�αφή
-        duration: Διά�κεια
-        title: Τίτλος
       close_meeting:
         attendees_count: Α�ιθμός συμμετεχόντων
         attending_organizations: Λίστα ο�γανισμών που συμμετείχαν
@@ -18,7 +15,6 @@ el:
         decidim_category_id: Κατηγο�ία
         decidim_scope_id: Πεδίο εφα�μογής
         description: Πε�ιγ�αφή
-        end_time: ��α λήξης
         location: Τοποθεσία
         location_hints: Υποδείξεις τοποθεσίας
         organizer_id: Διο�γανωτής
@@ -26,7 +22,6 @@ el:
         registration_form_enabled: Η φό�μα εγγ�αφής ενε�γοποιήθηκε
         registration_terms: Ό�οι εγγ�αφής
         registrations_enabled: Οι εγγ�αφές ενε�γοποιήθηκαν
-        start_time: ��α ένα�ξης
         title: Τίτλος
         transparent: Διαφανής
     errors:
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 6ad64f4c105d6..b1836d23168c7 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -2,10 +2,6 @@
 en:
   activemodel:
     attributes:
-      agenda:
-        description: Description
-        duration: Duration
-        title: Title
       close_meeting:
         attendees_count: Number of attendees
         attending_organizations: List of organizations that attended
@@ -23,8 +19,9 @@ en:
         decidim_scope_id: Scope
         decidim_user_group_id: User group
         description: Description
-        end_time: End Time
+        end_time: End time
         id: ID
+        iframe_embed_type: Iframe embed type
         location: Location
         location_hints: Location hints
         online_meeting_url: Online meeting URL
@@ -34,13 +31,26 @@ en:
         registration_email_custom_content: Registration email custom content
         registration_form_enabled: Registration form enabled
         registration_terms: Registration terms
+        registration_type: Registration type
         registration_url: Registration URL
         registrations_enabled: Registrations enabled
-        show_embedded_iframe: Show embedded iframe for this URL
-        start_time: Start Time
+        reserved_slots: Reserved slots for this meeting
+        start_time: Start time
         title: Title
         transparent: Transparent
         type_of_meeting: Type
+      meeting_agenda:
+        title: Title
+        visible: Visible
+      meeting_agenda_items:
+        description: Description
+        duration: Duration
+        title: Title
+      meeting_registration_invite:
+        email: Email
+        name: Name
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting:
@@ -90,15 +100,15 @@ en:
             values:
               'false': Past
               'true': Upcoming
-          origin_eq:
+          scope_id_eq:
+            label: Scope
+          with_any_origin:
             label: Origin
             values:
-              citizen: Citizen
               official: Official
+              participants: Participant
               user_group: User Groups
-          scope_id_eq:
-            label: Scope
-          type_eq:
+          with_any_type:
             label: Type of meeting
             values:
               hybrid: Hybrid
@@ -283,9 +293,6 @@ en:
           edit:
             close: Close
             title: Close meeting
-        meeting_copies:
-          form:
-            select_a_meeting_type: Please select a meeting type
         meetings:
           close:
             invalid: There was a problem closing this meeting
@@ -304,17 +311,15 @@ en:
             update: Update
           form:
             address_help: 'Address: used by Geocoder to find the location'
-            available_slots_help: Leave it to 0 if you have unlimited slots available
             disclaimer: 'Disclaimer: By using an external registration system, you''re aware that the organizers of %{organization} are not responsible for the data provided by the users to the external service.'
             location_help: 'Location: message directed to the users implying the spot to meet at'
             location_hints_help: 'Location hints: additional info. Example: the floor of the building if it is an in-person meeting, or the meeting password if it is an online meeting with restricted access.'
             online_meeting_url_help: 'Link: allow participants to connect directly to your meeting'
-            registration_email_help: This text will appear in the middle of the registration confirmation email. Just after the registration code.
             registration_url_help: 'Link: allow participants to go on the external service you are using for registrations'
             select_a_meeting_type: Please select a meeting type
             select_a_registration_type: Please select a registration type
             select_an_iframe_access_level: Please select an iframe access level
-            show_embedded_iframe_help: Only a few services allow embedding in meeting or live event (YouTube, Twitch and Jitsi)
+            show_embedded_iframe_help: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
           index:
             title: Meetings
           new:
@@ -357,6 +362,7 @@ en:
             available_slots_help: Leave it to 0 if you have unlimited slots available.
             invites: Invitations
             recommendation_message: For privacy reasons we recommend that you delete this inscription form when you no longer need it. By default this is 3 months after the meeting has ended.
+            registration_email_help: This text will appear in the middle of the registration confirmation email. Just after the registration code.
             registration_form: Registration form
             registrations_count:
               one: There has been %{count} registration.
@@ -384,6 +390,8 @@ en:
           value_types:
             organizer_presenter:
               not_found: 'The organizer was not found on the database (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} updated the questionnaire for the %{meeting_name} meeting"
       application_helper:
         filter_category_values:
           all: All
@@ -394,7 +402,19 @@ en:
       calendar_modal:
         calendar_url: Calendar URL
         close_window: Close window
+        copy_calendar_url: Copy
+        copy_calendar_url_clarification: Copy calendar URL to clipboard
+        copy_calendar_url_copied: Copied!
+        copy_calendar_url_description: You can see all the published meetings in your calendar application or provider. Copy and paste this URL in your calendar using the "Add new calendar from an URL" option.
+        copy_calendar_url_explanation: Please note that you're exporting a selection of meetings, as there are active filters. If you wish to export them all, reset all filters first.
+        copy_calendar_url_message: The URL was successfully copied to clipboard.
         export_calendar: Export calendar
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: The meeting <a href="%{meeting_path}">"%{meeting_title}"</a> is pending to be closed. Please add a report of the meeting using the "Close meeting" button.
+          greetings: Greetings,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hello %{username},
+          subject: You can now close your meeting with a report on the %{organization_name} platform
       conference_venues: Conference Venues
       content_blocks:
         upcoming_meetings:
@@ -469,8 +489,8 @@ en:
           origin: Origin
           origin_values:
             all: All
-            citizens: Citizens
             official: Official
+            participants: Participants
             user_groups: Groups
           scope: Scope
           search: Search
@@ -498,7 +518,7 @@ en:
           select_a_meeting_type: Please select a meeting type
           select_a_registration_type: Please select a registration type
           select_an_iframe_access_level: Please select an iframe access level
-          show_embedded_iframe_help: Only a few services allow embedding in meeting or live event (YouTube, Twitch and Jitsi)
+          show_embedded_iframe_help: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
         index:
           click_here: See all meetings
           new_meeting: New meeting
diff --git a/decidim-meetings/config/locales/es-MX.yml b/decidim-meetings/config/locales/es-MX.yml
index 1bb79667f19dd..2b42ac9bcbfcc 100644
--- a/decidim-meetings/config/locales/es-MX.yml
+++ b/decidim-meetings/config/locales/es-MX.yml
@@ -1,10 +1,7 @@
+---
 es-MX:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -22,8 +19,9 @@ es-MX:
         decidim_scope_id: �mbito
         decidim_user_group_id: Grupo de usuarias
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Pistas de ubicación
         online_meeting_url: URL del encuentro online
@@ -33,13 +31,26 @@ es-MX:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ es-MX:
             values:
               'false': Pasados
               'true': Próximos
-          origin_eq:
+          scope_id_eq:
+            label: �mbito
+          with_any_origin:
             label: Origen
             values:
-              citizen: Ciudadanía
               official: Oficial
+              participants: Participante
               user_group: Grupos
-          scope_id_eq:
-            label: �mbito
-          type_eq:
+          with_any_type:
             label: Tipo de encuentro
             values:
               hybrid: Híbrido
@@ -282,9 +293,6 @@ es-MX:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Ha habido un problema al cerrar este encuentro
@@ -303,17 +311,15 @@ es-MX:
             update: Actualizar
           form:
             address_help: 'Dirección: usada por Geocoder para encontrar la ubicación'
-            available_slots_help: Déjalo a 0 si tienes espacio ilimitado disponible
             disclaimer: 'Descargo de responsabilidad: Mediante el uso de un sistema de inscripción externo, aceptas que los organizadores de %{organization} no son responsables de los datos proporcionados por los usuarios al servicio externo.'
             location_help: 'Ubicación: mensaje dirigido a las participantes indicando el lugar donde reunirse'
             location_hints_help: 'Consejos de ubicación: información adicional. Ejemplo: la planta del edificio si se trata de un encuentro presencial, o la contraseña de la sala si se trata de un encuentro online con acceso restringido.'
             online_meeting_url_help: 'Enlace: permitir a las participantes conectarse directamente a tu encuentro'
-            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_url_help: 'Enlace: permitir a las participantes ir al servicio externo que estás utilizando para las inscripciones'
             select_a_meeting_type: Por favor, selecciona un tipo de encuentro
             select_a_registration_type: Por favor, seleccione un tipo de inscripción
             select_an_iframe_access_level: Por favor, seleccione un nivel de acceso iframe
-            show_embedded_iframe_help: Sólo unos pocos servicios se pueden incrustar en un encuentro o evento en vivo (YouTube, Twitch y Jitsi)
+            show_embedded_iframe_help: 'Solo unos pocos servicios permiten incrustar en reuniones o eventos en vivo desde los siguientes dominios: %{domains}'
           index:
             title: Encuentros
           new:
@@ -356,6 +362,7 @@ es-MX:
             available_slots_help: Déjalo a 0 si tiene inscripciones ilimitadas.
             invites: Invitaciones
             recommendation_message: Por razones de privacidad te recomendamos que elimines este formulario de inscripción cuando ya no lo necesites. Por defecto, esto es 3 meses después de que la reunión haya finalizado.
+            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_form: Formulario de inscripción
             registrations_count:
               one: Ha habido %{count} inscripción.
@@ -383,6 +390,8 @@ es-MX:
           value_types:
             organizer_presenter:
               not_found: 'El organizador no se encontró en la base de datos (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} ha actualizado el cuestionario del encuentro %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Todas
@@ -393,7 +402,19 @@ es-MX:
       calendar_modal:
         calendar_url: URL del calendario
         close_window: Cerrar ventana
+        copy_calendar_url: Copiar
+        copy_calendar_url_clarification: Copiar la URL del calendario al portapapeles
+        copy_calendar_url_copied: '¡Copiado!'
+        copy_calendar_url_description: Puedes ver todas las reuniones publicadas en tu aplicación o proveedor de calendario. Copia y pega esta URL en tu calendario usando la opción "Añadir nuevo calendario desde una URL".
+        copy_calendar_url_explanation: Ten en cuenta que estás exportando una selección de encuentros, ya que hay filtros activos. Si deseas exportarlos todos, primero elimina todos los filtros.
+        copy_calendar_url_message: Se ha copiado el enlace al portapapeles correctamente.
         export_calendar: Exportar calendario
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: El encuentro <a href="%{meeting_path}">"%{meeting_title}"</a> está pendiente de cerrarse. Por favor, agrega un informe de la reunión usando el botón "Cerrar encuentro".
+          greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hola %{username},
+          subject: Ahora puedes cerrar el encuentro con un informe en la plataforma %{organization_name}
       conference_venues: Sedes de las jornadas
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ es-MX:
           origin: Origen
           origin_values:
             all: Todos
-            citizens: Ciudadanos
             official: Oficial
+            participants: Participantes
             user_groups: Grupos
           scope: �mbito
           search: Buscar
@@ -497,7 +518,7 @@ es-MX:
           select_a_meeting_type: Por favor, selecciona un tipo de encuentro
           select_a_registration_type: Por favor, selecciona un tipo de inscripción
           select_an_iframe_access_level: Por favor, selecciona un nivel de acceso iframe
-          show_embedded_iframe_help: Sólo unos pocos servicios se pueden incrustar en un encuentro o evento en vivo (YouTube, Twitch y Jitsi)
+          show_embedded_iframe_help: 'Solo unos pocos servicios permiten incrustar en reuniones o eventos en vivo desde los siguientes dominios: %{domains}'
         index:
           click_here: Ver todos los encuentros
           new_meeting: Nuevo encuentro
diff --git a/decidim-meetings/config/locales/es-PY.yml b/decidim-meetings/config/locales/es-PY.yml
index 81adebf2e3ec2..08e05a5f6610b 100644
--- a/decidim-meetings/config/locales/es-PY.yml
+++ b/decidim-meetings/config/locales/es-PY.yml
@@ -1,10 +1,7 @@
+---
 es-PY:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -22,8 +19,9 @@ es-PY:
         decidim_scope_id: �mbito
         decidim_user_group_id: Grupo de usuarias
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Pistas de ubicación
         online_meeting_url: URL del encuentro online
@@ -33,13 +31,26 @@ es-PY:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ es-PY:
             values:
               'false': Pasados
               'true': Próximos
-          origin_eq:
+          scope_id_eq:
+            label: �mbito
+          with_any_origin:
             label: Origen
             values:
-              citizen: Ciudadanía
               official: Oficial
+              participants: Participante
               user_group: Grupos
-          scope_id_eq:
-            label: �mbito
-          type_eq:
+          with_any_type:
             label: Tipo de encuentro
             values:
               hybrid: Híbrido
@@ -282,9 +293,6 @@ es-PY:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Ha habido un problema al cerrar este encuentro
@@ -303,17 +311,15 @@ es-PY:
             update: Actualizar
           form:
             address_help: 'Dirección: usada por Geocoder para encontrar la ubicación'
-            available_slots_help: Déjalo a 0 si tienes espacio ilimitado disponible
             disclaimer: 'Descargo de responsabilidad: Mediante el uso de un sistema de inscripción externo, aceptas que los organizadores de %{organization} no son responsables de los datos proporcionados por los usuarios al servicio externo.'
             location_help: 'Ubicación: mensaje dirigido a las participantes indicando el lugar donde reunirse'
             location_hints_help: 'Consejos de ubicación: información adicional. Ejemplo: la planta del edificio si se trata de un encuentro presencial, o la contraseña de la sala si se trata de un encuentro online con acceso restringido.'
             online_meeting_url_help: 'Enlace: permitir a las participantes conectarse directamente a tu encuentro'
-            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_url_help: 'Enlace: permitir a las participantes ir al servicio externo que estás utilizando para las inscripciones'
             select_a_meeting_type: Por favor, selecciona un tipo de encuentro
             select_a_registration_type: Por favor, seleccione un tipo de inscripción
             select_an_iframe_access_level: Por favor, seleccione un nivel de acceso iframe
-            show_embedded_iframe_help: Solo unos pocos servicios se pueden incrustar en encuentros o eventos en directo (YouTube, Twitch y Jitsi)
+            show_embedded_iframe_help: 'Solo unos pocos servicios permiten ser incrustados en encuentros o eventos en vivo desde los siguientes dominios: %{domains}'
           index:
             title: Encuentros
           new:
@@ -356,6 +362,7 @@ es-PY:
             available_slots_help: Déjalo a 0 si tiene inscripciones ilimitadas.
             invites: Invitaciones
             recommendation_message: Por razones de privacidad te recomendamos que elimines este formulario de inscripción cuando ya no lo necesites. Por defecto, esto es 3 meses después de que la reunión haya finalizado.
+            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_form: Formulario de inscripción
             registrations_count:
               one: Ha habido %{count} registro.
@@ -383,6 +390,8 @@ es-PY:
           value_types:
             organizer_presenter:
               not_found: 'El organizador no se encontró en la base de datos (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} ha actualizado el cuestionario del encuentro %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Todas
@@ -393,7 +402,19 @@ es-PY:
       calendar_modal:
         calendar_url: URL del calendario
         close_window: Cerrar ventana
+        copy_calendar_url: Copiar
+        copy_calendar_url_clarification: Copiar la URL del calendario al portapapeles
+        copy_calendar_url_copied: '¡Copiado!'
+        copy_calendar_url_description: Puedes ver todas las reuniones publicadas en tu aplicación o proveedor de calendario. Copia y pega esta URL en tu calendario usando la opción "Añadir nuevo calendario desde una URL".
+        copy_calendar_url_explanation: Ten en cuenta que estás exportando una selección de encuentros, ya que hay filtros activos. Si deseas exportarlos todos, primero elimina todos los filtros.
+        copy_calendar_url_message: Se ha copiado el enlace al portapapeles correctamente.
         export_calendar: Exportar calendario
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: El encuentro <a href="%{meeting_path}">"%{meeting_title}"</a> está pendiente de cerrarse. Por favor, agrega un informe de la reunión usando el botón "Cerrar encuentro".
+          greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hola %{username},
+          subject: Ahora puedes cerrar el encuentro con un informe en la plataforma %{organization_name}
       conference_venues: Lugares de conferencia
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ es-PY:
           origin: Origen
           origin_values:
             all: Todos
-            citizens: Ciudadanos
             official: Oficial
+            participants: Participantes
             user_groups: Grupos
           scope: �mbito
           search: Buscar
@@ -497,7 +518,7 @@ es-PY:
           select_a_meeting_type: Por favor, selecciona un tipo de encuentro
           select_a_registration_type: Por favor, selecciona un tipo de inscripción
           select_an_iframe_access_level: Por favor, selecciona un nivel de acceso iframe
-          show_embedded_iframe_help: Solo unos pocos servicios se pueden incrustar en encuentros o eventos en directo (YouTube, Twitch y Jitsi)
+          show_embedded_iframe_help: 'Solo unos pocos servicios permiten ser incrustados en encuentros o eventos en vivo desde los siguientes dominios: %{domains}'
         index:
           click_here: Ver todos los encuentros
           new_meeting: Nuevo encuentro
diff --git a/decidim-meetings/config/locales/es.yml b/decidim-meetings/config/locales/es.yml
index 095f416f4dbf3..3e44b0f76d2a4 100644
--- a/decidim-meetings/config/locales/es.yml
+++ b/decidim-meetings/config/locales/es.yml
@@ -1,10 +1,7 @@
+---
 es:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -22,8 +19,9 @@ es:
         decidim_scope_id: �mbito
         decidim_user_group_id: Grupo
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Detalles de ubicación
         online_meeting_url: URL del encuentro online
@@ -33,13 +31,26 @@ es:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ es:
             values:
               'false': Pasados
               'true': Próximos
-          origin_eq:
+          scope_id_eq:
+            label: �mbito
+          with_any_origin:
             label: Origen
             values:
-              citizen: Ciudadanía
               official: Oficial
+              participants: Participante
               user_group: Grupos
-          scope_id_eq:
-            label: �mbito
-          type_eq:
+          with_any_type:
             label: Tipo de encuentro
             values:
               hybrid: Híbrido
@@ -282,9 +293,6 @@ es:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Se ha producido un error al cerrar este encuentro
@@ -303,17 +311,15 @@ es:
             update: Actualizar
           form:
             address_help: 'Dirección: usada por Geocoder para encontrar la ubicación'
-            available_slots_help: Déjalo a 0 si tienes espacio ilimitado disponible
             disclaimer: 'Descargo de responsabilidad: Mediante el uso de un sistema de inscripción externo, aceptas que los organizadores de %{organization} no son responsables de los datos proporcionados por los usuarios al servicio externo.'
             location_help: 'Ubicación: mensaje dirigido a las participantes indicando el lugar donde reunirse'
             location_hints_help: 'Consejos de ubicación: información adicional. Ejemplo: la planta del edificio si se trata de un encuentro presencial, o la contraseña de la sala si se trata de un encuentro online con acceso restringido.'
             online_meeting_url_help: 'Enlace: permitir a las participantes conectarse directamente a tu encuentro'
-            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_url_help: 'Enlace: permitir a las participantes ir al servicio externo que estás utilizando para las inscripciones'
             select_a_meeting_type: Por favor, selecciona un tipo de encuentro
             select_a_registration_type: Por favor, seleccione un tipo de inscripción
             select_an_iframe_access_level: Por favor, seleccione un nivel de acceso iframe
-            show_embedded_iframe_help: Solo unos pocos servicios se pueden incrustar en encuentros o eventos en directo (YouTube, Twitch y Jitsi)
+            show_embedded_iframe_help: 'Solo unos pocos servicios permiten ser incrustados en encuentros o eventos en vivo desde los siguientes dominios: %{domains}'
           index:
             title: Encuentros
           new:
@@ -356,6 +362,7 @@ es:
             available_slots_help: Dejar a 0 si las inscripciones son ilimitadas.
             invites: Invitaciones
             recommendation_message: Por razones de privacidad te recomendamos que elimines este formulario de inscripción cuando ya no lo necesites. Por defecto, esto es 3 meses después de que la reunión haya finalizado.
+            registration_email_help: Este texto aparecerá en medio del correo de confirmación de inscripción. Justo después del código de inscripción.
             registration_form: Formulario de inscripción
             registrations_count:
               one: Ha habido %{count} inscripción.
@@ -383,6 +390,8 @@ es:
           value_types:
             organizer_presenter:
               not_found: 'El organizador no se encontró en la base de datos (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} ha actualizado el cuestionario del encuentro %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Todas
@@ -393,7 +402,19 @@ es:
       calendar_modal:
         calendar_url: URL del calendario
         close_window: Cerrar ventana
+        copy_calendar_url: Copiar
+        copy_calendar_url_clarification: Copiar la URL del calendario al portapapeles
+        copy_calendar_url_copied: '¡Copiado!'
+        copy_calendar_url_description: Puedes ver todas las reuniones publicadas en tu aplicación o proveedor de calendario. Copia y pega esta URL en tu calendario usando la opción "Añadir nuevo calendario desde una URL".
+        copy_calendar_url_explanation: Ten en cuenta que estás exportando una selección de encuentros, ya que hay filtros activos. Si deseas exportarlos todos, primero elimina todos los filtros.
+        copy_calendar_url_message: Se ha copiado el enlace al portapapeles correctamente.
         export_calendar: Exportar calendario
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: El encuentro <a href="%{meeting_path}">"%{meeting_title}"</a> está pendiente de cerrarse. Por favor, agrega un informe de la reunión usando el botón "Cerrar encuentro".
+          greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hola %{username},
+          subject: Ahora puedes cerrar el encuentro con un informe en la plataforma %{organization_name}
       conference_venues: Sedes de las jornadas
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ es:
           origin: Origen
           origin_values:
             all: Todos
-            citizens: Ciudadanía
             official: Oficial
+            participants: Participantes
             user_groups: Grupos
           scope: �mbito
           search: Buscar
@@ -497,7 +518,7 @@ es:
           select_a_meeting_type: Por favor, selecciona un tipo de encuentro
           select_a_registration_type: Por favor, selecciona un tipo de inscripción
           select_an_iframe_access_level: Por favor, selecciona un nivel de acceso iframe
-          show_embedded_iframe_help: Solo unos pocos servicios se pueden incrustar en encuentros o eventos en directo (YouTube, Twitch y Jitsi)
+          show_embedded_iframe_help: 'Solo unos pocos servicios permiten ser incrustados en encuentros o eventos en vivo desde los siguientes dominios: %{domains}'
         index:
           click_here: Ver todos los encuentros
           new_meeting: Nuevo encuentro
diff --git a/decidim-meetings/config/locales/eu.yml b/decidim-meetings/config/locales/eu.yml
index 1ce5c7cb2416f..0749ee77916b7 100644
--- a/decidim-meetings/config/locales/eu.yml
+++ b/decidim-meetings/config/locales/eu.yml
@@ -1,10 +1,7 @@
+---
 eu:
   activemodel:
     attributes:
-      agenda:
-        description: deskribapena
-        duration: Iraupena
-        title: Izenburua
       close_meeting:
         attendees_count: Bertaratuen kopurua
         attending_organizations: 'Parte hartu duten erakundeen zerrenda:'
@@ -16,56 +13,73 @@ eu:
         video_url: Bideoaren URLa
       meeting:
         address: Helbidea
-        available_slots: Bilera honetarako zirrikitu erabilgarriak
-        customize_registration_email: Pertsonalizatu izena emateko e-maila
+        available_slots: Topaketa honetarako toki erabilgarriak
+        customize_registration_email: Pertsonalizatu izena emateko helbide elektronikoa
         decidim_category_id: Kategoria
         decidim_scope_id: Esparrua
         decidim_user_group_id: Erabiltzaile-taldea
         description: Deskribapena
-        end_time: Amaiera-ordua
+        end_time: Bukaera ordua
         id: ID
+        iframe_embed_type: Txertatutako iframe mota
         location: Kokapena
         location_hints: Kokapen-argibideak
-        online_meeting_url: Lineako topaketaren URLa
-        organizer_gid: Honela sortua
+        online_meeting_url: Lineako topaketaren URL helbidea
+        organizer_gid: Sortze-data
         organizer_id: Antolatzailea
-        private_meeting: Bilera pribatua
-        registration_email_custom_content: Izena emateko e-mailaren eduki pertsonalizatua
-        registration_form_enabled: Izena emateko inprimakia gaituta
-        registration_terms: Izen-emateak
+        private_meeting: Topaketa pribatua
+        registration_email_custom_content: Helbide elektroniko pertsonalizatua
+        registration_form_enabled: Izena emateko galdetegia
+        registration_terms: Izena emateko baldintzak
+        registration_type: Erregistro mota
         registration_url: Izena ematearen URLa
-        registrations_enabled: Erregistroak gaituta
-        show_embedded_iframe: Erakutsi iframe txertatua URL honentzat
-        start_time: Hasiera-ordua
+        registrations_enabled: Izen-emateak gaituta
+        reserved_slots: Topaketa honetarako toki erabilgarriak
+        start_time: Hasiera ordua
         title: Titulua
-        transparent: gardena
+        transparent: Gardena
         type_of_meeting: Mota
+      meeting_agenda:
+        title: Izenburua
+        visible: Ikusgai
+      meeting_agenda_items:
+        description: Deskribapena
+        title: Izenburua
+      meeting_registration_invite:
+        email: Helbide elektronikoa
+        name: Izena
+      validate_registration_code:
+        code: Kodea
     errors:
       models:
+        meeting:
+          attributes:
+            iframe_embed_type:
+              not_embeddable: URL hau ezin da bileren edo ekitaldien orrian txertatu
         meeting_agenda:
           attributes:
             base:
               too_many_minutes: Elementuen iraupena %{count} minutuko iraupena gainditzen du
-              too_many_minutes_child: Elementuaren haurraren iraupena "%{parent_title}" gurasoaren iraupena gainditzen du %{count} minutuko agendako elementua
+              too_many_minutes_child: '"%{parent_title}" bileraren gaiak %{count} minutu baino gehiago irauten du'
         meeting_registration_invite:
           attributes:
             email:
-              already_invited: Mezu hau dagoeneko gonbidatu da
+              already_invited: Helbide elektronikoko kontu hau gonbidatuta dago
     models:
-      decidim/meetings/close_meeting_event: Bilera itxia
+      decidim/meetings/close_meeting_event: Topaketa itxia
       decidim/meetings/create_meeting_event: Bilera
-      decidim/meetings/meeting_registrations_enabled_event: Erregistroak gaituta
-      decidim/meetings/meeting_registrations_over_percentage_event: Matrikulazioen muga gainditzen dutenak
-      decidim/meetings/upcoming_meeting_event: Hurrengo bilera
-      decidim/meetings/update_meeting_event: Bilera eguneratua
+      decidim/meetings/meeting_registrations_enabled_event: Izen-ematea gaituta
+      decidim/meetings/meeting_registrations_over_percentage_event: Izen-emateak mugatik kanpo
+      decidim/meetings/upcoming_meeting_event: Hurrengo topaketa
+      decidim/meetings/update_meeting_event: Topaketa eguneratua
   activerecord:
     models:
       decidim/meetings/meeting:
-        one: Bilera
-        other: Bilerak
+        one: Topaketa
+        other: Topaketak
       decidim/meetings/minutes:
-        one: Minutu
-        other: Minutu
+        one: Akta
+        other: Aktak
       decidim/meetings/registration:
         one: Izen-ematea
         other: Izen-emateak
@@ -85,36 +99,37 @@ eu:
             values:
               'false': Aurrekoak
               'true': Hurrengoak
-          origin_eq:
+          scope_id_eq:
+            label: Eremua
+          with_any_origin:
             label: Jatorria
             values:
-              citizen: Hiritarrak
               official: Ofiziala
+              participants: Parte-hartzailea
               user_group: Erabiltzaile-taldeak
-          scope_id_eq:
-            label: Eremua
-          type_eq:
+          with_any_type:
             label: Topaketa mota
             values:
+              hybrid: Hibridoa
               in_person: Aurrez aurre
               online: Lineakoa
       meeting_copies:
         create:
-          error: Akatsa gertatu da bilera hau bikoiztea.
-          success: Bildutako bilera bikoiztua behar bezala egin da.
+          error: Arazo bat izan da topaketa hau eguneratzean.
+          success: Bildutako topaketa bikoiztua behar bezala egin da.
         new:
-          copy: Copy
+          copy: Kopiatu
           select: Aukeratu zein datu bikoiztu nahi dituzun
-          title: Bilera bikoiztua
+          title: Topaketa bikoiztua
     components:
       meetings:
         actions:
           comment: Iruzkina
           join: Parte hartu
-        name: Bilerak
+        name: Topaketak
         settings:
           global:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_enabled: Iruzkinak gaituta
             comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsita konfigurazioa mantendu nahi baduzu)
             creation_enabled_for_participants: Parte-hartzaileek topaketak sortu ahal dituzte
@@ -122,73 +137,76 @@ eu:
             enable_pads_creation: Gaitu pads sortzea
             maps_enabled: Mapak gaituta
             registration_code_enabled: Izena emateko kodea aktibatuta
-            resources_permissions_enabled: Akzioen baimenak bilera bakoitzerako ezarri daitezke
+            resources_permissions_enabled: Topaketa bakoitzerako ekintza-baimenak ezar daitezke
             scope_id: Eremua
             scopes_enabled: Eremuak gaituta
             terms_and_conditions_url_for_meeting_creators: Irizpide eta baldintzen URLa topaketen egileentzat
           step:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_blocked: Iruzkinak blokeatuta
-            creation_enabled_for_participants: Gaitu topaketak parte-hartzaileek sortzea
-            creation_enabled_for_user_groups: Gaitu topaketak taldeek sortzea
+            creation_enabled_for_participants: Partehartzaileek topaketak sortu dizatkete
+            creation_enabled_for_user_groups: Erabiltzaileek bilerak sor ditzakete taldearen arabera
     events:
       meetings:
         meeting_closed:
           affected_user:
-            email_intro: 'Zure bilera "%{resource_title}" itxi egin da. Bere orriko ondorioak irakur ditzakezu:'
-            email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera antolatu duzulako.
-            email_subject: '"%{resource_title}" bilera itxita zegoen'
-            notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera itxita zegoen.
+            email_intro: 'Zure topaketa "%{resource_title}" itxi egin da. Bere orriko ondorioak irakur ditzakezu:'
+            email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" topaketa antolatu duzulako.
+            email_subject: '"%{resource_title}" topaketa itxita zegoen'
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa itxita zegoen.
           follower:
-            email_intro: '"%{resource_title}" bilera itxita zegoen. Bere orriko ondorioak irakur ditzakezu:'
-            email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" bilera jarraitzen ari zarelako. Aurreko esteka estekan jarrai dezakezu.
-            email_subject: '"%{resource_title}" bilera itxita zegoen'
-            notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera itxita zegoen.
+            email_intro: '"%{resource_title}" topaketa itxita zegoen. Bere orriko ondorioak irakur ditzakezu:'
+            email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" topaketa jarraitzen ari zarelako. Aurreko estekan jarrai dezakezu.
+            email_subject: '"%{resource_title}" topaketa itxita zegoen'
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa itxita zegoen.
         meeting_created:
           button_text: Eman izena topaketan
-          email_intro: Bilera "%{resource_title}" | gehitu da "%{participatory_space_title}" " jarraitzen ari zarela.
-          email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: Bilera berria %{participatory_space_title}
-          notification_title: Bilera <a href="%{resource_path}">%{resource_title}</a> gehitu da %{participatory_space_title}
+          email_intro: Topaketa "%{resource_title}" jarraitzen duzun "%{participatory_space_title}" espazioan gehitu da.
+          email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" prozesua jarraitzen ari zarelako. Ez jarraitu aurreko loturatik.
+          email_subject: Toopaketa berria %{participatory_space_title}-an
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa gehitu da %{participatory_space_title}
         meeting_registration_confirmed:
-          notification_title: <a href="%{resource_url}">%{resource_title}</a> bilerako erregistratzea baieztatu da. Zure izena emateko kodea %{registration_code}.
+          notification_title: <a href="%{resource_url}">%{resource_title}</a> topaketarako izen-ematea baieztatu da. Zure izena emateko kodea %{registration_code} da.
         meeting_registrations_over_percentage:
           email_intro: '"%{resource_title}" bilera okupatutako zirrikituak %{percentage} baino gehiagokoak dira.'
-          email_outro: Jakinarazpen hau jaso duzu bileraren parte hartzaileen gunea delako.
-          email_subject: '"%{resource_title}" bilera okupatutako zirrikituak %{percentage} baino gehiago dira.'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilerako slot okupatuak %{percentage} baino gehiagokoak dira.
+          email_outro: Topaketako espazio parte-hartzailearen administratzaile zarelako jaso duzu jakinarazpen hau.
+          email_subject: '"%{resource_title}" topaketarako hartutako ordu-tarteak % %{percentage}% baino gehiago dira'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketarako hartutako ordu-tarteak % %{percentage}% baino gehiago dira.
         meeting_updated:
-          email_intro: '"%{resource_title}" bilera eguneratu da. Bertsio berria irakur dezakezu bere orritik:'
-          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: '"%{resource_title}" bilera eguneratu da'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera eguneratu da.
+          email_intro: '"%{resource_title}" topaketa eguneratu da. Bertsio berria irakur dezakezu bere orrian:'
+          email_outro: Jjakinarazpen hau "%{resource_title}" topaketa jarraitzen ari zarelako. Aurreko estekan baja eman daiteke.
+          email_subject: '"%{resource_title}" topaketa eguneratu da'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa eguneratu da.
         registration_code_validated:
-          email_intro: Zure izen-emate kodea "%{registration_code}" bilera "%{resource_title}" egiteko baliozkoa izan da.
-          email_outro: Jakinarazpen hau jaso duzu zure "%{resource_title}" bilera-kodearen kodea erregistratu delako.
-          email_subject: Zure izen-emate kodea "%{registration_code}" bilera "%{resource_title}" egiteko baliozkoa izan da
-          notification_title: Zure erregistro-kodea "%{registration_code}" <a href="%{resource_path}">%{resource_title}</a> bilerako balioztatu da.
+          email_intro: Zure erregistro-kodea " "%{registration_code}" "%{resource_title}" topakerarako baliozkotu da.
+          email_outro: Jakinarazpen hau jaso duzu zure erregistro-kodea baliozkotu delako "%{resource_title}" topaketarako.
+          email_subject: Zure izen-emate kodea "%{registration_code}" "%{resource_title}" topaketarako baliozkotu egin da
+          notification_title: Zure erregistro-kodea "%{registration_code}" <a href="%{resource_path}">%{resource_title}</a> topaketarako balioztatu da.
         registrations_enabled:
-          email_intro: '"%{resource_title}" topaketak erregistroak gaitu ditu. Zeure burua erregistratu dezakezu bere orrialdean:'
+          email_intro: '"%{resource_title}" topaketak erregistroak gaitu ditu. Zeure izena eman dezakezu bere orrialdean:'
           email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
           email_subject: '"%{resource_title}" topaketak erregistroak gaitu ditu.'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera erregistratzeak gaitu du.
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketaren izen-emateak zabalik.
         upcoming_meeting:
-          email_intro: '"%{resource_title}" topaketa 48 ordu baino gutxiagotan hasiko da.'
-          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: '"%{resource_title}" topaketa 48 ordu baino gutxiagotan hasiko da.'
+          email_intro: '"%{resource_title}" topaketa 48 ordu baino lehen hasiko da.'
+          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" topaketa jarraitzen duzulako. Aurreko estekan baja eman daiteke.
+          email_subject: '"%{resource_title}" topaketa 48 ordu baino lehen hasiko da.'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa 48 ordu baino gutxiagoan hasiko da.
+    forms:
+      meetings:
+        attendees_count_help_text: Ez ahaztu tokapetara bertaratutakoen kopuru osoa sartzea, aurrez aurre, online edo hibridoan.
     gamification:
       badges:
         attended_meetings:
           conditions:
-            - Parte hartu nahi duzun bileretan izena eman
-          description: Idazmahaia hainbat aurpegi bileretara joaten zarenean ematen da.
-          description_another: Erabiltzaile honek %{score} bileratan parte hartu du.
-          description_own: '%{score} bileretan parte hartu duzu.'
-          name: Bilera parte hartzera
-          next_level_in: '%{score} topaketa gehiago parte hartzeko hurrengo mailara iristeko!'
+            - Parte hartu nahi duzun topaketan izena eman
+          description: Idazmahaia hau aurrez aurreko topaketa batzuetara joaten zarenean ematen da.
+          description_another: Erabiltzaile honek %{score} topeketetan parte hartu du.
+          description_own: '%{score} topaketetan parte hartu duzu.'
+          name: Parte hartu den topkaetak
+          next_level_in: '%{score} topaketa gehiago hurrengo mailara iristeko!'
           unearned_another: Erabiltzaile honek oraindik ez du topaketarik izan.
-          unearned_own: Oraindik ez duzu bilerarako parte hartu.
+          unearned_own: Oraindik ez zara topaketara joan.
     meetings:
       actions:
         agenda: Agenda
@@ -200,36 +218,36 @@ eu:
         edit: Editatu
         invalid_destroy:
           proposals_count:
-            one: 'Topaketa ezin da ezabatu lotutako %{count} proposamen dituelako:'
+            one: 'Topaketa ezin da ezabatu lotutako proposamen bat dituelako:'
             other: 'Topaketa ezin da ezabatu lotutako %{count} proposamen dituelako:'
         manage_poll: Konfiguratu inkesta
-        new: Bilera berria
+        new: Topaketa berria
         preview: Aurreikusi
         registrations: Izen-emateak
         title: Ekintzak
       admin:
         agenda:
           agenda_item:
-            add_agenda_item_child: Gehitu agenda item ume
-            agenda_item: Agenda Item
+            add_agenda_item_child: Gehitu agenda eremua
+            agenda_item: Agenda eremua
             agenda_item_children: Agenda item Childs
-            down: Down
+            down: Behera
             remove: Kendu
-            up: up
+            up: Gora
           agenda_item_child:
             agenda_item_child: Agenda Elementu umea
-            down: Down
+            down: Behera
             remove: Kendu
-            up: up
+            up: Gora
           create:
             invalid: Arazo bat izan da agenda hau sortzeko
             success: Egutegia modu egokian sortu da
           edit:
             title: Editatu agenda
-            update: eguneratzearen
+            update: Gorde
           form:
-            add_agenda_item: Gehitu agenda item
-            agenda_items: Agenda itemak
+            add_agenda_item: Gehitu agenda datu-eremua
+            agenda_items: Agenda eremuak
             end_date: Amaiera data
             start_date: Hasiera data
           new:
@@ -246,30 +264,30 @@ eu:
         invite_join_meeting_mailer:
           invite:
             decline: Deuseztatu gonbidapena
-            invited_you_to_join_a_meeting: "%{invited_by} gonbidatu zaitu %{application} bileran. Beheko estekan onartu dezakezu."
-            join: Erregistratu bilera '%{meeting_title}'
+            invited_you_to_join_a_meeting: "%{invited_by} gonbidatu zaitu %{application} topaketan. Beheko estekan onartu dezakezu."
+            join: Erregistratu topaketa'%{meeting_title}'
         invites:
           create:
-            error: Arazo bat izan da erabiltzaileak bileran sartzeko gonbita emanda.
-            success: Erabiltzailea behar bezala gonbidatu bilera batera.
+            error: Arazo bat zegoen parte-hartzailea topaketara gonbidatzeko.
+            success: Erabiltzailea behar bezala gonbidatu topaketa batera.
           form:
             attendee_type: Parte-hartzaile mota
-            existing_user: Erabiltzaile existentea
+            existing_user: Parte-hartzailea badago
             invite: Gonbit egin
             invite_explanation: Erabiltzailea bilera eta erakundean sartzeko gonbidatuko zaie.
             non_user: Erabiltzailea ez dago
             select_user: Aukeratu erabiltzailea
           index:
             filter:
-              accepted: Onartu
-              all: guztiak
+              accepted: Onartuta
+              all: Guztiak
               rejected: Baztertuta
-              sent: bidalia
+              sent: Bidalita
             filter_by: Iragazi arabera
-            invite_attendee: Gonbidatu gonbidatua
+            invite_attendee: Gonbidatu
             invites: Gonbidapenak
-            registrations_disabled: Ezin duzu parte-hartzaile bat gonbidatu erregistrazioek desgaituta egon direlako.
-            search: Search
+            registrations_disabled: Ezin duzu inor gonbidatu izne-emateak desgaituta daudelako.
+            search: Bilatu
         meeting_closes:
           edit:
             close: Itxi
@@ -288,19 +306,19 @@ eu:
                 other: Topaketa ezin da ezabatu lotutako %{count} proposamen dituelako
             success: Topaketa zuzen ezabatu da.
           edit:
-            title: Editatu topaketa
+            title: Editatu bilera
             update: Eguneratu
           form:
-            address_help: 'Helbidea: Geocoderrek erabilia kokapena aurkitzeko'
-            available_slots_help: Uzti 0an erabiltzeko espazio mugatua baduzu
+            address_help: 'Helbidea: Geocoderrek erabiltzen du kokapena aurkitzeko'
             disclaimer: 'Erantzukizun-deskargua: Kanpoko inskripzio-sistema bat erabiliz, onartzen duzu %{organization} ko antolatzaileak ez direla kanpo-zerbitzuko erabiltzaileek emandako datuen erantzule.'
-            location_help: 'Kokapena: mezua part-hartzaileei zuzendua biltzeko lekua adieraziz'
-            location_hints_help: 'Kokapen-aholkuak: informazio gehigarria. Adibidea: eraikinaren solairua, aurrez aurreko topaketa bada, edo aretoaren pasahitza, sarrera mugatua duen online topaketa bada.'
-            online_meeting_url_help: 'Lotura: Utzi parte-hartzaileei zuzenean konektatzen zure topaketara'
-            registration_email_help: Testu hau izen-ematea baieztatzeko postaren erdian agertuko da. Inskripzio kodearen ondoren.
-            registration_url_help: 'Lotura: parte-hartzaileei aukera ematea izena emateko erabiltzen ari zaren kanpoko zerbitzura joateko'
+            location_help: 'Kokapena: erabiltzaileentzako mezua, non bildu behar dugun adierazten duena'
+            location_hints_help: 'Kokapen-aholkuak: informazio gehigarria. Adibidez: eraikinaren solairua, aurrez aurreko topaketa bat bada, edo topaketarako pasahitza, sarbide mugatuko online topaketa bat bada.'
+            online_meeting_url_help: 'Esteka: Utzi parte-hartzaileei zuzenean konektatzen zure topaketara'
+            registration_url_help: 'Esteka: parte-hartzaileei aukera ematea izena emateko erabiltzen ari zaren kanpoko zerbitzura joateko'
             select_a_meeting_type: Mesedez, hautatu topaketa mota bat
-            select_a_registration_type: Mesedez, hautatu erregistro mota bat
+            select_a_registration_type: Mesedez, aukeratu erregistro mota bat
+            select_an_iframe_access_level: Mesedez, aukeratu iframe maila bat
+            show_embedded_iframe_help: 'Zerbitzu gutxi batzuek baino ez dute uzten topaketan edo zuzeneko gertakarietan txertatzen honako domeinu hauetatik:%{domains}'
           index:
             title: Topaketa-zerrenda
           new:
@@ -311,11 +329,11 @@ eu:
             success: Topaketa zuzen argitaratu da
           service:
             description: deskribapena
-            down: Down
+            down: Behera
             remove: Kendu
-            service: zerbitzua
+            service: Zerbitzua
             title: Izenburua
-            up: up
+            up: Gora
           services:
             add_service: Gehitu zerbitzua
             services: Zerbitzuak
@@ -323,53 +341,56 @@ eu:
             invalid: Arazo bat gertatu da topaketa hau desargitaratzean
             success: Topaketa zuzen desargitaratu da
           update:
-            invalid: Arazo bat izan da topaketa hau eguneratzean.
+            invalid: Arazo bat zegoen topaketa eguneratzeko
             success: Topaketa zuzen eguneratu da.
         meetings_poll:
           form:
-            title: Editatu inkestaren galdetegia honetarako %{questionnaire_for}
+            title: Editatu %{questionnaire_for} inkestaren galdetekgia
           update:
             invalid: Arazo bat izan da topaketa hau eguneratzean
-            success: Topaketa zuzen eguneratu da
+            success: Inkesta zuzen eguneratua
         models:
           meeting:
             name: Topaketa
         registrations:
           edit:
             save: Gorde
-            validate: Balidatu
+            validate: Balioztatu
             validate_registration_code: Baliozkotzeko inskripzio kodea
           form:
             available_slots_help: Utzi 0an izen-emate mugagabeak edukiz gero.
             invites: Gonbidapenak
-            recommendation_message: Pribatutasuna dela eta, izena emateko inprimaki hau kentzea gomendatzen dizugu, behar ez duzunean. Besterik adierazi ezean, hau da, bilera amaitu eta 3 hilabetera.
-            registration_form: Izena emateko inprimakia
+            recommendation_message: Pribatutasuna dela eta, izena emateko formulario hau kentzea gomendatzen dizugu, behar ez duzunean. Besterik adierazi ezean, hau da, topaketa amaitu eta 3 hilabetera.
+            registration_email_help: Testu hau erregistroa berresteko posta elektronikoaren erdian agertuko da. Erregistro-kodearen ondoren.
+            registration_form: Izena emateko formularioa
             registrations_count:
-              one: Dena den, %{count} erregistratzeko.
+              one: Izen-emate %{count} izan da.
               other: Dena den, %{count} matrikulazioak.
             reserved_slots_help: Utzi 0 aukerarik ez baduzu erreserbatutako slotarik
             reserved_slots_less_than: '%{count} baino gutxiago izan behar du'
-            title: Erregistroak
+            title: Izen-emateak
           update:
             invalid: Arazo bat izan da izen-ematearen konfigurazioa gordetzean.
-            success: Topaketen izen-emateen konfigurazioak zuzen gorde dira.
+            success: Topaketaren izen-ematearen erregistro-ezarpenak ondo gorde dira.
           validate_registration_code:
             invalid: Izena emateko kode hau baliogabea da.
             success: Izen-ematearen kodea behar bezala balioztatu da.
       admin_log:
         invite:
-          create: "%{user_name} gonbidatu %{attendee_name} batzeko %{resource_name} buruzko bilera %{space_name} espazio"
-          deleted: "%{user_name} gabeko %{attendee_name} batu batetik %{resource_name} bileraren on %{space_name} espazio"
-          update: "%{user_name} gonbidatu %{attendee_name} batzeko %{resource_name} buruzko bilera %{space_name} espazio"
+          create: "%{user_name} gonbidatua izan da %{attendee_name} batzeko %{resource_name} buruzko topaketa %{space_name} espazioan"
+          deleted: "%{user_name}-ek %{attendee_name}-ri gonbidapena egiteari utzi zion %{space_name} espazioan parte hartzeko"
+          update: "%{user_name}-ek %{attendee_name}-ri gonbidatu %{space_name} espazioan parte hartzeko"
         meeting:
-          close: "%{user_name} %{resource_name} bilera %{space_name} espazioan itxi zen"
-          create: "%{user_name} %{resource_name} bilera sortu zen %{space_name} espazioan"
-          delete: "%{user_name} %{resource_name} topaketa ezabatu da %{space_name} espazioan"
-          export_registrations: "%{user_name} %{resource_name} bilera erregistratu dira %{space_name} espazioan"
-          update: "%{user_name} %{resource_name} topaketa %{space_name} espazioan eguneratu zen"
+          close: "%{user_name}-k %{resource_name} topaketa %{space_name} espazioan itxi zen"
+          create: "%{user_name}-k %{resource_name} topaketa sortu da %{space_name} espazioan"
+          delete: "%{user_name}-k %{resource_name} topaketa ezabatu da %{space_name} espazioan"
+          export_registrations: "%{user_name} -k %{resource_name} topaketarako erregistroak esportatu ditu %{space_name} espazioan"
+          update: "%{user_name} %{resource_name} topaketa %{space_name} espazioan eguneratu da"
           value_types:
             organizer_presenter:
               not_found: 'Antolatzailea ez da aurkitu datu-basean (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} erabiltzaileak galdetegia eguneratu du %{meeting_name} topaketan"
       application_helper:
         filter_category_values:
           all: Guztiak
@@ -380,16 +401,39 @@ eu:
       calendar_modal:
         calendar_url: Egutegiaren URLa
         close_window: Itxi leihoa
+        copy_calendar_url: Kopiatu
+        copy_calendar_url_clarification: Kopiatu URL egutegia arbelera
+        copy_calendar_url_copied: Kopiatuta!
+        copy_calendar_url_description: Argitaratutako batzar guztiak zure egutegi-aplikazioan edo hornitzailean ikus ditzakezu. Kopiatu eta itsatsi URL hau "Egutegi berria gehitu URL batetik" aukera erabiliz
+        copy_calendar_url_explanation: Kontuan izan aukeratutako batzar multzo bat esportatzen ari zarela, eta iragazkiak aktibatuta daudela. Denak esportatu nahi badituzu kendu irakazkiak lehenengo.
+        copy_calendar_url_message: URL hau zuzen kopiatu da zure arbelean.
         export_calendar: Esportatu egutegia
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: <a href="%{meeting_path}">"%{meeting_title}"</a> topaketa ixteko dago. Mesedez, gehitu bilerari buruzko txosten bat "Itxi bilera" botoia erabiliz.
+          greetings: Agur, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Kaixo, %{username},
+          subject: Zure topaketa itxi dezakezu %{organization_name}-ren gaineko txosten batekin
       conference_venues: Hitzaldi aretoak
       content_blocks:
         upcoming_meetings:
+          name: Hurrengo topaketak
+          upcoming_meetings: Hurrengo topaketak
           view_all_meetings: Ikusi dena
       directory:
         meetings:
           index:
-            meetings: Bilerak
+            meetings: Topaketak
             space_type: Partaidetza espazioa
+      iframe_access_level:
+        all: Bisitari guztiak
+        registered: "Parte hartzaile erregistratuak topaketa honetan\n"
+        signed_in: Erregistratutako parte-hartzaileak bakarrik
+      iframe_embed_type:
+        embed_in_meeting_page: Topaketa-orrian txertatuta
+        none: Bat ere ez
+        open_in_live_event_page: Zabalik ekitaldi orrian (hautazko inkestekin)
+        open_in_new_tab: Ireki URL fitxa berri batean
       last_activity:
         meeting_updated_at_html: "<span>eztabaida ordu honetan %{link}</span> eguneratuta"
         new_meeting_at_html: "<span>Bilera berria %{link}</span>"
@@ -401,12 +445,12 @@ eu:
       mailer:
         invite_join_meeting_mailer:
           invite:
-            subject: Bilera baterako gonbidapena
+            subject: Topaketa baterako gonbidapena
         registration_mailer:
           confirmation:
             subject: Zure topaketarako izen-ematea baieztatua izan da
       meeting:
-        not_allowed: Ez zaude bilera hau ikusteko baimenik
+        not_allowed: Ez zaude topaketa hau ikusteko baimenik
       meeting_closes:
         edit:
           back: Atzera
@@ -422,8 +466,8 @@ eu:
           outlook: Ireki Outlooken egutegia
         count:
           meetings_count:
-            one: "%{count} topaketa"
-            other: "%{count} topaketak"
+            one: "topaketa 1"
+            other: "%{count} topaketa"
         create:
           invalid: Arazo bat izan da topaketa hau sortzean.
           success: Topaketa zuzen sortu duzu.
@@ -444,16 +488,17 @@ eu:
           origin: Jatorria
           origin_values:
             all: Denak
-            citizens: Hiritarrak
             official: Ofiziala
+            participants: Parte-hartzaileak
             user_groups: Taldeak
           scope: Eremua
           search: Bilatu
           type: Mota
           type_values:
             all: Denak
+            hybrid: Hibridoa
             in_person: Aurrez aurre
-            online: Lineakoa
+            online: Online
         filters_small_view:
           close_modal: Itxi leihoa
           filter: Iragazi
@@ -467,10 +512,12 @@ eu:
           location_help: 'Kokapena: mezua part-hartzaileei zuzendua biltzeko lekua adieraziz'
           location_hints_help: 'Kokapen-aholkuak: informazio gehigarria. Adibidea: eraikinaren solairua, aurrez aurreko topaketa bada, edo aretoaren pasahitza, sarrera mugatua duen online topaketa bada.'
           online_meeting_url_help: 'Lotura: Utzi parte-hartzaileei zuzenean konektatzen zure topaketara'
-          registration_url_help: 'Lotura: parte-hartzaileei aukera ematea izena emateko erabiltzen ari zaren kanpoko zerbitzura joateko'
+          registration_url_help: 'Esteka: parte-hartzaileei aukera ematea izena emateko erabiltzen ari zaren kanpoko zerbitzura joateko'
           select_a_category: Mesedez, hautatu kategoria bat
           select_a_meeting_type: Mesedez, hautatu topaketa mota bat
           select_a_registration_type: Mesedez, hautatu erregistro mota bat
+          select_an_iframe_access_level: Mesedez, aukeratu iframe maila bat
+          show_embedded_iframe_help: 'Zerbitzu gutxi batzuek baino ez dute uzten topaketan edo zuzeneko gertakarietan txertatzen honako domeinu hauetatik: %{domains}'
         index:
           click_here: Ikusi topaketa guztiak
           new_meeting: Topaketa berria
@@ -495,49 +542,52 @@ eu:
           close_meeting: Itxi topaketa
           contributions: Ekarpen-kopurua
           date: Data
-          edit_close_meeting: Editatu bileraren txostena
+          edit_close_meeting: Editatu topaketaren txostena
           edit_meeting: Editatu topaketa
           going: Topaketa honetan eman duzu izena
           join: Izena eman topaketan
           leave: Baliogabetu zure izen-ematea
           leave_confirmation: Ziur zaude topaketa honetarako zure izen-ematea indargabetu nahi duzula?
-          link_available_soon: Lotura hau laster erabilgarri
-          link_closed: Sartzeko lotura bilera hasi baino minutu batzuk lehenago egongo da erabilgarri
+          link_available_soon: Esteka hau laster erabilgarria izango da
+          link_closed: Sartzeko lotura topaketa hasi baino minutu batzuk lehenago egongo da erabilgarri
           live_event: Topaketa hau oraintxe gertatzen ari da
-          meeting_minutes: Bileraren akta
+          meeting_minutes: Topaketaren akta
           micro_camera_permissions_warning: Beheko botoia sakatzen duzunean, mikrofono eta/edo kamerarako baimena eskatuko zaizu eta bideohitzaldian sartuko zara
           no_slots_available: Ez dago leku librerik
           organizations: Bertaratutako erakundeak
           registration_code_help_text: Zure izena emateko kodea
           registration_state:
-            validated: balioztatu
-            validation_pending: VALIDACIÓN PENDIENTE
+            validated: BALIDATUA
+            validation_pending: BALIOZKOTZEKO ZAIN
           remaining_slots:
             one: "%{count} slot geratzen da"
             other: "%{count} slot geratzen dira"
           view: ikusi
           visit_finished: Ikusi egindako topaketa
+          withdraw_btn_hint: Topaketa bertan behera utz dezakezu iritziz aldatzen baduzu. Bilera ez da ezabatu. Erretiratuen zerrendan agertuko da.
+          withdraw_confirmation_html: Ziur zaude proposamen hau kendu nahi duzula? <br><br><strong>Ekintza hau ezin da desegin!</strong>
           withdraw_meeting: Bertan behera utzi topaketa
         update:
           invalid: Arazo bat izan da topaketa hau eguneratzean.
           success: Topaketa zuzen eguneratu duzu.
       meetings_map:
-        view_meeting: Ikusi bilera
+        view_meeting: Topaketa ikusi
       models:
         invite:
           fields:
-            email: Emaila
+            email: Helbide elektronikoa
             name: izena
-            sent_at: Bidalitakoan
+            sent_at: ' Bidalketa-data: '
             status: Egoera
           status:
-            accepted: Onartuta (%{at})
-            rejected: Baztertua (%{at})
+            accepted: (%{at})-an onartura
+            rejected: (%{at})-an baztertuta
             sent: bidalia
         meeting:
           fields:
             closed: Itxita
             end_time: Bukaera-data
+            id: ID
             map: Mapa
             official_meeting: Topaketa ofiziala
             start_time: Hasiera-data
@@ -550,6 +600,7 @@ eu:
             empty_questions: Topaketa honetan zehar, galdera batzuk bidaliko dira eta erantzun ahal izango dituzu. Hemen erakutsiko dira.
           index_admin:
             admin_dashboard: Administrazio-panela
+            edit: Editatu administrazio-panelean
             question: Galdera
             received_answer: jasotako erantzuna
             received_answers: jasotako erantzunak
@@ -557,12 +608,15 @@ eu:
             send: Bidali
             sent: Bidalita
           published_question:
-            max_choices_alert: Aukera gehiegi daude hautatuta
+            max_choices_alert: Aukera gehiegi hautatuta da
             question: Galdera
             question_replied: Galdera erantzunda
             reply_question: Erantzun galdera
       public_participants_list:
         attending_participants: Bertaratutako parte-hartzaileak
+        hidden_participants_count:
+          one: eta %{count} pertsona gehiago
+          other: eta %{count} pertsona gehiago
       read_more: "(geihago irakurri)"
       registration_mailer:
         confirmation:
@@ -572,37 +626,38 @@ eu:
       registration_type:
         on_different_platform: Plataforma desberdin batean
         on_this_platform: Plataforma honetan
-        registration_disabled: Desgaitutako izen-emateak
+        registration_disabled: Izen-ematea desgaituta dago
       registrations:
         create:
           invalid: Arazo bat izan da topaketa honekin bat egitean.
           success: Topaketan izena ongi eman duzu.
         decline_invitation:
-          invalid: Arazo bat izan da gonbidapena gaindituz gero.
-          success: Gonbidapena ongi egin du.
+          invalid: Arazo bat zegoen gonbidapenari uko egiten.
+          success: Arrakastaz uko egin diozu gonbidapenari.
         destroy:
           invalid: Arazo bat izan da topaketa honetatik ateratzean.
           success: Topaketatik ongi atera zara.
       type_of_meeting:
+        hybrid: Hibridoa
         in_person: Aurrez aurre
-        online: Lineakoa
+        online: Online
       types:
-        private_meeting: Bilera pribatua
-        transparent: gardena
+        private_meeting: Topaketa pribatua
+        transparent: Gardena
         withdraw: Kenduta
       versions:
         back_to_resource: Itzuli topaketara
       withdraw:
         error: Arazo bat izan da topaketa bertan behera uztean
-        success: Topaketa zuzen utzi da bertan behera
+        success: Topaketa da bertan behera
     metrics:
       meetings:
-        description: Bilera kopurua sortu da
-        object: bilerak
-        title: Bilerak
+        description: Topaketa kopurua sortu da
+        object: topaketak
+        title: Topaketak
     participatory_spaces:
       highlighted_meetings:
-        past_meetings: Azken bilerak
+        past_meetings: Azken topaketak
         see_all: Ikusi dena (%{count})
         upcoming_meetings: Hurrengo topaketak
       upcoming_meeting_for_card:
@@ -619,4 +674,4 @@ eu:
   devise:
     mailer:
       join_meeting:
-        subject: Bilera baterako gonbidapena
+        subject: Topaketa baterako gonbidapena
diff --git a/decidim-meetings/config/locales/fi-plain.yml b/decidim-meetings/config/locales/fi-plain.yml
index 351a9cbcb0a65..01e61539fec7d 100644
--- a/decidim-meetings/config/locales/fi-plain.yml
+++ b/decidim-meetings/config/locales/fi-plain.yml
@@ -1,10 +1,7 @@
+---
 fi-pl:
   activemodel:
     attributes:
-      agenda:
-        description: Kuvaus
-        duration: Kesto
-        title: Otsikko
       close_meeting:
         attendees_count: Osallistujien määrä
         attending_organizations: Osallistuvien organisaatioiden lista
@@ -22,8 +19,9 @@ fi-pl:
         decidim_scope_id: Teema
         decidim_user_group_id: Käyttäjäryhmä
         description: Kuvaus
-        end_time: Lopetusaika
+        end_time: Päättymisaika
         id: ID
+        iframe_embed_type: Iframe-upotuksen tyyppi
         location: Paikka
         location_hints: Paikan tarkemmat tiedot
         online_meeting_url: Verkkotapaamisen osoite (URL)
@@ -33,13 +31,26 @@ fi-pl:
         registration_email_custom_content: Ilmoittautumisten sähköpostivastauksen muokattu sisältö
         registration_form_enabled: Ilmoittautumislomake on käytössä
         registration_terms: Ilmoittautumisehdot
+        registration_type: Ilmoittautumistyyppi
         registration_url: Ilmoittautumisosoite (URL)
         registrations_enabled: Ilmoittautumiset ovat käytössä
-        show_embedded_iframe: Näytä upotettu iframe tälle osoitteelle
-        start_time: Aloitusaika
+        reserved_slots: Varatut paikat tälle tapaamiselle
+        start_time: Alkamisaika
         title: Otsikko
         transparent: Läpinäkyvä
         type_of_meeting: Tyyppi
+      meeting_agenda:
+        title: Otsikko
+        visible: Näkyvissä
+      meeting_agenda_items:
+        description: Kuvaus
+        duration: Kesto
+        title: Otsikko
+      meeting_registration_invite:
+        email: Sähköpostiosoite
+        name: Nimi
+      validate_registration_code:
+        code: Koodi
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ fi-pl:
             values:
               'false': Menneet
               'true': Tulevat
-          origin_eq:
+          scope_id_eq:
+            label: Teema
+          with_any_origin:
             label: Alkuperä
             values:
-              citizen: Kansalaiset
               official: Viralliset
+              participants: Osallistujat
               user_group: Käyttäjäryhmät
-          scope_id_eq:
-            label: Teema
-          type_eq:
+          with_any_type:
             label: Tapaamisen tyyppi
             values:
               hybrid: Hybridi
@@ -282,9 +293,6 @@ fi-pl:
           edit:
             close: Sulje
             title: Sulje tapahtuma
-        meeting_copies:
-          form:
-            select_a_meeting_type: Valitse tapaamisen tyyppi
         meetings:
           close:
             invalid: Tapahtuman sulkemisessa tapahtui virhe
@@ -303,17 +311,15 @@ fi-pl:
             update: Päivitä
           form:
             address_help: 'Osoite: käytetään sijainnin löytämiseksi geokoodaukseen'
-            available_slots_help: Määritä tähän kenttään arvo 0, jos tapahtuman paikkamäärää ei ole rajoitettu
             disclaimer: 'Vastuuvapauslauseke: Käyttämällä ulkoista ilmoittautumisjärjestelmää olet tietoinen siitä, että organisaatio %{organization} ei ole vastuussa tiedoista, jotka käyttäjät ovat antaneet ulkoiselle palvelulle.'
             location_help: 'Sijainti: viesti osallistujille tapaamispaikan sijainnin löytämiseksi'
             location_hints_help: 'Vihjeet sijainnille: sijainnin lisätieto. Esimerkiksi rakennuksen kerros fyysisissä tapaamisissa tai tapaamisen salasana rajatussa verkkotapaamisessa.'
             online_meeting_url_help: 'Linkki: salli osallistujien yhdistäminen tapaamiseen suoraan'
-            registration_email_help: Tämä teksti näytetään tapahtumailmoittautumisten vahvistussähköpostin keskiosassa. Teksti näkyy heti ilmoittautumiskoodin jälkeen.
             registration_url_help: 'Linkki: salli käyttäjien siirtyminen käytettyyn ulkoiseen ilmoittautumispalveluun'
             select_a_meeting_type: Valitse tapaamisen tyyppi
             select_a_registration_type: Valitse ilmoittautumisten tyyppi
             select_an_iframe_access_level: Valitse iframe-upotusten käyttöoikeustaso
-            show_embedded_iframe_help: Vain harvat palvelut sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle (YouTube, Twitch ja Jitsi)
+            show_embedded_iframe_help: 'Vain palvelut näistä osoitteista sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle: %{domains}'
           index:
             title: Tapahtumat
           new:
@@ -356,6 +362,7 @@ fi-pl:
             available_slots_help: Jätä arvoksi 0, mikäli tapahtumaan on rajoittamaton määrä paikkoja.
             invites: Kutsut
             recommendation_message: Yksityisyytesi takia suosittelemme, että poistat tämän kirjoituksen, kun et enää tarvitse sitä. Oletuksena se säilytetään 3 kuukautta tapahtuman päättymisen jälkeen.
+            registration_email_help: Tämä teksti näytetään tapahtumailmoittautumisten vahvistussähköpostin keskiosassa. Teksti näkyy heti ilmoittautumiskoodin jälkeen.
             registration_form: Ilmoittautumislomake
             registrations_count:
               one: Tapahtumaan on %{count} ilmoittautuminen.
@@ -383,6 +390,8 @@ fi-pl:
           value_types:
             organizer_presenter:
               not_found: 'Järjestäjää ei löytynyt tietokannasta (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} päivitti tapaamisen %{meeting_name} kyselyä"
       application_helper:
         filter_category_values:
           all: Kaikki
@@ -393,7 +402,19 @@ fi-pl:
       calendar_modal:
         calendar_url: Kalenterin URL
         close_window: Sulje ikkuna
+        copy_calendar_url: Kopio
+        copy_calendar_url_clarification: Kopioi kalenterin URL-osoite leikepöydälle
+        copy_calendar_url_copied: Kopioitu!
+        copy_calendar_url_description: Näet kaikki julkaistut tapaamiset oman palveluntarjoajasi kalenteriohjelmassa. Kopioi ja liitä tämä URL-osoite kalenteriisi käyttämällä "Lisää uusi kalenteri URL-osoitteesta" -toimintoa.
+        copy_calendar_url_explanation: Huomioithan, että olet viemässä vain osan tapaamisista, koska tapaamisia on suodatettu näkymässä. Jos haluat viedä kaikki tapaamiset, tyhjennä ensin kaikki suodattimet.
+        copy_calendar_url_message: URL-osoitteen kopiointi leikepöydälle onnistui.
         export_calendar: Vie kalenterin tiedot
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: Tapaaminen <a href="%{meeting_path}">"%{meeting_title}"</a> odottaa sulkemista. Ole hyvä ja kirjoita raportti tapaamisesta käyttämällä "Sulje tapaaminen" -painiketta.
+          greetings: Terveisin,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hei %{username},
+          subject: Voit nyt sulkea tapaamisesi kirjoittamalla siitä raportin alustalla %{organization_name}
       conference_venues: Tapahtumapaikat
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ fi-pl:
           origin: Alkuperä
           origin_values:
             all: Kaikki
-            citizens: Kansalaiset
             official: Viralliset
+            participants: Osallistujat
             user_groups: Ryhmät
           scope: Teema
           search: Hae
@@ -497,7 +518,7 @@ fi-pl:
           select_a_meeting_type: Valitse tapaamisen tyyppi
           select_a_registration_type: Valitse ilmoittautumisten tyyppi
           select_an_iframe_access_level: Valitse iframe-upotusten käyttöoikeustaso
-          show_embedded_iframe_help: Vain harvat palvelut sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle (YouTube, Twitch ja Jitsi)
+          show_embedded_iframe_help: 'Vain palvelut näistä osoitteista sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle: %{domains}'
         index:
           click_here: Näytä kaikki tapahtumat
           new_meeting: Uusi tapahtuma
diff --git a/decidim-meetings/config/locales/fi.yml b/decidim-meetings/config/locales/fi.yml
index 8579da7a3a404..fb52ebd59fc71 100644
--- a/decidim-meetings/config/locales/fi.yml
+++ b/decidim-meetings/config/locales/fi.yml
@@ -1,10 +1,7 @@
+---
 fi:
   activemodel:
     attributes:
-      agenda:
-        description: Kuvaus
-        duration: Kesto
-        title: Otsikko
       close_meeting:
         attendees_count: Osallistujien määrä
         attending_organizations: Osallistuvien organisaatioiden lista
@@ -22,8 +19,9 @@ fi:
         decidim_scope_id: Teema
         decidim_user_group_id: Käyttäjäryhmä
         description: Kuvaus
-        end_time: Lopetusaika
+        end_time: Päättymisaika
         id: ID
+        iframe_embed_type: Iframe-upotuksen tyyppi
         location: Paikka
         location_hints: Paikan tarkemmat tiedot
         online_meeting_url: Verkkotapaamisen osoite (URL)
@@ -33,13 +31,26 @@ fi:
         registration_email_custom_content: Ilmoittautumisten sähköpostivastauksen muokattu sisältö
         registration_form_enabled: Ilmoittautumislomake on käytössä
         registration_terms: Ilmoittautumisehdot
+        registration_type: Ilmoittautumistyyppi
         registration_url: Ilmoittautumisosoite (URL)
         registrations_enabled: Ilmoittautumiset ovat käytössä
-        show_embedded_iframe: Näytä upotettu iframe tälle osoitteelle
-        start_time: Aloitusaika
+        reserved_slots: Varatut paikat tälle tapaamiselle
+        start_time: Alkamisaika
         title: Otsikko
         transparent: Läpinäkyvä
         type_of_meeting: Tyyppi
+      meeting_agenda:
+        title: Otsikko
+        visible: Näkyvissä
+      meeting_agenda_items:
+        description: Kuvaus
+        duration: Kesto
+        title: Otsikko
+      meeting_registration_invite:
+        email: Sähköpostiosoite
+        name: Nimi
+      validate_registration_code:
+        code: Koodi
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ fi:
             values:
               'false': Menneet
               'true': Tulevat
-          origin_eq:
+          scope_id_eq:
+            label: Teema
+          with_any_origin:
             label: Alkuperä
             values:
-              citizen: Kansalaiset
               official: Viralliset
+              participants: Osallistujat
               user_group: Käyttäjäryhmät
-          scope_id_eq:
-            label: Teema
-          type_eq:
+          with_any_type:
             label: Tapaamisen tyyppi
             values:
               hybrid: Hybridi
@@ -282,9 +293,6 @@ fi:
           edit:
             close: Sulje
             title: Sulje tapaaminen
-        meeting_copies:
-          form:
-            select_a_meeting_type: Valitse tapaamisen tyyppi
         meetings:
           close:
             invalid: Tapaamisen sulkeminen epäonnistui
@@ -303,17 +311,15 @@ fi:
             update: Päivitä
           form:
             address_help: 'Osoite: käytetään karttapisteen etsimiseen geokoodauksen avulla'
-            available_slots_help: Määritä tähän kenttään arvo 0, jos tapahtuman paikkamäärää ei ole rajoitettu
             disclaimer: 'Vastuuvapauslauseke: Käyttämällä ulkoista ilmoittautumisjärjestelmää olet tietoinen siitä, että organisaatio %{organization} ei ole vastuussa tiedoista, jotka käyttäjät ovat antaneet ulkoiselle palvelulle.'
             location_help: 'Paikka: kuvaus tapahtumapaikan tarkemmasta sijainnista osallistujille'
             location_hints_help: 'Vihjeet sijainnille: sijainnin lisätieto. Esimerkiksi rakennuksen kerros fyysisissä tapaamisissa tai tapaamisen salasana rajatussa verkkotapaamisessa.'
             online_meeting_url_help: 'Linkki: salli osallistujien yhdistäminen tapaamiseen suoraan'
-            registration_email_help: Tämä teksti näytetään tapahtumailmoittautumisten vahvistussähköpostin keskiosassa. Teksti näkyy heti ilmoittautumiskoodin jälkeen.
             registration_url_help: 'Linkki: salli käyttäjien siirtyminen käytettyyn ulkoiseen ilmoittautumispalveluun'
             select_a_meeting_type: Valitse tapaamisen tyyppi
             select_a_registration_type: Valitse ilmoittautumisten tyyppi
             select_an_iframe_access_level: Valitse iframe-upotusten käyttöoikeustaso
-            show_embedded_iframe_help: Vain harvat palvelut sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle (YouTube, Twitch ja Jitsi)
+            show_embedded_iframe_help: 'Vain palvelut näistä osoitteista sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle: %{domains}'
           index:
             title: Tapaamiset
           new:
@@ -356,6 +362,7 @@ fi:
             available_slots_help: Jätä arvoksi 0, mikäli tapahtumaan on rajoittamaton määrä paikkoja.
             invites: Kutsut
             recommendation_message: Osallistujien yksityisyyden kannalta suosittelemme, että poistat tämän lomakkeen tiedot, kun et enää tarvitse niitä. Oletuksena se säilytetään 3 kuukautta tapaamisen päättymisen jälkeen.
+            registration_email_help: Tämä teksti näytetään tapahtumailmoittautumisten vahvistussähköpostin keskiosassa. Teksti näkyy heti ilmoittautumiskoodin jälkeen.
             registration_form: Ilmoittautumislomake
             registrations_count:
               one: Tapahtumaan on %{count} ilmoittautuminen.
@@ -383,6 +390,8 @@ fi:
           value_types:
             organizer_presenter:
               not_found: 'Järjestäjää ei löytynyt tietokannasta (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} päivitti tapaamisen %{meeting_name} kyselyä"
       application_helper:
         filter_category_values:
           all: Kaikki
@@ -393,7 +402,19 @@ fi:
       calendar_modal:
         calendar_url: Kalenterin URL
         close_window: Sulje ikkuna
+        copy_calendar_url: Kopio
+        copy_calendar_url_clarification: Kopioi kalenterin URL-osoite leikepöydälle
+        copy_calendar_url_copied: Kopioitu!
+        copy_calendar_url_description: Näet kaikki julkaistut tapaamiset oman palveluntarjoajasi kalenteriohjelmassa. Kopioi ja liitä tämä URL-osoite kalenteriisi käyttämällä "Lisää uusi kalenteri URL-osoitteesta" -toimintoa.
+        copy_calendar_url_explanation: Huomioithan, että olet viemässä vain osan tapaamisista, koska tapaamisia on suodatettu näkymässä. Jos haluat viedä kaikki tapaamiset, tyhjennä ensin kaikki suodattimet.
+        copy_calendar_url_message: URL-osoitteen kopiointi leikepöydälle onnistui.
         export_calendar: Vie kalenteriin
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: Tapaaminen <a href="%{meeting_path}">"%{meeting_title}"</a> odottaa sulkemista. Ole hyvä ja kirjoita raportti tapaamisesta käyttämällä "Sulje tapaaminen" -painiketta.
+          greetings: Terveisin,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hei %{username},
+          subject: Voit nyt sulkea tapaamisesi kirjoittamalla siitä raportin alustalla %{organization_name}
       conference_venues: Tapahtumapaikat
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ fi:
           origin: Alkuperä
           origin_values:
             all: Kaikki
-            citizens: Kansalaiset
             official: Viralliset
+            participants: Osallistujat
             user_groups: Ryhmät
           scope: Teema
           search: Hae
@@ -497,7 +518,7 @@ fi:
           select_a_meeting_type: Valitse tapaamisen tyyppi
           select_a_registration_type: Valitse ilmoittautumisten tyyppi
           select_an_iframe_access_level: Valitse iframe-upotusten käyttöoikeustaso
-          show_embedded_iframe_help: Vain harvat palvelut sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle (YouTube, Twitch ja Jitsi)
+          show_embedded_iframe_help: 'Vain palvelut näistä osoitteista sallivat tapaamisen upottamisen reaaliaikaisesti tapahtumasivulle: %{domains}'
         index:
           click_here: Näytä kaikki tapahtumat
           new_meeting: Uusi tapaaminen
diff --git a/decidim-meetings/config/locales/fr-CA.yml b/decidim-meetings/config/locales/fr-CA.yml
index fd2ee3de643d5..f463a086cd4a5 100644
--- a/decidim-meetings/config/locales/fr-CA.yml
+++ b/decidim-meetings/config/locales/fr-CA.yml
@@ -1,10 +1,7 @@
+---
 fr-CA:
   activemodel:
     attributes:
-      agenda:
-        description: Description
-        duration: Durée
-        title: Titre
       close_meeting:
         attendees_count: Nombre de participants
         attending_organizations: Liste des organisations qui ont participé à cette rencontre
@@ -22,8 +19,9 @@ fr-CA:
         decidim_scope_id: Périmètre d'application
         decidim_user_group_id: Groupe d'utilisateurs
         description: Description
-        end_time: Date de fin
+        end_time: Heure de fin
         id: ID
+        iframe_embed_type: Type d'Iframe encapsulée
         location: Lieu
         location_hints: Indicateurs d’emplacement
         online_meeting_url: URL de la rencontre
@@ -33,13 +31,26 @@ fr-CA:
         registration_email_custom_content: Contenu personnalisé de l'e-mail d'inscription
         registration_form_enabled: Formulaire d'inscription activé
         registration_terms: Conditions d'inscription
+        registration_type: Type d'inscription
         registration_url: URL d'inscription
         registrations_enabled: Inscriptions ouvertes
-        show_embedded_iframe: Montrer l'iframe intégrée pour cette URL
+        reserved_slots: Places réservées pour cette rencontre
         start_time: Heure de début
         title: Titre
         transparent: Visible par les non-membres
         type_of_meeting: Type
+      meeting_agenda:
+        title: Titre
+        visible: Visible
+      meeting_agenda_items:
+        description: Description
+        duration: Durée
+        title: Titre
+      meeting_registration_invite:
+        email: Email
+        name: Nom
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ fr-CA:
             values:
               'false': Passés
               'true': À venir
-          origin_eq:
+          scope_id_eq:
+            label: Périmètre
+          with_any_origin:
             label: Origine
             values:
-              citizen: Citoyen
               official: Officiel
+              participants: Participants
               user_group: Groupes d’utilisateurs
-          scope_id_eq:
-            label: Périmètre
-          type_eq:
+          with_any_type:
             label: Type de rencontre
             values:
               hybrid: Hybride
@@ -282,9 +293,6 @@ fr-CA:
           edit:
             close: Clore
             title: Clore la rencontre
-        meeting_copies:
-          form:
-            select_a_meeting_type: Veuillez sélectionner un type de rencontre
         meetings:
           close:
             invalid: Il y a eu un problème au moment de clore cette rencontre
@@ -303,17 +311,15 @@ fr-CA:
             update: Mettre à jour
           form:
             address_help: 'L''adresse entrée est utilisée par le géocodage pour trouver l''emplacement et afficher la réunion sur la carte. Format accepté : [n°] [rue] [code postal] [ville]'
-            available_slots_help: Laisser à 0 si le nombre de places disponibles est illimité
             disclaimer: 'Avertissement : En utilisant un système d''enregistrement externe, sachez que les organisateurs de %{organization} ne sont pas responsables des données fournies par les utilisateurs au service externe.'
             location_help: 'Le lieu indique le nom de l''endroit qui accueille la réunion (ex : Maison de la citoyenneté)'
             location_hints_help: 'Indices de localisation : informations complémentaires. Exemple: l''étage du bâtiment s''il s''agit d''une réunion en personne, ou le mot de passe de la réunion s''il s''agit d''une réunion en ligne avec accès restreint.'
             online_meeting_url_help: 'Lien : permet aux participants de se connecter directement à votre réunion'
-            registration_email_help: Ce texte apparaîtra au milieu de l'e-mail de confirmation d'inscription, juste après le code d'inscription.
             registration_url_help: 'Lien : permet aux participants de partir sur le service externe que vous utilisez pour les inscriptions'
             select_a_meeting_type: Veuillez sélectionner un type de rencontre
             select_a_registration_type: Veuillez sélectionner un type d'inscription
             select_an_iframe_access_level: Veuillez sélectionner un niveau d'accès iframe
-            show_embedded_iframe_help: Seuls quelques services permettent d'intégrer des rencontres ou des événements en direct (YouTube, Twitch et Jitsi)
+            show_embedded_iframe_help: 'Seuls quelques services permettent d''intégrer des réunions ou des événements en direct depuis les domaines suivants : %{domains}'
           index:
             title: Rencontres
           new:
@@ -356,6 +362,7 @@ fr-CA:
             available_slots_help: Laisser à 0 si le nombre de places disponibles est illimité.
             invites: Invitations
             recommendation_message: Pour des raisons de confidentialité, nous vous recommandons de supprimer ce formulaire d'inscription lorsque vous n'en avez plus besoin. Par défaut, il le sera 3 mois après la fin de la réunion.
+            registration_email_help: Ce texte apparaîtra au milieu de l'e-mail de confirmation d'inscription, juste après le code d'inscription.
             registration_form: Formulaire d'inscription
             registrations_count:
               one: Il y a eu %{count} inscription.
@@ -383,6 +390,8 @@ fr-CA:
           value_types:
             organizer_presenter:
               not_found: 'L''organisateur n''a pas été trouvé dans la base de données (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} a mis à jour le questionnaire pour la réunion %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Tous
@@ -393,7 +402,19 @@ fr-CA:
       calendar_modal:
         calendar_url: URL du calendrier
         close_window: Fermer la fenêtre
+        copy_calendar_url: Copier
+        copy_calendar_url_clarification: Copier l'URL du calendrier dans le presse-papiers
+        copy_calendar_url_copied: Copié !
+        copy_calendar_url_description: Vous pouvez voir toutes les réunions publiées dans votre application de calendrier. Copiez et collez cette URL dans votre calendrier en utilisant l'option "Ajouter un nouveau calendrier à partir d'une URL".
+        copy_calendar_url_explanation: Veuillez noter que vous exportez une sélection de réunions, car il y a des filtres actifs. Si vous souhaitez tous les exporter, réinitialisez d'abord tous les filtres.
+        copy_calendar_url_message: Le lien a bien été copié dans le presse-papier.
         export_calendar: Calendrier d'exportation
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: La réunion <a href="%{meeting_path}">"%{meeting_title}"</a> est en attente de fermeture. Veuillez ajouter un compte-rendu de la réunion en utilisant le bouton "Fermer la réunion".
+          greetings: Cordialement, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Bonjour %{username},
+          subject: Vous pouvez maintenant clôturer votre réunion en y ajoutant un compte-rendu sur la plateforme %{organization_name}
       conference_venues: Salles de conférence
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ fr-CA:
           origin: Origine
           origin_values:
             all: Toutes
-            citizens: Citoyens
             official: Officiel
+            participants: Participants
             user_groups: Groupes
           scope: Périmètre d'application
           search: Rechercher
@@ -497,7 +518,7 @@ fr-CA:
           select_a_meeting_type: Veuillez sélectionner un type de rencontre
           select_a_registration_type: Veuillez sélectionner un type d'inscription
           select_an_iframe_access_level: Veuillez sélectionner un niveau d'accès iframe
-          show_embedded_iframe_help: Seuls quelques services permettent d'intégrer des rencontres ou des événements en direct (YouTube, Twitch et Jitsi)
+          show_embedded_iframe_help: 'Seuls quelques services permettent d''intégrer des réunions ou des événements en direct depuis les domaines suivants : %{domains}'
         index:
           click_here: Voir toutes les réunions
           new_meeting: Nouvelle réunion
diff --git a/decidim-meetings/config/locales/fr.yml b/decidim-meetings/config/locales/fr.yml
index 3f4b0bbf52fcf..154473b267ed7 100644
--- a/decidim-meetings/config/locales/fr.yml
+++ b/decidim-meetings/config/locales/fr.yml
@@ -1,10 +1,7 @@
+---
 fr:
   activemodel:
     attributes:
-      agenda:
-        description: Description
-        duration: Durée
-        title: Titre
       close_meeting:
         attendees_count: Nombre de participants
         attending_organizations: Liste des organisations qui ont participé à cette rencontre
@@ -22,8 +19,9 @@ fr:
         decidim_scope_id: Périmètre d'application
         decidim_user_group_id: Groupe d'utilisateurs
         description: Description
-        end_time: Date de fin
+        end_time: Heure de fin
         id: ID
+        iframe_embed_type: Type d'Iframe encapsulée
         location: Lieu
         location_hints: Indicateurs d’emplacement
         online_meeting_url: URL de la rencontre
@@ -33,13 +31,26 @@ fr:
         registration_email_custom_content: Contenu personnalisé de l'e-mail d'inscription
         registration_form_enabled: Formulaire d'inscription activé
         registration_terms: Conditions d'inscription
+        registration_type: Type d'inscription
         registration_url: URL d'inscription
         registrations_enabled: Inscriptions ouvertes
-        show_embedded_iframe: Montrer l'iframe intégrée pour cette URL
+        reserved_slots: Places réservées pour cette rencontre
         start_time: Heure de début
         title: Titre
         transparent: Visible par les non-membres
         type_of_meeting: Type
+      meeting_agenda:
+        title: Titre
+        visible: Visible
+      meeting_agenda_items:
+        description: Description
+        duration: Durée
+        title: Titre
+      meeting_registration_invite:
+        email: Email
+        name: Nom
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting:
@@ -89,15 +100,15 @@ fr:
             values:
               'false': Passées
               'true': À venir
-          origin_eq:
+          scope_id_eq:
+            label: Secteur
+          with_any_origin:
             label: Origine
             values:
-              citizen: Participants
               official: Officiel
+              participants: Participants
               user_group: Groupes d’utilisateurs
-          scope_id_eq:
-            label: Secteur
-          type_eq:
+          with_any_type:
             label: Type de rencontre
             values:
               hybrid: Hybride
@@ -282,9 +293,6 @@ fr:
           edit:
             close: Clore
             title: Clore la rencontre
-        meeting_copies:
-          form:
-            select_a_meeting_type: Veuillez sélectionner un type de rencontre
         meetings:
           close:
             invalid: Il y a eu un problème au moment de clore cette rencontre
@@ -303,17 +311,15 @@ fr:
             update: Mettre à jour
           form:
             address_help: 'L''adresse entrée est utilisée par le géocodage pour trouver l''emplacement et afficher la réunion sur la carte. Format accepté : [rue] [code postal] [ville]'
-            available_slots_help: Laisser à 0 si le nombre de places disponibles est illimité
             disclaimer: 'Avertissement : En utilisant un système d''enregistrement externe, sachez que les organisateurs de %{organization} ne sont pas responsables des données fournies par les utilisateurs au service externe.'
             location_help: 'Le lieu indique le nom de l''endroit qui accueille la réunion (ex : Maison de la citoyenneté)'
             location_hints_help: 'Indices de localisation : informations complémentaires. Exemple: l''étage du bâtiment s''il s''agit d''une réunion en personne, ou le mot de passe de la réunion s''il s''agit d''une réunion en ligne avec accès restreint.'
             online_meeting_url_help: 'Lien : permet aux participants de se connecter directement à votre réunion'
-            registration_email_help: Ce texte apparaîtra au centre de l'e-mail de confirmation d'inscription, juste après le code d'inscription.
             registration_url_help: 'Lien : permet aux participants de partir sur le service externe que vous utilisez pour les inscriptions'
             select_a_meeting_type: Veuillez sélectionner un type de rencontre
             select_a_registration_type: Veuillez sélectionner un type d'inscription
             select_an_iframe_access_level: Veuillez sélectionner un niveau d'accès iframe
-            show_embedded_iframe_help: Seuls quelques services permettent d'intégrer des rencontres ou des événements en direct (YouTube, Twitch et Jitsi)
+            show_embedded_iframe_help: 'Seuls quelques services permettent d''intégrer des réunions ou des événements en direct depuis les domaines suivants : %{domains}'
           index:
             title: Rencontres
           new:
@@ -356,6 +362,7 @@ fr:
             available_slots_help: Laisser à 0 si le nombre de places disponibles est illimité.
             invites: Invitations
             recommendation_message: Pour des raisons de confidentialité, nous vous recommandons de supprimer ce formulaire d'inscription lorsque vous n'en avez plus besoin. Par défaut, il le sera 3 mois après la fin de la réunion.
+            registration_email_help: Ce texte apparaîtra au centre de l'e-mail de confirmation d'inscription, juste après le code d'inscription.
             registration_form: Formulaire d'inscription
             registrations_count:
               one: Il y a eu %{count} inscription.
@@ -383,6 +390,8 @@ fr:
           value_types:
             organizer_presenter:
               not_found: 'L''organisateur n''a pas été trouvé dans la base de données (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} a mis à jour le questionnaire pour la réunion %{meeting_name}"
       application_helper:
         filter_category_values:
           all: Tout
@@ -393,7 +402,19 @@ fr:
       calendar_modal:
         calendar_url: URL du calendrier
         close_window: Fermer la fenêtre
+        copy_calendar_url: Copier
+        copy_calendar_url_clarification: Copier l'URL du calendrier dans le presse-papiers
+        copy_calendar_url_copied: Copié !
+        copy_calendar_url_description: Vous pouvez voir toutes les réunions publiées dans votre application de calendrier. Copiez et collez cette URL dans votre calendrier en utilisant l'option "Ajouter un nouveau calendrier à partir d'une URL".
+        copy_calendar_url_explanation: Veuillez noter que vous exportez une sélection de réunions, car il y a des filtres actifs. Si vous souhaitez tous les exporter, réinitialisez d'abord tous les filtres.
+        copy_calendar_url_message: Le lien a bien été copié dans le presse-papier.
         export_calendar: Calendrier d'exportation
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: La réunion <a href="%{meeting_path}">"%{meeting_title}"</a> est en attente de fermeture. Veuillez ajouter un compte-rendu de la réunion en utilisant le bouton "Fermer la réunion".
+          greetings: Cordialement, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Bonjour %{username},
+          subject: Vous pouvez maintenant clôturer votre réunion en y ajoutant un compte-rendu sur la plateforme %{organization_name}
       conference_venues: Salles de conférence
       content_blocks:
         upcoming_meetings:
@@ -468,8 +489,8 @@ fr:
           origin: Origine
           origin_values:
             all: Toutes
-            citizens: Citoyens
             official: Officiel
+            participants: Participants
             user_groups: Groupes
           scope: Secteur
           search: Rechercher
@@ -497,7 +518,7 @@ fr:
           select_a_meeting_type: Veuillez sélectionner un type de rencontre
           select_a_registration_type: Veuillez sélectionner un type d'inscription
           select_an_iframe_access_level: Veuillez sélectionner un niveau d'accès iframe
-          show_embedded_iframe_help: Seuls quelques services permettent d'intégrer des rencontres ou des événements en direct (YouTube, Twitch et Jitsi)
+          show_embedded_iframe_help: 'Seuls quelques services permettent d''intégrer des réunions ou des événements en direct depuis les domaines suivants : %{domains}'
         index:
           click_here: Voir toutes les rencontres
           new_meeting: Nouvelle rencontre
diff --git a/decidim-meetings/config/locales/ga-IE.yml b/decidim-meetings/config/locales/ga-IE.yml
index 70b59c5a0ca0e..6f14d68da7a8c 100644
--- a/decidim-meetings/config/locales/ga-IE.yml
+++ b/decidim-meetings/config/locales/ga-IE.yml
@@ -1,9 +1,7 @@
+---
 ga:
   activemodel:
     attributes:
-      agenda:
-        duration: Fad
-        title: Teideal
       close_meeting:
         audio_url: URL Fuaime
         closing_report: Miontuairiscí
@@ -12,7 +10,6 @@ ga:
         address: Seoladh
         decidim_category_id: Catagóir
         decidim_scope_id: Scóip
-        end_time: Am Críochnaithe
         id: ID
         location: Suíomh
         title: Teideal
@@ -35,16 +32,8 @@ ga:
             values:
               'false': Roimhe
               'true': Le teacht
-          origin_eq:
-            label: Bunús
-            values:
-              citizen: Saoránach
-              official: Oifigiúil
           scope_id_eq:
             label: Scóip
-          type_eq:
-            values:
-              online: Ar líne
       meeting_copies:
         new:
           copy: Cóipeáil
@@ -153,7 +142,6 @@ ga:
           origin: Bunús
           origin_values:
             all: Uile
-            citizens: Saoránaigh
             official: Oifigiúil
             user_groups: Grúpaí
           scope: Scóip
diff --git a/decidim-meetings/config/locales/gl.yml b/decidim-meetings/config/locales/gl.yml
index a75cce708ee6a..51e297ce98a6e 100644
--- a/decidim-meetings/config/locales/gl.yml
+++ b/decidim-meetings/config/locales/gl.yml
@@ -1,10 +1,7 @@
+---
 gl:
   activemodel:
     attributes:
-      agenda:
-        description: Descrición
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Listaxe de organizacións que asistiron
@@ -21,7 +18,6 @@ gl:
         decidim_category_id: Categoría
         decidim_scope_id: Alcance
         description: Descrición
-        end_time: Hora de finalización
         location: Localización
         location_hints: Consellos de localización
         organizer_id: Organizador
@@ -30,7 +26,6 @@ gl:
         registration_form_enabled: Formulario de rexistro habilitado
         registration_terms: Termos de rexistro
         registrations_enabled: Rexistros habilitados
-        start_time: Hora de inicio
         title: Título
         transparent: Transparente
     errors:
@@ -64,6 +59,16 @@ gl:
         other: Rexistros
   decidim:
     admin:
+      filters:
+        meetings:
+          with_any_origin:
+            label: Orixe
+            values:
+              official: Oficial
+              participants: Participante
+          with_any_type:
+            values:
+              online: En liña
       meeting_copies:
         create:
           error: Produciuse un erro ao duplicar esta reunión.
@@ -225,9 +230,6 @@ gl:
           edit:
             close: Pechar
             title: Pechar reunión
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de xuntanza
         meetings:
           close:
             invalid: Produciuse un problema ao pechar esta reunión
@@ -238,8 +240,6 @@ gl:
             success: Reunión eliminada correctamente
           edit:
             update: Actualización
-          form:
-            registration_email_help: Este texto aparecerá no medio do correo de confirmación do rexistro, xusto despois do código de rexistro.
           index:
             title: Reunións
           new:
@@ -269,6 +269,7 @@ gl:
           form:
             available_slots_help: Déixao a 0 se ten slots ilimitados dispoñibles.
             invites: Invitacións
+            registration_email_help: Este texto aparecerá no medio do correo de confirmación do rexistro, xusto despois do código de rexistro.
             registration_form: Formulario de inscrición
             registrations_count:
               one: Houbo un rexistro de %{count}.
@@ -349,6 +350,8 @@ gl:
         filters:
           category: Categoría
           date: Data
+          origin_values:
+            participants: Participantes
           search: Busca
         filters_small_view:
           close_modal: Pechar modal
diff --git a/decidim-meetings/config/locales/hu.yml b/decidim-meetings/config/locales/hu.yml
index c440c73a2fe5e..61c061b9bc29a 100644
--- a/decidim-meetings/config/locales/hu.yml
+++ b/decidim-meetings/config/locales/hu.yml
@@ -1,10 +1,7 @@
+---
 hu:
   activemodel:
     attributes:
-      agenda:
-        description: Leírás
-        duration: Időtartam
-        title: Cím
       close_meeting:
         attendees_count: Résztvevők száma
         attending_organizations: Résztvevő szervezetek listája
@@ -22,7 +19,6 @@ hu:
         decidim_scope_id: Hatáskör
         decidim_user_group_id: Felhasználói csoport
         description: Leírás
-        end_time: Záró időpont
         id: ID
         location: Helye
         location_hints: Tippek a helyre
@@ -35,8 +31,6 @@ hu:
         registration_terms: Regisztrációs feltételek
         registration_url: Regisztrációs URL
         registrations_enabled: Regisztráció engedélyezve
-        show_embedded_iframe: Mutassa ennek az url-nek az iframe beágyazását
-        start_time: Kezdő időpont
         title: Cím
         transparent: �tlátszó
         type_of_meeting: Típus
@@ -89,14 +83,15 @@ hu:
             values:
               'false': Előzmények
               'true': Közelgő
-          origin_eq:
+          scope_id_eq:
+            label: Hatókör
+          with_any_origin:
+            label: Kiindulópont
             values:
-              citizen: Polgár
               official: Hivatalos
+              participants: Résztvevő
               user_group: Felhasználói csoportok
-          scope_id_eq:
-            label: Hatókör
-          type_eq:
+          with_any_type:
             label: Értekezlet típusa
             values:
               hybrid: Hibrid
@@ -281,9 +276,6 @@ hu:
           edit:
             close: Bezárás
             title: Ttalálkozó lezárása
-        meeting_copies:
-          form:
-            select_a_meeting_type: Válassza ki a találkozó típusát
         meetings:
           close:
             invalid: Probléma merült fel a találkozó lezárásakor
@@ -302,17 +294,15 @@ hu:
             update: Frissítés
           form:
             address_help: 'Cím: Geocoder használata a helymeghatározáshoz'
-            available_slots_help: Hagyd "0" értéken, ha a jelentkezők száma korlátlan
             disclaimer: 'Jogi nyilatkozat: Egy külső regisztrációs rendszer használatával Ön tudatában van annak, hogy a %{organization} szervezői nem felelősek a felhasználók által a külső szolgáltatásnak megadott adatokért.'
             location_help: 'Helyszín: üzenet az adott felhasználóknak a találkozó helyéről'
             location_hints_help: 'Helyszíni tippek: további információk. Példa: az épület emelete ha személyes találkozóról van szó, vagy a találkozó jelszava, ha korlátozott hozzáféréssel rendelkező online találkozóról van szó.'
             online_meeting_url_help: 'Link: a résztvevők engedélyezése a találkozóhoz való közvetlen kapcsolódáshoz'
-            registration_email_help: Ez a szöveg a regisztrációt megerősítő e-mail közepén fog megjelenni. Épp a regisztrációs kód után.
             registration_url_help: 'Link: lehetővé teszi a résztvevők számára, hogy a regisztrációhoz a külső szolgáltatást használják'
             select_a_meeting_type: Válassza ki a találkozó típusát
             select_a_registration_type: Kérjük, válassza ki a regisztráció típusát
             select_an_iframe_access_level: Kérjük, válassz iframe hozzáférési szintet
-            show_embedded_iframe_help: Csak néhány szolgáltatás engedélyezi a beágyazást megbeszélésekbe vagy élő eseményekbe (YouTube, Twitch és Jitsi)
+            show_embedded_iframe_help: 'Csak néhány szolgáltatás engedélyezi a beágyazást megbeszélésekbe vagy élő eseményekbe a következő domainekről: %{domains}'
           index:
             title: Találkozók
           new:
@@ -355,6 +345,7 @@ hu:
             available_slots_help: Hagyd "0" értéken, ha a jelentkezők száma korlátlan.
             invites: Meghívók
             recommendation_message: Adatvédelmi okokból javasoljuk, hogy törölje ezt az űrlapot, ha már nincs rá szüksége. Alapértelmezés szerint ez 3 hónap az ülés végét követően.
+            registration_email_help: Ez a szöveg a regisztrációt megerősítő e-mail közepén fog megjelenni. Épp a regisztrációs kód után.
             registration_form: Regisztrációs űrlap
             registrations_count:
               one: '%{count} regisztráció volt.'
@@ -382,6 +373,8 @@ hu:
           value_types:
             organizer_presenter:
               not_found: 'A szervező nem található az adatbázisban (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} frissítette a kérdőívet a %{meeting_name} üléshez"
       application_helper:
         filter_category_values:
           all: Összes
@@ -392,7 +385,19 @@ hu:
       calendar_modal:
         calendar_url: Naptár URL
         close_window: Ablak bezárása
+        copy_calendar_url: Másolás
+        copy_calendar_url_clarification: Naptár URL másolása a vágólapra
+        copy_calendar_url_copied: Lemásolva!
+        copy_calendar_url_description: Az összes közzétett találkozót láthatja a naptáralkalmazásában vagy naptárszolgáltatónál (pl Google Calendar). Másolja ki és illessze be ezt az URL-címet a naptárába az "Új naptár hozzáadása URL-címről" opcióval.
+        copy_calendar_url_explanation: Kérjük, vegye figyelembe, hogy a kiválasztott találkozókat exportálja. Ha az összeset exportálni szeretné, először állítsa vissza az összes szűrőt.
+        copy_calendar_url_message: A hivatkozás vágólapra másolása sikeres.
         export_calendar: Naptár exportálása
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: A találkozó <a href="%{meeting_path}">%{meeting_title}</a> lezárásra vár. A "találkozó lezárása" gomb segítségével adjon jelentést a megbeszélésről.
+          greetings: Üdvözöljük <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hello %{username},
+          subject: Lezárhatja a megbeszélést a %{organization_name} platformon beküldött jelentéssel
       conference_venues: Konferencia helyszínek
       content_blocks:
         upcoming_meetings:
@@ -462,8 +467,8 @@ hu:
           my_meetings: Találkozóim
           origin_values:
             all: Összes
-            citizens: Polgárok
             official: Hivatalos
+            participants: Résztvevők
             user_groups: Csoportok
           scope: Hatókör
           search: Keresés
@@ -482,7 +487,6 @@ hu:
           address_help: 'Cím: Geocoder használata a helymeghatározáshoz'
           available_slots_help: Hagyd "0" értéken, ha a jelentkezők száma korlátlan
           create_as: Ülés létrehozása mint
-          show_embedded_iframe_help: Csak néhány szolgáltatás engedélyezi a beágyazást megbeszélésekbe vagy élő eseményekbe (YouTube, Twitch és Jitsi)
         meeting_minutes:
           related_information: Kapcsolódó információ
         meetings:
diff --git a/decidim-meetings/config/locales/id-ID.yml b/decidim-meetings/config/locales/id-ID.yml
index 2ba53fcd38ce8..8e1afc83f4fbf 100644
--- a/decidim-meetings/config/locales/id-ID.yml
+++ b/decidim-meetings/config/locales/id-ID.yml
@@ -1,10 +1,7 @@
+---
 id:
   activemodel:
     attributes:
-      agenda:
-        description: Deskripsi
-        duration: Lamanya
-        title: Judul
       close_meeting:
         attendees_count: Jumlah peserta
         attending_organizations: Daftar organisasi yang hadir
@@ -18,7 +15,6 @@ id:
         decidim_category_id: Kategori
         decidim_scope_id: Cakupan
         description: Deskripsi
-        end_time: Akhir waktu
         location: Lokasi
         location_hints: Petunjuk lokasi
         organizer_id: Penyelenggara
@@ -26,7 +22,6 @@ id:
         registration_form_enabled: Formulir pendaftaran diaktifkan
         registration_terms: Ketentuan pendaftaran
         registrations_enabled: Pendaftaran diaktifkan
-        start_time: Waktu mulai
         title: Judul
         transparent: Transparan
     errors:
diff --git a/decidim-meetings/config/locales/is-IS.yml b/decidim-meetings/config/locales/is-IS.yml
index 1a81e5c53acdc..efed79c3e24dc 100644
--- a/decidim-meetings/config/locales/is-IS.yml
+++ b/decidim-meetings/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       close_meeting:
@@ -14,13 +15,11 @@ is-IS:
         decidim_category_id: Flokkur
         decidim_scope_id: Umfang
         description: Lýsing
-        end_time: Lokatími
         location: Staðsetning
         location_hints: Staðsetningarmöguleikar
         private_meeting: Einkafundur
         registration_terms: Skráningarskilmálar
         registrations_enabled: Skráningar virkt
-        start_time: Byrjunartími
         title: Titill
         transparent: Gegnsætt
   decidim:
diff --git a/decidim-meetings/config/locales/it.yml b/decidim-meetings/config/locales/it.yml
index 96823d93f3a7e..e3a0e6258422f 100644
--- a/decidim-meetings/config/locales/it.yml
+++ b/decidim-meetings/config/locales/it.yml
@@ -1,10 +1,7 @@
+---
 it:
   activemodel:
     attributes:
-      agenda:
-        description: Descrizione
-        duration: Durata
-        title: Titolo
       close_meeting:
         attendees_count: Numero di partecipanti
         attending_organizations: Elenco delle organizzazioni partecipanti
@@ -22,7 +19,6 @@ it:
         decidim_scope_id: Visibilità
         decidim_user_group_id: Gruppo di utenti
         description: Descrizione
-        end_time: Orario fine
         id: ID
         location: Luogo
         location_hints: Informazione sul luogo
@@ -35,8 +31,6 @@ it:
         registration_terms: Termini di registrazione
         registration_url: URL di iscrizione
         registrations_enabled: Registrazioni abilitate
-        show_embedded_iframe: Mostra iframe incorporato per questo URL
-        start_time: Orario inizio
         title: Titolo
         transparent: Trasparente
         type_of_meeting: Tipo
@@ -85,19 +79,15 @@ it:
             values:
               'false': Conclusi
               'true': Prossimi
-          origin_eq:
-            label: Origine
-            values:
-              citizen: Cittadina
-              official: Ufficiale
-              user_group: Gruppi di utenti
           scope_id_eq:
             label: Ambito
-          type_eq:
+          with_any_origin:
+            values:
+              user_group: Gruppi di utenti
+          with_any_type:
             label: Tipologia di incontro
             values:
               in_person: Fisiche
-              online: Online
       meeting_copies:
         create:
           error: C'era un errore en duplicazione di questo incontro.
@@ -292,12 +282,10 @@ it:
             update: Modifica
           form:
             address_help: 'Indirizzo: usato da Geocoder per trovare la posizione'
-            available_slots_help: Lasciare a 0 se disponi di slot illimitati
             disclaimer: 'Disclaimer: Utilizzando un sistema di registrazione esterno, sei consapevole che gli organizzatori di %{organization} non sono responsabili per i dati forniti dagli utenti al servizio esterno.'
             location_help: 'Posizione: messaggio diretto agli utenti che riporta il luogo dell''incontro'
             location_hints_help: 'Suggerimenti: informazioni aggiuntive. Esempio: il pavimento dell''edificio se si tratta di una riunione di persona o la password di riunione se si tratta di una riunione online con accesso ristretto.'
             online_meeting_url_help: 'Link: permette ai partecipanti di connettersi direttamente alla tua riunione'
-            registration_email_help: Questo testo apparirà nel mezzo dell'email di conferma della registrazione. Subito dopo il codice di registrazione.
             registration_url_help: 'Link: consentire ai partecipanti di accedere al servizio esterno che stai utilizzando per le iscrizioni'
             select_a_meeting_type: Seleziona un tipo di riunione
             select_a_registration_type: Seleziona un tipo di registrazione
@@ -343,6 +331,7 @@ it:
             available_slots_help: Lasciare a 0 se disponi di slot illimitati.
             invites: Inviti
             recommendation_message: Per motivi di privacy, ti consigliamo di eliminare questo modulo di iscrizione quando non ne hai più bisogno. Per impostazione predefinita, questo avverrà 3 mesi dopo la fine della riunione.
+            registration_email_help: Questo testo apparirà nel mezzo dell'email di conferma della registrazione. Subito dopo il codice di registrazione.
             registration_form: Formulario di registrazione
             registrations_count:
               one: C'è stata %{count} registrazione.
@@ -437,8 +426,8 @@ it:
           origin: Origine
           origin_values:
             all: Tutte
-            citizens: Cittadini
             official: Ufficiale
+            participants: Utenti
             user_groups: Gruppi
           scope: Ambito
           search: Cerca
diff --git a/decidim-meetings/config/locales/ja.yml b/decidim-meetings/config/locales/ja.yml
index 056b99ed3e665..6d1ea75f8363a 100644
--- a/decidim-meetings/config/locales/ja.yml
+++ b/decidim-meetings/config/locales/ja.yml
@@ -1,10 +1,7 @@
+---
 ja:
   activemodel:
     attributes:
-      agenda:
-        description: 説明
-        duration: �続期間
-        title: タイトル
       close_meeting:
         attendees_count: 出席者数
         attending_organizations: �加��組織一覧
@@ -22,8 +19,9 @@ ja:
         decidim_scope_id: スコープ
         decidim_user_group_id: ユーザーグループ
         description: 説明
-        end_time: 終了時刻
+        end_time: 終了時間
         id: ID
+        iframe_embed_type: Iframe 埋�込�タイプ
         location: 場所
         location_hints: �置情報�ヒント
         online_meeting_url: オンラインミーティングURL
@@ -33,13 +31,26 @@ ja:
         registration_email_custom_content: 登録メール�カスタムコンテンツ
         registration_form_enabled: 登録フォーム�有効
         registration_terms: 登録�件
+        registration_type: 登録種別
         registration_url: 登録URL
         registrations_enabled: 登録�有効
-        show_embedded_iframe: �� URL �埋�込�れ� iframe を表示
-        start_time: 開始時刻
+        reserved_slots: ��会議�予約済�スロット
+        start_time: 開始日時
         title: タイトル
         transparent: �明度
         type_of_meeting: 種別
+      meeting_agenda:
+        title: タイトル
+        visible: 表示
+      meeting_agenda_items:
+        description: 説明
+        duration: 期間
+        title: タイトル
+      meeting_registration_invite:
+        email: Eメールアドレス
+        name: ��
+      validate_registration_code:
+        code: コード
     errors:
       models:
         meeting:
@@ -86,15 +97,15 @@ ja:
             values:
               'false': �去
               'true': 近日公開
-          origin_eq:
-            label: 起案者：
-            values:
-              citizen: 市民
-              official: 事務局
-              user_group: ユーザーグループ
           scope_id_eq:
             label: スコープ
-          type_eq:
+          with_any_origin:
+            label: オリジン
+            values:
+              official: 公�
+              participants: �加者
+              user_group: ユーザーグループ
+          with_any_type:
             label: ミーティング�種類
             values:
               hybrid: �イブリッド
@@ -278,9 +289,6 @@ ja:
           edit:
             close: 閉�る
             title: ミーティングを閉�る
-        meeting_copies:
-          form:
-            select_a_meeting_type: ミーティング種別を�択������
         meetings:
           close:
             invalid: ��ミーティングを終了�る際��題�発生����
@@ -298,17 +306,15 @@ ja:
             update: æ›´æ–°
           form:
             address_help: 'アドレス: ジオコーダー�場所を見��る���使用'
-            available_slots_help: 無制��場��0����������
             disclaimer: '�責事項: 外部登録システムを使用�る場�� %{organization} �主催者��ユーザー�外部サービス��供��データ����責任を負���ん。'
             location_help: '場所: ユーザー�メッセージ�表示�れ��。'
             location_hints_help: '�置情報�ヒント：追加情報。 例: 対�ミーティング��建物�フロア����アクセス制���るオンラインミーティング��ミーティングパスワード。'
             online_meeting_url_help: 'リンク: �加者�����ミーティング�直接接続��るよ�����'
-            registration_email_help: ��テキスト�登録確�メール�途中�表示�れ��。場所�登録コード�直後��り��。
             registration_url_help: 'リンク: �加者�登録�使用���る外部サービス�アクセス��るよ�����'
             select_a_meeting_type: ミーティング種別を�択������
             select_a_registration_type: 登録種別を�択������
             select_an_iframe_access_level: Iframeアクセスレベルを�択������
-            show_embedded_iframe_help: ミーティングやライブイベント( YouTube�Twitch�Jitsi) �埋�込む�����るサービス��られ�も�����。
+            show_embedded_iframe_help: 'ミーティング���ライブイベント�埋�込�るサービス�以下�ドメイン��定�れ����: %{domains}'
           index:
             title: ミーティング
           new:
@@ -351,6 +357,7 @@ ja:
             available_slots_help: 無制��スロット��る場��0����������。
             invites: 招待
             recommendation_message: プライ�シー上��由�ら������������碑文フォームを削除�る��を�勧����。 デフォルト���ミーティング�終了���ら3ヶ月��。
+            registration_email_help: ��テキスト�登録確�メール�途中�表示�れ��。場所�登録コード�直後��り��。
             registration_form: 登録フォーム
             registrations_count:
               other: '%{count} 件�登録��り���。'
@@ -377,6 +384,8 @@ ja:
           value_types:
             organizer_presenter:
               not_found: '主催者�データベース上�見��り��ん��� (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} � %{meeting_name} ミーティング�アンケートを更新����"
       application_helper:
         filter_category_values:
           all: ���
@@ -387,7 +396,19 @@ ja:
       calendar_modal:
         calendar_url: カレンダー URL
         close_window: ウィンドウを閉�る
+        copy_calendar_url: コピー
+        copy_calendar_url_clarification: カレンダーURLをクリップボード�コピー
+        copy_calendar_url_copied: コピー����
+        copy_calendar_url_description: カレンダーアプリケーション���プロ�イダー�公開�れ�����ミーティングを見る�������。 「URL�ら新��カレンダーを追加�オプションを使用�����URLをカレンダー�コピー��貼り付���。
+        copy_calendar_url_explanation: アクティブ�フィルター��る���ミーティング�一部��をエクス�ート���る���注�������。���エクス�ート���場���最������フィルターをリセット������。
+        copy_calendar_url_message: URLをクリップボード�コピー����。
         export_calendar: カレンダーをエクス�ート
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: ミーティング <a href="%{meeting_path}">"%{meeting_title}"</a> �クローズ�れ��．「ミーティングを閉�る�ボタンを使��ミーティング�レ�ートを追加������．
+          greetings: �ん����<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: �ん���� %{username} �ん。
+          subject: '%{organization_name} プラットフォーム上�レ�ート�ミーティングを閉�る�������。'
       conference_venues: カンファレンス会場
       content_blocks:
         upcoming_meetings:
@@ -461,8 +482,8 @@ ja:
           origin: 起案者：
           origin_values:
             all: ���
-            citizens: 一般�加者
             official: 事務局
+            participants: �加者
             user_groups: グループ
           scope: スコープ
           search: 検索
@@ -490,7 +511,7 @@ ja:
           select_a_meeting_type: ミーティング種別を�択������
           select_a_registration_type: 登録種別を�択������
           select_an_iframe_access_level: iframeアクセスレベルを�択������
-          show_embedded_iframe_help: ミーティングやライブイベント（YouTube�Twitch�Jitsi）�埋�込む�����るサービス��られ�も�����。
+          show_embedded_iframe_help: 'ミーティング���ライブイベント�埋�込�るサービス�以下�ドメイン��定�れ����: %{domains}'
         index:
           click_here: ����ミーティングを見る
           new_meeting: 新��ミーティング
diff --git a/decidim-meetings/config/locales/ka-GE.yml b/decidim-meetings/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-meetings/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-meetings/config/locales/lb.yml b/decidim-meetings/config/locales/lb.yml
index 162486c43cdd7..9b7966349235d 100644
--- a/decidim-meetings/config/locales/lb.yml
+++ b/decidim-meetings/config/locales/lb.yml
@@ -1,10 +1,7 @@
+---
 lb:
   activemodel:
     attributes:
-      agenda:
-        description: Beschreibung
-        duration: Dauer
-        title: Titel
       close_meeting:
         attendees_count: Anzahl der Teilnehmer
         attending_organizations: Liste der Organisationen, die teilgenommen haben
@@ -22,7 +19,6 @@ lb:
         decidim_scope_id: Ëmfang
         decidim_user_group_id: Benutzergruppe
         description: Beschreiwung
-        end_time: Endzeit
         id: ID
         location: Standuert
         location_hints: Standorthinweise
@@ -35,7 +31,6 @@ lb:
         registration_terms: Registrierungsbedingungen
         registration_url: Registrierungs-URL
         registrations_enabled: Registrierungen aktiviert
-        start_time: Startzeit
         title: Titel
         transparent: Transparent
         type_of_meeting: Zort
@@ -84,13 +79,12 @@ lb:
             values:
               'false': Vergaangenes
               'true': Demnächst stattfannend
-          origin_eq:
-            values:
-              citizen: Bierger*in
-              user_group: Benotzergruppen
           scope_id_eq:
             label: Ëmfang
-          type_eq:
+          with_any_origin:
+            values:
+              user_group: Benotzergruppen
+          with_any_type:
             label: Typ vu Versammlung
       meeting_copies:
         create:
@@ -231,7 +225,6 @@ lb:
             location_help: 'Ort: an die Benutzer gerichtete Nachricht mit dem Treffpunkt'
             location_hints_help: 'Hinweise zum Standort: Zusätzliche Informationen. Beispiel: das Stockwerk im Gebäude wenn es eine Sitzung vor Ort ist, oder das Passwort wenn es eine Online-Sitzung mit eingeschränktem Zugriff ist.'
             online_meeting_url_help: 'Link: Erlaubt Teilnehmern, sich direkt mit Ihrem Meeting zu verbinden'
-            registration_email_help: Dieser Text erscheint in der Mitte der Registrierungs-E-Mail, direkt nach dem Registrierungscode.
             registration_url_help: 'Link: Erlaubt den Teilnehmern den externen Service zu nutzen, den Sie für die Registrierung verwenden'
             select_a_meeting_type: Bitte eine Meeting-Typ auswählen
             select_a_registration_type: Bitte wählen Sie eine Registrierungsart aus
@@ -271,6 +264,7 @@ lb:
             available_slots_help: Belassen Sie es auf 0, wenn Sie unbegrenzte Plätze zur Verfügung haben.
             invites: Aluedungen
             recommendation_message: Aus Datenschutzgründen empfehlen wir, dass Sie dieses Einschreibeformular löschen, wenn es nicht länger benötigt wird. Standardmäßig ist das 3 Monate nachdem die Besprechung durchgeführt wurde.
+            registration_email_help: Dieser Text erscheint in der Mitte der Registrierungs-E-Mail, direkt nach dem Registrierungscode.
             registration_form: Anmeldeformular
             registrations_count:
               one: Es wurde %{count} registriert.
diff --git a/decidim-meetings/config/locales/lt.yml b/decidim-meetings/config/locales/lt.yml
index 7bc6993388d32..d2f43c1ca9d3b 100644
--- a/decidim-meetings/config/locales/lt.yml
+++ b/decidim-meetings/config/locales/lt.yml
@@ -1,10 +1,7 @@
+---
 lt:
   activemodel:
     attributes:
-      agenda:
-        description: Aprašymas
-        duration: TrukmÄ—
-        title: Pavadinimas
       close_meeting:
         attendees_count: Dalyvių skai�ius
         attending_organizations: Dalyvavusių organizacijų sąrašas
@@ -22,7 +19,6 @@ lt:
         decidim_scope_id: Apimtis
         decidim_user_group_id: Naudotojų grupė
         description: Aprašymas
-        end_time: Pabaigos laikas
         id: ID
         location: Vieta
         location_hints: Vietos užuomina
@@ -35,8 +31,6 @@ lt:
         registration_terms: Registracijos sÄ…lygos
         registration_url: Registracijos URL
         registrations_enabled: Registracijos įjungtos
-        show_embedded_iframe: Rodyti šiame URL įterptąjį „iframe“
-        start_time: Pradžios Laikas
         title: Pavadinimas
         transparent: Skaidrus
         type_of_meeting: Tipas
@@ -95,20 +89,20 @@ lt:
             values:
               'false': PraÄ—jÄ™
               'true': ArtÄ—jantys
-          origin_eq:
+          scope_id_eq:
+            label: Apimtis
+          with_any_origin:
             label: KilmÄ—
             values:
-              citizen: Pilietis
-              official: Oficialus
+              official: Oficialūs
+              participants: Dalyvis
               user_group: Naudotojų Grupės
-          scope_id_eq:
-            label: Apimtis
-          type_eq:
+          with_any_type:
             label: Susitikimo tipas
             values:
               hybrid: Hibridiniai
               in_person: Fizinis
-              online: Virtualūs
+              online: Internetiniai
       meeting_copies:
         create:
           error: Dubliuojant šį susitikimą iškilo problema.
@@ -290,9 +284,6 @@ lt:
           edit:
             close: Uždaryti
             title: Baigti susirinkimÄ…
-        meeting_copies:
-          form:
-            select_a_meeting_type: Prašome pasirinkti susirinkimo tipą
         meetings:
           close:
             invalid: Užbaigiant šį susirinkimą iškilo problema
@@ -313,17 +304,15 @@ lt:
             update: Atnaujinti
           form:
             address_help: 'Adresas: jį naudoja „Geocoder“, kad rastų vietą'
-            available_slots_help: Jei nėra ribojimų įrašykite 0
             disclaimer: 'Perspėjimas: Naudodami išorinę registracijos sistemą, %{organization} nėra atsakinga už dalyvių duomenų tvarkymą.'
             location_help: 'Vieta: naudotojams skirtas pranešimas, kuriame nurodoma susitikimo vieta'
             location_hints_help: 'Vietos priedėliai: papildoma informacija kaip pvz. buto numeris, iš kurios pusės įeiti ir t. t.'
             online_meeting_url_help: 'Nuoroda: leisti dalyviams tiesiai prisijungti prie susirinkimo'
-            registration_email_help: Šis tekstas bus rodomas registracijos patvirtinimo el. laiško viduryje. Iš karto po registracijos kodo.
             registration_url_help: 'Nuoroda: leisti dalyviams eiti į išorinę registracijos sistemą'
             select_a_meeting_type: Prašome pasirinkti susirinkimo tipą
             select_a_registration_type: Prašome pasirinkti registracijos tipą
             select_an_iframe_access_level: Pasirinkite iframe prieigos lygį
-            show_embedded_iframe_help: Tik kelios paslaugos gali būti integruotos susitikimuose (YouTube, Twitch, Jitsi)
+            show_embedded_iframe_help: 'Tik kelios paslaugos leidžia integruotis susitikimuose iš šių domenų: %{domains}'
           index:
             title: Susirinkimai
           new:
@@ -366,6 +355,7 @@ lt:
             available_slots_help: Jei nėra ribojimų įrašykite 0.
             invites: Pakvietimai
             recommendation_message: Dėl privatumo priežas�ių rekomenduojame ištrinti šią įrašo formą, kai jos nebereikės. Pagal numatytuosius parametrus, ji ištrinama praėjus 3 mėnesiams nuo susirinkimo pabaigos.
+            registration_email_help: Šis tekstas bus rodomas registracijos patvirtinimo el. laiško viduryje. Iš karto po registracijos kodo.
             registration_form: Registracijos forma
             registrations_count:
               one: Yra %{count} registracija.
@@ -395,6 +385,8 @@ lt:
           value_types:
             organizer_presenter:
               not_found: 'Organizatorius duomenų bazėje nerastas (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} atnaujino klausimynÄ… %{meeting_name} susirinkimui"
       application_helper:
         filter_category_values:
           all: Visi
@@ -405,7 +397,19 @@ lt:
       calendar_modal:
         calendar_url: Kalendoriaus URL
         close_window: Uždaryti langą
+        copy_calendar_url: Kopijuoti
+        copy_calendar_url_clarification: Kopijuoti kalendoriaus URL į iškarpinę
+        copy_calendar_url_copied: Nukopijuota!
+        copy_calendar_url_description: Kalendoriaus programėlėje galite matyti visus paskelbtus susitikimus. Nukopijuokite ir įklijuokite šį URL į savo kalendorių naudodami parinktį „Pridėti naują kalendorių iš URL“.
+        copy_calendar_url_explanation: Atkreipkite dėmesį, kad eksportuojate pasirinktus susirinkimus (nes yra aktyvių filtrų). Jei norėtumėt eksportuoti viską, pirmiausiai panaikinkite filtrus.
+        copy_calendar_url_message: Nuoroda sėkmingai nukopijuota į iškarpinę.
         export_calendar: Eksportuoti kalendorių
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: Susirinkimas<a href="%{meeting_path}">%{meeting_title}</a> laukia būti uždarytas. Prašau pridėkite susirinkimo ataskaitą paspausdami "Uždaryti susirinkimą".
+          greetings: Sveiki, <br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Sveiki %{username},
+          subject: Dabar galite uždaryti susirinkimą su ataskaita %{organization_name} platformoje
       conference_venues: Konferencijos vietos
       content_blocks:
         upcoming_meetings:
@@ -482,8 +486,8 @@ lt:
           origin: KilmÄ—
           origin_values:
             all: Visi
-            citizens: Pilie�iai
             official: Oficialus
+            participants: Dalyviai
             user_groups: GrupÄ—s
           scope: Apimtis
           search: Ieškoti
@@ -511,7 +515,7 @@ lt:
           select_a_meeting_type: Pasirinkite susitikimo tipÄ…
           select_a_registration_type: Pasirinkite registracijos tipÄ…
           select_an_iframe_access_level: Pasirinkite iframe prieigos lygį
-          show_embedded_iframe_help: Tik kelios paslaugos gali būti integruotos susitikimuose (YouTube, Twitch, Jitsi)
+          show_embedded_iframe_help: 'Tik kelios paslaugos leidžia įterpti susitikimą ar tiesioginį įvykį iš šių domenų: %{domains}'
         index:
           click_here: Žiūrėti visus susitikimus
           new_meeting: Naujas susitikimas
diff --git a/decidim-meetings/config/locales/lv.yml b/decidim-meetings/config/locales/lv.yml
index dc9c14503be0c..902ff31274390 100644
--- a/decidim-meetings/config/locales/lv.yml
+++ b/decidim-meetings/config/locales/lv.yml
@@ -1,10 +1,7 @@
+---
 lv:
   activemodel:
     attributes:
-      agenda:
-        description: Apraksts
-        duration: Ilgums
-        title: Nosaukums
       close_meeting:
         attendees_count: Apmeklēt�ju skaits
         attending_organizations: Organiz�ciju saraksts, kuras apmeklēja
@@ -18,7 +15,6 @@ lv:
         decidim_category_id: Kategorija
         decidim_scope_id: Darbības tvērums
         description: Apraksts
-        end_time: Beigu laiks
         location: Atrašan�s vieta
         location_hints: Nor�dījumi par atrašan�s vietu
         organizer_id: Organizators
@@ -26,7 +22,6 @@ lv:
         registration_form_enabled: Reģistr�cijas veidlapa ir iespējota
         registration_terms: Reģistr�cijas noteikumi
         registrations_enabled: Reģistr�cijas ir iespējotas
-        start_time: S�kuma laiks
         title: Nosaukums
         transparent: Caurskat�ms
     errors:
diff --git a/decidim-meetings/config/locales/nl.yml b/decidim-meetings/config/locales/nl.yml
index adc9dfce80b8e..8cd60abadb367 100644
--- a/decidim-meetings/config/locales/nl.yml
+++ b/decidim-meetings/config/locales/nl.yml
@@ -1,10 +1,7 @@
+---
 nl:
   activemodel:
     attributes:
-      agenda:
-        description: Beschrijving
-        duration: Duur
-        title: Titel
       close_meeting:
         attendees_count: Aantal deelnemers
         attending_organizations: Lijst van organisaties die bijwoonden
@@ -22,7 +19,6 @@ nl:
         decidim_scope_id: Scope
         decidim_user_group_id: Gebruikers groep
         description: Beschrijving
-        end_time: Eindtijd
         id: ID
         location: Plaats
         location_hints: Locatie hints
@@ -35,8 +31,6 @@ nl:
         registration_terms: Registratievoorwaarden
         registration_url: Registratie URL
         registrations_enabled: Registraties geactiveerd
-        show_embedded_iframe: Toon embedded iframe voor deze URL
-        start_time: Starttijd
         title: Titel
         transparent: Transparant
         type_of_meeting: Type
@@ -89,15 +83,15 @@ nl:
             values:
               'false': Verleden
               'true': Toekomstige
-          origin_eq:
-            label: Oorsprong
+          scope_id_eq:
+            label: Scope
+          with_any_origin:
+            label: Afkomstig van
             values:
-              citizen: Inwoners
               official: Officieel
+              participants: Deelnemer
               user_group: Gebruikersgroepen
-          scope_id_eq:
-            label: Scope
-          type_eq:
+          with_any_type:
             label: Type vergadering
             values:
               hybrid: Hybride
@@ -282,9 +276,6 @@ nl:
           edit:
             close: Sluiten
             title: Vergadering sluiten
-        meeting_copies:
-          form:
-            select_a_meeting_type: Selecteer een vergaderingstype
         meetings:
           close:
             invalid: Er is een probleem opgetreden bij het sluiten van deze vergadering
@@ -303,16 +294,15 @@ nl:
             update: Bijwerken
           form:
             address_help: 'Adres: gebruikt door Geocoder om de locatie te vinden'
-            available_slots_help: Laat op 0 staan als je onbeperkt aantal tijdsblokken beschikbaar hebt
             disclaimer: 'Disclaimer: Door gebruik te maken van een extern registratiesysteem, ben je op de hoogte dat de organisatoren van %{organization} niet verantwoordelijk zijn voor de gegevens die door gebruikers aan de externe dienst worden verstrekt.'
             location_help: 'Locatie: bericht gericht aan de gebruikers die de locatie op een vergadering plaatsen'
             location_hints_help: 'Locatie hints: aanvullende informatie. Bijvoorbeeld: de verdieping van het gebouw als het een fysieke vergadering is, of het vergaderwachtwoord als het een online vergadering is met beperkte toegang.'
             online_meeting_url_help: 'Link: laat deelnemers direct verbinding maken met je vergadering'
-            registration_email_help: Deze tekst verschijnt in het midden van de registratie bevestigingsmail, net na de registratiecode.
             registration_url_help: 'Link: verleen deelnemers toegang tot de externe dienst die je gebruikt voor registraties'
             select_a_meeting_type: Selecteer een vergaderingstype
             select_a_registration_type: Selecteer een registratietype
             select_an_iframe_access_level: Selecteer een iframe toegangsniveau
+            show_embedded_iframe_help: 'Slechts enkele diensten staan embedden in vergadering of live evenement toe op de volgende domeinen: %{domains}'
           index:
             title: Events
           new:
@@ -355,6 +345,7 @@ nl:
             available_slots_help: Laat het op 0 indien u onbeperkt beschikbare plaatsen hebt.
             invites: Uitnodigingen
             recommendation_message: Om privacyredenen raden we je aan dit inschrijvingsformulier te verwijderen als je het niet meer nodig hebt. Standaard is dit 3 maanden na afloop van de vergadering.
+            registration_email_help: Deze tekst verschijnt in het midden van de registratie bevestigingsmail, net na de registratiecode.
             registration_form: Registratieformulier
             registrations_count:
               one: Er is %{count} registratie geweest.
@@ -382,6 +373,8 @@ nl:
           value_types:
             organizer_presenter:
               not_found: 'De organisator is niet gevonden in de database (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} heeft de vragenlijst bijgewerkt voor het %{meeting_name} event"
       application_helper:
         filter_category_values:
           all: Alle
@@ -392,7 +385,19 @@ nl:
       calendar_modal:
         calendar_url: Agenda-URL
         close_window: Venster sluiten
+        copy_calendar_url: Kopieer
+        copy_calendar_url_clarification: Kopieer link naar klembord
+        copy_calendar_url_copied: Gekopieerd!
+        copy_calendar_url_description: Je kunt alle gepubliceerde vergaderingen zien in uw agenda-applicatie. Kopieer en plak deze URL in uw kalender met behulp van de optie "Voeg nieuwe kalender toe van een URL".
+        copy_calendar_url_explanation: Hou er rekening mee dat je een selectie van vergaderingen exporteert, omdat er filters actief zijn. Als je ze allemaal wil exporteren, reset eerst alle filters.
+        copy_calendar_url_message: URL met succes gekopieerd naar klembord.
         export_calendar: Kalender exporteren
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          body: De vergadering <a href="%{meeting_path}">"%{meeting_title}"</a> is in behandeling om te worden gesloten. Voeg een verslag van de vergadering toe via de knop "Sluiten".
+          greetings: Groeten,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Hallo %{username},
+          subject: Je kunt je vergadering nu sluiten op het %{organization_name} platform met een verslag
       conference_venues: Vergaderlocaties
       content_blocks:
         upcoming_meetings:
@@ -467,8 +472,8 @@ nl:
           origin: Oorsprong
           origin_values:
             all: Alles
-            citizens: Burgers
             official: Officieel
+            participants: Deelnemers
             user_groups: Groepen
           scope: Scope
           search: Zoeken
@@ -496,6 +501,7 @@ nl:
           select_a_meeting_type: Selecteer een vergaderingstype
           select_a_registration_type: Selecteer een registratietype
           select_an_iframe_access_level: Selecteer een iframe toegangsniveau
+          show_embedded_iframe_help: 'Slechts enkele diensten staan inbedden in vergadering of live evenement toe op de volgende domeinen: %{domains}'
         index:
           click_here: Alle vergaderingen bekijken
           new_meeting: Nieuwe vergadering
diff --git a/decidim-meetings/config/locales/no.yml b/decidim-meetings/config/locales/no.yml
index 26ffbb598a8d6..9b1d2ee3741b8 100644
--- a/decidim-meetings/config/locales/no.yml
+++ b/decidim-meetings/config/locales/no.yml
@@ -1,10 +1,7 @@
+---
 "no":
   activemodel:
     attributes:
-      agenda:
-        description: Beskrivelse
-        duration: Varighet
-        title: Tittel
       close_meeting:
         attendees_count: Antall deltagere
         attending_organizations: Liste over organisasjoner som deltok
@@ -22,7 +19,6 @@
         decidim_scope_id: Tema
         decidim_user_group_id: Brukergruppe
         description: Beskrivelse
-        end_time: Sluttid
         id: ID
         location: Plassering
         location_hints: Plasseringstips
@@ -34,8 +30,6 @@
         registration_terms: Registrerings vilkår
         registration_url: Link til registrering
         registrations_enabled: Registreringer aktivert
-        show_embedded_iframe: Vis innebygd iframe for denne nettadressen
-        start_time: Start-Tid
         title: Tittel
         transparent: Privat
         type_of_meeting: Type møte
@@ -88,19 +82,15 @@
             values:
               'false': Tidligere
               'true': Kommende
-          origin_eq:
-            label: Opprinnelse
-            values:
-              citizen: Innbygger
-              official: Offisiell
-              user_group: Brukergrupper
           scope_id_eq:
             label: Tema
-          type_eq:
+          with_any_origin:
+            values:
+              user_group: Brukergrupper
+          with_any_type:
             label: Type møte
             values:
               in_person: Tilstede
-              online: Digitalt
       meeting_copies:
         create:
           error: Det oppstod et problem med å publisere dette møtet.
@@ -277,9 +267,6 @@
           edit:
             close: Lukk
             title: Lukk møte
-        meeting_copies:
-          form:
-            select_a_meeting_type: Vennligst velg en møtetype
         meetings:
           close:
             invalid: Det oppstod et problem med å avslutte dette møtet
@@ -298,17 +285,14 @@
             update: Oppdater
           form:
             address_help: 'Adresse: brukes av Geocoder for å finne lokasjonen'
-            available_slots_help: Sett den til 0 hvis du har ubegrensede plasser tilgjengelig
             disclaimer: 'Ansvarsfraskrivelse: Ved å bruke et eksternt registreringssystem, er du klar over at opphavspersonene av %{organization} ikke er ansvarlige for dataene som brukerne gir til den eksterne tjenesten.'
             location_help: 'Plassering: melding rettet til brukerne som antyder stedet å møte på'
             location_hints_help: 'Hint: ekstra info. Eksempel: Etasje i bygningen hvis det er et fysisk møte, eller møtepassordet hvis det er et nettmøte med begrenset tilgang.'
             online_meeting_url_help: 'Lenke: tillat deltakere å koble direkte til møtet ditt'
-            registration_email_help: Denne teksten vil dukke opp i midten av e-posten med registreringsbekreftelsen. Like etter registreringskoden.
             registration_url_help: 'Lenke: La deltakerne gå på den eksterne tjenesten du bruker for registreringer'
             select_a_meeting_type: Vennligst velg en møtetype
             select_a_registration_type: Velg en registreringstype
             select_an_iframe_access_level: Velg et tilgangsnivå for iframe
-            show_embedded_iframe_help: Kun noen få tjenester tillater integrering i møte eller direktearrangement (YouTube, Twitch og Jitsi)
           index:
             title: Møter
           new:
@@ -350,6 +334,7 @@
           form:
             available_slots_help: Sett den til 0 hvis du har ubegrensede plasser tilgjengelig.
             invites: Invitasjoner
+            registration_email_help: Denne teksten vil dukke opp i midten av e-posten med registreringsbekreftelsen. Like etter registreringskoden.
             registration_form: Registreingsskjema
             registrations_count:
               one: Det har vært %{count} registrering.
@@ -460,8 +445,8 @@
           origin: Opprinnelse
           origin_values:
             all: Alle
-            citizens: Innbyggere
             official: Offisiell
+            participants: Deltakere
             user_groups: Grupper
           scope: Tema
           search: Søk
diff --git a/decidim-meetings/config/locales/pl.yml b/decidim-meetings/config/locales/pl.yml
index 9e848c7bd243c..93084f69e0db9 100644
--- a/decidim-meetings/config/locales/pl.yml
+++ b/decidim-meetings/config/locales/pl.yml
@@ -1,10 +1,7 @@
+---
 pl:
   activemodel:
     attributes:
-      agenda:
-        description: Opis
-        duration: Czas trwania
-        title: Tytuł
       close_meeting:
         attendees_count: Liczba osób biorących udział
         attending_organizations: Lista organizacji biorących udział
@@ -21,7 +18,6 @@ pl:
         decidim_scope_id: Zakres
         decidim_user_group_id: Grupa użytkowników
         description: Opis
-        end_time: Czas zakończenia
         id: Numer ID
         location: Miejsce
         location_hints: Wskazówki co do miejsca
@@ -33,7 +29,6 @@ pl:
         registration_terms: Warunki rejestracji
         registration_url: Adres URL rejestracji
         registrations_enabled: Rejestracje włączone
-        start_time: Czas rozpoczęcia
         title: Tytuł
         transparent: Transparentny
         type_of_meeting: Typ
@@ -84,13 +79,6 @@ pl:
               'true': Zamknięte
           is_upcoming_true:
             label: Data
-          origin_eq:
-            label: Źródło
-            values:
-              official: Oficjalny
-          type_eq:
-            values:
-              online: Online
       meeting_copies:
         create:
           error: Wystąpił błąd podczas duplikowania tego spotkania.
@@ -287,16 +275,13 @@ pl:
             update: Aktualizuj
           form:
             address_help: 'Adres: używany przez Geocoder do znalezienia lokalizacji'
-            available_slots_help: Zostaw 0 jeśli masz nieograniczoną liczbę dostępnych miejsc
             disclaimer: 'Uwaga: Korzystając z zewnętrznego systemu uwierzytelniania, jesteś świadomy, że organizatorzy %{organization} nie są odpowiedzialni za dane dostarczone przez użytkowników usługi zewnętrznej.'
             location_help: 'Lokalizacja: informacja dla użytkowników dotycząca miejsca spotkania'
             location_hints_help: 'Wskazówki dotyczące lokalizacji: dodatkowe informacje. Przykład: piętro budynku, jeśli jest to spotkanie fizyczne, lub hasło do spotkania, jeśli odbywa się ono online i ma ograniczony dostęp.'
             online_meeting_url_help: 'Link: zezwól uczestnikom na bezpośredni dostęp do Twojego spotkania'
-            registration_email_help: Ten tekst pojawi się w środku wiadomości e-mail z potwierdzeniem rejestracji. Tuż po kodzie rejestracyjnym.
             registration_url_help: 'Link: zezwól użytkownikom na korzystanie z usługi zewnętrznej, której używasz do rejestracji'
             select_a_meeting_type: Wybierz typ spotkania
             select_a_registration_type: Wybierz typ rejestracji
-            show_embedded_iframe_help: Tylko kilka usług pozwala na osadzanie w spotkaniu lub wydarzeniu na żywo (YouTube, Twitch i Jitsi)
           index:
             title: Spotkania
           new:
@@ -336,6 +321,7 @@ pl:
             available_slots_help: Zostaw 0, jeśli dostępna jest nieograniczona liczba miejsc.
             invites: Zaproszenia
             recommendation_message: Ze względu na ochronę prywatności zalecamy usunięcie tego podpisu, gdy nie będzie już wymagany. Standardowo są to 3 miesiące od zakończenia spotkania.
+            registration_email_help: Ten tekst pojawi się w środku wiadomości e-mail z potwierdzeniem rejestracji. Tuż po kodzie rejestracyjnym.
             registration_form: Formularz rejestracyjny
             registrations_count:
               one: Była%{count} rejestracja.
@@ -368,7 +354,11 @@ pl:
       calendar_modal:
         calendar_url: Adres URL kalendarza
         close_window: Zamknij okno
+        copy_calendar_url_description: Możesz zobaczyć wszystkie opublikowane spotkania w swojej aplikacji kalendarza. Skopiuj i wklej ten adres URL w swoim kalendarzu, używając opcji "Dodaj nowy kalendarz z URL".
         export_calendar: Eksportuj kalendarz
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          subject: Teraz możesz zamknąć spotkanie z opublikowaniem raportu na platformie %{organization_name}
       conference_venues: Sale konferencyjne
       content_blocks:
         upcoming_meetings:
@@ -428,7 +418,6 @@ pl:
           origin: Źródło
           origin_values:
             all: Wszystkie
-            citizens: Obywatele
             official: Oficjalny
             user_groups: Grupy
           scope: Zakres
@@ -455,7 +444,6 @@ pl:
           select_a_category: Wybierz kategoriÄ™
           select_a_meeting_type: Wybierz typ spotkania
           select_a_registration_type: Wybierz typ rejestracji
-          show_embedded_iframe_help: Tylko kilka usług pozwala na osadzanie w spotkaniu lub wydarzeniu na żywo (YouTube, Twitch i Jitsi)
         index:
           new_meeting: Nowe spotkanie
         meeting_minutes:
diff --git a/decidim-meetings/config/locales/pt-BR.yml b/decidim-meetings/config/locales/pt-BR.yml
index 8fd3179b4b930..ece64bf1e852a 100644
--- a/decidim-meetings/config/locales/pt-BR.yml
+++ b/decidim-meetings/config/locales/pt-BR.yml
@@ -1,10 +1,7 @@
+---
 pt-BR:
   activemodel:
     attributes:
-      agenda:
-        description: Descrição
-        duration: Duração
-        title: Título
       close_meeting:
         attendees_count: Número de Participantes
         attending_organizations: Lista de organizações que participaram
@@ -22,7 +19,6 @@ pt-BR:
         decidim_scope_id: Âmbito
         decidim_user_group_id: Grupo de usuários
         description: Descrição
-        end_time: Fim do tempo
         location: Localização
         location_hints: Dicas de localização
         online_meeting_url: URL da reunião on-line
@@ -34,7 +30,6 @@ pt-BR:
         registration_terms: Termos de registro
         registration_url: URL de Registro
         registrations_enabled: Registos habilitados
-        start_time: Hora de início
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
@@ -69,15 +64,6 @@ pt-BR:
         other: Registros
   decidim:
     admin:
-      filters:
-        meetings:
-          origin_eq:
-            label: Origem
-            values:
-              official: Oficial
-          type_eq:
-            values:
-              online: On-line
       meeting_copies:
         create:
           error: Ocorreu um erro ao duplicar esta reunião.
@@ -271,12 +257,10 @@ pt-BR:
             update: Atualizar
           form:
             address_help: 'Endereço: usado pelo Geocodificador para encontrar a localização'
-            available_slots_help: Deixe-o em 0 se você tiver slots ilimitados disponíveis
             disclaimer: 'Aviso: ao usar um sistema de registro externo, você está ciente de que os organizadores do %{organization} não são responsáveis pelos dados fornecidos pelos usuários ao serviço externo.'
             location_help: 'Localização: mensagem direcionada aos usuários que imprimem o local para'
             location_hints_help: 'Dicas de localização: informações adicionais Exemplo: o piso do edifício se é uma reunião presencial, ou a senha da reunião, se é uma reunião online com acesso restrito.'
             online_meeting_url_help: 'Link: permitir que os participantes se conectem diretamente à sua reunião'
-            registration_email_help: Este texto aparecerá no meio do e-mail de confirmação de registro. Logo após o código de registro.
             registration_url_help: 'Link: permitir que os participantes possam acessar o serviço externo que você está usando para inscrições'
             select_a_meeting_type: Por favor, selecione um tipo de reunião
             select_a_registration_type: Por favor, selecione um tipo de registro
@@ -322,6 +306,7 @@ pt-BR:
             available_slots_help: Deixe-o para 0 se você tiver slots ilimitados disponíveis.
             invites: Convites
             recommendation_message: Por razões de privacidade, recomendamos que você exclua esse formulário de inscrição quando não precisar mais dele. Por padrão, isso será daqui a 3 meses após o fim da reunião.
+            registration_email_help: Este texto aparecerá no meio do e-mail de confirmação de registro. Logo após o código de registro.
             registration_form: Formulário de registro
             registrations_count:
               one: Houve %{count} registro.
@@ -416,7 +401,6 @@ pt-BR:
           origin: Origem
           origin_values:
             all: Tudo
-            citizens: Cidadãos
             official: Oficial
             user_groups: Grupos
           scope: Escopo
diff --git a/decidim-meetings/config/locales/pt.yml b/decidim-meetings/config/locales/pt.yml
index fe835b57ad6d4..2bb6e1bcbf795 100644
--- a/decidim-meetings/config/locales/pt.yml
+++ b/decidim-meetings/config/locales/pt.yml
@@ -1,10 +1,7 @@
+---
 pt:
   activemodel:
     attributes:
-      agenda:
-        description: Descrição
-        duration: Duração
-        title: Título
       close_meeting:
         attendees_count: Número de participantes
         attending_organizations: Lista de organizações que participaram
@@ -22,7 +19,6 @@ pt:
         decidim_scope_id: Âmbito
         decidim_user_group_id: Grupo de utilizadores
         description: Descrição
-        end_time: Hora de fim
         id: IDENTIFICAÇÃO
         location: Localização
         location_hints: Dicas de localização
@@ -35,8 +31,6 @@ pt:
         registration_terms: Termos de registo
         registration_url: URL de registo
         registrations_enabled: Registos ativados
-        show_embedded_iframe: Mostrar iframe embutido para este URL
-        start_time: Hora de início
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
@@ -85,19 +79,15 @@ pt:
             values:
               'false': Passado
               'true': Seguinte
-          origin_eq:
-            label: Origem
-            values:
-              citizen: Cidadão
-              official: Oficial
-              user_group: Grupos de utilizadores
           scope_id_eq:
             label: Âmbito
-          type_eq:
+          with_any_origin:
+            values:
+              user_group: Grupos de utilizadores
+          with_any_type:
             label: Tipo de reunião
             values:
               in_person: Presencialmente
-              online: On-line
       meeting_copies:
         create:
           error: Ocorreu um problema ao duplicar esta reunião.
@@ -292,12 +282,10 @@ pt:
             update: Atualizar
           form:
             address_help: 'Endereço: utilizado por Geocoder para encontrar a localização'
-            available_slots_help: Deixar em 0 se tiver número ilimitado de intervalos de tempo disponíveis
             disclaimer: 'Declinação de responsabilidade: Ao usar um registo externo ao sistema fica ao corrente que os organizadores de %{organization} não são responsáveis pelos dados fornecidos pelo utilizador ao serviço externo.'
             location_help: 'Localização: mensagem direcionada para os utilizadores indicando o local de encontro'
             location_hints_help: 'Sugestões de localização: informação adicional. Exemplo: o piso do edifício se for uma reunião presencial, ou a palavra-chave se for uma reunião on-line de acesso restrito.'
             online_meeting_url_help: 'Ligação: permitir aos participantes ligarem-se directamente à sua reunião'
-            registration_email_help: Este texto irá aparecer no meio do e-mail de confirmação de registo. Logo a seguir ao código de registo.
             registration_url_help: 'Ligação: permitir aos participantes dirigirem-se ao serviço externo que está a usar para os registos'
             select_a_meeting_type: Por favor seleccione um tipo de reunião
             select_a_registration_type: Por favor seleccione um tipo de registo
@@ -343,6 +331,7 @@ pt:
             available_slots_help: Deixar a 0 se tiver intervalos de tempo ilimitados disponíveis.
             invites: Convites
             recommendation_message: Por questões de privacidade recomendamos que elimine este formulário de inscrição quando já não for necessário. Por predefinição, isto acontece 3 meses após o fim da reunião.
+            registration_email_help: Este texto irá aparecer no meio do e-mail de confirmação de registo. Logo a seguir ao código de registo.
             registration_form: Formulário de registo
             registrations_count:
               one: Houve %{count} registo.
@@ -437,7 +426,6 @@ pt:
           origin: Origem
           origin_values:
             all: Todos
-            citizens: Cidadãos
             official: Oficial
             user_groups: Grupos
           scope: Âmbito
diff --git a/decidim-meetings/config/locales/ro-RO.yml b/decidim-meetings/config/locales/ro-RO.yml
index 3c247c428089d..3853b71256323 100644
--- a/decidim-meetings/config/locales/ro-RO.yml
+++ b/decidim-meetings/config/locales/ro-RO.yml
@@ -1,10 +1,7 @@
+---
 ro:
   activemodel:
     attributes:
-      agenda:
-        description: Descriere
-        duration: Durată
-        title: Titlu
       close_meeting:
         attendees_count: Număr de participanți
         attending_organizations: Lista organizaţiilor care au participat
@@ -22,7 +19,6 @@ ro:
         decidim_scope_id: Domeniu de interes
         decidim_user_group_id: Grup de utilizatori
         description: Descriere
-        end_time: Ora de încheiere
         id: ID
         location: Locaţie
         location_hints: Sugestii de localizare
@@ -35,11 +31,14 @@ ro:
         registration_terms: Termeni de înregistrare
         registration_url: URL înregistrare
         registrations_enabled: Înregistrări activate
-        show_embedded_iframe: Arată iframe încorporat pentru acest URL
-        start_time: Ora de începere
         title: Titlu
         transparent: Transparentă
         type_of_meeting: Tip
+      meeting_agenda:
+        title: Titlu
+      meeting_agenda_items:
+        duration: Durată
+        title: Titlu
     errors:
       models:
         meeting:
@@ -92,15 +91,15 @@ ro:
             values:
               'false': Trecute
               'true': Viitoare
-          origin_eq:
+          scope_id_eq:
+            label: Domeniu de interes
+          with_any_origin:
             label: Origine
             values:
-              citizen: Cetățean
               official: Oficial
+              participants: Participant
               user_group: Grupuri de utilizatori
-          scope_id_eq:
-            label: Domeniu de interes
-          type_eq:
+          with_any_type:
             label: Tip de întâlnire
             values:
               hybrid: Hibrid
@@ -286,9 +285,6 @@ ro:
           edit:
             close: ÃŽnchide
             title: Închide ședința
-        meeting_copies:
-          form:
-            select_a_meeting_type: Te rugăm să selectezi un tip de ședință
         meetings:
           close:
             invalid: A apărut o problemă la închiderea acestei întâlniri
@@ -308,12 +304,10 @@ ro:
             update: Actualizare
           form:
             address_help: 'Adresă: utilizată de Geocoder pentru a găsi locaţia'
-            available_slots_help: Lasă această opțiune la 0 dacă ai sloturi disponibile nelimitate
             disclaimer: 'Declinare: Prin utilizarea unui sistem extern de înregistrare, acceptați faptul că organizatorii %{organization} nu sunt responsabili pentru datele furnizate de utilizatorii serviciului extern.'
             location_help: 'Locație: mesaj direcționat către utilizatori care implică locul la care să se întâlnească'
             location_hints_help: 'Sugestii privind locaţia: informaţii suplimentare. Exemplu: parterul clădirii dacă este o întâlnire în personaă, sau parola pentru intrare dacă este vorba de o întâlnire online cu acces restrâns.'
             online_meeting_url_help: 'Link: permite participanților să se conecteze direct la întâlnirea ta'
-            registration_email_help: Acest text va apărea în mijlocul e-mailului de confirmare a înregistrării. Imediat după codul de înregistrare.
             registration_url_help: 'Link: permite participanților să acceseze serviciul extern pe care îl utilizezi pentru înregistrare'
             select_a_meeting_type: Te rugăm să selectezi un tip de ședință
             select_a_registration_type: Te rugăm să selectezi un tip de înregistrare
@@ -360,6 +354,7 @@ ro:
             available_slots_help: Lăsați la 0 dacă aveți sloturi nelimitate disponibile.
             invites: Invitații
             recommendation_message: Din motive de confidenţialitate îți recomandăm să şterge acest formular atunci când nu mai ai nevoie de el. Acest lucru se întâmplă în mod automat la 3 luni după încheierea ședinței.
+            registration_email_help: Acest text va apărea în mijlocul e-mailului de confirmare a înregistrării. Imediat după codul de înregistrare.
             registration_form: Formular de înregistrare
             registrations_count:
               one: A existat %{count} înregistrări.
@@ -398,7 +393,16 @@ ro:
       calendar_modal:
         calendar_url: URL Calendar
         close_window: ÃŽnchide fereastra
+        copy_calendar_url: Copiază
+        copy_calendar_url_clarification: Copiază URL-ul calendarului în clipboard
+        copy_calendar_url_copied: Copiat!
+        copy_calendar_url_explanation: Vă rugăm să rețineți că exportați o selecție de întâlniri, pentru că există filtre active. Dacă doriți să le exportați, resetați toate filtrele mai întâi.
+        copy_calendar_url_message: URL-ul a fost copiat cu succes în clipboard.
         export_calendar: Exportă calendarul
+      close_meeting_reminder_mailer:
+        close_meeting_reminder:
+          hello: Salut %{username},
+          subject: Acum poți închide întâlnirea cu un raport pe platforma %{organization_name}
       conference_venues: Locuri ale conferinței
       content_blocks:
         upcoming_meetings:
@@ -473,8 +477,8 @@ ro:
           origin: Origine
           origin_values:
             all: Toate
-            citizens: Cetățeni
             official: Oficial
+            participants: Participanți
             user_groups: Grupuri
           scope: Domeniu de interes
           search: Caută
diff --git a/decidim-meetings/config/locales/ru.yml b/decidim-meetings/config/locales/ru.yml
index 792e2d1f44361..4796b75022d22 100644
--- a/decidim-meetings/config/locales/ru.yml
+++ b/decidim-meetings/config/locales/ru.yml
@@ -1,10 +1,7 @@
+---
 ru:
   activemodel:
     attributes:
-      agenda:
-        description: Опи�ание
-        duration: Длительно�ть
-        title: Заголовок
       close_meeting:
         attendees_count: Количе�тво уча�тников
         attending_organizations: Спи�ок прин�вших уча�тие организаций
@@ -18,7 +15,6 @@ ru:
         decidim_category_id: Категори�
         decidim_scope_id: Охват
         description: Опи�ание
-        end_time: Врем� окончани�
         location: Ме�то
         location_hints: Как добрать��
         organizer_id: Организаци�
@@ -26,7 +22,6 @@ ru:
         registration_form_enabled: Реги�трационна� форма включена
         registration_terms: У�лови� реги�трации
         registrations_enabled: Реги�траци� включена
-        start_time: Врем� начала
         title: �азвание
         transparent: Прозрачна�
     errors:
diff --git a/decidim-meetings/config/locales/sk.yml b/decidim-meetings/config/locales/sk.yml
index ade89d576003d..59c3d548189f7 100644
--- a/decidim-meetings/config/locales/sk.yml
+++ b/decidim-meetings/config/locales/sk.yml
@@ -1,10 +1,7 @@
+---
 sk:
   activemodel:
     attributes:
-      agenda:
-        description: Popis
-        duration: ÄŒas trvania
-        title: Názov
       close_meeting:
         attendees_count: Po�et ú�astníkov
         attending_organizations: Zoznam organizácií, ktoré sa zú�astnili
@@ -18,7 +15,6 @@ sk:
         decidim_category_id: Kategória
         decidim_scope_id: Rozsah
         description: Popis
-        end_time: Čas ukon�enia
         location: Umiestnenie
         location_hints: Tipy pre umiestnenie
         organizer_id: Organizátor
@@ -26,7 +22,6 @@ sk:
         registration_form_enabled: Registra�ný formulár je povolený
         registration_terms: Podmienky registrácie
         registrations_enabled: Registrácia povolené
-        start_time: Čas za�atia
         title: Názov
         transparent: Transparentné
     errors:
diff --git a/decidim-meetings/config/locales/sl.yml b/decidim-meetings/config/locales/sl.yml
index 92acbfec51eb5..a04a199788d2d 100644
--- a/decidim-meetings/config/locales/sl.yml
+++ b/decidim-meetings/config/locales/sl.yml
@@ -1,8 +1,6 @@
+---
 sl:
   activemodel:
-    attributes:
-      agenda:
-        description: Opis
     models:
       decidim/meetings/create_meeting_event: Sestanek
   decidim:
diff --git a/decidim-meetings/config/locales/sr-CS.yml b/decidim-meetings/config/locales/sr-CS.yml
index e0c057912f19b..94d157ea87ba6 100644
--- a/decidim-meetings/config/locales/sr-CS.yml
+++ b/decidim-meetings/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     meetings:
diff --git a/decidim-meetings/config/locales/sv.yml b/decidim-meetings/config/locales/sv.yml
index a0e467a5fa82f..a07e69ef87a6b 100644
--- a/decidim-meetings/config/locales/sv.yml
+++ b/decidim-meetings/config/locales/sv.yml
@@ -1,10 +1,7 @@
+---
 sv:
   activemodel:
     attributes:
-      agenda:
-        description: Beskrivning
-        duration: Varaktighet
-        title: Titel
       close_meeting:
         attendees_count: Antal deltagare
         attending_organizations: Lista över organisationer som deltog
@@ -35,11 +32,20 @@ sv:
         registration_terms: Registreringsvillkor
         registration_url: URL för anmälan
         registrations_enabled: Registreringar aktiverade
-        show_embedded_iframe: Visa integrerad iframe för denna URL
-        start_time: Starttid
         title: Titel
         transparent: Transparent
         type_of_meeting: Typ
+      meeting_agenda:
+        title: Titel
+        visible: Synlig
+      meeting_agenda_items:
+        duration: Varaktighet
+        title: Titel
+      meeting_registration_invite:
+        email: E-post
+        name: Namn
+      validate_registration_code:
+        code: Kod
     errors:
       models:
         meeting:
@@ -89,15 +95,15 @@ sv:
             values:
               'false': Tidigare
               'true': Kommande
-          origin_eq:
+          scope_id_eq:
+            label: Omfång
+          with_any_origin:
             label: Ursprung
             values:
-              citizen: Medborgare
-              official: Officiell
+              official: Officiella
+              participants: Deltagare
               user_group: Användargrupper
-          scope_id_eq:
-            label: Omfång
-          type_eq:
+          with_any_type:
             label: Mötestyp
             values:
               hybrid: Hybrid
@@ -279,9 +285,6 @@ sv:
           edit:
             close: Stäng
             title: Stäng mötet
-        meeting_copies:
-          form:
-            select_a_meeting_type: Välj mötestyp
         meetings:
           close:
             invalid: Det gick inte att stänga mötet
@@ -300,17 +303,14 @@ sv:
             update: Uppdatera
           form:
             address_help: 'Adress: anger en plats för Geocoder'
-            available_slots_help: Lämna det till 0 om du har obegränsade platser
             disclaimer: 'Disclaimer: När du använder ett externt anmälningssystem är du medveten om att administratörerna för %{organization} inte är ansvariga för de data som tillhandahålls av användarna till den externa tjänsten.'
             location_help: 'Plats: meddelande till användarna som anger mötesplats'
             location_hints_help: 'Tips för att hitta platsen: ytterligare information. Exempel: våningen om det är ett fysiskt möte eller möteslösenordet om det är ett online möte.'
             online_meeting_url_help: 'Länk: tillåt deltagare att koppla sig direct till ditt möte'
-            registration_email_help: Denna text kommer att synas i mitten av e-postet för registreringsbekräftelse, efter registreringskod.
             registration_url_help: 'Länk: tillåt deltagare att registrera sig på en extern tjänst'
             select_a_meeting_type: Välj mötestyp
             select_a_registration_type: Välj en registreringsmetod
             select_an_iframe_access_level: Välj vem får tillgång till denna iframe
-            show_embedded_iframe_help: Endast ett fåtal tjänster tillåter inbäddning i möten eller live-event (t.ex. YouTube, Twitch och Jitsi)
           index:
             title: Möten
           new:
@@ -353,6 +353,7 @@ sv:
             available_slots_help: Lämna det till 0 om du har obegränsade platser.
             invites: Inbjudningar
             recommendation_message: Av sekretessskäl rekommenderar vi att du tar bort detta inskriptionsformulär när du inte längre behöver det. Som standard är detta 3 månader efter att mötet avslutats.
+            registration_email_help: Denna text kommer att synas i mitten av e-postet för registreringsbekräftelse, efter registreringskod.
             registration_form: Anmälningsformulär
             registrations_count:
               one: Det har gjorts %{count} anmälan.
@@ -390,6 +391,8 @@ sv:
       calendar_modal:
         calendar_url: Kalender-URL
         close_window: Stäng fönster
+        copy_calendar_url: Kopiera
+        copy_calendar_url_copied: Kopierad!
         export_calendar: Exportera kalender
       conference_venues: Konferenslokaler
       content_blocks:
@@ -465,8 +468,8 @@ sv:
           origin: Ursprung
           origin_values:
             all: Alla
-            citizens: Medborgare
             official: Officiell
+            participants: Deltagare
             user_groups: Grupper
           scope: Omfattning
           search: Sök
@@ -494,7 +497,6 @@ sv:
           select_a_meeting_type: Välj mötestyp
           select_a_registration_type: Välj en registreringsmetod
           select_an_iframe_access_level: Välj vem får tillgång till denna iframe
-          show_embedded_iframe_help: Endast ett fåtal tjänster tillåter inbäddning i möten eller live-event (t.ex. YouTube, Twitch och Jitsi)
         index:
           click_here: Se alla möten
           new_meeting: Nytt möte
diff --git a/decidim-meetings/config/locales/tr-TR.yml b/decidim-meetings/config/locales/tr-TR.yml
index 4e7c6b5a99a79..d8044fdb14576 100644
--- a/decidim-meetings/config/locales/tr-TR.yml
+++ b/decidim-meetings/config/locales/tr-TR.yml
@@ -1,10 +1,7 @@
+---
 tr:
   activemodel:
     attributes:
-      agenda:
-        description: Açıklama
-        duration: süre
-        title: Başlık
       close_meeting:
         attendees_count: Katılımcı sayısı
         attending_organizations: Katılan kuruluşların listesi
@@ -21,7 +18,6 @@ tr:
         decidim_scope_id: kapsam
         decidim_user_group_id: Kullanıcı grubu
         description: Açıklama
-        end_time: Bitiş zamanı
         location: yer
         location_hints: Yer ipuçları
         online_meeting_url: Çevrimiçi Toplantı URL
@@ -32,7 +28,6 @@ tr:
         registration_terms: Kayıt şartları
         registration_url: Kayıt URL
         registrations_enabled: Kayıtlar etkinleştirildi
-        start_time: Başlama zamanı
         title: Başlık
         transparent: Åžeffaf
         type_of_meeting: Tür
@@ -67,15 +62,6 @@ tr:
         other: Kayıtlar
   decidim:
     admin:
-      filters:
-        meetings:
-          origin_eq:
-            label: Orijin
-            values:
-              official: Resmi
-          type_eq:
-            values:
-              online: Çevrimiçi
       meeting_copies:
         create:
           error: Bu toplantıyı kopyalarken bir sorun oluştu.
@@ -264,7 +250,6 @@ tr:
             update: Güncelle
           form:
             address_help: 'Adres: Geocoder tarafından konumu bulmak için kullanılır'
-            available_slots_help: Sınırsız alanınız varsa bunu 0 olarak bırakın
             disclaimer: 'Sorumluluk reddi: Harici bir kayıt sistemi kullanarak, %{organization} organizatörlerinin, kullanıcılar tarafından harici hizmete sağlanan verilerden sorumlu olmadığını biliyorsunuz.'
             location_help: 'Konum: kullanıcılara buluşulacak yeri ima eden mesaj'
             location_hints_help: 'Konum ipuçları: ek bilgi. Örnek: Yüz yüze bir toplantıysa binanın katı veya kısıtlı erişime sahip çevrimiçi bir toplantıysa toplantı parolası.'
@@ -380,7 +365,6 @@ tr:
           origin: Orijin
           origin_values:
             all: Tümü
-            citizens: VatandaÅŸlar
             official: Resmi
             user_groups: Gruplar
           scope: Kapsam
diff --git a/decidim-meetings/config/locales/uk.yml b/decidim-meetings/config/locales/uk.yml
index ecfbf558b4f00..261847c9f4494 100644
--- a/decidim-meetings/config/locales/uk.yml
+++ b/decidim-meetings/config/locales/uk.yml
@@ -1,10 +1,7 @@
+---
 uk:
   activemodel:
     attributes:
-      agenda:
-        description: Опи�
-        duration: Тривалі�ть
-        title: Заголовок
       close_meeting:
         attendees_count: Кількі�ть уча�ників
         attending_organizations: Перелік організацій, �кі брали уча�ть
@@ -18,14 +15,12 @@ uk:
         decidim_category_id: Категорі�
         decidim_scope_id: Об��г
         description: Опи�
-        end_time: Ча� завершенн�
         location: Розташуванн�
         location_hints: Як ді�тати�� до цього мі�ц�
         organizer_id: Організатор
         private_meeting: Приватна зу�тріч
         registration_terms: Умови реє�трації
         registrations_enabled: Реє�трацію відкрито
-        start_time: Ча� початку
         title: �азва
         transparent: Прозора
     errors:
diff --git a/decidim-meetings/config/locales/zh-CN.yml b/decidim-meetings/config/locales/zh-CN.yml
index 1706edafb1ac7..3c57342257562 100644
--- a/decidim-meetings/config/locales/zh-CN.yml
+++ b/decidim-meetings/config/locales/zh-CN.yml
@@ -1,10 +1,7 @@
+---
 zh-CN:
   activemodel:
     attributes:
-      agenda:
-        description: �述
-        duration: 期�
-        title: 标题
       close_meeting:
         attendees_count: �与者人数
         attending_organizations: 与会组织��
@@ -19,7 +16,6 @@ zh-CN:
         decidim_scope_id: 范围
         decidim_user_group_id: 用户组
         description: �述
-        end_time: 结�时间
         location: 地点
         location_hints: �置�示
         organizer_gid: 创建为
@@ -28,7 +24,6 @@ zh-CN:
         registration_form_enabled: 注册表�已�用
         registration_terms: 注册�款
         registrations_enabled: 注册已�用
-        start_time: 开始时间
         title: 标题
         transparent: �明的
     errors:
@@ -59,12 +54,6 @@ zh-CN:
         other: 注册
   decidim:
     admin:
-      filters:
-        meetings:
-          origin_eq:
-            label: 始�地
-            values:
-              official: 官方的
       meeting_copies:
         create:
           error: ��这次会议时出现问题。
@@ -349,7 +338,6 @@ zh-CN:
           origin: 始�地
           origin_values:
             all: 所有的
-            citizens: Citizens
             official: 官方的
             user_groups: 群組
           scope: 范围
diff --git a/decidim-meetings/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb b/decidim-meetings/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb
index 1702087150c46..487f2af407009 100644
--- a/decidim-meetings/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb
+++ b/decidim-meetings/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb
@@ -72,7 +72,7 @@ def down
 private
 
 def blank_minutes?(meeting)
-  meeting.video_url.blank? &&
+  (meeting.video_url.blank? &&
     meeting.audio_url.blank? &&
-    meeting.minutes_description.blank? || meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.all?(&:blank?)
+    meeting.minutes_description.blank?) || (meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.all?(&:blank?))
 end
diff --git a/decidim-meetings/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb b/decidim-meetings/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb
index 092d3584e67ac..ac9c196b8bf6c 100644
--- a/decidim-meetings/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb
+++ b/decidim-meetings/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb
@@ -53,5 +53,5 @@ def merge_closing_report(meeting)
 
 def minutes_data?(meeting)
   [meeting.video_url, meeting.audio_url].any?(&:present?) ||
-    meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?)
+    (meeting.minutes_description.is_a?(Hash) && meeting.minutes_description.values.any?(&:present?))
 end
diff --git a/decidim-meetings/db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb b/decidim-meetings/db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
new file mode 100644
index 0000000000000..29511e4770d93
--- /dev/null
+++ b/decidim-meetings/db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveNotNullOnCustomizeRegistrationEmail < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_meetings_meetings, :customize_registration_email, true
+  end
+end
diff --git a/decidim-meetings/decidim-meetings.gemspec b/decidim-meetings/decidim-meetings.gemspec
index 229fb66aa46b5..f37d6f893d15e 100644
--- a/decidim-meetings/decidim-meetings.gemspec
+++ b/decidim-meetings/decidim-meetings.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-meetings"
   s.summary = "Decidim meetings module"
diff --git a/decidim-meetings/lib/decidim/api/meeting_type.rb b/decidim-meetings/lib/decidim/api/meeting_type.rb
index af382ca47a27d..0a8b767dff206 100644
--- a/decidim-meetings/lib/decidim/api/meeting_type.rb
+++ b/decidim-meetings/lib/decidim/api/meeting_type.rb
@@ -6,6 +6,7 @@ class MeetingType < Decidim::Api::Types::BaseObject
       description "A meeting"
 
       implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AuthorableInterface
       implements Decidim::Core::CategorizableInterface
       implements Decidim::Core::ScopableInterface
       implements Decidim::Core::AttachableInterface
@@ -20,7 +21,6 @@ class MeetingType < Decidim::Api::Types::BaseObject
       field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting.", null: true
       field :start_time, Decidim::Core::DateTimeType, "The time this meeting starts", null: false
       field :end_time, Decidim::Core::DateTimeType, "The time this meeting ends", null: false
-      field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting", null: true
       field :agenda, Decidim::Meetings::AgendaType, "Agenda for this meeting, if available", null: true
 
       def agenda
diff --git a/decidim-meetings/lib/decidim/meetings.rb b/decidim-meetings/lib/decidim/meetings.rb
index f9bb475f597bb..b9653c5fa2074 100644
--- a/decidim-meetings/lib/decidim/meetings.rb
+++ b/decidim-meetings/lib/decidim/meetings.rb
@@ -15,7 +15,7 @@ module Meetings
     autoload :Registrations, "decidim/meetings/registrations"
     autoload :MeetingSerializer, "decidim/meetings/meeting_serializer"
     autoload :UserAnswersSerializer, "decidim/meetings/user_answers_serializer"
-    autoload :DataPortabilityUserAnswersSerializer, "decidim/meetings/data_portability_user_answers_serializer"
+    autoload :DownloadYourDataUserAnswersSerializer, "decidim/meetings/download_your_data_user_answers_serializer"
 
     include ActiveSupport::Configurable
 
@@ -28,6 +28,10 @@ module Meetings
     config_accessor :upcoming_meeting_notification do
       2.days
     end
+
+    config_accessor :embeddable_services do
+      %w(www.youtube.com www.twitch.tv meet.jit.si)
+    end
   end
 
   module ContentParsers
diff --git a/decidim-meetings/lib/decidim/meetings/component.rb b/decidim-meetings/lib/decidim/meetings/component.rb
index 89974ef98be24..b37522f71b699 100644
--- a/decidim-meetings/lib/decidim/meetings/component.rb
+++ b/decidim-meetings/lib/decidim/meetings/component.rb
@@ -207,8 +207,8 @@
         user = Decidim::User.find_or_initialize_by(email: email)
 
         user.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -236,7 +236,7 @@
         attachment_collection: attachment_collection,
         attached_to: meeting,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -248,7 +248,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
@@ -260,7 +260,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: meeting,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
diff --git a/decidim-meetings/lib/decidim/meetings/data_portability_user_answers_serializer.rb b/decidim-meetings/lib/decidim/meetings/download_your_data_user_answers_serializer.rb
similarity index 83%
rename from decidim-meetings/lib/decidim/meetings/data_portability_user_answers_serializer.rb
rename to decidim-meetings/lib/decidim/meetings/download_your_data_user_answers_serializer.rb
index b6004232f3fdf..48555c2350062 100644
--- a/decidim-meetings/lib/decidim/meetings/data_portability_user_answers_serializer.rb
+++ b/decidim-meetings/lib/decidim/meetings/download_your_data_user_answers_serializer.rb
@@ -2,9 +2,9 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataUserAnswersSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
-      # Serializes an user answer for data portability
+      # Serializes an user answer for download your data
       def serialize
         {
           id: resource.id,
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 96b3e8cd97329..fb805a1d5b3f1 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -57,7 +57,7 @@ class Engine < ::Rails::Engine
         # meeting for the given participatory space.
         Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
           published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
-          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).upcoming.order(:start_time, :end_time).first
+          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).published.upcoming.order(:start_time, :end_time).first
 
           next unless upcoming_meeting
 
@@ -119,6 +119,20 @@ class Engine < ::Rails::Engine
       initializer "decidim_meetings.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_meetings.notification_settings" do
+        Decidim.notification_settings(:close_meeting_reminder) { |ns| ns.settings_area = :administrators }
+      end
+
+      initializer "decidim_meetings.register_reminders" do
+        Decidim.reminders_registry.register(:close_meeting) do |reminder_registry|
+          reminder_registry.generator_class_name = "Decidim::Meetings::CloseMeetingReminderGenerator"
+
+          reminder_registry.settings do |settings|
+            settings.attribute :reminder_times, type: :array, default: [3.days, 7.days]
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-meetings/lib/decidim/meetings/test/factories.rb b/decidim-meetings/lib/decidim/meetings/test/factories.rb
index 559abfae6fa72..dfc722c3e6e11 100644
--- a/decidim-meetings/lib/decidim/meetings/test/factories.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/factories.rb
@@ -86,6 +86,8 @@
       end
     end
 
+    trait(:participant_author) { not_official }
+
     trait :user_group_author do
       author do
         create(:user, organization: component.organization) if component
@@ -205,7 +207,7 @@
   factory :invite, class: "Decidim::Meetings::Invite" do
     meeting
     user
-    sent_at { Time.current - 1.day }
+    sent_at { 1.day.ago }
     accepted_at { nil }
     rejected_at { nil }
 
diff --git a/decidim-meetings/lib/decidim/meetings/test/notifications_handling.rb b/decidim-meetings/lib/decidim/meetings/test/notifications_handling.rb
index ca1c4f2b4fbe6..1732076a89fe6 100644
--- a/decidim-meetings/lib/decidim/meetings/test/notifications_handling.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/notifications_handling.rb
@@ -13,7 +13,7 @@
         .to receive(:generate_checksum).and_return "1234"
 
       expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
-        .to receive_message_chain(:set, :perform_later) # rubocop:disable RSpec/MessageChain
+        .to receive_message_chain(:set, :perform_later)
         .with(set: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
         .with(kind_of(Integer), "1234")
 
diff --git a/decidim-meetings/lib/decidim/meetings/test/translated_event.rb b/decidim-meetings/lib/decidim/meetings/test/translated_event.rb
index 8d761b07d7d86..8fd2dcafc69c6 100644
--- a/decidim-meetings/lib/decidim/meetings/test/translated_event.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/translated_event.rb
@@ -3,7 +3,7 @@
 shared_examples_for "a translated meeting event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
-    let(:body) { { "en": en_body, "machine_translations": { "ca": "C'est Sparta!" } } }
+    let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
     let(:translatable) { true }
@@ -13,7 +13,7 @@
     let(:resource) do
       create :meeting,
              component: meeting_component,
-             title: { "en": "A nice event", "machine_translations": { "ca": "Une belle event" } },
+             title: { en: "A nice event", machine_translations: { ca: "Une belle event" } },
              description: body
     end
 
diff --git a/decidim-meetings/lib/decidim/meetings/version.rb b/decidim-meetings/lib/decidim/meetings/version.rb
index 857fad944e0df..6e0137c406452 100644
--- a/decidim-meetings/lib/decidim/meetings/version.rb
+++ b/decidim-meetings/lib/decidim/meetings/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
index 92a872fe0db2d..f4002671c2fcf 100644
--- a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
@@ -6,7 +6,7 @@ module Decidim::Meetings
   describe Admin::CopyMeeting do
     subject { described_class.new(form, meeting) }
 
-    let(:meeting) { create :meeting }
+    let!(:meeting) { create :meeting }
 
     let(:current_user) { create :user, :admin, :confirmed, organization: meeting.organization }
     let(:address) { "address" }
@@ -43,7 +43,16 @@ module Decidim::Meetings
         private_meeting: meeting.private_meeting,
         transparent: meeting.transparent,
         current_organization: current_user.organization,
-        current_component: meeting.component
+        current_component: meeting.component,
+        online_meeting_url: meeting.online_meeting_url,
+        iframe_embed_type: meeting.iframe_embed_type,
+        iframe_access_level: meeting.iframe_access_level,
+        comments_enabled: meeting.comments_enabled,
+        comments_start_time: meeting.comments_start_time,
+        comments_end_time: meeting.comments_end_time,
+        registration_type: :on_this_platform,
+        registration_url: meeting.registration_url,
+        type_of_meeting: meeting.type_of_meeting
       )
     end
 
@@ -57,9 +66,9 @@ module Decidim::Meetings
 
     context "when everything is ok" do
       it "duplicates a meeting" do
-        expect { subject.call }.to change(Meeting, :count).by(2)
+        expect { subject.call }.to change(Meeting, :count).by(1)
 
-        old_meeting = Meeting.first
+        old_meeting = meeting
         new_meeting = Meeting.last
 
         expect(new_meeting.title["en"]).to eq("title")
@@ -78,6 +87,40 @@ module Decidim::Meetings
       it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
+
+      context "and saves the correct meeting type" do
+        context "with in_person meeting type" do
+          let!(:meeting) { create :meeting, :in_person }
+
+          it "duplicates an in_person meeting" do
+            expect { subject.call }.to change(Meeting, :count).by(1)
+            new_meeting = Meeting.last
+            expect(new_meeting.type_of_meeting).to eq(meeting.type_of_meeting)
+          end
+        end
+
+        context "with online meeting type" do
+          let!(:meeting) { create :meeting, :online }
+
+          it "duplicates an online meeting" do
+            expect { subject.call }.to change(Meeting, :count).by(1)
+            new_meeting = Meeting.last
+            expect(new_meeting.type_of_meeting).to eq(meeting.type_of_meeting)
+            expect(new_meeting.online_meeting_url).to eq(meeting.online_meeting_url)
+          end
+        end
+
+        context "with hybrid meeting type" do
+          let!(:meeting) { create :meeting, :hybrid }
+
+          it "duplicates a hybrid meeting" do
+            expect { subject.call }.to change(Meeting, :count).by(1)
+            new_meeting = Meeting.last
+            expect(new_meeting.type_of_meeting).to eq(meeting.type_of_meeting)
+            expect(new_meeting.online_meeting_url).to eq(meeting.online_meeting_url)
+          end
+        end
+      end
     end
 
     describe "events" do
diff --git a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
index 61ca54989f124..7e561d5bdb491 100644
--- a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
@@ -24,7 +24,6 @@ module Decidim::Meetings
     let(:online_meeting_url) { "http://decidim.org" }
     let(:registration_url) { "http://decidim.org" }
     let(:registration_type) { "on_this_platform" }
-    let(:available_slots) { 0 }
     let(:iframe_embed_type) { "embed_in_meeting_page" }
     let(:iframe_access_level) { "all" }
     let(:services) do
@@ -42,8 +41,6 @@ module Decidim::Meetings
     let(:services_to_persist) do
       services.map { |service| Admin::MeetingServiceForm.from_params(service) }
     end
-    let(:customize_registration_email) { true }
-    let(:registration_email_custom_content) { { "en" => "The registration email custom content." } }
 
     let(:form) do
       double(
@@ -66,12 +63,9 @@ module Decidim::Meetings
         current_component: current_component,
         current_organization: organization,
         registration_type: registration_type,
-        available_slots: available_slots,
         registration_url: registration_url,
         clean_type_of_meeting: type_of_meeting,
         online_meeting_url: online_meeting_url,
-        customize_registration_email: customize_registration_email,
-        registration_email_custom_content: registration_email_custom_content,
         iframe_embed_type: iframe_embed_type,
         comments_enabled: true,
         comments_start_time: nil,
@@ -136,13 +130,6 @@ module Decidim::Meetings
         expect(meeting.questionnaire).to be_a(Decidim::Forms::Questionnaire)
       end
 
-      it "sets the registration email related fields" do
-        subject.call
-
-        expect(meeting.customize_registration_email).to be true
-        expect(meeting.registration_email_custom_content).to eq(registration_email_custom_content)
-      end
-
       it "is created as unpublished" do
         subject.call
 
diff --git a/decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb b/decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb
index b3456369a5828..5be19aaa23580 100644
--- a/decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb
+++ b/decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb
@@ -14,7 +14,7 @@ module Decidim::Meetings
       it "exports the meeting registrations" do
         exporter_double = double(export: true)
         class_double = double(new: exporter_double)
-        expect(Decidim::Exporters)
+        allow(Decidim::Exporters)
           .to receive(:find_exporter)
           .with(format)
           .and_return(class_double)
diff --git a/decidim-meetings/spec/commands/admin/invite_user_to_join_meeting_spec.rb b/decidim-meetings/spec/commands/admin/invite_user_to_join_meeting_spec.rb
index b3423575037c7..72dcee09d0011 100644
--- a/decidim-meetings/spec/commands/admin/invite_user_to_join_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/invite_user_to_join_meeting_spec.rb
@@ -134,7 +134,7 @@ module Decidim::Meetings
 
     context "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-meetings/spec/commands/admin/update_agenda_spec.rb b/decidim-meetings/spec/commands/admin/update_agenda_spec.rb
index 488e03ab150c5..24a619d584d0b 100644
--- a/decidim-meetings/spec/commands/admin/update_agenda_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_agenda_spec.rb
@@ -55,7 +55,7 @@ module Decidim::Meetings
 
     context "when the form is not valid" do
       before do
-        expect(form).to receive(:valid?).and_return(false)
+        allow(form).to receive(:valid?).and_return(false)
       end
 
       it "is not valid" do
diff --git a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
index d366446edfdef..389175f85a625 100644
--- a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
@@ -28,9 +28,6 @@ module Decidim::Meetings
     let(:online_meeting_url) { "http://decidim.org" }
     let(:registration_url) { "http://decidim.org" }
     let(:registration_type) { "on_this_platform" }
-    let(:available_slots) { 0 }
-    let(:customize_registration_email) { true }
-    let(:registration_email_custom_content) { { "en" => "The registration email custom content." } }
     let(:iframe_embed_type) { "none" }
     let(:iframe_access_level) { nil }
 
@@ -54,12 +51,9 @@ module Decidim::Meetings
         current_user: user,
         current_organization: organization,
         registration_type: registration_type,
-        available_slots: available_slots,
         registration_url: registration_url,
         clean_type_of_meeting: type_of_meeting,
         online_meeting_url: online_meeting_url,
-        customize_registration_email: customize_registration_email,
-        registration_email_custom_content: registration_email_custom_content,
         iframe_embed_type: iframe_embed_type,
         comments_enabled: true,
         comments_start_time: nil,
@@ -111,13 +105,6 @@ module Decidim::Meetings
         end
       end
 
-      it "sets the registration email related fields" do
-        subject.call
-
-        expect(meeting.customize_registration_email).to be true
-        expect(meeting.registration_email_custom_content).to eq(registration_email_custom_content)
-      end
-
       it "sets iframe_access_level" do
         subject.call
 
@@ -161,12 +148,9 @@ module Decidim::Meetings
             current_user: user,
             current_organization: organization,
             registration_type: registration_type,
-            available_slots: available_slots,
             registration_url: registration_url,
             clean_type_of_meeting: type_of_meeting,
             online_meeting_url: online_meeting_url,
-            customize_registration_email: customize_registration_email,
-            registration_email_custom_content: registration_email_custom_content,
             iframe_embed_type: iframe_embed_type,
             comments_enabled: true,
             comments_start_time: nil,
diff --git a/decidim-meetings/spec/commands/admin/update_questionnaire_spec.rb b/decidim-meetings/spec/commands/admin/update_questionnaire_spec.rb
index 0604a5953c297..48642ed419d52 100644
--- a/decidim-meetings/spec/commands/admin/update_questionnaire_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_questionnaire_spec.rb
@@ -7,6 +7,7 @@ module Meetings
     module Admin
       describe UpdateQuestionnaire do
         let(:current_organization) { create(:organization) }
+        let(:user) { create :user, organization: current_organization }
         let(:participatory_process) { create(:participatory_process, organization: current_organization) }
         let(:current_component) { create :component, participatory_space: participatory_process, manifest_name: "meetings" }
         let(:meeting) { create :meeting, component: current_component }
@@ -71,18 +72,19 @@ module Admin
           QuestionnaireForm.from_params(
             questionnaire: form_params
           ).with_context(
-            current_organization: current_organization
+            current_organization: current_organization,
+            current_user: user
           )
         end
         let(:command) { described_class.new(form, questionnaire) }
 
         context "with a persisted poll and questionnaire" do
-          let(:poll) { create(:poll) }
+          let(:poll) { create(:poll, meeting: meeting) }
           let(:questionnaire) { create(:meetings_poll_questionnaire, questionnaire_for: poll) }
 
           describe "when the form is invalid" do
             before do
-              expect(form).to receive(:invalid?).and_return(true)
+              allow(form).to receive(:invalid?).and_return(true)
             end
 
             it "broadcasts invalid" do
@@ -111,6 +113,18 @@ module Admin
               expect(questionnaire.questions[1].question_type).to eq("multiple_option")
               expect(questionnaire.questions[1].max_choices).to eq(2)
             end
+
+            it "traces the action", versioning: true do
+              expect(Decidim.traceability)
+                .to receive(:perform_action!)
+                .with("update", Decidim::Meetings::Questionnaire, user, { meeting: meeting })
+                .and_call_original
+
+              expect { command.call }.to change(Decidim::ActionLog, :count)
+              action_log = Decidim::ActionLog.last
+              expect(action_log.action).to eq("update")
+              expect(action_log.version).to be_present
+            end
           end
 
           describe "when the questionnaire has an existing question" do
@@ -163,7 +177,7 @@ module Admin
 
           describe "when the form is invalid" do
             before do
-              expect(form).to receive(:invalid?).and_return(true)
+              allow(form).to receive(:invalid?).and_return(true)
             end
 
             it "broadcasts invalid" do
diff --git a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
index 6c2de7bf5768a..6cb81c76055a6 100644
--- a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
@@ -12,6 +12,8 @@ module Decidim::Meetings
     let(:registration_form_enabled) { true }
     let(:available_slots) { 10 }
     let(:reserved_slots) { 2 }
+    let(:customize_registration_email) { true }
+    let(:registration_email_custom_content) { { "en" => "The registration email custom content." } }
     let(:registration_terms) do
       {
         en: "A legal text",
@@ -26,6 +28,8 @@ module Decidim::Meetings
         registration_form_enabled: registration_form_enabled,
         available_slots: available_slots,
         reserved_slots: reserved_slots,
+        customize_registration_email: customize_registration_email,
+        registration_email_custom_content: registration_email_custom_content,
         registration_terms: registration_terms
       )
     end
@@ -49,6 +53,8 @@ module Decidim::Meetings
         expect(meeting.registration_form_enabled).to eq(registration_form_enabled)
         expect(meeting.available_slots).to eq(available_slots)
         expect(meeting.reserved_slots).to eq(reserved_slots)
+        expect(meeting.customize_registration_email).to be true
+        expect(meeting.registration_email_custom_content).to eq(registration_email_custom_content)
         expect(translated(meeting.registration_terms)).to eq "A legal text"
       end
     end
diff --git a/decidim-meetings/spec/commands/admin/validate_registration_code_spec.rb b/decidim-meetings/spec/commands/admin/validate_registration_code_spec.rb
index cc928b0cc379d..126c0687c052b 100644
--- a/decidim-meetings/spec/commands/admin/validate_registration_code_spec.rb
+++ b/decidim-meetings/spec/commands/admin/validate_registration_code_spec.rb
@@ -17,7 +17,7 @@ module Decidim::Meetings
 
     context "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-meetings/spec/commands/create_answer_spec.rb b/decidim-meetings/spec/commands/create_answer_spec.rb
index 80da07a3b6ff7..5a967735cd9b7 100644
--- a/decidim-meetings/spec/commands/create_answer_spec.rb
+++ b/decidim-meetings/spec/commands/create_answer_spec.rb
@@ -37,7 +37,7 @@ module Meetings
 
       describe "when the form is invalid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
diff --git a/decidim-meetings/spec/commands/create_meeting_spec.rb b/decidim-meetings/spec/commands/create_meeting_spec.rb
index a43ac5397a308..66d99615bb0a8 100644
--- a/decidim-meetings/spec/commands/create_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/create_meeting_spec.rb
@@ -157,15 +157,15 @@ module Decidim::Meetings
 
       it "schedules a upcoming meeting notification job 48h before start time" do
         meeting = instance_double(Meeting, id: 1, start_time: start_time, participatory_space: participatory_process)
-        expect(Decidim.traceability)
+        allow(Decidim.traceability)
           .to receive(:create!)
           .and_return(meeting)
 
         expect(meeting).to receive(:valid?)
         expect(meeting).to receive(:publish!)
-        expect(meeting).to receive(:to_signed_global_id).and_return "gid://Decidim::Meetings::Meeting/1"
+        allow(meeting).to receive(:to_signed_global_id).and_return "gid://Decidim::Meetings::Meeting/1"
 
-        expect(UpcomingMeetingNotificationJob)
+        allow(UpcomingMeetingNotificationJob)
           .to receive(:generate_checksum).and_return "1234"
 
         expect(UpcomingMeetingNotificationJob)
@@ -179,13 +179,13 @@ module Decidim::Meetings
 
       it "doesn't schedule an upcoming meeting notification if start time is in the past" do
         meeting = instance_double(Meeting, id: 1, start_time: 2.days.ago, participatory_space: participatory_process)
-        expect(Decidim.traceability)
+        allow(Decidim.traceability)
           .to receive(:create!)
           .and_return(meeting)
 
         expect(meeting).to receive(:valid?)
         expect(meeting).to receive(:publish!)
-        expect(meeting).to receive(:to_signed_global_id).and_return "gid://Decidim::Meetings::Meeting/1"
+        allow(meeting).to receive(:to_signed_global_id).and_return "gid://Decidim::Meetings::Meeting/1"
 
         expect(UpcomingMeetingNotificationJob).not_to receive(:generate_checksum)
         expect(UpcomingMeetingNotificationJob).not_to receive(:set)
diff --git a/decidim-meetings/spec/commands/join_meeting_spec.rb b/decidim-meetings/spec/commands/join_meeting_spec.rb
index 3eabff78d4e3c..f94dd12963e62 100644
--- a/decidim-meetings/spec/commands/join_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/join_meeting_spec.rb
@@ -22,7 +22,7 @@ module Decidim::Meetings
              questionnaire: questionnaire)
     end
 
-    let(:user) { create :user, :confirmed, organization: organization, email_on_notification: false }
+    let(:user) { create :user, :confirmed, organization: organization, notifications_sending_frequency: "none" }
 
     let(:registration_form) { Decidim::Meetings::JoinMeetingForm.new }
 
diff --git a/decidim-meetings/spec/commands/withdraw_meeting_spec.rb b/decidim-meetings/spec/commands/withdraw_meeting_spec.rb
index ffe0571d1b70e..ec85e8868077e 100644
--- a/decidim-meetings/spec/commands/withdraw_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/withdraw_meeting_spec.rb
@@ -27,7 +27,7 @@ module Meetings
 
         it "does not withdraw the meeting" do
           expect { command.call }.to broadcast(:invalid)
-          expect(meeting.state).to be(nil)
+          expect(meeting.state).to be_nil
         end
       end
     end
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/admin/registrations_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/admin/registrations_controller_spec.rb
index 8d83117c5ae51..ad0b90581c48e 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/admin/registrations_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/admin/registrations_controller_spec.rb
@@ -13,6 +13,7 @@
 
   let(:available_slots) { 0 }
   let(:reserved_slots) { 0 }
+
   let(:params) do
     {
       meeting_id: meeting.id,
diff --git a/decidim-meetings/spec/forms/admin/close_meeting_form_spec.rb b/decidim-meetings/spec/forms/admin/close_meeting_form_spec.rb
index 0f1684ee5830f..f28e829c8ade0 100644
--- a/decidim-meetings/spec/forms/admin/close_meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/close_meeting_form_spec.rb
@@ -58,7 +58,8 @@ module Decidim::Meetings
     describe "when attendees_count is invalid" do
       let(:attendees_count) { "a" }
 
-      it { is_expected.not_to be_valid }
+      # The value is cast to the correct type so "a" becomes 0 which is valid.
+      it { is_expected.to be_valid }
     end
 
     describe "when contributions_count is missing" do
@@ -70,7 +71,8 @@ module Decidim::Meetings
     describe "when contributions_count is invalid" do
       let(:contributions_count) { "a" }
 
-      it { is_expected.not_to be_valid }
+      # The value is cast to the correct type so "a" becomes 0 which is valid.
+      it { is_expected.to be_valid }
     end
 
     describe "when minutes attributes are missing" do
diff --git a/decidim-meetings/spec/forms/admin/meeting_copy_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_copy_form_spec.rb
deleted file mode 100644
index a79e7e2f5c3b5..0000000000000
--- a/decidim-meetings/spec/forms/admin/meeting_copy_form_spec.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Meetings
-  describe Admin::MeetingCopyForm do
-    subject(:form) { described_class.from_params(attributes).with_context(context) }
-
-    let(:organization) { create(:organization, available_locales: [:en]) }
-    let(:context) do
-      {
-        current_organization: organization,
-        current_component: current_component,
-        current_participatory_space: participatory_process
-      }
-    end
-    let(:participatory_process) { create :participatory_process, organization: organization }
-    let(:current_component) { create :component, participatory_space: participatory_process, manifest_name: "meetings" }
-    let(:title) do
-      Decidim::Faker::Localized.sentence(word_count: 3)
-    end
-    let(:description) do
-      Decidim::Faker::Localized.sentence(word_count: 3)
-    end
-    let(:location) do
-      Decidim::Faker::Localized.sentence(word_count: 3)
-    end
-    let(:location_hints) do
-      Decidim::Faker::Localized.sentence(word_count: 3)
-    end
-    let(:service_objects) do
-      build_list(:service, 2)
-    end
-    let(:services) do
-      service_objects.map(&:attributes)
-    end
-    let(:address) { "Carrer Pic de Peguera 15, 17003 Girona" }
-    let(:latitude) { 40.1234 }
-    let(:longitude) { 2.1234 }
-    let(:start_time) { 2.days.from_now }
-    let(:end_time) { 2.days.from_now + 4.hours }
-    let(:private_meeting) { false }
-    let(:transparent) { true }
-    let(:type_of_meeting) { :in_person }
-    let(:online_meeting_url) { nil }
-    let(:attributes) do
-      {
-        title_en: title[:en],
-        description_en: description[:en],
-        location_en: location[:en],
-        location_hints_en: location_hints[:en],
-        address: address,
-        start_time: start_time,
-        end_time: end_time,
-        private_meeting: private_meeting,
-        transparent: transparent,
-        services: services,
-        type_of_meeting: type_of_meeting,
-        online_meeting_url: online_meeting_url
-      }
-    end
-
-    before do
-      stub_geocoding(address, [latitude, longitude])
-    end
-
-    it { is_expected.to be_valid }
-
-    describe "when title is missing" do
-      let(:title) { { en: nil } }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when description is missing" do
-      let(:description) { { en: nil } }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when location is missing in an in person meeting" do
-      let(:location) { { en: nil } }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when location is missing in an hybrid meeting" do
-      let(:location) { { en: nil } }
-      let(:type_of_meeting) { :hybrid }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when location is missing in an online meeting" do
-      let(:location) { { en: nil } }
-      let(:type_of_meeting) { :online }
-
-      it { is_expected.to be_valid }
-    end
-
-    describe "when address is missing in an in person meeting" do
-      let(:address) { nil }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when address is missing in an hybrid meeting" do
-      let(:address) { nil }
-      let(:type_of_meeting) { :hybrid }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when address is missing in an online meeting" do
-      let(:address) { nil }
-      let(:type_of_meeting) { :online }
-
-      it { is_expected.to be_valid }
-    end
-
-    describe "when start_time is missing" do
-      let(:start_time) { nil }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when end_time is missing" do
-      let(:end_time) { nil }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when start_time is after end_time" do
-      let(:start_time) { end_time + 3.days }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when end_time is before start_time" do
-      let(:end_time) { start_time - 3.days }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    describe "when start_time is equal to start_time" do
-      let(:start_time) { end_time }
-
-      it { is_expected.not_to be_valid }
-    end
-
-    it "validates address and store its coordinates" do
-      expect(subject).to be_valid
-      expect(subject.latitude).to eq(latitude)
-      expect(subject.longitude).to eq(longitude)
-    end
-
-    it "properly maps services from model" do
-      meeting = create(:meeting, :with_services, services: service_objects)
-
-      services = described_class.from_model(meeting).services
-      expect(services).to all be_an(Admin::MeetingServiceForm)
-      expect(services.map(&:title_en)).to eq(services.map(&:title_en))
-    end
-
-    describe "services_to_persist" do
-      subject { form.services_to_persist }
-
-      let(:services) do
-        [
-          { title: { en: "First service" }, description: { en: "First description" } },
-          { title: { en: "Second service" }, description: { en: "Second description" }, deleted: true },
-          { title: { en: "Third service" }, description: { en: "Third description" } }
-        ]
-      end
-
-      it "only returns non deleted services" do
-        expect(subject.size).to eq(2)
-        expect(subject.map(&:title_en)).to eq(["First service", "Third service"])
-      end
-    end
-
-    describe "number_of_services" do
-      subject { form.number_of_services }
-
-      it { is_expected.to eq(services.size) }
-    end
-  end
-end
diff --git a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
index 5f05fd782bc0d..662ee53e8388c 100644
--- a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
@@ -157,9 +157,9 @@ module Decidim::Meetings
     it "properly maps services from model" do
       meeting = create(:meeting, :with_services, services: services)
 
-      services = described_class.from_model(meeting).services
-      expect(services).to all be_an(Admin::MeetingServiceForm)
-      expect(services.map(&:title_en)).to eq(services.map(&:title_en))
+      local_services = described_class.from_model(meeting).services
+      expect(local_services).to all be_an(Admin::MeetingServiceForm)
+      expect(local_services.map(&:title_en)).to eq(services.map { |s| s["title"]["en"] })
     end
 
     it "properly maps category id from model" do
@@ -217,13 +217,6 @@ module Decidim::Meetings
       it { is_expected.not_to be_valid }
     end
 
-    describe "when registration type is on this platform and available slots are missing" do
-      let(:available_slots) { nil }
-      let(:registration_type) { "on_this_platform" }
-
-      it { is_expected.not_to be_valid }
-    end
-
     describe "when registration url is missing and registration type of meeting is on different platform" do
       let(:registration_type) { "on_different_platform" }
       let(:registration_url) { nil }
diff --git a/decidim-meetings/spec/forms/admin/meeting_registration_invite_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_registration_invite_form_spec.rb
index 1d863de5248e5..2983c273094a1 100644
--- a/decidim-meetings/spec/forms/admin/meeting_registration_invite_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/meeting_registration_invite_form_spec.rb
@@ -31,13 +31,13 @@ module Decidim::Meetings
     end
 
     context "when name is missing" do
-      let(:name) {}
+      let(:name) { nil }
 
       it { is_expected.to be_invalid }
     end
 
     context "when email is missing" do
-      let(:email) {}
+      let(:email) { nil }
 
       it { is_expected.to be_invalid }
     end
@@ -73,13 +73,13 @@ module Decidim::Meetings
         context "when the user does not exist" do
           let(:user_id) { 999_999 }
 
-          it { is_expected.to eq(nil) }
+          it { is_expected.to be_nil }
         end
 
         context "when the user is from another organization" do
           let(:user_id) { create(:user).id }
 
-          it { is_expected.to eq(nil) }
+          it { is_expected.to be_nil }
         end
       end
     end
diff --git a/decidim-meetings/spec/forms/close_meeting_form_spec.rb b/decidim-meetings/spec/forms/close_meeting_form_spec.rb
index 58c4e40cd78a4..c77362c5c93a1 100644
--- a/decidim-meetings/spec/forms/close_meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/close_meeting_form_spec.rb
@@ -59,7 +59,8 @@ module Decidim::Meetings
     describe "when attendees_count is invalid" do
       let(:attendees_count) { "a" }
 
-      it { is_expected.not_to be_valid }
+      # The value is cast to the correct type so "a" becomes 0 which is valid.
+      it { is_expected.to be_valid }
     end
 
     describe "map_model" do
diff --git a/decidim-meetings/spec/helpers/application_helper_spec.rb b/decidim-meetings/spec/helpers/application_helper_spec.rb
new file mode 100644
index 0000000000000..d48798cb942a5
--- /dev/null
+++ b/decidim-meetings/spec/helpers/application_helper_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Meetings
+    describe ApplicationHelper do
+      describe "#render_meeting_body" do
+        subject { helper.render_meeting_body(meeting) }
+
+        before do
+          allow(helper).to receive(:present).with(meeting).and_return(Decidim::Meetings::MeetingPresenter.new(meeting))
+          allow(helper).to receive(:current_organization).and_return(meeting.organization)
+          helper.instance_variable_set(:@meeting, meeting)
+        end
+
+        let(:description) { "<ul><li>First</li><li>Second</li><li>Third</li></ul><script>alert('OK');</script>" }
+        let(:meeting_trait) { :not_official }
+        let(:meeting) { create(:meeting, meeting_trait, description: { "en" => description }) }
+
+        it "renders a sanitized body" do
+          expect(subject).to eq(
+            <<~HTML.strip
+              <div>• First
+              <br />• Second
+              <br />• Third
+              </div>
+            HTML
+          )
+        end
+
+        context "with official meeting" do
+          let(:meeting_trait) { :official }
+
+          it "renders a sanitized body" do
+            expect(subject).to eq(
+              <<~HTML.strip
+                <div class="ql-editor-display"><ul>
+                <li>First</li>
+                <li>Second</li>
+                <li>Third</li>
+                </ul>alert('OK');</div>
+              HTML
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/jobs/decidim/meetings/send_close_meeting_reminder_job_spec.rb b/decidim-meetings/spec/jobs/decidim/meetings/send_close_meeting_reminder_job_spec.rb
new file mode 100644
index 0000000000000..894086686f8b9
--- /dev/null
+++ b/decidim-meetings/spec/jobs/decidim/meetings/send_close_meeting_reminder_job_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Meetings::SendCloseMeetingReminderJob do
+  subject { described_class }
+
+  let(:organization) { create(:organization) }
+  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:component) { create(:component, :published, manifest_name: :meetings, participatory_space: participatory_process) }
+  let(:user) { create(:user, organization: organization, email: "user@example.org") }
+  let(:reminder) { create(:reminder, user: user, component: component) }
+  let(:mailer) { double :mailer }
+  let(:mailer_class) { Decidim::Meetings::CloseMeetingReminderMailer }
+
+  context "when everything is OK" do
+    let(:meeting) { create(:meeting, :published, component: component) }
+    let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: meeting) }
+
+    it "sends an email and creates reminder delivery" do
+      allow(mailer_class)
+        .to receive(:close_meeting_reminder).with(reminder_record).and_return(mailer)
+      expect(mailer)
+        .to receive(:deliver_now)
+
+      expect { subject.perform_now(reminder_record) }.to change(Decidim::ReminderDelivery, :count).to(1)
+    end
+  end
+
+  context "when the meeting is closed" do
+    let(:meeting) { create(:meeting, :published, :closed, component: component) }
+    let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: meeting) }
+
+    it "doesn't send the email" do
+      expect(mailer_class)
+        .not_to receive(:close_meeting_reminder)
+
+      subject.perform_now(reminder_record)
+    end
+  end
+end
diff --git a/decidim-meetings/spec/lib/decidim/content_parsers/meeting_parser_spec.rb b/decidim-meetings/spec/lib/decidim/content_parsers/meeting_parser_spec.rb
index aaf9bbc8afef7..89c7790627ef7 100644
--- a/decidim-meetings/spec/lib/decidim/content_parsers/meeting_parser_spec.rb
+++ b/decidim-meetings/spec/lib/decidim/content_parsers/meeting_parser_spec.rb
@@ -145,8 +145,8 @@ def meeting_url(meeting)
 
       def changed_meeting_url(meeting)
         url = meeting_url(meeting)
-        regex = %r{http(s)?://my.host/(.*)}
-        url_path = regex.match(url)[2]
+        regex = %r{http(s)?://my.host(:[0-9]+)?/(.*)}
+        url_path = regex.match(url)[3]
         "http://my.another.host/#{url_path}"
       end
     end
diff --git a/decidim-meetings/spec/lib/decidim/content_renderers/meeting_renderer_spec.rb b/decidim-meetings/spec/lib/decidim/content_renderers/meeting_renderer_spec.rb
index 5f8e171af41d9..f67e332d09da2 100644
--- a/decidim-meetings/spec/lib/decidim/content_renderers/meeting_renderer_spec.rb
+++ b/decidim-meetings/spec/lib/decidim/content_renderers/meeting_renderer_spec.rb
@@ -38,17 +38,17 @@ module ContentRenderers
         end
 
         context "when content has many links" do
-          let(:meeting_1) { create(:meeting) }
-          let(:meeting_2) { create(:meeting) }
-          let(:meeting_3) { create(:meeting) }
+          let(:meeting1) { create(:meeting) }
+          let(:meeting2) { create(:meeting) }
+          let(:meeting3) { create(:meeting) }
           let(:content) do
-            gid1 = meeting_1.to_global_id
-            gid2 = meeting_2.to_global_id
-            gid3 = meeting_3.to_global_id
+            gid1 = meeting1.to_global_id
+            gid2 = meeting2.to_global_id
+            gid3 = meeting3.to_global_id
             "This content references the following proposals: #{gid1}, #{gid2} and #{gid3}. Great?I like them!"
           end
 
-          it { is_expected.to eq("This content references the following proposals: #{resource_as_html_link(meeting_1)}, #{resource_as_html_link(meeting_2)} and #{resource_as_html_link(meeting_3)}. Great?I like them!") }
+          it { is_expected.to eq("This content references the following proposals: #{resource_as_html_link(meeting1)}, #{resource_as_html_link(meeting2)} and #{resource_as_html_link(meeting3)}. Great?I like them!") }
         end
       end
 
diff --git a/decidim-meetings/spec/lib/decidim/meetings/component_spec.rb b/decidim-meetings/spec/lib/decidim/meetings/component_spec.rb
index 7b65bd1b83aa4..5719a117ad6ce 100644
--- a/decidim-meetings/spec/lib/decidim/meetings/component_spec.rb
+++ b/decidim-meetings/spec/lib/decidim/meetings/component_spec.rb
@@ -12,7 +12,7 @@
       it "destroys the component" do
         expect do
           Decidim::Admin::DestroyComponent.call(component, current_user)
-        end.to change { Decidim::Component.count }.by(-1)
+        end.to change(Decidim::Component, :count).by(-1)
 
         expect(component).to be_destroyed
       end
@@ -76,14 +76,14 @@
       let(:stats_name) { :followers_count }
 
       before do
-        # rubocop:disable FactoryBot/CreateList
+        # rubocop:disable RSpec/FactoryBot/CreateList
         2.times do
           create(:follow, followable: meeting, user: build(:user, organization: organization))
         end
         3.times do
           create(:follow, followable: hidden_meeting, user: build(:user, organization: organization))
         end
-        # rubocop:enable FactoryBot/CreateList
+        # rubocop:enable RSpec/FactoryBot/CreateList
       end
 
       it "counts the followers from visible meetings" do
diff --git a/decidim-meetings/spec/lib/decidim/meetings/meeting_acts_as_author_spec.rb b/decidim-meetings/spec/lib/decidim/meetings/meeting_acts_as_author_spec.rb
index 9ea304d585f5d..d37a1404c9597 100644
--- a/decidim-meetings/spec/lib/decidim/meetings/meeting_acts_as_author_spec.rb
+++ b/decidim-meetings/spec/lib/decidim/meetings/meeting_acts_as_author_spec.rb
@@ -4,7 +4,7 @@
 
 module Decidim
   describe User do
-    let(:subject) { create(:meeting) }
+    subject { create(:meeting) }
 
     it_behaves_like "acts as author"
   end
diff --git a/decidim-meetings/spec/lib/decidim/meetings/registrations/code_generator_spec.rb b/decidim-meetings/spec/lib/decidim/meetings/registrations/code_generator_spec.rb
index 587c1c8287317..a6dcac2f6051f 100644
--- a/decidim-meetings/spec/lib/decidim/meetings/registrations/code_generator_spec.rb
+++ b/decidim-meetings/spec/lib/decidim/meetings/registrations/code_generator_spec.rb
@@ -39,7 +39,7 @@ module Registrations
           end
 
           it "returns a code where all chars are valid" do
-            code.split("").each do |char|
+            code.chars.each do |char|
               expect(CodeGenerator::ALPHABET).to include char
             end
           end
diff --git a/decidim-meetings/spec/lib/tasks/decidim_meetings_clean_registration_forms_spec.rb b/decidim-meetings/spec/lib/tasks/decidim_meetings_clean_registration_forms_spec.rb
index 00ce58a253e56..f7d432b9bcd2a 100644
--- a/decidim-meetings/spec/lib/tasks/decidim_meetings_clean_registration_forms_spec.rb
+++ b/decidim-meetings/spec/lib/tasks/decidim_meetings_clean_registration_forms_spec.rb
@@ -15,7 +15,7 @@
   end
 
   context "when a meeting has finished before the given threshold" do
-    let!(:meeting) { create(:meeting, end_time: Time.current - 4.months) }
+    let!(:meeting) { create(:meeting, end_time: 4.months.ago) }
     let(:questionnaire) { meeting.questionnaire }
 
     it "removes related questionnaires and answers but not the meeting itself" do
@@ -28,7 +28,7 @@
   end
 
   context "when a meeting has finished after the given threshold" do
-    let!(:meeting) { create(:meeting, end_time: Time.current - 2.months) }
+    let!(:meeting) { create(:meeting, end_time: 2.months.ago) }
     let(:questionnaire) { meeting.questionnaire }
 
     it "does not remove anything" do
diff --git a/decidim-meetings/spec/mailers/close_meeting_reminder_mailer_spec.rb b/decidim-meetings/spec/mailers/close_meeting_reminder_mailer_spec.rb
new file mode 100644
index 0000000000000..7b504db10a8bc
--- /dev/null
+++ b/decidim-meetings/spec/mailers/close_meeting_reminder_mailer_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Meetings
+  describe CloseMeetingReminderMailer, type: :mailer do
+    include ActionView::Helpers::SanitizeHelper
+
+    let(:organization) { create(:organization) }
+    let(:participatory_process) { create(:participatory_process, organization: organization) }
+    let(:component) { create(:component, :published, manifest_name: :meetings, participatory_space: participatory_process) }
+    let(:user) { create(:user, organization: organization, email: "user@example.org") }
+    let(:meeting) { create(:meeting, :published, component: component) }
+    let(:reminder) { create(:reminder, user: user, component: component) }
+    let!(:reminder_record) { create(:reminder_record, reminder: reminder, remindable: meeting) }
+
+    describe "when sending the email" do
+      let(:mail) { described_class.close_meeting_reminder(reminder_record) }
+
+      it "sends to the correct email address" do
+        expect(mail.to).to eq(["user@example.org"])
+      end
+
+      it "parses the subject" do
+        expect(mail.subject).to eq("You can now close your meeting with a report on the #{organization.name} platform")
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/mailers/registration_mailer_spec.rb b/decidim-meetings/spec/mailers/registration_mailer_spec.rb
index dd3e53924e4d1..56446018c8a39 100644
--- a/decidim-meetings/spec/mailers/registration_mailer_spec.rb
+++ b/decidim-meetings/spec/mailers/registration_mailer_spec.rb
@@ -15,7 +15,7 @@ module Decidim::Meetings
     let(:mail) { described_class.confirmation(user, meeting, registration) }
 
     describe "confirmation" do
-      let(:subject) { "La teva inscripció a la trobada ha estat confirmada" }
+      let(:mail_subject) { "La teva inscripció a la trobada ha estat confirmada" }
       let(:default_subject) { "Your meeting's registration has been confirmed" }
 
       let(:body) { "arxiu adjunt" }
diff --git a/decidim-meetings/spec/models/meeting_spec.rb b/decidim-meetings/spec/models/meeting_spec.rb
index e0ecdbc32b855..ec0fb86a54981 100644
--- a/decidim-meetings/spec/models/meeting_spec.rb
+++ b/decidim-meetings/spec/models/meeting_spec.rb
@@ -66,9 +66,8 @@ module Decidim::Meetings
       end
     end
 
-    describe "#visible_meeting_for" do
-      subject { Decidim::Meetings::Meeting.visible_meeting_for(user) }
-
+    describe "#visible_for" do
+      subject { Decidim::Meetings::Meeting.visible_for(user) }
       let(:meeting) { create :meeting, :published }
       let(:user) { create :user, organization: meeting.component.organization }
 
@@ -103,13 +102,13 @@ module Decidim::Meetings
       context "when registrations are disabled" do
         let(:meeting) { build :meeting, registrations_enabled: false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when meeting is closed" do
         let(:meeting) { build :meeting, :closed }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when the user cannot participate to the meeting" do
@@ -119,13 +118,13 @@ module Decidim::Meetings
           allow(meeting).to receive(:can_participate?).and_return(false)
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when everything is OK" do
         let(:meeting) { build :meeting, registrations_enabled: true }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
 
@@ -184,13 +183,13 @@ module Decidim::Meetings
       context "when registrations are disabled" do
         let(:meeting) { build :meeting, registrations_enabled: false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when meeting is closed" do
         let(:meeting) { build :meeting, :closed }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when the user cannot participate to the meeting" do
@@ -200,20 +199,20 @@ module Decidim::Meetings
           allow(meeting).to receive(:can_register_invitation?).and_return(false)
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when everything is OK" do
         let(:meeting) { build :meeting, registrations_enabled: true }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when no user on register process" do
         let(:meeting) { build :meeting, registrations_enabled: true, private_meeting: true, transparent: false }
         let(:user) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user has invitation to register" do
@@ -222,14 +221,14 @@ module Decidim::Meetings
 
         it "allows the user to join the meeting" do
           meeting.invites << invite
-          expect(subject).to eq true
+          expect(subject).to be true
         end
       end
 
       context "when user has no invitation to register" do
         let(:meeting) { build :meeting, registrations_enabled: true, private_meeting: true, transparent: false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -384,7 +383,7 @@ module Decidim::Meetings
 
       context "when the pad is not visible" do
         before do
-          expect(meeting).to receive(:pad_is_visible?).and_return(false)
+          allow(meeting).to receive(:pad_is_visible?).and_return(false)
         end
 
         it "returns false" do
diff --git a/decidim-meetings/spec/permissions/decidim/meetings/admin/permissions_spec.rb b/decidim-meetings/spec/permissions/decidim/meetings/admin/permissions_spec.rb
index c29eba342002a..6a4517f2523b8 100644
--- a/decidim-meetings/spec/permissions/decidim/meetings/admin/permissions_spec.rb
+++ b/decidim-meetings/spec/permissions/decidim/meetings/admin/permissions_spec.rb
@@ -20,7 +20,7 @@
   let(:meeting) { create :meeting, :official, component: meeting_component }
   let(:agenda) { create :agenda }
   let(:questionnaire) { create :questionnaire }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:registrations_enabled) { true }
   let(:action) do
     { scope: :admin, action: action_name, subject: action_subject }
@@ -32,37 +32,37 @@
 
   shared_examples "action requiring a meeting" do
     context "when meeting is present" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when meeting is missing" do
       let(:meeting) { nil }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
   shared_examples "action requiring an agenda" do
     context "when agenda is present" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when agenda is missing" do
       let(:agenda) { nil }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
   shared_examples "action requiring a questionnaire" do
     context "when registration form is present" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when registration form is missing" do
       let(:questionnaire) { nil }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -97,13 +97,13 @@
       let(:meeting) { create :meeting, :not_official, component: meeting_component }
       let(:action_name) { :update }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when creating a meeting" do
       let(:action_name) { :create }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when closing a meeting" do
@@ -139,7 +139,7 @@
       context "when the meeting registrations are closed" do
         let(:meeting) { create :meeting, registrations_enabled: false, component: meeting_component }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
 
@@ -196,7 +196,7 @@
       context "when poll is missing" do
         let(:poll) { nil }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
diff --git a/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb b/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
index 425011d5748af..caa322d594a5a 100644
--- a/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
+++ b/decidim-meetings/spec/permissions/decidim/meetings/permissions_spec.rb
@@ -20,7 +20,7 @@
   end
   let(:meeting_component) { create :meeting_component }
   let(:meeting) { create :meeting, component: meeting_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:poll) { create :poll, meeting: meeting }
   let(:poll_questionnaire) { create :meetings_poll_questionnaire, questionnaire_for: poll }
   let(:question) { create :meetings_poll_question, questionnaire: poll_questionnaire }
@@ -56,13 +56,13 @@
     end
 
     context "when question not answered" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when question answered" do
       let!(:answer) { create :meetings_poll_answer, user: user, question: question, questionnaire: poll_questionnaire }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -72,13 +72,13 @@
     end
 
     context "when user is not admin" do
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user is admin" do
       let(:user) { admin_user }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -97,13 +97,13 @@
     context "when meeting can't be joined" do
       let(:can_be_joined) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when meeting can be joined" do
       let(:can_be_joined) { true }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -122,13 +122,13 @@
     context "when meeting can't be joined" do
       let(:can_be_registered) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when meeting can be joined" do
       let(:can_be_registered) { true }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -140,13 +140,13 @@
     context "when meeting author is the user trying to withdraw" do
       let(:meeting) { create :meeting, author: user, component: meeting_component }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when trying by another user" do
       let(:user) { build :user }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -164,11 +164,11 @@
     context "when registrations are disabled" do
       let(:registrations_enabled) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user is authorized" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -186,11 +186,11 @@
     context "when registrations are disabled" do
       let(:registrations_enabled) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has not been invited" do
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user has been invited" do
@@ -198,7 +198,7 @@
         meeting.invites << create(:invite, user: user, meeting: meeting)
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -208,7 +208,7 @@
     end
 
     context "when setting is enabled" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when setting is disabled" do
@@ -216,7 +216,7 @@
         double(creation_enabled_for_participants?: false)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -227,18 +227,18 @@
 
     context "when setting is enabled" do
       context "when user is not the author" do
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is the author" do
         let(:meeting) { create :meeting, author: user, component: meeting_component }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
 
         context "when meeting is closed" do
           let(:meeting) { create :meeting, :closed, author: user, component: meeting_component }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
       end
     end
@@ -248,7 +248,7 @@
         double(creation_enabled_for_participants?: false)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -259,7 +259,7 @@
 
     context "when setting is enabled" do
       context "when user is not the author" do
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when user is the author" do
@@ -268,7 +268,7 @@
         context "when meeting is closed" do
           let(:closed_at) { Time.current }
 
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when meeting is not closed" do
@@ -279,7 +279,7 @@
               allow(meeting).to receive(:past?).and_return(false)
             end
 
-            it { is_expected.to eq false }
+            it { is_expected.to be false }
           end
 
           context "when meeting did finish" do
@@ -287,7 +287,7 @@
               allow(meeting).to receive(:past?).and_return(true)
             end
 
-            it { is_expected.to eq true }
+            it { is_expected.to be true }
           end
         end
       end
@@ -298,7 +298,7 @@
         double(creation_enabled_for_participants?: false)
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 end
diff --git a/decidim-meetings/spec/presenters/decidim/meetings/meeting_presenter_spec.rb b/decidim-meetings/spec/presenters/decidim/meetings/meeting_presenter_spec.rb
index a665943607a4d..3025b8cd042f7 100644
--- a/decidim-meetings/spec/presenters/decidim/meetings/meeting_presenter_spec.rb
+++ b/decidim-meetings/spec/presenters/decidim/meetings/meeting_presenter_spec.rb
@@ -39,7 +39,7 @@ module Decidim::Meetings
 
         it "returns an empty array and does not call authored_proposals" do
           expect(meeting).not_to receive(:authored_proposals)
-          expect(subject).to be nil
+          expect(subject).to be_nil
         end
       end
     end
@@ -86,8 +86,8 @@ module Decidim::Meetings
         expect(meeting.description["machine_translations"]["es"]).to match(/gid:/)
 
         presented_description = presented_meeting.description(all_locales: true)
-        expect(presented_description["en"]).to eq("<div class=\"ql-editor ql-reset-decidim\">Description #description</div>")
-        expect(presented_description["machine_translations"]["es"]).to eq("<div class=\"ql-editor ql-reset-decidim\">Description in Spanish #description</div>")
+        expect(presented_description["en"]).to eq("Description #description")
+        expect(presented_description["machine_translations"]["es"]).to eq("Description in Spanish #description")
       end
 
       context "when sanitizes any HTML input" do
diff --git a/decidim-meetings/spec/queries/decidim/meetings/questionnaire_user_answers_spec.rb b/decidim-meetings/spec/queries/decidim/meetings/questionnaire_user_answers_spec.rb
index 50ee0f37531c3..ccd2cc271d170 100644
--- a/decidim-meetings/spec/queries/decidim/meetings/questionnaire_user_answers_spec.rb
+++ b/decidim-meetings/spec/queries/decidim/meetings/questionnaire_user_answers_spec.rb
@@ -6,8 +6,8 @@
   subject { described_class.new(questionnaire) }
 
   let(:current_organization) { create(:organization) }
-  let(:user_1) { create :user, organization: meeting_component.organization }
-  let(:user_2) { create :user, organization: meeting_component.organization }
+  let(:user1) { create :user, organization: meeting_component.organization }
+  let(:user2) { create :user, organization: meeting_component.organization }
   let(:meeting_component) { create :meeting_component }
   let(:meeting) { create :meeting, component: meeting_component }
   let(:poll) { create :poll, meeting: meeting }
@@ -18,15 +18,15 @@
       create(:meetings_poll_question, questionnaire: questionnaire, position: 1)
     ]
   end
-  let!(:answers_user_1) { questions.map { |question| create(:meetings_poll_answer, question: question, user: user_1, questionnaire: questionnaire) } }
-  let!(:answers_user_2) { questions.map { |question| create(:meetings_poll_answer, question: question, user: user_2, questionnaire: questionnaire) } }
+  let!(:answers_user1) { questions.map { |question| create(:meetings_poll_answer, question: question, user: user1, questionnaire: questionnaire) } }
+  let!(:answers_user2) { questions.map { |question| create(:meetings_poll_answer, question: question, user: user2, questionnaire: questionnaire) } }
 
   it "returns the user answers for each user" do
     result = subject.query
 
     expect(result).to contain_exactly(
-      [answers_user_1.last, answers_user_1.first],
-      [answers_user_2.last, answers_user_2.first]
+      [answers_user1.last, answers_user1.first],
+      [answers_user2.last, answers_user2.first]
     )
   end
 end
diff --git a/decidim-meetings/spec/requests/meeting_directory_search_spec.rb b/decidim-meetings/spec/requests/meeting_directory_search_spec.rb
new file mode 100644
index 0000000000000..246f1ecefb427
--- /dev/null
+++ b/decidim-meetings/spec/requests/meeting_directory_search_spec.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Meeting directory search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:organization) { create(:organization) }
+  let!(:components) { create_list(:component, 3, manifest_name: "meetings", organization: organization) }
+  let(:user) { create :user, :confirmed, organization: organization }
+
+  let(:participatory_space) { components.first.participatory_space }
+  let!(:category1) { create :category, participatory_space: participatory_space }
+  let!(:category2) { create :category, participatory_space: participatory_space }
+  let!(:child_category) { create :category, participatory_space: participatory_space, parent: category2 }
+  let!(:meeting1) { create(:meeting, :published, component: components.second) }
+  let!(:meeting2) { create(:meeting, :published, component: components.first, category: category1) }
+  let!(:meeting3) { create(:meeting, :published, component: components.first, category: category2) }
+  let!(:meeting4) { create(:meeting, :published, component: components.first, category: child_category) }
+  let!(:meeting5) { create(:meeting, :published, component: components.third) }
+
+  let(:filter_params) { {} }
+  let(:request_path) { engine_routes.meetings_path }
+  let(:engine_routes) { Decidim::Meetings::DirectoryEngine.routes.url_helpers }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all meetings without any filters" do
+    expect(subject).to include(translated(meeting1.title))
+    expect(subject).to include(translated(meeting2.title))
+    expect(subject).to include(translated(meeting3.title))
+    expect(subject).to include(translated(meeting4.title))
+    expect(subject).to include(translated(meeting5.title))
+  end
+
+  context "when filtering by category" do
+    let(:filter_params) { { with_any_global_category: category_ids } }
+
+    context "and no category filter is present" do
+      let(:category_ids) { nil }
+
+      it "displays all resources" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+        expect(subject).to include(translated(meeting3.title))
+        expect(subject).to include(translated(meeting4.title))
+        expect(subject).to include(translated(meeting5.title))
+      end
+    end
+
+    context "and a category is selected" do
+      let(:category_ids) { [category2.id] }
+
+      it "displays only resources for that category and its children" do
+        expect(subject).not_to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+        expect(subject).to include(translated(meeting3.title))
+        expect(subject).to include(translated(meeting4.title))
+        expect(subject).not_to include(translated(meeting5.title))
+      end
+    end
+
+    context "and a subcategory is selected" do
+      let(:category_ids) { [child_category.id] }
+
+      it "displays only resources for that category" do
+        expect(subject).not_to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).to include(translated(meeting4.title))
+        expect(subject).not_to include(translated(meeting5.title))
+      end
+    end
+
+    context "and a participatory process is selected" do
+      let(:value) { participatory_space.class.name.gsub("::", "__") + participatory_space.id.to_s }
+      let(:category_ids) { [value] }
+
+      it "displays only resources for that participatory_process - all categories and sub-categories" do
+        expect(subject).not_to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+        expect(subject).to include(translated(meeting3.title))
+        expect(subject).to include(translated(meeting4.title))
+        expect(subject).not_to include(translated(meeting5.title))
+      end
+    end
+
+    context "and the provided category is `without`" do
+      let(:category_ids) { ["without"] }
+
+      it "returns resources without a category" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).not_to include(translated(meeting4.title))
+        expect(subject).to include(translated(meeting5.title))
+      end
+    end
+
+    context "and the provided category is `without` or some category id" do
+      let(:category_ids) { ["without", category1.id] }
+
+      it "returns resources without a category and with the selected category" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).not_to include(translated(meeting4.title))
+        expect(subject).to include(translated(meeting5.title))
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/requests/meeting_search_spec.rb b/decidim-meetings/spec/requests/meeting_search_spec.rb
new file mode 100644
index 0000000000000..6ad586376c1d2
--- /dev/null
+++ b/decidim-meetings/spec/requests/meeting_search_spec.rb
@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Meeting search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :meeting_component }
+  let(:user) { create :user, :confirmed, organization: organization }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:meeting1) do
+    create(
+      :meeting,
+      :published,
+      author: user,
+      component: component,
+      start_time: 1.day.from_now,
+      description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
+    )
+  end
+  let!(:meeting2) do
+    create(
+      :meeting,
+      :published,
+      component: component,
+      start_time: 1.day.ago,
+      end_time: 2.days.from_now,
+      description: Decidim::Faker::Localized.literal("Curabitur arcu erat, accumsan id imperdiet et.")
+    )
+  end
+  # Meeting not published, shouldn't appear
+  let!(:meeting3) do
+    create(
+      :meeting,
+      author: user,
+      component: component,
+      start_time: 1.day.from_now,
+      description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
+    )
+  end
+  # Meeting withdrawn, shouldn't appear
+  let!(:meeting4) do
+    create(
+      :meeting,
+      :published,
+      :withdrawn,
+      author: user,
+      component: component,
+      start_time: 1.day.ago,
+      end_time: 2.days.from_now,
+      description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
+    )
+  end
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).meetings_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :published_meeting
+  it_behaves_like "a resource search with scopes", :published_meeting
+  it_behaves_like "a resource search with categories", :published_meeting
+  it_behaves_like "a resource search with origin", :published_meeting
+
+  it "displays all meetings without any filters" do
+    expect(subject).to include(translated(meeting1.title))
+    expect(subject).to include(translated(meeting2.title))
+    expect(subject).not_to include(translated(meeting3.title))
+    expect(subject).not_to include(translated(meeting4.title))
+  end
+
+  context "when searching by date" do
+    let(:filter_params) { { with_any_date: date } }
+    let!(:past_meeting) do
+      create(:meeting, :published, component: component, start_time: 10.days.ago, end_time: 1.day.ago)
+    end
+
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
+    context "and date is upcoming" do
+      let(:date) { ["upcoming"] }
+
+      it "only returns that are scheduled in the future" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).not_to include(translated(meeting4.title))
+        expect(subject).not_to include(translated(past_meeting.title))
+      end
+    end
+
+    context "and date is past" do
+      let(:date) { ["past"] }
+
+      it "only returns meetings that were scheduled in the past" do
+        expect(subject).not_to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).not_to include(translated(meeting4.title))
+        expect(subject).to include(translated(past_meeting.title))
+      end
+    end
+  end
+
+  context "when searching by availability" do
+    let(:filter_params) { { with_availability: availability } }
+
+    context "and availability is withdrawn" do
+      let(:availability) { "withdrawn" }
+
+      it "only returns meetings that are withdrawn" do
+        expect(subject).not_to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).to include(translated(meeting4.title))
+      end
+    end
+
+    context "and availability is not set" do
+      let(:availability) { nil }
+
+      it "only returns meetings that are not withdrawn" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+        expect(subject).not_to include(translated(meeting3.title))
+        expect(subject).not_to include(translated(meeting4.title))
+      end
+    end
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "TestCheck" } }
+
+    it "show only the meeting containing the search_text" do
+      expect(subject).to include(translated(meeting1.title))
+      expect(subject).not_to include(translated(meeting2.title))
+      expect(subject).not_to include(translated(meeting3.title))
+      expect(subject).not_to include(translated(meeting4.title))
+    end
+  end
+
+  context "when searching by type" do
+    let!(:in_person_meeting) do
+      create(:meeting, :published, component: component)
+    end
+    let!(:online_meeting) do
+      create(:meeting, :published, :online, component: component)
+    end
+    let(:filter_params) { { with_any_type: type } }
+
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
+    context "and type is online" do
+      let(:type) { ["online"] }
+
+      it "only lists online meetings" do
+        expect(subject).to include(translated(online_meeting.title))
+        expect(subject).not_to include(translated(in_person_meeting.title))
+      end
+    end
+
+    context "and type is in_person" do
+      let(:type) { ["in_person"] }
+
+      it "only lists online meetings" do
+        expect(subject).to include(translated(in_person_meeting.title))
+        expect(subject).not_to include(translated(online_meeting.title))
+      end
+    end
+  end
+
+  context "when searching by activity" do
+    let(:filter_params) { { activity: activity } }
+
+    before do
+      login_as user, scope: :user
+
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
+    context "and activity is 'all'" do
+      let(:activity) { "all" }
+
+      it "returns all the meetings" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).to include(translated(meeting2.title))
+      end
+    end
+
+    context "and activity is 'my meetings'" do
+      let(:activity) { "my_meetings" }
+
+      it "returns only the meeting created by the current user" do
+        expect(subject).to include(translated(meeting1.title))
+        expect(subject).not_to include(translated(meeting2.title))
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/serializers/decidim/meetings/data_portability_invite_serializer_spec.rb b/decidim-meetings/spec/serializers/decidim/meetings/download_your_data_invite_serializer_spec.rb
similarity index 95%
rename from decidim-meetings/spec/serializers/decidim/meetings/data_portability_invite_serializer_spec.rb
rename to decidim-meetings/spec/serializers/decidim/meetings/download_your_data_invite_serializer_spec.rb
index be6938e8796fd..d0c58b56721bf 100644
--- a/decidim-meetings/spec/serializers/decidim/meetings/data_portability_invite_serializer_spec.rb
+++ b/decidim-meetings/spec/serializers/decidim/meetings/download_your_data_invite_serializer_spec.rb
@@ -3,9 +3,10 @@
 require "spec_helper"
 
 module Decidim::Meetings
-  describe DataPortabilityInviteSerializer do
+  describe DownloadYourDataInviteSerializer do
     let(:resource) { build_stubbed(:invite) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the invite data" do
diff --git a/decidim-meetings/spec/serializers/data_portability_registration_serializer_spec.rb b/decidim-meetings/spec/serializers/download_your_data_registration_serializer_spec.rb
similarity index 95%
rename from decidim-meetings/spec/serializers/data_portability_registration_serializer_spec.rb
rename to decidim-meetings/spec/serializers/download_your_data_registration_serializer_spec.rb
index 81504d15f778b..5dc513aec2c7b 100644
--- a/decidim-meetings/spec/serializers/data_portability_registration_serializer_spec.rb
+++ b/decidim-meetings/spec/serializers/download_your_data_registration_serializer_spec.rb
@@ -3,9 +3,10 @@
 require "spec_helper"
 
 module Decidim::Meetings
-  describe DataPortabilityRegistrationSerializer do
+  describe DownloadYourDataRegistrationSerializer do
     let(:resource) { create(:registration) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the id" do
diff --git a/decidim-meetings/spec/serializers/registration_serializer_spec.rb b/decidim-meetings/spec/serializers/registration_serializer_spec.rb
index 253afa4022289..aa1c9499e2d75 100644
--- a/decidim-meetings/spec/serializers/registration_serializer_spec.rb
+++ b/decidim-meetings/spec/serializers/registration_serializer_spec.rb
@@ -5,8 +5,9 @@
 module Decidim::Meetings
   describe RegistrationSerializer do
     describe "#serialize" do
+      subject { described_class.new(registration) }
+
       let!(:registration) { create(:registration) }
-      let!(:subject) { described_class.new(registration) }
 
       context "when there are not a questionnaire" do
         it "includes the id" do
@@ -29,6 +30,7 @@ module Decidim::Meetings
 
       context "when questionnaire enabled" do
         let(:meeting) { create :meeting, :with_registrations_enabled }
+        let(:serialized) { subject.serialize }
         let!(:user) { create(:user, organization: meeting.organization) }
         let!(:registration) { create(:registration, meeting: meeting, user: user) }
 
@@ -81,8 +83,7 @@ module Decidim::Meetings
           )
         end
 
-        let!(:subject) { described_class.new(registration) }
-        let(:serialized) { subject.serialize }
+        subject { described_class.new(registration) }
 
         it "includes the answer for each question" do
           expect(serialized[:registration_form_answers]).to include(
diff --git a/decidim-meetings/spec/services/calendar/component_calendar_spec.rb b/decidim-meetings/spec/services/calendar/component_calendar_spec.rb
index 97d350d3abd22..a5cb89dd10842 100644
--- a/decidim-meetings/spec/services/calendar/component_calendar_spec.rb
+++ b/decidim-meetings/spec/services/calendar/component_calendar_spec.rb
@@ -6,10 +6,12 @@ module Decidim::Meetings::Calendar
   describe ComponentCalendar do
     subject { described_class.for(component) }
 
-    let!(:meeting) { create :meeting }
+    let!(:meeting) { create :meeting, :published }
     let!(:component) { meeting.component }
-    let!(:another_meeting) { create :meeting, component: component }
+    let!(:another_meeting) { create :meeting, :published, component: component }
     let!(:external_meeting) { create :meeting }
+    let!(:unpublished_meeting) { create :meeting, component: component }
+    let!(:withdrawn_meeting) { create :meeting, :published, :withdrawn }
 
     describe "#calendar" do
       it "renders a full calendar" do
@@ -23,6 +25,8 @@ module Decidim::Meetings::Calendar
         expect(subject).to include(meeting.title["en"])
         expect(subject).to include(another_meeting.title["en"])
         expect(subject).not_to include(external_meeting.title["en"])
+        expect(subject).not_to include(unpublished_meeting.title["en"])
+        expect(subject).not_to include(withdrawn_meeting.title["en"])
       end
     end
 
@@ -40,6 +44,35 @@ module Decidim::Meetings::Calendar
         expect(subject).to include(meeting.title["en"])
         expect(subject).to include(another_meeting.title["en"])
         expect(subject).not_to include(external_meeting.title["en"])
+        expect(subject).not_to include(unpublished_meeting.title["en"])
+        expect(subject).not_to include(withdrawn_meeting.title["en"])
+      end
+    end
+
+    describe "#filters" do
+      subject { described_class.for(component, filters) }
+
+      let!(:filters) { { "with_any_origin" => ["", "official"], "with_any_type" => ["", "online"] } }
+
+      context "when no meetings returned" do
+        let!(:online_meeting) { create :meeting, :published, :not_official, :online, component: component }
+
+        it "returns a nil value" do
+          expect(subject).to be_nil
+        end
+      end
+
+      context "when having meetings returned" do
+        let!(:online_meeting) { create :meeting, :published, :official, :online, component: component }
+
+        it "renders the meetings of the given component based on filters" do
+          expect(subject).to include(online_meeting.title["en"])
+          expect(subject).not_to include(meeting.title["en"])
+          expect(subject).not_to include(another_meeting.title["en"])
+          expect(subject).not_to include(external_meeting.title["en"])
+          expect(subject).not_to include(unpublished_meeting.title["en"])
+          expect(subject).not_to include(withdrawn_meeting.title["en"])
+        end
       end
     end
   end
diff --git a/decidim-meetings/spec/services/calendar/organization_calendar_spec.rb b/decidim-meetings/spec/services/calendar/organization_calendar_spec.rb
index 239867a7564f2..eedd11b2abb16 100644
--- a/decidim-meetings/spec/services/calendar/organization_calendar_spec.rb
+++ b/decidim-meetings/spec/services/calendar/organization_calendar_spec.rb
@@ -6,11 +6,11 @@ module Decidim::Meetings::Calendar
   describe OrganizationCalendar do
     subject { described_class.for(organization) }
 
-    let!(:meeting) { create :meeting }
+    let!(:meeting) { create :meeting, :published }
     let!(:component) { meeting.component }
     let!(:component2) { create :meeting_component, participatory_space: component.participatory_space }
     let!(:organization) { component.organization }
-    let!(:another_meeting) { create :meeting, component: component2 }
+    let!(:another_meeting) { create :meeting, :published, component: component2 }
     let!(:external_meeting) { create :meeting }
 
     describe "#calendar" do
@@ -44,5 +44,45 @@ module Decidim::Meetings::Calendar
         expect(subject).not_to include(external_meeting.title["en"])
       end
     end
+
+    describe "#filters" do
+      subject { described_class.for(organization, filters) }
+
+      let(:online_meeting) { create :meeting, :official, :online, component: component }
+      let(:online_meeting2) { create :meeting, :not_official, :online, component: component2 }
+      let!(:withdrawn_meeting) { create :meeting, :published, :withdrawn, component: component2 }
+      let!(:filters) { { "with_any_origin" => ["", "official"], "with_any_type" => ["", "online"] } }
+
+      context "when no meetings returned" do
+        before do
+          online_meeting.published_at = nil
+          online_meeting2.published_at = nil
+          online_meeting.save!
+          online_meeting2.save!
+        end
+
+        it "returns a nil value" do
+          expect(subject).to be_nil
+        end
+      end
+
+      context "when having meetings returned" do
+        before do
+          online_meeting.published_at = Time.current
+          online_meeting2.published_at = Time.current
+          online_meeting.save!
+          online_meeting2.save!
+        end
+
+        it "renders the meetings of the given component based on filters" do
+          expect(subject).to include(online_meeting.title["en"])
+          expect(subject).not_to include(online_meeting2.title["en"])
+          expect(subject).not_to include(meeting.title["en"])
+          expect(subject).not_to include(another_meeting.title["en"])
+          expect(subject).not_to include(external_meeting.title["en"])
+          expect(subject).not_to include(withdrawn_meeting.title["en"])
+        end
+      end
+    end
   end
 end
diff --git a/decidim-meetings/spec/services/decidim/meetings/close_meeting_reminder_generator_spec.rb b/decidim-meetings/spec/services/decidim/meetings/close_meeting_reminder_generator_spec.rb
new file mode 100644
index 0000000000000..e8dfa9f4eee80
--- /dev/null
+++ b/decidim-meetings/spec/services/decidim/meetings/close_meeting_reminder_generator_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Meetings
+  describe CloseMeetingReminderGenerator do
+    subject { described_class.new }
+
+    let(:manifest) do
+      double(
+        settings: double(
+          attributes: {
+            reminder_times: double(default: intervals)
+          }
+        )
+      )
+    end
+    let(:intervals) { [3.days, 7.days] }
+    let(:organization) { create(:organization) }
+    let(:participatory_process) { create(:participatory_process, organization: organization) }
+    let!(:component) { create(:component, :published, manifest_name: "meetings", participatory_space: participatory_process) }
+    let(:user) { create(:user, :admin, organization: organization, email: "user@example.org") }
+    let!(:meeting) { create(:meeting, :published, component: component, author: user, start_time: start_time, end_time: end_time, closed_at: closed_at) }
+    let(:closed_at) { nil }
+
+    before do
+      allow(Decidim.reminders_registry).to receive(:for).with(:close_meeting).and_return(manifest)
+    end
+
+    describe "#generate" do
+      context "when there is a past meeting without a report in the the last 3 days" do
+        let(:start_time) { 4.days.ago }
+        let(:end_time) { 3.days.ago }
+
+        context "and the meeting is closed" do
+          let(:closed_at) { 2.days.ago }
+
+          it "does not send the reminder" do
+            expect(Decidim::Meetings::SendCloseMeetingReminderJob).not_to receive(:perform_later)
+
+            expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+          end
+        end
+
+        context "and the meeting is not closed" do
+          it "sends reminder" do
+            expect(Decidim::Meetings::SendCloseMeetingReminderJob).to receive(:perform_later)
+
+            expect { subject.generate }.to change(Decidim::Reminder, :count).by(1)
+          end
+        end
+      end
+
+      context "when there is a past meeting without a report in the the last 7 days" do
+        let(:start_time) { 8.days.ago }
+        let(:end_time) { 7.days.ago }
+
+        context "when the meeting is closed" do
+          let(:closed_at) { 2.days.ago }
+
+          it "does not send the reminder" do
+            expect(Decidim::Meetings::SendCloseMeetingReminderJob).not_to receive(:perform_later)
+
+            expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+            expect(Decidim::Reminder.first).to be_nil
+          end
+        end
+
+        context "when the meeting is not closed" do
+          it "sends reminder" do
+            expect(Decidim::Meetings::SendCloseMeetingReminderJob).to receive(:perform_later)
+
+            expect { subject.generate }.to change(Decidim::Reminder, :count).by(1)
+            expect(Decidim::Reminder.first.records.count).to eq(1)
+          end
+        end
+      end
+
+      context "when the meeting is in the past but end date does not correspond to the interval" do
+        let(:start_time) { 10.days.ago }
+        let(:end_time) { 9.days.ago }
+
+        it "does not send the reminder" do
+          expect(Decidim::Meetings::SendCloseMeetingReminderJob).not_to receive(:perform_later)
+
+          expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+          expect(Decidim::Reminder.first).to be_nil
+        end
+      end
+
+      context "when the reminder exists" do
+        let!(:reminder) { create(:reminder, user: user, component: component) }
+        let(:start_time) { 4.days.ago }
+        let(:end_time) { 3.days.ago }
+
+        it "sends existing reminder" do
+          expect(Decidim::Meetings::SendCloseMeetingReminderJob).to receive(:perform_later)
+
+          expect { subject.generate }.not_to change(Decidim::Reminder, :count)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/services/decidim/meetings/diff_renderer_spec.rb b/decidim-meetings/spec/services/decidim/meetings/diff_renderer_spec.rb
index fdc5e0310cbe5..0ed69c2b10156 100644
--- a/decidim-meetings/spec/services/decidim/meetings/diff_renderer_spec.rb
+++ b/decidim-meetings/spec/services/decidim/meetings/diff_renderer_spec.rb
@@ -7,7 +7,7 @@
   let!(:old_values) { meeting.attributes }
   let(:version) { meeting.versions.last }
 
-  let!(:start_time) { Time.zone.now - 1.day }
+  let!(:start_time) { 1.day.ago }
   let!(:end_time) { Time.zone.now }
   let!(:user_group) { create :user_group, organization: meeting.organization }
   let!(:scope) { create(:scope, organization: meeting.organization) }
@@ -85,7 +85,7 @@
         end_time: :date,
         decidim_scope_id: :scope
       }
-      types = subject.map { |attribute, data| [attribute.to_sym, data[:type]] }.to_h
+      types = subject.to_h { |attribute, data| [attribute.to_sym, data[:type]] }
       expect(types).to eq expected_types
     end
 
@@ -98,11 +98,11 @@
         location_en: "Location (English)",
         location_hints_ca: "Location hints (Català)",
         location_hints_en: "Location hints (English)",
-        start_time: "Start Time",
-        end_time: "End Time",
+        start_time: "Start time",
+        end_time: "End time",
         decidim_scope_id: "Scope"
       }
-      labels = subject.map { |attribute, data| [attribute.to_sym, data[:label]] }.to_h
+      labels = subject.to_h { |attribute, data| [attribute.to_sym, data[:label]] }
       expect(labels).to eq expected_labels
     end
 
@@ -128,11 +128,11 @@
           location_en: "Location (English)",
           location_hints_ca: "Location hints (ca)",
           location_hints_en: "Location hints (English)",
-          start_time: "Start Time",
-          end_time: "End Time",
+          start_time: "Start time",
+          end_time: "End time",
           decidim_scope_id: "Scope"
         }
-        labels = subject.map { |attribute, data| [attribute.to_sym, data[:label]] }.to_h
+        labels = subject.to_h { |attribute, data| [attribute.to_sym, data[:label]] }
         expect(labels).to eq expected_labels
       end
     end
diff --git a/decidim-meetings/spec/services/directory/meeting_search_spec.rb b/decidim-meetings/spec/services/directory/meeting_search_spec.rb
deleted file mode 100644
index a8ca6d8acf545..0000000000000
--- a/decidim-meetings/spec/services/directory/meeting_search_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Meetings::Directory
-  describe MeetingSearch do
-    subject { described_class.new(params).results }
-
-    let!(:component) { create_list(:component, 3, manifest_name: "meetings") }
-    let(:user) { create :user, organization: component.first.organization }
-    let(:default_params) { { component: component, organization: component.first.organization, user: user } }
-    let(:params) { default_params }
-
-    describe "a resource search with categories" do
-      let(:participatory_process) { component.first.participatory_space }
-      let(:params) { default_params.merge(category_id: category_ids) }
-
-      describe "results" do
-        let!(:category1) { create :category, participatory_space: participatory_process }
-        let!(:category2) { create :category, participatory_space: participatory_process }
-        let!(:child_category) { create :category, participatory_space: participatory_process, parent: category2 }
-        let!(:meeting1) { create(:meeting, :published, component: component.first) }
-        let!(:meeting2) { create(:meeting, :published, component: component.first, category: category1) }
-        let!(:meeting3) { create(:meeting, :published, component: component.first, category: category2) }
-        let!(:meeting4) { create(:meeting, :published, component: component.first, category: child_category) }
-
-        context "when no category filter is present" do
-          let(:category_ids) { nil }
-
-          it "includes all resources" do
-            expect(subject).to match_array [meeting1, meeting2, meeting3, meeting4]
-          end
-        end
-
-        context "when a category is selected" do
-          let(:category_ids) { [category2.id] }
-
-          it "includes only resources for that category and its children" do
-            expect(subject).to match_array [meeting3, meeting4]
-          end
-        end
-
-        context "when a participatory process is selected" do
-          let(:value) { participatory_process.class.name.gsub("::", "__") + participatory_process.id.to_s }
-          let(:category_ids) { [value] }
-
-          it "includes only resources for that participatory_process - all categories and sub-categories" do
-            expect(subject).to match_array [meeting2, meeting3, meeting4]
-          end
-        end
-
-        context "when a subcategory is selected" do
-          let(:category_ids) { [child_category.id] }
-
-          it "includes only resources for that category" do
-            expect(subject).to eq [meeting4]
-          end
-        end
-
-        context "when `without` is being sent" do
-          let(:category_ids) { ["without"] }
-
-          it "returns resources without a category" do
-            expect(subject).to eq [meeting1]
-          end
-        end
-
-        context "when `without` and some category id is being sent" do
-          let(:category_ids) { ["without", category1.id] }
-
-          it "returns resources without a category and with the selected category" do
-            expect(subject).to match_array [meeting1, meeting2]
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-meetings/spec/services/meeting_iframe_embedder_spec.rb b/decidim-meetings/spec/services/meeting_iframe_embedder_spec.rb
index ec09737fb08c8..6973f7840d7fe 100644
--- a/decidim-meetings/spec/services/meeting_iframe_embedder_spec.rb
+++ b/decidim-meetings/spec/services/meeting_iframe_embedder_spec.rb
@@ -8,6 +8,11 @@ module Meetings
       subject { described_class.new(url) }
 
       let(:request_host) { "decidim.org" }
+      let(:services) { %w(www.youtube.com www.twitch.tv meet.jit.si) }
+
+      before do
+        allow(Decidim::Meetings).to receive(:embeddable_services).and_return services
+      end
 
       describe "#embed_transformed_url" do
         context "with a valid youtube URL" do
@@ -74,6 +79,14 @@ module Meetings
           it "is not embeddable" do
             expect(subject).not_to be_embeddable
           end
+
+          context "and emebeddable services are customized" do
+            let(:services) { %w(www.youtube.com www.twitch.tv meet.jit.si example.org) }
+
+            it "is not embeddable" do
+              expect(subject).to be_embeddable
+            end
+          end
         end
       end
 
@@ -84,8 +97,9 @@ module Meetings
           embed_code = subject.embed_code(request_host)
 
           expect(embed_code).to include(subject.embed_transformed_url(request_host))
-          expect(embed_code).to include("<iframe")
-          expect(embed_code).to include("</iframe")
+          expect(embed_code).to include(%(<div))
+          expect(embed_code).to include(%(class="disabled-iframe"))
+          expect(embed_code).to include("</div")
         end
       end
     end
diff --git a/decidim-meetings/spec/services/meeting_search_spec.rb b/decidim-meetings/spec/services/meeting_search_spec.rb
deleted file mode 100644
index eab08250f89e4..0000000000000
--- a/decidim-meetings/spec/services/meeting_search_spec.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim::Meetings
-  describe MeetingSearch do
-    subject { described_class.new(params).results }
-
-    let(:component) { create :component, manifest_name: "meetings" }
-    let(:user) { create :user, organization: component.organization }
-    let(:default_params) { { component: component, organization: component.organization, user: user } }
-    let(:params) { default_params }
-
-    it_behaves_like "a resource search", :published_meeting
-    it_behaves_like "a resource search with scopes", :published_meeting
-    it_behaves_like "a resource search with categories", :published_meeting
-
-    describe "filters" do
-      let!(:meeting1) do
-        create(
-          :meeting,
-          :published,
-          author: user,
-          component: component,
-          start_time: 1.day.from_now,
-          description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
-        )
-      end
-      let!(:meeting2) do
-        create(
-          :meeting,
-          :published,
-          component: component,
-          start_time: 1.day.ago,
-          end_time: 2.days.from_now,
-          description: Decidim::Faker::Localized.literal("Curabitur arcu erat, accumsan id imperdiet et.")
-        )
-      end
-      # Meeting not published, shouldn't appear
-      let!(:meeting3) do
-        create(
-          :meeting,
-          author: user,
-          component: component,
-          start_time: 1.day.from_now,
-          description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
-        )
-      end
-
-      # Meeting withdrawn, shouldn't appear
-      let!(:meeting4) do
-        create(
-          :meeting,
-          :published,
-          :withdrawn,
-          author: user,
-          component: component,
-          start_time: 1.day.ago,
-          end_time: 2.days.from_now,
-          description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
-        )
-      end
-
-      context "with date" do
-        let(:params) { default_params.merge(date: date) }
-        let!(:past_meeting) do
-          create(:meeting, :published, component: component, start_time: 10.days.ago, end_time: 1.day.ago)
-        end
-
-        context "when upcoming" do
-          let(:date) { ["upcoming"] }
-
-          it "only returns that are scheduled in the future" do
-            expect(subject).to match_array [meeting1, meeting2]
-          end
-        end
-
-        context "when past" do
-          let(:date) { ["past"] }
-
-          it "only returns meetings that were scheduled in the past" do
-            expect(subject).to match_array [past_meeting]
-          end
-        end
-      end
-
-      context "with state" do
-        let(:params) { default_params.merge(state: state) }
-
-        context "when withdrawn" do
-          let(:state) { "withdrawn" }
-
-          it "only returns meetings that are withdrawn" do
-            expect(subject).to match_array [meeting4]
-          end
-        end
-
-        context "when except withdrawn" do
-          let(:state) { nil }
-
-          it "only returns meetings that are not withdrawn" do
-            expect(subject).to match_array [meeting1, meeting2]
-          end
-        end
-      end
-
-      context "with search_text" do
-        let(:params) { default_params.merge(search_text: "TestCheck") }
-
-        it "show only the meeting containing the search_text" do
-          expect(subject).to include(meeting1)
-          expect(subject.length).to eq(1)
-        end
-      end
-
-      context "when filtering by type" do
-        let!(:in_person_meeting) do
-          create(:meeting, :published, component: component)
-        end
-        let!(:online_meeting) do
-          create(:meeting, :published, :online, component: component)
-        end
-
-        context "when online" do
-          let(:params) { default_params.merge(type: ["online"]) }
-
-          it "only lists online meetings" do
-            expect(subject).to include(online_meeting)
-            expect(subject).not_to include(in_person_meeting)
-          end
-        end
-
-        context "when in_person" do
-          let(:params) { default_params.merge(type: ["in_person"]) }
-
-          it "only lists online meetings" do
-            expect(subject).to include(in_person_meeting)
-            expect(subject).not_to include(online_meeting)
-          end
-        end
-      end
-
-      describe "activity filter" do
-        let(:params) { default_params.merge(activity: activity) }
-
-        context "when filtering by 'all'" do
-          let(:activity) { "all" }
-
-          it "returns all the meetings" do
-            expect(subject.length).to eq(2)
-          end
-        end
-
-        context "when filtering by 'my meetings'" do
-          let(:activity) { "my_meetings" }
-
-          it "returns only the meeting created by the current user" do
-            expect(subject).to include(meeting1)
-            expect(subject.length).to eq(1)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-meetings/spec/shared/duplicate_meetings_examples.rb b/decidim-meetings/spec/shared/duplicate_meetings_examples.rb
index 1c304d65e0628..74ec519f915de 100644
--- a/decidim-meetings/spec/shared/duplicate_meetings_examples.rb
+++ b/decidim-meetings/spec/shared/duplicate_meetings_examples.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples "duplicate meetings" do
-  let(:form) { Decidim::Meetings::Admin::MeetingCopyForm.from_model(meeting).with_context(context) }
+  let(:form) { Decidim::Meetings::Admin::MeetingForm.from_model(meeting).with_context(context) }
   let(:context) { { current_organization: meeting.organization, current_component: meeting.component } }
   let(:copy_meeting) { Decidim::Meetings::Admin::CopyMeeting.new(form, meeting) }
 
diff --git a/decidim-meetings/spec/shared/manage_invites_examples.rb b/decidim-meetings/spec/shared/manage_invites_examples.rb
index b8a8520ca39b6..c18330a0ab2a0 100644
--- a/decidim-meetings/spec/shared/manage_invites_examples.rb
+++ b/decidim-meetings/spec/shared/manage_invites_examples.rb
@@ -76,8 +76,8 @@ def invite_existing_user(user)
 
           within "form.new_user" do
             fill_in :invitation_user_nickname, with: "caballo_loco"
-            fill_in :invitation_user_password, with: "decidim123456"
-            fill_in :invitation_user_password_confirmation, with: "decidim123456"
+            fill_in :invitation_user_password, with: "decidim123456789"
+            fill_in :invitation_user_password_confirmation, with: "decidim123456789"
             check :invitation_user_tos_agreement
             find("*[type=submit]").click
           end
@@ -95,8 +95,8 @@ def invite_existing_user(user)
 
           within "form.new_user" do
             fill_in :invitation_user_nickname, with: "caballo_loco"
-            fill_in :invitation_user_password, with: "decidim123456"
-            fill_in :invitation_user_password_confirmation, with: "decidim123456"
+            fill_in :invitation_user_password, with: "decidim123456789"
+            fill_in :invitation_user_password_confirmation, with: "decidim123456789"
             check :invitation_user_tos_agreement
             find("*[type=submit]").click
           end
diff --git a/decidim-meetings/spec/system/admin/admin_manages_meetings_registration_forms_spec.rb b/decidim-meetings/spec/system/admin/admin_manages_meetings_registration_forms_spec.rb
index f3894f2671cfb..f437da84ba63e 100644
--- a/decidim-meetings/spec/system/admin/admin_manages_meetings_registration_forms_spec.rb
+++ b/decidim-meetings/spec/system/admin/admin_manages_meetings_registration_forms_spec.rb
@@ -12,6 +12,10 @@
 
   it_behaves_like "manage questionnaires"
 
+  def registrations_edit_path
+    Decidim::EngineRouter.admin_proxy(component).edit_meeting_registrations_path(meeting_id: meeting.id)
+  end
+
   def questionnaire_edit_path
     Decidim::EngineRouter.admin_proxy(component).edit_meeting_registrations_form_path(meeting_id: meeting.id)
   end
@@ -19,4 +23,17 @@ def questionnaire_edit_path
   def questionnaire_public_path
     Decidim::EngineRouter.main_proxy(component).join_meeting_registration_path(meeting_id: meeting.id)
   end
+
+  describe "manages registration form" do
+    it "allows to change the custom content in registration email" do
+      visit registrations_edit_path
+      find("#meeting_customize_registration_email").click
+      expect(page.find_all(("div[data-tabs-content*='meeting-registration_email_custom_content-tab']")).first.sibling(".help-text")).to be_present
+      fill_in_i18n_editor(
+        :meeting_registration_email_custom_content,
+        "#meeting-registration_email_custom_content-tabs",
+        en: "We're very happy you registered for this event!"
+      )
+    end
+  end
 end
diff --git a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
index 79c9a4dc8a9bc..cf01515343dfc 100644
--- a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
@@ -278,17 +278,6 @@
     scope_pick select_data_picker(:meeting_decidim_scope_id), scope
     select translated(category.name), from: :meeting_decidim_category_id
 
-    # the field is not visible by default
-    expect(page).not_to have_field("Custom content in registration email")
-    # make the field visible
-    find("#meeting_customize_registration_email").click
-    expect(help_text_for("div[data-tabs-content*='meeting-registration_email_custom_content-tab']")).to be_present
-    fill_in_i18n_editor(
-      :meeting_registration_email_custom_content,
-      "#meeting-registration_email_custom_content-tabs",
-      en: "We're very happy you registered for this event!"
-    )
-
     within ".new_meeting" do
       find("*[type=submit]").click
     end
@@ -388,14 +377,11 @@
     within ".new_meeting" do
       select "Registration disabled", from: :meeting_registration_type
       expect(page).to have_no_field("Registration URL")
-      expect(page).to have_no_field("Available slots")
 
       select "On a different platform", from: :meeting_registration_type
       expect(page).to have_field("Registration URL")
-      expect(page).to have_no_field("Available slots")
 
       select "On this platform", from: :meeting_registration_type
-      expect(page).to have_field("Available slots")
       expect(page).to have_no_field("Registration URL")
     end
   end
diff --git a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
index ad95888745b36..36c33c22b72cf 100644
--- a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb
@@ -33,7 +33,7 @@ def meeting_without_type(type)
     before { visit_component_admin }
 
     TYPES.each do |state|
-      i18n_state = I18n.t(state, scope: "decidim.admin.filters.meetings.type_eq.values")
+      i18n_state = I18n.t(state, scope: "decidim.admin.filters.meetings.with_any_type.values")
 
       context "filtering meetings by type: #{i18n_state}" do
         it_behaves_like "a filtered collection", options: "Type", filter: i18n_state do
@@ -67,32 +67,32 @@ def meeting_without_type(type)
 
   context "when filtering by origin" do
     let!(:official_meeting) { create(:meeting, :official, component: component) }
-    let!(:citizen_meeting) { create(:meeting, :not_official, component: component) }
+    let!(:participant_meeting) { create(:meeting, :not_official, component: component) }
     let!(:user_group_meeting) { create(:meeting, :user_group_author, component: component) }
 
     before { visit_component_admin }
 
-    context "when filtering citizens " do
-      context "when no official event is present" do
-        it_behaves_like "a filtered collection", options: "Origin", filter: "Citizen" do
-          let(:in_filter) { translated(citizen_meeting.title) }
+    context "when filtering participants" do
+      context "when no official meeting is present" do
+        it_behaves_like "a filtered collection", options: "Origin", filter: "Participant" do
+          let(:in_filter) { translated(participant_meeting.title) }
           let(:not_in_filter) { translated(official_meeting.title) }
         end
       end
 
       context "when no user group is present" do
-        it_behaves_like "a filtered collection", options: "Origin", filter: "Citizen" do
-          let(:in_filter) { translated(citizen_meeting.title) }
+        it_behaves_like "a filtered collection", options: "Origin", filter: "Participant" do
+          let(:in_filter) { translated(participant_meeting.title) }
           let(:not_in_filter) { translated(user_group_meeting.title) }
         end
       end
     end
 
-    context "when filtering official " do
-      context "when no citizen event is present" do
+    context "when filtering official" do
+      context "when no participant meeting is present" do
         it_behaves_like "a filtered collection", options: "Origin", filter: "Official" do
           let(:in_filter) { translated(official_meeting.title) }
-          let(:not_in_filter) { translated(citizen_meeting.title) }
+          let(:not_in_filter) { translated(participant_meeting.title) }
         end
       end
 
@@ -104,15 +104,15 @@ def meeting_without_type(type)
       end
     end
 
-    context "when filtering official " do
-      context "when no citizen event is present" do
+    context "when filtering user groups" do
+      context "when no participant meeting is present" do
         it_behaves_like "a filtered collection", options: "Origin", filter: "User Groups" do
           let(:in_filter) { translated(user_group_meeting.title) }
-          let(:not_in_filter) { translated(citizen_meeting.title) }
+          let(:not_in_filter) { translated(participant_meeting.title) }
         end
       end
 
-      context "when no official event is present" do
+      context "when no official meeting is present" do
         it_behaves_like "a filtered collection", options: "Origin", filter: "User Groups" do
           let(:in_filter) { translated(user_group_meeting.title) }
           let(:not_in_filter) { translated(official_meeting.title) }
@@ -122,19 +122,19 @@ def meeting_without_type(type)
   end
 
   context "when filtering by Date" do
-    let!(:past_event) { create(:meeting, :past, component: component) }
-    let!(:future_event) { create(:meeting, :upcoming, component: component) }
+    let!(:past_meeting) { create(:meeting, :past, component: component) }
+    let!(:future_meeting) { create(:meeting, :upcoming, component: component) }
 
     before { visit_component_admin }
 
     it_behaves_like "a filtered collection", options: "Date", filter: "Upcoming" do
-      let(:in_filter) { translated(future_event.title) }
-      let(:not_in_filter) { translated(past_event.title) }
+      let(:in_filter) { translated(future_meeting.title) }
+      let(:not_in_filter) { translated(past_meeting.title) }
     end
 
     it_behaves_like "a filtered collection", options: "Date", filter: "Past" do
-      let(:in_filter) { translated(past_event.title) }
-      let(:not_in_filter) { translated(future_event.title) }
+      let(:in_filter) { translated(past_meeting.title) }
+      let(:not_in_filter) { translated(future_meeting.title) }
     end
   end
 
diff --git a/decidim-meetings/spec/system/explore_meeting_directory_spec.rb b/decidim-meetings/spec/system/explore_meeting_directory_spec.rb
index 90c104ba1762d..a015e285846c6 100644
--- a/decidim-meetings/spec/system/explore_meeting_directory_spec.rb
+++ b/decidim-meetings/spec/system/explore_meeting_directory_spec.rb
@@ -16,6 +16,9 @@
   end
 
   before do
+    # Required for the link to be pointing to the correct URL with the server
+    # port since the server port is not defined for the test environment.
+    allow(ActionMailer::Base).to receive(:default_url_options).and_return(port: Capybara.server_port)
     switch_to_host(organization.host)
     visit directory
   end
@@ -27,7 +30,7 @@
     it "shows all the upcoming meetings" do
       visit directory
 
-      within ".date_collection_radio_buttons_filter" do
+      within ".with_any_date_collection_radio_buttons_filter" do
         expect(find("input[value='upcoming']").checked?).to be(true)
       end
 
@@ -46,11 +49,28 @@
     end
   end
 
+  describe "text filter" do
+    it "updates the current URL" do
+      create(:meeting, :published, component: components[0], title: { en: "Foobar meeting" })
+      create(:meeting, :published, component: components[1], title: { en: "Another meeting" })
+      visit directory
+
+      within "form.new_filter" do
+        fill_in("filter[title_or_description_cont]", with: "foobar")
+        click_button "Search"
+      end
+
+      expect(page).not_to have_content("Another meeting")
+      expect(page).to have_content("Foobar meeting")
+
+      filter_params = CGI.parse(URI.parse(page.current_url).query)
+      expect(filter_params["filter[title_or_description_cont]"]).to eq(["foobar"])
+    end
+  end
+
   describe "category filter" do
     context "with a category" do
-      let!(:category1) do
-        create(:category, participatory_space: participatory_process, name: { "en": "Category1" })
-      end
+      let!(:category1) { create(:category, participatory_space: participatory_process, name: { en: "Category1" }) }
       let!(:meeting) do
         meeting = meetings.first
         meeting.category = category1
@@ -70,7 +90,7 @@
       it "allows filtering by category" do
         visit directory
 
-        within ".category_id_check_boxes_tree_filter" do
+        within ".with_any_global_category_check_boxes_tree_filter" do
           check "All"
           check translated(participatory_process.title)
         end
@@ -93,7 +113,7 @@
     it "allows filtering by scope" do
       visit directory
 
-      within ".scope_id_check_boxes_tree_filter" do
+      within ".with_any_scope_check_boxes_tree_filter" do
         check "All"
         check translated(meeting.scope.name)
       end
@@ -109,7 +129,7 @@
       it "lists the filtered meetings" do
         visit directory
 
-        within ".origin_check_boxes_tree_filter" do
+        within ".with_any_origin_check_boxes_tree_filter" do
           uncheck "All"
           check "Official"
         end
@@ -129,7 +149,7 @@
       it "lists the filtered meetings" do
         visit directory
 
-        within ".origin_check_boxes_tree_filter" do
+        within ".with_any_origin_check_boxes_tree_filter" do
           uncheck "All"
           check "Groups"
         end
@@ -142,13 +162,13 @@
       end
     end
 
-    context "with 'citizens' origin" do
+    context "with 'participants' origin" do
       it "lists the filtered meetings" do
         visit directory
 
-        within ".origin_check_boxes_tree_filter" do
+        within ".with_any_origin_check_boxes_tree_filter" do
           uncheck "All"
-          check "Citizens"
+          check "Participants"
         end
 
         expect(page).to have_css(".card--meeting", count: 6)
@@ -163,7 +183,18 @@
       let!(:online_meeting2) { create(:meeting, :published, :online, component: components.last) }
 
       it "allows filtering by type 'online'" do
-        within ".type_check_boxes_tree_filter" do
+        within ".with_any_type_check_boxes_tree_filter" do
+          uncheck "All"
+          check "Online"
+        end
+
+        expect(page).to have_content(online_meeting1.title["en"])
+        expect(page).to have_content(online_meeting2.title["en"])
+        expect(page).to have_css("#meetings-count", text: "2 MEETINGS")
+      end
+
+      it "allows linking to the filtered view using a short link" do
+        within ".with_any_type_check_boxes_tree_filter" do
           uncheck "All"
           check "Online"
         end
@@ -171,6 +202,28 @@
         expect(page).to have_content(online_meeting1.title["en"])
         expect(page).to have_content(online_meeting2.title["en"])
         expect(page).to have_css("#meetings-count", text: "2 MEETINGS")
+
+        filter_params = CGI.parse(URI.parse(page.current_url).query)
+        base_url = "http://#{organization.host}:#{Capybara.server_port}"
+
+        click_button "Export calendar"
+        expect(page).to have_content("Calendar URL:")
+        expect(page).to have_css("#calendarShare", visible: :visible)
+        short_url = nil
+        within "#calendarShare" do
+          input = find("input#urlCalendarUrl[readonly]")
+          short_url = input.value
+          expect(short_url).to match(%r{^#{base_url}/s/[a-zA-Z0-9]{10}$})
+        end
+
+        visit short_url
+        expect(page).to have_content(online_meeting1.title["en"])
+        expect(page).to have_content(online_meeting2.title["en"])
+        expect(page).to have_css("#meetings-count", text: "2 MEETINGS")
+        expect(page).to have_current_path(/^#{directory}/)
+
+        current_params = CGI.parse(URI.parse(page.current_url).query)
+        expect(current_params).to eq(filter_params)
       end
     end
 
@@ -178,7 +231,7 @@
       let!(:in_person_meeting) { create(:meeting, :published, :in_person, component: components.last) }
 
       it "allows filtering by type 'in-person'" do
-        within ".type_check_boxes_tree_filter" do
+        within ".with_any_type_check_boxes_tree_filter" do
           uncheck "All"
           check "In-person"
         end
@@ -192,7 +245,7 @@
       let!(:online_meeting) { create(:meeting, :published, :hybrid, component: components.last) }
 
       it "allows filtering by type 'both'" do
-        within ".type_check_boxes_tree_filter" do
+        within ".with_any_type_check_boxes_tree_filter" do
           uncheck "All"
           check "Hybrid"
         end
@@ -212,9 +265,9 @@
 
     context "with all meetings" do
       it "orders them by start date" do
-        visit directory
+        visit "#{directory}?per_page=20"
 
-        within ".date_collection_radio_buttons_filter" do
+        within ".with_any_date_collection_radio_buttons_filter" do
           choose "All"
         end
 
@@ -233,7 +286,7 @@
       it "orders them by start date" do
         visit directory
 
-        within ".date_collection_radio_buttons_filter" do
+        within ".with_any_date_collection_radio_buttons_filter" do
           choose "Past"
         end
 
@@ -280,7 +333,7 @@
       # have_content to wait for the card list to change. This is a hack to
       # reset the contents to no meetings at all, and then showing only the upcoming
       # assembly meetings.
-      within ".date_collection_radio_buttons_filter" do
+      within ".with_any_date_collection_radio_buttons_filter" do
         choose "Past"
       end
 
@@ -290,7 +343,7 @@
         check "Assemblies"
       end
 
-      within ".date_collection_radio_buttons_filter" do
+      within ".with_any_date_collection_radio_buttons_filter" do
         choose "Upcoming"
       end
 
diff --git a/decidim-meetings/spec/system/explore_meetings_spec.rb b/decidim-meetings/spec/system/explore_meetings_spec.rb
index 476a51e3cd566..a6f693bae46d5 100644
--- a/decidim-meetings/spec/system/explore_meetings_spec.rb
+++ b/decidim-meetings/spec/system/explore_meetings_spec.rb
@@ -12,6 +12,9 @@
   end
 
   before do
+    # Required for the link to be pointing to the correct URL with the server
+    # port since the server port is not defined for the test environment.
+    allow(ActionMailer::Base).to receive(:default_url_options).and_return(port: Capybara.server_port)
     component_scope = create :scope, parent: participatory_process.scope
     component_settings = component["settings"]["global"].merge!(scopes_enabled: true, scope_id: component_scope.id)
     component.update!(settings: component_settings)
@@ -33,7 +36,7 @@
 
       it "shows all the upcoming meetings" do
         visit_component
-        within ".date_collection_radio_buttons_filter" do
+        within ".with_any_date_collection_radio_buttons_filter" do
           expect(find("input[value='upcoming']").checked?).to be(true)
         end
 
@@ -122,6 +125,25 @@
     end
 
     context "when filtering" do
+      context "when filtering by text" do
+        it "updates the current URL" do
+          create(:meeting, :published, component: component, title: { en: "Foobar meeting" })
+          create(:meeting, :published, component: component, title: { en: "Another meeting" })
+          visit_component
+
+          within "form.new_filter" do
+            fill_in("filter[search_text_cont]", with: "foobar")
+            click_button "Search"
+          end
+
+          expect(page).not_to have_content("Another meeting")
+          expect(page).to have_content("Foobar meeting")
+
+          filter_params = CGI.parse(URI.parse(page.current_url).query)
+          expect(filter_params["filter[search_text_cont]"]).to eq(["foobar"])
+        end
+      end
+
       context "when filtering by origin" do
         let!(:component) do
           create(:meeting_component,
@@ -136,7 +158,7 @@
           it "lists the filtered meetings" do
             visit_component
 
-            within ".origin_check_boxes_tree_filter" do
+            within ".with_any_origin_check_boxes_tree_filter" do
               uncheck "All"
               check "Official"
             end
@@ -155,7 +177,7 @@
           it "lists the filtered meetings" do
             visit_component
 
-            within ".origin_check_boxes_tree_filter" do
+            within ".with_any_origin_check_boxes_tree_filter" do
               uncheck "All"
               check "Groups"
             end
@@ -169,13 +191,13 @@
           end
         end
 
-        context "with 'citizens' origin" do
+        context "with 'participants' origin" do
           it "lists the filtered meetings" do
             visit_component
 
-            within ".origin_check_boxes_tree_filter" do
+            within ".with_any_origin_check_boxes_tree_filter" do
               uncheck "All"
-              check "Citizens"
+              check "Participants"
             end
 
             expect(page).to have_no_content("6 MEETINGS")
@@ -190,7 +212,7 @@
         within ".filters" do
           # It seems that there's another field with the same name in another form on page.
           # Because of that we try to select the correct field to set the value and submit the right form
-          find(:css, "#content form.new_filter [name='filter[search_text]']").set(translated(meetings.first.title))
+          find(:css, "#content form.new_filter [name='filter[search_text_cont]']").set(translated(meetings.first.title))
 
           # The form should be auto-submitted when filter box is filled up, but
           # somehow it's not happening. So we workaround that be explicitly
@@ -214,7 +236,7 @@
         it "lists filtered meetings" do
           visit_component
 
-          within ".date_collection_radio_buttons_filter" do
+          within ".with_any_date_collection_radio_buttons_filter" do
             choose "Past"
           end
 
@@ -222,7 +244,7 @@
           expect(page).to have_content(translated(past_meeting1.title))
           expect(page).not_to have_content(translated(upcoming_meeting1.title))
 
-          within ".date_collection_radio_buttons_filter" do
+          within ".with_any_date_collection_radio_buttons_filter" do
             choose "Upcoming"
           end
 
@@ -231,7 +253,7 @@
 
           expect(page).to have_css(".card--meeting", count: 8)
 
-          within ".date_collection_radio_buttons_filter" do
+          within ".with_any_date_collection_radio_buttons_filter" do
             choose "All"
           end
 
@@ -243,7 +265,7 @@
         context "when there are multiple past meetings" do
           it "orders them by start date" do
             visit_component
-            within ".date_collection_radio_buttons_filter" do
+            within ".with_any_date_collection_radio_buttons_filter" do
               choose "Past"
             end
 
@@ -258,7 +280,7 @@
         context "when there are multiple upcoming meetings" do
           it "orders them by start date" do
             visit_component
-            within ".date_collection_radio_buttons_filter" do
+            within ".with_any_date_collection_radio_buttons_filter" do
               choose "Upcoming"
             end
 
@@ -272,8 +294,8 @@
 
         context "when there are multiple meetings" do
           it "orders them by start date" do
-            visit_component
-            within ".date_collection_radio_buttons_filter" do
+            page.visit "#{main_component_path(component)}?per_page=20"
+            within ".with_any_date_collection_radio_buttons_filter" do
               choose "All"
             end
 
@@ -293,7 +315,7 @@
         past_meeting = create(:meeting, :published, component: component, start_time: 1.day.ago)
         visit_component
 
-        within ".date_collection_radio_buttons_filter" do
+        within ".with_any_date_collection_radio_buttons_filter" do
           choose "Past"
         end
 
@@ -301,19 +323,19 @@
         expect(page).to have_content(translated(past_meeting.title))
 
         filter_params = CGI.parse(URI.parse(page.current_url).query)
-        base_url = "http://#{organization.host}"
+        base_url = "http://#{organization.host}:#{Capybara.server_port}"
 
         click_button "Export calendar"
         expect(page).to have_content("Calendar URL:")
         expect(page).to have_css("#calendarShare", visible: :visible)
-        share_url = nil
+        short_url = nil
         within "#calendarShare" do
-          input = find("input[readonly]")
-          share_url = input.value
-          expect(share_url).to match(%r{^#{base_url}:[0-9]+/processes/#{participatory_process.slug}/f/#{component.id}/calendar$})
+          input = find("input#urlCalendarUrl[readonly]")
+          short_url = input.value
+          expect(short_url).to match(%r{^#{base_url}/s/[a-zA-Z0-9]{10}$})
         end
 
-        visit share_url
+        visit short_url
         expect(page).to have_css(".card--meeting", count: 1)
         expect(page).to have_content(translated(past_meeting.title))
         expect(page).to have_current_path(/^#{main_component_path(component)}/)
@@ -330,7 +352,7 @@
 
         visit_component
 
-        within ".scope_id_check_boxes_tree_filter" do
+        within ".with_any_scope_check_boxes_tree_filter" do
           check "All"
           uncheck "All"
           check translated(scope.name)
@@ -347,7 +369,7 @@
 
         visit_component
 
-        within ".scope_id_check_boxes_tree_filter" do
+        within ".with_any_scope_check_boxes_tree_filter" do
           check "All"
           uncheck "All"
           check translated(scope.name)
@@ -364,7 +386,7 @@
 
     context "when no upcoming meetings scheduled" do
       let!(:meetings) do
-        create_list(:meeting, 2, :published, component: component, start_time: Time.current - 4.days, end_time: Time.current - 2.days)
+        create_list(:meeting, 2, :published, component: component, start_time: 4.days.ago, end_time: 2.days.ago)
       end
 
       it "only shows the past meetings" do
diff --git a/decidim-meetings/spec/system/homepage_stats_spec.rb b/decidim-meetings/spec/system/homepage_stats_spec.rb
index f9ed2c58326ad..7000dde98313a 100644
--- a/decidim-meetings/spec/system/homepage_stats_spec.rb
+++ b/decidim-meetings/spec/system/homepage_stats_spec.rb
@@ -9,6 +9,11 @@
   let!(:meetings) { create_list(:meeting, 3, :published, component: component, author: component.organization) }
   let!(:moderation) { create :moderation, reportable: meetings.first, hidden_at: 1.day.ago }
 
+  let(:day) { Time.zone.yesterday }
+  let(:author) { create(:user, organization: component.organization) }
+  let!(:comments) { create_list(:comment, 5, created_at: day, author: author, commentable: meetings.last) }
+  let!(:comment_moderation) { create :moderation, reportable: comments.last, hidden_at: 1.day.ago }
+
   before do
     create :content_block, organization: organization, scope_name: :homepage, manifest_name: :stats
     visit decidim.root_path
@@ -19,4 +24,10 @@
       expect(page).to have_content(2)
     end
   end
+
+  it "display unhidden comments count" do
+    within(".comments_count") do
+      expect(page).to have_content(4)
+    end
+  end
 end
diff --git a/decidim-meetings/spec/system/live_meeting_access_spec.rb b/decidim-meetings/spec/system/live_meeting_access_spec.rb
index a9b2a22c592f5..697f49cf978e5 100644
--- a/decidim-meetings/spec/system/live_meeting_access_spec.rb
+++ b/decidim-meetings/spec/system/live_meeting_access_spec.rb
@@ -80,6 +80,23 @@ def visit_meeting
               expect(page).to have_content("JOIN MEETING")
             end
           end
+
+          context "when cookies rejected" do
+            before { data_consent(false, visit_root: true) }
+
+            it "shows cookie warning" do
+              visit_meeting
+
+              expect(page).to have_content("This meeting is happening right now")
+              case embedding_type
+              when :embedded
+                expect(page).to have_content("You need to enable all cookies in order to see this content")
+                expect(page).not_to have_css("iframe")
+              else
+                expect(page).to have_content("JOIN MEETING")
+              end
+            end
+          end
         end
       end
 
@@ -218,14 +235,18 @@ def visit_meeting
         end
       end
 
-      it "shows the meeting link embedded" do
-        visit_meeting
+      context "when cookies accepted" do
+        before { data_consent(true, visit_root: true) }
 
-        expect(page).to have_css("iframe")
-      end
+        it "shows the meeting link embedded" do
+          visit_meeting
 
-      it_behaves_like "iframe access levels", :embedded
-      it_behaves_like "belonging to an assembly which is a transparent private space"
+          expect(page).to have_css("iframe")
+        end
+
+        it_behaves_like "iframe access levels", :embedded
+        it_behaves_like "belonging to an assembly which is a transparent private space"
+      end
     end
 
     context "and the iframe_embed_type is 'open_in_live_event_page'" do
@@ -255,8 +276,14 @@ def visit_meeting
         end
       end
 
-      it_behaves_like "iframe access levels", :live_event_page
-      it_behaves_like "belonging to an assembly which is a transparent private space"
+      context "when cookies accepted" do
+        before do
+          data_consent(true, visit_root: true)
+        end
+
+        it_behaves_like "iframe access levels", :live_event_page
+        it_behaves_like "belonging to an assembly which is a transparent private space"
+      end
     end
 
     context "and the iframe_embed_type is 'open_in_new_tab'" do
@@ -286,7 +313,7 @@ def visit_meeting
     end
   end
 
-  context "when online meeting is not live and is not embedded" do
+  context "when online meeting is not live and it's embedded" do
     let(:meeting) { create :meeting, :published, :embed_in_meeting_page_iframe_embed_type, :online, :embeddable, component: component }
 
     it "doesn't show the meeting link embedded" do
diff --git a/decidim-meetings/spec/system/live_meeting_admin_questions_spec.rb b/decidim-meetings/spec/system/live_meeting_admin_questions_spec.rb
index a0568e39438ae..a9b992a7882ae 100644
--- a/decidim-meetings/spec/system/live_meeting_admin_questions_spec.rb
+++ b/decidim-meetings/spec/system/live_meeting_admin_questions_spec.rb
@@ -15,7 +15,7 @@
            :confirmed,
            organization: organization
   end
-  let(:user_2) do
+  let(:user2) do
     create :user,
            :admin,
            :confirmed,
@@ -94,11 +94,11 @@
   context "when there's a published question with answers" do
     let!(:question_multiple_option) { create(:meetings_poll_question, :published, questionnaire: questionnaire, body: body_multiple_option_question, question_type: "multiple_option") }
 
-    let!(:answer_user_1) { create(:meetings_poll_answer, question: question_multiple_option, user: user, questionnaire: questionnaire) }
-    let!(:answer_user_2) { create(:meetings_poll_answer, question: question_multiple_option, user: user_2, questionnaire: questionnaire) }
+    let!(:answer_user1) { create(:meetings_poll_answer, question: question_multiple_option, user: user, questionnaire: questionnaire) }
+    let!(:answer_user2) { create(:meetings_poll_answer, question: question_multiple_option, user: user2, questionnaire: questionnaire) }
 
-    let!(:answer_choice_user_1) { create(:meetings_poll_answer_choice, answer: answer_user_1, answer_option: question_multiple_option.answer_options.first) }
-    let!(:answer_choice_user_2) { create(:meetings_poll_answer_choice, answer: answer_user_2, answer_option: question_multiple_option.answer_options.first) }
+    let!(:answer_choice_user1) { create(:meetings_poll_answer_choice, answer: answer_user1, answer_option: question_multiple_option.answer_options.first) }
+    let!(:answer_choice_user2) { create(:meetings_poll_answer_choice, answer: answer_user2, answer_option: question_multiple_option.answer_options.first) }
 
     it "allows to see question answers" do
       open_first_question
diff --git a/decidim-meetings/spec/system/live_meeting_answer_questions_spec.rb b/decidim-meetings/spec/system/live_meeting_answer_questions_spec.rb
index 0283d7cdc534e..0130fd5bbed09 100644
--- a/decidim-meetings/spec/system/live_meeting_answer_questions_spec.rb
+++ b/decidim-meetings/spec/system/live_meeting_answer_questions_spec.rb
@@ -11,7 +11,7 @@
            :confirmed,
            organization: organization
   end
-  let(:user_2) do
+  let(:user2) do
     create :user,
            :confirmed,
            organization: organization
@@ -82,8 +82,8 @@
 
   context "when questions are closed" do
     let!(:question_multiple_option) { create(:meetings_poll_question, :closed, questionnaire: questionnaire, body: body_multiple_option_question, question_type: "multiple_option") }
-    let!(:answer_user_1) { create(:meetings_poll_answer, question: question_multiple_option, user: user, questionnaire: questionnaire) }
-    let!(:answer_choice_user_1) { create(:meetings_poll_answer_choice, answer: answer_user_1) }
+    let!(:answer_user1) { create(:meetings_poll_answer, question: question_multiple_option, user: user, questionnaire: questionnaire) }
+    let!(:answer_choice_user1) { create(:meetings_poll_answer_choice, answer: answer_user1) }
 
     before do
       visit meeting_live_event_path
diff --git a/decidim-meetings/spec/system/live_meeting_spec.rb b/decidim-meetings/spec/system/live_meeting_spec.rb
index 23dd20bec7935..84e2f880f105b 100644
--- a/decidim-meetings/spec/system/live_meeting_spec.rb
+++ b/decidim-meetings/spec/system/live_meeting_spec.rb
@@ -38,6 +38,26 @@
     expect(page).to have_current_path meeting_path
   end
 
+  context "with essential cookies only" do
+    before do
+      visit decidim.root_path
+      data_consent("essential")
+    end
+
+    it "tells that you need to enable cookies" do
+      visit meeting_live_event_path
+      expect(page).not_to have_selector("iframe")
+      expect(page).to have_content("You need to enable all cookies in order to see this content")
+    end
+
+    it "can enable all cookies" do
+      visit meeting_live_event_path
+      click_link "Change cookie settings"
+      click_button "Accept all"
+      expect(page).to have_selector("iframe")
+    end
+  end
+
   context "when user is logged and session is about to timeout" do
     before do
       allow(Decidim.config).to receive(:expire_session_after).and_return(2.minutes)
@@ -49,7 +69,7 @@
 
     context "when meeting is live" do
       let(:meeting) { create(:meeting, :published, :online, :embed_in_meeting_page_iframe_embed_type, component: component, start_time: 1.minute.ago, end_time: end_time) }
-      let(:end_time) { Time.current + 1.hour }
+      let(:end_time) { 1.hour.from_now }
 
       it "does not timeout user" do
         travel 5.minutes
@@ -59,12 +79,12 @@
       end
 
       context "and ends soon" do
-        let(:end_time) { Time.current + 15.seconds }
+        let(:end_time) { 15.seconds.from_now }
 
         it "logouts user" do
           travel 1.minute
           expect(page).to have_content("If you continue being inactive", wait: 30)
-          allow(Time).to receive(:current).and_return(Time.current + 1.minute)
+          allow(Time).to receive(:current).and_return(1.minute.from_now)
           expect(page).to have_content("You are not allowed to view this meeting")
         end
       end
diff --git a/decidim-meetings/spec/system/meeting_registrations_spec.rb b/decidim-meetings/spec/system/meeting_registrations_spec.rb
index 048d1c730d3a2..859a1fcb1d889 100644
--- a/decidim-meetings/spec/system/meeting_registrations_spec.rb
+++ b/decidim-meetings/spec/system/meeting_registrations_spec.rb
@@ -430,7 +430,7 @@ def questionnaire_public_path
         it "shows validation pending if not validated" do
           visit_meeting
 
-          expect(registration.validated_at).to be(nil)
+          expect(registration.validated_at).to be_nil
           expect(page).to have_content("VALIDATION PENDING")
         end
       end
@@ -443,7 +443,7 @@ def questionnaire_public_path
         it "shows validation pending if not validated" do
           visit_meeting
 
-          expect(registration.validated_at).to be(nil)
+          expect(registration.validated_at).to be_nil
           expect(page).to have_no_content("VALIDATION PENDING")
         end
       end
@@ -457,7 +457,7 @@ def questionnaire_public_path
           registration.update validated_at: Time.current
           visit_meeting
 
-          expect(registration.validated_at).not_to be(nil)
+          expect(registration.validated_at).not_to be_nil
           expect(page).to have_content("VALIDATED")
         end
       end
@@ -471,7 +471,7 @@ def questionnaire_public_path
           registration.update validated_at: Time.current
           visit_meeting
 
-          expect(registration.validated_at).not_to be(nil)
+          expect(registration.validated_at).not_to be_nil
           expect(page).to have_no_content("VALIDATED")
         end
       end
diff --git a/decidim-meetings/spec/system/meeting_spec.rb b/decidim-meetings/spec/system/meeting_spec.rb
index f5a0d27f3c81f..f3c6d6eec1612 100644
--- a/decidim-meetings/spec/system/meeting_spec.rb
+++ b/decidim-meetings/spec/system/meeting_spec.rb
@@ -153,7 +153,7 @@ def visit_meeting
     end
 
     context "when meeting is live" do
-      let(:meeting) { create(:meeting, :published, component: component, start_time: 1.minute.ago, end_time: Time.current + 1.hour) }
+      let(:meeting) { create(:meeting, :published, component: component, start_time: 1.minute.ago, end_time: 1.hour.from_now) }
 
       it "does not timeout user" do
         visit_meeting
@@ -164,7 +164,7 @@ def visit_meeting
     end
 
     context "when meeting is in future" do
-      let(:meeting) { create(:meeting, :published, component: component, start_time: Time.current + 1.day, end_time: Time.current + 1.day + 2.hours) }
+      let(:meeting) { create(:meeting, :published, component: component, start_time: 1.day.from_now, end_time: 1.day.from_now + 2.hours) }
 
       it "timeouts user normally" do
         visit_meeting
diff --git a/decidim-meetings/spec/system/private_meetings_spec.rb b/decidim-meetings/spec/system/private_meetings_spec.rb
index 9750a5a8d9e1d..af2671747b2de 100644
--- a/decidim-meetings/spec/system/private_meetings_spec.rb
+++ b/decidim-meetings/spec/system/private_meetings_spec.rb
@@ -75,7 +75,7 @@
           end
         end
 
-        context "when user is logged in and has not been invited to meeting" do
+        context "when user is logged in and has not been invited to the meeting" do
           before do
             switch_to_host(organization.host)
             login_as user, scope: :user
@@ -92,7 +92,7 @@
           end
         end
 
-        context "when user is logged in and has been invited to meeting" do
+        context "when user is logged in and has been invited to the meeting" do
           before do
             switch_to_host(organization.host)
             login_as other_user, scope: :user
diff --git a/decidim-meetings/spec/system/search_meetings_spec.rb b/decidim-meetings/spec/system/search_meetings_spec.rb
index 0621708b52c31..76b6b4abce6f9 100644
--- a/decidim-meetings/spec/system/search_meetings_spec.rb
+++ b/decidim-meetings/spec/system/search_meetings_spec.rb
@@ -8,14 +8,14 @@
 
   context "when meetings are published" do
     let!(:searchables) { create_list(:meeting, 3, :published, component: component) }
-    let!(:term) { searchables.first.title["en"].split(" ").sample }
+    let!(:term) { searchables.first.title["en"].split.sample }
 
     include_examples "searchable results"
   end
 
   context "when meetings are not published" do
     let!(:searchables) { create_list(:meeting, 3, component: component) }
-    let!(:term) { searchables.first.title["en"].split(" ").sample }
+    let!(:term) { searchables.first.title["en"].split.sample }
     let(:organization) { create(:organization) }
 
     before do
diff --git a/decidim-meetings/spec/system/user_close_meeting_spec.rb b/decidim-meetings/spec/system/user_close_meeting_spec.rb
index 250f8d699fdde..c8f515cf700d4 100644
--- a/decidim-meetings/spec/system/user_close_meeting_spec.rb
+++ b/decidim-meetings/spec/system/user_close_meeting_spec.rb
@@ -56,7 +56,7 @@
       expect(page).to have_content(closing_report)
       expect(page).not_to have_content "Close meeting"
       expect(page).not_to have_content "ATTENDING ORGANIZATIONS"
-      expect(meeting.reload.closed_at).not_to be nil
+      expect(meeting.reload.closed_at).not_to be_nil
     end
 
     context "when updates the meeting report" do
@@ -92,7 +92,7 @@
         expect(page).to have_content(edit_closing_report)
         expect(page).not_to have_content "Close meeting"
         expect(page).not_to have_content "ATTENDING ORGANIZATIONS"
-        expect(meeting.reload.closed_at).not_to be nil
+        expect(meeting.reload.closed_at).not_to be_nil
       end
     end
 
diff --git a/decidim-meetings/spec/system/user_creates_meeting_spec.rb b/decidim-meetings/spec/system/user_creates_meeting_spec.rb
index d24c9a12677b1..60140588c4809 100644
--- a/decidim-meetings/spec/system/user_creates_meeting_spec.rb
+++ b/decidim-meetings/spec/system/user_creates_meeting_spec.rb
@@ -55,7 +55,7 @@
         let(:meeting_address) { "Some address" }
         let(:latitude) { 40.1234 }
         let(:longitude) { 2.1234 }
-        let!(:meeting_start_time) { Time.current + 2.days }
+        let!(:meeting_start_time) { 2.days.from_now }
         let(:meeting_end_time) { meeting_start_time + 4.hours }
         let(:meeting_available_slots) { 30 }
         let(:meeting_registration_terms) { "These are the registration terms for this meeting" }
diff --git a/decidim-meetings/spec/system/user_edit_meeting_spec.rb b/decidim-meetings/spec/system/user_edit_meeting_spec.rb
index 7d42806ad3519..a1e7ddb435706 100644
--- a/decidim-meetings/spec/system/user_edit_meeting_spec.rb
+++ b/decidim-meetings/spec/system/user_edit_meeting_spec.rb
@@ -105,7 +105,7 @@
 
         within "textarea#meeting_description" do
           expect(page).to have_content translated(meeting.description)
-          expect(page).to have_no_content '<div class="ql-editor ql-reset-decidim">'
+          expect(page).to have_no_content '<div class="ql-editor">'
         end
       end
     end
diff --git a/decidim-meetings/spec/types/meeting_type_spec.rb b/decidim-meetings/spec/types/meeting_type_spec.rb
index 9dcfc99c56aa2..91cca01c62e15 100644
--- a/decidim-meetings/spec/types/meeting_type_spec.rb
+++ b/decidim-meetings/spec/types/meeting_type_spec.rb
@@ -17,6 +17,7 @@ module Meetings
       let(:component) { create(:meeting_component) }
       let(:model) { create(:meeting, component: component) }
 
+      include_examples "authorable interface"
       include_examples "categorizable interface"
       include_examples "timestamps interface"
       include_examples "scopable interface"
@@ -288,16 +289,6 @@ module Meetings
           expect(response["transparent"]).to be true
         end
       end
-
-      describe "author" do
-        let(:model) { create(:meeting, :not_official, author: author, component: component) }
-        let(:author) { create(:user, organization: component.participatory_space.organization) }
-        let(:query) { "{ author { name } }" }
-
-        it "includes the user's name" do
-          expect(response["author"]["name"]).to eq(author.name)
-        end
-      end
     end
   end
 end
diff --git a/decidim-pages/app/commands/decidim/pages/admin/update_page.rb b/decidim-pages/app/commands/decidim/pages/admin/update_page.rb
index 1c061cbd41e73..1977d06d094a2 100644
--- a/decidim-pages/app/commands/decidim/pages/admin/update_page.rb
+++ b/decidim-pages/app/commands/decidim/pages/admin/update_page.rb
@@ -5,7 +5,7 @@ module Pages
     module Admin
       # This command is executed when the user changes a Page from the admin
       # panel.
-      class UpdatePage < Rectify::Command
+      class UpdatePage < Decidim::Command
         # Initializes a UpdatePage Command.
         #
         # form - The form from which to get the data.
diff --git a/decidim-pages/app/commands/decidim/pages/copy_page.rb b/decidim-pages/app/commands/decidim/pages/copy_page.rb
index 34e8e7633bced..dc9167964abab 100644
--- a/decidim-pages/app/commands/decidim/pages/copy_page.rb
+++ b/decidim-pages/app/commands/decidim/pages/copy_page.rb
@@ -5,7 +5,7 @@ module Pages
     # Command that gets called whenever a component's page has to be duplicated.
     # It's need a context with the old component that
     # is going to be duplicated on the new one
-    class CopyPage < Rectify::Command
+    class CopyPage < Decidim::Command
       def initialize(context)
         @context = context
       end
diff --git a/decidim-pages/app/commands/decidim/pages/create_page.rb b/decidim-pages/app/commands/decidim/pages/create_page.rb
index 8afc4c96c5443..a978d14ca1e32 100644
--- a/decidim-pages/app/commands/decidim/pages/create_page.rb
+++ b/decidim-pages/app/commands/decidim/pages/create_page.rb
@@ -4,7 +4,7 @@ module Decidim
   module Pages
     # Command that gets called whenever a component's page has to be created. It
     # usually happens as a callback when the component itself is created.
-    class CreatePage < Rectify::Command
+    class CreatePage < Decidim::Command
       def initialize(component)
         @component = component
       end
diff --git a/decidim-pages/app/commands/decidim/pages/destroy_page.rb b/decidim-pages/app/commands/decidim/pages/destroy_page.rb
index 49f194553d8a4..1072511f39a74 100644
--- a/decidim-pages/app/commands/decidim/pages/destroy_page.rb
+++ b/decidim-pages/app/commands/decidim/pages/destroy_page.rb
@@ -4,7 +4,7 @@ module Decidim
   module Pages
     # Command that gets called when the page of this component needs to be
     # destroyed. It usually happens as a callback when the component is removed.
-    class DestroyPage < Rectify::Command
+    class DestroyPage < Decidim::Command
       def initialize(component)
         @component = component
       end
diff --git a/decidim-pages/config/locales/ar.yml b/decidim-pages/config/locales/ar.yml
index 15943798ace65..2758d5d37f943 100644
--- a/decidim-pages/config/locales/ar.yml
+++ b/decidim-pages/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/bg.yml b/decidim-pages/config/locales/bg.yml
index f705f6908c98d..cc3180509c795 100644
--- a/decidim-pages/config/locales/bg.yml
+++ b/decidim-pages/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ca.yml b/decidim-pages/config/locales/ca.yml
index 85d0f563fee57..c8a4c81f2abcb 100644
--- a/decidim-pages/config/locales/ca.yml
+++ b/decidim-pages/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/cs.yml b/decidim-pages/config/locales/cs.yml
index a70130013e7ff..337e8f4db144f 100644
--- a/decidim-pages/config/locales/cs.yml
+++ b/decidim-pages/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/de.yml b/decidim-pages/config/locales/de.yml
index d0e0fb5f576cb..3f8f55482b011 100644
--- a/decidim-pages/config/locales/de.yml
+++ b/decidim-pages/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/el.yml b/decidim-pages/config/locales/el.yml
index 524550d99f7b4..4f4e6c34ba486 100644
--- a/decidim-pages/config/locales/el.yml
+++ b/decidim-pages/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/es-MX.yml b/decidim-pages/config/locales/es-MX.yml
index e7298d4f6f483..4b9037591a5dc 100644
--- a/decidim-pages/config/locales/es-MX.yml
+++ b/decidim-pages/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/es-PY.yml b/decidim-pages/config/locales/es-PY.yml
index 2d47b1ff03c87..0c48648727577 100644
--- a/decidim-pages/config/locales/es-PY.yml
+++ b/decidim-pages/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/es.yml b/decidim-pages/config/locales/es.yml
index 0b0ffef6c2742..f46edc0186c9c 100644
--- a/decidim-pages/config/locales/es.yml
+++ b/decidim-pages/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/eu.yml b/decidim-pages/config/locales/eu.yml
index 65964466243cc..9f1aeac83ccaa 100644
--- a/decidim-pages/config/locales/eu.yml
+++ b/decidim-pages/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/fi-plain.yml b/decidim-pages/config/locales/fi-plain.yml
index 95ed2f5eee78f..1902596b66dc5 100644
--- a/decidim-pages/config/locales/fi-plain.yml
+++ b/decidim-pages/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/fi.yml b/decidim-pages/config/locales/fi.yml
index 9dfca439fa243..482e3e43ead47 100644
--- a/decidim-pages/config/locales/fi.yml
+++ b/decidim-pages/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/fr-CA.yml b/decidim-pages/config/locales/fr-CA.yml
index 79e2e1080ce34..d1b41dfb7b244 100644
--- a/decidim-pages/config/locales/fr-CA.yml
+++ b/decidim-pages/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/fr.yml b/decidim-pages/config/locales/fr.yml
index dedfb35e16996..4853ab834a322 100644
--- a/decidim-pages/config/locales/fr.yml
+++ b/decidim-pages/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ga-IE.yml b/decidim-pages/config/locales/ga-IE.yml
index d19560a5facd4..4cf22062c92fc 100644
--- a/decidim-pages/config/locales/ga-IE.yml
+++ b/decidim-pages/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   decidim:
     components:
diff --git a/decidim-pages/config/locales/gl.yml b/decidim-pages/config/locales/gl.yml
index 842c8958577c6..bcbc7cc0a550a 100644
--- a/decidim-pages/config/locales/gl.yml
+++ b/decidim-pages/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/hu.yml b/decidim-pages/config/locales/hu.yml
index d426ea1830f76..64af30f26aa4f 100644
--- a/decidim-pages/config/locales/hu.yml
+++ b/decidim-pages/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/id-ID.yml b/decidim-pages/config/locales/id-ID.yml
index 21660dc6aec3a..5bc457ff293c9 100644
--- a/decidim-pages/config/locales/id-ID.yml
+++ b/decidim-pages/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/is-IS.yml b/decidim-pages/config/locales/is-IS.yml
index 008258cedede8..265e4cd4bd5d9 100644
--- a/decidim-pages/config/locales/is-IS.yml
+++ b/decidim-pages/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     admin_log:
       page:
diff --git a/decidim-pages/config/locales/it.yml b/decidim-pages/config/locales/it.yml
index fe69e48d4cffa..5baaa7448de20 100644
--- a/decidim-pages/config/locales/it.yml
+++ b/decidim-pages/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ja.yml b/decidim-pages/config/locales/ja.yml
index d39184425d73b..9fca8641ab496 100644
--- a/decidim-pages/config/locales/ja.yml
+++ b/decidim-pages/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ka-GE.yml b/decidim-pages/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-pages/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-pages/config/locales/lb.yml b/decidim-pages/config/locales/lb.yml
index 40c788d6cd462..6f5859b5e1a91 100644
--- a/decidim-pages/config/locales/lb.yml
+++ b/decidim-pages/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/lt.yml b/decidim-pages/config/locales/lt.yml
index 963fa3086c51d..b8b0d2c2b983f 100644
--- a/decidim-pages/config/locales/lt.yml
+++ b/decidim-pages/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/lv.yml b/decidim-pages/config/locales/lv.yml
index db38b710a12db..65881bf43df06 100644
--- a/decidim-pages/config/locales/lv.yml
+++ b/decidim-pages/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/nl.yml b/decidim-pages/config/locales/nl.yml
index 9bdb7d7029c2e..d895aff222663 100644
--- a/decidim-pages/config/locales/nl.yml
+++ b/decidim-pages/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/no.yml b/decidim-pages/config/locales/no.yml
index c60942485a822..ccca58a2a1ac0 100644
--- a/decidim-pages/config/locales/no.yml
+++ b/decidim-pages/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/pl.yml b/decidim-pages/config/locales/pl.yml
index 4b6eff1f0e158..33ebaa5018ca7 100644
--- a/decidim-pages/config/locales/pl.yml
+++ b/decidim-pages/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/pt-BR.yml b/decidim-pages/config/locales/pt-BR.yml
index 9a9ef44ae2b3c..f23690b7b42c9 100644
--- a/decidim-pages/config/locales/pt-BR.yml
+++ b/decidim-pages/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/pt.yml b/decidim-pages/config/locales/pt.yml
index 61f599e00627f..b388654b1dd1e 100644
--- a/decidim-pages/config/locales/pt.yml
+++ b/decidim-pages/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ro-RO.yml b/decidim-pages/config/locales/ro-RO.yml
index 626d870fd3465..2c7575e8ba163 100644
--- a/decidim-pages/config/locales/ro-RO.yml
+++ b/decidim-pages/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/ru.yml b/decidim-pages/config/locales/ru.yml
index 3b0629ef93c70..577c01b6d5b14 100644
--- a/decidim-pages/config/locales/ru.yml
+++ b/decidim-pages/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/sk.yml b/decidim-pages/config/locales/sk.yml
index 79d04282ffaee..ca6226aa98332 100644
--- a/decidim-pages/config/locales/sk.yml
+++ b/decidim-pages/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/sl.yml b/decidim-pages/config/locales/sl.yml
index a5fea3ae7b3ad..fbd8b6e4451f4 100644
--- a/decidim-pages/config/locales/sl.yml
+++ b/decidim-pages/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/sv.yml b/decidim-pages/config/locales/sv.yml
index 97e317d8bdf08..980006e8cb5e3 100644
--- a/decidim-pages/config/locales/sv.yml
+++ b/decidim-pages/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/tr-TR.yml b/decidim-pages/config/locales/tr-TR.yml
index 9a8e0165aa28e..e9ede688191f8 100644
--- a/decidim-pages/config/locales/tr-TR.yml
+++ b/decidim-pages/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/uk.yml b/decidim-pages/config/locales/uk.yml
index e7788312c20ec..3f11a4d981d75 100644
--- a/decidim-pages/config/locales/uk.yml
+++ b/decidim-pages/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activerecord:
     models:
diff --git a/decidim-pages/config/locales/zh-CN.yml b/decidim-pages/config/locales/zh-CN.yml
index bd31994f445ce..4299f895c41ea 100644
--- a/decidim-pages/config/locales/zh-CN.yml
+++ b/decidim-pages/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activerecord:
     models:
diff --git a/decidim-pages/decidim-pages.gemspec b/decidim-pages/decidim-pages.gemspec
index fae0247886397..40444b2aadfe2 100644
--- a/decidim-pages/decidim-pages.gemspec
+++ b/decidim-pages/decidim-pages.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-pages"
   s.summary = "Decidim pages module"
diff --git a/decidim-pages/lib/decidim/pages/version.rb b/decidim-pages/lib/decidim/pages/version.rb
index bdde9b730b52e..96d2be18b819b 100644
--- a/decidim-pages/lib/decidim/pages/version.rb
+++ b/decidim-pages/lib/decidim/pages/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Pages
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-pages/spec/commands/create_page_spec.rb b/decidim-pages/spec/commands/create_page_spec.rb
index 266edb1910877..27a6e8a51e0de 100644
--- a/decidim-pages/spec/commands/create_page_spec.rb
+++ b/decidim-pages/spec/commands/create_page_spec.rb
@@ -12,7 +12,7 @@ module Pages
         describe "when the page is not saved" do
           before do
             # rubocop:disable RSpec/AnyInstance
-            expect_any_instance_of(Page).to receive(:save).and_return(false)
+            allow_any_instance_of(Page).to receive(:save).and_return(false)
             # rubocop:enable RSpec/AnyInstance
           end
 
diff --git a/decidim-pages/spec/commands/update_page_spec.rb b/decidim-pages/spec/commands/update_page_spec.rb
index 61793f7ba1938..03af49c6c5f4e 100644
--- a/decidim-pages/spec/commands/update_page_spec.rb
+++ b/decidim-pages/spec/commands/update_page_spec.rb
@@ -28,7 +28,7 @@ module Admin
 
         describe "when the form is invalid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-pages/spec/permissions/decidim/pages/permissions_spec.rb b/decidim-pages/spec/permissions/decidim/pages/permissions_spec.rb
index ec358f42dc840..c8aa6fc52eadf 100644
--- a/decidim-pages/spec/permissions/decidim/pages/permissions_spec.rb
+++ b/decidim-pages/spec/permissions/decidim/pages/permissions_spec.rb
@@ -13,14 +13,14 @@
     }
   end
   let(:page_component) { create :page_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when updating a page" do
     let(:action) do
       { scope: :admin, action: :update, subject: :page }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when any other action" do
diff --git a/decidim-participatory_processes/README.md b/decidim-participatory_processes/README.md
index d6fa2c65eea85..f6ef5a7b43c1b 100644
--- a/decidim-participatory_processes/README.md
+++ b/decidim-participatory_processes/README.md
@@ -33,10 +33,6 @@ This is on the default Decidim installation so you shouldn't change anything to
 
 ![Admin View](docs/screenshot02.png)
 
-## Documentation
-
-Read more about this Space on [Admin Manual](https://docs.decidim.org/admin-manual/en/processess/).
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb
index 0575ef1445977..b60b5d6fbf9aa 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb
@@ -3,7 +3,7 @@
     <%= cell(
       "decidim/scopes_picker",
       form,
-      attribute: :scope_id,
+      attribute: :with_scope,
       multiple: true,
       legend_title: I18n.t("decidim.scopes.scopes"),
       label: false,
@@ -11,11 +11,11 @@
     ) %>
   </div>
   <div class="columns mediumlarge-6 large-5">
-    <%= form.areas_select :area_id,
+    <%= form.areas_select :with_area,
                           areas_for_select(current_organization),
                           legend_title: t("decidim.shared.participatory_space_filters.filters.areas"),
                           label: "",
-                          selected: filter.area_id,
+                          selected: filter.with_area,
                           include_blank: t("decidim.shared.participatory_space_filters.filters.select_an_area") %>
   </div>
 <% end %>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/show.erb
index 9a4b314049c32..7de9a6e803fe1 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/show.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/show.erb
@@ -1,6 +1,7 @@
 <section class="section" id="<%= block_id %>">
   <%= render :title_filter_order %>
   <%= render :participatory_space_filters %>
+  <p class="loading"><%= t("loading", scope: "decidim.participatory_processes.participatory_processes.index") %></p>
   <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
     <%= cell "decidim/participatory_processes/filtered_participatory_processes", filtered_relation, default_filter: default_date_filter %>
   </div>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes_cell.rb
index 0c506017d9ce6..18ee1a60dfb5c 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes_cell.rb
@@ -23,7 +23,7 @@ def block_id
         end
 
         def filtered_relation
-          @filtered_relation ||= search.results
+          @filtered_relation ||= search.result
         end
 
         def default_date_filter
@@ -36,20 +36,15 @@ def default_date_filter
 
         private
 
-        def search_klass
-          Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch
+        def search_collection
+          base_relation
         end
 
         def default_filter_params
           {
-            scope_id: nil,
-            area_id: nil
-          }
-        end
-
-        def default_search_params
-          {
-            base_relation: base_relation
+            with_scope: nil,
+            with_area: nil,
+            with_type: nil
           }
         end
 
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb
index 4830239bbd634..44f6ef6555c4b 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb
@@ -2,7 +2,7 @@
   <h2 class="heading2"><%= translated_attribute(participatory_process_group.title) %></h2>
   <div class="row">
     <div class="columns medium-9">
-      <%= decidim_sanitize_editor translated_attribute(participatory_process_group.description) %>
+      <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_group.description) %>
       <div class="row">
         <div class="column medium-6 text-muted">
           <%= icon "grid-three-up", role: "img", "aria-hidden": true, class: "mr-xs" %>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/process_filters_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/process_filters_cell.rb
index 1631dfcb5ac21..c62fce443553d 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/process_filters_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_process_groups/process_filters_cell.rb
@@ -25,22 +25,15 @@ module ParticipatoryProcessGroups
     #   date_filter: "active"
     # )
     class ProcessFiltersCell < Decidim::ParticipatoryProcesses::ProcessFiltersCell
-      def filter_link(filter)
+      def filter_link(date_filter, type_filter = nil)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_process_group_path(
-            model,
-            filter: {
-              scope_id: get_filter(:scope_id),
-              area_id: get_filter(:area_id),
-              date: filter
-            }
-          )
+          .participatory_process_group_path(model, **filter_params(date_filter, type_filter))
       end
 
       def current_filter
-        get_filter(:date, default_date_filter)
+        get_filter(:with_date, default_date_filter)
       end
 
       def base_relation
@@ -53,21 +46,25 @@ def base_relation
       def process_count_by_filter
         @process_count_by_filter ||= begin
           counts = ALL_FILTERS.without("all").each_with_object({}) do |filter_name, collection_by_filter|
-            collection_by_filter.update(filter_name => filtered_processes(filter_name).results.count)
+            collection_by_filter.update(filter_name => filtered_processes(filter_name).count)
           end
           counts.update("all" => counts.values.sum)
         end
       end
 
-      def filtered_processes(date_filter)
-        Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch.new(
-          base_relation: base_relation,
-          date: date_filter,
-          scope_id: get_filter(:scope_id),
-          area_id: get_filter(:area_id),
+      def filtered_processes(date_filter, filter_with_type: true)
+        query = base_relation.ransack(
+          {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: filter_with_type ? get_filter(:with_type) : nil
+          },
           current_user: current_user,
           organization: current_organization
-        )
+        ).result
+
+        query.published.visible_for(current_user)
       end
 
       def default_date_filter
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb
index 5c9208c050718..b88a9fe24d572 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb
@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_processes" class="wrapper-home home-section">
   <div class="row" id="highlighted-processes">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb
index e27352a98f7b9..6d9053e11269e 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb
@@ -51,7 +51,7 @@ def highlighted_processes
                                          OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
                                          HighlightedParticipatoryProcesses.new |
                                          FilteredParticipatoryProcesses.new("active")
-                                       ).query.includes([:organization]).limit(highlighted_processes_max_results)
+                                       ).query.with_attached_hero_image.includes([:organization, :hero_image_attachment]).limit(highlighted_processes_max_results)
                                      end
         end
 
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/filtered_participatory_processes_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/filtered_participatory_processes_cell.rb
index a3309cf72df33..d2554e720c665 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/filtered_participatory_processes_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/filtered_participatory_processes_cell.rb
@@ -17,26 +17,30 @@ module ParticipatoryProcesses
     # cell(
     #   "decidim/participatory_processes/filtered_participatory_processes",
     #   group.participatory_processes.published,
-    #   date_filter: "active"
+    #   default_filter: "active"
     # )
     class FilteredParticipatoryProcessesCell < Decidim::ViewModel
       include Decidim::FilterResource
       include Decidim::CardHelper
 
       def elements
-        @elements ||= search.results
+        @elements ||= search.result
       end
 
       private
 
-      def search_klass
-        Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch
+      def search_collection
+        base_relation.published.visible_for(current_user).includes(:area)
       end
 
-      def default_search_params
+      def base_relation
+        model
+      end
+
+      def default_filter_params
         {
-          base_relation: model,
-          date: default_date_filter
+          with_date: default_date_filter,
+          with_type: nil
         }
       end
 
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/show.erb
index 9191561691c4c..35e2b647b2adb 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/show.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/show.erb
@@ -1,13 +1,17 @@
-<div class="row collapse order-by">
-  <h3 class="order-by__text section-heading">
-    <%= title %>
-    <%= render :filter_tabs %>
-  </h3>
-</div>
-<% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
 <div class="row column">
-  <div class="callout warning mb-sm">
-    <p><%= t("decidim.participatory_processes.participatory_processes.filters.explanations.no_active_nor_upcoming_callout") %></p>
+  <div class="flex--sbe">
+    <h3 class="section-heading collapse">
+      <%= title %>
+      <%= render :filter_tabs %>
+    </h3>
+    <%= render :type_filter if participatory_process_types_for_select.present? %>
   </div>
+  <hr class="reset mt-s mb-s">
 </div>
+<% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
+  <div class="row column">
+    <div class="callout warning mb-sm">
+      <p><%= t("decidim.participatory_processes.participatory_processes.filters.explanations.no_active_nor_upcoming_callout") %></p>
+    </div>
+  </div>
 <% end %>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/type_filter.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/type_filter.erb
new file mode 100644
index 0000000000000..c819a9159a984
--- /dev/null
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters/type_filter.erb
@@ -0,0 +1,17 @@
+<div id="process-type-filter" class="inline-filters">
+  <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+    <ul class="list-reset">
+      <% participatory_process_types_for_select.each do |title, id| %>
+        <li>
+          <%= link_to filter_link(current_filter, id), remote: true do %>
+            <%= title %>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+  <label>
+    <span><%= filter_type_label %></span>
+    <button id="button-text" data-toggle="inline-filter-sort"><%= current_type_filter_name %></button>
+  </label>
+</div>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters_cell.rb
index ec3b3bd7dca35..ae3b25a22b94d 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_filters_cell.rb
@@ -5,42 +5,57 @@ module ParticipatoryProcesses
     class ProcessFiltersCell < Decidim::ViewModel
       ALL_FILTERS = %w(active upcoming past all).freeze
 
-      def filter_link(filter)
+      def filter_link(date_filter, type_filter = nil)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_processes_path(
-            filter: {
-              scope_id: get_filter(:scope_id),
-              area_id: get_filter(:area_id),
-              date: filter
-            }
-          )
+          .participatory_processes_path(**filter_params(date_filter, type_filter))
       end
 
       def current_filter
-        get_filter(:date, model[:default_filter])
+        get_filter(:with_date, model[:default_filter])
+      end
+
+      def current_type_filter_name
+        participatory_process_types_for_select.find { |_, id| id == get_filter(:with_type) }&.first ||
+          I18n.t("all_types", scope: "decidim.participatory_processes.participatory_processes.filters")
       end
 
       def get_filter(filter_name, default = nil)
         params&.dig(:filter, filter_name) || default
       end
 
-      def filtered_processes(date_filter)
-        ParticipatoryProcessSearch.new(
-          date: date_filter,
-          scope_id: get_filter(:scope_id),
-          area_id: get_filter(:area_id),
+      def filter_params(date_filter, type_filter)
+        {
+          filter: {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: type_filter || get_filter(:with_type)
+          }
+        }
+      end
+
+      def filtered_processes(date_filter, filter_with_type: true)
+        query = ParticipatoryProcess.ransack(
+          {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: filter_with_type ? get_filter(:with_type) : nil
+          },
           current_user: current_user,
           organization: current_organization
-        )
+        ).result
+
+        query.published.visible_for(current_user)
       end
 
       def process_count_by_filter
         return @process_count_by_filter if @process_count_by_filter
 
         @process_count_by_filter = %w(active upcoming past).inject({}) do |collection_by_filter, filter_name|
-          filtered_processes = filtered_processes(filter_name).results
+          filtered_processes = filtered_processes(filter_name)
           processes = filtered_processes.groupless
           groups = Decidim::ParticipatoryProcessGroup.where(id: filtered_processes.grouped.group_ids)
           collection_by_filter.merge(filter_name => processes.count + groups.count)
@@ -67,6 +82,10 @@ def title
         I18n.t(current_filter, scope: "decidim.participatory_processes.participatory_processes.filters.counters", count: process_count_by_filter[current_filter])
       end
 
+      def filter_type_label
+        I18n.t("filter_by", scope: "decidim.participatory_processes.participatory_processes.filters")
+      end
+
       def filter_name(filter)
         I18n.t(filter, scope: "decidim.participatory_processes.participatory_processes.filters.names")
       end
@@ -86,6 +105,21 @@ def explanation_text
 
         "no_active_nor_upcoming"
       end
+
+      def participatory_process_types
+        @participatory_process_types ||= Decidim::ParticipatoryProcessType.joins(:processes).where(
+          decidim_participatory_processes: { id: filtered_processes(current_filter, filter_with_type: false) }
+        ).distinct
+      end
+
+      def participatory_process_types_for_select
+        return if participatory_process_types.blank?
+
+        [[I18n.t("all_types", scope: "decidim.participatory_processes.participatory_processes.filters"), ""]] +
+          participatory_process_types.map do |type|
+            [translated_attribute(type.title), type.id.to_s]
+          end
+      end
     end
   end
 end
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb
index ccf2c87a22916..3c21bf3b36bb5 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command that sets a step in a participatory process as active (and
       # unsets a previous active step)
-      class ActivateParticipatoryProcessStep < Rectify::Command
+      class ActivateParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # step - A ParticipatoryProcessStep that will be activated
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb
index cb440e7dba153..a98527ab25904 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb
@@ -5,14 +5,15 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when copying a new participatory
       # process in the system.
-      class CopyParticipatoryProcess < Rectify::Command
+      class CopyParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # participatory_process - A participatory_process we want to duplicate
-        def initialize(form, participatory_process)
+        def initialize(form, participatory_process, current_user)
           @form = form
           @participatory_process = participatory_process
+          @current_user = current_user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,12 +25,14 @@ def initialize(form, participatory_process)
         def call
           return broadcast(:invalid) if form.invalid?
 
-          ParticipatoryProcess.transaction do
-            copy_participatory_process
-            copy_participatory_process_attachments
-            copy_participatory_process_steps if @form.copy_steps?
-            copy_participatory_process_categories if @form.copy_categories?
-            copy_participatory_process_components if @form.copy_components?
+          Decidim.traceability.perform_action!("duplicate", @participatory_process, @current_user) do
+            ParticipatoryProcess.transaction do
+              copy_participatory_process
+              copy_participatory_process_attachments
+              copy_participatory_process_steps if @form.copy_steps?
+              copy_participatory_process_categories if @form.copy_categories?
+              copy_participatory_process_components if @form.copy_components?
+            end
           end
 
           broadcast(:ok, @copied_process)
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
index 692d017af6ffc..557619ac2e8db 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class CreateParticipatoryProcess < Rectify::Command
+      class CreateParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -89,6 +89,7 @@ def attributes
             start_date: form.start_date,
             end_date: form.end_date,
             participatory_process_group: form.participatory_process_group,
+            participatory_process_type: form.participatory_process_type,
             show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb
index ecbca3bb7e7aa..ea77607506fc0 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process group in the system.
-      class CreateParticipatoryProcessGroup < Rectify::Command
+      class CreateParticipatoryProcessGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_step.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_step.rb
index 40218b6b6a077..823094184336c 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_step.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_step.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class CreateParticipatoryProcessStep < Rectify::Command
+      class CreateParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_type.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_type.rb
new file mode 100644
index 0000000000000..e36fa482e4c6f
--- /dev/null
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/create_participatory_process_type.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when creating a new participatory
+      # process type in the system.
+      class CreateParticipatoryProcessType < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          create_participatory_process_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def create_participatory_process_type!
+          transaction do
+            Decidim.traceability.create!(
+              Decidim::ParticipatoryProcessType,
+              form.current_user,
+              organization: form.current_organization,
+              title: form.title
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb
index 56b173aae0e35..8d3591380666e 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when destroying a participatory
       # process admin in the system.
-      class DestroyParticipatoryProcessAdmin < Rectify::Command
+      class DestroyParticipatoryProcessAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the ParticipatoryProcessUserRole to destroy
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_group.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_group.rb
index ff7ae45bdce6c..a19e124b73822 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_group.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_group.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when deleting a ParticipatoryProcessGroup.
-      class DestroyParticipatoryProcessGroup < Rectify::Command
+      class DestroyParticipatoryProcessGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # participatory_process_group - the ParticipatoryProcessGroup to delete.
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_step.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_step.rb
index 47d2a82d9b8c3..4947e25176573 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_step.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_step.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that sets all steps in a participatory process as inactive
-      class DestroyParticipatoryProcessStep < Rectify::Command
+      class DestroyParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # step - A ParticipatoryProcessStep that will be deactivated
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_type.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_type.rb
new file mode 100644
index 0000000000000..6733048adc26c
--- /dev/null
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/destroy_participatory_process_type.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when destroying a participatory
+      # process type in the system.
+      class DestroyParticipatoryProcessType < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_process_type - A participatory_process_type object to
+        # destroy
+        # current_user - the user performing the action
+        def initialize(participatory_process_type, current_user)
+          @participatory_process_type = participatory_process_type
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          destroy_participatory_process_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :current_user
+
+        def destroy_participatory_process_type!
+          transaction do
+            Decidim.traceability.perform_action!(
+              "delete",
+              @participatory_process_type,
+              current_user
+            ) do
+              @participatory_process_type.destroy!
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/import_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/import_participatory_process.rb
index 69532d3544ea4..f29d5aef9566f 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/import_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/import_participatory_process.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when copying a new participatory
       # process in the system.
-      class ImportParticipatoryProcess < Rectify::Command
+      class ImportParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -38,11 +38,14 @@ def call
         def import_participatory_process
           importer = Decidim::ParticipatoryProcesses::ParticipatoryProcessImporter.new(form.current_organization, form.current_user)
           participatory_processes.each do |original_process|
-            @imported_process = importer.import(original_process, form.current_user, title: form.title, slug: form.slug)
-            importer.import_participatory_process_steps(original_process["participatory_process_steps"]) if form.import_steps?
-            importer.import_categories(original_process["participatory_process_categories"]) if form.import_categories?
-            importer.import_folders_and_attachments(original_process["attachments"]) if form.import_attachments?
-            importer.import_components(original_process["components"]) if form.import_components?
+            Decidim.traceability.perform_action!("import", Decidim::ParticipatoryProcess, form.current_user) do
+              @imported_process = importer.import(original_process, form.current_user, title: form.title, slug: form.slug)
+              importer.import_participatory_process_steps(original_process["participatory_process_steps"]) if form.import_steps?
+              importer.import_categories(original_process["participatory_process_categories"]) if form.import_categories?
+              importer.import_folders_and_attachments(original_process["attachments"]) if form.import_attachments?
+              importer.import_components(original_process["components"]) if form.import_components?
+              @imported_process
+            end
           end
         end
 
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/notify_role_assigned_to_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/notify_role_assigned_to_participatory_process.rb
index 04c1fec9deebd..0d59368450a0c 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/notify_role_assigned_to_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/notify_role_assigned_to_participatory_process.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command to notify users when a role is assigned for a participatory process
-      class NotifyRoleAssignedToParticipatoryProcess < Rectify::Command
+      class NotifyRoleAssignedToParticipatoryProcess < Decidim::Command
         def send_notification(user)
           Decidim::EventsManager.publish(
             event: "decidim.events.participatory_process.role_assigned",
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/publish_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/publish_participatory_process.rb
index ba16fd30c57d7..778ace09f6571 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/publish_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/publish_participatory_process.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that sets a participatory process as published.
-      class PublishParticipatoryProcess < Rectify::Command
+      class PublishParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # process - A ParticipatoryProcess that will be published
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/reorder_participatory_process_steps.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/reorder_participatory_process_steps.rb
index a39594012fa40..7e06fd400bf2e 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/reorder_participatory_process_steps.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/reorder_participatory_process_steps.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that reorders the steps in a participatory process.
-      class ReorderParticipatoryProcessSteps < Rectify::Command
+      class ReorderParticipatoryProcessSteps < Decidim::Command
         # Public: Initializes the command.
         #
         # collection - an ActiveRecord::Relation of steps
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/unpublish_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/unpublish_participatory_process.rb
index da966b73123e2..7185173396d7f 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/unpublish_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/unpublish_participatory_process.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that sets a participatory process as unpublished.
-      class UnpublishParticipatoryProcess < Rectify::Command
+      class UnpublishParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # process - A ParticipatoryProcess that will be unpublished
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
index 63e05b46e0bbe..9fff5ea26b2a4 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class UpdateParticipatoryProcess < Rectify::Command
+      class UpdateParticipatoryProcess < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -77,6 +77,7 @@ def attributes
             start_date: form.start_date,
             end_date: form.end_date,
             participatory_process_group: form.participatory_process_group,
+            participatory_process_type: form.participatory_process_type,
             show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb
index 2949d7fccb30b..cd225bc521a08 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process group in the system.
-      class UpdateParticipatoryProcessGroup < Rectify::Command
+      class UpdateParticipatoryProcessGroup < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
index 1fa3e87c27fee..9e44a8a5a9ff6 100644
--- a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class UpdateParticipatoryProcessStep < Rectify::Command
+      class UpdateParticipatoryProcessStep < Decidim::Command
         attr_reader :step
 
         # Public: Initializes the command.
diff --git a/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb
new file mode 100644
index 0000000000000..29cc48f20293d
--- /dev/null
+++ b/decidim-participatory_processes/app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when updating a participatory
+      # process type in the system.
+      class UpdateParticipatoryProcessType < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_process_type - A participatory_process_type object to
+        # update
+        # form - A form object with the params.
+        def initialize(participatory_process_type, form)
+          @participatory_process_type = participatory_process_type
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          update_participatory_process_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :participatory_process_type
+
+        def update_participatory_process_type!
+          transaction do
+            Decidim.traceability.update!(
+              participatory_process_type,
+              form.current_user,
+              title: form.title
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb
index 2f3526fb7ce23..ea2454d32b432 100644
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb
@@ -17,7 +17,7 @@ def create
           enforce_permission_to :create, :process
           @form = form(ParticipatoryProcessCopyForm).from_params(params)
 
-          CopyParticipatoryProcess.call(@form, current_participatory_process) do
+          CopyParticipatoryProcess.call(@form, current_participatory_process, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_processes_copies.create.success", scope: "decidim.admin")
               redirect_to participatory_processes_path
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb
new file mode 100644
index 0000000000000..60182a6d12ac8
--- /dev/null
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller used to manage participatory process types for the current
+      # organization
+      class ParticipatoryProcessTypesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
+        helper_method :collection, :current_participatory_process_type
+        layout "decidim/admin/participatory_process_type"
+
+        # GET /admin/participatory_process_types
+        def index
+          enforce_permission_to :index, :participatory_process_type
+        end
+
+        # GET /admin/participatory_process_types/new
+        def new
+          enforce_permission_to :create, :participatory_process_type
+          @form = participatory_process_type_form.instance
+        end
+
+        # POST /admin/participatory_process_types
+        def create
+          enforce_permission_to :create, :participatory_process_type
+          @form = participatory_process_type_form.from_params(params)
+
+          CreateParticipatoryProcessType.call(@form) do
+            on(:ok) do |_process_type|
+              flash[:notice] = I18n.t("participatory_process_types.create.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("participatory_process_types.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        # GET /admin/participatory_process_types/:id/edit
+        def edit
+          enforce_permission_to :edit, :participatory_process_type, participatory_process_type: current_participatory_process_type
+          @form = participatory_process_type_form.from_model(
+            current_participatory_process_type,
+            participatory_process_type: current_participatory_process_type
+          )
+        end
+
+        # PUT /admin/participatory_process_types/:id
+        def update
+          enforce_permission_to :update, :participatory_process_type, participatory_process_type: current_participatory_process_type
+
+          @form = participatory_process_type_form
+                  .from_params(params, participatory_process_type: current_participatory_process_type)
+
+          UpdateParticipatoryProcessType.call(current_participatory_process_type, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_process_types.update.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("participatory_process_types.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        # DELETE /admin/participatory_process_types/:id
+        def destroy
+          enforce_permission_to :destroy, :participatory_process_type, participatory_process_type: current_participatory_process_type
+
+          DestroyParticipatoryProcessType.call(current_participatory_process_type, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_process_types.destroy.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+          end
+        end
+
+        private
+
+        def participatory_process_type_form
+          form(Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessTypeForm)
+        end
+
+        def current_participatory_process_type
+          @current_participatory_process_type ||= Decidim::ParticipatoryProcessType.find(params[:id])
+        end
+
+        def collection
+          @collection ||= Decidim::ParticipatoryProcessType.where(organization: current_organization)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/reminders_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/reminders_controller.rb
new file mode 100644
index 0000000000000..acab6051897a4
--- /dev/null
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/admin/reminders_controller.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # a participatory process.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::ParticipatoryProcessAdmin
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
index 0742e0935844a..8cf0070d02ba6 100644
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
@@ -40,15 +40,16 @@ def all_metrics
 
       private
 
-      def search_klass
-        ParticipatoryProcessSearch
+      def search_collection
+        ParticipatoryProcess.where(organization: current_organization).published.visible_for(current_user).includes(:area)
       end
 
       def default_filter_params
         {
-          scope_id: nil,
-          area_id: nil,
-          date: default_date_filter
+          with_scope: nil,
+          with_area: nil,
+          with_type: nil,
+          with_date: default_date_filter
         }
       end
 
@@ -85,7 +86,7 @@ def collection
       end
 
       def filtered_processes
-        search.results
+        search.result
       end
 
       def participatory_processes
@@ -102,7 +103,7 @@ def stats
       end
 
       def metrics
-        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space)
+        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space, view_context: view_context)
       end
 
       def participatory_process_group
diff --git a/decidim-participatory_processes/app/events/decidim/participatory_process_role_assigned_event.rb b/decidim-participatory_processes/app/events/decidim/participatory_process_role_assigned_event.rb
index af5638d2f8677..51411c8fe59a1 100644
--- a/decidim-participatory_processes/app/events/decidim/participatory_process_role_assigned_event.rb
+++ b/decidim-participatory_processes/app/events/decidim/participatory_process_role_assigned_event.rb
@@ -6,7 +6,7 @@ class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
     include Decidim::Events::AuthorEvent
 
     def notification_title
-      I18n.t("notification_title", i18n_options).html_safe
+      I18n.t("notification_title", **i18n_options).html_safe
     end
 
     def i18n_role
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
index 2b3a2d03e2269..e7fbc86a568a8 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb
@@ -39,6 +39,7 @@ class ParticipatoryProcessForm < Form
         attribute :scopes_enabled, Boolean
         attribute :show_metrics, Boolean
         attribute :show_statistics, Boolean
+        attribute :participatory_process_type_id, Integer
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :start_date, Decidim::Attributes::LocalizedDate
@@ -66,6 +67,7 @@ class ParticipatoryProcessForm < Form
         def map_model(model)
           self.scope_id = model.decidim_scope_id
           self.participatory_process_group_id = model.decidim_participatory_process_group_id
+          self.participatory_process_type_id = model.decidim_participatory_process_type_id
           self.related_process_ids = model.linked_participatory_space_resources(:participatory_process, "related_processes").pluck(:id)
           @processes = Decidim::ParticipatoryProcess.where(organization: model.organization).where.not(id: model.id)
         end
@@ -86,12 +88,26 @@ def participatory_process_group
           Decidim::ParticipatoryProcessGroup.find_by(id: participatory_process_group_id)
         end
 
+        def participatory_process_type
+          Decidim::ParticipatoryProcessType.find_by(id: participatory_process_type_id)
+        end
+
         def processes
           @processes ||= Decidim::ParticipatoryProcess.where(organization: current_organization)
         end
 
+        def participatory_process_types_for_select
+          @participatory_process_types_for_select ||= participatory_process_types.map do |type|
+            [translated_attribute(type.title), type.id]
+          end
+        end
+
         private
 
+        def participatory_process_types
+          Decidim::ParticipatoryProcessType.where(organization: current_organization)
+        end
+
         def organization_participatory_processes
           OrganizationParticipatoryProcesses.new(current_organization).query
         end
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
index c5f80dc07cb4b..c8f6a89408113 100644
--- a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
@@ -8,7 +8,6 @@ module Admin
       #
       class ParticipatoryProcessImportForm < Form
         include TranslatableAttributes
-        include Decidim::HasUploadValidations
 
         JSON_MIME_TYPE = "application/json"
         # Accepted mime types
@@ -30,10 +29,9 @@ class ParticipatoryProcessImportForm < Form
         attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
-        attribute :document
-
-        validates :document, presence: true
+        attribute :document, Decidim::Attributes::Blob
 
+        validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
         validate :slug_uniqueness
@@ -41,7 +39,7 @@ class ParticipatoryProcessImportForm < Form
         validate :document_type_must_be_valid, if: :document
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
 
         def document_type_must_be_valid
@@ -60,9 +58,9 @@ def document_type
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.participatory_process.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text
diff --git a/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_type_form.rb b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_type_form.rb
new file mode 100644
index 0000000000000..e510b54fb87bf
--- /dev/null
+++ b/decidim-participatory_processes/app/forms/decidim/participatory_processes/admin/participatory_process_type_form.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A form object used to create participatory process types from the admin
+      # dashboard.
+      #
+      class ParticipatoryProcessTypeForm < Form
+        include TranslatableAttributes
+
+        mimic :participatory_process_type
+
+        translatable_attribute :title, String
+
+        validates :title, translatable_presence: true
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb b/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
index aac4eb318504e..edc298a762549 100644
--- a/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
+++ b/decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb
@@ -12,14 +12,14 @@ module ParticipatoryProcessHelper
       include Decidim::ResourceReferenceHelper
 
       # Public: Returns the dates for a step in a readable format like
-      # "2016-01-01 - 2016-02-05".
+      # "01/01/2016 - 05/02/2016".
       #
       # participatory_process_step - The step to format to
       #
       # Returns a String with the formatted dates.
       def step_dates(participatory_process_step)
         dates = [participatory_process_step.start_date, participatory_process_step.end_date]
-        dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
+        dates.map { |date| date ? l(date.to_date, format: :decidim_short) : "?" }.join(" - ")
       end
 
       # Public: Returns the path for the participatory process cta button
diff --git a/decidim-participatory_processes/app/models/decidim/participatory_process.rb b/decidim-participatory_processes/app/models/decidim/participatory_process.rb
index d2615bd511e05..693a7123443dc 100644
--- a/decidim-participatory_processes/app/models/decidim/participatory_process.rb
+++ b/decidim-participatory_processes/app/models/decidim/participatory_process.rb
@@ -21,6 +21,8 @@ class ParticipatoryProcess < ApplicationRecord
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
                         :target, :participatory_scope, :participatory_structure, :announcement
@@ -28,10 +30,6 @@ class ParticipatoryProcess < ApplicationRecord
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :area,
-               foreign_key: "decidim_area_id",
-               class_name: "Decidim::Area",
-               optional: true
     belongs_to :participatory_process_group,
                foreign_key: "decidim_participatory_process_group_id",
                class_name: "Decidim::ParticipatoryProcessGroup",
@@ -58,6 +56,10 @@ class ParticipatoryProcess < ApplicationRecord
                foreign_key: "decidim_scope_type_id",
                class_name: "Decidim::ScopeType",
                optional: true
+    belongs_to :participatory_process_type,
+               foreign_key: "decidim_participatory_process_type_id",
+               class_name: "Decidim::ParticipatoryProcessType",
+               optional: true
 
     has_many :components, as: :participatory_space, dependent: :destroy
 
@@ -76,6 +78,31 @@ class ParticipatoryProcess < ApplicationRecord
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
     scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gteq(Date.current).or(arel_table[:end_date].eq(nil)))) }
 
+    scope :with_date, lambda { |date_key|
+      case date_key
+      when "active"
+        active.order(start_date: :desc)
+      when "past"
+        past.order(end_date: :desc)
+      when "upcoming"
+        upcoming.order(start_date: :asc)
+      else # Assume 'all'
+        timezone = ActiveSupport::TimeZone.find_tzinfo(Time.zone.name).identifier
+        order(
+          Arel.sql(
+            sanitize_sql_array(
+              [
+                "ABS(start_date - (CURRENT_DATE at time zone :timezone)::date)",
+                { timezone: timezone }
+              ]
+            )
+          )
+        )
+      end
+    }
+
+    scope :with_type, ->(type_id) { where(decidim_participatory_process_type_id: type_id) }
+
     searchable_fields({
                         scope_id: :decidim_scope_id,
                         participatory_space: :itself,
@@ -177,8 +204,10 @@ def attachment_context
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    ransacker_i18n :title
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_date, :with_area, :with_scope, :with_type]
     end
   end
 end
diff --git a/decidim-participatory_processes/app/models/decidim/participatory_process_type.rb b/decidim-participatory_processes/app/models/decidim/participatory_process_type.rb
new file mode 100644
index 0000000000000..ca62a18501648
--- /dev/null
+++ b/decidim-participatory_processes/app/models/decidim/participatory_process_type.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ParticipatoryProcessType < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    has_many :processes,
+             foreign_key: "decidim_participatory_process_type_id",
+             class_name: "Decidim::ParticipatoryProcess",
+             inverse_of: :participatory_process_type,
+             dependent: :nullify
+
+    validates :title, presence: true
+
+    def self.log_presenter_class_for(_log)
+      Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessTypePresenter
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
index dbdcd74a2c52f..ae326db5352f7 100644
--- a/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
+++ b/decidim-participatory_processes/app/permissions/decidim/participatory_processes/permissions.rb
@@ -38,6 +38,7 @@ def permissions
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
+        participatory_process_type_action?
 
         return permission_action unless process
 
@@ -252,6 +253,19 @@ def org_admin_action?
         allow! if is_allowed
       end
 
+      def participatory_process_type_action?
+        return unless permission_action.subject == :participatory_process_type
+        return disallow! unless user.admin?
+
+        participatory_process_type = context.fetch(:participatory_process_type, nil)
+        case permission_action.action
+        when :destroy
+          toggle_allow(participatory_process_type&.processes&.none?)
+        else
+          allow!
+        end
+      end
+
       # Checks if the permission_action is to read the admin processes list or
       # not.
       def read_process_list_permission_action?
diff --git a/decidim-participatory_processes/app/presenters/decidim/log/value_types/participatory_process_type_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/log/value_types/participatory_process_type_presenter.rb
new file mode 100644
index 0000000000000..6b74f7de91328
--- /dev/null
+++ b/decidim-participatory_processes/app/presenters/decidim/log/value_types/participatory_process_type_presenter.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a
+      # Decidim::ParticipatoryProcessType. If the type can be found, it shows
+      # its title. Otherwise it shows its ID.
+      #
+      # Returns an HTML-safe String
+      class ParticipatoryProcessTypePresenter < Decidim::Log::ValueTypes::DefaultPresenter
+        def present
+          return unless value
+          return h.translated_attribute(type.title) if type
+
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.participatory_process_type_presenter")
+        end
+
+        private
+
+        def type
+          @type ||= Decidim::ParticipatoryProcessType.find_by(id: value)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
index f3e5b13995232..418421f73516f 100644
--- a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
@@ -31,13 +31,14 @@ def diff_fields_mapping
             slug: :string,
             subtitle: :i18n,
             target: :i18n,
-            title: :i18n
+            title: :i18n,
+            decidim_participatory_process_type_id: :participatory_process_type
           }
         end
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update"
+          when "create", "publish", "unpublish", "update", "import", "export", "duplicate"
             "decidim.admin_log.participatory_process.#{action}"
           else
             super
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter.rb
new file mode 100644
index 0000000000000..04f70d6b1a93e
--- /dev/null
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module AdminLog
+      # This class holds the logic to present a
+      # `Decidim::ParticipatoryProcessType`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    ParticipatoryProcessTypePresenter.new(action_log, view_helpers).present
+      class ParticipatoryProcessTypePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          { title: :i18n }
+        end
+
+        def action_string
+          case action
+          when "create", "update"
+            "decidim.admin_log.participatory_process_type.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.participatory_process_type"
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb
index 2c3d55f3b2bc3..03c490a5884fd 100644
--- a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb
@@ -4,9 +4,12 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
     class ParticipatoryProcessGroupStatsPresenter < Decidim::StatsPresenter
-      attribute :participatory_process_group, Decidim::ParticipatoryProcessGroup
       include Decidim::IconHelper
 
+      def participatory_process_group
+        __getobj__.fetch(:participatory_process_group)
+      end
+
       # Public: returns a collection of stats (Hash) for the participatory
       # process group landing page.
       def collection
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb
index 05d7a06240513..b88b1b6662982 100644
--- a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb
@@ -4,7 +4,11 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render metrics in ParticipatoryProcesses statistics page
     class ParticipatoryProcessMetricChartsPresenter < Decidim::MetricChartsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
+      delegate :hidden_field_tag, :link_to, :capture, to: :view_context
+
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
 
       def params
         capture do
diff --git a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb
index 7bf06c0afaf0e..5292ac4d80050 100644
--- a/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb
+++ b/decidim-participatory_processes/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb
@@ -4,9 +4,12 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
     class ParticipatoryProcessStatsPresenter < Decidim::StatsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
       include Decidim::IconHelper
 
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
+
       # Public: returns a collection of stats (Hash) for the Process Home.
       def collection
         highlighted_stats = process_participants_stats
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/admin_users.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/admin_users.rb
index 026588ea5684e..64e1c4e046388 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/admin_users.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/admin_users.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A class used to find the admins for a participatory process including
       # organization admins.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its process admins
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/moderators.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/moderators.rb
index 90afc5422ddb1..1e0410acd499e 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/moderators.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/admin/moderators.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     module Admin
       # A class used to find the users that can moderate the participatory
       # process.
-      class Moderators < Rectify::Query
+      class Moderators < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its moderators
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb
index 916903c7a803a..b139c3a92a833 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb
@@ -5,7 +5,7 @@ module ParticipatoryProcesses
     # This query class filters participatory processes groups given a filter name.
     # The filter is applied checking the start and end dates of the processes in
     # the group.
-    class FilteredParticipatoryProcessGroups < Rectify::Query
+    class FilteredParticipatoryProcessGroups < Decidim::Query
       def initialize(filter = "active")
         @filter = filter
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_processes.rb
index 38c25c769d70c..fa481c5cd2c57 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/filtered_participatory_processes.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a filter name.
     # It uses the start and end dates to select the correct processes.
-    class FilteredParticipatoryProcesses < Rectify::Query
+    class FilteredParticipatoryProcesses < Decidim::Query
       def initialize(filter = "active")
         @filter = filter
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_participatory_processes.rb
index a07d1acc45457..bcb98eb047507 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters all processes of a participatory process group
-    class GroupParticipatoryProcesses < Rectify::Query
+    class GroupParticipatoryProcesses < Decidim::Query
       def initialize(group)
         @group = group
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_published_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_published_participatory_processes.rb
index 23a76c3b73743..f0e0a0f7be87f 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_published_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/group_published_participatory_processes.rb
@@ -3,14 +3,14 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters published processes of a participatory process group
-    class GroupPublishedParticipatoryProcesses < Rectify::Query
+    class GroupPublishedParticipatoryProcesses < Decidim::Query
       def initialize(group, user = nil)
         @group = group
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           GroupParticipatoryProcesses.new(@group),
           VisibleParticipatoryProcesses.new(@user),
           PublishedParticipatoryProcesses.new
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/highlighted_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/highlighted_participatory_processes.rb
index 5c7a3f9e52797..256725a16f83d 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/highlighted_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/highlighted_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query selects some prioritized processes.
-    class HighlightedParticipatoryProcesses < Rectify::Query
+    class HighlightedParticipatoryProcesses < Decidim::Query
       def query
         PrioritizedParticipatoryProcesses.new.query.limit(8)
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_process_groups.rb
index 9d5f3c039568a..b3d983c1cf40f 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_process_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization.
-    class OrganizationParticipatoryProcessGroups < Rectify::Query
+    class OrganizationParticipatoryProcessGroups < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_processes.rb
index 77b2a5e196720..a9e09400fe20d 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters all processes given an organization.
-    class OrganizationParticipatoryProcesses < Rectify::Query
+    class OrganizationParticipatoryProcesses < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_process_groups.rb
index 4bcb4d1ae238a..901fb59ddf6a5 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_process_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization and a filter.
-    class OrganizationPrioritizedParticipatoryProcessGroups < Rectify::Query
+    class OrganizationPrioritizedParticipatoryProcessGroups < Decidim::Query
       def initialize(organization, filter = "active", user = nil)
         @organization = organization
         @filter = filter
@@ -11,7 +11,7 @@ def initialize(organization, filter = "active", user = nil)
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationParticipatoryProcessGroups.new(@organization),
           FilteredParticipatoryProcessGroups.new(@filter),
           VisibleParticipatoryProcessGroups.new(@user)
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb
index 467210c1bf9cb..5f6f429580c1f 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_prioritized_participatory_processes.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query class filters public processes given an organization and a
     # filter in a meaningful prioritized order.
-    class OrganizationPrioritizedParticipatoryProcesses < Rectify::Query
+    class OrganizationPrioritizedParticipatoryProcesses < Decidim::Query
       def initialize(organization, filter = "active", user = nil)
         @organization = organization
         @filter = filter
@@ -12,7 +12,7 @@ def initialize(organization, filter = "active", user = nil)
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedParticipatoryProcesses.new(@organization, @user),
           PrioritizedParticipatoryProcesses.new,
           FilteredParticipatoryProcesses.new(@filter)
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb
index 7c99523e8424b..fe6a74fd1712b 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_promoted_participatory_process_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization.
-    class OrganizationPromotedParticipatoryProcessGroups < Rectify::Query
+    class OrganizationPromotedParticipatoryProcessGroups < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb
index 994b3ea713e40..813b968348d75 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb
@@ -3,14 +3,14 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters published processes given an organization.
-    class OrganizationPublishedParticipatoryProcesses < Rectify::Query
+    class OrganizationPublishedParticipatoryProcesses < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationParticipatoryProcesses.new(@organization),
           VisibleParticipatoryProcesses.new(@user),
           PublishedParticipatoryProcesses.new
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/participatory_processes_by_group.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/participatory_processes_by_group.rb
index 782581e93ad3a..cee324547a29a 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/participatory_processes_by_group.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/participatory_processes_by_group.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # A class used to find the ParticipatoryProcesses from a ProcessGroup.
-    class ParticipatoryProcessesByGroup < Rectify::Query
+    class ParticipatoryProcessesByGroup < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for(process_group)
         new(process_group).query
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb
index 3042167307f08..a451713ee214e 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb
@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query orders processes by importance, prioritizing promoted processes
     # first, and closest to finalization date second.
-    class PrioritizedParticipatoryProcesses < Rectify::Query
+    class PrioritizedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.order(promoted: :desc).includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_process_groups.rb
index 4e441e2a677a7..6f754056a41e8 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_process_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters participatory process groups so only promoted ones are returned.
-    class PromotedParticipatoryProcessGroups < Rectify::Query
+    class PromotedParticipatoryProcessGroups < Decidim::Query
       def query
         Decidim::ParticipatoryProcessGroup.promoted
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_processes.rb
index f0e5111191c13..4ecad625b6f59 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/promoted_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters processes so only promoted ones are returned.
-    class PromotedParticipatoryProcesses < Rectify::Query
+    class PromotedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.promoted
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/published_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/published_participatory_processes.rb
index f3f1250f4af47..80b84c378238a 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/published_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/published_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters published processes only.
-    class PublishedParticipatoryProcesses < Rectify::Query
+    class PublishedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.published
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_followers_count.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_followers_count.rb
index 42bdd99d44b12..afcd8420a4668 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_followers_count.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_followers_count.rb
@@ -4,10 +4,10 @@ module Decidim
   module ParticipatoryProcesses
     # This class counts all Followers of a participatory process or
     # participatory processes belonging to a participatory process group
-    class StatsFollowersCount < Rectify::Query
+    class StatsFollowersCount < Decidim::Query
       def self.for(participatory_space)
         return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
-                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
+                        (participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?)
 
         new(participatory_space).query
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_participants_count.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_participants_count.rb
index ab8a3ddc41af5..253b4289dff8d 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_participants_count.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/stats_participants_count.rb
@@ -4,10 +4,10 @@ module Decidim
   module ParticipatoryProcesses
     # This class counts unique Participants on a participatory process or
     # participatory processes belonging to a participatory process group
-    class StatsParticipantsCount < Rectify::Query
+    class StatsParticipantsCount < Decidim::Query
       def self.for(participatory_space)
         return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
-                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
+                        (participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?)
 
         new(participatory_space).query
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_process_groups.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_process_groups.rb
index 572c134f016e3..3003697b9a95b 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_process_groups.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_process_groups.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a current_user.
-    class VisibleParticipatoryProcessGroups < Rectify::Query
+    class VisibleParticipatoryProcessGroups < Decidim::Query
       def initialize(current_user)
         @current_user = current_user
       end
diff --git a/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_processes.rb b/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_processes.rb
index 31cb14199bc8c..b8ab237ff5259 100644
--- a/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_processes.rb
+++ b/decidim-participatory_processes/app/queries/decidim/participatory_processes/visible_participatory_processes.rb
@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a current_user.
-    class VisibleParticipatoryProcesses < Rectify::Query
+    class VisibleParticipatoryProcesses < Decidim::Query
       def initialize(current_user)
         @current_user = current_user
       end
diff --git a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
index d02f1a90ecb52..e4e9bc3804083 100644
--- a/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
+++ b/decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb
@@ -117,7 +117,7 @@ def import_folders_and_attachments(attachments)
         attachments["files"].map do |file|
           next unless remote_file_exists?(file["remote_file_url"])
 
-          file_tmp = URI.open(file["remote_file_url"])
+          file_tmp = URI.parse(file["remote_file_url"]).open
 
           Decidim.traceability.perform_action!("create", Attachment, @user) do
             attachment = Attachment.new(
diff --git a/decidim-participatory_processes/app/services/decidim/participatory_processes/participatory_process_search.rb b/decidim-participatory_processes/app/services/decidim/participatory_processes/participatory_process_search.rb
deleted file mode 100644
index bb67f2a4d47a6..0000000000000
--- a/decidim-participatory_processes/app/services/decidim/participatory_processes/participatory_process_search.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # Service that encapsulates all logic related to filtering participatory processes.
-    class ParticipatoryProcessSearch < ParticipatorySpaceSearch
-      def initialize(options = {})
-        base_relation = options.has_key?(:base_relation) ? options.delete(:base_relation) : ParticipatoryProcess.all
-        super(base_relation, options)
-      end
-
-      def search_date
-        case date
-        when "active"
-          query.active.order(start_date: :desc)
-        when "past"
-          query.past.order(end_date: :desc)
-        when "upcoming"
-          query.upcoming.order(start_date: :asc)
-        else # Assume 'all'
-          timezone = ActiveSupport::TimeZone.find_tzinfo(Time.zone.name).identifier
-          query.order(Arel.sql("ABS(start_date - (CURRENT_DATE at time zone '#{timezone}')::date)").to_s)
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
index 9922e7c93ae46..59c555c857abe 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
@@ -10,7 +10,7 @@
       <h3 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h3>
     </div>
     <div class="timeline__content">
-      <%= translated_attribute(participatory_process_step.description).html_safe %>
+      <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_step.description) %>
     </div>
   </div>
 </li>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/_form.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/_form.html.erb
new file mode 100644
index 0000000000000..d0e157237d608
--- /dev/null
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/_form.html.erb
@@ -0,0 +1,11 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t("participatory_process_types.form.title", scope: "decidim.admin") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+  </div>
+</div>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb
new file mode 100644
index 0000000000000..87caf6e697f65
--- /dev/null
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb
@@ -0,0 +1,9 @@
+<%= decidim_form_for(@form, html: { class: "form edit_participatory_process_type" }) do |f| %>
+  <h2 class="process-title-summary">
+    <%= t("participatory_process_types.edit.title", scope: "decidim.admin") %>
+  </h2>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("participatory_process_types.edit.update", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb
new file mode 100644
index 0000000000000..9fa81d11852cd
--- /dev/null
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb
@@ -0,0 +1,60 @@
+<div class="card" id="participatory-process-types">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("titles.participatory_process_types", scope: "decidim.admin") %>
+      <%= link_to(
+            t("actions.new_process_type", scope: "decidim.admin"),
+            [:new, :participatory_process_type],
+            class: "button tiny button--title"
+          ) if allowed_to? :create, :participatory_process_type %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.participatory_process_type.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.participatory_process_type.fields.created_at", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% collection.each do |participatory_process_type| %>
+          <tr>
+            <td>
+              <% if allowed_to?(:update, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= link_to(
+                      translated_attribute(participatory_process_type.title),
+                      edit_participatory_process_type_path(participatory_process_type)
+                    ) %>
+              <% else %>
+                <%= translated_attribute(participatory_process_type.title) %></td>
+              <% end %>
+            <td><%= l(participatory_process_type.created_at, format: :short) %></td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:update, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= icon_link_to(
+                      "pencil",
+                      edit_participatory_process_type_path(participatory_process_type),
+                      t("actions.edit", scope: "decidim.admin"),
+                      class: "action-icon--new"
+                    ) %>
+              <% end %>
+              <% if allowed_to?(:destroy, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= icon_link_to(
+                      "circle-x",
+                      participatory_process_type_path(participatory_process_type),
+                      t("actions.destroy", scope: "decidim.admin"),
+                      class: "action-icon--remove",
+                      method: :delete,
+                      data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }
+                    ) %>
+              <% end %>
+            </td>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb
new file mode 100644
index 0000000000000..3142d3e088d44
--- /dev/null
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb
@@ -0,0 +1,9 @@
+<%= decidim_form_for(@form, html: { class: "form new_participatory_process_type" }) do |f| %>
+  <h2 class="process-title-summary">
+    <%= t("participatory_process_types.new.title", scope: "decidim.admin") %>
+  </h2>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("participatory_process_types.new.create", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
index 7258bdf027f49..578c6a82a0955 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb
@@ -188,6 +188,16 @@
     <div class="row column">
       <%= form.check_box :show_metrics %>
     </div>
+
+    <% if @form.participatory_process_types_for_select.present? %>
+      <div class="row column">
+        <%= form.select(
+              :participatory_process_type_id,
+              @form.participatory_process_types_for_select,
+              include_blank: t(".select_participatory_process_type")
+            ) %>
+      </div>
+    <% end %>
   </div>
 </div>
 
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
index 9bfbe9e0b1c30..6cf7e4b7adf3a 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
@@ -19,4 +19,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_participatory_processes" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_participatory_processes" %>
+<% end %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb
index 97849331ca296..356b9c0af9fa8 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb
@@ -1,12 +1,15 @@
 var $grid = $('#processes-grid');
-var $assembliesFilter = $('#processes-filter');
+var $order_by_filters = $grid.find('.processes-grid-order-by');
+var $loading = $grid.find('.loading');
 
 $grid.find('.card-grid').html('<%= j(cell(
                                       "decidim/participatory_processes/filtered_participatory_processes",
                                       participatory_processes
                                     ).show).strip.html_safe %>');
-$grid.find('.processes-grid-order-by').html('<%= j(cell(
-                                                    "decidim/participatory_process_groups/process_filters",
-                                                    group,
-                                                    base_relation: participatory_processes
-                                                  ).show).strip.html_safe %>');
+$order_by_filters.html('<%= j(cell(
+                                "decidim/participatory_process_groups/process_filters",
+                                group,
+                                base_relation: participatory_processes
+                              ).show).strip.html_safe %>');
+$order_by_filters.foundation();
+$loading.hide();
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.html.erb
index dda75ad52a27c..82744e0ce7c4c 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.html.erb
@@ -30,4 +30,6 @@ edit_link(
   </section>
 <% end %>
 
-<%= javascript_pack_tag "decidim_participatory_processes" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_participatory_processes" %>
+<% end %>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.js.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.js.erb
index ccf20dcf8b628..bb82289371418 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.js.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.js.erb
@@ -1,6 +1,8 @@
 var $grid = $('#processes-grid');
+var $order_by_filters = $grid.find('.processes-grid-order-by');
 var $loading = $grid.find('.loading');
 
 $grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
-$grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+$order_by_filters.html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+$order_by_filters.foundation();
 $loading.hide();
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
index 89691bcd0f455..2c85d80c94ded 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
@@ -34,7 +34,7 @@
         <div class="lead">
           <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
         </div>
-        <%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
+        <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
       </div>
       <%= attachments_for current_participatory_space %>
       <%= render_hook(:participatory_space_highlighted_elements) %>
diff --git a/decidim-participatory_processes/app/views/layouts/decidim/admin/participatory_process_type.html.erb b/decidim-participatory_processes/app/views/layouts/decidim/admin/participatory_process_type.html.erb
new file mode 100644
index 0000000000000..127de81060c94
--- /dev/null
+++ b/decidim-participatory_processes/app/views/layouts/decidim/admin/participatory_process_type.html.erb
@@ -0,0 +1,15 @@
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_participatory_processes_menu).render %>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.titles.participatory_processes"), decidim_participatory_processes.participatory_processes_path, target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
+<% end %>
diff --git a/decidim-participatory_processes/config/locales/ar.yml b/decidim-participatory_processes/config/locales/ar.yml
index 6bff23dcd75c3..694a251df7b1a 100644
--- a/decidim-participatory_processes/config/locales/ar.yml
+++ b/decidim-participatory_processes/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/bg.yml b/decidim-participatory_processes/config/locales/bg.yml
index 9e37c1915215b..76dd2c1921564 100644
--- a/decidim-participatory_processes/config/locales/bg.yml
+++ b/decidim-participatory_processes/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/ca.yml b/decidim-participatory_processes/config/locales/ca.yml
index b37d7b5459698..24c8b01e82a46 100644
--- a/decidim-participatory_processes/config/locales/ca.yml
+++ b/decidim-participatory_processes/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ ca:
         decidim_area_id: Àrea
         description: Descripció
         developer_group: Grup promotor
+        document: Document
         domain: Àrees municipals
         end_date: Data de finalització
         hashtag: Etiqueta (hashtag)
         hero_image: Imatge de portada
+        import_attachments: Importar arxius adjunts
+        import_categories: Importar categories
+        import_components: Importar components
+        import_steps: Importar fases
         local_area: Àrea d'organització
         meta_scope: Metadades d'àmbit
         participatory_process_group_id: Grup de processos
+        participatory_process_type_id: Tipus de procés
         participatory_scope: El que es decideix
         participatory_structure: Com es decideix
+        private_space: Procés privat
         promoted: Destacat
         published_at: Publicat el
         related_process_ids: Processos relacionats
@@ -56,6 +64,8 @@ ca:
         short_description: Breu descripció
         start_date: Data d'inici
         title: Títol
+      participatory_process_type:
+        title: Títol
       participatory_process_user_role:
         email: Correu electrònic
         name: Nom
@@ -65,7 +75,7 @@ ca:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Tipus de document no vàlid. Els formats acceptats són: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipus de document no vàlid. Només s''accepten arxius amb les següents extensions: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Fase activada
       decidim/participatory_process_step_changed_event: Fase modificada
@@ -96,6 +106,7 @@ ca:
         new_process: Nou procés
         new_process_group: Nou grup de processos
         new_process_step: Nova fase
+        new_process_type: Nou tipus de procés
         new_process_user_role: Nova administradora del procés
         preview: Previsualitzar
         publish: Publicar
@@ -106,6 +117,7 @@ ca:
         participatory_process_groups_submenu:
           info: Informació
           landing_page: Pàgina d'inici
+        participatory_process_types: Tipus de procés
         participatory_processes: Processos
         participatory_processes_submenu:
           attachment_collections: Carpetes
@@ -137,6 +149,11 @@ ca:
             start_date: Data d'inici
             title: Títol
           name: Fase del procés participatiu
+        participatory_process_type:
+          fields:
+            created_at: Creat el
+            title: Títol
+          name: Tipus de procés
         participatory_process_user_role:
           fields:
             email: Correu electrònic
@@ -219,6 +236,23 @@ ca:
         update:
           error: S'ha produït un error en l'actualització d'aquesta fase de procés participatiu.
           success: La fase de procés participatiu s'ha actualitzat correctament.
+      participatory_process_types:
+        create:
+          error: S'ha produït un error en crear un nou tipus de procés.
+          success: Tipus de procés creat correctament.
+        destroy:
+          success: Tipus de procés eliminat correctament.
+        edit:
+          title: Editar el tipus de procés
+          update: Actualitzar
+        form:
+          title: Títol
+        new:
+          create: Crear
+          title: Nou tipus de procés
+        update:
+          error: S'ha produït un error en actualitzar aquest tipus de procés.
+          success: Tipus de procés actualitzat correctament.
       participatory_process_user_roles:
         create:
           error: S'ha produït un error en afegir una participant en aquest procés participatiu.
@@ -263,6 +297,7 @@ ca:
           success: Grup de processos participatius creat correctament.
       titles:
         participatory_process_groups: Grups de processos participatius
+        participatory_process_types: Tipus de processos participatius
         participatory_processes: Processos participatius
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ ca:
     admin_log:
       participatory_process:
         create: "%{user_name} ha creat el procés participatiu %{resource_name}"
+        duplicate: "%{user_name} ha duplicat el procés participatiu %{resource_name}"
+        export: "%{user_name} ha exportat el procés participatiu %{resource_name}"
+        import: "%{user_name} ha importat el procés participatiu %{resource_name}"
         publish: "%{user_name} ha publicat el procés participatiu %{resource_name}"
         unpublish: "%{user_name} ha despublicat el procés participatiu %{resource_name}"
         update: "%{user_name} ha actualitzat el procés participatiu %{resource_name}"
@@ -282,6 +320,10 @@ ca:
         create: "%{user_name} ha creat la fase %{resource_name} en el procés participatiu %{space_name}"
         delete: "%{user_name} ha eliminat la fase %{resource_name} en el procés participatiu %{space_name}"
         update: "%{user_name} ha actualitzat la fase %{resource_name} en el procés participatiu %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} ha creat el tipus de procés participatiu %{resource_name}"
+        delete: "%{user_name} ha esborrat el tipus de procés participatiu %{resource_name}"
+        update: "%{user_name} ha actualitzat el tipus de procés participatiu %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} ha convidat la participant %{resource_name} al procés participatiu %{space_name}"
         delete: "%{user_name} ha eliminat la participant %{resource_name} del procés participatiu %{space_name}"
@@ -309,6 +351,10 @@ ca:
           contextual: "<p>Un <strong>procés participatiu</strong> és una seqüència d'activitats participatives (p.e. primer omplir una enquesta, després realitzar propostes, debatre-les en trobades presencials o virtuals, i finalment prioritzar-les) amb l'objectiu de definir y prendre una decisió sobre un tema específic.</p> <p>Exemples de processos participatius són: un procés d'elecció de les membres d'un comitè (on primer es presenten unes candidatures, després es debat i finalment s'escull una candidatura), pressupostos participatius (on es realitzen propostes, es valoren econòmicament i es voten amb el pressupost disponible), un procés de planificació estratègica, la redacció col·laborativa d'un reglament o norma, el disseny d'un espai urbà o la producció d'un pla de polítiques públiques.</p>\n"
           page: "<p>Un <strong>procés participatiu</strong> és una seqüència d'activitats participatives (p.e. primer omplir una enquesta, després realitzar propostes, debatre-les en trobades presencials o virtuals, i finalment prioritzar-les) amb l'objectiu de definir y prendre una decisió sobre un tema específic.</p> <p>Exemples de processos participatius són: un procés d'elecció de les membres d'un comitè (on primer es presenten unes candidatures, després es debat i finalment s'escull una candidatura), pressupostos participatius (on es realitzen propostes, es valoren econòmicament i es voten amb el pressupost disponible), un procés de planificació estratègica, la redacció col·laborativa d'un reglament o norma, el disseny d'un espai urbà o la producció d'un pla de polítiques públiques.</p>\n"
           title: Què és un procés participatiu?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Aquest tipus de procés no s''ha trobat a la base de dades (ID: %{id})'
     menu:
       processes: Processos
     metrics:
@@ -384,6 +430,7 @@ ca:
             related_processes: Processos relacionats
             scope_type_max_depth_help: Restringeix la profunditat del filtre d'àmbit. Es mostrarà des del filtre general fins al filtre seleccionat.
             select_an_area: Selecciona una àrea
+            select_participatory_process_type: Selecciona un tipus de procés
             select_process_group: Selecciona un grup de processos
             slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
             title: Informació general
@@ -410,6 +457,7 @@ ca:
           back_to_process: Torna a la pàgina de procés
       participatory_processes:
         filters:
+          all_types: Tots els tipus
           counters:
             active:
               one: Un procés actiu
@@ -427,6 +475,7 @@ ca:
             no_active: Sense processos actius
             no_active_nor_upcoming: No hi ha processos actius ni futurs
             no_active_nor_upcoming_callout: No hi ha processos actius ni futurs. Aquí hi ha una llista dels anteriors.
+          filter_by: Mostrar
           names:
             active: Actius
             all: Tots
diff --git a/decidim-participatory_processes/config/locales/cs.yml b/decidim-participatory_processes/config/locales/cs.yml
index 5294cf9d663de..7f73fa61916ff 100644
--- a/decidim-participatory_processes/config/locales/cs.yml
+++ b/decidim-participatory_processes/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ cs:
         decidim_area_id: Oblast
         description: Popis
         developer_group: Skupina promotérů
+        document: Dokument
         domain: Doména
         end_date: Datum ukon�ení
         hashtag: Hashtag
         hero_image: Domácí obrázek
+        import_attachments: Importovat přílohy
+        import_categories: Importovat kategorie
+        import_components: Importovat komponenty
+        import_steps: Importovat kroky
         local_area: Oblast působnosti organizace
         meta_scope: Metadata Oblasti působnosti
         participatory_process_group_id: Skupina procesů
+        participatory_process_type_id: Typ procesů
         participatory_scope: Co se rozhodlo
         participatory_structure: Jak se to rozhoduje
+        private_space: Soukromý proces
         promoted: Propagováno
         published_at: Publikováno v
         related_process_ids: Související procesy
@@ -56,6 +64,8 @@ cs:
         short_description: Stru�ný popis
         start_date: Datum zahájení
         title: Titul
+      participatory_process_type:
+        title: Název
       participatory_process_user_role:
         email: E-mailem
         name: Název
@@ -65,7 +75,7 @@ cs:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Neplatný typ dokumentu. Přijatelné formáty jsou: %{valid_mime_types}'
+              allowed_file_content_types: 'Neplatný typ dokumentu. Jsou povoleny pouze soubory s následujícími příponami: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Krok aktivován
       decidim/participatory_process_step_changed_event: Krok se změnil
@@ -102,6 +112,7 @@ cs:
         new_process: Nový proces
         new_process_group: Nová skupina procesů
         new_process_step: Nový krok
+        new_process_type: Nový typ procesu
         new_process_user_role: Nový uživatel procesu
         preview: Náhled
         publish: Publikovat
@@ -112,6 +123,7 @@ cs:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Úvodní stránka
+        participatory_process_types: Typy procesů
         participatory_processes: Procesy
         participatory_processes_submenu:
           attachment_collections: Složky
@@ -143,6 +155,11 @@ cs:
             start_date: Datum zahájení
             title: Titul
           name: Participa�ní krok procesu
+        participatory_process_type:
+          fields:
+            created_at: Vytvořeno v
+            title: Název
+          name: Typ procesu
         participatory_process_user_role:
           fields:
             email: E-mailem
@@ -225,6 +242,23 @@ cs:
         update:
           error: Při aktualizaci tohoto kroku procesu participace došlo k chybě.
           success: Úspěšný krok procesu byl úspěšně aktualizován.
+      participatory_process_types:
+        create:
+          error: Při vytváření nového typu procesu došlo k chybě.
+          success: Typ procesu byl úspěšně vytvořen.
+        destroy:
+          success: Typ procesu byl úspěšně odstraněn.
+        edit:
+          title: Upravit typ procesu
+          update: Aktualizovat
+        form:
+          title: Název
+        new:
+          create: Vytvořit
+          title: Nový typ procesu
+        update:
+          error: Při aktualizaci tohoto typu procesu došlo k chybě.
+          success: Typ procesu byl úspěšně aktualizován.
       participatory_process_user_roles:
         create:
           error: Při přidávání uživatele pro tento participa�ní proces došlo k chybě.
@@ -269,6 +303,7 @@ cs:
           success: Skupina úspěšně vytvořená skupina ú�astníků.
       titles:
         participatory_process_groups: Skupiny ú�astnických procesů
+        participatory_process_types: Typy participa�ních procesů
         participatory_processes: Participativní procesy
       users:
         resend_invitation:
@@ -277,6 +312,9 @@ cs:
     admin_log:
       participatory_process:
         create: "%{user_name} vytvořil %{resource_name} participa�ní proces"
+        duplicate: "%{user_name} zkopíroval participa�ní proces %{resource_name}"
+        export: "%{user_name} exportoval participa�ní proces %{resource_name}"
+        import: "%{user_name} importoval participa�ní proces %{resource_name}"
         publish: "%{user_name} publikoval %{resource_name} participa�ní proces"
         unpublish: "%{user_name} neuveřejnil %{resource_name} participa�ní proces"
         update: "%{user_name} aktualizoval %{resource_name} participa�ní proces"
@@ -288,6 +326,10 @@ cs:
         create: "%{user_name} vytvořil %{resource_name} krok ve %{space_name} ú�astnických procesech"
         delete: "%{user_name} odstraněno %{resource_name} krok ve %{space_name} ú�astnických procesech"
         update: "%{user_name} aktualizoval %{resource_name} krok ve %{space_name} ú�astnických procesech"
+      participatory_process_type:
+        create: "%{user_name} vytvořil %{resource_name} typ participa�ního procesu"
+        delete: "%{user_name} odstranil %{resource_name} typ participa�ního procesu"
+        update: "%{user_name} aktualizoval %{resource_name} typ participa�ního procesu"
       participatory_process_user_role:
         create: "%{user_name} pozval uživatele %{resource_name} do procesu participace %{space_name}"
         delete: "%{user_name} odstranil uživatele %{resource_name} z procesu participace %{space_name}"
@@ -315,6 +357,10 @@ cs:
           contextual: "<p> <strong>Participa�ní proces</strong> je sled aktivit participativního charakteru (např. Nejprve vyplnění průzkumu, následné předkládání návrhů, diskuse o nich v rámci osobních nebo virtuálních schůzek a nakonec jejich prioritizace) s cílem definovat a rozhodnout na konkrétní téma.</p> <p>Příklady participa�ních procesů jsou: <strong>proces volby �lenů výboru</strong> (kde jsou kandidatury poprvé představeny, pak diskutovány a nakonec je vybrána kandidatura), <strong>participa�ní rozpo�ty</strong> (kde jsou návrhy předloženy, ekonomicky oceňovány a hlasovány s dostupnými prostředky); <strong>proces strategického plánování</strong>, spole�né vypracování nařízení nebo normy, návrh městského prostoru nebo vypracování plánu veřejného pořádku.</p>\n"
           page: "<p> <strong>participa�ní proces</strong> je sled aktivit participativního charakteru (např. Nejprve vyplnění průzkumu, následné předkládání návrhů, diskuse o nich v rámci osobních nebo virtuálních schůzek a nakonec jejich prioritizace) s cílem definovat a rozhodnout na konkrétní téma.</p> <p>Příklady participa�ních procesů jsou: proces volby �lenů výboru (kde jsou kandidatury poprvé představeny, pak diskutovány a nakonec je vybrána kandidatura), participa�ní rozpo�ty (kde jsou návrhy předloženy, ekonomicky oceňovány a hlasovány s dostupnými prostředky); proces strategického plánování, spole�né vypracování nařízení nebo normy, návrh městského prostoru nebo vypracování plánu veřejného pořádku.</p>\n"
           title: Co je participa�ní proces?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Typ procesu nebyl v databázi nalezen (ID: %{id})'
     menu:
       processes: Procesy
     metrics:
@@ -392,6 +438,7 @@ cs:
             related_processes: Související procesy
             scope_type_max_depth_help: Omezit hloubku filtru rozsahu. Filtr se zobrazí od obecného k vybranému typu rozsahu.
             select_an_area: Vyberte oblast
+            select_participatory_process_type: Vyberte typ procesu
             select_process_group: Vyberte skupinu procesů
             slug_help: 'Sloupce adres URL se používají k vygenerování adres URL, které směřují k tomuto procesu. Přijme pouze písmena, �ísla a poml�ky a musí za�ínat písmenem. Příklad: %{url}'
             title: Obecná informace
@@ -418,6 +465,7 @@ cs:
           back_to_process: Zpět na stránku procesu
       participatory_processes:
         filters:
+          all_types: VÅ¡echny typy
           counters:
             active:
               one: 1 aktivní proces
@@ -443,6 +491,7 @@ cs:
             no_active: Žádné aktivní procesy
             no_active_nor_upcoming: Žádné aktivní ani nadcházející procesy
             no_active_nor_upcoming_callout: Neexistují žádné aktivní ani nadcházející procesy. Zde je seznam minulých.
+          filter_by: Zobrazit
           names:
             active: Aktivní
             all: VÅ¡e
diff --git a/decidim-participatory_processes/config/locales/de.yml b/decidim-participatory_processes/config/locales/de.yml
index 65070c945e8c7..34291cfed3f27 100644
--- a/decidim-participatory_processes/config/locales/de.yml
+++ b/decidim-participatory_processes/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -34,7 +35,7 @@ de:
         subtitle: Untertitel
         target: Wer nimmt teil?
         title: Titel
-        weight: Bestellposition
+        weight: Reihenfolge
       participatory_process_group:
         description: Beschreibung
         developer_group: Gruppe der Unterstützer
@@ -56,16 +57,12 @@ de:
         short_description: Kurzbeschreibung
         start_date: Startdatum
         title: Titel
+      participatory_process_type:
+        title: Titel
       participatory_process_user_role:
         email: E-Mail
         name: Name
         role: Rolle
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ungültiger Dokumenttyp. Zulässige Formate sind: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Phase aktiviert
       decidim/participatory_process_step_changed_event: Phase geändert
@@ -96,6 +93,7 @@ de:
         new_process: Neuer Beteiligungsprozess
         new_process_group: Neue Prozessgruppe
         new_process_step: Neue Phase
+        new_process_type: Neuer Prozesstyp
         new_process_user_role: Neuer Prozess-Administrator
         preview: Vorschau
         publish: Veröffentlichen
@@ -106,6 +104,7 @@ de:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Startseite
+        participatory_process_types: Prozesstypen
         participatory_processes: Beteiligungsprozesse
         participatory_processes_submenu:
           attachment_collections: Ordner
@@ -137,6 +136,11 @@ de:
             start_date: Anfangsdatum
             title: Titel
           name: Partizipativer Prozessschritt
+        participatory_process_type:
+          fields:
+            created_at: Erstellt am
+            title: Titel
+          name: Prozesstyp
         participatory_process_user_role:
           fields:
             email: Email
@@ -219,6 +223,23 @@ de:
         update:
           error: Beim Aktualisieren dieses partizipativen Prozessschritts ist ein Fehler aufgetreten.
           success: Partizipativer Prozessschritt erfolgreich aktualisiert.
+      participatory_process_types:
+        create:
+          error: Beim Erstellen eines neuen Prozesstyps ist ein Fehler aufgetreten.
+          success: Prozesstyp erfolgreich erstellt.
+        destroy:
+          success: Prozesstyp erfolgreich gelöscht.
+        edit:
+          title: Prozesstyp bearbeiten
+          update: Aktualisieren
+        form:
+          title: Titel
+        new:
+          create: Erstellen
+          title: Neuer Prozesstyp
+        update:
+          error: Beim Aktualisieren dieses Prozesstyps ist ein Fehler aufgetreten.
+          success: Prozesstyp erfolgreich aktualisiert.
       participatory_process_user_roles:
         create:
           error: Beim Hinzufügen eines Benutzers für diesen partizipativen Prozess ist ein Fehler aufgetreten.
@@ -263,6 +284,7 @@ de:
           success: Partizipative Prozessgruppe erfolgreich erstellt.
       titles:
         participatory_process_groups: Partizipative Prozessgruppen
+        participatory_process_types: Beteiligungsprozesstypen
         participatory_processes: Beteiligungsprozesse
       users:
         resend_invitation:
@@ -271,6 +293,9 @@ de:
     admin_log:
       participatory_process:
         create: "%{user_name} hat den Partizipationsprozess %{resource_name} erstellt"
+        duplicate: "%{user_name} hat den Beteiligungsprozess %{resource_name} dupliziert"
+        export: "%{user_name} hat den Beteiligungsprozess %{resource_name} exportiert"
+        import: "%{user_name} hat den Beteiligungsprozess %{resource_name} importiert"
         publish: "%{user_name} hat den Partizipationsprozess %{resource_name} veröffentlicht"
         unpublish: "%{user_name} hat den Partizipationsprozess %{resource_name} auf \"unveröffentlicht\" gesetzt"
         update: "%{user_name} hat den Partizipationsprozess %{resource_name} aktualisiert"
@@ -282,6 +307,9 @@ de:
         create: "%{user_name} hat den Schritt %{resource_name} in %{space_name} erstellt"
         delete: "%{user_name} hat den Schritt %{resource_name} aus %{space_name} gelöscht"
         update: "%{user_name} hat den Schritt %{resource_name} in %{space_name} aktualisiert"
+      participatory_process_type:
+        create: "%{user_name} hat den Beteiligungsprozesstyp %{resource_name} erstellt"
+        delete: "%{user_name} hat den Beteiligungsprozesstyp %{resource_name} gelöscht"
       participatory_process_user_role:
         create: "%{user_name} lud den Benutzer %{resource_name} zu dem %{space_name} Partizipationsprozess ein"
         delete: "%{user_name} entfernte den Benutzer %{resource_name} aus dem %{space_name} Partizipationsprozess"
@@ -384,6 +412,7 @@ de:
             related_processes: Ähnliche Beteiligungsprozesse
             scope_type_max_depth_help: Beschränken Sie die Bereichs-Filtertiefe; der Filter zeigt nur Ergebnisse von Allgemein bis zum ausgewählten Bereichstyp an.
             select_an_area: Wählen Sie einen Bereich aus
+            select_participatory_process_type: Wählen Sie einen Prozesstyp aus
             select_process_group: Wählen Sie eine Prozessgruppe aus
             slug_help: 'URL-Slugs werden zum Generieren der URLs verwendet, die auf diesen Prozess verweisen. Akzeptiert nur Buchstaben, Zahlen und Bindestriche und muss mit einem Buchstaben beginnen. Beispiel: %{url}'
             title: Allgemeine Information
@@ -410,6 +439,7 @@ de:
           back_to_process: Zurück zur Prozessseite
       participatory_processes:
         filters:
+          all_types: Alle Typen
           counters:
             active:
               one: 1 aktiver Beteiligungsprozess
@@ -427,6 +457,7 @@ de:
             no_active: Keine aktiven Prozesse
             no_active_nor_upcoming: Keine aktiven oder zukünftigen Beteiligungsprozesse
             no_active_nor_upcoming_callout: Es gibt keine aktiven oder zukünftigen Beteiligungsprozesse. Hier ist eine Liste der vergangenen.
+          filter_by: Anzeigen
           names:
             active: Aktiv
             all: Alle
diff --git a/decidim-participatory_processes/config/locales/el.yml b/decidim-participatory_processes/config/locales/el.yml
index 61ae8fb4022e0..d9ed8a1c4954c 100644
--- a/decidim-participatory_processes/config/locales/el.yml
+++ b/decidim-participatory_processes/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ el:
         email: Email
         name: Όνομα
         role: Ρόλος
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Μη έγκυ�ος τ�πος εγγ�άφου. Οι αποδεκτές μο�φές είναι: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Η φάση ενε�γοποιήθηκε
       decidim/participatory_process_step_changed_event: Η φάση άλλαξε
diff --git a/decidim-participatory_processes/config/locales/en.yml b/decidim-participatory_processes/config/locales/en.yml
index 1326c84c56eee..83a4fd79bb88c 100644
--- a/decidim-participatory_processes/config/locales/en.yml
+++ b/decidim-participatory_processes/config/locales/en.yml
@@ -12,15 +12,22 @@ en:
         decidim_area_id: Area
         description: Description
         developer_group: Promoter group
+        document: Document
         domain: Domain
         end_date: End date
         hashtag: Hashtag
         hero_image: Home image
+        import_attachments: Import attachments
+        import_categories: Import categories
+        import_components: Import components
+        import_steps: Import steps
         local_area: Organization area
         meta_scope: Scope metadata
         participatory_process_group_id: Processes group
+        participatory_process_type_id: Processes type
         participatory_scope: What is decided
         participatory_structure: How is it decided
+        private_space: Private process
         promoted: Promoted
         published_at: Published at
         related_process_ids: Related processes
@@ -57,6 +64,8 @@ en:
         short_description: Short description
         start_date: Start date
         title: Title
+      participatory_process_type:
+        title: Title
       participatory_process_user_role:
         email: Email
         name: Name
@@ -66,7 +75,7 @@ en:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Invalid document type. Accepted formats are: %{valid_mime_types}'
+              allowed_file_content_types: 'Invalid document type. Only files with the following extensions are allowed: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Phase activated
       decidim/participatory_process_step_changed_event: Phase changed
@@ -97,6 +106,7 @@ en:
         new_process: New process
         new_process_group: New process group
         new_process_step: New phase
+        new_process_type: New process type
         new_process_user_role: New process admin
         preview: Preview
         publish: Publish
@@ -107,6 +117,7 @@ en:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Landing page
+        participatory_process_types: Process types
         participatory_processes: Processes
         participatory_processes_submenu:
           attachment_collections: Folders
@@ -138,6 +149,11 @@ en:
             start_date: Start date
             title: Title
           name: Participatory process phase
+        participatory_process_type:
+          fields:
+            created_at: Created at
+            title: Title
+          name: Process type
         participatory_process_user_role:
           fields:
             email: Email
@@ -220,6 +236,23 @@ en:
         update:
           error: There was a problem updating this phase of the participatory process.
           success: Participatory phase successfully updated.
+      participatory_process_types:
+        create:
+          error: There was a problem creating a new process type.
+          success: Process type successfully created.
+        destroy:
+          success: Process type successfully deleted.
+        edit:
+          title: Edit process type
+          update: Update
+        form:
+          title: Title
+        new:
+          create: Create
+          title: New process type
+        update:
+          error: There was a problem updating this process type.
+          success: Process type successfully updated.
       participatory_process_user_roles:
         create:
           error: There was a problem adding a participant for this participatory process.
@@ -264,6 +297,7 @@ en:
           success: Participatory process group successfully created.
       titles:
         participatory_process_groups: Participatory process groups
+        participatory_process_types: Participatory process types
         participatory_processes: Participatory processes
       users:
         resend_invitation:
@@ -272,6 +306,9 @@ en:
     admin_log:
       participatory_process:
         create: "%{user_name} created the %{resource_name} participatory process"
+        duplicate: "%{user_name} duplicated the %{resource_name} participatory process"
+        export: "%{user_name} exported the %{resource_name} participatory process"
+        import: "%{user_name} imported the %{resource_name} participatory process"
         publish: "%{user_name} published the %{resource_name} participatory process"
         unpublish: "%{user_name} unpublished the %{resource_name} participatory process"
         update: "%{user_name} updated the %{resource_name} participatory process"
@@ -283,6 +320,10 @@ en:
         create: "%{user_name} created the %{resource_name} phase in the %{space_name} participatory process"
         delete: "%{user_name} deleted the %{resource_name} phase in the %{space_name} participatory process"
         update: "%{user_name} updated the %{resource_name} phase in the %{space_name} participatory process"
+      participatory_process_type:
+        create: "%{user_name} created the %{resource_name} participatory process type"
+        delete: "%{user_name} deleted the %{resource_name} participatory process type"
+        update: "%{user_name} updated the %{resource_name} participatory process type"
       participatory_process_user_role:
         create: "%{user_name} invited the participant %{resource_name} to the %{space_name} participatory process"
         delete: "%{user_name} removed the participant %{resource_name} from the %{space_name} participatory process"
@@ -310,6 +351,10 @@ en:
           contextual: "<p>A <strong>participatory process</strong> is a sequence of participatory activities (e.g. first filling out a survey, then making proposals, discussing them in face-to-face or virtual meetings, and finally prioritizing them) with the aim of defining and making a decision on a specific topic.</p> <p>Examples of participatory processes are: a process of electing committee members (where candidatures are first presented, then debated and finally a candidacy is chosen), participatory budgets (where proposals are made, valued economically and voted on with the money available), a strategic planning process, the collaborative drafting of a regulation or norm, the design of an urban space or the production of a public policy plan.</p>\n"
           page: "<p>A <strong>participatory process</strong> is a sequence of participatory activities (e.g. first filling out a survey, then making proposals, discussing them in face-to-face or virtual meetings, and finally prioritizing them) with the aim of defining and making a decision on a specific topic.</p> <p>Examples of participatory processes are: a process of electing committee members (where candidatures are first presented, then debated and finally a candidacy is chosen), participatory budgets (where proposals are made, valued economically and voted on with the money available), a strategic planning process, the collaborative drafting of a regulation or norm, the design of an urban space or the production of a public policy plan.</p>\n"
           title: What is a participatory process?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'The process type was not found on the database (ID: %{id})'
     menu:
       processes: Processes
     metrics:
@@ -385,6 +430,7 @@ en:
             related_processes: Related processes
             scope_type_max_depth_help: Restrict the scope filter depth; The filter will show from general to the selected scope type.
             select_an_area: Select an Area
+            select_participatory_process_type: Select a process type
             select_process_group: Select a process group
             slug_help: 'URL slugs are used to generate the URLs that point to this process. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
             title: General Information
@@ -411,6 +457,7 @@ en:
           back_to_process: Back to the process page
       participatory_processes:
         filters:
+          all_types: All types
           counters:
             active:
               one: 1 active process
@@ -428,6 +475,7 @@ en:
             no_active: No active processes
             no_active_nor_upcoming: No active nor upcoming processes
             no_active_nor_upcoming_callout: There are no active nor upcoming processes. Here is a list of the past ones.
+          filter_by: Show
           names:
             active: Active
             all: All
diff --git a/decidim-participatory_processes/config/locales/es-MX.yml b/decidim-participatory_processes/config/locales/es-MX.yml
index 8c561b422b8ba..5495bf795277b 100644
--- a/decidim-participatory_processes/config/locales/es-MX.yml
+++ b/decidim-participatory_processes/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ es-MX:
         decidim_area_id: �rea
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         end_date: Fecha de finalización
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
+        import_steps: Importar fases
         local_area: �rea de organización
         meta_scope: 'Metadatos: ámbito'
         participatory_process_group_id: Grupo de procesos
+        participatory_process_type_id: Tipo de proceso
         participatory_scope: Qué se decide
         participatory_structure: Cómo se decide
+        private_space: Proceso privado
         promoted: Destacado
         published_at: Publicado en
         related_process_ids: Procesos relacionados
@@ -56,6 +64,8 @@ es-MX:
         short_description: Descripción breve
         start_date: Fecha de inicio
         title: Título
+      participatory_process_type:
+        title: Título
       participatory_process_user_role:
         email: Correo electrónico
         name: Nombre
@@ -65,7 +75,7 @@ es-MX:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Fase activada
       decidim/participatory_process_step_changed_event: La fase ha cambiado
@@ -96,6 +106,7 @@ es-MX:
         new_process: Nuevo proceso
         new_process_group: Nuevo grupo de procesos
         new_process_step: Nueva fase
+        new_process_type: Nuevo tipo de proceso
         new_process_user_role: Nuevo usuario de proceso
         preview: Previsualizar
         publish: Publicar
@@ -106,6 +117,7 @@ es-MX:
         participatory_process_groups_submenu:
           info: Información
           landing_page: Página de inicio
+        participatory_process_types: Tipo de proceso
         participatory_processes: Procesos
         participatory_processes_submenu:
           attachment_collections: Carpetas
@@ -137,6 +149,11 @@ es-MX:
             start_date: Fecha de inicio
             title: Título
           name: Fase de proceso participativo
+        participatory_process_type:
+          fields:
+            created_at: Creado el
+            title: Título
+          name: Tipo de proceso
         participatory_process_user_role:
           fields:
             email: Correo electrónico
@@ -219,6 +236,23 @@ es-MX:
         update:
           error: Se ha producido un error en la actualización de esta fase de proceso participativo.
           success: La fase de proceso participativo se ha actualizado correctamente.
+      participatory_process_types:
+        create:
+          error: Se ha producido un error al crear un nuevo tipo de proceso.
+          success: Tipo de proceso creado correctamente.
+        destroy:
+          success: Tipo de proceso eliminado correctamente.
+        edit:
+          title: Editar el tipo de proceso
+          update: Actualizar
+        form:
+          title: Título
+        new:
+          create: Crear
+          title: Nuevo tipo de proceso
+        update:
+          error: Se ha producido un error al actualizar este tipo de proceso.
+          success: Tipo de procés actualizado correctamente.
       participatory_process_user_roles:
         create:
           error: Ha habido un error al agregar un usuario a este proceso participativo.
@@ -263,6 +297,7 @@ es-MX:
           success: Grupo creado correctamente.
       titles:
         participatory_process_groups: Grupos de procesos participativos
+        participatory_process_types: Tipos de procesos participativos
         participatory_processes: Procesos participativos
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ es-MX:
     admin_log:
       participatory_process:
         create: "%{user_name} creó el proceso participativo %{resource_name}"
+        duplicate: "%{user_name} ha duplicado el proceso participativo %{resource_name}"
+        export: "%{user_name} exportó el proceso participativo %{resource_name}"
+        import: "%{user_name} importó el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
@@ -282,6 +320,10 @@ es-MX:
         create: "%{user_name} creó la fase %{resource_name} en el proceso participativo %{space_name}"
         delete: "%{user_name} eliminó la fase %{resource_name} en el proceso participativo %{space_name}"
         update: "%{user_name} actualizó la fase %{resource_name} en el proceso participativo %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} ha creado el tipo de proceso participativo %{resource_name}"
+        delete: "%{user_name} ha borrado el tipo de proceso participativo %{resource_name}"
+        update: "%{user_name} ha actualizado el tipo de proceso participativo %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} invitó al usuario %{resource_name} al proceso participativo %{space_name}"
         delete: "%{user_name} eliminó al usuario %{resource_name} del proceso participativo %{space_name}"
@@ -309,6 +351,10 @@ es-MX:
           contextual: "<p>Un <strong>proceso participativo</strong> es una secuencia de actividades participativas (p.e. primero rellenar una encuesta, luego realizar propuestas, debatirlas en encuentros presenciales o virtuales, y finalmente priorizarlas) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros de un comité (donde primero se presentan unas candidaturas, luego se debate y finalmente se elige una candidatura), presupuestos participativos (donde se realizan propuestas, se valoran económicamente y se vota con el dinero disponible), un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de políticas públicas.</p>\n"
           page: "<p>Un <strong>proceso participativo</strong> es una secuencia de actividades participativas (p.e. primero rellenar una encuesta, luego realizar propuestas, debatirlas en encuentros presenciales o virtuales, y finalmente priorizarlas) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros de un comité (donde primero se presentan unas candidaturas, luego se debate y finalmente se elige una candidatura), presupuestos participativos (donde se realizan propuestas, se valoran económicamente y se vota con el dinero disponible), un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de políticas públicas.</p>\n"
           title: '¿Qué es un proceso participativo?'
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Este tipo de proceso no se encontró en la base de datos (ID: %{id})'
     menu:
       processes: Procesos
     metrics:
@@ -384,6 +430,7 @@ es-MX:
             related_processes: Procesos relacionados
             scope_type_max_depth_help: Restringe la profundidad del filtro de ámbito; se mostrará el filtro desde el ámbito general hasta el seleccionado.
             select_an_area: Seleccione una área
+            select_participatory_process_type: Selecciona un tipo de proceso
             select_process_group: Seleccione un grupo de proceso
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a este proceso. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Información general
@@ -410,6 +457,7 @@ es-MX:
           back_to_process: Volver a la página del proceso
       participatory_processes:
         filters:
+          all_types: Todos los tipos
           counters:
             active:
               one: 1 proceso activo
@@ -427,6 +475,7 @@ es-MX:
             no_active: Sin procesos activos
             no_active_nor_upcoming: Sin procesos activos ni futuros
             no_active_nor_upcoming_callout: No hay procesos activos ni futuros. Aquí hay una lista de los pasados.
+          filter_by: Mostrar
           names:
             active: Activar
             all: Todos
diff --git a/decidim-participatory_processes/config/locales/es-PY.yml b/decidim-participatory_processes/config/locales/es-PY.yml
index b947e01390b72..ec7d4f62369e2 100644
--- a/decidim-participatory_processes/config/locales/es-PY.yml
+++ b/decidim-participatory_processes/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ es-PY:
         decidim_area_id: �rea
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         end_date: Fecha de finalización
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
+        import_steps: Importar fases
         local_area: �rea de organización
         meta_scope: 'Metadatos: ámbito'
         participatory_process_group_id: Grupo de procesos
+        participatory_process_type_id: Tipo de proceso
         participatory_scope: Qué se decide
         participatory_structure: Cómo se decide
+        private_space: Proceso privado
         promoted: Destacado
         published_at: Publicado en
         related_process_ids: Procesos relacionados
@@ -56,6 +64,8 @@ es-PY:
         short_description: Descripción breve
         start_date: Fecha de inicio
         title: Título
+      participatory_process_type:
+        title: Título
       participatory_process_user_role:
         email: Correo electrónico
         name: Nombre
@@ -65,7 +75,7 @@ es-PY:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Fase activada
       decidim/participatory_process_step_changed_event: La fase ha cambiado
@@ -96,6 +106,7 @@ es-PY:
         new_process: Nuevo proceso
         new_process_group: Nuevo grupo de procesos
         new_process_step: Nueva fase
+        new_process_type: Nuevo tipo de proceso
         new_process_user_role: Nuevo usuario de proceso
         preview: Previsualizar
         publish: Publicar
@@ -106,6 +117,7 @@ es-PY:
         participatory_process_groups_submenu:
           info: Información
           landing_page: Página de inicio
+        participatory_process_types: Tipo de proceso
         participatory_processes: Procesos
         participatory_processes_submenu:
           attachment_collections: Carpetas
@@ -137,6 +149,11 @@ es-PY:
             start_date: Fecha de inicio
             title: Título
           name: Fase de proceso participativo
+        participatory_process_type:
+          fields:
+            created_at: Creado el
+            title: Título
+          name: Tipo de proceso
         participatory_process_user_role:
           fields:
             email: Correo electrónico
@@ -219,6 +236,23 @@ es-PY:
         update:
           error: Se ha producido un error en la actualización de esta fase de proceso participativo.
           success: La fase de proceso participativo se ha actualizado correctamente.
+      participatory_process_types:
+        create:
+          error: Se ha producido un error al crear un nuevo tipo de proceso.
+          success: Tipo de proceso creado correctamente.
+        destroy:
+          success: Tipo de proceso eliminado correctamente.
+        edit:
+          title: Editar el tipo de proceso
+          update: Actualizar
+        form:
+          title: Título
+        new:
+          create: Crear
+          title: Nuevo tipo de proceso
+        update:
+          error: Se ha producido un error al actualizar este tipo de proceso.
+          success: Tipo de procés actualizado correctamente.
       participatory_process_user_roles:
         create:
           error: Ha habido un error al agregar un usuario a este proceso participativo.
@@ -263,6 +297,7 @@ es-PY:
           success: Grupo creado correctamente.
       titles:
         participatory_process_groups: Grupos de procesos participativos
+        participatory_process_types: Tipos de procesos participativos
         participatory_processes: Procesos participativos
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ es-PY:
     admin_log:
       participatory_process:
         create: "%{user_name} creó el proceso participativo %{resource_name}"
+        duplicate: "%{user_name} ha duplicado el proceso participativo %{resource_name}"
+        export: "%{user_name} ha exportado el proceso participativo %{resource_name}"
+        import: "%{user_name} ha importado el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
@@ -282,6 +320,10 @@ es-PY:
         create: "%{user_name} creó la fase %{resource_name} en el proceso participativo %{space_name}"
         delete: "%{user_name} eliminó la fase %{resource_name} en el proceso participativo %{space_name}"
         update: "%{user_name} actualizó la fase %{resource_name} en el proceso participativo %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} ha creado el tipo de proceso participativo %{resource_name}"
+        delete: "%{user_name} ha borrado el tipo de proceso participativo %{resource_name}"
+        update: "%{user_name} ha actualizado el tipo de proceso participativo %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} invitó al usuario %{resource_name} al proceso participativo %{space_name}"
         delete: "%{user_name} eliminó al usuario %{resource_name} del proceso participativo %{space_name}"
@@ -309,6 +351,10 @@ es-PY:
           contextual: "<p>A <strong>proceso participativo</strong> es una secuencia de actividades de participación (por ejemplo, primero llenar una encuesta, a continuación, hacer propuestas, discutirlos en reuniones cara a cara o virtuales, y, finalmente, dar prioridad a ellos) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros del comité (donde las candidaturas se presentan primero, luego se debate y finalmente se elige una candidatura), los presupuestos participativos (donde se hacen las propuestas, se valoran económicamente y se vota con el dinero disponible) un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de política pública.</p>\n"
           page: "<p>A <strong>proceso participativo</strong> es una secuencia de actividades de participación (por ejemplo, primero llenar una encuesta, a continuación, hacer propuestas, discutirlos en reuniones cara a cara o virtuales, y, finalmente, dar prioridad a ellos) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros del comité (donde las candidaturas se presentan primero, luego se debate y finalmente se elige una candidatura), los presupuestos participativos (donde se hacen las propuestas, se valoran económicamente y se vota con el dinero disponible) un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de política pública.</p>\n"
           title: '¿Qué es un proceso participativo?'
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Este tipo de proceso no se encontró en la base de datos (ID: %{id})'
     menu:
       processes: Procesos
     metrics:
@@ -384,6 +430,7 @@ es-PY:
             related_processes: Procesos relacionados
             scope_type_max_depth_help: Restringe la profundidad del filtro de ámbito; se mostrará el filtro desde el ámbito general hasta el seleccionado.
             select_an_area: Seleccione una área
+            select_participatory_process_type: Selecciona un tipo de proceso
             select_process_group: Seleccione un grupo de proceso
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a este proceso. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Información general
@@ -410,6 +457,7 @@ es-PY:
           back_to_process: Volver a la página del proceso
       participatory_processes:
         filters:
+          all_types: Todos los tipos
           counters:
             active:
               one: 1 proceso activo
@@ -427,6 +475,7 @@ es-PY:
             no_active: Sin procesos activos
             no_active_nor_upcoming: Sin procesos activos ni futuros
             no_active_nor_upcoming_callout: No hay procesos activos ni futuros. Aquí hay una lista de los pasados.
+          filter_by: Mostrar
           names:
             active: Activa
             all: Todos
diff --git a/decidim-participatory_processes/config/locales/es.yml b/decidim-participatory_processes/config/locales/es.yml
index 6f8fa27aae365..fb3f34c525c4d 100644
--- a/decidim-participatory_processes/config/locales/es.yml
+++ b/decidim-participatory_processes/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ es:
         decidim_area_id: �rea
         description: Descripción
         developer_group: Grupo promotor
+        document: Documento
         domain: Dominio
         end_date: Fecha de finalización
         hashtag: Hashtag
         hero_image: Imagen de portada
+        import_attachments: Importar archivos adjuntos
+        import_categories: Importar categorias
+        import_components: Importar componentes
+        import_steps: Importar fases
         local_area: �rea de organización
         meta_scope: Metadatos de ámbito
         participatory_process_group_id: Grupo de procesos
+        participatory_process_type_id: Tipo de proceso
         participatory_scope: Qué se decide
         participatory_structure: Cómo se decide
+        private_space: Proceso privado
         promoted: Destacado
         published_at: Publicado en
         related_process_ids: Procesos relacionados
@@ -56,6 +64,8 @@ es:
         short_description: Descripción breve
         start_date: Fecha de inicio
         title: Título
+      participatory_process_type:
+        title: Título
       participatory_process_user_role:
         email: Correo electrónico
         name: Nombre
@@ -65,7 +75,7 @@ es:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Fase activada
       decidim/participatory_process_step_changed_event: Fase modificada
@@ -96,6 +106,7 @@ es:
         new_process: Nuevo proceso
         new_process_group: Nuevo grupo de procesos
         new_process_step: Nueva fase
+        new_process_type: Nuevo tipo de proceso
         new_process_user_role: Nueva administradora de proceso
         preview: Previsualizar
         publish: Publicar
@@ -106,6 +117,7 @@ es:
         participatory_process_groups_submenu:
           info: Información
           landing_page: Página de inicio
+        participatory_process_types: Tipo de proceso
         participatory_processes: Procesos
         participatory_processes_submenu:
           attachment_collections: Carpetas
@@ -137,6 +149,11 @@ es:
             start_date: Fecha de inicio
             title: Título
           name: Fase del proceso participativo
+        participatory_process_type:
+          fields:
+            created_at: Creado el
+            title: Título
+          name: Tipo de proceso
         participatory_process_user_role:
           fields:
             email: Correo electrónico
@@ -219,6 +236,23 @@ es:
         update:
           error: Se ha producido un error en la actualización de esta fase del proceso participativo.
           success: La fase del proceso participativo se ha actualizado correctamente.
+      participatory_process_types:
+        create:
+          error: Se ha producido un error al crear un nuevo tipo de proceso.
+          success: Tipo de proceso creado correctamente.
+        destroy:
+          success: Tipo de proceso eliminado correctamente.
+        edit:
+          title: Editar el tipo de proceso
+          update: Actualizar
+        form:
+          title: Título
+        new:
+          create: Crear
+          title: Nuevo tipo de proceso
+        update:
+          error: Se ha producido un error al actualizar este tipo de proceso.
+          success: Tipo de procés actualizado correctamente.
       participatory_process_user_roles:
         create:
           error: Ha habido un error al añadir una participante a este proceso participativo.
@@ -263,6 +297,7 @@ es:
           success: Grupo de procesos participativos creado correctamente.
       titles:
         participatory_process_groups: Grupos de procesos participativos
+        participatory_process_types: Tipos de procesos participativos
         participatory_processes: Procesos participativos
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ es:
     admin_log:
       participatory_process:
         create: "%{user_name} creó el proceso participativo %{resource_name}"
+        duplicate: "%{user_name} ha duplicado el proceso participativo %{resource_name}"
+        export: "%{user_name} ha exportado el proceso participativo %{resource_name}"
+        import: "%{user_name} ha importado el proceso participativo %{resource_name}"
         publish: "%{user_name} publicó el proceso participativo %{resource_name}"
         unpublish: "%{user_name} despublicó el proceso participativo %{resource_name}"
         update: "%{user_name} actualizó el proceso participativo %{resource_name}"
@@ -282,6 +320,10 @@ es:
         create: "%{user_name} creó la fase %{resource_name} en el proceso participativo %{space_name}"
         delete: "%{user_name} eliminó la fase %{resource_name} en el proceso participativo %{space_name}"
         update: "%{user_name} actualizó la fase %{resource_name} en el proceso participativo %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} ha creado el tipo de proceso participativo %{resource_name}"
+        delete: "%{user_name} ha borrado el tipo de proceso participativo %{resource_name}"
+        update: "%{user_name} ha actualizado el tipo de proceso participativo %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} invitó a la participante %{resource_name} al proceso participativo %{space_name}"
         delete: "%{user_name} eliminó a la participante %{resource_name} del proceso participativo %{space_name}"
@@ -309,6 +351,10 @@ es:
           contextual: "<p>Un <strong>proceso participativo</strong> es una secuencia de actividades participativas (p.e. primero rellenar una encuesta, luego realizar propuestas, debatirlas en encuentros presenciales o virtuales, y finalmente priorizarlas) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros de un comité (donde primero se presentan unas candidaturas, luego se debate y finalmente se elige una candidatura), presupuestos participativos (donde se realizan propuestas, se valoran económicamente y se vota con el dinero disponible), un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de políticas públicas.</p>\n"
           page: "<p>Un <strong>proceso participativo</strong> es una secuencia de actividades participativas (p.e. primero rellenar una encuesta, luego realizar propuestas, debatirlas en encuentros presenciales o virtuales, y finalmente priorizarlas) con el objetivo de definir y tomar una decisión sobre un tema específico.</p> <p>Ejemplos de procesos participativos son: un proceso de elección de los miembros de un comité (donde primero se presentan unas candidaturas, luego se debate y finalmente se elige una candidatura), presupuestos participativos (donde se realizan propuestas, se valoran económicamente y se vota con el dinero disponible), un proceso de planificación estratégica, la redacción colaborativa de un reglamento o norma, el diseño de un espacio urbano o la producción de un plan de políticas públicas.</p>\n"
           title: '¿Qué es un proceso participativo?'
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Este tipo de proceso no se encontró en la base de datos (ID: %{id})'
     menu:
       processes: Procesos
     metrics:
@@ -384,6 +430,7 @@ es:
             related_processes: Procesos relacionados
             scope_type_max_depth_help: Restringe la profundidad del filtro de ámbito; se mostrará el filtro desde el ámbito general hasta el seleccionado.
             select_an_area: Seleccione una área
+            select_participatory_process_type: Selecciona un tipo de proceso
             select_process_group: Selecciona un grupo de procesos
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a este proceso. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             title: Información general
@@ -410,6 +457,7 @@ es:
           back_to_process: Volver a la página del proceso
       participatory_processes:
         filters:
+          all_types: Todos los tipos
           counters:
             active:
               one: Un proceso activo
@@ -427,6 +475,7 @@ es:
             no_active: Sin procesos activos
             no_active_nor_upcoming: No hay procesos activos ni futuros
             no_active_nor_upcoming_callout: No hay procesos activos ni futuros. Aquí hay una lista de los pasados.
+          filter_by: Mostrar
           names:
             active: Activos
             all: Todos
diff --git a/decidim-participatory_processes/config/locales/eu.yml b/decidim-participatory_processes/config/locales/eu.yml
index 16227cd4beb64..97e45e4122dfa 100644
--- a/decidim-participatory_processes/config/locales/eu.yml
+++ b/decidim-participatory_processes/config/locales/eu.yml
@@ -1,16 +1,17 @@
+---
 eu:
   activemodel:
     attributes:
       participatory_process:
         announcement: Anuntzio
-        area_id: Area
+        area_id: Arloa
         banner_image: Bannerra
         copy_categories: Kopiatu kategoriak
         copy_components: Kopiatu osagaiak
         copy_steps: Kopiatu faseak
-        decidim_area_id: Area
+        decidim_area_id: Arloa
         description: Deskribapena
-        developer_group: Sustatzailearen taldea
+        developer_group: Talde sustatzailea
         domain: Domeinua
         end_date: Bukaera-data
         hashtag: Traola
@@ -18,10 +19,10 @@ eu:
         local_area: Antolakuntza eremua
         meta_scope: 'Metadatuak: esparrua'
         participatory_process_group_id: Prozesu-multzoa
-        participatory_scope: Zer erabaki
+        participatory_scope: Zer erabakitzen da
         participatory_structure: Nola erabakitzen da?
         promoted: Nabarmendua
-        published_at: Argitaratu at
+        published_at: Argitaratze-data
         related_process_ids: Elkarrekin lotutako prozesuak
         scope_id: Esparrua
         scope_type_max_depth_id: Eremuaren iragazkiaren sakonera
@@ -34,7 +35,7 @@ eu:
         subtitle: Azpititulua
         target: Nor parte hartzen du
         title: Titulua
-        weight: Kokapenaren hurrenkera
+        weight: Ordena
       participatory_process_group:
         description: Deskribapena
         developer_group: Talde sustatzailea
@@ -46,7 +47,7 @@ eu:
         participatory_process_ids: Elkarrekin lotutako prozesuak
         participatory_scope: Zer erabakitzen den
         participatory_structure: Nola erabakitzen den
-        target: Nork hartzen duen parte
+        target: Nork hartzen due parte
         title: Izenburua
       participatory_process_step:
         cta_path: Deitu ekintza bideari
@@ -65,7 +66,7 @@ eu:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Dokumentu-mota baliogabea da. Formatu hauek onartzen dira: %{valid_mime_types}'
+              allowed_file_content_types: 'Dokumentu mota hau ez da onartzen. Honako hauek onartzen dira: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Urratsera aktibatuta
       decidim/participatory_process_step_changed_event: Pasartea aldatu da
@@ -290,7 +291,7 @@ eu:
       participatory_process:
         role_assigned:
           email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> prozesu parte-hartzailean.'
-          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu zaizu "%{resource_title}" jardunaldian.
+          email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu zaizu "%{resource_title}" espazioan.
           email_subject: '%{role} rola esleitu zaizu hemen "%{resource_title}".'
           notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> prozesu parte-hartzailean.'
         step_activated:
@@ -331,8 +332,8 @@ eu:
           developer_group: Nork sustatua
           name: Metadatuak
           participatory_scope: Zer erabakitzen den
-          participatory_structure: Nola erabakitzen den
-          target: Nork hartzen duen parte
+          participatory_structure: Nola erabakitzen da
+          target: Nork hartzen du parte
         participatory_processes:
           name: Prozesu parte-hartzaileak
         stats:
@@ -399,7 +400,7 @@ eu:
             more_information: Informazio gehiago
             participate: Parte hartu
             participate_in: Parte hartu %{resource_name} prozesuan
-            processes_button_title: Lotura prozesu guztiak erakusten dituen Prozesuen orrialdera
+            processes_button_title: Esteka prozesu guztiak erakusten dituen Prozesuen orrialdera
             see_all_processes: Ikusi prozesu guztiak
       participatory_process_steps:
         index:
diff --git a/decidim-participatory_processes/config/locales/fi-plain.yml b/decidim-participatory_processes/config/locales/fi-plain.yml
index 550a229698ea4..27192e1f4312b 100644
--- a/decidim-participatory_processes/config/locales/fi-plain.yml
+++ b/decidim-participatory_processes/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ fi-pl:
         decidim_area_id: Alue
         description: Kuvaus
         developer_group: Kehittäjäryhmä
+        document: Asiakirja
         domain: Toimintaympäristö
         end_date: Päättymispäivä
         hashtag: Aihetunniste (hashtag)
         hero_image: Etusivun kuva
+        import_attachments: Tuo liitteitä
+        import_categories: Kopioi aihepiirejä
+        import_components: Tuo komponentteja
+        import_steps: Tuo vaiheita
         local_area: Järjestöalue
         meta_scope: Teeman metadata
         participatory_process_group_id: Prosessiryhmä
+        participatory_process_type_id: Prosessin tyyppi
         participatory_scope: Mitä päätetään
         participatory_structure: Miten päätetään
+        private_space: Yksityinen prosessi
         promoted: Korostettu
         published_at: Julkaisuaika
         related_process_ids: Liittyvät prosessit
@@ -56,6 +64,8 @@ fi-pl:
         short_description: Lyhyt kuvaus
         start_date: Alkamispäivä
         title: Otsikko
+      participatory_process_type:
+        title: Otsikko
       participatory_process_user_role:
         email: Sähköposti
         name: Nimi
@@ -65,7 +75,7 @@ fi-pl:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Vaihe aktivoidaan
       decidim/participatory_process_step_changed_event: Vaihe muutettu
@@ -96,6 +106,7 @@ fi-pl:
         new_process: Uusi prosessi
         new_process_group: Uusi prosessiryhmä
         new_process_step: Uusi vaihe
+        new_process_type: Uusi prosessityyppi
         new_process_user_role: Uusi prosessikäyttäjä
         preview: Esikatsele
         publish: Julkaise
@@ -106,6 +117,7 @@ fi-pl:
         participatory_process_groups_submenu:
           info: Tiedot
           landing_page: Laskeutumissivu
+        participatory_process_types: Prosessityypit
         participatory_processes: Prosessit
         participatory_processes_submenu:
           attachment_collections: Kansiot
@@ -137,6 +149,11 @@ fi-pl:
             start_date: Alkamispäivä
             title: Otsikko
           name: Osallisuusprosessin vaihe
+        participatory_process_type:
+          fields:
+            created_at: Luontiaika
+            title: Otsikko
+          name: Prosessityyppi
         participatory_process_user_role:
           fields:
             email: Sähköposti
@@ -219,6 +236,23 @@ fi-pl:
         update:
           error: Tämän osallisuusprosessin vaiheen päivityksessä tapahtui virhe.
           success: Osallisuusprosessin vaihe päivitetty onnistuneesti.
+      participatory_process_types:
+        create:
+          error: Prosessityypin luonti epäonnistui.
+          success: Prosessityypin luonti onnistui.
+        destroy:
+          success: Prosessityypin poisto onnistui.
+        edit:
+          title: Muokkaa prosessityyppiä
+          update: Päivitä
+        form:
+          title: Otsikko
+        new:
+          create: Luo
+          title: Uusi prosessityyppi
+        update:
+          error: Prosessityypin päivitys epäonnistui.
+          success: Prosessityypin päivittäminen onnistui.
       participatory_process_user_roles:
         create:
           error: Tapahtui virhe lisätessä käyttäjää osallisuusprosessiin.
@@ -263,6 +297,7 @@ fi-pl:
           success: Osallisuusprosessiryhmä luotu onnistuneesti.
       titles:
         participatory_process_groups: Osallisuusprosessiryhmät
+        participatory_process_types: Osallistumisprosessien tyypit
         participatory_processes: Osallisuusprosessit
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ fi-pl:
     admin_log:
       participatory_process:
         create: "%{user_name} loi osallisuusprosessin %{resource_name}"
+        duplicate: "%{user_name} kopioi osallistumisprosessin %{resource_name}"
+        export: "%{user_name} vei osallistumisprosessin %{resource_name}"
+        import: "%{user_name} toi osallistumisprosessin %{resource_name}"
         publish: "%{user_name} julkaisi osallisuusprosessin %{resource_name}"
         unpublish: "%{user_name} muutti osallisuusprosessin %{resource_name} julkaisemattomaksi"
         update: "%{user_name} päivitti osallisuusprosessin %{resource_name}"
@@ -282,6 +320,10 @@ fi-pl:
         create: "%{user_name} loi vaiheen %{resource_name} osallisuusprosessissa %{space_name}"
         delete: "%{user_name} poisti vaiheen %{resource_name} osallisuusprosessissa %{space_name}"
         update: "%{user_name} päivitti vaiheen %{resource_name} osallisuusprosessissa %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} loi prosessityypin %{resource_name}"
+        delete: "%{user_name} poisti prosessityypin %{resource_name}"
+        update: "%{user_name} päivitti prosessityyppiä %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} kutsui käyttäjän %{resource_name} osallisuusprosessiin %{space_name}"
         delete: "%{user_name} poisti käyttäjän %{resource_name} osallisuusprosessista %{space_name}"
@@ -309,6 +351,10 @@ fi-pl:
           contextual: "<p><strong>Osallisuusprosessi</strong> on osallisuustoimien sarja (esim. täytä ensin kysely, tee sitten ehdotuksia, keskustele niistä kasvokkain tai virtuaalisissa tapaamisissa ja lopuksi priorisoi ne), tavoitteena päättää tietystä aiheesta.</p> <p>Esimerkkejä osallisuusprosesseista ovat komitean jäsenten valintamenettely (jossa ensin esitetään ehdokkaat, sitten keskustellaan ja lopulta valitaan jäsenet), osallistuva budjetointi (joissa tehdään ehdotuksia, arvioidaan niiden toteutushinta ja äänestetään niistä budjetoitujen varojen puitteissa) strateginen suunnitteluprosessi ja asetuksen, säädöksen, kaupunkisuunnitelman tai julkisen toimintasuunnitelman laatimisen yhteistyöstäminen.</p>\n"
           page: "<p><strong>Osallisuusprosessi</strong> on osallisuustoimien sarja (esim. täytä ensin kysely, tee sitten ehdotuksia, keskustele niistä kasvokkain tai virtuaalisissa tapaamisissa ja lopuksi priorisoi ne), tavoitteena päättää tietystä aiheesta.</p> <p>Esimerkkejä osallisuusprosesseista ovat komitean jäsenten valintamenettely (jossa ensin esitetään ehdokkaat, sitten keskustellaan ja lopulta valitaan jäsenet), osallistuva budjetointi (joissa tehdään ehdotuksia, arvioidaan niiden toteutushinta ja äänestetään niistä budjetoitujen varojen puitteissa) strateginen suunnitteluprosessi ja asetuksen, säädöksen, kaupunkisuunnitelman tai julkisen toimintasuunnitelman laatimisen yhteistyöstäminen.</p>"
           title: Mikä on osallisuusprosessi?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Prosessityyppiä ei löytynyt tietokannasta (ID: %{id})'
     menu:
       processes: Prosessit
     metrics:
@@ -384,6 +430,7 @@ fi-pl:
             related_processes: Liittyvät prosessit
             scope_type_max_depth_help: Rajaa teemasuodattimen syvyyttä; suodatin näyttää yleisestä teemasta valittuun teematyyppiin saakka.
             select_an_area: Valitse alue
+            select_participatory_process_type: Valitse prosessityyppi
             select_process_group: Valitse prosessiryhmä
             slug_help: 'URL-tunnisteita käytetään tuottamaan URL-tunnisteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimia, numeroita ja viivoja. Arvon on alettava kirjaimella. Esimerkki: %{url}'
             title: Yleistä tietoa
@@ -410,6 +457,7 @@ fi-pl:
           back_to_process: Takaisin prosessin sivulle
       participatory_processes:
         filters:
+          all_types: Kaikki tyypit
           counters:
             active:
               one: 1 aktiivinen prosessi
@@ -427,6 +475,7 @@ fi-pl:
             no_active: Ei aktiivisia prosesseja
             no_active_nor_upcoming: Ei aktiivisia tai tulevia prosesseja
             no_active_nor_upcoming_callout: Ei ole olemassa aktiivisia tai tulevia prosesseja. Tässä on luettelo menneistä.
+          filter_by: Näytä
           names:
             active: Aktiiviset
             all: Kaikki
diff --git a/decidim-participatory_processes/config/locales/fi.yml b/decidim-participatory_processes/config/locales/fi.yml
index 35c8a332780bd..d22df32832a32 100644
--- a/decidim-participatory_processes/config/locales/fi.yml
+++ b/decidim-participatory_processes/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ fi:
         decidim_area_id: Alue
         description: Kuvaus
         developer_group: Edistäjäryhmä
+        document: Asiakirja
         domain: Toimintaympäristö
         end_date: Päättymispäivä
         hashtag: Aihetunniste (hashtag)
         hero_image: Etusivun kuva
+        import_attachments: Tuo liitteitä
+        import_categories: Kopioi aihepiirejä
+        import_components: Tuo komponentteja
+        import_steps: Tuo vaiheita
         local_area: Järjestöalue
         meta_scope: Teeman metadata
         participatory_process_group_id: Prosessiryhmä
+        participatory_process_type_id: Prosessin tyyppi
         participatory_scope: Mitä päätetään
         participatory_structure: Miten päätetään
+        private_space: Yksityinen prosessi
         promoted: Korostettu
         published_at: Julkaisuaika
         related_process_ids: Liittyvät prosessit
@@ -56,6 +64,8 @@ fi:
         short_description: Lyhyt kuvaus
         start_date: Alkamispäivä
         title: Otsikko
+      participatory_process_type:
+        title: Otsikko
       participatory_process_user_role:
         email: Sähköposti
         name: Nimi
@@ -65,7 +75,7 @@ fi:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
     models:
       decidim/participatory_process_step_activated_event: Vaihe aktivoitu
       decidim/participatory_process_step_changed_event: Vaihe muutettu
@@ -96,6 +106,7 @@ fi:
         new_process: Uusi prosessi
         new_process_group: Uusi prosessiryhmä
         new_process_step: Uusi vaihe
+        new_process_type: Uusi prosessityyppi
         new_process_user_role: Uusi prosessin hallintakäyttäjä
         preview: Esikatsele
         publish: Julkaise
@@ -106,6 +117,7 @@ fi:
         participatory_process_groups_submenu:
           info: Tiedot
           landing_page: Laskeutumissivu
+        participatory_process_types: Prosessityypit
         participatory_processes: Prosessit
         participatory_processes_submenu:
           attachment_collections: Kansiot
@@ -137,6 +149,11 @@ fi:
             start_date: Alkamispäivä
             title: Otsikko
           name: Osallistumisprosessin vaihe
+        participatory_process_type:
+          fields:
+            created_at: Luontiaika
+            title: Otsikko
+          name: Prosessityyppi
         participatory_process_user_role:
           fields:
             email: Sähköposti
@@ -219,6 +236,23 @@ fi:
         update:
           error: Osallistumisprosessin vaiheen päivitys epäonnistui.
           success: Osallistumisprosessin vaiheen päivitys onnistui.
+      participatory_process_types:
+        create:
+          error: Prosessityypin luonti epäonnistui.
+          success: Prosessityypin luonti onnistui.
+        destroy:
+          success: Prosessityypin poisto onnistui.
+        edit:
+          title: Muokkaa prosessityyppiä
+          update: Päivitä
+        form:
+          title: Otsikko
+        new:
+          create: Luo
+          title: Uusi prosessityyppi
+        update:
+          error: Prosessityypin päivitys epäonnistui.
+          success: Prosessityypin päivittäminen onnistui.
       participatory_process_user_roles:
         create:
           error: Osallistumisprosessin käyttäjän lisääminen epäonnistui.
@@ -263,6 +297,7 @@ fi:
           success: Osallistumisprosessien ryhmän luonti onnistui.
       titles:
         participatory_process_groups: Osallistumisprosessiryhmät
+        participatory_process_types: Osallistumisprosessien tyypit
         participatory_processes: Osallistumisprosessit
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ fi:
     admin_log:
       participatory_process:
         create: "%{user_name} loi osallistumisprosessin %{resource_name}"
+        duplicate: "%{user_name} kopioi osallistumisprosessin %{resource_name}"
+        export: "%{user_name} vei osallistumisprosessin %{resource_name}"
+        import: "%{user_name} toi osallistumisprosessin %{resource_name}"
         publish: "%{user_name} julkaisi osallistumisprosessin %{resource_name}"
         unpublish: "%{user_name} muutti osallistumisprosessin %{resource_name} julkaisemattomaksi"
         update: "%{user_name} päivitti osallistumisprosessin %{resource_name}"
@@ -282,6 +320,10 @@ fi:
         create: "%{user_name} loi vaiheen %{resource_name} osallistumisprosessissa %{space_name}"
         delete: "%{user_name} poisti vaiheen %{resource_name} osallistumisprosessissa %{space_name}"
         update: "%{user_name} päivitti vaiheen %{resource_name} osallistumisprosessissa %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} loi prosessityypin %{resource_name}"
+        delete: "%{user_name} poisti prosessityypin %{resource_name}"
+        update: "%{user_name} päivitti prosessityyppiä %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} kutsui käyttäjän %{resource_name} osallistumisprosessiin %{space_name}"
         delete: "%{user_name} poisti käyttäjän %{resource_name} osallistumisprosessista %{space_name}"
@@ -309,6 +351,10 @@ fi:
           contextual: "<p><strong>Osallistumisprosessi</strong> on osallistumistoimien sarja (esim. täytä ensin kysely, tee sitten ehdotuksia, keskustele niistä kasvokkain tai virtuaalisissa tapaamisissa ja lopuksi priorisoi ne), tavoitteena päättää tietystä aiheesta.</p> <p>Esimerkkejä osallisuusprosesseista ovat komitean jäsenten valintamenettely (jossa ensin esitetään ehdokkaat, sitten keskustellaan ja lopulta valitaan jäsenet), osallistuva budjetointi (joissa tehdään ehdotuksia, arvioidaan niiden toteutushinta ja äänestetään niistä budjetoitujen varojen puitteissa) strateginen suunnitteluprosessi ja asetuksen, säädöksen, kaupunkisuunnitelman tai julkisen toimintasuunnitelman laatimisen yhteistyöstäminen.</p>\n"
           page: "<p><strong>Osallistumisprosessi</strong> on osallistumistoimien sarja (esim. täytä ensin kysely, tee sitten ehdotuksia, keskustele niistä kasvokkain tai virtuaalisissa tapaamisissa ja lopuksi priorisoi ne), tavoitteena päättää tietystä aiheesta.</p> <p>Esimerkkejä osallisuusprosesseista ovat komitean jäsenten valintamenettely (jossa ensin esitetään ehdokkaat, sitten keskustellaan ja lopulta valitaan jäsenet), osallistuva budjetointi (joissa tehdään ehdotuksia, arvioidaan niiden toteutushinta ja äänestetään niistä budjetoitujen varojen puitteissa) strateginen suunnitteluprosessi ja asetuksen, säädöksen, kaupunkisuunnitelman tai julkisen toimintasuunnitelman laatimisen yhteistyöstäminen.</p>\n"
           title: Mikä on osallistumisprosessi?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Prosessityyppiä ei löytynyt tietokannasta (ID: %{id})'
     menu:
       processes: Prosessit
     metrics:
@@ -384,6 +430,7 @@ fi:
             related_processes: Liittyvät prosessit
             scope_type_max_depth_help: Rajaa teemasuodattimen syvyyttä; suodatin näyttää yleisestä teemasta valittuun teematyyppiin saakka.
             select_an_area: Valitse alue
+            select_participatory_process_type: Valitse prosessityyppi
             select_process_group: Valitse prosessiryhmä
             slug_help: 'URL-tunnisteita käytetään tuottamaan URL-tunnisteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimia, numeroita ja viivoja. Arvon on alettava kirjaimella. Esimerkki: %{url}'
             title: Yleistä tietoa
@@ -410,6 +457,7 @@ fi:
           back_to_process: Takaisin prosessin sivulle
       participatory_processes:
         filters:
+          all_types: Kaikki tyypit
           counters:
             active:
               one: 1 aktiivinen prosessi
@@ -427,6 +475,7 @@ fi:
             no_active: Ei aktiivisia prosesseja
             no_active_nor_upcoming: Ei aktiivisia tai tulevia prosesseja
             no_active_nor_upcoming_callout: Ei ole olemassa aktiivisia tai tulevia prosesseja. Tässä on luettelo menneistä.
+          filter_by: Näytä
           names:
             active: Aktiiviset
             all: Kaikki
diff --git a/decidim-participatory_processes/config/locales/fr-CA.yml b/decidim-participatory_processes/config/locales/fr-CA.yml
index ddc244e80703e..e425ceb8d2933 100644
--- a/decidim-participatory_processes/config/locales/fr-CA.yml
+++ b/decidim-participatory_processes/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ fr-CA:
         decidim_area_id: Périmètre d'assemblée
         description: Description
         developer_group: Organisateur
+        document: Document
         domain: Domaine
         end_date: Date de fin
         hashtag: Hashtag
         hero_image: Image de la page d'accueil
+        import_attachments: Importer les pièces jointes
+        import_categories: Importer les catégories
+        import_components: Importer les fonctionnalités
+        import_steps: Importer les étapes
         local_area: Espace d'organisation
         meta_scope: Échelle
         participatory_process_group_id: Groupe de processus
+        participatory_process_type_id: Type de processus
         participatory_scope: Objectifs
         participatory_structure: Modalités de décision
+        private_space: Processus privé
         promoted: Mise en avant
         published_at: Publiée à
         related_process_ids: Concertations liées
@@ -56,6 +64,8 @@ fr-CA:
         short_description: Résumé
         start_date: Date de début
         title: Titre
+      participatory_process_type:
+        title: Titre
       participatory_process_user_role:
         email: Email
         name: Nom
@@ -65,7 +75,7 @@ fr-CA:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont: %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
     models:
       decidim/participatory_process_step_activated_event: Étape activée
       decidim/participatory_process_step_changed_event: Étape modifiée
@@ -96,6 +106,7 @@ fr-CA:
         new_process: Nouvelle concertation
         new_process_group: Nouveau groupe de concertations
         new_process_step: Nouvelle étape
+        new_process_type: Nouveau type de concertation
         new_process_user_role: Nouvel administrateur de la concertation
         preview: Aperçu
         publish: Publier
@@ -106,6 +117,7 @@ fr-CA:
         participatory_process_groups_submenu:
           info: Information
           landing_page: Page d'accueil
+        participatory_process_types: Types de concertation
         participatory_processes: Concertations
         participatory_processes_submenu:
           attachment_collections: Dossiers
@@ -137,6 +149,11 @@ fr-CA:
             start_date: Date de début
             title: Titre
           name: Étape de la concertation
+        participatory_process_type:
+          fields:
+            created_at: Crée le
+            title: Titre
+          name: Type de concertation
         participatory_process_user_role:
           fields:
             email: Email
@@ -219,6 +236,23 @@ fr-CA:
         update:
           error: Une erreur s'est produite lors de la mise à jour de cette étape de la concertation.
           success: Étape de la concertation mise à jour avec succès.
+      participatory_process_types:
+        create:
+          error: Une erreur s'est produite lors de la création d'un nouveau type de concertation.
+          success: Type de concertation créé avec succès.
+        destroy:
+          success: Type de concertation supprimé avec succès.
+        edit:
+          title: Modifier le type de concertation
+          update: Mettre à jour
+        form:
+          title: Titre
+        new:
+          create: Créer
+          title: Nouveau type de concertation
+        update:
+          error: Une erreur s'est produite lors de la mise à jour de ce type de concertation.
+          success: Type de concertation mis à jour avec succès.
       participatory_process_user_roles:
         create:
           error: Une erreur s'est produite lors de l'ajout d'un utilisateur pour cette concertation.
@@ -263,6 +297,7 @@ fr-CA:
           success: Groupe de concertations créé avec succès.
       titles:
         participatory_process_groups: Groupes de concertations
+        participatory_process_types: Types de concertation
         participatory_processes: Concertations
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ fr-CA:
     admin_log:
       participatory_process:
         create: "%{user_name} a créé la concertation %{resource_name}"
+        duplicate: "%{user_name} a dupliqué\" la concertation %{resource_name}"
+        export: "%{user_name} a exporté la concertation %{resource_name}"
+        import: "%{user_name} a importé la concertation %{resource_name}"
         publish: "%{user_name} a publié la concertation %{resource_name}"
         unpublish: "%{user_name} n'a pas publié la concertation %{resource_name}"
         update: "%{user_name} a mis à jour la concertation %{resource_name}"
@@ -282,6 +320,10 @@ fr-CA:
         create: "%{user_name} a créé l'étape %{resource_name} dans la concertation %{space_name}"
         delete: "%{user_name} a supprimé l'étape %{resource_name} de la concertation %{space_name}"
         update: "%{user_name} a mis à jour l'étape %{resource_name} de la concertation %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} a créé le type de concertation %{resource_name}"
+        delete: "%{user_name} a supprimé le type de concertation %{resource_name}"
+        update: "%{user_name} a mis à jour le type de concertation %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} a invité l'utilisateur %{resource_name} à la concertation %{space_name}"
         delete: "%{user_name} a supprimé l'utilisateur %{resource_name} de la concertation %{space_name}"
@@ -309,6 +351,10 @@ fr-CA:
           contextual: "<p>Un <strong>processus de participation</strong> est une séquence d'activités de participation (par exemple , premier remplir un sondage, puis faire des propositions, les discuter en face-à-face ou virtuelles, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées avec l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
           page: "<p>Un <strong>processus de participation</strong> est une séquence d'activités de participation (par exemple , premier remplir un sondage, puis faire des propositions, les discuter en face-à-face ou virtuelles, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées avec l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
           title: Qu'est-ce qu'une concertation ?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Le type de concertation n''a pas été trouvé dans la base de données (ID: %{id})'
     menu:
       processes: Concertations
     metrics:
@@ -384,6 +430,7 @@ fr-CA:
             related_processes: Concertations liées
             scope_type_max_depth_help: Restreindre la profondeur du filtre de téles; Le filtre s'affichera de général au type de télescope sélectionné.
             select_an_area: Sélectionnez un secteur
+            select_participatory_process_type: Sélectionnez un type de concertation
             select_process_group: Sélectionnez un groupe de concertations
             slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui envoient vers cette concertation. Ils n''acceptent que des lettres, des chiffres et des tirets et doivent commencer par une lettre. Exemple : %{url}'
             title: Informations générales
@@ -410,6 +457,7 @@ fr-CA:
           back_to_process: Retour à la page du processus
       participatory_processes:
         filters:
+          all_types: Tous les types
           counters:
             active:
               one: 1 concertation active
@@ -427,6 +475,7 @@ fr-CA:
             no_active: Aucune concertation active
             no_active_nor_upcoming: Aucune concertation active ni à venir
             no_active_nor_upcoming_callout: Il n'y a pas de concertations actives ni à venir. Voici une liste des concertations passées.
+          filter_by: Afficher
           names:
             active: Actifs
             all: Tous
diff --git a/decidim-participatory_processes/config/locales/fr.yml b/decidim-participatory_processes/config/locales/fr.yml
index 6820a5ff9dfbe..c08eceb732b64 100644
--- a/decidim-participatory_processes/config/locales/fr.yml
+++ b/decidim-participatory_processes/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ fr:
         decidim_area_id: Périmètre d'assemblée
         description: Description
         developer_group: Organisateur
+        document: Document
         domain: Domaine
         end_date: Date de fin
         hashtag: Hashtag
         hero_image: Image de la page d'accueil
+        import_attachments: Importer les pièces jointes
+        import_categories: Importer les catégories
+        import_components: Importer les fonctionnalités
+        import_steps: Importer les étapes
         local_area: Espace d'organisation
         meta_scope: Échelle
         participatory_process_group_id: Groupe de processus
+        participatory_process_type_id: Type de processus
         participatory_scope: Objectifs
         participatory_structure: Modalités de décision
+        private_space: Processus privé
         promoted: Mis en avant
         published_at: Publiée à
         related_process_ids: Concertations liées
@@ -56,6 +64,8 @@ fr:
         short_description: Résumé
         start_date: Date de début
         title: Titre
+      participatory_process_type:
+        title: Titre
       participatory_process_user_role:
         email: Email
         name: Nom
@@ -65,7 +75,7 @@ fr:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont: %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
     models:
       decidim/participatory_process_step_activated_event: Étape activée
       decidim/participatory_process_step_changed_event: Étape modifiée
@@ -96,6 +106,7 @@ fr:
         new_process: Nouvelle concertation
         new_process_group: Nouveau groupe de concertations
         new_process_step: Nouvelle étape
+        new_process_type: Nouveau type de concertation
         new_process_user_role: Nouvel administrateur de la concertation
         preview: Aperçu
         publish: Publier
@@ -106,6 +117,7 @@ fr:
         participatory_process_groups_submenu:
           info: Information
           landing_page: Page d'accueil
+        participatory_process_types: Types de concertation
         participatory_processes: Concertations
         participatory_processes_submenu:
           attachment_collections: Dossiers
@@ -137,6 +149,11 @@ fr:
             start_date: Date de début
             title: Titre
           name: Étape de la concertation
+        participatory_process_type:
+          fields:
+            created_at: Crée le
+            title: Titre
+          name: Type de concertation
         participatory_process_user_role:
           fields:
             email: Email
@@ -219,6 +236,23 @@ fr:
         update:
           error: Une erreur s'est produite lors de la mise à jour de cette étape de la concertation.
           success: Étape de la concertation mise à jour avec succès.
+      participatory_process_types:
+        create:
+          error: Une erreur s'est produite lors de la création d'un nouveau type de concertation.
+          success: Type de concertation créé avec succès.
+        destroy:
+          success: Type de concertation supprimé avec succès.
+        edit:
+          title: Modifier le type de concertation
+          update: Mettre à jour
+        form:
+          title: Titre
+        new:
+          create: Créer
+          title: Nouveau type de concertation
+        update:
+          error: Une erreur s'est produite lors de la mise à jour de ce type de concertation.
+          success: Type de concertation mis à jour avec succès.
       participatory_process_user_roles:
         create:
           error: Une erreur s'est produite lors de l'ajout d'un utilisateur pour cette concertation.
@@ -263,6 +297,7 @@ fr:
           success: Groupe de concertations créé avec succès.
       titles:
         participatory_process_groups: Groupes de concertations
+        participatory_process_types: Types de concertation
         participatory_processes: Concertations
       users:
         resend_invitation:
@@ -271,6 +306,9 @@ fr:
     admin_log:
       participatory_process:
         create: "%{user_name} a créé la concertation %{resource_name}"
+        duplicate: "%{user_name} a dupliqué\" la concertation %{resource_name}"
+        export: "%{user_name} a exporté la concertation %{resource_name}"
+        import: "%{user_name} a importé la concertation %{resource_name}"
         publish: "%{user_name} a publié la concertation %{resource_name}"
         unpublish: "%{user_name} n'a pas publié la concertation %{resource_name}"
         update: "%{user_name} a mis à jour la concertation %{resource_name}"
@@ -282,6 +320,10 @@ fr:
         create: "%{user_name} a créé l'étape %{resource_name} dans la concertation %{space_name}"
         delete: "%{user_name} a supprimé l'étape %{resource_name} de la concertation %{space_name}"
         update: "%{user_name} a mis à jour l'étape %{resource_name} de la concertation %{space_name}"
+      participatory_process_type:
+        create: "%{user_name} a créé le type de concertation %{resource_name}"
+        delete: "%{user_name} a supprimé le type de concertation %{resource_name}"
+        update: "%{user_name} a mis à jour le type de concertation %{resource_name}"
       participatory_process_user_role:
         create: "%{user_name} a invité l'utilisateur %{resource_name} à la concertation %{space_name}"
         delete: "%{user_name} a supprimé l'utilisateur %{resource_name} de la concertation %{space_name}"
@@ -309,6 +351,10 @@ fr:
           contextual: "<p>Une <strong>concertation</strong> est une séquence d'activités de participation (par exemple remplir un sondage, puis faire des propositions, les discuter en face-à-face ou en ligne, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées selon l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
           page: "<p>Une <strong>concertation</strong> est une séquence d'activités de participation (par exemple remplir un sondage, puis faire des propositions, les discuter en face-à-face ou en ligne, et enfin les hiérarchiser) dans le but de définir et de prendre une décision sur un sujet spécifique.</p> <p>Exemples de processus participatifs: un processus d’élection des membres du comité (où les candidatures sont d'abord présentées, puis débattues et finalement une candidature est choisie), les budgets participatifs (où les propositions sont faites, évaluées économiquement et votées selon l'argent disponible), un processus de planification stratégique, la rédaction collaborative d'un règlement ou d'une norme, la conception d'un espace urbain ou la production d'un plan de politique publique.</p>\n"
           title: Qu'est-ce qu'une concertation ?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Le type de concertation n''a pas été trouvé dans la base de données (ID: %{id})'
     menu:
       processes: Concertations
     metrics:
@@ -384,6 +430,7 @@ fr:
             related_processes: Concertations liées
             scope_type_max_depth_help: Restreindre la profondeur du filtre de secteur; Le filtre s'affichera du secteur général au type de secteur sélectionné.
             select_an_area: Sélectionnez un secteur
+            select_participatory_process_type: Sélectionnez un type de concertation
             select_process_group: Sélectionnez un groupe de concertations
             slug_help: 'Les identifiants d''URL sont utilisés pour générer les URL qui envoient vers cette concertation. Ils n''acceptent que des lettres, des chiffres et des tirets et doivent commencer par une lettre. Exemple : %{url}'
             title: Informations générales
@@ -410,6 +457,7 @@ fr:
           back_to_process: Retour à la page du processus
       participatory_processes:
         filters:
+          all_types: Tous les types
           counters:
             active:
               one: 1 concertation active
@@ -427,6 +475,7 @@ fr:
             no_active: Aucune concertation active
             no_active_nor_upcoming: Aucune concertation active ni à venir
             no_active_nor_upcoming_callout: Il n'y a pas de concertations actives ni à venir. Voici une liste des concertations passées.
+          filter_by: Afficher
           names:
             active: Actives
             all: Toutes
diff --git a/decidim-participatory_processes/config/locales/ga-IE.yml b/decidim-participatory_processes/config/locales/ga-IE.yml
index 532a4503d916a..3cba8a9e96c3a 100644
--- a/decidim-participatory_processes/config/locales/ga-IE.yml
+++ b/decidim-participatory_processes/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/gl.yml b/decidim-participatory_processes/config/locales/gl.yml
index 239997295027f..3690e720c0b5f 100644
--- a/decidim-participatory_processes/config/locales/gl.yml
+++ b/decidim-participatory_processes/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -56,12 +57,6 @@ gl:
         email: Correo electrónico
         name: Nome
         role: Rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento non válido. Formatos aceptados: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Paso activado
       decidim/participatory_process_step_changed_event: O paso cambiou
diff --git a/decidim-participatory_processes/config/locales/hu.yml b/decidim-participatory_processes/config/locales/hu.yml
index 15859342e4d81..f96eb100423ef 100644
--- a/decidim-participatory_processes/config/locales/hu.yml
+++ b/decidim-participatory_processes/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -56,16 +57,12 @@ hu:
         short_description: Rövid leírás
         start_date: Kezdő dátum
         title: Cím
+      participatory_process_type:
+        title: Cím
       participatory_process_user_role:
         email: Email
         name: Név
         role: Szerep
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Érvénytelen dokumentumtípus. Elfogadott formátumok: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Lépés aktiválva
       decidim/participatory_process_step_changed_event: Lépés megváltozott
@@ -96,6 +93,7 @@ hu:
         new_process: Új folyamat
         new_process_group: Új folyamat csoport
         new_process_step: Új lépés
+        new_process_type: Új folyamat típus
         new_process_user_role: Új folyamat adminisztrátor
         preview: Előnézet
         publish: Közzétesz
@@ -106,6 +104,7 @@ hu:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Landing oldal
+        participatory_process_types: Folyamat típusok
         participatory_processes: Folyamatok
         participatory_processes_submenu:
           attachment_collections: Mappák
@@ -137,6 +136,11 @@ hu:
             start_date: Kezdő dátum
             title: Cím
           name: Résztvevői folyamat lépés
+        participatory_process_type:
+          fields:
+            created_at: Létrehozva
+            title: Cím
+          name: Folyamat típusa
         participatory_process_user_role:
           fields:
             email: Email
@@ -219,6 +223,23 @@ hu:
         update:
           error: Hiba történt a részvételi folyamat lépésének frissítése során.
           success: Részvételi folyamat lépés frissítése sikeres.
+      participatory_process_types:
+        create:
+          error: Hiba történt az új folyamat típus létrehozásakor.
+          success: Folyamat típus sikeresen létrehozva.
+        destroy:
+          success: Folyamat-típus sikeresen törölve.
+        edit:
+          title: Folyamat típus szerkesztése
+          update: Frissítés
+        form:
+          title: Cím
+        new:
+          create: Létrehozás
+          title: Új folyamat típus
+        update:
+          error: Hiba történt a folyamat típus frissítése során.
+          success: A folyamat típus sikeresen frissítésre került.
       participatory_process_user_roles:
         create:
           error: Hiba a felhasználó részvételi folyamathoz való hozzáadásakor.
@@ -263,6 +284,7 @@ hu:
           success: Részvételi folyamat csoport létrehozása sikeres.
       titles:
         participatory_process_groups: Részvételi folyamat csoportok
+        participatory_process_types: Részvételi folyamat típusok
         participatory_processes: Részvételi folyamatok
       users:
         resend_invitation:
@@ -271,6 +293,9 @@ hu:
     admin_log:
       participatory_process:
         create: "%{user_name} létrehozta a(z) %{resource_name} részvételi folyamatot"
+        duplicate: "%{user_name} duplikálta a(z) %{resource_name} részvételi folyamatot"
+        export: "%{user_name} exportálta a(z) %{resource_name} részvételi folyamatot"
+        import: "%{user_name} importálta a(z) %{resource_name} részvételi folyamatot"
         publish: "%{user_name} közzétette a(z) %{resource_name} részvételi folyamatot"
         unpublish: "%{user_name} visszavonta a(z) %{resource_name} részvételi folyamatot közzétételét"
         update: "%{user_name} frissítette a(z) %{resource_name} részvételi folyamatot"
@@ -282,6 +307,10 @@ hu:
         create: "%{user_name} létrehozta a(z) %{resource_name} lépést a(z) %{space_name} részvételi folyamatban"
         delete: "%{user_name} törölte a(z) %{resource_name} lépést a(z) %{space_name} részvételi folyamatból"
         update: "%{user_name} frissítette a(z) %{resource_name} lépést a(z) %{space_name} részvételi folyamatban"
+      participatory_process_type:
+        create: "%{user_name} létrehozta a(z) %{resource_name} részvételi folyamat típust"
+        delete: "%{user_name} törölte a(z) %{resource_name} részvételi folyamat típust"
+        update: "%{user_name} frissítette a(z) %{resource_name} részvételi folyamat típust"
       participatory_process_user_role:
         create: "%{user_name} meghívta %{resource_name} felhasználót a(z) %{space_name} részvételi folyamatba"
         delete: "%{user_name} törölte %{resource_name} felhasználót a(z) %{space_name} részvételi folyamatból"
@@ -309,6 +338,10 @@ hu:
           contextual: "<p>A <strong>részvételi folyamat</strong> a részvételi tevékenységek sorrendje (pl. Először egy felmérést tölt be, majd javaslatokat tesz, személyes vagy virtuális találkozókkal foglalkozik, végül pedig kiemelteti őket) a döntés megfogalmazása és meghozatala érdekében egy adott témában.</p> <p>Példák a részvételi folyamatokra: a bizottsági tagok megválasztásának folyamata (ahol a jelölteket először bemutatták, vitatták és végül jelöltségüket választották), részvételi költségvetések (ahol javaslatokat tesznek, gazdaságilag értékelik és szavaznak a rendelkezésre álló pénzzel) egy stratégiai tervezési folyamatot, egy rendelet vagy normaterv kidolgozását, egy városi tér kialakítását vagy egy közpolitikai terv elkészítését.</p>\n"
           page: "<p>A <strong>részvételi folyamat</strong> a részvételi tevékenységek sorrendje (pl. Először egy felmérést tölt be, majd javaslatokat tesz, személyes vagy virtuális találkozókkal foglalkozik, végül pedig kiemelteti őket) a döntés megfogalmazása és meghozatala érdekében egy adott témában.</p> <p>Példák a részvételi folyamatokra: a bizottsági tagok megválasztásának folyamata (ahol a jelölteket először bemutatták, vitatták és végül jelöltségüket választották), részvételi költségvetések (ahol javaslatokat tesznek, gazdaságilag értékelik és szavaznak a rendelkezésre álló pénzzel) egy stratégiai tervezési folyamatot, egy rendelet vagy normaterv kidolgozását, egy városi tér kialakítását vagy egy közpolitikai terv elkészítését.</p>\n"
           title: Mi a részvételi folyamat?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'A folyamat típust nem találtuk az adatbázisban (ID:%{id})'
     menu:
       processes: Folyamatok
     metrics:
@@ -381,6 +414,7 @@ hu:
             related_processes: Kapcsolódó folyamatok
             scope_type_max_depth_help: Hatáskör szűrő mélység korlátozása; A szűrő az általánostól a kiválasztott hatáskörtípus típusáig jelenik meg.
             select_an_area: Válasszon egy területet
+            select_participatory_process_type: Válasszon folyamat típust
             select_process_group: Válassza ki a folyamatcsoportot
             slug_help: 'Az URL slugok a folyamatok linkjeinek generáláshoz szükségesek. Csak betűket, számokat és kötőjeleket használhatsz. Betűvel kell kezdened. Példa: %{url}'
             title: �ltalános információk
@@ -407,6 +441,7 @@ hu:
           back_to_process: Vissza a folyamatok oldalára
       participatory_processes:
         filters:
+          all_types: Minden típus
           counters:
             active:
               one: 1 aktív folyamat
@@ -424,6 +459,7 @@ hu:
             no_active: Nincsenek aktív folyamatok
             no_active_nor_upcoming: Nincs aktív vagy közelgő folyamat
             no_active_nor_upcoming_callout: Nincs sem aktív, sem közelgő folyamat. A korrábbiakat itt nézheted meg.
+          filter_by: Mutat
           names:
             active: Aktív
             all: Összes
diff --git a/decidim-participatory_processes/config/locales/id-ID.yml b/decidim-participatory_processes/config/locales/id-ID.yml
index a67a15d743ea8..6a2365910eded 100644
--- a/decidim-participatory_processes/config/locales/id-ID.yml
+++ b/decidim-participatory_processes/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/is-IS.yml b/decidim-participatory_processes/config/locales/is-IS.yml
index f09b761a7fb83..a37fa0c35caf0 100644
--- a/decidim-participatory_processes/config/locales/is-IS.yml
+++ b/decidim-participatory_processes/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       participatory_process:
diff --git a/decidim-participatory_processes/config/locales/it.yml b/decidim-participatory_processes/config/locales/it.yml
index d980431afbef1..57b488c3edf7e 100644
--- a/decidim-participatory_processes/config/locales/it.yml
+++ b/decidim-participatory_processes/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ it:
         email: Email
         name: Titolo
         role: Ruolo
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo di documento non valido. I formati accettati sono: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Fase attivata
       decidim/participatory_process_step_changed_event: Fase modificata
diff --git a/decidim-participatory_processes/config/locales/ja.yml b/decidim-participatory_processes/config/locales/ja.yml
index dd01a4601ef2e..c471d959dd696 100644
--- a/decidim-participatory_processes/config/locales/ja.yml
+++ b/decidim-participatory_processes/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -11,15 +12,22 @@ ja:
         decidim_area_id: エリア
         description: 説明
         developer_group: プロモーターグループ
+        document: ドキュメント
         domain: ドメイン
         end_date: 終了日
         hashtag: �ッシュタグ
         hero_image: ホーム画�
+        import_attachments: 添付ファイルをイン�ート
+        import_categories: カテゴリをイン�ート
+        import_components: コン�ー�ントをイン�ート
+        import_steps: ステップをイン�ート
         local_area: 組織エリア
         meta_scope: スコープメタデータ
         participatory_process_group_id: �加型プロセスグループ
+        participatory_process_type_id: プロセス種別
         participatory_scope: 決定�れるも�
         participatory_structure: ��よ��決�られ���？
+        private_space: プライベートプロセス
         promoted: プロモート
         published_at: 公開日時
         related_process_ids: 関連�る�加型プロセス
@@ -56,6 +64,8 @@ ja:
         short_description: 短�説明
         start_date: 開始日
         title: タイトル
+      participatory_process_type:
+        title: タイトル
       participatory_process_user_role:
         email: Eメールアドレス
         name: ��
@@ -65,7 +75,7 @@ ja:
         participatory_process:
           attributes:
             document:
-              invalid_document_type: '無効�ドキュメント�種類��。承��れ�フォーマット�次���り��: %{valid_mime_types}'
+              allowed_file_content_types: '無効�ドキュメントタイプ��。次�拡張�を��ファイル���許��れ����: %{types}'
     models:
       decidim/participatory_process_step_activated_event: フェーズ有効化
       decidim/participatory_process_step_changed_event: フェーズ変更
@@ -93,6 +103,7 @@ ja:
         new_process: 新��加型プロセス
         new_process_group: 新��加型プロセスグループ
         new_process_step: 新��フェーズ
+        new_process_type: 新��プロセス種別
         new_process_user_role: 新���加型プロセス管�者
         preview: プレビュー
         publish: 公開
@@ -103,6 +114,7 @@ ja:
         participatory_process_groups_submenu:
           info: 情報
           landing_page: ランディングページ
+        participatory_process_types: プロセス�種別
         participatory_processes: �加型プロセス
         participatory_processes_submenu:
           attachment_collections: フォルダ
@@ -134,6 +146,11 @@ ja:
             start_date: 開始日
             title: タイトル
           name: プロセス�フェーズ
+        participatory_process_type:
+          fields:
+            created_at: 作�日時
+            title: タイトル
+          name: プロセス�種別
         participatory_process_user_role:
           fields:
             email: Eメールアドレス
@@ -216,6 +233,23 @@ ja:
         update:
           error: �加型プロセス���段階�更新��題��り���。
           success: �加段階�正常�更新�れ���。
+      participatory_process_types:
+        create:
+          error: 新��プロセス種別�作�中��題�発生����。
+          success: プロセス種別�正常�作��れ���。
+        destroy:
+          success: プロセス種別�正常�削除�れ���。
+        edit:
+          title: プロセス種別�編集
+          update: æ›´æ–°
+        form:
+          title: タイトル
+        new:
+          create: 作�
+          title: 新��プロセス種別
+        update:
+          error: プロセス種別�更新中��題�発生����。
+          success: プロセス種別�正常�更新�れ���。
       participatory_process_user_roles:
         create:
           error: ���加型プロセス��加者を追加�る際��題�発生����。
@@ -260,6 +294,7 @@ ja:
           success: �加型プロセスグループを作�����。
       titles:
         participatory_process_groups: �加型プロセスグループ
+        participatory_process_types: �加型プロセス種別
         participatory_processes: �加型プロセス
       users:
         resend_invitation:
@@ -268,6 +303,9 @@ ja:
     admin_log:
       participatory_process:
         create: "%{user_name} � %{resource_name} ��加型プロセスを作�����"
+        duplicate: "%{user_name} � %{resource_name} ��加プロセスを複製����"
+        export: "%{user_name} � %{resource_name} ��加プロセスをエクス�ート����"
+        import: "%{user_name} � %{resource_name} ��加プロセスをイン�ート����"
         publish: "%{user_name} � %{resource_name} �加型プロセスを公開����"
         unpublish: "%{user_name} � %{resource_name} �加型プロセスを�公開�����"
         update: "%{user_name} � %{resource_name} ��加型プロセスを更新����"
@@ -279,6 +317,10 @@ ja:
         create: "%{user_name} � %{resource_name} ��加型プロセス� %{space_name} フェーズを作�����"
         delete: "%{user_name} � %{resource_name} ��加型プロセス� %{space_name} フェーズを削除����"
         update: "%{user_name} � %{resource_name} ��加型プロセス� %{space_name} フェーズを更新����"
+      participatory_process_type:
+        create: "%{user_name} ��加型プロセス種別 %{resource_name} を作�����"
+        delete: "%{user_name} ��加者プロセス種別 %{resource_name} を削除����"
+        update: "%{user_name} ��加型プロセス種別 %{resource_name} を更新����"
       participatory_process_user_role:
         create: "%{user_name} ��加者 %{resource_name} を %{space_name} �加型プロセス�招待����"
         delete: "%{user_name} ��加者 %{resource_name} を %{space_name} �加型プロセス�ら削除����"
@@ -306,6 +348,10 @@ ja:
           contextual: "<p> <strong>�加型プロセス</strong>���特定�トピックを定義��決定�る��を目的���一連��加型活動(例���最��アンケート�記入��次��案を行��対����仮想会議�議論��最終的�優先順�を��る)�����。 </p> <p>�加型プロセス�例�����委員会メン�ー��出プロセス(最��立候補者��示�れ�議論�れ�最終的�立候補者���れる)��加型予算(�案���れ�経済的�評価�れ�利用�能�資金�投票�れる)�戦略的計画プロセス��制や�範�共�起��都市空間�設計�公共政策計画�作����挙�られ��。</p>\n"
           page: "<p> <strong>�加型プロセス</strong>���特定�トピックを定義��決定�る��を目的���一連��加型活動(例���最��アンケート�記入��次��案を行��対����仮想会議�議論��最終的�優先順�を��る)�����。 </p> <p>�加型プロセス�例�����委員会メン�ー��出プロセス(最��立候補者��示�れ�議論�れ�最終的�立候補者���れる)��加型予算(�案���れ�経済的�評価�れ�利用�能�資金�投票�れる)�戦略的計画プロセス��制や�範�共�起��都市空間�設計�公共政策計画�作����挙�られ��。</p>\n"
           title: �加型プロセス��何���?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'プロセス種別�データベース上�見��り��ん��� (ID: %{id})'
     menu:
       processes: �加型プロセス
     metrics:
@@ -380,6 +426,7 @@ ja:
             related_processes: 関連�る�加型プロセス
             scope_type_max_depth_help: スコープフィルター�深�を制����。フィルター��一般�ら�択��スコープタイプ�表示�れ��。
             select_an_area: エリアを�択
+            select_participatory_process_type: プロセス�種別を�択
             select_process_group: �加型プロセス グループを�択
             slug_help: 'URLスラグ�����加型プロセスを指�URLを生��る���使用�れ��。 文字�数字�ダッシュ��を��付��文字�始�る必���り��。例: %{url}'
             title: 一般情報
@@ -406,6 +453,7 @@ ja:
           back_to_process: �加型プロセス�ページ�戻る
       participatory_processes:
         filters:
+          all_types: ����種別
           counters:
             active:
               other: "%{count} 個�有効��加型プロセス"
@@ -419,6 +467,7 @@ ja:
             no_active: アクティブ��加型プロセス��り��ん
             no_active_nor_upcoming: アクティブ��加型プロセスも今後��加型プロセスも�り��ん
             no_active_nor_upcoming_callout: アクティブ��加型プロセスも今後��加型プロセスも�り��ん。�����去��加型プロセス�リストを示���。
+          filter_by: 表示
           names:
             active: アクティブ
             all: ���
diff --git a/decidim-participatory_processes/config/locales/ka-GE.yml b/decidim-participatory_processes/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-participatory_processes/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-participatory_processes/config/locales/lb.yml b/decidim-participatory_processes/config/locales/lb.yml
index f8950ffd2d904..0b61ee88090fe 100644
--- a/decidim-participatory_processes/config/locales/lb.yml
+++ b/decidim-participatory_processes/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ lb:
         email: Email
         name: Numm
         role: Rolle
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ungültiger Dokumenttyp. Zulässige Formate sind: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Phase aktiviert
       decidim/participatory_process_step_changed_event: Phase geändert
diff --git a/decidim-participatory_processes/config/locales/lt.yml b/decidim-participatory_processes/config/locales/lt.yml
index 05f6e5ff0ae52..7dbefa716295a 100644
--- a/decidim-participatory_processes/config/locales/lt.yml
+++ b/decidim-participatory_processes/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -56,16 +57,12 @@ lt:
         short_description: Trumpas aprašymas
         start_date: Pradžios data
         title: Pavadinimas
+      participatory_process_type:
+        title: Pavadinimas
       participatory_process_user_role:
         email: El. paštas
         name: Vardas
         role: RolÄ—
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Netinkamas dokumento tipas. Priimtini formatai: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Etapas aktyvuotas
       decidim/participatory_process_step_changed_event: Eatapas pakeistas
@@ -102,6 +99,7 @@ lt:
         new_process: Naujas procesas
         new_process_group: Nauja procesų grupė
         new_process_step: Naujas etapas
+        new_process_type: Naujas proceso tipas
         new_process_user_role: Naujas proceso administratorius
         preview: Peržiūra
         publish: Publikuoti
@@ -112,6 +110,7 @@ lt:
         participatory_process_groups_submenu:
           info: Informacija
           landing_page: Pagrindinis puslapis
+        participatory_process_types: Proceso tipas
         participatory_processes: Procesai
         participatory_processes_submenu:
           attachment_collections: Aplankai
@@ -143,6 +142,11 @@ lt:
             start_date: Pradžios data
             title: Pavadinimas
           name: Dalyvaujamojo proceso etapas
+        participatory_process_type:
+          fields:
+            created_at: Sukurta
+            title: Pavadinimas
+          name: Proceso tipas
         participatory_process_user_role:
           fields:
             email: El. paštas
@@ -225,6 +229,23 @@ lt:
         update:
           error: Atnaujinant šio dalyvaujamojo proceso etapą iškilo problema.
           success: Dalyvaujamasis etapas atnaujintas.
+      participatory_process_types:
+        create:
+          error: Kuriant naują proceso tipą iškilo problema.
+          success: Proceso tipas sÄ—kmingai sukurtas.
+        destroy:
+          success: Proceso tipas sėkmingai ištrintas.
+        edit:
+          title: Redaguoti proceso tipÄ…
+          update: Atnaujinti
+        form:
+          title: Pavadinimas
+        new:
+          create: Sukurti
+          title: Naujas proceso tipas
+        update:
+          error: Atnaujinant šį proceso tipą iškilo problema.
+          success: Proceso tipas sÄ—kmingai sukurtas.
       participatory_process_user_roles:
         create:
           error: Pridedant dalyvį prie dalyvaujamojo proceso iškilo problema.
@@ -269,6 +290,7 @@ lt:
           success: Dalyvaujamojo proceso grupÄ— sukurta.
       titles:
         participatory_process_groups: Dalyvaujamojo proceso grupÄ—s
+        participatory_process_types: Dalyvaujamųjų procesų tipai
         participatory_processes: Dalyvaujamieji procesai
       users:
         resend_invitation:
@@ -277,6 +299,9 @@ lt:
     admin_log:
       participatory_process:
         create: "%{user_name} sukūrė %{resource_name} dalyvaujamąjį procesą"
+        duplicate: "%{user_name} dublikavo %{resource_name} dalyvaujamąjį procesą"
+        export: "%{user_name} eksportavo %{resource_name} dalyvaujamąjį procesą"
+        import: "%{user_name} importavo %{resource_name} dalyvaujamąjį procesą"
         publish: "%{user_name} paskelbė %{resource_name} dalyvaujamąjį procesą"
         unpublish: "%{user_name} panaikino %{resource_name} dalyvaujamojo proceso skelbimÄ…"
         update: "%{user_name} atnaujino %{resource_name} dalyvaujamąjį procesą"
@@ -288,6 +313,10 @@ lt:
         create: "%{user_name} sukūrė %{space_name} dalyvaujamojo proceso %{resource_name} etapą"
         delete: "%{user_name} pašalino %{space_name} dalyvaujamojo proceso %{resource_name} etapą"
         update: "%{user_name} atnaujino %{space_name} dalyvaujamojo proceso %{resource_name} etapÄ…"
+      participatory_process_type:
+        create: "%{user_name} sukūrė %{resource_name} dalyvaujamojo proceso tipą"
+        delete: "%{user_name} ištrynė %{resource_name} dalyvaujamojo proceso tipą"
+        update: "%{user_name} atnaujino %{resource_name} dalyvaujamojo proceso tipÄ…"
       participatory_process_user_role:
         create: "%{user_name} pakvietė %{resource_name} dalyvį į %{space_name} dalyvaujamąjį procesą"
         delete: "%{user_name} pašalino %{resource_name} dalyvį iš %{space_name} dalyvaujamojo proceso"
@@ -315,6 +344,10 @@ lt:
           contextual: "<p> <strong>dalyvaujamasis procesas</strong> – dalyvaujamųjų veiklų seka (pvz., visų pirma surengiama apklausa, tada pateikiami pasiūlymai, jie aptariami tiesioginiuose susitikimuose arba vaizdo konferencijose ir galiausiai nustatomi pasiūlymų prioritetai). Šios veiklos tikslas – nustatyti ir priimti sprendimus konkre�ia tema.</p> <p>Dalyvaujamojo proceso pavyzdžiai: komiteto narių rinkimo procesas (pirmiausia pateikiamos kandidatūros, po to diskutuojama ir galiausiai pasirenkamas kandidatas), dalyvaujamojo biudžeto nustatymas (teikiami pasiūlymai, jie vertinami ekonomiškai ir dėl jų balsuojama remiantis turimomis lėšomis), strateginio planavimo procesas, bendras reglamento ar standarto rengimas, miesto erdvės planavimas arba viešosios politikos plano rengimas.</p>\n"
           page: "<p> <strong>dalyvaujamasis procesas</strong> – dalyvaujamųjų veiklų seka (pvz., visų pirma surengiama apklausa, tada pateikiami pasiūlymai, jie aptariami tiesioginiuose susitikimuose arba vaizdo konferencijose ir galiausiai nustatomi pasiūlymų prioritetai). Šios veiklos tikslas – nustatyti ir priimti sprendimus konkre�ia tema.</p> <p>Dalyvaujamojo proceso pavyzdžiai: komiteto narių rinkimo procesas (pirmiausia pateikiamos kandidatūros, po to diskutuojama ir galiausiai pasirenkamas kandidatas), dalyvaujamojo biudžeto nustatymas (teikiami pasiūlymai, jie vertinami ekonomiškai ir dėl jų balsuojama remiantis turimomis lėšomis), strateginio planavimo procesas, bendras reglamento ar standarto rengimas, miesto erdvės planavimas arba viešosios politikos plano rengimas.</p>\n"
           title: Kas yra dalyvaujamasis procesas?
+    log:
+      value_types:
+        participatory_process_type_presenter:
+          not_found: 'Proceso tipas duomenų bazėje nerastas (ID: %{id})'
     menu:
       processes: Procesai
     metrics:
@@ -392,6 +425,7 @@ lt:
             related_processes: SusijÄ™ procesai
             scope_type_max_depth_help: Riboti srities filtro dydį; Filtras parodys nuo bendros iki pasirinktos apimties tipo.
             select_an_area: Pasirinkti aplinkÄ…
+            select_participatory_process_type: Pasirinkti proceso tipÄ…
             select_process_group: Pasirinkti procesų grupę
             slug_help: 'Nuorodos priedėliai nukreipia į šią konkretų procesą. Priedėliai sudaromi iš raidžių, skai�ių, brukšnių ir turi prasidėti nuo raidės. Pavyzdys: %{url}'
             title: Bendroji informacija
@@ -418,6 +452,7 @@ lt:
           back_to_process: Grįžti į procesų puslapį
       participatory_processes:
         filters:
+          all_types: Visi tipai
           counters:
             active:
               one: 1 aktyvus procesas
@@ -443,6 +478,7 @@ lt:
             no_active: Aktyvių procesų nėra
             no_active_nor_upcoming: Nei aktyvių, nei būsimų procesų nėra
             no_active_nor_upcoming_callout: Nei aktyvių, nei būsimų procesų nėra. Čia pateikiamas buvusių procesų sąrašas.
+          filter_by: Rodyti
           names:
             active: Aktyvūs
             all: Visi
diff --git a/decidim-participatory_processes/config/locales/lv.yml b/decidim-participatory_processes/config/locales/lv.yml
index a79bde516a2ee..3db86d776a0ea 100644
--- a/decidim-participatory_processes/config/locales/lv.yml
+++ b/decidim-participatory_processes/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ lv:
         email: E-pasts
         name: Nosaukums
         role: Loma
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Nederīgs dokumenta tips. Pieņemtie form�ti ir: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: F�ze aktivizēta
       decidim/participatory_process_step_changed_event: F�ze mainīta
diff --git a/decidim-participatory_processes/config/locales/nl.yml b/decidim-participatory_processes/config/locales/nl.yml
index 45f2bc206ef17..968f58af5c660 100644
--- a/decidim-participatory_processes/config/locales/nl.yml
+++ b/decidim-participatory_processes/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ nl:
         email: E-mail
         name: Naam
         role: Rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ongeldig documenttype. Geaccepteerde formaten zijn: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Stap geactiveerd
       decidim/participatory_process_step_changed_event: Stap veranderd
diff --git a/decidim-participatory_processes/config/locales/no.yml b/decidim-participatory_processes/config/locales/no.yml
index 55a51873399dc..29a7c1ab834e6 100644
--- a/decidim-participatory_processes/config/locales/no.yml
+++ b/decidim-participatory_processes/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -56,16 +57,12 @@
         short_description: Kort beskrivelse
         start_date: Startdato
         title: Tittel
+      participatory_process_type:
+        title: Tittel
       participatory_process_user_role:
         email: Epost
         name: Navn
         role: Rolle
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ugyldig filtype. Godkjente formater er: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Fase er aktivert
       decidim/participatory_process_step_changed_event: Fase endret
@@ -96,6 +93,7 @@
         new_process: Ny prosess
         new_process_group: Ny prosessgruppe
         new_process_step: Ny medvirkningsfase
+        new_process_type: Ny prosesstype
         new_process_user_role: Ny prosessadministrator
         preview: Forhåndsvis
         publish: Publiser
@@ -106,6 +104,7 @@
         participatory_process_groups_submenu:
           info: Informasjon
           landing_page: Landingsside
+        participatory_process_types: Prosesstyper
         participatory_processes: Prosesser
         participatory_processes_submenu:
           attachment_collections: Mapper
@@ -137,6 +136,11 @@
             start_date: Startdato
             title: Tittel
           name: Medvirkningsfase
+        participatory_process_type:
+          fields:
+            created_at: Opprettet
+            title: Tittel
+          name: Prosesstype
         participatory_process_user_role:
           fields:
             email: Epost
@@ -219,6 +223,10 @@
         update:
           error: Det oppstod et problem med å oppdatere denne medvirkningsfasen.
           success: Medvirkningsfase oppdatert.
+      participatory_process_types:
+        create:
+          error: Det oppstod et problem med å lage en ny prosesstype.
+          success: Prosesstypen ble opprettet.
       participatory_process_user_roles:
         create:
           error: Det oppstod et problem med å legge til en deltaker for denne prosessen.
@@ -384,6 +392,7 @@
             related_processes: Relaterte prosesser
             scope_type_max_depth_help: Begrens temaets filternivå; Filteret viser fra generelt til valgt tematype.
             select_an_area: Velg et Område
+            select_participatory_process_type: Velg en type prosess
             select_process_group: Velg en prosessgruppe
             slug_help: 'URL-navn brukes til å generere nettadressene som peker på denne prosessen. Godtar bare bokstaver, tall og bindestreker, og må starte med en bokstav. Eksempel: %{url}'
             title: Generell informasjon
@@ -410,6 +419,7 @@
           back_to_process: Tilbake til prosesssiden
       participatory_processes:
         filters:
+          all_types: Alle prosesser
           counters:
             active:
               one: 1 aktiv prosess
@@ -427,6 +437,7 @@
             no_active: Ingen aktive prosesser
             no_active_nor_upcoming: Ingen aktive eller kommende prosesser
             no_active_nor_upcoming_callout: Det er ingen aktive eller kommende prosesser. Her er en liste over de som har vært.
+          filter_by: Vis
           names:
             active: Aktiv
             all: Alle
diff --git a/decidim-participatory_processes/config/locales/pl.yml b/decidim-participatory_processes/config/locales/pl.yml
index aabb0e0becc4f..5ab4b43f2ae86 100644
--- a/decidim-participatory_processes/config/locales/pl.yml
+++ b/decidim-participatory_processes/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ pl:
         email: Adres e-mail
         name: ImiÄ™
         role: Rola
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Nieprawidłowy typ dokumentu. Dopuszczalne formaty to: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Aktualny etap
       decidim/participatory_process_step_changed_event: Zmieniono etap
@@ -102,6 +97,7 @@ pl:
         new_process: Nowy proces
         new_process_group: Nowa grupa procesu
         new_process_step: Nowy etap
+        new_process_type: Nowy typ procesu
         new_process_user_role: Nowy administrator procesu
         preview: PodglÄ…d
         publish: Publikuj
@@ -225,6 +221,10 @@ pl:
         update:
           error: Podczas aktualizowania etapu procesu partycypacyjnego wystąpił błąd.
           success: Etap procesu partycypacyjnego został zaktualizowany.
+      participatory_process_types:
+        new:
+          create: Utwórz
+          title: Nowy typ procesu
       participatory_process_user_roles:
         create:
           error: Wystąpił błąd podczas dodawania użytkownika do tego procesu partycypacyjnego.
@@ -392,6 +392,7 @@ pl:
             related_processes: PowiÄ…zane procesy
             scope_type_max_depth_help: Ogranicz głębokość filtra zakresu; Filtr pokaże typy zakresu od ogólnego do wybranego.
             select_an_area: Wybierz kategoriÄ™
+            select_participatory_process_type: Wybierz typ procesu
             select_process_group: Wybierz grupę procesów
             slug_help: 'URL slugi służą do generowania adresów URL kierujących bezpośrednio do tego procesu. Należy wpisać tylko to, co ma znaleźć się na końcu po znaku „/�, a nie pełen adres. Można użyć liter, cyfr i myślników. Musi zaczynać się od litery. Przykład: %{url}'
             title: Informacje ogólne
diff --git a/decidim-participatory_processes/config/locales/pt-BR.yml b/decidim-participatory_processes/config/locales/pt-BR.yml
index fc9689cb2ec79..a20ab37ad8a03 100644
--- a/decidim-participatory_processes/config/locales/pt-BR.yml
+++ b/decidim-participatory_processes/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ pt-BR:
         email: O email
         name: Nome
         role: Cargo
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceitos são: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Passo ativado
       decidim/participatory_process_step_changed_event: Passo alterado
diff --git a/decidim-participatory_processes/config/locales/pt.yml b/decidim-participatory_processes/config/locales/pt.yml
index 7a7693d35a0dd..b0cc2cf2e42c5 100644
--- a/decidim-participatory_processes/config/locales/pt.yml
+++ b/decidim-participatory_processes/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ pt:
         email: E-mail
         name: Nome
         role: Função
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceites: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Fase ativada
       decidim/participatory_process_step_changed_event: Fase modificada
diff --git a/decidim-participatory_processes/config/locales/ro-RO.yml b/decidim-participatory_processes/config/locales/ro-RO.yml
index d0c0cd61b7023..0f3aa1829c9cb 100644
--- a/decidim-participatory_processes/config/locales/ro-RO.yml
+++ b/decidim-participatory_processes/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -56,16 +57,12 @@ ro:
         short_description: Descriere scurtă
         start_date: Data de început
         title: Titlu
+      participatory_process_type:
+        title: Titlu
       participatory_process_user_role:
         email: E-mail
         name: Nume
         role: Rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tip de document invalid. Formatele acceptate sunt: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Etapă activată
       decidim/participatory_process_step_changed_event: Etapă modificată
@@ -140,6 +137,9 @@ ro:
             start_date: Data de început
             title: Titlu
           name: Etapa procesului participativ
+        participatory_process_type:
+          fields:
+            title: Titlu
         participatory_process_user_role:
           fields:
             email: E-mail
@@ -222,6 +222,9 @@ ro:
         update:
           error: A apărut o problemă la actualizarea acestei etape a procesului participativ.
           success: Etapa procesul participativ a fost actualizată cu succes.
+      participatory_process_types:
+        form:
+          title: Titlu
       participatory_process_user_roles:
         create:
           error: A apărut o problemă la adăugarea unui participant pentru acest proces participativ.
diff --git a/decidim-participatory_processes/config/locales/ru.yml b/decidim-participatory_processes/config/locales/ru.yml
index d1421b8b55aa0..bb48550f3f151 100644
--- a/decidim-participatory_processes/config/locales/ru.yml
+++ b/decidim-participatory_processes/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/sk.yml b/decidim-participatory_processes/config/locales/sk.yml
index a7cd7aa789891..4f75fefc2b157 100644
--- a/decidim-participatory_processes/config/locales/sk.yml
+++ b/decidim-participatory_processes/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ sk:
         email: E-mailom
         name: názov
         role: Úloha
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Neplatný typ dokumentu. Prijateľné formáty sú:%{valid_mime_types} '
     models:
       decidim/participatory_process_step_activated_event: Krok aktivovaný
       decidim/participatory_process_step_changed_event: Krok zmenený
diff --git a/decidim-participatory_processes/config/locales/sl.yml b/decidim-participatory_processes/config/locales/sl.yml
index c13c78e60b062..c55f9cf274f0d 100644
--- a/decidim-participatory_processes/config/locales/sl.yml
+++ b/decidim-participatory_processes/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/sr-CS.yml b/decidim-participatory_processes/config/locales/sr-CS.yml
index feadc9d8d912c..e7e8a82203e03 100644
--- a/decidim-participatory_processes/config/locales/sr-CS.yml
+++ b/decidim-participatory_processes/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/sv.yml b/decidim-participatory_processes/config/locales/sv.yml
index d976527886f5c..b13664f428a23 100644
--- a/decidim-participatory_processes/config/locales/sv.yml
+++ b/decidim-participatory_processes/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -11,13 +12,16 @@ sv:
         decidim_area_id: Område
         description: Beskrivning
         developer_group: Kampanjgrupp
+        document: Dokument
         domain: Domän
         end_date: Slutdatum
         hashtag: Hashtag
         hero_image: Hembild
+        import_steps: Importera steg
         local_area: Område
         meta_scope: Omfångets metadata
         participatory_process_group_id: Dialoggrupp
+        participatory_process_type_id: Dialogtyp
         participatory_scope: Vad som bestäms
         participatory_structure: Hur det bestäms
         promoted: Annonserad
@@ -56,16 +60,12 @@ sv:
         short_description: Kort beskrivning
         start_date: Startdatum
         title: Titel
+      participatory_process_type:
+        title: Titel
       participatory_process_user_role:
         email: E-post
         name: Namn
         role: Roll
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ogiltig dokumenttyp. Godkända format är: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Steg aktiverat
       decidim/participatory_process_step_changed_event: Steget har ändrats
@@ -106,6 +106,7 @@ sv:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Landningssida
+        participatory_process_types: Processtyper
         participatory_processes: Dialoger
         participatory_processes_submenu:
           attachment_collections: Mappar
@@ -137,6 +138,10 @@ sv:
             start_date: Startdatum
             title: Titel
           name: Steg i dialog
+        participatory_process_type:
+          fields:
+            title: Titel
+          name: Processtyp
         participatory_process_user_role:
           fields:
             email: E-post
@@ -219,6 +224,14 @@ sv:
         update:
           error: Det gick inte att uppdatera detta steg i dialogen.
           success: Steget i deltagarprocessen har uppdaterats.
+      participatory_process_types:
+        edit:
+          title: Redigera dialogtyp
+          update: Uppdatera
+        form:
+          title: Titel
+        new:
+          create: Skapa
       participatory_process_user_roles:
         create:
           error: Det gick inte att lägga till en deltagare till dialogen.
@@ -427,6 +440,7 @@ sv:
             no_active: Inga pågående dialoger
             no_active_nor_upcoming: Inga pågående eller kommande dialoger
             no_active_nor_upcoming_callout: Det finns inga pågående eller kommande dialoger. Här är en lista över tidigare dialoger.
+          filter_by: Visa
           names:
             active: Pågående
             all: Alla
diff --git a/decidim-participatory_processes/config/locales/tr-TR.yml b/decidim-participatory_processes/config/locales/tr-TR.yml
index 66e1469e2f967..97d4e19fd5a25 100644
--- a/decidim-participatory_processes/config/locales/tr-TR.yml
+++ b/decidim-participatory_processes/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -59,12 +60,6 @@ tr:
         email: E-posta
         name: isim
         role: rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz belge türü. Kabul edilen biçimler şunlardır: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Adım aktif
       decidim/participatory_process_step_changed_event: Adım değişti
diff --git a/decidim-participatory_processes/config/locales/uk.yml b/decidim-participatory_processes/config/locales/uk.yml
index 9c34bccc42f01..9525a83283784 100644
--- a/decidim-participatory_processes/config/locales/uk.yml
+++ b/decidim-participatory_processes/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
diff --git a/decidim-participatory_processes/config/locales/zh-CN.yml b/decidim-participatory_processes/config/locales/zh-CN.yml
index 5c71f89d9a2c1..ce2b299c76238 100644
--- a/decidim-participatory_processes/config/locales/zh-CN.yml
+++ b/decidim-participatory_processes/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ zh-CN:
         email: 电�邮件地�
         name: �称
         role: 作用
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接�的格�为： %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: 相�激活
       decidim/participatory_process_step_changed_event: 相�已更改
diff --git a/decidim-participatory_processes/db/migrate/20211125202008_create_decidim_participatory_process_types.rb b/decidim-participatory_processes/db/migrate/20211125202008_create_decidim_participatory_process_types.rb
new file mode 100644
index 0000000000000..3d40926012f64
--- /dev/null
+++ b/decidim-participatory_processes/db/migrate/20211125202008_create_decidim_participatory_process_types.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreateDecidimParticipatoryProcessTypes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_participatory_process_types do |t|
+      t.jsonb :title, null: false
+      t.references(
+        :decidim_organization,
+        foreign_key: true,
+        index: { name: "index_decidim_process_types_on_decidim_organization_id" }
+      )
+      t.timestamps
+    end
+
+    add_reference(
+      :decidim_participatory_processes,
+      :decidim_participatory_process_type,
+      foreign_key: true,
+      index: { name: "index_decidim_processes_on_decidim_process_type_id" }
+    )
+  end
+end
diff --git a/decidim-participatory_processes/decidim-participatory_processes.gemspec b/decidim-participatory_processes/decidim-participatory_processes.gemspec
index 49bba4abe9ae6..a1e30521d7617 100644
--- a/decidim-participatory_processes/decidim-participatory_processes.gemspec
+++ b/decidim-participatory_processes/decidim-participatory_processes.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-participatory_processes"
   s.summary = "Decidim participatory processes module"
diff --git a/decidim-participatory_processes/lib/decidim/api/participatory_process_type_type.rb b/decidim-participatory_processes/lib/decidim/api/participatory_process_type_type.rb
new file mode 100644
index 0000000000000..dcb7755b94902
--- /dev/null
+++ b/decidim-participatory_processes/lib/decidim/api/participatory_process_type_type.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This type represents a ParticipatoryProcessType.
+    class ParticipatoryProcessTypeType < Decidim::Api::Types::BaseObject
+      description "A participatory process type"
+
+      field :id, GraphQL::Types::ID, "Unique ID of this participatory process type", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this participatory process type", null: true
+      field :created_at, Decidim::Core::DateTimeType, "The time this participatory process type was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this participatory process type was updated", null: false
+      field :processes, [Decidim::ParticipatoryProcesses::ParticipatoryProcessType, { null: true }],
+            description: "Lists all the participatory processes belonging to this type", null: false
+    end
+  end
+end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
index 973bef444dd4c..7e790fe37c0c9 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/admin_engine.rb
@@ -20,6 +20,7 @@ class AdminEngine < ::Rails::Engine
             resources :content_blocks, only: [:edit, :update], controller: "participatory_process_group_landing_page_content_blocks"
           end
         end
+        resources :participatory_process_types
         resources :participatory_processes, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
           resources :copies, controller: "participatory_process_copies", only: [:new, :create]
@@ -59,6 +60,7 @@ class AdminEngine < ::Rails::Engine
             resources :imports, only: [:new, :create] do
               get :example, on: :collection
             end
+            resources :reminders, only: [:new, :create]
           end
 
           resources :moderations do
@@ -75,7 +77,9 @@ class AdminEngine < ::Rails::Engine
               post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
             end
             collection do
-              resource :participatory_space_private_users_csv_import, only: [:new, :create], path: "csv_import"
+              resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                delete :destroy_all
+              end
             end
           end
         end
@@ -99,7 +103,8 @@ class AdminEngine < ::Rails::Engine
                         icon_name: "target",
                         position: 2,
                         active: is_active_link?(decidim_admin_participatory_processes.participatory_processes_path, :inclusive) ||
-                                is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path, :inclusive),
+                                is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path, :inclusive) ||
+                                is_active_link?(decidim_admin_participatory_processes.participatory_process_types_path),
                         if: allowed_to?(:enter, :space_area, space_name: :processes) || allowed_to?(:enter, :space_area, space_name: :process_groups)
         end
       end
@@ -119,6 +124,13 @@ class AdminEngine < ::Rails::Engine
                         position: 2,
                         if: allowed_to?(:enter, :space_area, space_name: :process_groups),
                         active: is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path)
+
+          menu.add_item :participatory_process_types,
+                        I18n.t("menu.participatory_process_types", scope: "decidim.admin"),
+                        decidim_admin_participatory_processes.participatory_process_types_path,
+                        position: 3,
+                        if: allowed_to?(:manage, :participatory_process_type),
+                        active: is_active_link?(decidim_admin_participatory_processes.participatory_process_types_path)
         end
       end
 
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/api.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/api.rb
index d82122a5569f8..f55e42d953588 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/api.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/api.rb
@@ -7,5 +7,6 @@ module ParticipatoryProcesses
     autoload :ParticipatoryProcessGroupType, "decidim/api/participatory_process_group_type"
     autoload :ParticipatoryProcessStepType, "decidim/api/participatory_process_step_type"
     autoload :ParticipatoryProcessType, "decidim/api/participatory_process_type"
+    autoload :ParticipatoryProcessTypeType, "decidim/api/participatory_process_type_type"
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
index 96c56e8fdd321..aa988c56d0ce3 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb
@@ -74,7 +74,7 @@
         hashtag: Faker::Internet.slug,
         group_url: Faker::Internet.url,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
@@ -104,6 +104,14 @@
       end
     end
 
+    process_types = []
+    2.times do
+      process_types << Decidim::ParticipatoryProcessType.create!(
+        title: Decidim::Faker::Localized.word,
+        organization: organization
+      )
+    end
+
     2.times do |n|
       params = {
         title: Decidim::Faker::Localized.sentence(word_count: 5),
@@ -117,13 +125,13 @@
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
           metadata: nil
         ), # Keep after organization
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -140,6 +148,7 @@
         start_date: Date.current,
         end_date: 2.months.from_now,
         participatory_process_group: process_groups.sample,
+        participatory_process_type: process_types.sample,
         scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first
       }
 
@@ -173,8 +182,8 @@
         user.update!(
           name: Faker::Name.name,
           nickname: Faker::Twitter.unique.screen_name,
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           organization: organization,
           confirmed_at: Time.current,
           locale: I18n.default_locale,
@@ -200,7 +209,7 @@
         attachment_collection: attachment_collection,
         content_type: "application/pdf",
         attached_to: process,
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -213,7 +222,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
@@ -226,7 +235,7 @@
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
index f3667a300ffd5..040dcc4bc6563 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/query_extensions.rb
@@ -19,6 +19,15 @@ def self.included(type)
           description "Finds a participatory process group"
           argument :id, GraphQL::Types::ID, required: true, description: "The ID of the Participatory process group"
         end
+
+        type.field :participatory_process_types, [ParticipatoryProcessTypeType],
+                   null: false,
+                   description: "List all participatory process types"
+
+        type.field :participatory_process_type, ParticipatoryProcessTypeType, null: true do
+          description "Finds a participatory process type"
+          argument :id, GraphQL::Types::ID, required: true, description: "The ID of the participatory process type"
+        end
       end
 
       def participatory_process_groups(*)
@@ -33,6 +42,19 @@ def participatory_process_group(id:)
           id: id
         )
       end
+
+      def participatory_process_types(*)
+        Decidim::ParticipatoryProcessType.where(
+          organization: context[:current_organization]
+        )
+      end
+
+      def participatory_process_type(id:)
+        Decidim::ParticipatoryProcessType.find_by(
+          organization: context[:current_organization],
+          id: id
+        )
+      end
     end
   end
 end
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
index 65cc785e67bf1..6e16991fb2eef 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/test/factories.rb
@@ -128,6 +128,23 @@
     end
   end
 
+  factory :participatory_process_type, class: "Decidim::ParticipatoryProcessType" do
+    title { generate_localized_title }
+    organization
+
+    trait :with_active_participatory_processes do
+      after(:create) do |participatory_process_type|
+        create_list(:participatory_process, 2, :active, :published, organization: participatory_process_type.organization, participatory_process_type: participatory_process_type)
+      end
+    end
+
+    trait :with_past_participatory_processes do
+      after(:create) do |participatory_process_type|
+        create_list(:participatory_process, 2, :past, :published, organization: participatory_process_type.organization, participatory_process_type: participatory_process_type)
+      end
+    end
+  end
+
   factory :process_admin, parent: :user, class: "Decidim::User" do
     transient do
       participatory_process { create(:participatory_process) }
@@ -150,6 +167,7 @@
     end
 
     organization { participatory_process.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
@@ -165,6 +183,7 @@
     end
 
     organization { participatory_process.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
@@ -180,6 +199,7 @@
     end
 
     organization { participatory_process.organization }
+    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
index c6d9857c53f7d..7b217f28395e1 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-participatory_processes/spec/cells/decidim/participatory_process_groups/content_blocks/title_cell_spec.rb b/decidim-participatory_processes/spec/cells/decidim/participatory_process_groups/content_blocks/title_cell_spec.rb
index fd584bff7717a..1c1b63b043e21 100644
--- a/decidim-participatory_processes/spec/cells/decidim/participatory_process_groups/content_blocks/title_cell_spec.rb
+++ b/decidim-participatory_processes/spec/cells/decidim/participatory_process_groups/content_blocks/title_cell_spec.rb
@@ -39,7 +39,7 @@
       expect(subject).to have_content(translated(participatory_process_group.title, locale: :en))
     end
 
-    it "shows the group description " do
+    it "shows the group description" do
       expect(subject).to have_content(
         ActionView::Base.full_sanitizer.sanitize(translated(participatory_process_group.description, locale: :en), tags: [])
       )
diff --git a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/statistics_cell_spec.rb b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/statistics_cell_spec.rb
index 128701fc3984a..0c669f1d1f440 100644
--- a/decidim-participatory_processes/spec/cells/decidim/participatory_processes/statistics_cell_spec.rb
+++ b/decidim-participatory_processes/spec/cells/decidim/participatory_processes/statistics_cell_spec.rb
@@ -18,7 +18,6 @@ module Decidim::ParticipatoryProcesses
 
     context "when rendering" do
       it "renders the statistics wrapper" do
-        puts subject
         expect(subject).to have_css(".section-statistics")
       end
 
diff --git a/decidim-participatory_processes/spec/commands/copy_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/copy_participatory_process_spec.rb
index 7b32be49332fc..853d7e85ed4aa 100644
--- a/decidim-participatory_processes/spec/commands/copy_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/copy_participatory_process_spec.rb
@@ -4,9 +4,10 @@
 
 module Decidim::ParticipatoryProcesses
   describe Admin::CopyParticipatoryProcess do
-    subject { described_class.new(form, participatory_process) }
+    subject { described_class.new(form, participatory_process, user) }
 
     let(:organization) { create :organization }
+    let(:user) { create :user, organization: organization }
     let(:participatory_process_group) { create :participatory_process_group, organization: organization }
     let(:scope) { create :scope, organization: organization }
     let(:errors) { double.as_null_object }
@@ -45,7 +46,7 @@ module Decidim::ParticipatoryProcesses
 
     context "when everything is ok" do
       it "duplicates a participatory process" do
-        expect { subject.call }.to change { Decidim::ParticipatoryProcess.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcess, :count).by(1)
 
         old_participatory_process = Decidim::ParticipatoryProcess.first
         new_participatory_process = Decidim::ParticipatoryProcess.last
@@ -72,13 +73,25 @@ module Decidim::ParticipatoryProcesses
       it "broadcasts ok" do
         expect { subject.call }.to broadcast(:ok)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("duplicate", Decidim::ParticipatoryProcess, user)
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("duplicate")
+        expect(action_log.version).to be_present
+      end
     end
 
     context "when copy_steps exists" do
       let(:copy_steps) { true }
 
       it "duplicates a participatory process and the steps" do
-        expect { subject.call }.to change { Decidim::ParticipatoryProcessStep.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcessStep, :count).by(1)
         expect(Decidim::ParticipatoryProcessStep.distinct.pluck(:decidim_participatory_process_id).count).to eq 2
 
         old_participatory_process_step = Decidim::ParticipatoryProcessStep.first
@@ -95,7 +108,7 @@ module Decidim::ParticipatoryProcesses
       let(:copy_categories) { true }
 
       it "duplicates a participatory process and the categories" do
-        expect { subject.call }.to change { Decidim::Category.count }.by(1)
+        expect { subject.call }.to change(Decidim::Category, :count).by(1)
         expect(Decidim::Category.unscoped.distinct.pluck(:decidim_participatory_space_id).count).to eq 2
 
         old_participatory_process_category = Decidim::Category.unscoped.first
@@ -110,7 +123,7 @@ module Decidim::ParticipatoryProcesses
         let!(:subcategory) { create(:category, parent: category, participatory_space: participatory_process) }
 
         it "duplicates the parent and its children" do
-          expect { subject.call }.to change { Decidim::Category.count }.by(2)
+          expect { subject.call }.to change(Decidim::Category, :count).by(2)
           new_participatory_process = Decidim::ParticipatoryProcess.last
 
           expect(participatory_process.categories.count).to eq(2)
@@ -125,17 +138,17 @@ module Decidim::ParticipatoryProcesses
       it "duplicates a participatory process and the components" do
         dummy_hook = proc {}
         component.manifest.on :copy, &dummy_hook
-        expect(dummy_hook).to receive(:call).with(new_component: an_instance_of(Decidim::Component), old_component: component)
+        expect(dummy_hook).to receive(:call).with({ new_component: an_instance_of(Decidim::Component), old_component: component })
 
-        expect { subject.call }.to change { Decidim::Component.count }.by(1)
+        expect { subject.call }.to change(Decidim::Component, :count).by(1)
 
         last_participatory_process = Decidim::ParticipatoryProcess.last
         last_component = Decidim::Component.all.reorder(:id).last
 
         expect(last_component.participatory_space).to eq(last_participatory_process)
         expect(last_component.name).to eq(component.name)
-        expect(last_component.settings.attributes.except(:dummy_global_translatable_text)).to eq(component.settings.attributes.except(:dummy_global_translatable_text))
-        expect(last_component.settings.attributes[:dummy_global_translatable_text]).to include(component.settings.attributes[:dummy_global_translatable_text])
+        expect(last_component.settings.attributes.except("dummy_global_translatable_text")).to eq(component.settings.attributes.except("dummy_global_translatable_text"))
+        expect(last_component.settings.attributes["dummy_global_translatable_text"]).to include(component.settings.attributes["dummy_global_translatable_text"])
         expect(last_component.step_settings.keys).not_to eq(component.step_settings.keys)
         expect(last_component.step_settings.values).not_to eq(component.step_settings.values)
       end
diff --git a/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
index 273af5741f17b..0ddc8d6e402b8 100644
--- a/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/create_participatory_process_spec.rb
@@ -8,6 +8,7 @@ module Decidim::ParticipatoryProcesses
 
     let(:organization) { create :organization }
     let(:participatory_process_group) { create :participatory_process_group, organization: organization }
+    let(:participatory_process_type) { create :participatory_process_type, organization: organization }
     let(:scope) { create :scope, organization: organization }
     let(:area) { create :area, organization: organization }
     let(:current_user) { create :user, :admin, organization: organization }
@@ -46,6 +47,7 @@ module Decidim::ParticipatoryProcesses
         errors: errors,
         related_process_ids: related_process_ids,
         participatory_process_group: participatory_process_group,
+        participatory_process_type: participatory_process_type,
         show_statistics: false,
         show_metrics: false,
         announcement: { en: "message" }
@@ -68,14 +70,14 @@ module Decidim::ParticipatoryProcesses
           persisted?: false,
           valid?: false,
           errors: {
-            hero_image: "Image too big",
-            banner_image: "Image too big"
+            hero_image: "File resolution is too large",
+            banner_image: "File resolution is too large"
           }
         ).as_null_object
       end
 
       before do
-        expect(Decidim::ParticipatoryProcess).to receive(:new).and_return(invalid_process)
+        allow(Decidim::ParticipatoryProcess).to receive(:new).and_return(invalid_process)
       end
 
       it "broadcasts invalid" do
@@ -83,8 +85,8 @@ module Decidim::ParticipatoryProcesses
       end
 
       it "adds errors to the form" do
-        expect(errors).to receive(:add).with(:hero_image, "Image too big")
-        expect(errors).to receive(:add).with(:banner_image, "Image too big")
+        expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
+        expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
         subject.call
       end
     end
@@ -93,7 +95,7 @@ module Decidim::ParticipatoryProcesses
       let(:process) { Decidim::ParticipatoryProcess.last }
 
       it "creates a participatory process" do
-        expect { subject.call }.to change { Decidim::ParticipatoryProcess.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcess, :count).by(1)
       end
 
       it "traces the creation", versioning: true do
@@ -121,8 +123,8 @@ module Decidim::ParticipatoryProcesses
 
       it "doesn't enable by default stats and metrics" do
         subject.call
-        expect(process.show_statistics).to eq(false)
-        expect(process.show_metrics).to eq(false)
+        expect(process.show_statistics).to be(false)
+        expect(process.show_metrics).to be(false)
       end
 
       it "adds the admins as followers" do
@@ -140,6 +142,19 @@ module Decidim::ParticipatoryProcesses
           linked_processes = process.linked_participatory_space_resources(:participatory_process, "related_processes")
           expect(linked_processes).to match_array([another_process])
         end
+
+        context "when sorting by weight" do
+          let!(:process_one) { create :participatory_process, organization: organization, weight: 2 }
+          let!(:process_two) { create :participatory_process, organization: organization, weight: 1 }
+          let(:related_process_ids) { [process_one.id, process_two.id] }
+
+          it "links processes in right way" do
+            subject.call
+
+            linked_processes = process.linked_participatory_space_resources(:participatory_process, "related_processes")
+            expect(linked_processes.first).to eq(process_two)
+          end
+        end
       end
     end
   end
diff --git a/decidim-participatory_processes/spec/commands/create_participatory_process_step_spec.rb b/decidim-participatory_processes/spec/commands/create_participatory_process_step_spec.rb
index 7efb1b1f21e99..79df6e69a8211 100644
--- a/decidim-participatory_processes/spec/commands/create_participatory_process_step_spec.rb
+++ b/decidim-participatory_processes/spec/commands/create_participatory_process_step_spec.rb
@@ -31,7 +31,7 @@ module Decidim::ParticipatoryProcesses
 
     context "when everything is ok" do
       it "creates a participatory process step" do
-        expect { subject.call }.to change { Decidim::ParticipatoryProcessStep.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcessStep, :count).by(1)
       end
 
       it "broadcasts ok" do
diff --git a/decidim-participatory_processes/spec/commands/create_participatory_process_type_spec.rb b/decidim-participatory_processes/spec/commands/create_participatory_process_type_spec.rb
new file mode 100644
index 0000000000000..f5eeacc5205b0
--- /dev/null
+++ b/decidim-participatory_processes/spec/commands/create_participatory_process_type_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::ParticipatoryProcesses
+  describe Admin::CreateParticipatoryProcessType do
+    subject { described_class.new(form) }
+
+    let(:organization) { create :organization }
+    let(:user) { create :user, :admin }
+    let(:form) do
+      instance_double(
+        Admin::ParticipatoryProcessTypeForm,
+        title: { en: "title" },
+        current_user: user,
+        current_organization: organization,
+        invalid?: invalid
+      )
+    end
+    let(:invalid) { false }
+
+    context "when the form is not valid" do
+      let(:invalid) { true }
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+
+    context "when everything is ok" do
+      it "creates a participatory process type" do
+        expect { subject.call }.to change(Decidim::ParticipatoryProcessType, :count).by(1)
+      end
+
+      it "broadcasts ok" do
+        expect { subject.call }.to broadcast(:ok)
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:create!)
+          .with(Decidim::ParticipatoryProcessType, user, hash_including(:title, :organization))
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.version).to be_present
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/create_participatory_process_group_spec.rb b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/create_participatory_process_group_spec.rb
index a26402d67716e..04bfc8aeda862 100644
--- a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/create_participatory_process_group_spec.rb
+++ b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/create_participatory_process_group_spec.rb
@@ -46,7 +46,7 @@ module Decidim::ParticipatoryProcesses
       end
 
       it "creates a participatory process group" do
-        expect { subject.call }.to change { Decidim::ParticipatoryProcessGroup.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcessGroup, :count).by(1)
       end
 
       it "traces the creation", versioning: true do
diff --git a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
index 94c88b325978e..ee71f15ddbebc 100644
--- a/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/decidim/participatory_processes/admin/import_participatory_process_spec.rb
@@ -9,7 +9,7 @@ module Decidim::ParticipatoryProcesses
     subject { described_class.new(form) }
 
     let(:organization) { create :organization }
-    let!(:document_file) { IO.read(Decidim::Dev.asset(document_name)) }
+    let!(:document_file) { File.read(Decidim::Dev.asset(document_name)) }
     let(:form_doc) do
       instance_double(File,
                       blank?: false)
@@ -61,6 +61,17 @@ def stub_calls_to_external_files
         expect(imported_participatory_process).not_to be_published
         expect(imported_participatory_process.organization).to eq(organization)
       end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!).exactly(3).times
+                                       .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.action).to eq("import")
+        expect(action_log.version).to be_present
+      end
     end
 
     describe "when the form is not valid" do
@@ -73,7 +84,7 @@ def stub_calls_to_external_files
       it "doesn't create any proces" do
         expect do
           subject.call
-        end.to change(::Decidim::ParticipatoryProcess, :count).by(0)
+        end.not_to change(::Decidim::ParticipatoryProcess, :count)
       end
     end
 
@@ -90,7 +101,7 @@ def stub_calls_to_external_files
 
       it "imports a participatory process and the steps" do
         stub_calls_to_external_files
-        expect { subject.call }.to change { Decidim::Component.count }.by(3)
+        expect { subject.call }.to change(Decidim::Component, :count).by(3)
         expect(Decidim::Component.where(participatory_space_id: Decidim::ParticipatoryProcess.last).count).to eq 3
       end
 
@@ -106,7 +117,7 @@ def stub_calls_to_external_files
 
       it "imports a participatory process and the steps" do
         stub_calls_to_external_files
-        expect { subject.call }.to change { Decidim::ParticipatoryProcessStep.count }.by(1)
+        expect { subject.call }.to change(Decidim::ParticipatoryProcessStep, :count).by(1)
         expect(Decidim::ParticipatoryProcessStep.distinct.pluck(:decidim_participatory_process_id).count).to eq 1
 
         imported_participatory_process_step = Decidim::ParticipatoryProcessStep.last
@@ -128,7 +139,7 @@ def stub_calls_to_external_files
       it "imports a participatory process and the categories" do
         stub_calls_to_external_files
 
-        expect { subject.call }.to change { Decidim::Category.count }.by(8)
+        expect { subject.call }.to change(Decidim::Category, :count).by(8)
         expect(Decidim::Category.unscoped.distinct.pluck(:decidim_participatory_space_id).count).to eq 1
 
         imported_participatory_process_category = Decidim::Category.unscoped.first
@@ -154,7 +165,7 @@ def stub_calls_to_external_files
         it "imports a participatory process and the collections" do
           stub_calls_to_external_files
 
-          expect { subject.call }.to change { Decidim::AttachmentCollection.count }.by(1)
+          expect { subject.call }.to change(Decidim::AttachmentCollection, :count).by(1)
           imported_participatory_process_collection = Decidim::AttachmentCollection.first
           expect(imported_participatory_process_collection.name).to eq("ca" => "assumenda", "en" => "cumque", "es" => "rem")
           expect(imported_participatory_process_collection.collection_for).to eq(Decidim::ParticipatoryProcess.last)
diff --git a/decidim-participatory_processes/spec/commands/destroy_participatory_process_type_spec.rb b/decidim-participatory_processes/spec/commands/destroy_participatory_process_type_spec.rb
new file mode 100644
index 0000000000000..b552156e7e448
--- /dev/null
+++ b/decidim-participatory_processes/spec/commands/destroy_participatory_process_type_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::ParticipatoryProcesses
+  describe Admin::DestroyParticipatoryProcessType, class: true do
+    subject { described_class.new(process_type, user) }
+
+    let(:organization) { create(:organization) }
+    let(:process_type) { create(:participatory_process_type, organization: organization) }
+    let(:user) { create(:user, :admin, :confirmed) }
+
+    context "when everything is ok" do
+      it "destroys the process type" do
+        subject.call
+        expect { process_type.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:perform_action!)
+          .with("delete", process_type, user)
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.version).to be_present
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb b/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
index 49835a423832a..6d42dfc422636 100644
--- a/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/commands/update_participatory_process_spec.rb
@@ -60,7 +60,7 @@ module Decidim::ParticipatoryProcesses
 
       describe "when the form is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(true)
+          allow(form).to receive(:invalid?).and_return(true)
         end
 
         it "broadcasts invalid" do
@@ -77,10 +77,10 @@ module Decidim::ParticipatoryProcesses
 
       describe "when the participatory process is not valid" do
         before do
-          expect(form).to receive(:invalid?).and_return(false)
+          allow(form).to receive(:invalid?).and_return(false)
           expect(my_process).to receive(:valid?).at_least(:once).and_return(false)
-          my_process.errors.add(:hero_image, "Image too big")
-          my_process.errors.add(:banner_image, "Image too big")
+          my_process.errors.add(:hero_image, "File resolution is too large")
+          my_process.errors.add(:banner_image, "File resolution is too large")
         end
 
         it "broadcasts invalid" do
diff --git a/decidim-participatory_processes/spec/commands/update_participatory_process_type_spec.rb b/decidim-participatory_processes/spec/commands/update_participatory_process_type_spec.rb
new file mode 100644
index 0000000000000..fb79eb123e530
--- /dev/null
+++ b/decidim-participatory_processes/spec/commands/update_participatory_process_type_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::ParticipatoryProcesses
+  describe Admin::UpdateParticipatoryProcessType do
+    subject { described_class.new(process_type, form) }
+
+    let(:organization) { create(:organization) }
+    let(:process_type) { create :participatory_process_type, organization: organization }
+    let(:user) { create :user, :admin, :confirmed, organization: organization }
+    let(:form) do
+      instance_double(
+        Admin::ParticipatoryProcessTypeForm,
+        title: { en: "new title" },
+        current_user: user,
+        current_organization: organization,
+        invalid?: invalid
+      )
+    end
+
+    context "when the form is not valid" do
+      let(:invalid) { true }
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+
+    context "when everything is ok" do
+      let(:invalid) { false }
+
+      it "updates the participatory process type" do
+        subject.call
+        process_type.reload
+
+        expect(process_type.title["en"]).to eq("new title")
+      end
+
+      it "broadcasts ok" do
+        expect { subject.call }.to broadcast(:ok)
+      end
+
+      it "traces the action", versioning: true do
+        expect(Decidim.traceability)
+          .to receive(:update!)
+          .with(process_type, user, hash_including(:title))
+          .and_call_original
+
+        expect { subject.call }.to change(Decidim::ActionLog, :count)
+        action_log = Decidim::ActionLog.last
+        expect(action_log.version).to be_present
+        expect(action_log.version.event).to eq "update"
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/controllers/exports_controller_spec.rb b/decidim-participatory_processes/spec/controllers/admin/exports_controller_spec.rb
similarity index 76%
rename from decidim-participatory_processes/spec/controllers/exports_controller_spec.rb
rename to decidim-participatory_processes/spec/controllers/admin/exports_controller_spec.rb
index 9f5dbbdcb6d72..314c4d977b935 100644
--- a/decidim-participatory_processes/spec/controllers/exports_controller_spec.rb
+++ b/decidim-participatory_processes/spec/controllers/admin/exports_controller_spec.rb
@@ -47,6 +47,18 @@ module Admin
             end
           end
         end
+
+        it "traces the action", versioning: true do
+          expect(Decidim.traceability)
+            .to receive(:perform_action!)
+            .with("export_component", component, user, { name: "dummies", format: "json" })
+            .and_call_original
+
+          expect { post(:create, params: params) }.to change(Decidim::ActionLog, :count)
+          action_log = Decidim::ActionLog.last
+          expect(action_log.action).to eq("export_component")
+          expect(action_log.version).to be_present
+        end
       end
     end
   end
diff --git a/decidim-participatory_processes/spec/controllers/admin/participatory_process_exports_controller_spec.rb b/decidim-participatory_processes/spec/controllers/admin/participatory_process_exports_controller_spec.rb
index d726d43840d7c..db16b62fedc14 100644
--- a/decidim-participatory_processes/spec/controllers/admin/participatory_process_exports_controller_spec.rb
+++ b/decidim-participatory_processes/spec/controllers/admin/participatory_process_exports_controller_spec.rb
@@ -31,6 +31,18 @@ module Admin
 
             post(:create, params: params)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with("export", Decidim::ParticipatoryProcess, user)
+              .and_call_original
+
+            expect { post(:create, params: params) }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("export")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end
diff --git a/decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb b/decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb
new file mode 100644
index 0000000000000..43379920b3488
--- /dev/null
+++ b/decidim-participatory_processes/spec/controllers/admin/participatory_space_private_users_csv_imports_controller_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      describe ParticipatorySpacePrivateUsersCsvImportsController, type: :controller do
+        routes { Decidim::ParticipatoryProcesses::AdminEngine.routes }
+
+        let!(:organization) { create :organization }
+        let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
+        let!(:user) { create(:user, organization: organization) }
+        let!(:private_user) { create(:participatory_space_private_user, user: user) }
+
+        before do
+          request.env["decidim.current_organization"] = organization
+          request.env["decidim.current_participatory_process"] = private_user.privatable_to
+          sign_in admin, scope: :user
+        end
+
+        it "is routed to" do
+          delete :destroy_all, params: { participatory_process_slug: private_user.privatable_to.slug }
+
+          expect(response).to be_redirect
+        end
+
+        it "suppress the existing users" do
+          expect do
+            delete :destroy_all, params: { participatory_process_slug: private_user.privatable_to.slug }
+          end.to change { Decidim::ParticipatorySpacePrivateUser.by_participatory_space(private_user.privatable_to).count }.by(-1)
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
index 1ed69043add65..d56328b7a675d 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
@@ -39,7 +39,7 @@ module Admin
           }
         end
         let(:slug) { "slug" }
-        let(:attachment) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
         let(:show_metrics) { true }
         let(:show_statistics) { true }
         let(:attributes) do
@@ -71,30 +71,19 @@ module Admin
           it { is_expected.to be_valid }
         end
 
-        context "when hero_image is too big" do
-          before do
-            organization.settings.tap do |settings|
-              settings.upload.maximum_file_size.default = 5
-            end
-            expect(subject.hero_image).to receive(:size).twice.and_return(6.megabytes)
-          end
-
-          it { is_expected.not_to be_valid }
-        end
-
         context "when banner_image is too big" do
           before do
             organization.settings.tap do |settings|
               settings.upload.maximum_file_size.default = 5
             end
-            expect(subject.banner_image).to receive(:size).twice.and_return(6.megabytes)
+            ActiveStorage::Blob.find_signed(attachment).update(byte_size: 6.megabytes)
           end
 
           it { is_expected.not_to be_valid }
         end
 
         context "when images are not the expected type" do
-          let(:attachment) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
+          let(:attachment) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")) }
 
           it { is_expected.not_to be_valid }
         end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_group_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_group_form_spec.rb
index 06043f94ebcc1..91bd99fd526dc 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_group_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_group_form_spec.rb
@@ -40,7 +40,7 @@ module Admin
         end
         let(:hashtag) { "hashtag" }
         let(:group_url) { "http://example.org" }
-        let(:attachment) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+        let(:attachment) { upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg")) }
 
         let(:attributes) do
           {
@@ -66,14 +66,14 @@ module Admin
             organization.settings.tap do |settings|
               settings.upload.maximum_file_size.default = 5
             end
-            expect(subject.hero_image).to receive(:size).and_return(6.megabytes)
+            ActiveStorage::Blob.find_signed(attachment).update(byte_size: 6.megabytes)
           end
 
           it { is_expected.not_to be_valid }
         end
 
         context "when images are not the expected type" do
-          let(:attachment) { Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf") }
+          let(:attachment) { upload_test_file(Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")) }
 
           it { is_expected.not_to be_valid }
         end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_step_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_step_form_spec.rb
index c5a30f6611465..3ee9f54daa79a 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_step_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_step_form_spec.rb
@@ -22,8 +22,8 @@ module Admin
             ca: "Descripció"
           }
         end
-        let(:start_date) {}
-        let(:end_date) {}
+        let(:start_date) { nil }
+        let(:end_date) { nil }
         let(:cta_path) { nil }
         let(:attributes) do
           {
@@ -55,8 +55,8 @@ module Admin
 
           context "when no dates" do
             it "returns nil" do
-              expect(subject.start_date).to eq(nil)
-              expect(subject.end_date).to eq(nil)
+              expect(subject.start_date).to be_nil
+              expect(subject.end_date).to be_nil
             end
           end
         end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_type_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_type_form_spec.rb
new file mode 100644
index 0000000000000..a4befaead6e14
--- /dev/null
+++ b/decidim-participatory_processes/spec/forms/participatory_process_type_form_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      describe ParticipatoryProcessTypeForm do
+        subject { described_class.from_params(attributes).with_context(current_organization: organization) }
+
+        let(:organization) { create :organization }
+        let(:title) do
+          {
+            en: "Title",
+            es: "Título",
+            ca: "Títol"
+          }
+        end
+        let(:attributes) do
+          {
+            "participatory_process_type" => {
+              "title_en" => title[:en],
+              "title_es" => title[:es],
+              "title_ca" => title[:ca]
+            }
+          }
+        end
+
+        context "when everything is OK" do
+          it { is_expected.to be_valid }
+        end
+
+        context "when default language in title is missing" do
+          let(:title) do
+            {
+              ca: "Títol"
+            }
+          end
+
+          it { is_expected.to be_invalid }
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/forms/participatory_process_user_role_form_spec.rb b/decidim-participatory_processes/spec/forms/participatory_process_user_role_form_spec.rb
index 67dff261e1a5d..b533115bf2fef 100644
--- a/decidim-participatory_processes/spec/forms/participatory_process_user_role_form_spec.rb
+++ b/decidim-participatory_processes/spec/forms/participatory_process_user_role_form_spec.rb
@@ -36,7 +36,7 @@ module Admin
         end
 
         context "when email is missing" do
-          let(:email) {}
+          let(:email) { nil }
 
           it { is_expected.to be_invalid }
         end
diff --git a/decidim-participatory_processes/spec/helpers/decidim/participatory_processes/participatory_process_helper_spec.rb b/decidim-participatory_processes/spec/helpers/decidim/participatory_processes/participatory_process_helper_spec.rb
index 73d4b3d75310d..c3ca810997fc1 100644
--- a/decidim-participatory_processes/spec/helpers/decidim/participatory_processes/participatory_process_helper_spec.rb
+++ b/decidim-participatory_processes/spec/helpers/decidim/participatory_processes/participatory_process_helper_spec.rb
@@ -20,7 +20,7 @@ module ParticipatoryProcesses
         describe "when both dates are present" do
           it "returns the formatted dates" do
             result = helper.step_dates(participatory_process)
-            expect(result).to eq("2016-01-01 - 2016-02-05")
+            expect(result).to eq("01/01/2016 - 05/02/2016")
           end
         end
 
@@ -29,7 +29,7 @@ module ParticipatoryProcesses
 
           it "fills it in with an interrogation mark" do
             result = helper.step_dates(participatory_process)
-            expect(result).to eq("? - 2016-02-05")
+            expect(result).to eq("? - 05/02/2016")
           end
         end
 
@@ -38,7 +38,7 @@ module ParticipatoryProcesses
 
           it "fills it in with an interrogation mark" do
             result = helper.step_dates(participatory_process)
-            expect(result).to eq("2016-01-01 - ?")
+            expect(result).to eq("01/01/2016 - ?")
           end
         end
       end
diff --git a/decidim-participatory_processes/spec/lib/components/participatory_processes/current_component_spec.rb b/decidim-participatory_processes/spec/lib/components/participatory_processes/current_component_spec.rb
index e034428a9e5f8..344b29a73ee47 100644
--- a/decidim-participatory_processes/spec/lib/components/participatory_processes/current_component_spec.rb
+++ b/decidim-participatory_processes/spec/lib/components/participatory_processes/current_component_spec.rb
@@ -5,8 +5,9 @@
 module Decidim
   module ParticipatoryProcesses
     describe CurrentComponent do
+      subject { described_class.new(manifest) }
+
       let(:request) { double(params: params, env: env) }
-      let(:subject) { described_class.new(manifest) }
       let(:params) { {} }
       let(:manifest) { Decidim.find_component_manifest("dummy") }
 
@@ -31,7 +32,7 @@ module ParticipatoryProcesses
 
         context "when the params don't contain a component id" do
           it "doesn't match" do
-            expect(subject.matches?(request)).to eq(false)
+            expect(subject.matches?(request)).to be(false)
           end
         end
 
@@ -44,7 +45,7 @@ module ParticipatoryProcesses
             let(:component) { create(:component) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(false)
+              expect(subject.matches?(request)).to be(false)
             end
           end
 
@@ -52,7 +53,7 @@ module ParticipatoryProcesses
             let(:component) { create(:component, participatory_space: current_participatory_process) }
 
             it "matches" do
-              expect(subject.matches?(request)).to eq(true)
+              expect(subject.matches?(request)).to be(true)
             end
           end
         end
diff --git a/decidim-participatory_processes/spec/lib/query_extensions_spec.rb b/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
index 43158d2c3fa25..c834c73641f24 100644
--- a/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
+++ b/decidim-participatory_processes/spec/lib/query_extensions_spec.rb
@@ -82,6 +82,42 @@ module Core
           end
         end
       end
+
+      describe "participatoryProcessTypes" do
+        let!(:type1) { create(:participatory_process_type, :with_active_participatory_processes, organization: current_organization) }
+        let!(:type2) { create(:participatory_process_type, :with_active_participatory_processes, organization: current_organization) }
+        let!(:type3) { create(:participatory_process_type, :with_active_participatory_processes) }
+
+        let(:query) { %({ participatoryProcessTypes { id }}) }
+
+        it "returns all the process types" do
+          expect(response["participatoryProcessTypes"]).to include("id" => type1.id.to_s)
+          expect(response["participatoryProcessTypes"]).to include("id" => type2.id.to_s)
+          expect(response["participatoryProcessTypes"]).not_to include("id" => type3.id.to_s)
+        end
+      end
+
+      describe "participatoryProcessType" do
+        let(:query) { %({ participatoryProcessType(id: \"#{id}\") { id }}) }
+
+        context "with a participatory process type that belongs to the current organization" do
+          let!(:type) { create(:participatory_process_type, :with_active_participatory_processes, organization: current_organization) }
+          let(:id) { type.id }
+
+          it "returns the type" do
+            expect(response["participatoryProcessType"]).to eq("id" => type.id.to_s)
+          end
+        end
+
+        context "with a participatory process type of another organization" do
+          let!(:type) { create(:participatory_process_type, :with_active_participatory_processes) }
+          let(:id) { type.id }
+
+          it "returns nil" do
+            expect(response["participatoryProcessType"]).to be_nil
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-participatory_processes/spec/models/decidim/participatory_process_type_spec.rb b/decidim-participatory_processes/spec/models/decidim/participatory_process_type_spec.rb
new file mode 100644
index 0000000000000..f5cc0001a733c
--- /dev/null
+++ b/decidim-participatory_processes/spec/models/decidim/participatory_process_type_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  describe ParticipatoryProcessType do
+    subject(:participatory_process_type) { build(:participatory_process_type) }
+
+    it { is_expected.to be_valid }
+
+    context "without title" do
+      subject(:participatory_process_type) { build(:participatory_process_type, title: { en: "My title" }) }
+
+      before do
+        participatory_process_type.title = {}
+      end
+
+      it { is_expected.to be_invalid }
+    end
+
+    context "without organization" do
+      before do
+        participatory_process_type.organization = nil
+      end
+
+      it { is_expected.to be_invalid }
+    end
+
+    describe "has an association for children processes" do
+      subject(:children) { participatory_process_type.processes }
+
+      let(:processes) { create_list(:participatory_process, 2, participatory_process_type: participatory_process_type) }
+
+      it { is_expected.to contain_exactly(*processes) }
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb b/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
index fafb4d08f0c86..8042869ecb06e 100644
--- a/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
+++ b/decidim-participatory_processes/spec/permissions/decidim/participatory_processes/permissions_spec.rb
@@ -9,7 +9,7 @@
   let(:organization) { create :organization }
   let(:process) { create :participatory_process, organization: organization }
   let(:context) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:process_admin) { create :process_admin, participatory_process: process }
   let(:process_collaborator) { create :process_collaborator, participatory_process: process }
   let(:process_moderator) { create :process_moderator, participatory_process: process }
@@ -21,18 +21,18 @@
         { scope: :admin, action: :foo, subject: action_subject }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
   shared_examples "access for role" do |access|
     case access
     when true
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     when :not_set
       it_behaves_like "permission is not set"
     else
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -82,6 +82,23 @@
       )
     end
 
+    context "when accessing global moderation" do
+      subject { Decidim::Admin::Permissions.new(user, permission_action, context).permissions.allowed? }
+
+      let(:action) do
+        { scope: :admin, action: :read, subject: :global_moderation }
+      end
+
+      it_behaves_like(
+        "access for roles",
+        org_admin: true,
+        admin: true,
+        collaborator: false,
+        moderator: true,
+        valuator: false
+      )
+    end
+
     context "when reading a process" do
       let(:action) do
         { scope: :public, action: :read, subject: :process }
@@ -91,13 +108,13 @@
       context "when the user is an admin" do
         let(:user) { create :user, :admin }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the process is published" do
         let(:user) { create :user, organization: organization }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when the process is not published" do
@@ -105,7 +122,7 @@
         let(:process) { create :participatory_process, :unpublished, organization: organization }
 
         context "when the user doesn't have access to it" do
-          it { is_expected.to eq false }
+          it { is_expected.to be false }
         end
 
         context "when the user has access to it" do
@@ -113,7 +130,7 @@
             create :participatory_process_user_role, user: user, participatory_process: process
           end
 
-          it { is_expected.to eq true }
+          it { is_expected.to be true }
         end
       end
     end
@@ -123,7 +140,7 @@
         { scope: :public, action: :list, subject: :process }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when listing process groups" do
@@ -131,7 +148,7 @@
         { scope: :public, action: :list, subject: :process_group }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when any other action" do
@@ -358,7 +375,7 @@
           { scope: :admin, action: :preview, subject: :dummy }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when action is a random one" do
@@ -378,7 +395,7 @@
           { scope: :admin, action: :create, subject: :process }
         end
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       it_behaves_like "allows any action on subject", :attachment
@@ -398,7 +415,7 @@
           { scope: :admin, action: :create, subject: :process }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       it_behaves_like "allows any action on subject", :attachment
@@ -420,7 +437,7 @@
           { scope: :admin, action: :read, subject: :component }
         end
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
diff --git a/decidim-participatory_processes/spec/presenters/decidim/log/value_types/participatory_process_type_presenter_spec.rb b/decidim-participatory_processes/spec/presenters/decidim/log/value_types/participatory_process_type_presenter_spec.rb
new file mode 100644
index 0000000000000..217270e69a27b
--- /dev/null
+++ b/decidim-participatory_processes/spec/presenters/decidim/log/value_types/participatory_process_type_presenter_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Log::ValueTypes::ParticipatoryProcessTypePresenter, type: :helper do
+  subject { described_class.new(value, helper) }
+
+  let(:value) { participatory_process_type.id }
+  let!(:participatory_process_type) { create :participatory_process_type }
+
+  before do
+    helper.extend(Decidim::ApplicationHelper)
+    helper.extend(Decidim::TranslationsHelper)
+  end
+
+  describe "#present" do
+    context "when the participatory process type is found" do
+      let(:title) { participatory_process_type.title["en"] }
+
+      it "shows the participatory process type title" do
+        expect(subject.present).to eq title
+      end
+    end
+
+    context "when the participatory process type was not found" do
+      let(:value) { participatory_process_type.id + 1 }
+
+      it "shows a string explaining the problem" do
+        expect(subject.present).to eq "The process type was not found on the database (ID: #{value})"
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter_spec.rb b/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter_spec.rb
new file mode 100644
index 0000000000000..8b49c8d595cfa
--- /dev/null
+++ b/decidim-participatory_processes/spec/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter_spec.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessTypePresenter, type: :helper do
+  include_examples "present admin log entry" do
+    let(:admin_log_resource) { create(:participatory_process_type, organization: organization) }
+    let(:action) { "delete" }
+  end
+end
diff --git a/decidim-participatory_processes/spec/requests/participatory_process_search_spec.rb b/decidim-participatory_processes/spec/requests/participatory_process_search_spec.rb
new file mode 100644
index 0000000000000..494d2da31bfce
--- /dev/null
+++ b/decidim-participatory_processes/spec/requests/participatory_process_search_spec.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Participatory process search", type: :request do
+  subject { response.body }
+
+  let(:organization) { create(:organization) }
+  let(:current_user) { create :user, :confirmed, organization: organization }
+  let!(:process1) do
+    create(
+      :participatory_process,
+      :active,
+      organization: organization,
+      area: create(:area, organization: organization),
+      scope: create(:scope, organization: organization)
+    )
+  end
+  let!(:process2) do
+    create(
+      :participatory_process,
+      :active,
+      organization: organization,
+      area: create(:area, organization: organization),
+      scope: create(:scope, organization: organization)
+    )
+  end
+  let!(:past_process) { create(:participatory_process, :past, organization: organization) }
+  let!(:upcoming_process) { create(:participatory_process, :upcoming, organization: organization) }
+  let!(:unpublished_process) do
+    create(
+      :participatory_process,
+      :unpublished,
+      organization: organization
+    )
+  end
+
+  let(:filter_params) { {} }
+  let(:request_path) { decidim_participatory_processes.participatory_processes_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => organization.host }
+    )
+  end
+
+  it "displays all public active processes by default" do
+    expect(subject).to include(translated(process1.title))
+    expect(subject).to include(translated(process2.title))
+    expect(subject).not_to include(translated(past_process.title))
+    expect(subject).not_to include(translated(upcoming_process.title))
+  end
+
+  context "when filtering by area" do
+    let(:filter_params) { { with_area: process1.area.id } }
+
+    it "displays matching assemblies" do
+      expect(subject).to include(translated(process1.title))
+      expect(subject).not_to include(translated(process2.title))
+    end
+  end
+
+  context "when filtering by scope" do
+    let(:filter_params) { { with_scope: process1.scope.id } }
+
+    it "displays matching assemblies" do
+      expect(subject).to include(translated(process1.title))
+      expect(subject).not_to include(translated(process2.title))
+    end
+  end
+
+  context "when filtering by date" do
+    let(:filter_params) { { with_date: date } }
+
+    context "and the date is set to active" do
+      let(:date) { "active" }
+
+      it "displays all active processes" do
+        expect(subject).to include(translated(process1.title))
+        expect(subject).to include(translated(process2.title))
+        expect(subject).not_to include(translated(past_process.title))
+        expect(subject).not_to include(translated(upcoming_process.title))
+      end
+    end
+
+    context "and the date is set to past" do
+      let(:date) { "past" }
+
+      it "displays the past process" do
+        expect(subject).not_to include(translated(process1.title))
+        expect(subject).not_to include(translated(process2.title))
+        expect(subject).to include(translated(past_process.title))
+        expect(subject).not_to include(translated(upcoming_process.title))
+      end
+    end
+
+    context "and the date is set to upcoming" do
+      let(:date) { "upcoming" }
+
+      it "displays the upcoming process" do
+        expect(subject).not_to include(translated(process1.title))
+        expect(subject).not_to include(translated(process2.title))
+        expect(subject).not_to include(translated(past_process.title))
+        expect(subject).to include(translated(upcoming_process.title))
+      end
+    end
+
+    context "and the date is set to all" do
+      let(:date) { "all" }
+
+      it "displays all public processes" do
+        expect(subject).to include(translated(process1.title))
+        expect(subject).to include(translated(process2.title))
+        expect(subject).to include(translated(past_process.title))
+        expect(subject).to include(translated(upcoming_process.title))
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_serializer_spec.rb b/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_serializer_spec.rb
index 7fb60d160d50b..97452a645d9a1 100644
--- a/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_serializer_spec.rb
+++ b/decidim-participatory_processes/spec/serializers/decidim/participatory_processes/participatory_process_serializer_spec.rb
@@ -5,7 +5,8 @@
 module Decidim::ParticipatoryProcesses
   describe ParticipatoryProcessSerializer do
     let(:resource) { create(:participatory_process) }
-    let(:subject) { described_class.new(resource) }
+
+    subject { described_class.new(resource) }
 
     describe "#serialize" do
       it "includes the participatory process data" do
diff --git a/decidim-participatory_processes/spec/services/decidim/participatory_processes/searchable_participatory_process_resource_spec.rb b/decidim-participatory_processes/spec/services/decidim/participatory_processes/searchable_participatory_process_resource_spec.rb
index 2a2a041636ec2..9e0fd65863193 100644
--- a/decidim-participatory_processes/spec/services/decidim/participatory_processes/searchable_participatory_process_resource_spec.rb
+++ b/decidim-participatory_processes/spec/services/decidim/participatory_processes/searchable_participatory_process_resource_spec.rb
@@ -14,12 +14,12 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
-          description: description_1,
+          description: description1,
           users: [author]
         )
       end
       let(:participatory_space) { participatory_process }
-      let(:participatory_process_2) do
+      let(:participatory_process2) do
         create(
           :participatory_process,
           organization: organization,
@@ -27,11 +27,11 @@ module Decidim
           title: Decidim::Faker::Localized.name,
           subtitle: Decidim::Faker::Localized.name,
           short_description: Decidim::Faker::Localized.sentence,
-          description: description_2,
+          description: description2,
           users: [author]
         )
       end
-      let(:participatory_space2) { participatory_process_2 }
+      let(:participatory_space2) { participatory_process2 }
       let(:searchable_resource_attrs_mapper) do
         lambda { |space, locale|
           {
diff --git a/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb b/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb
index 522ee3f3b7cad..268d1cbf84350 100644
--- a/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_participatory_process_private_users_examples.rb
@@ -42,7 +42,7 @@
       # The CSV has no headers
       expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("my_user@example.org", "My User Name", participatory_process, user)
       expect(Decidim::Admin::ImportParticipatorySpacePrivateUserCsvJob).to receive(:perform_later).once.ordered.with("my_private_user@example.org", "My Private User Name", participatory_process, user)
-      attach_file "File", Decidim::Dev.asset("import_participatory_space_private_users.csv")
+      dynamically_attach_file(:participatory_space_private_user_csv_import_file, Decidim::Dev.asset("import_participatory_space_private_users.csv"))
       perform_enqueued_jobs { click_button "Upload" }
 
       expect(page).to have_content("CSV file uploaded successfully")
diff --git a/decidim-participatory_processes/spec/shared/manage_processes_examples.rb b/decidim-participatory_processes/spec/shared/manage_processes_examples.rb
index 04f6a96ce0d9f..b72c16f0a4d64 100644
--- a/decidim-participatory_processes/spec/shared/manage_processes_examples.rb
+++ b/decidim-participatory_processes/spec/shared/manage_processes_examples.rb
@@ -101,7 +101,7 @@ def filter_by_group(group_title)
         es: "Mi nuevo título",
         ca: "El meu nou títol"
       )
-      attach_file :participatory_process_banner_image, image3_path
+      dynamically_attach_file(:participatory_process_banner_image, image3_path, remove_before: true)
 
       page.execute_script("$('#participatory_process_end_date').focus()")
       page.find(".datepicker-dropdown .day", text: "22").click
diff --git a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_user_roles_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_user_roles_spec.rb
index adfd737441cb0..257138196a441 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_user_roles_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_process_user_roles_spec.rb
@@ -11,11 +11,11 @@
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
 
-  let!(:invited_user_1) { create(:process_valuator, name: name, participatory_process: participatory_process) }
-  let!(:invited_user_2) { create(:process_valuator, email: email, participatory_process: participatory_process) }
+  let!(:invited_user1) { create(:process_valuator, name: name, participatory_process: participatory_process) }
+  let!(:invited_user2) { create(:process_valuator, email: email, participatory_process: participatory_process) }
 
   before do
-    invited_user_2.update!(invitation_sent_at: Time.current - 1.day, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
+    invited_user2.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current, last_sign_in_at: Time.current)
 
     switch_to_host(organization.host)
     login_as admin, scope: :user
@@ -36,6 +36,7 @@
       let!(:user) do
         create(:process_valuator,
                name: "ZZZupper user",
+               email: "zzz@example.org",
                participatory_process: participatory_process,
                last_sign_in_at: 30.seconds.ago,
                invitation_accepted_at: Time.current)
diff --git a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb
index 744bd71a27beb..f80319eff7448 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_filters_participatory_processes_private_space_users_spec.rb
@@ -9,10 +9,10 @@
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
 
-  let!(:invited_user_1) { create(:user, name: name, organization: organization) }
-  let!(:invited_private_user_1) { create :participatory_space_private_user, user: invited_user_1, privatable_to: participatory_process }
-  let!(:invited_user_2) { create(:user, email: email, organization: organization) }
-  let!(:invited_private_user_2) { create :participatory_space_private_user, user: invited_user_2, privatable_to: participatory_process }
+  let!(:invited_user1) { create(:user, name: name, organization: organization) }
+  let!(:invited_private_user1) { create :participatory_space_private_user, user: invited_user1, privatable_to: participatory_process }
+  let!(:invited_user2) { create(:user, email: email, organization: organization) }
+  let!(:invited_private_user2) { create :participatory_space_private_user, user: invited_user2, privatable_to: participatory_process }
 
   let(:name) { "Dummy Name" }
   let(:email) { "dummy_email@example.org" }
@@ -20,7 +20,7 @@
   let(:resource_controller) { Decidim::ParticipatoryProcesses::Admin::ParticipatorySpacePrivateUsersController }
 
   before do
-    invited_user_1.update!(invitation_sent_at: Time.current - 1.day, invitation_accepted_at: Time.current)
+    invited_user1.update!(invitation_sent_at: 1.day.ago, invitation_accepted_at: Time.current)
 
     switch_to_host(organization.host)
     login_as user, scope: :user
diff --git a/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
index 3ebeb253a1a71..b9c857236b227 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_import_participatory_process_spec.rb
@@ -24,12 +24,13 @@
           ca: "Importació del procés participatiu"
         )
         fill_in :participatory_process_slug, with: "pp-import"
-        attach_file :participatory_process_document, Decidim::Dev.asset("participatory_processes.json")
       end
 
       stub_get_request_with_format("http://localhost:3000/uploads/decidim/participatory_process/hero_image/1/city.jpeg", "image/jpeg")
       stub_get_request_with_format("http://localhost:3000/uploads/decidim/participatory_process/banner_image/1/city2.jpeg", "image/jpeg")
 
+      dynamically_attach_file(:participatory_process_document, Decidim::Dev.asset("participatory_processes.json"))
+
       click_button "Import"
     end
 
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_groups_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_groups_spec.rb
index ce19041ed64cd..a5cc431d4d261 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_groups_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_groups_spec.rb
@@ -46,8 +46,11 @@
         ca: "La corporació X"
       )
       select participatory_processes.first.title["en"], from: :participatory_process_group_participatory_process_ids
-      attach_file :participatory_process_group_hero_image, image1_path
+    end
+
+    dynamically_attach_file(:participatory_process_group_hero_image, image1_path)
 
+    within ".new_participatory_process_group" do
       find("*[type=submit]").click
     end
 
@@ -101,8 +104,11 @@
           ca: "La corporació Z"
         )
         select participatory_processes.last.title["en"], from: :participatory_process_group_participatory_process_ids
-        attach_file :participatory_process_group_hero_image, image2_path
+      end
+
+      dynamically_attach_file(:participatory_process_group_hero_image, image2_path, remove_before: true)
 
+      within ".edit_participatory_process_group" do
         find("*[type=submit]").click
       end
 
@@ -141,7 +147,13 @@
         click_link "Edit"
       end
 
-      check "Remove this file"
+      within ".upload-container-for-hero_image" do
+        find("#participatory_process_group_hero_image_button").click
+      end
+
+      find(".remove-upload-item").click
+      click_button "Save"
+
       click_button "Update"
 
       expect(page).to have_no_css("img")
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_types_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_types_spec.rb
new file mode 100644
index 0000000000000..42bff71db741a
--- /dev/null
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_process_types_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages participatory process types", type: :system do
+  include_context "when admin administrating a participatory process"
+
+  let!(:participatory_processes) do
+    create_list(:participatory_process, 3, organization: organization)
+  end
+
+  describe "Managing participatory process types" do
+    before do
+      switch_to_host(organization.host)
+      login_as user, scope: :user
+      visit decidim_admin_participatory_processes.participatory_process_types_path
+    end
+
+    it "can create new participatory process types" do
+      click_link "New process type"
+
+      within ".new_participatory_process_type" do
+        fill_in_i18n(
+          :participatory_process_type_title,
+          "#participatory_process_type-title-tabs",
+          en: "My participatory process type",
+          es: "Mi tipo de proceso participativo",
+          ca: "El meu tipus de procés participatiu "
+        )
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "table" do
+        expect(page).to have_content("My participatory process type")
+      end
+    end
+
+    context "with existing participatory process types" do
+      let!(:participatory_process_type) { create(:participatory_process_type, organization: organization) }
+
+      before do
+        visit current_path
+      end
+
+      it "lists all the participatory process types for the organization" do
+        within "#participatory-process-types table" do
+          expect(page).to have_content(translated(participatory_process_type.title, locale: :en))
+        end
+      end
+
+      it "can edit them" do
+        within find("tr", text: translated(participatory_process_type.title)) do
+          click_link "Edit"
+        end
+
+        within ".edit_participatory_process_type" do
+          fill_in_i18n(
+            :participatory_process_type_title,
+            "#participatory_process_type-title-tabs",
+            en: "Another participatory process type",
+            es: "Otro tipo de proceso participativo",
+            ca: "Un altre tipus de procés participatiu"
+          )
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_admin_callout("successfully")
+
+        within "table" do
+          expect(page).to have_content("Another participatory process type")
+        end
+      end
+
+      it "can delete them" do
+        click_delete_participatory_process_type
+
+        expect(page).to have_admin_callout("successfully")
+
+        within ".card-section" do
+          expect(page).to have_no_content(translated(participatory_process_type.title))
+        end
+      end
+    end
+  end
+
+  private
+
+  def click_delete_participatory_process_type
+    within find("tr", text: translated(participatory_process_type.title)) do
+      accept_confirm { click_link "Delete" }
+    end
+  end
+end
diff --git a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
index 624524c51b0ed..c4a34f6dd5f8e 100644
--- a/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/admin_manages_participatory_processes_spec.rb
@@ -66,9 +66,12 @@
         fill_in :participatory_process_slug, with: "slug"
         fill_in :participatory_process_hashtag, with: "#hashtag"
         fill_in :participatory_process_weight, with: 1
-        attach_file :participatory_process_hero_image, image1_path
-        attach_file :participatory_process_banner_image, image2_path
+      end
+
+      dynamically_attach_file(:participatory_process_hero_image, image1_path)
+      dynamically_attach_file(:participatory_process_banner_image, image2_path)
 
+      within ".new_participatory_process" do
         find("*[type=submit]").click
       end
 
diff --git a/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb b/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
index 6245a7ef5d81f..1758dda686a0a 100644
--- a/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/invite_process_admin_spec.rb
@@ -21,8 +21,8 @@
 
       within "form.new_user" do
         fill_in :invitation_user_nickname, with: "caballo_loco"
-        fill_in :invitation_user_password, with: "decidim123456"
-        fill_in :invitation_user_password_confirmation, with: "decidim123456"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        fill_in :invitation_user_password_confirmation, with: "decidim123456789"
         check :invitation_user_tos_agreement
         find("*[type=submit]").click
       end
diff --git a/decidim-participatory_processes/spec/system/admin/invite_process_collaborator_spec.rb b/decidim-participatory_processes/spec/system/admin/invite_process_collaborator_spec.rb
index c135da62933b5..90c9502b0d83e 100644
--- a/decidim-participatory_processes/spec/system/admin/invite_process_collaborator_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/invite_process_collaborator_spec.rb
@@ -20,8 +20,8 @@
 
       within "form.new_user" do
         fill_in :invitation_user_nickname, with: "caballo_loco"
-        fill_in :invitation_user_password, with: "decidim123456"
-        fill_in :invitation_user_password_confirmation, with: "decidim123456"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        fill_in :invitation_user_password_confirmation, with: "decidim123456789"
         check :invitation_user_tos_agreement
         find("*[type=submit]").click
       end
diff --git a/decidim-participatory_processes/spec/system/admin/invite_process_moderator_spec.rb b/decidim-participatory_processes/spec/system/admin/invite_process_moderator_spec.rb
index 6fe9723de6519..402b0f10da44b 100644
--- a/decidim-participatory_processes/spec/system/admin/invite_process_moderator_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/invite_process_moderator_spec.rb
@@ -19,8 +19,8 @@
 
       within "form.new_user" do
         fill_in :invitation_user_nickname, with: "caballo_loco"
-        fill_in :invitation_user_password, with: "decidim123456"
-        fill_in :invitation_user_password_confirmation, with: "decidim123456"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        fill_in :invitation_user_password_confirmation, with: "decidim123456789"
         check :invitation_user_tos_agreement
         find("*[type=submit]").click
       end
diff --git a/decidim-participatory_processes/spec/system/admin/process_moderator_manages_process_moderations_spec.rb b/decidim-participatory_processes/spec/system/admin/process_moderator_manages_process_moderations_spec.rb
index 0530da408cb0e..f8f2c7828870f 100644
--- a/decidim-participatory_processes/spec/system/admin/process_moderator_manages_process_moderations_spec.rb
+++ b/decidim-participatory_processes/spec/system/admin/process_moderator_manages_process_moderations_spec.rb
@@ -25,4 +25,8 @@
   end
 
   it_behaves_like "manage moderations"
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:dummy_resource, 17, component: current_component) }
+  end
 end
diff --git a/decidim-participatory_processes/spec/system/filter_participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/filter_participatory_processes_spec.rb
index 3d86b0d7be290..8c1801dc94974 100644
--- a/decidim-participatory_processes/spec/system/filter_participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/filter_participatory_processes_spec.rb
@@ -28,11 +28,11 @@
 
   context "when filtering processes by date" do
     let!(:active_process) { create :participatory_process, title: { en: "Started today" }, start_date: Date.current, organization: organization }
-    let!(:active_process_2) { create :participatory_process, title: { en: "Started 1 day ago" }, start_date: 1.day.ago, organization: organization }
+    let!(:active_process2) { create :participatory_process, title: { en: "Started 1 day ago" }, start_date: 1.day.ago, organization: organization }
     let!(:past_process) { create :participatory_process, :past, title: { en: "Ended 1 week ago" }, organization: organization }
-    let!(:past_process_2) { create :participatory_process, :past, title: { en: "Ended 1 month ago" }, end_date: 1.month.ago, organization: organization }
+    let!(:past_process2) { create :participatory_process, :past, title: { en: "Ended 1 month ago" }, end_date: 1.month.ago, organization: organization }
     let!(:upcoming_process) { create :participatory_process, :upcoming, title: { en: "Starts 1 week from now" }, organization: organization }
-    let!(:upcoming_process_2) { create :participatory_process, :upcoming, title: { en: "Starts 1 year from now" }, start_date: 1.year.from_now, organization: organization }
+    let!(:upcoming_process2) { create :participatory_process, :upcoming, title: { en: "Starts 1 year from now" }, start_date: 1.year.from_now, organization: organization }
     let(:titles) { page.all(".card__title") }
 
     before do
@@ -95,7 +95,7 @@
 
       before do
         past_process.update(title: { en: "Started 2 weeks ago" })
-        past_process_2.update(title: { en: "Started 3 weeks ago" }, start_date: 3.weeks.ago)
+        past_process2.update(title: { en: "Started 3 weeks ago" }, start_date: 3.weeks.ago)
         allow(Time).to receive(:zone).and_return(time_zone)
         within ".order-by__tabs" do
           click_link "All"
@@ -119,7 +119,7 @@
 
     context "and choosing a scope" do
       before do
-        visit decidim_participatory_processes.participatory_processes_path(filter: { scope_id: scope.id })
+        visit decidim_participatory_processes.participatory_processes_path(filter: { with_scope: scope.id })
       end
 
       it "lists all processes belonging to that scope" do
@@ -140,7 +140,7 @@
 
     context "and choosing an area" do
       before do
-        select translated(area.name), from: "filter[area_id]"
+        select translated(area.name), from: "filter[with_area]"
       end
 
       it "lists all processes belonging to that area" do
@@ -159,8 +159,180 @@
       end
 
       it "doesnt show filters" do
-        expect(page).not_to have_css(".area_id_areas_select_filter")
-        expect(page).not_to have_css(".scope_id_scopes_picker_filter")
+        expect(page).not_to have_css(".with_area_areas_select_filter")
+        expect(page).not_to have_css(".with_scope_scopes_picker_filter")
+      end
+    end
+  end
+
+  context "when filtering processes by type" do
+    context "when there are no participatory processes types" do
+      let!(:processes) { create_list(:participatory_process, 3, :active, organization: organization) }
+
+      context "when visiting processes index" do
+        before do
+          visit decidim_participatory_processes.participatory_processes_path
+        end
+
+        it "doesn't show the participatory process types filter" do
+          expect(page).to have_no_css("#process-type-filter")
+        end
+      end
+    end
+
+    context "when there are participatory processes types" do
+      let!(:process_type) { create(:participatory_process_type, :with_active_participatory_processes, organization: organization, title: { en: "Awesome Type" }) }
+      let!(:past_process_type) { create(:participatory_process_type, :with_past_participatory_processes, organization: organization, title: { en: "Old Type" }) }
+      let!(:unpublished_process_type) { create(:participatory_process_type, organization: organization, title: { en: "Unpublished Type" }) }
+      let!(:empty_process_type) { create(:participatory_process_type, organization: organization, title: { en: "Empty Type" }) }
+      let!(:processes_group1) { create(:participatory_process_group, organization: organization, title: { en: "The South Group" }) }
+      let!(:processes_group2) { create(:participatory_process_group, organization: organization, title: { en: "The North Group" }) }
+      let!(:group_1_process_type) { create(:participatory_process_type, :with_active_participatory_processes, organization: organization, title: { en: "The East Type" }) }
+      let!(:group_2_process_type) { create(:participatory_process_type, :with_active_participatory_processes, organization: organization, title: { en: "The West Type" }) }
+      let!(:processes1) do
+        create_list(
+          :participatory_process,
+          3,
+          title: { en: "SE Rocks!" },
+          start_date: 2.days.ago,
+          organization: organization,
+          participatory_process_group: processes_group1,
+          participatory_process_type: group_1_process_type
+        )
+      end
+      let!(:processes2) do
+        create_list(
+          :participatory_process,
+          3,
+          title: { en: "NW Rocks!" },
+          start_date: 2.days.ago,
+          organization: organization,
+          participatory_process_group: processes_group2,
+          participatory_process_type: group_2_process_type
+        )
+      end
+      let(:unpublished_process) do
+        create(
+          :participatory_process,
+          :active,
+          :unpublished,
+          title: { en: "Unpublished process" },
+          participatory_process_type: unpublished_process_type
+        )
+      end
+
+      context "when visiting processes index" do
+        before do
+          visit decidim_participatory_processes.participatory_processes_path
+        end
+
+        context "and choosing 'active' processes" do
+          it "lists all active processes" do
+            within "#processes-grid h3" do
+              expect(page).to have_content("8 ACTIVE PROCESSES")
+            end
+          end
+
+          it "only shows process types with active processes" do
+            within "#process-type-filter" do
+              click_button "All types"
+              expect(page).to have_content("Awesome Type")
+              expect(page).to have_content("The East Type")
+              expect(page).to have_content("The West Type")
+              expect(page).to have_no_content("Old Type")
+              expect(page).to have_no_content("Empty Type")
+              expect(page).to have_no_content("Unpublished Type")
+            end
+          end
+        end
+
+        context "and choosing 'past' processes" do
+          before do
+            within ".order-by__tabs" do
+              click_link "Past"
+            end
+            sleep 2
+          end
+
+          it "lists past processes" do
+            within "#processes-grid h3" do
+              expect(page).to have_content("2 PAST PROCESSES")
+            end
+          end
+
+          it "only shows process types with past processes" do
+            within "#process-type-filter" do
+              click_button "All types"
+              expect(page).to have_no_content("Awesome Type")
+              expect(page).to have_no_content("The East Type")
+              expect(page).to have_no_content("The West Type")
+              expect(page).to have_content("Old Type")
+              expect(page).to have_no_content("Empty Type")
+              expect(page).to have_no_content("Unpublished Type")
+            end
+          end
+        end
+
+        context "and filtering by a process type" do
+          before do
+            within "#process-type-filter" do
+              click_button "All types"
+              click_link "The West Type"
+            end
+            sleep 2
+          end
+
+          it "lists process type processes" do
+            within "#processes-grid h3" do
+              expect(page).to have_content("3 ACTIVE PROCESSES")
+            end
+
+            expect(page).to have_no_content("NW Rocks!")
+            expect(page).to have_no_content("SE Rocks!")
+            group_2_process_type.processes.groupless.each do |group|
+              expect(page).to have_content(translated(group.title))
+            end
+          end
+        end
+      end
+
+      context "when visiting processes group page with processes block enabled" do
+        before do
+          create(
+            :content_block,
+            organization: organization,
+            scope_name: :participatory_process_group_homepage,
+            scoped_resource_id: processes_group1.id,
+            manifest_name: :participatory_processes
+          )
+          visit decidim_participatory_processes.participatory_process_group_path(processes_group1)
+        end
+
+        context "and choosing 'active' processes" do
+          it "lists all active processes inside the group" do
+            within "#processes-grid h3" do
+              expect(page).to have_content("3 ACTIVE PROCESSES")
+            end
+
+            expect(page).to have_content("SE Rocks!")
+            expect(page).to have_no_content("NW Rocks!")
+            group_1_process_type.processes.groupless.each do |group|
+              expect(page).to have_no_content(translated(group.title))
+            end
+          end
+
+          it "only shows process types with active processes in the group" do
+            within "#process-type-filter" do
+              click_button "All types"
+              expect(page).to have_no_content("Awesome Type")
+              expect(page).to have_content("The East Type")
+              expect(page).to have_no_content("The West Type")
+              expect(page).to have_no_content("Old Type")
+              expect(page).to have_no_content("Empty Type")
+              expect(page).to have_no_content("Unpublished Type")
+            end
+          end
+        end
       end
     end
   end
diff --git a/decidim-participatory_processes/spec/system/participatory_process_groups_spec.rb b/decidim-participatory_processes/spec/system/participatory_process_groups_spec.rb
index 983406db837b3..e7936ddda202e 100644
--- a/decidim-participatory_processes/spec/system/participatory_process_groups_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_process_groups_spec.rb
@@ -97,6 +97,13 @@
       it "has a link to the group url" do
         expect(page).to have_link("www.example.org/external", href: "https://www.example.org/external")
       end
+
+      it_behaves_like "has embedded video in description", :description do
+        before do
+          participatory_process_group.update!(description: description)
+          visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
+        end
+      end
     end
 
     context "when the metadata content block is enabled" do
@@ -158,8 +165,8 @@
     context "when the proposals block is enabled" do
       let!(:proposals_component) { create(:component, :published, participatory_space: process, manifest_name: :proposals) }
       let!(:other_process_proposals_component) { create(:component, :published, participatory_space: other_process, manifest_name: :proposals) }
-      let!(:proposal_1) { create(:proposal, component: proposals_component, title: { en: "First awesome proposal!" }) }
-      let!(:proposal_2) { create(:proposal, component: other_process_proposals_component, title: { en: "Second fabulous proposal!" }) }
+      let!(:proposal1) { create(:proposal, component: proposals_component, title: { en: "First awesome proposal!" }) }
+      let!(:proposal2) { create(:proposal, component: other_process_proposals_component, title: { en: "Second fabulous proposal!" }) }
 
       before do
         create(
@@ -175,15 +182,15 @@
 
       it "shows cards of proposals from both processes" do
         within("#participatory-process-group-homepage-highlighted-proposals") do
-          expect(page).to have_selector("#proposal_#{proposal_1.id}")
-          expect(page).to have_selector("#proposal_#{proposal_2.id}")
+          expect(page).to have_selector("#proposal_#{proposal1.id}")
+          expect(page).to have_selector("#proposal_#{proposal2.id}")
 
-          within("#proposal_#{proposal_1.id}") do
+          within("#proposal_#{proposal1.id}") do
             expect(page).to have_content "First awesome proposal!"
             expect(page).to have_i18n_content process.title
           end
 
-          within("#proposal_#{proposal_2.id}") do
+          within("#proposal_#{proposal2.id}") do
             expect(page).to have_content "Second fabulous proposal!"
             expect(page).to have_i18n_content other_process.title
           end
@@ -194,8 +201,8 @@
     context "when the results block is enabled" do
       let!(:accountability_component) { create(:component, :published, participatory_space: process, manifest_name: :accountability) }
       let!(:other_process_accountability_component) { create(:component, :published, participatory_space: other_process, manifest_name: :accountability) }
-      let!(:result_1) { create(:result, component: accountability_component, title: { en: "First awesome result!" }) }
-      let!(:result_2) { create(:result, component: other_process_accountability_component, title: { en: "Second fabulous result!" }) }
+      let!(:result1) { create(:result, component: accountability_component, title: { en: "First awesome result!" }) }
+      let!(:result2) { create(:result, component: other_process_accountability_component, title: { en: "Second fabulous result!" }) }
 
       before do
         create(
@@ -211,15 +218,15 @@
 
       it "shows cards of results from both processes" do
         within("#participatory-process-group-homepage-highlighted-results") do
-          expect(page).to have_selector("#result_#{result_1.id}")
-          expect(page).to have_selector("#result_#{result_2.id}")
+          expect(page).to have_selector("#result_#{result1.id}")
+          expect(page).to have_selector("#result_#{result2.id}")
 
-          within("#result_#{result_1.id}") do
+          within("#result_#{result1.id}") do
             expect(page).to have_content "First awesome result!"
             expect(page).to have_i18n_content process.title
           end
 
-          within("#result_#{result_2.id}") do
+          within("#result_#{result2.id}") do
             expect(page).to have_content "Second fabulous result!"
             expect(page).to have_i18n_content other_process.title
           end
@@ -229,6 +236,7 @@
 
     context "when the html block is enabled" do
       before do
+        # rubocop:disable Naming/VariableNumber
         create(
           :content_block,
           organization: organization,
@@ -241,6 +249,7 @@
             html_content_es: nil
           }
         )
+        # rubocop:enable Naming/VariableNumber
 
         visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
       end
@@ -257,8 +266,8 @@
   context "when the meetings block is enabled" do
     let!(:meetings_component) { create(:component, :published, participatory_space: process, manifest_name: :meetings) }
     let!(:other_process_meetings_component) { create(:component, :published, participatory_space: other_process, manifest_name: :meetings) }
-    let!(:meeting_1) { create(:meeting, :published, component: meetings_component, title: { en: "First awesome meeting!" }) }
-    let!(:meeting_2) { create(:meeting, :published, component: other_process_meetings_component, title: { en: "Second fabulous meeting!" }) }
+    let!(:meeting1) { create(:meeting, :published, component: meetings_component, title: { en: "First awesome meeting!" }) }
+    let!(:meeting2) { create(:meeting, :published, component: other_process_meetings_component, title: { en: "Second fabulous meeting!" }) }
 
     before do
       create(
@@ -526,7 +535,7 @@
     context "when filtering processes by scope" do
       context "and choosing a scope" do
         before do
-          visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group, filter: { scope_id: scope.id })
+          visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group, filter: { with_scope: scope.id })
         end
 
         it "lists active process belonging to that scope" do
@@ -551,7 +560,7 @@
     context "when filtering processes by area" do
       context "and choosing a area" do
         before do
-          visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group, filter: { area_id: area.id })
+          visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group, filter: { with_area: area.id })
         end
 
         it "lists active process belonging to that area" do
diff --git a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
index ec9e7e38d157b..545db7da89b45 100644
--- a/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_processes_spec.rb
@@ -8,12 +8,13 @@
   let(:show_metrics) { true }
   let(:show_statistics) { true }
   let(:hashtag) { true }
+  let(:base_description) { { en: "Description", ca: "Descripció", es: "Descripción" } }
   let(:base_process) do
     create(
       :participatory_process,
       :active,
       organization: organization,
-      description: { en: "Description", ca: "Descripció", es: "Descripción" },
+      description: base_description,
       short_description: { en: "Short description", ca: "Descripció curta", es: "Descripción corta" },
       show_metrics: show_metrics,
       show_statistics: show_statistics
@@ -482,6 +483,8 @@
             expect(page).to have_no_content(translated(private_assembly.title))
           end
         end
+
+        it_behaves_like "has embedded video in description", :base_description
       end
     end
   end
diff --git a/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb b/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
index b97d1792f456d..becb5d69ce3e5 100644
--- a/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
+++ b/decidim-participatory_processes/spec/system/private_participatory_processes_spec.rb
@@ -9,12 +9,12 @@
   let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
   let!(:user) { create :user, :confirmed, organization: organization }
   let!(:other_user) { create :user, :confirmed, organization: organization }
-  let!(:other_user_2) { create :user, :confirmed, organization: organization }
+  let!(:other_user2) { create :user, :confirmed, organization: organization }
   let!(:participatory_space_private_user) { create :participatory_space_private_user, user: other_user, privatable_to: private_participatory_process }
-  let!(:participatory_space_private_user_2) { create :participatory_space_private_user, user: other_user_2, privatable_to: private_participatory_process }
+  let!(:participatory_space_private_user2) { create :participatory_space_private_user, user: other_user2, privatable_to: private_participatory_process }
 
   context "when there are private participatory processes" do
-    context "and no user is loged in" do
+    context "and no user is logged in" do
       before do
         switch_to_host(organization.host)
         visit decidim_participatory_processes.participatory_processes_path
@@ -34,7 +34,7 @@
       end
     end
 
-    context "when user is loged in and is not a participatory space private user" do
+    context "when user is logged in and is not a participatory space private user" do
       before do
         switch_to_host(organization.host)
         login_as user, scope: :user
@@ -72,10 +72,17 @@
             expect(page).to have_selector(".card", count: 2)
           end
         end
+
+        it "shows the privacy warning in attachments admin" do
+          visit decidim_admin_participatory_processes.participatory_process_attachments_path(private_participatory_process)
+          within "#attachments" do
+            expect(page).to have_content("Any participant could share this document to others")
+          end
+        end
       end
     end
 
-    context "when user is loged in and is participatory space private user" do
+    context "when user is logged in and is participatory space private user" do
       before do
         switch_to_host(organization.host)
         login_as other_user, scope: :user
diff --git a/decidim-participatory_processes/spec/types/integration_schema_spec.rb b/decidim-participatory_processes/spec/types/integration_schema_spec.rb
index 1c4153893e9e7..8a225fb7c9749 100644
--- a/decidim-participatory_processes/spec/types/integration_schema_spec.rb
+++ b/decidim-participatory_processes/spec/types/integration_schema_spec.rb
@@ -152,11 +152,14 @@
   let!(:participatory_process_response) do
     {
       "announcement" => {
-        "locales" => participatory_process.announcement.keys.sort,
+        "locales" => (
+          participatory_process.announcement.keys.excluding("machine_translations") +
+          participatory_process.announcement["machine_translations"].keys
+        ).sort,
         "translation" => participatory_process.announcement[locale]
       },
       "attachments" => [],
-      "bannerImage" => participatory_process.attached_uploader(:banner_image).path.sub(Rails.root.join("public").to_s, ""),
+      "bannerImage" => participatory_process.attached_uploader(:banner_image).path.sub(Rails.public_path.to_s, ""),
       "categories" => [],
       "components" => components,
       "createdAt" => participatory_process.created_at.iso8601.to_s.gsub("Z", "+00:00"),
@@ -164,7 +167,7 @@
       "developerGroup" => { "translation" => participatory_process.developer_group[locale] },
       "endDate" => participatory_process.end_date.to_s,
       "hashtag" => "",
-      "heroImage" => participatory_process.attached_uploader(:hero_image).path.sub(Rails.root.join("public").to_s, ""),
+      "heroImage" => participatory_process.attached_uploader(:hero_image).path.sub(Rails.public_path.to_s, ""),
       "id" => participatory_process.id.to_s,
       "linkedParticipatorySpaces" => [],
       "localArea" => { "translation" => participatory_process.local_area[locale] },
diff --git a/decidim-participatory_processes/spec/types/participatory_process_step_type_spec.rb b/decidim-participatory_processes/spec/types/participatory_process_step_type_spec.rb
index 7c7d34380f65b..392ce9bb71c40 100644
--- a/decidim-participatory_processes/spec/types/participatory_process_step_type_spec.rb
+++ b/decidim-participatory_processes/spec/types/participatory_process_step_type_spec.rb
@@ -36,7 +36,8 @@ module ParticipatoryProcesses
         let(:query) { '{ title { locales translation(locale:"en") } }' }
 
         it "returns its title" do
-          expect(response["title"]["locales"]).to include(*model.title.keys)
+          expected_keys = (model.description.keys.excluding("machine_translations") + model.description["machine_translations"].keys).sort
+          expect(response["title"]["locales"]).to include(*expected_keys)
           expect(response["title"]["translation"]).to eq(model.title["en"])
         end
       end
@@ -45,7 +46,8 @@ module ParticipatoryProcesses
         let(:query) { '{ description { locales translation(locale:"en") } }' }
 
         it "returns its description" do
-          expect(response["description"]["locales"]).to include(*model.description.keys)
+          expected_keys = (model.description.keys.excluding("machine_translations") + model.description["machine_translations"].keys).sort
+          expect(response["description"]["locales"]).to include(*expected_keys)
           expect(response["description"]["translation"]).to eq(model.description["en"])
         end
       end
diff --git a/decidim-proposals/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb b/decidim-proposals/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb
index 79959bba28204..47f404f985e89 100644
--- a/decidim-proposals/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb
+++ b/decidim-proposals/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb
@@ -19,7 +19,7 @@ def show
       def proposals
         @proposals ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
                                                    .where(component: model)
-                                                   .order_randomly(rand * 2 - 1)
+                                                   .order_randomly((rand * 2) - 1)
       end
 
       def proposals_to_render
@@ -29,6 +29,14 @@ def proposals_to_render
       def proposals_count
         @proposals_count ||= proposals.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/proposals/highlighted_proposals_for_component"
+        hash << proposals.cache_key_with_version
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end
diff --git a/decidim-proposals/app/cells/decidim/proposals/proposal_m_cell.rb b/decidim-proposals/app/cells/decidim/proposals/proposal_m_cell.rb
index 07097c62f212e..88abd9f106f3e 100644
--- a/decidim-proposals/app/cells/decidim/proposals/proposal_m_cell.rb
+++ b/decidim-proposals/app/cells/decidim/proposals/proposal_m_cell.rb
@@ -57,13 +57,11 @@ def badge_classes
       end
 
       def base_statuses
-        @base_statuses ||= begin
-          if endorsements_visible?
-            [:endorsements_count, :comments_count]
-          else
-            [:comments_count]
-          end
-        end
+        @base_statuses ||= if endorsements_visible?
+                             [:endorsements_count, :comments_count]
+                           else
+                             [:comments_count]
+                           end
       end
 
       def statuses
diff --git a/decidim-proposals/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
index bc26718391c97..09c3131736032 100644
--- a/decidim-proposals/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic to accept a user request to
     # contribute to a collaborative draft.
-    class AcceptAccessToCollaborativeDraft < Rectify::Command
+    class AcceptAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb
index 8b2e00127c987..745765bf794b3 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/answer_proposal.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin answers a proposal.
-      class AnswerProposal < Rectify::Command
+      class AnswerProposal < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb b/decidim-proposals/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
index 3f0586c2dbbce..105857d829508 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic to assign proposals to a given
       # valuator.
-      class AssignProposalsToValuator < Rectify::Command
+      class AssignProposalsToValuator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb
index 949fa6cb3cddb..3653b8435c7f8 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when a user creates a new proposal.
-      class CreateProposal < Rectify::Command
+      class CreateProposal < Decidim::Command
         include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
@@ -37,12 +37,13 @@ def call
 
           transaction do
             create_proposal
-            create_attachment if process_attachments?
             create_gallery if process_gallery?
+            create_attachment(weight: first_attachment_weight) if process_attachments?
             link_author_meeeting if form.created_in_meeting?
-            send_notification
           end
 
+          send_notification
+
           broadcast(:ok, proposal)
         end
 
@@ -81,16 +82,24 @@ def link_author_meeeting
         end
 
         def send_notification
+          return unless proposal
+
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",
             event_class: Decidim::Proposals::PublishProposalEvent,
             resource: proposal,
-            followers: @proposal.participatory_space.followers,
+            followers: proposal.participatory_space.followers,
             extra: {
               participatory_space: true
             }
           )
         end
+
+        def first_attachment_weight
+          return 1 if proposal.photos.count.zero?
+
+          proposal.photos.count
+        end
       end
     end
   end
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal_note.rb b/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal_note.rb
index 88f4af93f1983..a48cb8b1714a9 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal_note.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/create_proposal_note.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin creates a private note proposal.
-      class CreateProposalNote < Rectify::Command
+      class CreateProposalNote < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -59,7 +59,7 @@ def notify_admins_and_valuators
             affected_users: affected_users
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/discard_participatory_text.rb b/decidim-proposals/app/commands/decidim/proposals/admin/discard_participatory_text.rb
index 37dd4f0f13f0b..08ce2cc3f53a9 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/discard_participatory_text.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/discard_participatory_text.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic related with an admin discarding participatory text proposals.
-      class DiscardParticipatoryText < Rectify::Command
+      class DiscardParticipatoryText < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A PreviewParticipatoryTextForm form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/import_participatory_text.rb b/decidim-proposals/app/commands/decidim/proposals/admin/import_participatory_text.rb
index c26265e0fda51..c7ffe7e784aa3 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/import_participatory_text.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/import_participatory_text.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # a participatory text.
-      class ImportParticipatoryText < Rectify::Command
+      class ImportParticipatoryText < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/import_proposals.rb b/decidim-proposals/app/commands/decidim/proposals/admin/import_proposals.rb
index 3dc06e7dd5a8a..96d83011c450a 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/import_proposals.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/import_proposals.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # one component to another.
-      class ImportProposals < Rectify::Command
+      class ImportProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/merge_proposals.rb b/decidim-proposals/app/commands/decidim/proposals/admin/merge_proposals.rb
index 5c0b1ee136dec..c2632bae01c2d 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/merge_proposals.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/merge_proposals.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic when an admin merges proposals from
       # one component to another.
-      class MergeProposals < Rectify::Command
+      class MergeProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/notify_proposal_answer.rb b/decidim-proposals/app/commands/decidim/proposals/admin/notify_proposal_answer.rb
index 5acb2f3f08f7d..c036568d53bdb 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/notify_proposal_answer.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/notify_proposal_answer.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command to notify about the change of the published state for a proposal.
-      class NotifyProposalAnswer < Rectify::Command
+      class NotifyProposalAnswer < Decidim::Command
         # Public: Initializes the command.
         #
         # proposal - The proposal to write the answer for.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/publish_answers.rb b/decidim-proposals/app/commands/decidim/proposals/admin/publish_answers.rb
index 79edeaa57b676..72eeb7e7c56cb 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/publish_answers.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/publish_answers.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic to publish many answers at once.
-      class PublishAnswers < Rectify::Command
+      class PublishAnswers < Decidim::Command
         # Public: Initializes the command.
         #
         # component - The component that contains the answers.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/split_proposals.rb b/decidim-proposals/app/commands/decidim/proposals/admin/split_proposals.rb
index 6197c7db82652..aa1a307e04baa 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/split_proposals.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/split_proposals.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic when an admin splits proposals from
       # one component to another.
-      class SplitProposals < Rectify::Command
+      class SplitProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb b/decidim-proposals/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
index 824daec662980..8b6cd31543074 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
@@ -5,7 +5,7 @@ module Proposals
     module Admin
       # A command with all the business logic to unassign proposals from a given
       # valuator.
-      class UnassignProposalsFromValuator < Rectify::Command
+      class UnassignProposalsFromValuator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/update_participatory_text.rb b/decidim-proposals/app/commands/decidim/proposals/admin/update_participatory_text.rb
index 6780cfdef9848..088fadef4020a 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/update_participatory_text.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/update_participatory_text.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin updates participatory text proposals.
-      class UpdateParticipatoryText < Rectify::Command
+      class UpdateParticipatoryText < Decidim::Command
         include Decidim::TranslatableAttributes
 
         # Public: Initializes the command.
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
index 87fb3ac7e21b5..724008409670d 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when a user updates a proposal.
-      class UpdateProposal < Rectify::Command
+      class UpdateProposal < Decidim::Command
         include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
@@ -45,8 +45,8 @@ def call
           transaction do
             update_proposal
             update_proposal_author
-            create_attachment if process_attachments?
             create_gallery if process_gallery?
+            create_attachment(weight: first_attachment_weight) if process_attachments?
             photo_cleanup!
           end
 
@@ -80,6 +80,12 @@ def update_proposal_author
           proposal.save!
           proposal
         end
+
+        def first_attachment_weight
+          return 1 if proposal.photos.count.zero?
+
+          proposal.photos.count
+        end
       end
     end
   end
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_category.rb b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_category.rb
index 6a1f8094e3ac6..d7dbb3c9cb136 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_category.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_category.rb
@@ -4,7 +4,9 @@ module Decidim
   module Proposals
     module Admin
       #  A command with all the business logic when an admin batch updates proposals category.
-      class UpdateProposalCategory < Rectify::Command
+      class UpdateProposalCategory < Decidim::Command
+        include TranslatableAttributes
+
         # Public: Initializes the command.
         #
         # category_id - the category id to update
@@ -33,13 +35,13 @@ def call
           @response[:category_name] = @category.translated_name
           Proposal.where(id: @proposal_ids).find_each do |proposal|
             if @category == proposal.category
-              @response[:errored] << proposal.title
+              @response[:errored] << translated_attribute(proposal.title)
             else
               transaction do
                 update_proposal_category proposal
                 notify_author proposal if proposal.coauthorships.any?
               end
-              @response[:successful] << proposal.title
+              @response[:successful] << translated_attribute(proposal.title)
             end
           end
 
diff --git a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_scope.rb b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_scope.rb
index 75d0bb5486e17..acdde8435cdf8 100644
--- a/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_scope.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/admin/update_proposal_scope.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       #  A command with all the business logic when an admin batch updates proposals scope.
-      class UpdateProposalScope < Rectify::Command
+      class UpdateProposalScope < Decidim::Command
         include TranslatableAttributes
         # Public: Initializes the command.
         #
@@ -44,13 +44,13 @@ def update_proposals_scope
           @response[:scope_name] = translated_attribute(scope.name, scope.organization)
           Proposal.where(id: proposal_ids).find_each do |proposal|
             if scope == proposal.scope
-              @response[:errored] << proposal.title
+              @response[:errored] << translated_attribute(proposal.title)
             else
               transaction do
                 update_proposal_scope proposal
                 notify_author proposal if proposal.coauthorships.any?
               end
-              @response[:successful] << proposal.title
+              @response[:successful] << translated_attribute(proposal.title)
             end
           end
         end
diff --git a/decidim-proposals/app/commands/decidim/proposals/create_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/create_collaborative_draft.rb
index 300707dca1236..ac275a5fc92a9 100644
--- a/decidim-proposals/app/commands/decidim/proposals/create_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/create_collaborative_draft.rb
@@ -3,8 +3,8 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new collaborative draft.
-    class CreateCollaborativeDraft < Rectify::Command
-      include ::Decidim::AttachmentMethods
+    class CreateCollaborativeDraft < Decidim::Command
+      include ::Decidim::MultipleAttachmentsMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -27,13 +27,13 @@ def call
         return broadcast(:invalid) if form.invalid?
 
         if process_attachments?
-          build_attachment
-          return broadcast(:invalid) if attachment_invalid?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
         end
 
         transaction do
           create_collaborative_draft
-          create_attachment if process_attachments?
+          create_attachments if process_attachments?
         end
 
         broadcast(:ok, collaborative_draft)
diff --git a/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
index 874d30e554398..79d91c18f45de 100644
--- a/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
-    class CreateProposal < Rectify::Command
+    class CreateProposal < Decidim::Command
       include ::Decidim::AttachmentMethods
       include HashtagsMethods
 
diff --git a/decidim-proposals/app/commands/decidim/proposals/destroy_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/destroy_proposal.rb
index 00f5dff511904..63264fe1e9183 100644
--- a/decidim-proposals/app/commands/decidim/proposals/destroy_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/destroy_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user destroys a draft proposal.
-    class DestroyProposal < Rectify::Command
+    class DestroyProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to destroy.
diff --git a/decidim-proposals/app/commands/decidim/proposals/publish_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/publish_collaborative_draft.rb
index 26e3c9f51b272..bdbfa272787ea 100644
--- a/decidim-proposals/app/commands/decidim/proposals/publish_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/publish_collaborative_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user publishes a collaborative_draft.
-    class PublishCollaborativeDraft < Rectify::Command
+    class PublishCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # collaborative_draft - The collaborative_draft to publish.
diff --git a/decidim-proposals/app/commands/decidim/proposals/publish_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/publish_proposal.rb
index 2363fa644e693..c7a4e049a0968 100644
--- a/decidim-proposals/app/commands/decidim/proposals/publish_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/publish_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user publishes a draft proposal.
-    class PublishProposal < Rectify::Command
+    class PublishProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to publish.
diff --git a/decidim-proposals/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb
index 4a23fc291a8bd..77a0234559d51 100644
--- a/decidim-proposals/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic to reject a user request to
     # contribute to a collaborative draft.
-    class RejectAccessToCollaborativeDraft < Rectify::Command
+    class RejectAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb
index fcfea4682119d..a8ff1ad96b8ea 100644
--- a/decidim-proposals/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb
@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user requests access
     # to edit a collaborative draft.
-    class RequestAccessToCollaborativeDraft < Rectify::Command
+    class RequestAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
diff --git a/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
index 9034bf578ce25..077d70d9fabd3 100644
--- a/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user unvotes a proposal.
-    class UnvoteProposal < Rectify::Command
+    class UnvoteProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - A Decidim::Proposals::Proposal object.
diff --git a/decidim-proposals/app/commands/decidim/proposals/update_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/update_collaborative_draft.rb
index 5e592dfb2ea19..fe7873accd1a5 100644
--- a/decidim-proposals/app/commands/decidim/proposals/update_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/update_collaborative_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user updates a collaborative_draft.
-    class UpdateCollaborativeDraft < Rectify::Command
+    class UpdateCollaborativeDraft < Decidim::Command
       include HashtagsMethods
 
       # Public: Initializes the command.
diff --git a/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
index 3c71d7bdc5365..b28619ecb7907 100644
--- a/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/update_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user updates a proposal.
-    class UpdateProposal < Rectify::Command
+    class UpdateProposal < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
       include GalleryMethods
       include HashtagsMethods
@@ -50,7 +50,7 @@ def call
           document_cleanup!
 
           create_gallery if process_gallery?
-          create_attachments if process_attachments?
+          create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end
 
         broadcast(:ok, proposal)
@@ -116,6 +116,12 @@ def proposal_limit_reached?
         end
       end
 
+      def first_attachment_weight
+        return 1 if proposal.photos.count.zero?
+
+        proposal.photos.count
+      end
+
       def user_group
         @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
       end
diff --git a/decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb
index 46886f009d23b..f461a3dfffee8 100644
--- a/decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user votes a proposal.
-    class VoteProposal < Rectify::Command
+    class VoteProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - A Decidim::Proposals::Proposal object.
diff --git a/decidim-proposals/app/commands/decidim/proposals/withdraw_collaborative_draft.rb b/decidim-proposals/app/commands/decidim/proposals/withdraw_collaborative_draft.rb
index 39d7889f003bf..0ecb74c2ea20b 100644
--- a/decidim-proposals/app/commands/decidim/proposals/withdraw_collaborative_draft.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/withdraw_collaborative_draft.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user withdraws a collaborative_draft.
-    class WithdrawCollaborativeDraft < Rectify::Command
+    class WithdrawCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # collaborative_draft     - The collaborative_draft to withdraw.
diff --git a/decidim-proposals/app/commands/decidim/proposals/withdraw_proposal.rb b/decidim-proposals/app/commands/decidim/proposals/withdraw_proposal.rb
index 9385a16a39b31..0422146d700b9 100644
--- a/decidim-proposals/app/commands/decidim/proposals/withdraw_proposal.rb
+++ b/decidim-proposals/app/commands/decidim/proposals/withdraw_proposal.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user withdraws a new proposal.
-    class WithdrawProposal < Rectify::Command
+    class WithdrawProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to withdraw.
diff --git a/decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb b/decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb
index 3a35f2c2f2c22..b31919137b8b2 100644
--- a/decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb
+++ b/decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb
@@ -30,12 +30,14 @@ def possible_orders
         end
 
         def default_order
-          @default_order ||= begin
-            default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
-            return order_by_default if default_order == "default"
+          @default_order ||= fetch_default_order
+        end
 
-            possible_orders.include?(default_order) ? default_order : order_by_default
-          end
+        def fetch_default_order
+          default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
+          return order_by_default if default_order == "default"
+
+          possible_orders.include?(default_order) ? default_order : order_by_default
         end
 
         def order_by_default
diff --git a/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb
index acbce933887e7..b9cbc94e3da9c 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb
@@ -65,9 +65,10 @@ def update_category
               flash.now[:notice] = update_proposals_bulk_response_successful(@response, :category)
               flash.now[:alert] = update_proposals_bulk_response_errored(@response, :category)
             end
-            respond_to do |format|
-              format.js
-            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
           end
         end
 
@@ -114,10 +115,9 @@ def update_scope
               flash.now[:notice] = update_proposals_bulk_response_successful(@response, :scope)
               flash.now[:alert] = update_proposals_bulk_response_errored(@response, :scope)
             end
-
-            respond_to do |format|
-              format.js
-            end
+          end
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
           end
         end
 
diff --git a/decidim-proposals/app/controllers/decidim/proposals/collaborative_drafts_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/collaborative_drafts_controller.rb
index 3ec6a3b103d52..de35d2eb35a58 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/collaborative_drafts_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/collaborative_drafts_controller.rb
@@ -25,7 +25,7 @@ class CollaborativeDraftsController < Decidim::Proposals::ApplicationController
 
       def index
         @collaborative_drafts = search
-                                .results
+                                .result
                                 .not_hidden
                                 .includes(:category)
                                 .includes(:scope)
@@ -134,19 +134,19 @@ def retrieve_collaborative_draft
       end
 
       def geocoded_collaborative_draft
-        @geocoded_collaborative_draft ||= search.results.not_hidden.select(&:geocoded_and_valid?)
+        @geocoded_collaborative_draft ||= search.result.not_hidden.select(&:geocoded_and_valid?)
       end
 
-      def search_klass
-        CollaborativeDraftSearch
+      def search_collection
+        CollaborativeDraft.where(component: current_component).not_hidden
       end
 
       def default_filter_params
         {
-          search_text: "",
-          category_id: default_filter_category_params,
-          state: %w(open),
-          scope_id: default_filter_scope_params,
+          search_text_cont: "",
+          with_any_category: default_filter_category_params,
+          with_any_state: %w(open),
+          with_any_scope: default_filter_scope_params,
           related_to: ""
         }
       end
diff --git a/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb
index 67d3030798723..20900fd8e9998 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb
@@ -5,7 +5,7 @@ module Proposals
     # Exposes the proposal vote resource so users can vote proposals.
     class ProposalVotesController < Decidim::Proposals::ApplicationController
       include ProposalVotesHelper
-      include Rectify::ControllerHelpers
+      include Decidim::ControllerHelpers
 
       helper_method :proposal
 
diff --git a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
index 84e011ae544f8..7acd0bb72ed2b 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
@@ -25,6 +25,13 @@ class ProposalsController < Decidim::Proposals::ApplicationController
 
       before_action :set_participatory_text
 
+      # rubocop:disable Naming/VariableNumber
+      STEP1 = :step_1
+      STEP2 = :step_2
+      STEP3 = :step_3
+      STEP4 = :step_4
+      # rubocop:enable Naming/VariableNumber
+
       def index
         if component_settings.participatory_texts_enabled?
           @proposals = Decidim::Proposals::Proposal
@@ -37,7 +44,7 @@ def index
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
           @base_query = search
-                        .results
+                        .result
                         .published
                         .not_hidden
 
@@ -63,7 +70,7 @@ def show
 
       def new
         enforce_permission_to :create, :proposal
-        @step = :step_1
+        @step = STEP1
         if proposal_draft.present?
           redirect_to edit_draft_proposal_path(proposal_draft, component_id: proposal_draft.component.id, question_slug: proposal_draft.component.participatory_space.slug)
         else
@@ -73,7 +80,7 @@ def new
 
       def create
         enforce_permission_to :create, :proposal
-        @step = :step_1
+        @step = STEP1
         @form = form(ProposalWizardCreateStepForm).from_params(proposal_creation_params)
 
         CreateProposal.call(@form, current_user) do
@@ -92,7 +99,7 @@ def create
 
       def compare
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_2
+        @step = STEP2
         @similar_proposals ||= Decidim::Proposals::SimilarProposals
                                .for(current_component, @proposal)
                                .all
@@ -105,7 +112,7 @@ def compare
 
       def complete
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_3
+        @step = STEP3
 
         @form = form_proposal_model
 
@@ -114,13 +121,13 @@ def complete
 
       def preview
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_4
+        @step = STEP4
         @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = :step_4
+        @step = STEP4
         PublishProposal.call(@proposal, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("proposals.publish.success", scope: "decidim")
@@ -135,12 +142,12 @@ def publish
       end
 
       def edit_draft
-        @step = :step_3
+        @step = STEP3
         enforce_permission_to :edit, :proposal, proposal: @proposal
       end
 
       def update_draft
-        @step = :step_1
+        @step = STEP1
         enforce_permission_to :edit, :proposal, proposal: @proposal
 
         @form = form_proposal_params
@@ -211,25 +218,25 @@ def withdraw
 
       private
 
-      def search_klass
-        ProposalSearch
+      def search_collection
+        Proposal.where(component: current_component).published.not_hidden.with_availability(params[:filter].try(:[], :with_availability))
       end
 
       def default_filter_params
         {
-          search_text: "",
-          origin: default_filter_origin_params,
+          search_text_cont: "",
+          with_any_origin: default_filter_origin_params,
           activity: "all",
-          category_id: default_filter_category_params,
-          state: %w(accepted evaluating state_not_published),
-          scope_id: default_filter_scope_params,
+          with_any_category: default_filter_category_params,
+          with_any_state: %w(accepted evaluating state_not_published),
+          with_any_scope: default_filter_scope_params,
           related_to: "",
           type: "all"
         }
       end
 
       def default_filter_origin_params
-        filter_origin_params = %w(citizens meeting)
+        filter_origin_params = %w(participants meeting)
         filter_origin_params << "official" if component_settings.official_proposals_enabled
         filter_origin_params << "user_group" if current_organization.user_groups_enabled?
         filter_origin_params
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/import_participatory_text_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/import_participatory_text_form.rb
index ea909961bd94c..d678f9e45f49f 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/import_participatory_text_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/import_participatory_text_form.rb
@@ -15,7 +15,7 @@ class ImportParticipatoryTextForm < Decidim::Form
 
         translatable_attribute :title, String
         translatable_attribute :description, String
-        attribute :document
+        attribute :document, Decidim::Attributes::Blob
 
         validates :title, translatable_presence: true
         validates :document, presence: true, if: :new_participatory_text?
@@ -44,9 +44,9 @@ def document_type
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.participatory_text.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text
@@ -60,7 +60,7 @@ def default_locale
         end
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
       end
     end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_base_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_base_form.rb
index 73453b6e78e29..393ff5d6a18a6 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_base_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_base_form.rb
@@ -57,14 +57,14 @@ def category
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the proposal
         def scope_id
-          @scope_id || scope&.id
+          super || scope&.id
         end
 
         def geocoding_enabled?
@@ -101,7 +101,7 @@ def extra_hashtags
         end
 
         def suggested_hashtags
-          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+          downcased_suggested_hashtags = super.map(&:downcase).to_set
           component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
         end
 
@@ -129,7 +129,7 @@ def notify_missing_attachment_if_errored
         end
 
         def ordered_hashtag_list(string)
-          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+          string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
         end
       end
     end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
index 9dc00fd5e7588..dfd8610717bd4 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb
@@ -5,6 +5,8 @@ module Proposals
     module Admin
       # A form object to be used when admin users want to create a proposal.
       class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
+        include Decidim::HasUploadValidations
+
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_fork_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_fork_form.rb
index 7001dec134967..8ecb55d3351e1 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_fork_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_fork_form.rb
@@ -7,7 +7,7 @@ module Admin
       class ProposalsForkForm < Decidim::Form
         mimic :proposals_import
 
-        attribute :target_component_id, Integer
+        attribute :target_component_id, Array[Integer]
         attribute :proposal_ids, Array
 
         validates :target_component, :proposals, :current_component, presence: true
@@ -55,7 +55,7 @@ def same_participatory_space
         #
         # We receive this as ["id"] since it's from a select in a form.
         def clean_target_component_id
-          target_component_id.first.to_i
+          target_component_id.first
         end
       end
     end
diff --git a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
index 4807be757e723..dddfef0f89c62 100644
--- a/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/admin/proposals_import_form.rb
@@ -31,7 +31,7 @@ def states_collection
         end
 
         def states
-          super.reject(&:blank?)
+          super.compact_blank
         end
 
         def scopes
diff --git a/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb b/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
index 28f0803acff11..ff267db180c52 100644
--- a/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb
@@ -6,6 +6,7 @@ module Proposals
     class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
       include Decidim::TranslatableAttributes
       include Decidim::AttachmentAttributes
+      include Decidim::HasUploadValidations
 
       mimic :proposal
 
@@ -41,6 +42,12 @@ def map_model(model)
         self.scope_id = model.scope.id if model.scope
 
         self.has_address = true if model.address.present?
+
+        # Proposals have the "photos" field reserved for the proposal card image
+        # so we don't want to show all photos there. Instead, only show the
+        # first photo.
+        self.photos = [model.photo].compact.select { |p| p.weight.zero? }
+        self.documents = model.attachments - photos
       end
 
       # Finds the Category from the category_id.
@@ -54,14 +61,14 @@ def category
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
+        @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the proposal
       def scope_id
-        @scope_id || scope&.id
+        super || scope&.id
       end
 
       def geocoding_enabled?
@@ -89,7 +96,7 @@ def extra_hashtags
       end
 
       def suggested_hashtags
-        downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+        downcased_suggested_hashtags = super.map(&:downcase).to_set
         component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
       end
 
@@ -119,7 +126,7 @@ def notify_missing_attachment_if_errored
       end
 
       def ordered_hashtag_list(string)
-        string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+        string.to_s.split.compact_blank.uniq.sort_by(&:parameterize)
       end
     end
   end
diff --git a/decidim-proposals/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb b/decidim-proposals/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
index 27072d45d5db1..64b9556b6d444 100644
--- a/decidim-proposals/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
+++ b/decidim-proposals/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
@@ -23,6 +23,9 @@ class ProposalWizardCreateStepForm < Decidim::Form
       alias component current_component
 
       def map_model(model)
+        self.title = translated_attribute(model.title)
+        self.body = translated_attribute(model.body)
+
         self.user_group_id = model.user_groups.first&.id
         return unless model.categorization
 
diff --git a/decidim-proposals/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb b/decidim-proposals/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb
index 2224935f432eb..97aa71b1e530e 100644
--- a/decidim-proposals/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb
+++ b/decidim-proposals/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb
@@ -4,6 +4,10 @@ module Decidim
   module Proposals
     module Admin
       module ProposalBulkActionsHelper
+        def proposal_find(id)
+          Decidim::Proposals::Proposal.find(id)
+        end
+
         # Public: Generates a select field with the valuators of the given participatory space.
         #
         # participatory_space - A participatory space instance.
diff --git a/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb b/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb
index 2278f0b08f3d3..b6bfce774272e 100644
--- a/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb
+++ b/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb
@@ -40,12 +40,10 @@ def proposal_state_css_class(proposal)
         case state
         when "accepted"
           "text-success"
-        when "rejected"
+        when "rejected", "withdrawn"
           "text-alert"
         when "evaluating"
           "text-warning"
-        when "withdrawn"
-          "text-alert"
         else
           "text-info"
         end
@@ -96,13 +94,18 @@ def not_from_participatory_text(proposal)
       # frontend, the proposal body is considered as safe content; that's unless
       # the proposal comes from a collaborative_draft or a participatory_text.
       def safe_content?
-        rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal) ||
-          (@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal)
+        (rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal)) ||
+          ((@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal))
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_proposal_body(proposal)
-        Decidim::ContentProcessor.render(render_sanitized_content(proposal, :body), "div")
+        sanitized = render_sanitized_content(proposal, :body)
+        if safe_content?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
       end
 
       # Returns :text_area or :editor based on the organization' settings.
@@ -172,7 +175,7 @@ def activity_filter_values
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.proposals.application_helper.filter_origin_values.official")) if component_settings.official_proposals_enabled
-        origin_values << TreePoint.new("citizens", t("decidim.proposals.application_helper.filter_origin_values.citizens"))
+        origin_values << TreePoint.new("participants", t("decidim.proposals.application_helper.filter_origin_values.participants"))
         origin_values << TreePoint.new("user_group", t("decidim.proposals.application_helper.filter_origin_values.user_groups")) if current_organization.user_groups_enabled?
         origin_values << TreePoint.new("meeting", t("decidim.proposals.application_helper.filter_origin_values.meetings"))
 
diff --git a/decidim-proposals/app/helpers/decidim/proposals/proposal_cells_helper.rb b/decidim-proposals/app/helpers/decidim/proposals/proposal_cells_helper.rb
index b0c9d6510a4d1..b2b7cb3e3aa77 100644
--- a/decidim-proposals/app/helpers/decidim/proposals/proposal_cells_helper.rb
+++ b/decidim-proposals/app/helpers/decidim/proposals/proposal_cells_helper.rb
@@ -60,12 +60,10 @@ def state_classes
         case state
         when "accepted"
           ["success"]
-        when "rejected"
+        when "rejected", "withdrawn"
           ["alert"]
         when "evaluating"
           ["warning"]
-        when "withdrawn"
-          ["alert"]
         else
           ["muted"]
         end
diff --git a/decidim-proposals/app/helpers/decidim/proposals/proposal_wizard_helper.rb b/decidim-proposals/app/helpers/decidim/proposals/proposal_wizard_helper.rb
index b12b2bc401393..918d583cf3b87 100644
--- a/decidim-proposals/app/helpers/decidim/proposals/proposal_wizard_helper.rb
+++ b/decidim-proposals/app/helpers/decidim/proposals/proposal_wizard_helper.rb
@@ -73,10 +73,10 @@ def proposal_wizard_stepper_step(step, current_step)
       def proposal_wizard_stepper(current_step)
         content_tag :ol, class: "wizard__steps" do
           %(
-            #{proposal_wizard_stepper_step(:step_1, current_step)}
-            #{proposal_wizard_stepper_step(:step_2, current_step)}
-            #{proposal_wizard_stepper_step(:step_3, current_step)}
-            #{proposal_wizard_stepper_step(:step_4, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP1, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP2, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP3, current_step)}
+            #{proposal_wizard_stepper_step(ProposalsController::STEP4, current_step)}
           ).html_safe
         end
       end
@@ -120,11 +120,11 @@ def wizard_aside_info_text
       # Renders the back link except for step_2: compare
       def proposal_wizard_aside_link_to_back(step)
         case step
-        when :step_1
+        when ProposalsController::STEP1
           proposals_path
-        when :step_3
+        when ProposalsController::STEP3
           compare_proposal_path
-        when :step_4
+        when ProposalsController::STEP4
           edit_draft_proposal_path
         end
       end
diff --git a/decidim-proposals/app/models/decidim/proposals/collaborative_draft.rb b/decidim-proposals/app/models/decidim/proposals/collaborative_draft.rb
index 5f7ec33fdc670..8f63b67001a79 100644
--- a/decidim-proposals/app/models/decidim/proposals/collaborative_draft.rb
+++ b/decidim-proposals/app/models/decidim/proposals/collaborative_draft.rb
@@ -16,6 +16,7 @@ class CollaborativeDraft < Proposals::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Randomable
+      include Decidim::FilterableResource
 
       has_many :collaborator_requests,
                class_name: "Decidim::Proposals::CollaborativeDraftCollaboratorRequest",
@@ -35,6 +36,8 @@ class CollaborativeDraft < Proposals::ApplicationRecord
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :published, -> { where(state: "published") }
 
+      scope_search_multi :with_any_state, [:open, :published, :withdrawn]
+
       # Checks whether the user can edit the given proposal.
       #
       # user - the user to check for authorship
@@ -68,6 +71,13 @@ def reported_attributes
       def reported_searchable_content_extras
         [authors.map(&:name).join("\n")]
       end
+
+      # Create the :search_text ransacker alias for searching from both :title or :body.
+      ransacker_text_multi :search_text, [:title, :body]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_state, :related_to, :with_any_scope, :with_any_category]
+      end
     end
   end
 end
diff --git a/decidim-proposals/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb b/decidim-proposals/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
index 12fcd8ae015dd..972f08b3e661c 100644
--- a/decidim-proposals/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
+++ b/decidim-proposals/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
@@ -4,8 +4,6 @@ module Decidim
   module Proposals
     # A collaborative_draft can accept requests to coauthor and contribute
     class CollaborativeDraftCollaboratorRequest < Proposals::ApplicationRecord
-      validates :collaborative_draft, :user, presence: true
-
       belongs_to :collaborative_draft, class_name: "Decidim::Proposals::CollaborativeDraft", foreign_key: :decidim_proposals_collaborative_draft_id
       belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
     end
diff --git a/decidim-proposals/app/models/decidim/proposals/proposal.rb b/decidim-proposals/app/models/decidim/proposals/proposal.rb
index e07f29d1322e8..2a376a7f3ac13 100644
--- a/decidim-proposals/app/models/decidim/proposals/proposal.rb
+++ b/decidim-proposals/app/models/decidim/proposals/proposal.rb
@@ -18,7 +18,7 @@ class Proposal < Proposals::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Fingerprintable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Proposals::ParticipatoryTextSection
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
@@ -27,6 +27,7 @@ class Proposal < Proposals::ApplicationRecord
       include Decidim::Proposals::Valuatable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
+      include Decidim::FilterableResource
 
       translatable_fields :title, :body
 
@@ -67,10 +68,33 @@ class Proposal < Proposals::ApplicationRecord
       scope :except_rejected, -> { where.not(state: "rejected").or(state_not_published) }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :drafts, -> { where(published_at: nil) }
-      scope :except_drafts, -> { where.not(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
       scope :order_by_most_recent, -> { order(created_at: :desc) }
 
+      scope :with_availability, lambda { |state_key|
+        case state_key
+        when "withdrawn"
+          withdrawn
+        else
+          except_withdrawn
+        end
+      }
+
+      scope :with_type, lambda { |type_key, user, component|
+        case type_key
+        when "proposals"
+          only_amendables
+        when "amendments"
+          only_visible_emendations_for(user, component)
+        else # Assume 'all'
+          amendables_and_visible_emendations_for(user, component)
+        end
+      }
+
+      scope :voted_by, lambda { |user|
+        includes(:votes).where(decidim_proposals_proposal_votes: { decidim_author_id: user })
+      }
+
       scope :sort_by_valuation_assignments_count_asc, lambda {
         order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} ASC NULLS FIRST").to_s)
       }
@@ -79,6 +103,8 @@ class Proposal < Proposals::ApplicationRecord
         order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} DESC NULLS LAST").to_s)
       }
 
+      scope_search_multi :with_any_state, [:accepted, :rejected, :evaluating, :state_not_published]
+
       def self.with_valuation_assigned_to(user, space)
         valuator_roles = space.user_roles(:valuator).where(user: user)
 
@@ -103,7 +129,7 @@ def self.log_presenter_class_for(_log)
       end
 
       # Returns a collection scoped by an author.
-      # Overrides this method in DataPortability to support Coauthorable.
+      # Overrides this method in DownloadYourData to support Coauthorable.
       def self.user_collection(author)
         return unless author.is_a?(Decidim::User)
 
@@ -241,8 +267,9 @@ def reported_attributes
       end
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      # Returns authors name or title in case it's a meeting
       def reported_searchable_content_extras
-        [authors.map(&:name).join("\n")]
+        [authors.map { |p| p.respond_to?(:name) ? p.name : p.title }.join("\n")]
       end
 
       # Public: Whether the proposal is official or not.
@@ -252,7 +279,7 @@ def official?
 
       # Public: Whether the proposal is created in a meeting or not.
       def official_meeting?
-        authors.first.class.name == "Decidim::Meetings::Meeting"
+        authors.first.instance_of?(Decidim::Meetings::Meeting)
       end
 
       # Public: The maximum amount of votes allowed for this proposal.
@@ -302,6 +329,10 @@ def draft?
         published_at.nil?
       end
 
+      def self.ransack(params = {}, options = {})
+        ProposalSearch.new(self, params, options)
+      end
+
       # Defines the base query so that ransack can actually sort by this value
       def self.sort_by_valuation_assignments_count_nulls_last_query
         <<-SQL.squish
@@ -327,10 +358,18 @@ def self.valuator_role_ids_has(value)
         where(query, value: value)
       end
 
-      def self.ransackable_scopes(_auth = nil)
-        [:valuator_role_ids_has]
+      def self.ransackable_scopes(auth_object = nil)
+        base = [:with_any_origin, :with_any_state, :voted_by, :coauthored_by, :related_to, :with_any_scope, :with_any_category]
+        return base unless auth_object&.admin?
+
+        # Add extra scopes for admins for the admin panel searches
+        base + [:valuator_role_ids_has]
       end
 
+      # Create i18n ransackers for :title and :body.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :body]
+
       ransacker :state_published do
         Arel.sql("CASE
           WHEN EXISTS (
@@ -379,7 +418,7 @@ def self.export_serializer
         Decidim::Proposals::ProposalSerializer
       end
 
-      def self.data_portability_images(user)
+      def self.download_your_data_images(user)
         user_collection(user).map { |p| p.attachments.collect(&:file) }
       end
 
diff --git a/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb b/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb
index 201faea9cd0fe..5b707b72974e1 100644
--- a/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb
+++ b/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A class used to find proposals filtered by components and a date range
-    class FilteredProposals < Rectify::Query
+    class FilteredProposals < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component
diff --git a/decidim-proposals/app/queries/decidim/proposals/similar_proposals.rb b/decidim-proposals/app/queries/decidim/proposals/similar_proposals.rb
index bc3c990c58e71..e4583b78be15e 100644
--- a/decidim-proposals/app/queries/decidim/proposals/similar_proposals.rb
+++ b/decidim-proposals/app/queries/decidim/proposals/similar_proposals.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # Class used to retrieve similar proposals.
-    class SimilarProposals < Rectify::Query
+    class SimilarProposals < Decidim::Query
       include Decidim::TranslationsHelper
 
       # Syntactic sugar to initialize the class and return the queried objects.
diff --git a/decidim-proposals/app/services/decidim/proposals/collaborative_draft_search.rb b/decidim-proposals/app/services/decidim/proposals/collaborative_draft_search.rb
deleted file mode 100644
index d2d414e5b0dec..0000000000000
--- a/decidim-proposals/app/services/decidim/proposals/collaborative_draft_search.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    # A service to encapsualte all the logic when searching and filtering
-    # collaborative drafts in a participatory process.
-    class CollaborativeDraftSearch < ResourceSearch
-      text_search_fields :title, :body
-
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the drafts from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of drafts to return per page.
-      def initialize(options = {})
-        super(CollaborativeDraft.all, options)
-      end
-
-      # Handle the search_text filter
-      #
-      # We can't use the search from `ResourceFilter` since these fields aren't
-      # translated.
-      def search_search_text
-        query
-          .where("title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("body ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the state filter
-      def search_state
-        return query if state.member?("all")
-
-        apply_scopes(%w(open withdrawn published), state)
-      end
-
-      # Filters drafts by the name of the classes they are linked to. By default,
-      # returns all drafts. When a `related_to` param is given, then it camelcases item
-      # to find the real class name and checks the links for the Collaborative Draft.
-      #
-      # The `related_to` param is expected to be in this form:
-      #
-      #   "decidim/meetings/meeting"
-      #
-      # This can be achieved by performing `klass.name.underscore`.
-      #
-      # Returns only those drafts that are linked to the given class name.
-      def search_related_to
-        from = query
-               .joins(:resource_links_from)
-               .where(decidim_resource_links: { to_type: related_to.camelcase })
-
-        to = query
-             .joins(:resource_links_to)
-             .where(decidim_resource_links: { from_type: related_to.camelcase })
-
-        query.where(id: from).or(query.where(id: to))
-      end
-    end
-  end
-end
diff --git a/decidim-proposals/app/services/decidim/proposals/proposal_search.rb b/decidim-proposals/app/services/decidim/proposals/proposal_search.rb
index c48b13ddaeedf..9922af9d9907f 100644
--- a/decidim-proposals/app/services/decidim/proposals/proposal_search.rb
+++ b/decidim-proposals/app/services/decidim/proposals/proposal_search.rb
@@ -2,83 +2,28 @@
 
 module Decidim
   module Proposals
-    # A service to encapsualte all the logic when searching and filtering
-    # proposals in a participatory process.
+    # This service scopes the proposal searches with parameters that cannot be
+    # passed from the user interface.
     class ProposalSearch < ResourceSearch
-      text_search_fields :title, :body
+      attr_reader :type, :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the proposals from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        options[:scope] = options.fetch(:scope, Proposal)
-        options[:scope] = options[:state_withdraw] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        super(options[:scope], options)
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "voted"
-          query
-            .includes(:votes)
-            .where(decidim_proposals_proposal_votes: { decidim_author_id: user })
-        when "my_proposals"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where(decidim_coauthorships: { decidim_author_id: user })
-        else # Assume 'all'
-          query
-        end
-      end
-
-      def search_state_withdraw
-        return query if state_withdraw == "withdrawn"
+      def build(params)
+        return super if search_context == :admin
 
-        query.except_withdrawn
-      end
+        @type = params[:type]
+        @activity = params[:activity]
 
-      # Handle the state filter
-      def search_state
-        apply_scopes(%w(accepted rejected evaluating state_not_published), state)
-      end
-
-      # Handle the amendment type filter
-      def search_type
-        case type
-        when "proposals"
-          query.only_amendables
-        when "amendments"
-          query.only_visible_emendations_for(user, component)
-        else # Assume 'all'
-          query.amendables_and_visible_emendations_for(user, component)
+        if params[:activity] && user
+          case params[:activity]
+          when "voted"
+            add_scope(:voted_by, user)
+          when "my_proposals"
+            add_scope(:coauthored_by, user)
+          end
         end
-      end
-
-      # Filters Proposals by the name of the classes they are linked to. By default,
-      # returns all Proposals. When a `related_to` param is given, then it camelcases item
-      # to find the real class name and checks the links for the Proposals.
-      #
-      # The `related_to` param is expected to be in this form:
-      #
-      #   "decidim/meetings/meeting"
-      #
-      # This can be achieved by performing `klass.name.underscore`.
-      #
-      # Returns only those proposals that are linked to the given class name.
-      def search_related_to
-        from = query
-               .joins(:resource_links_from)
-               .where(decidim_resource_links: { to_type: related_to.camelcase })
-
-        to = query
-             .joins(:resource_links_to)
-             .where(decidim_resource_links: { from_type: related_to.camelcase })
+        add_scope(:with_type, [params[:type], user, component]) if params[:type]
 
-        query.where(id: from).or(query.where(id: to))
+        super
       end
     end
   end
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
index 2f4e61e0ff5dd..304fa5194399c 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb
@@ -83,7 +83,7 @@
             </div>
 
             <div class="row column">
-              <%= form.upload :file, optional: false %>
+              <%= form.upload :file %>
               <% if params[:id].present? %>
                 <% if proposal.documents.present? %>
                   <%= form.hidden_field :id, value: proposal.documents.first.id %>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
index a427f9534882d..8b800f250e0f2 100644
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
@@ -1,4 +1,4 @@
-$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+$("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
new file mode 100644
index 0000000000000..f7ccc689c88f6
--- /dev/null
+++ b/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
@@ -0,0 +1,26 @@
+<% if flash.now[:error].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:alert].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:notice].present? %>
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+  <% proposal_ids.each do |id| %>
+    $(".table-list [data-id='<%= id %>']")
+      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+  <% end %>
+
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $(".js-check-all").prop('checked', false);
+  $(".js-check-all-resources").prop('checked', false);
+  window.hideBulkActionsButton();
+  window.hideBulkActionForms();
+  window.showOtherActionsButtons();
+  window.selectedResourcesCountUpdate();
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_category.js.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_category.js.erb
deleted file mode 100644
index d749876c1f81b..0000000000000
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_category.js.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<% if flash.now[:error].present? %>
-  $("#js-form-recategorize-proposals #category_id").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:alert].present? %>
-  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
-
-  <% proposal_ids.each do |id| %>
-    $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
-  <% end %>
-
-  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
-  $(".js-check-all").prop('checked', false);
-  $(".js-check-all-proposal").prop('checked', false);
-  window.hideBulkActionsButton();
-  window.hideBulkActionForms();
-  window.showOtherActionsButtons();
-  window.selectedProposalsCountUpdate();
-<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_scope.js.erb b/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_scope.js.erb
deleted file mode 100644
index 4e963741ad9f4..0000000000000
--- a/decidim-proposals/app/views/decidim/proposals/admin/proposals/update_scope.js.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% if flash.now[:error].present? %>
-  $("#js-form-scope-change-proposals #scope_id").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:alert].present? %>
-  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
-
-  <% @proposal_ids.each do |id| %>
-    $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
-  <% end %>
-
-  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
-  $(".js-check-all").prop('checked', false);
-  $(".js-check-all-proposal").prop('checked', false);
-
-  window.hideBulkActionForms();
-  window.hideBulkActionsButton();
-  window.showOtherActionsButtons();
-  window.selectedProposalsCountUpdate();
-<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
index eca54e984f19e..ca2a823e29a00 100644
--- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
@@ -63,21 +63,13 @@
 <% if component_settings.attachments_allowed? %>
   <fieldset class="attachments_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-      <div class="field">
-        <%= nested_form.text_field :title %>
-      </div>
-
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
+    <div class="row column">
+      <%= form.attachment :documents,
+        multiple: false,
+        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
+    </div>
   </fieldset>
 <% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb
index 124ec845f8b96..832bfc982cfaa 100644
--- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="collaborative_drafts">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,18 +14,18 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
+  <%= form.check_boxes_tree :with_any_state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
 
   <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/edit.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/edit.html.erb
index d63caae8c023e..5d0da8f474754 100644
--- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/edit.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/edit.html.erb
@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/new.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/new.html.erb
index dc0f0a5fa7822..3cd624ee873b8 100644
--- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/new.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/new.html.erb
@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
index 9254ddc99142c..22d5cfebd742c 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
@@ -67,49 +67,26 @@
 <% if component_settings.attachments_allowed? && @proposal %>
   <fieldset class="gallery__container photos_container">
     <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.photos.any? %>
-      <% @form.photos.each do |photo| %>
-        <div class="callout gallery__item" id="attachment_<%= photo.id %>" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
-          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-          <button class="close-button"
-                  aria-label="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
-                  title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
-                  type="button"
-                  data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
     <div class="row column">
-      <%= form.file_field :add_photos, multiple: false, label: t("add_images", scope: "decidim.proposals.proposals.edit") %>
+      <%= form.attachment :photos,
+        multiple: false,
+        label: t("decidim.proposals.proposals.edit.add_image"),
+        button_label: t("decidim.proposals.proposals.edit.add_image"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
+        help_i18n_scope: "decidim.forms.file_help.image",
+        extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
     </div>
   </fieldset>
 
   <fieldset class="attachments_container gallery__container documents_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.documents.any? %>
-      <% @form.documents.each do |document| %>
-        <div class="callout" id="attachment_<%= document.id %>" data-closable>
-          <%= link_to translated_attribute(document.title), document.url %>
-          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-          <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
-          <button class="close-button"
-                  aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
     <div class="row column">
-      <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
+      <%= form.attachment :documents,
+        multiple: true,
+        label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
     </div>
   </fieldset>
 <% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb
index 4933cfb21b949..e974dfe319881 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="proposals">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -17,19 +17,19 @@
   <%= form.hidden_field "state_withdraw", value: params.dig("filter", "state_withdraw") %>
 
   <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if component_settings.official_proposals_enabled %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_user %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb
index 372e21a0bd38e..f802926076c92 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb
@@ -1,7 +1,7 @@
-<% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <div class="callout warning">
     <%= t("decidim.proposals.proposals.index.text_banner",
-          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[state_withdraw]" => nil)),
+          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil)),
           ).html_safe %>
   </div>
 <% end %>
@@ -37,10 +37,10 @@
 
 <div class="row">
   <div class="text-right">
-    <% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[state_withdraw]" => nil) %>
+    <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
     <% else %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { state_withdraw: "withdrawn", state: [""] }) %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", state: [""] }) %>
     <% end %>
   </div>
 </div>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/complete.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/complete.html.erb
index 750a26fdaac73..bdd6f218a4cfd 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/complete.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/complete.html.erb
@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/edit.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/edit.html.erb
index fc3a92873842a..14e79f5f94e3b 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/edit.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/edit.html.erb
@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/edit_draft.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/edit_draft.html.erb
index 3d833b884c502..11315a84b49b4 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/edit_draft.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/edit_draft.html.erb
@@ -23,4 +23,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb
index bbad2a83f5a42..cb059f398f610 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb
@@ -35,4 +35,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>
diff --git a/decidim-proposals/config/locales/ar.yml b/decidim-proposals/config/locales/ar.yml
index ef65cfcc61052..19b83e393bbd2 100644
--- a/decidim-proposals/config/locales/ar.yml
+++ b/decidim-proposals/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ ar:
           valuator_role_id: اسم الم�قيّ�م
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'نوع المستند غير صالح. التنسيقات المقبولة هي: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -431,7 +428,6 @@ ar:
           all: الكل
         filter_origin_values:
           all: الكل
-          citizens: المواطنون
           meetings: اجتماعات
           official: الرسمية
           user_groups: المجموعات
@@ -608,12 +604,8 @@ ar:
             many: "%{count} مقترحات"
             other: "%{count} مقترحات"
         edit:
-          add_documents: المستندات
-          add_images: مل�
           attachment_legend: "(اختياري) إضا�ة مر�ق"
           back: الى الخل�
-          delete_document: حذ� المستند
-          delete_image: حذ� الصورة
           select_a_category: الرجاء تحديد ال�ئة
           send: إرسال
           title: تعديل الاقتراح
diff --git a/decidim-proposals/config/locales/bg.yml b/decidim-proposals/config/locales/bg.yml
index 9f6e324a7e54f..a11573235aff7 100644
--- a/decidim-proposals/config/locales/bg.yml
+++ b/decidim-proposals/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ bg:
           valuator_role_id: Име на провер�ващ
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: '�евалиден тип документ. Допу�тимите формати �а: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
diff --git a/decidim-proposals/config/locales/ca.yml b/decidim-proposals/config/locales/ca.yml
index 52a3e98356e4d..bf18af912defe 100644
--- a/decidim-proposals/config/locales/ca.yml
+++ b/decidim-proposals/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ ca:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Tipus de document no vàlid. Els formats acceptats són: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipus de document no vàlid. Només s''accepten arxius amb les següents extensions: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -403,14 +404,14 @@ ca:
         imports:
           help:
             answers: |
-              El document d'importació ha de contindre els següents noms de columna i en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
+              El document d'importació ha d'incloure els següents noms de columna en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
               <ul>
               <li><b>id:</b> ID de la proposta a responder</li>
               <li>state<b>:</b> Un d'aquests "acceptada", "en avaluació" o "rebutjada"</li>
-              <li><b>answer/en</b> Resposta en idioma inglés. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
+              <li><b>answer/ca</b> Resposta en català. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
               </ul>
             proposals: |
-              El document ha de contindre els següents noms de columna en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
+              El document ha d'incloure els següents noms de columna en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
               <ul>
               <li><b>title/ca:</b> Títol en català. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
               <li><b>body/ca:</b> Descripció en català. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
@@ -609,9 +610,9 @@ ca:
           all: Totes
         filter_origin_values:
           all: Totes
-          citizens: Ciutadania
           meetings: Trobades
           official: Oficial
+          participants: Participants
           user_groups: Grups
         filter_scope_values:
           all: Totes
@@ -674,6 +675,8 @@ ca:
           filter_by: Filtra per
           unfold: Desplega
         new:
+          add_file: Afegir fitxer
+          edit_file: Editar el fitxer
           send: Continua
         new_collaborative_draft_button:
           new_collaborative_draft: Nou esborrany col·laboratiu
@@ -784,19 +787,19 @@ ca:
           description: Les coordenades s'actualitzaran quan facis clic en el botó 'previsualitzar'. No obstant això, la direcció no canvia.
           instructions: Pots moure la ubicació en el mapa.
         edit:
-          add_documents: Documents
-          add_images: Arxiu
+          add_documents: Afegir documents
+          add_image: Afegir imatge
           attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
           back: Torna
-          delete_document: Eliminar document
-          delete_image: Eliminar imatge
+          edit_documents: Editar documents
+          edit_image: Editar imatge
           gallery_legend: "(Opcional) Afegir una imatge a la targeta de proposta"
           select_a_category: Si us plau, selecciona una categoria
           send: Envia
           title: Edita proposta
         edit_draft:
           discard: Descarta aquest esborrany
-          discard_confirmation: Estàs segur de que vols descartar l'esborrany d'aquesta proposta?
+          discard_confirmation: Segur que vols descartar l'esborrany d'aquesta proposta?
           send: Vista prèvia
           title: Edició l'esborrany de proposta
         filters:
diff --git a/decidim-proposals/config/locales/cs.yml b/decidim-proposals/config/locales/cs.yml
index b7de4de8efac9..5e459721a6ded 100644
--- a/decidim-proposals/config/locales/cs.yml
+++ b/decidim-proposals/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ cs:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Neplatný typ dokumentu. Přijaté formáty jsou: %{valid_mime_types}'
+              allowed_file_content_types: 'Neplatný typ dokumentu. Jsou povoleny pouze soubory s následujícími příponami: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -409,6 +410,22 @@ cs:
           proposal_comments: Komentáře
           proposals: Návrhy
         imports:
+          help:
+            answers: |
+              Importovaný dokument by měl obsahovat tyto názvy sloupců v případě souborů CSV nebo Excel, nebo jména klí�ů v případě JSON souborů:
+              <ul>
+              <li><b>id:</b> ID návrhu na odpově�</li>
+              <li><b>state:</b> Jeden z "přijatých", "vyhodnocení" nebo "odmítnuto"</li>
+              <li><b>answer/en:</b> Odpově� v angli�tině. Bude to záviset na konfiguraci jazyka vaší platformy.</li>
+              </ul>
+            proposals: |
+              Soubor musí mít následující názvy sloupců v případě souborů CSV nebo Excel, nebo názvy klí�ů v případě JSON souborů:
+              <ul>
+              <li><b>title/en:</b> Nadpis v angli�tině. Toto bude záviset na jazykové konfiguraci platformy.</li>
+              <li><b>body/en:</b> Tělo v angli�tině. To bude záviset na konfiguraci jazyka vaší platformy.</li>
+              <li><b>scope/id:</b> ID oblasti působnosti</li>
+              <li><b>category/id:</b> ID pro kategorii</li>
+              </ul>
           label:
             answers: Importovat odpovědi ze souboru
             proposals: Importovat návrhy ze souboru
@@ -607,9 +624,9 @@ cs:
           all: VÅ¡e
         filter_origin_values:
           all: VÅ¡e
-          citizens: Ob�ané
           meetings: Setkání
           official: Oficiální
+          participants: Ú�astníci
           user_groups: Skupiny uživatelů
         filter_scope_values:
           all: VÅ¡e
@@ -674,6 +691,8 @@ cs:
           filter_by: Filtrovat podle
           unfold: Rozvinout
         new:
+          add_file: Přidat soubor
+          edit_file: Upravit soubor
           send: Pokra�ovat
         new_collaborative_draft_button:
           new_collaborative_draft: Nový návrh spolupráce
@@ -788,12 +807,12 @@ cs:
           description: Souřadnice budou aktualizovány po kliknutí na tla�ítko 'náhled'. Adresa se však nemění.
           instructions: Můžete přesunout bod na mapě.
         edit:
-          add_documents: Dokumenty
-          add_images: Soubor
+          add_documents: Přidat dokumenty
+          add_image: Přidat obrázek
           attachment_legend: "(Volitelné) Přidání přílohy"
           back: Zadní
-          delete_document: Smazat dokument
-          delete_image: Smazat obrázek
+          edit_documents: Upravit dokumenty
+          edit_image: Upravit obrázek
           gallery_legend: "(Volitelné) Přidejte obrázek na kartu návrhu"
           select_a_category: Vyberte kategorii
           send: Poslat
diff --git a/decidim-proposals/config/locales/de.yml b/decidim-proposals/config/locales/de.yml
index 96b023bc74d3e..2563c6b291c22 100644
--- a/decidim-proposals/config/locales/de.yml
+++ b/decidim-proposals/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ de:
           valuator_role_id: Name des Schätzers
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ungültiger Dokumenttyp Zulässige Formate sind: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -566,9 +563,9 @@ de:
           all: Alle
         filter_origin_values:
           all: Alle
-          citizens: Einzelpersonen
           meetings: Meetings
           official: Offiziell
+          participants: Teilnehmer
           user_groups: Benutzergruppen
         filter_scope_values:
           all: Alle
@@ -630,6 +627,8 @@ de:
           filter_by: Filtern nach
           unfold: Aufklappen
         new:
+          add_file: Datei hinzufügen
+          edit_file: Datei bearbeiten
           send: Fortsetzen
         new_collaborative_draft_button:
           new_collaborative_draft: Neuer gemeinsamer Entwurf
@@ -739,12 +738,12 @@ de:
         dynamic_map_instructions:
           instructions: Sie können den Marker auf der Karte verschieben.
         edit:
-          add_documents: Unterlagen
-          add_images: Datei
+          add_documents: Dokumente hinzufügen
+          add_image: Bild hinzufügen
           attachment_legend: "(Optional) Fügen Sie einen Anhang hinzu"
           back: Zurück
-          delete_document: Dokument löschen
-          delete_image: Bild löschen
+          edit_documents: Dokumente bearbeiten
+          edit_image: Bild bearbeiten
           gallery_legend: "(Optional) Ein Bild zur Vorschlagskarte hinzufügen"
           select_a_category: Bitte wählen sie eine Kategorie
           send: Abschicken
diff --git a/decidim-proposals/config/locales/el.yml b/decidim-proposals/config/locales/el.yml
index c2111dcaf91e6..600c89de7074f 100644
--- a/decidim-proposals/config/locales/el.yml
+++ b/decidim-proposals/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -38,10 +39,6 @@ el:
           valuator_role_id: Όνομα εκτιμητή
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Μη έγκυ�ος τ�πος εγγ�άφου. Οι αποδεκτές μο�φές είναι: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -486,7 +483,6 @@ el:
           all: Όλα
         filter_origin_values:
           all: Όλα
-          citizens: Πολίτες
           meetings: Συσκέψεις
           official: Επίσημη
           user_groups: Ομάδες
@@ -653,7 +649,6 @@ el:
             one: "%{count} π�όταση"
             other: "%{count} π�οτάσεις"
         edit:
-          add_documents: Έγγ�αφα
           attachment_legend: "(Π�οαι�ετικά) Π�οσθήκη συνημμένου"
           back: Πίσω
           select_a_category: Επιλέξτε μια κατηγο�ία
diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml
index 6a8d13ec0d970..6c3891a78cefd 100644
--- a/decidim-proposals/config/locales/en.yml
+++ b/decidim-proposals/config/locales/en.yml
@@ -46,7 +46,7 @@ en:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Invalid document type. Accepted formats are: %{valid_mime_types}'
+              allowed_file_content_types: 'Invalid document type. Only files with the following extensions are allowed: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -610,9 +610,9 @@ en:
           all: All
         filter_origin_values:
           all: All
-          citizens: Citizens
           meetings: Meetings
           official: Official
+          participants: Participants
           user_groups: Groups
         filter_scope_values:
           all: All
@@ -675,6 +675,8 @@ en:
           filter_by: Filter by
           unfold: Unfold
         new:
+          add_file: Add file
+          edit_file: Edit file
           send: Continue
         new_collaborative_draft_button:
           new_collaborative_draft: New collaborative draft
@@ -785,12 +787,12 @@ en:
           description: The coordinates will be updated when clicking on 'preview' button. However, the address does not change.
           instructions: You can move the point on the map.
         edit:
-          add_documents: Documents
-          add_images: File
+          add_documents: Add documents
+          add_image: Add image
           attachment_legend: "(Optional) Add an attachment"
           back: Back
-          delete_document: Delete Document
-          delete_image: Delete Image
+          edit_documents: Edit documents
+          edit_image: Edit image
           gallery_legend: "(Optional) Add an image to the proposal card"
           select_a_category: Please select a category
           send: Send
diff --git a/decidim-proposals/config/locales/es-MX.yml b/decidim-proposals/config/locales/es-MX.yml
index 6a692a757fd5b..018194a7be81e 100644
--- a/decidim-proposals/config/locales/es-MX.yml
+++ b/decidim-proposals/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ es-MX:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -609,9 +610,9 @@ es-MX:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Ciudadanía
           meetings: Encuentros
           official: Oficial
+          participants: Participantes
           user_groups: Grupos de Usuarios
         filter_scope_values:
           all: Todos
@@ -674,6 +675,8 @@ es-MX:
           filter_by: Filtrado por
           unfold: Desplegar
         new:
+          add_file: Añadir archivo
+          edit_file: Editar fichero
           send: Continuar
         new_collaborative_draft_button:
           new_collaborative_draft: Nuevo borrador colaborativo
@@ -784,12 +787,12 @@ es-MX:
           description: Las coordenadas se actualizarán cuando hagas clic en el botón 'previsualizar'. Sin embargo, la dirección no cambia.
           instructions: Puedes mover la ubicación en el mapa.
         edit:
-          add_documents: Documentos
-          add_images: Archivo
+          add_documents: Añadir documentos
+          add_image: Añadir imagen
           attachment_legend: "(Opcional) Agregar un archivo adjunto"
           back: Atrás
-          delete_document: Borrar Documento
-          delete_image: Borrar imagen
+          edit_documents: Editar documentos
+          edit_image: Editar imagen
           gallery_legend: "(Opcional) Añadir una imagen a la tarjeta de propuesta"
           select_a_category: Por favor, selecciona una categoría
           send: Enviar
diff --git a/decidim-proposals/config/locales/es-PY.yml b/decidim-proposals/config/locales/es-PY.yml
index ba190965b114b..2e2c7bc2be279 100644
--- a/decidim-proposals/config/locales/es-PY.yml
+++ b/decidim-proposals/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ es-PY:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -609,9 +610,9 @@ es-PY:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Ciudadanía
           meetings: Reuniones
           official: Oficial
+          participants: Participantes
           user_groups: Grupos de Usuarios
         filter_scope_values:
           all: Todos
@@ -674,6 +675,8 @@ es-PY:
           filter_by: Filtrado por
           unfold: Desplegar
         new:
+          add_file: Añadir archivo
+          edit_file: Editar fichero
           send: Continuar
         new_collaborative_draft_button:
           new_collaborative_draft: Nuevo borrador colaborativo
@@ -784,12 +787,12 @@ es-PY:
           description: Las coordenadas se actualizarán cuando hagas clic en el botón 'previsualizar'. Sin embargo, la dirección no cambia.
           instructions: Puedes mover la ubicación en el mapa.
         edit:
-          add_documents: Documentos
-          add_images: Archivo
+          add_documents: Añadir documentos
+          add_image: Añadir imagen
           attachment_legend: "(Opcional) Agregar un archivo adjunto"
           back: Volver
-          delete_document: Borrar Documento
-          delete_image: Borrar imagen
+          edit_documents: Editar documentos
+          edit_image: Editar imagen
           gallery_legend: "(Opcional) Añadir una imagen a la tarjeta de propuesta"
           select_a_category: Por favor, seleccione una categoría
           send: Enviar
diff --git a/decidim-proposals/config/locales/es.yml b/decidim-proposals/config/locales/es.yml
index c3489b7e5499c..0aad31700fa49 100644
--- a/decidim-proposals/config/locales/es.yml
+++ b/decidim-proposals/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ es:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipo de documento no válido. Sólo se permiten archivos con las siguientes extensiones: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -609,9 +610,9 @@ es:
           all: Todas
         filter_origin_values:
           all: Todas
-          citizens: Ciudadanía
           meetings: Encuentros
           official: Oficial
+          participants: Participantes
           user_groups: Grupos
         filter_scope_values:
           all: Todas
@@ -674,6 +675,8 @@ es:
           filter_by: Filtrar por
           unfold: Desplegar
         new:
+          add_file: Añadir archivo
+          edit_file: Editar fichero
           send: Continuar
         new_collaborative_draft_button:
           new_collaborative_draft: Nuevo borrador colaborativo
@@ -784,12 +787,12 @@ es:
           description: Las coordenadas se actualizarán cuando hagas clic en el botón 'previsualizar'. Sin embargo, la dirección no cambia.
           instructions: Puedes mover la ubicación en el mapa.
         edit:
-          add_documents: Documentos
-          add_images: Archivo
+          add_documents: Añadir documentos
+          add_image: Añadir imagen
           attachment_legend: "(Opcional) Agregar un archivo adjunto"
           back: Volver
-          delete_document: Borrar Documento
-          delete_image: Borrar imagen
+          edit_documents: Editar documentos
+          edit_image: Editar imagen
           gallery_legend: "(Opcional) Añadir una imagen a la tarjeta de propuesta"
           select_a_category: Por favor, selecciona una categoría
           send: Enviar
diff --git a/decidim-proposals/config/locales/eu.yml b/decidim-proposals/config/locales/eu.yml
index 370a71b9027da..c40313cf09ff0 100644
--- a/decidim-proposals/config/locales/eu.yml
+++ b/decidim-proposals/config/locales/eu.yml
@@ -1,38 +1,39 @@
+---
 eu:
   activemodel:
     attributes:
       collaborative_draft:
         address: Helbidea
-        body: Gorputzeko
+        body: Gorputza
         category_id: Kategoria
         decidim_scope_id: esparrua
         has_address: Helbidea du
         scope_id: Eremua
-        state: Estatu
+        state: Egoera
         title: Izenburua
         user_group_id: Lankidetza zirriborroa sortu
       proposal:
         address: Helbidea
         answer: Erantzuna
-        answered_at: Erantzuna at
-        automatic_hashtags: Hashtags automatikoki gehitu da
+        answered_at: '-k erantzuna'
+        automatic_hashtags: Traola automatikoki gehitu da
         body: Testua
         category_id: Kategoria
         decidim_scope_id: Eremua
         has_address: Helbidea du
         scope_id: Eremua
         state: Estatu
-        suggested_hashtags: Iradokitako hashtagak
+        suggested_hashtags: Iradokitako traolak
         title: Titulua
         user_group_id: 'Sortu proposamen bat honako hau gisa:'
       proposal_answer:
         answer: Erantzuna
         cost: Kostua
         cost_report: Kostuaren txostena
-        execution_period: Exekuzioaldia
+        execution_period: Gauzatzeko epea
       proposals_copy:
-        copy_proposals: Honek hautatutako osagaiaren unekoaren proposamen guztiak inportatuko ditu eta ekintza hori ezin da alderantzikatu.
-        origin_component_id: Proposamenen kopia egiteko osagaia
+        copy_proposals: Ulertzen dut honek aukeratutako osagaiaren proposamen guztiak ekarriko dituela gaur egunera eta ekintza hau ezin dela atzera bota.
+        origin_component_id: Proposamenak kopiatzeko osagaia
       proposals_import:
         import_proposals: Inportatu proposamenak
         keep_answers: Mantendu egoera eta erantzunak
@@ -45,7 +46,7 @@ eu:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Dokumentu mota baliogabea. Onartutako formatuak hauek dira: %{valid_mime_types}'
+              allowed_file_content_types: 'Dokumentu mota hau ez da onartzen. Honako hauek onartzen dira: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -54,19 +55,21 @@ eu:
               needs_to_be_reattached: Artxiboa berriro erantsi behar da
             body:
               cant_be_equal_to_template: ezin da plantillaren berdina izan
-              identical: ETA izenburua ezin da berdinak izan
+              identical: ETA izenburua ezin da berdina izan
             title:
-              identical: ETA gorputzak ezin du berdinak izan
+              identical: ETA testua ezin du berdinak izan
         proposals_merge:
           attributes:
             base:
               not_official: Ez dira ofizialak
+              supported: Laguntza edo basesak jaso izana
         proposals_split:
           attributes:
             base:
               not_official: Ez dira ofizialak
+              supported: Laguntza edo basesak jaso izana
     models:
-      decidim/proposals/accepted_proposal_event: Onartutako proposamena
+      decidim/proposals/accepted_proposal_event: Poposamena onartura
       decidim/proposals/admin/update_proposal_category_event: Proposamen kategoria aldatu da
       decidim/proposals/admin/update_proposal_scope_event: Proposamen-eremua aldatuta
       decidim/proposals/creation_enabled_event: Proposamenaren sorrera gaituta
@@ -80,16 +83,16 @@ eu:
     models:
       decidim/proposals/collaborative_draft:
         one: Zirriborro kolaboratzailea
-        other: Lankidetza zirriborroak
+        other: Zirriborro kolaboratzaileak
       decidim/proposals/proposal:
         one: Proposamen
-        other: proposamenak
+        other: Proposamenak
       decidim/proposals/proposal_note:
         one: Ohar
         other: Oharrak
       decidim/proposals/proposal_vote:
-        one: Bozkatu
-        other: Botoak
+        one: Bozka
+        other: Bozkak
   decidim:
     admin:
       filters:
@@ -126,23 +129,24 @@ eu:
           amend: Zuzendu
           comment: Iruzkina
           create: Sortu
-          endorse: gatoz
+          endorse: Atxikitu
           vote: Bozkatu
           vote_comment: Bozkatu iruzkina
           withdraw: Erretiratuko
         name: proposamenak
         settings:
           global:
-            amendments_enabled: Emendakinak gaituta
+            amendments_enabled: Zuzenketak baimenduta
             amendments_enabled_help: Aktibo badago, konfiguratu zuzenketen aukerak urrats bakoitzerako.
             amendments_wizard_help_text: Zuzenketen testu-laguntzailea
-            announcement: Anuntzio
+            announcement: Iragarpena
             attachments_allowed: Onartu eranskinak
-            can_accumulate_supports_beyond_threshold: Atalasetik haratago doazen euskarriak pilatu ditzakezu
+            can_accumulate_supports_beyond_threshold: Babesak metatu ditzake atalasetik haratago
             collaborative_drafts_enabled: Lankidetza zirriborroak gaituta
             comments_enabled: Iruzkinak gaituta
             comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsita konfigurazioa mantendu nahi baduzu)
             default_sort_order: Proposamenen hurrenkera lehenetsia
+            default_sort_order_help: Lehenetsita, esan nahi du euskarriak aktibatuta badaude, proposamenak ausaz ordenatuta erakutsiko direla, eta euskarriak blokeatuta badaude, euskarririk euskarrienaren arabera ordenatuko direla.
             default_sort_order_options:
               default: Lehenetsita
               most_commented: Iruzkin gehien dituztenak
@@ -153,19 +157,20 @@ eu:
               recent: Azkenak
               with_more_authors: Egile gehiagorekin
             geocoding_enabled: Geokodifikazioa gaituta dago
-            minimum_votes_per_user: Erabiltzaile bakoitzeko gutxieneko botoiak
+            minimum_votes_per_user: Erabiltzaile bakoitzeko gutxieneko botoak
             new_proposal_body_template: Plantilla proposamen berriaren testurako
             new_proposal_body_template_help: Proposamen berriek izango duten testu aurredefinitua zehaztu ahal duzu
             new_proposal_help_text: Proposamen berriaren laguntza testu
             official_proposals_enabled: Proposamen ofizialak gaituta
             participatory_texts_enabled: Parte hartzaileen testuak gaituta
+            participatory_texts_enabled_readonly: Proposamenak badaude, ezin du doikuntza horrekin elkarreragin. Mesedez, sor ezazu proposamen berri bat, funtzio hori aktibatu nahi baduzu edo `Testu parte hartzaileak` menuan inportatutako proposamen guztiak baztertu nahi badituzu, desaktibatu nahi baduzu.
             proposal_answering_enabled: Proposamena erantzutea gaituta dago
             proposal_edit_before_minutes: Proposamenak egileek editatu ahal izango dituzte minutu asko igaro aurretik
             proposal_edit_time: Proposamenen edizioa
             proposal_edit_time_choices:
               infinite: Utzi proposamenak editatzen epe mugagabe batean
               limited: Utzi proposamenak editatzen epe zehatz baten barruan
-            proposal_length: Proposamen maximoa gorputzaren luzera
+            proposal_length: Proposamen maximoa testuaren luzera
             proposal_limit: Proposamenaren muga erabiltzaile bakoitzeko
             proposal_wizard_step_1_help_text: Proposamen laguntzailea "Sortu" urrats laguntza testua
             proposal_wizard_step_2_help_text: Proposamen laguntzailea "Konparatu" urrats laguntza testua
@@ -188,11 +193,14 @@ eu:
               all: Zuzenketak ikusgai denentzat
               participants: Zuzenketak ikusgai daude beren egileentzat
             amendments_visibility_help: Zuzenketak egileentzat bakarrik ikusgai" aukera hautatzen bada, parte-hartzaileek saioa hasi beharko dute egindako zuzenketak ikusteko.
-            announcement: Anuntzio
+            announcement: Iragarpenak
             answers_with_costs: Gaitu kostua proposamenen erantzunetan
-            automatic_hashtags: Hashtags proposamen guztiei gehitu zaie
+            automatic_hashtags: Traola proposamen guztiei gehitu zaie
             comments_blocked: Iruzkinak blokeatuta
+            creation_enabled: Parte-hartzaileek eztabaidak sor ditzakete
+            creation_enabled_readonly: Aukera hori desaktibatu egiten da Testuen Parte-hartzaile funtzionaltasuna aktibatzean. Testu parte-hartzaile gisa proposamenak kargatzeko, egin klik Testu parte-hartzaileak botoian eta jarraitu jarraibideak.
             default_sort_order: Proposamenen hurrenkera lehenetsia
+            default_sort_order_help: Besterik adierazi ezean, botoak gaituta badaude, proposamenak ausaz ordenatuta agertuko dira, eta botoak blokeatuta badaude, bozkatuenaren arabera ordenatuko dira.
             default_sort_order_options:
               default: Lehenetsita
               most_commented: Iruzkin gehien dituztenak
@@ -205,7 +213,8 @@ eu:
             endorsements_blocked: Onarpen blokeatuak
             endorsements_enabled: Onarpen gaituak
             proposal_answering_enabled: Proposamena erantzutea gaituta dago
-            publish_answers_immediately: Argitaratu berehala erantzunak proposamenei
+            publish_answers_immediately: Argitaratu berehala proposamen erantzunak
+            publish_answers_immediately_help_html: 'Kontuz, proposamenen bati erantzuten badiozu hau gabe, eskuz argitaratu beharko dituzu, aukeratuz eta argitaratzeko ekintza erabiliz. Nola funtzionatzen duen jakiteko, ikus <a href="https://docs.decidim.org/en/admin/components/proposals/answers#_publication" target="_blank"> proposals'' answers documentation page</a>proposamenen erantzunen dokumentazio-orria.'
             suggested_hashtags: Hashtag-ek erabiltzaileei proposamen berriak proposatu dizkie
             votes_blocked: Botoak blokeatuta
             votes_enabled: Botoak gaituta
@@ -219,18 +228,28 @@ eu:
             email_subject: Norbaitek ohar bat utzi du %{resource_title} proposamenean.
             notification_title: Norbaitek ohar bat utzi du <a href="%{resource_path}">%{resource_title}</a> proposamenean. Berrikusi orain honen bidez <a href="%{admin_proposal_info_path}">panel de administración</a>
         collaborative_draft_access_accepted:
+          email_intro: '%{requester_name} onartu da <a href="%{resource_url}">%{resource_title}</a> zirriborro koloboratiboan laguntzaile gisa sartzeko.'
+          email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
           email_subject: "%{requester_name} izan da onartu %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> izan da <strong>sarbidea onartu kolaboratzaile gisa</strong> de <a href="%{resource_path}">%{resource_title}</a> elkarlanerako zirriborroa.
         collaborative_draft_access_rejected:
+          email_intro: '%{requester_name} baztertu egin da <a href="%{resource_url}">%{resource_title}</a>-an laguntzaile gisa sartzeko.'
+          email_outro: Jakinarazpen hau jaso duzu<a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
           email_subject: "%{requester_name} ez da onartu du kolaboratzaile gisa sartzeko %{resource_title} elkarlanerako zirriborroa."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> izan da <strong>baztertutako <a href="%{resource_path}">%{resource_title}</a> lankidetza zirriborroaren</strong> laguntzaile gisa sartzeko.
         collaborative_draft_access_requested:
+          email_intro: '%{requester_name} -k eskatu du laguntzaile gisa sartzeko. <strong>onartu edo baztertu egin dezakezu </strong> <a href="%{resource_url}">%{resource_title}</a> testu kolaboratibo ziriborroan.'
+          email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzailea zarelako.
           email_subject: "%{requester_name} eskatutako sarbidea izateko %{resource_title}laguntzera."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> eskatutako sarbidea <a href="%{resource_path}">%{resource_title}</a> lankidetza proiektuari laguntzea. <strong>Onartu edo ezetsi eskaera</strong>.
         collaborative_draft_access_requester_accepted:
+          email_intro: "<a href=\"%{resource_url}\">%{resource_title}</a> testu kolaboratiboan laguntzaile gisa sartzeko onartu zaituzte.\n</a>."
+          email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzaile izatea eskatu duzulako.
           email_subject: '%{resource_title}laguntzaile gisa onartzen duzu.'
           notification_title: Izan zara <strong>onartu laguntzaile gisa sartzeko</strong> de <a href="%{resource_path}">%{resource_title}</a> elkarlanerako zirriborroa.
         collaborative_draft_access_requester_rejected:
+          email_intro: "<a href=\"%{resource_url}\">%{resource_title}</a> testu kolaboratiboan laguntzaile gisa sartzeko onartu zaituzte.\n</a>."
+          email_outro: Jakinarazpen hau jaso duzu <a href="%{resource_url}">%{resource_title}</a>-ko kolaboratzaile izatea eskatu duzulako.
           email_subject: Baztertu zara %{resource_title}laguntzaile gisa.
           notification_title: Izan zara <strong>baztertu laguntzaile gisa sartzeko</strong> de <a href="%{resource_path}">%{resource_title}</a> elkarlanerako zirriborroa.
         collaborative_draft_withdrawn:
@@ -255,7 +274,7 @@ eu:
           follower:
             email_intro: '"%{resource_title}" proposamena onartu da. Orri honetan erantzun dezakezu:'
             email_outro: Jakinarazpena jaso duzu "%{resource_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
-            email_subject: Ondorengo proposamen bat onartu da
+            email_subject: Jarraitzen ari zaren proposamen bat onartu da
             notification_title: <a href="%{resource_path}">%{resource_title}</a> proposamena onartu da.
         proposal_evaluating:
           affected_user:
@@ -314,7 +333,7 @@ eu:
           conditions:
             - Aukeratu zure intereseko partaidetza espazioa proposamenak bidaltzeko
             - Saiatu egin daitezkeen proposamenak egitea. Horrela onartuko lirateke gehiago.
-          description: Idazmahaia proposamen berriekin modu aktiboan parte hartzen duzunean onartuko zaituzte eta onartzen dira.
+          description: Idazmahaia hau proposamen berriekin aktiboki parte hartzen duzunean ematen da eta hauek onartzen dira.
           description_another: Erabiltzaile honek %{score} proposamen jaso ditu.
           description_own: '%{score} proposamen onartu dituzu.'
           name: Onartutako proposamenak
@@ -349,25 +368,25 @@ eu:
         object: proposamenak
         title: Onartutako proposamenak
       endorsements:
-        description: Proposamenetan sortutako babesle kopurua
-        object: abalak
+        description: Proposamenekiko abalen kopurua
+        object: oniritziak
         title: Oniritziak
       proposals:
         description: Sortutako proposamen kopurua
         object: proposamenak
-        title: proposamenak
+        title: Proposamenak
       votes:
         description: Erabiltzaileek proposatutako sortutako boto kopurua
-        object: boto
+        object: botoak
         title: Botoak
     participatory_spaces:
       highlighted_proposals:
-        see_all: Ikusi dena (%{count})
+        see_all: Ikusi (%{count}) proposamenak
     proposals:
       actions:
         answer_proposal: Erantzun proposamenari
         edit_proposal: Editatu proposamena
-        import: Inportatu beste osagai batetik
+        import: Inportatu proposamenak beste osagai batetik
         new: Proposamen berria
         participatory_texts: Testu partehartzaileak
         show: Ikusi proposamena
@@ -379,9 +398,25 @@ eu:
           proposal_comments: Iruzkinak
           proposals: Proposamenak
         imports:
+          help:
+            proposals: |
+              Fitxategiak zutabeko izen hauek izan behar ditu CSV edo Excel fitxategien kasuan, edo gako-izenak JSON fitxategien kasuan:
+              <ul>
+              <li><b>Izenburua/en:</b>Ingelesari buruzko titulua. Zure plataformaren hizkuntzaren konfigurazioaren araberakoa izango da..</li>
+              <li><b>Testua/en:</b>Testua ingelesez. Zure plataformaren hizkuntzaren konfigurazioaren araberakoa izango da.</li>
+              <li><b>Eremua/id:</b> Eremauren ID-a</li>
+              <li><b>Kategoria/id:</b> Kategoriaren ID-a</li>
+              </ul>
           label:
             answers: Inportatu erantzunak errenkada batetik
             proposals: Inportatu proposamenak errenkada batetik
+          resources:
+            answers:
+              one: proposamenari emandako erantzuna
+              other: proposamenei emandako erantzunak
+            proposals:
+              one: proposamena
+              other: proposamenak
           title:
             answers: Inportatu erantzunak proposamen gisa
             proposals: Inportatu proposamenak
@@ -397,25 +432,27 @@ eu:
             success: Parte-hartzaileen testu-zirriborro guztiak baztertu egin dira.
           import:
             invalid: Inprimakia baliogabea da!
+            invalid_file: Fitxategian akatsen bat dago. Mesedez, saiatu fitxategiaren edukia editatzen eta berriro kargatzen.
             success: Zorionak, ondorengo atalak inportatutako dokumentutik aztertu dira, proposamen bihurtu dira. Orain argitalpenaren aurretik behar duzun guztia berrikusi eta egokitu dezakezu.
           index:
             info_1: Ondorengo atalak inportatutako dokumentutik aztertu dira, proposamen bihurtu dira. Orain argitalpenaren aurretik behar duzun guztia berrikusi eta egokitu dezakezu.
             publish_document: Argitaratu dokumentua
-            save_draft: Aurreztu zirriborroa
-            title: PREVIEW PARTICIPATORIO TEXT
+            save_draft: Zirriborroa gorde
+            title: Parte hartzeko testua aurreikustea
           new_import:
             accepted_mime_types:
               md: Markdown
               odt: ODT
             bottom_hint: "(Dokumentuko atalen aurrebista eta ordenazioa ahal izango duzu)"
+            document_legend: 'Gehitu 2MB baino gutxiagoko dokumentu bat. Atal bakoitza 3 sakontasun-mailaraino, proposamenetan aztertuko da.. Formatu suportatuak hauek dira: %{valid_mime_types}'
             title: ADD DOCUMENT
             upload_document: Kargatu dokumentua
           publish:
             invalid: Ezin izan dira proposamenik argitaratu
             success: Proposamen guztiak argitaratu dira
           sections:
-            article: "<em>artikuluaren</em>"
-            section: "<em>Artikulua:</em> <strong>%{title}</strong>"
+            article: "<em>Artikulua</em>"
+            section: "<em>Atala:</em> <strong>%{title}</strong>"
             sub-section: "<em>Azpiatala:</em> %{title}"
           update:
             success: Parte hartzailearen testua behar bezala eguneratu da.
@@ -424,6 +461,7 @@ eu:
             accepted: Onartuta
             answer_proposal: Erantzuna
             evaluating: Ebaluatzen
+            not_answered: Erantzun gabe
             rejected: Ukatua
             title: 'Erantzun proposamen honi: %{title}'
         proposal_notes:
@@ -431,7 +469,7 @@ eu:
             error: Arazo bat izan da proposamen ohar hau sortzeko
             success: Proposatutako oharra zuzen sortu da
           form:
-            note: Ohar
+            note: Oharra
             submit: Bidali
           leave_your_note: Utzi zure oharra
           title: Ohar pribatuak
@@ -443,8 +481,8 @@ eu:
             invalid: Arazo bat izan da proposamen hau sortzean.
             success: Proposamena zuzen sortu da.
           edit:
-            title: Eguneratze proposamena
-            update: eguneratzearen
+            title: Eguneratu proposamena
+            update: Eguneratu
           form:
             attachment_legend: "(Aukerakoa) Gehitu eranskin bat"
             created_in_meeting: Proposamen hau bilera batetik dator
@@ -458,18 +496,18 @@ eu:
             cancel: Utzi
             change_category: Aldatu kategoria
             change_scope: Aldatu eremua
-            merge: Bateratu berri bat sartu
+            merge: Beste batean fusionatu
             merge_button: Batu
             publish: Argitaratu
             publish_answers: Argitaratu erantzunak
             select_component: Hautatu osagaia
             selected: hautatutako
-            split: Proposamen banatuak
-            split_button: Split
+            split: Proposamen zatituak
+            split_button: Zatitu
             title: Proposamenak
             unassign_from_valuator: Desesleitu ebaluatzaileari
             unassign_from_valuator_button: Desesleitu
-            update: eguneratzearen
+            update: Eguneratu
             update_scope_button: Eguneratu eremua
           new:
             create: Sortu
@@ -481,7 +519,7 @@ eu:
             amendments_count: Zuzenketa kopurua
             assigned_valuators: Ebaluatzaileak esleituta
             authors: Egileak
-            body: Gorputzeko
+            body: Testua
             comments_count: Iruzkin kopurua
             comments_negative_count: Aurka
             comments_neutral_count: Neutrala
@@ -491,7 +529,7 @@ eu:
             endorsements_count: Atxikimendu kopurua
             endorsements_ranking: Sailkapena atxikimenduen arabera
             endorsers: Atxiki dira
-            link: Lotura
+            link: Esteka
             n_more_endorsers:
               one: eta 1 gehiago
               other: eta %{count} gehiago
@@ -516,19 +554,21 @@ eu:
             success: 'Proposamenak zuzen eguneratuta %{subject_name}: %{proposals} eremuan.'
         proposals_imports:
           create:
-            invalid: Arazo bat izan da proposamenak inportatzea
+            invalid: Arazo bat izan da proposamenak inportatzean
             success: "%{number} proposamenak behar bezala inportatu dira"
           new:
-            create: Inportatzeko proposamenak
+            create: Proposamenak inportatu
             no_components: Proposamenen inportazioa inportatzeko espazio parte hartzaile honetan ez dago proposamenrik.
             select_component: Hautatu osagaia
             select_states: Egiaztatu inportatzeko proposamenen egoera
             title: Inportatu proposamenak
         proposals_merges:
           create:
-            success: Proposamen berri batean sartu dira ondo.
+            invalid: 'Arazo bat izan da aukeratutako proposamenak bateratzeko, horietako batzuk:'
+            success: Proposamen berri batean sartu dira.
         proposals_splits:
           create:
+            invalid: 'Arazo bat egon da hautatutako proposamenak zatitzeko; izan ere, horietako batzuk honako hauek izan dira:'
             success: Proposamen berrietara egokitu dira.
         valuation_assignments:
           create:
@@ -553,28 +593,28 @@ eu:
         evaluating: Ebaluatzen
         not_answered: Erantzun gabe
         rejected: Ukatua
-        withdrawn: kendu
+        withdrawn: Kendu
       application_helper:
         filter_category_values:
           all: guztiak
         filter_origin_values:
           all: guztiak
-          citizens: Hiritarrak
           meetings: Bilerak
           official: Ofiziala
+          participants: Parte-hartzaileak
           user_groups: Erabiltzaile taldeak
         filter_scope_values:
           all: guztiak
         filter_state_values:
-          accepted: Onartu
-          all: guztiak
-          evaluating: ebaluatzea
+          accepted: Onartuta
+          all: Guztiak
+          evaluating: Ebaluatzen
           not_answered: Erantzun gabe
           rejected: Baztertuta
         filter_type_values:
-          all: guztiak
-          amendments: Aldaketak
-          proposals: proposamenak
+          all: Guztiak
+          amendments: Zuzenketak
+          proposals: Proposamenak
       collaborative_drafts:
         collaborative_draft:
           publish:
@@ -582,10 +622,10 @@ eu:
             irreversible_action_modal:
               body: Proiektua proposamen gisa argitaratu ondoren, zirriborroa ezin izango da berriro editatu. Proposamena ez da egile edo ekarpen berririk onartuko.
               cancel: Utzi
-              ok: Proposamen gisa Argitaratu
+              ok: Proposamen gisa argitaratu
               title: Hurrengo ekintza ez da atzeraezina
             success: Proposamen gisa argitaratutako proiektu kolaboratzailea.
-          view_collaborative_draft: Ikusi proiektu kolaboratzailea
+          view_collaborative_draft: Ikusi ziriborro kolaboratzailea
           withdraw:
             error: Arazoak izan dira lankidetza zirriborroa ixtean.
             irreversible_action_modal:
@@ -599,30 +639,33 @@ eu:
             one: "%{count} lankidetza zirriborroa"
             other: "%{count} lankidetza zirriborroa"
         create:
+          error: Arazo bat izan da lankidetza-zirriborroak sortzean.
           success: Kolaborazio zirriborroa sortu da.
         edit:
           attachment_legend: "(Aukerakoa) Gehitu eranskina"
-          back: Back
+          back: Atzera
           select_a_category: Hautatu kategoria bat
           send: Bidali
           title: Editatu lankidetza zirriborroa
         filters:
-          all: guztiak
-          amendment: Aldaketak
+          all: Guztiak
+          amendment: Zuzenketak
           category: Kategoria
-          open: Open
-          published: Argitaratutako
+          open: Zabalik
+          published: Argitaratuta
           related_to: Lotutako gaiak
           scope: esparrua
-          search: Search
-          state: Estatu
-          withdrawn: kendu
+          search: Bilatu
+          state: Egoera
+          withdrawn: Baztertu
         filters_small_view:
-          close_modal: Itxi modal
-          filter: Filter
-          filter_by: Iragazi arabera
+          close_modal: Itxi leihoa
+          filter: Iragazi
+          filter_by: 'Honen arabera iragazi:'
           unfold: Zabaldu
         new:
+          add_file: Gehitu fitxategiak
+          edit_file: Fitxategia editatu
           send: Jarraitu
         new_collaborative_draft_button:
           new_collaborative_draft: Lankidetza proiektu berria
@@ -630,7 +673,7 @@ eu:
           label: 'Eskaerak bidali:'
           most_contributed: Gehien lagunduta
           random: Random
-          recent: Berriki
+          recent: Berriena
         requests:
           accepted_request:
             error: Ezin izan da kolaboratzaile gisa onartu, saiatu berriro geroago.
@@ -646,7 +689,7 @@ eu:
             error: Ezin izan da laguntzailea baztertu, saiatu berriro geroago.
             success: "@%{user} behar bezala baztertu da kolaboratzaile gisa"
         show:
-          back: Back
+          back: Atzera
           edit: Editatu lankidetza zirriborroa
           final_proposal: azken proposamena
           final_proposal_help_text: Abisua amaitu da. Azken bukatutako proposamena ikus dezakezu
@@ -657,14 +700,14 @@ eu:
           publish: Argitaratu
           publish_info: Argitaratu zirriborroaren bertsio hau edo
           published_proposal: argitaratutako proposamena
-          request_access: Eskatu sarbidea
-          requested_access: Eskatutako sarbidea
+          request_access: Sarrera beharrezkoa
+          requested_access: Sarbidea beharrezkoa
           version_history: ikusi bertsioaren historia proposamen honetarako
           withdraw: kendu zirriborroa
         states:
-          open: Open
-          published: Argitaratutako
-          withdrawn: kendu
+          open: Zabalik
+          published: Argitaratuta
+          withdrawn: Kendu
         update:
           error: Lankidetza zirriborroa gordetzean erroreak gertatu dira.
           success: Laguntza-proiektua ondo eguneratu da.
@@ -694,26 +737,26 @@ eu:
         proposal:
           fields:
             category: Kategoria
-            comments: Oharrak
+            comments: Iruzkinak
             id: NORTASUN AGIRIA
             notes: Oharrak
             official_proposal: Proposamen ofiziala
             published_answer: Erantzuna argitaratuta
-            published_at: Argitaratu at
+            published_at: Argitaratze-data
             scope: Esparrua
             state: Egoera
             title: Titulua
             valuator: Ebaluatzailea
             valuators: Ebaluatzaileak
-            votes: Euskarriak
+            votes: Botoak
       new:
-        limit_reached: Ezin duzu proposamen berririk sortu muga gainditu zenuenetik.
+        limit_reached: Ezin duzu proposamen berririk egin muga gainditu duzulako.
       participatory_text_proposal:
         alternative_title: Une honetan ez dago partaidetzazko testurik
         buttons:
-          amend: aldatzea
+          amend: Zuzendu
           comment: Iruzkina
-          comments: Oharrak
+          comments: Iruzkinak
       proposal_votes:
         create:
           error: Erroreak gertatu dira proposamena bozkatzean.
@@ -724,7 +767,7 @@ eu:
           title: Proposamen antzekoak
         complete:
           send: Bidali
-          title: Zure proposamena osatzea
+          title: Osatu zue proposamena
         count:
           proposals_count:
             one: "%{count} proposamen"
@@ -733,12 +776,12 @@ eu:
           description: Koordenatuak eguneratu egingo dira 'aurrebistaratu' botoian klik egiten duzunean. Baina helbidea ez da aldatzen.
           instructions: Kokapena mugitu ahal duzu mapan.
         edit:
-          add_documents: Dokumentuak
-          add_images: Fitxategia
+          add_documents: Dokumentuak atxikutu
+          add_image: Argazki bat atxikutu
           attachment_legend: "(Aukerakoa) Gehitu eranskina"
-          back: Back
-          delete_document: Ezabatu dokumentua
-          delete_image: Ezabatu irudia
+          back: Atzera
+          edit_documents: Editatu dokumentuak
+          edit_image: Irudia editatu
           gallery_legend: "(Aukerakoa) Gehitu irudi bat proposamen-txartelari"
           select_a_category: Hautatu kategoria bat
           send: Bidali
@@ -756,7 +799,7 @@ eu:
           my_proposals: Nire proposamenak
           origin: Jatorria
           related_to: Honekin lotuta
-          scope: esparrua
+          scope: Eremua
           search: Bilatu
           state: Egoera
           type: Mota
@@ -777,9 +820,10 @@ eu:
         linked_proposals:
           proposal_votes:
             one: proiektuaren alde egin
-            other: euskarriak
+            other: babesak
         new:
           send: Jarraitu
+          title: Sortu zure proposamena
         orders:
           label: 'Antolatu proposamenak honen arabera:'
           most_commented: Iruzkin gehien dituztenak
@@ -806,7 +850,7 @@ eu:
           publish: Argitaratu
           title: Argitaratu zure proposamena
         proposal:
-          creation_date: 'Sorkuntza: %{date}'
+          creation_date: 'Sortze data'
           view_proposal: Ikusi proposamena
         proposals:
           empty: Oraindik ez dago proposamenik
@@ -845,21 +889,21 @@ eu:
         vote_button:
           already_voted: Bozkatuta duzu
           already_voted_hover: Unvote
-          maximum_votes_reached: Vote muga iritsi da
-          no_votes_remaining: Ez da gelditzen botorik
+          maximum_votes_reached: Bozken mugara iritsi da
+          no_votes_remaining: Ez da botorik gelditzen
           vote: Proiektuaren alde egin
           votes_blocked: Bozketa desaktibatu da
         votes_count:
           count:
             one: SOSTENGU
-            other: SOSTENGU
+            other: Babesak
           most_popular_proposal: Proposamenrik ezagunena
-          need_more_votes: Botoak gehiago behar dituzu
+          need_more_votes: Botoa gehiago behar duzu
         voting_rules:
           can_accumulate_supports_beyond_threshold:
             description: Proposamen bakoitza %{limit} euskarri baino gehiagotan pilatu daiteke
           minimum_votes_per_user:
-            description: Gutxienez %{votes} boto eman behar dituzu proposamen desberdinen artean.
+            description: Gutxienez %{votes} bozka eman behar dituzu proposamen desberdinen artean.
             given_enough_votes: Onartutako euskarri guztiak eman dituzu.
             supports_remaining: '%{remaining_votes} boto gehiago proposatu behar dituzu zure botoak kontuan hartzeko.'
           proposal_limit:
@@ -869,10 +913,10 @@ eu:
           title: 'Botoak honako arauak ditu:'
           vote_limit:
             description: '%{limit} proposamenari bozkatu ahal zaizkio.'
-            left: Emateke
-            votes: Euskarriak
+            left: Geratzen diren hiru aukerak
+            votes: Babesak
         wizard_aside:
-          back: Back
+          back: Atzera
           back_from_step_1: Itzuli proposamenetara
           back_from_step_2: Itzuli proposamenetara
           back_from_step_3: Alderatu berriro proposamenak
@@ -883,9 +927,9 @@ eu:
           see_steps: ikusi urratsak
           step_1: Sortu zure proposamena
           step_2: konparatu
-          step_3: osoa
+          step_3: Osatuta
           step_4: Argitaratu zure proposamena
-          step_of: Urratsa %{current_step_num} de %{total_steps}
+          step_of: '%{total_steps} urratsetik %{current_step_num} eginda'
           title: Proposamen bat sortzeko urratsak
       proposals_picker:
         choose_proposals: Hautatu proposamenak
@@ -907,12 +951,12 @@ eu:
         collaborative_drafts:
           back_to_resource: Itzuli lankidetza zirriborrora
         index:
-          title: bertsioak
+          title: Bertsioak
         proposals:
-          back_to_resource: Joan proposamenari
+          back_to_resource: Joan proposamenera
       withdraw:
         errors:
-          has_supports: Proposamen hau ezin da kendu, dagoeneko onartzen duelako.
+          has_supports: Proposamen hau ezin da baztertu, bozkak dituelako.
     resource_links:
       copied_from_component:
         proposal_proposal: Lotutako proposamenak
diff --git a/decidim-proposals/config/locales/fi-plain.yml b/decidim-proposals/config/locales/fi-plain.yml
index b81543799c760..89f322ea6f44a 100644
--- a/decidim-proposals/config/locales/fi-plain.yml
+++ b/decidim-proposals/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ fi-pl:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -608,9 +609,9 @@ fi-pl:
           all: Kaikki
         filter_origin_values:
           all: Kaikki
-          citizens: Kansalaiset
           meetings: Tapaamiset
           official: Virallinen
+          participants: Osallistujat
           user_groups: Käyttäjäryhmät
         filter_scope_values:
           all: Kaikki
@@ -673,6 +674,8 @@ fi-pl:
           filter_by: Rajaa hakua
           unfold: Avaa
         new:
+          add_file: Lisää tiedosto
+          edit_file: Muokkaa tiedostoa
           send: Jatka
         new_collaborative_draft_button:
           new_collaborative_draft: Uusi yhteistyöluonnos
@@ -783,12 +786,12 @@ fi-pl:
           description: Koordinaatit päivitetään, kun painat Esikatsele-painiketta. Osoitetekstiä ei muuteta.
           instructions: Voit siirtää pistettä kartalla.
         edit:
-          add_documents: Asiakirjat
-          add_images: Tiedosto
+          add_documents: Lisää asiakirjoja
+          add_image: Lisää kuva
           attachment_legend: "(Valinnainen) Lisää liite"
           back: Takaisin
-          delete_document: Poista tiedosto
-          delete_image: Poista kuva
+          edit_documents: Muokkaa asiakirjoja
+          edit_image: Muokkaa kuvaa
           gallery_legend: "(Valinnainen) Lisää kuva ehdotuskorttiin"
           select_a_category: Valitse aihepiiri
           send: Lähetä
diff --git a/decidim-proposals/config/locales/fi.yml b/decidim-proposals/config/locales/fi.yml
index 9772ee02af8fe..08a8bb93ad426 100644
--- a/decidim-proposals/config/locales/fi.yml
+++ b/decidim-proposals/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ fi:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
+              allowed_file_content_types: 'Virheellinen tiedostomuoto. Ainoastaan seuraavat tiedostomuodot on sallittu: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -608,9 +609,9 @@ fi:
           all: Kaikki
         filter_origin_values:
           all: Kaikki
-          citizens: Kansalaiset
           meetings: Tapaamiset
           official: Virallinen
+          participants: Osallistujat
           user_groups: Käyttäjäryhmät
         filter_scope_values:
           all: Kaikki
@@ -673,6 +674,8 @@ fi:
           filter_by: Rajaa hakua
           unfold: Avaa
         new:
+          add_file: Lisää tiedosto
+          edit_file: Muokkaa tiedostoa
           send: Jatka
         new_collaborative_draft_button:
           new_collaborative_draft: Uusi yhteistyöluonnos
@@ -783,12 +786,12 @@ fi:
           description: Koordinaatit päivitetään, kun painat Esikatsele-painiketta. Osoitetekstiä ei muuteta.
           instructions: Voit siirtää pistettä kartalla.
         edit:
-          add_documents: Asiakirjat
-          add_images: Tiedosto
+          add_documents: Lisää asiakirjoja
+          add_image: Lisää kuva
           attachment_legend: "(Valinnainen) Lisää liite"
           back: Takaisin
-          delete_document: Poista tiedosto
-          delete_image: Poista kuva
+          edit_documents: Muokkaa asiakirjoja
+          edit_image: Muokkaa kuvaa
           gallery_legend: "(Valinnainen) Lisää kuva ehdotuskorttiin"
           select_a_category: Valitse aihepiiri
           send: Lähetä
diff --git a/decidim-proposals/config/locales/fr-CA.yml b/decidim-proposals/config/locales/fr-CA.yml
index 8a0aaac6dde8b..4677a6403364b 100644
--- a/decidim-proposals/config/locales/fr-CA.yml
+++ b/decidim-proposals/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ fr-CA:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont: %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
         proposal:
           attributes:
             add_documents:
@@ -405,7 +406,7 @@ fr-CA:
             answers: |
               Le document d'importation doit contenir les noms de colonnes suivants en cas de fichiers CSV ou Excel ou noms de clés suivants dans le cas de fichiers JSON :
               <ul>
-              <li><b>id:</b> ID de la proposition auquel on répond</li>
+              <li><b>id:</b> ID de la proposition à laquelle on répond</li>
               <li><b>state:</b>"accepted", "evaluating", ou "rejected"</li>
               <li><b>answer/en:</b> Réponse en langue anglaise. Cela dépendra de la configuration de langue de votre plateforme.</li>
               </ul>
@@ -609,9 +610,9 @@ fr-CA:
           all: Tout
         filter_origin_values:
           all: Tout
-          citizens: Propositions citoyennes
           meetings: Des réunions
           official: Propositions officielles
+          participants: Participants
           user_groups: Groupes d'utilisateurs
         filter_scope_values:
           all: Tout
@@ -674,6 +675,8 @@ fr-CA:
           filter_by: Filtrer par
           unfold: Se dérouler
         new:
+          add_file: Ajouter un fichier
+          edit_file: Modifier le fichier
           send: Continuer
         new_collaborative_draft_button:
           new_collaborative_draft: Nouveau brouillon collaboratif
@@ -784,12 +787,12 @@ fr-CA:
           description: Les coordonnées seront mises à jour en cliquant sur le bouton 'Aperçu'. Cependant, l'adresse ne change pas.
           instructions: Vous pouvez déplacer le point sur la carte.
         edit:
-          add_documents: Documents
-          add_images: Fichier
+          add_documents: Ajouter des documents
+          add_image: Ajouter une image
           attachment_legend: "(Facultatif) Ajouter une pièce jointe"
           back: Retour
-          delete_document: Supprimer le document
-          delete_image: Supprimer l'image
+          edit_documents: Modifier les documents
+          edit_image: Modifier l'Image
           gallery_legend: "(Facultatif) Ajouter une image à la carte de proposition"
           select_a_category: Veuillez sélectionner une catégorie
           send: Envoyer
diff --git a/decidim-proposals/config/locales/fr.yml b/decidim-proposals/config/locales/fr.yml
index ad22362b435cb..92056386f86bb 100644
--- a/decidim-proposals/config/locales/fr.yml
+++ b/decidim-proposals/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ fr:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Type de document invalide. Les formats acceptés sont: %{valid_mime_types}'
+              allowed_file_content_types: 'Type de document invalide. Seuls les fichiers avec les extensions suivantes sont autorisés : %{types}'
         proposal:
           attributes:
             add_documents:
@@ -405,7 +406,7 @@ fr:
             answers: |
               Le document d'importation doit contenir les noms de colonnes suivants en cas de fichiers CSV ou Excel ou noms de clés suivants dans le cas de fichiers JSON :
               <ul>
-              <li><b>id:</b> ID de la proposition auquel on répond</li>
+              <li><b>id:</b> ID de la proposition à laquelle on répond</li>
               <li><b>state:</b>"accepted", "evaluating", ou "rejected"</li>
               <li><b>answer/en:</b> Réponse en langue anglaise. Cela dépendra de la configuration de langue de votre plateforme.</li>
               </ul>
@@ -609,9 +610,9 @@ fr:
           all: Tout
         filter_origin_values:
           all: Tout
-          citizens: Propositions citoyennes
           meetings: Des réunions
           official: Propositions officielles
+          participants: Participants
           user_groups: Groupes d'utilisateurs
         filter_scope_values:
           all: Tout
@@ -674,6 +675,8 @@ fr:
           filter_by: Filtrer par
           unfold: Se dérouler
         new:
+          add_file: Ajouter un fichier
+          edit_file: Modifier le fichier
           send: Continuer
         new_collaborative_draft_button:
           new_collaborative_draft: Nouveau brouillon collaboratif
@@ -784,12 +787,12 @@ fr:
           description: Les coordonnées seront mises à jour en cliquant sur le bouton 'Aperçu'. Cependant, l'adresse ne change pas.
           instructions: Vous pouvez déplacer le point sur la carte.
         edit:
-          add_documents: Documents
-          add_images: Fichier
+          add_documents: Ajouter des documents
+          add_image: Ajouter une image
           attachment_legend: "(Facultatif) Ajouter une pièce jointe"
           back: Retour
-          delete_document: Supprimer le document
-          delete_image: Supprimer l'image
+          edit_documents: Modifier les documents
+          edit_image: Modifier l'Image
           gallery_legend: "(Facultatif) Ajouter une image à la carte de proposition"
           select_a_category: Veuillez sélectionner une catégorie
           send: Envoyer
diff --git a/decidim-proposals/config/locales/ga-IE.yml b/decidim-proposals/config/locales/ga-IE.yml
index fee11af15fb6a..4d1bf264f5272 100644
--- a/decidim-proposals/config/locales/ga-IE.yml
+++ b/decidim-proposals/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -144,7 +145,6 @@ ga:
           all: Uile
         filter_origin_values:
           all: Uile
-          citizens: Saoránaigh
           meetings: Cruinnithe
           official: Oifigiúil
           user_groups: Grúpaí
@@ -223,7 +223,6 @@ ga:
         complete:
           send: Seol
         edit:
-          add_images: Comhad
           back: Ar Ais
           select_a_category: Roghnaigh catagóir le do thoil
           send: Seol
diff --git a/decidim-proposals/config/locales/gl.yml b/decidim-proposals/config/locales/gl.yml
index 5ae86b350d79d..9b1fa2b084607 100644
--- a/decidim-proposals/config/locales/gl.yml
+++ b/decidim-proposals/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ gl:
           valuator_role_id: Nome do avaliador/a
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento non válido. Os formatos aceptados son: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -505,9 +502,9 @@ gl:
           all: Todo
         filter_origin_values:
           all: Todo
-          citizens: Cidadáns
           meetings: Reunións
           official: Oficial
+          participants: Participantes
           user_groups: Grupos de usuarios
         filter_scope_values:
           all: Todo
@@ -569,6 +566,8 @@ gl:
           filter_by: Filtrar por
           unfold: Despregar
         new:
+          add_file: Engadir ficheiro
+          edit_file: Editar ficheiro
           send: Continuar
         new_collaborative_draft_button:
           new_collaborative_draft: Novo borrador colaborativo
@@ -677,12 +676,12 @@ gl:
         dynamic_map_instructions:
           instructions: Podes mover o punto no mapa.
         edit:
-          add_documents: Documentos
-          add_images: Ficheiro
+          add_documents: Engadir documentos
+          add_image: Engadir imaxe
           attachment_legend: "(Opcional) Engada un anexo"
           back: De volta
-          delete_document: Eliminar documento
-          delete_image: Eliminar imaxe
+          edit_documents: Editar documentos
+          edit_image: Editar imaxe
           gallery_legend: "(Opcional) Engadir unha imaxe ao cartón de proposta"
           select_a_category: Selecciona unha categoría
           send: Enviar
diff --git a/decidim-proposals/config/locales/hu.yml b/decidim-proposals/config/locales/hu.yml
index d5fc46d8b24c1..9c259241d2a0f 100644
--- a/decidim-proposals/config/locales/hu.yml
+++ b/decidim-proposals/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ hu:
           valuator_role_id: Értékelő neve
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Érvénytelen dokumentumtípus. Az elfogadott formátumok: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -502,9 +499,9 @@ hu:
           all: Minden
         filter_origin_values:
           all: Minden
-          citizens: �llampolgárok
           meetings: Találkozók
           official: Hivatalos
+          participants: Résztvevők
           user_groups: Felhasználói csoportok
         filter_scope_values:
           all: Minden
@@ -566,6 +563,8 @@ hu:
           filter_by: 'Szűrés ez alapján:'
           unfold: Kibont
         new:
+          add_file: Fájl hozzáadása
+          edit_file: Fájl szerkesztése
           send: Tovább
         new_collaborative_draft_button:
           new_collaborative_draft: Új közös vázlat
@@ -668,12 +667,12 @@ hu:
             one: "%{count} javaslat"
             other: "%{count} javaslatot"
         edit:
-          add_documents: Dokumentumok
-          add_images: Fájl
+          add_documents: Dokumentum hozzáadása
+          add_image: Kép hozzáadása
           attachment_legend: "(Nem kötelező) Melléklet hozzáadása"
           back: Vissza
-          delete_document: Dokumentum törlése
-          delete_image: Kép törlése
+          edit_documents: Dokumentum szerkesztése
+          edit_image: Kép szerkesztése
           select_a_category: Válassz kategóriát
           send: Küldés
           title: Javaslat szerkesztése
diff --git a/decidim-proposals/config/locales/id-ID.yml b/decidim-proposals/config/locales/id-ID.yml
index 7300e85ebbaf8..4a2eda23935a9 100644
--- a/decidim-proposals/config/locales/id-ID.yml
+++ b/decidim-proposals/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -32,10 +33,6 @@ id:
         keep_authors: Simpan penulis asli
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Jenis dokumen tidak valid. Format yang diterima adalah: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -390,7 +387,6 @@ id:
           all: Semua
         filter_origin_values:
           all: Semua
-          citizens: Warga
           meetings: Rapat
           official: Resmi
           user_groups: Grup Pengguna
diff --git a/decidim-proposals/config/locales/is-IS.yml b/decidim-proposals/config/locales/is-IS.yml
index 89492809f0191..47cf3c743b3a9 100644
--- a/decidim-proposals/config/locales/is-IS.yml
+++ b/decidim-proposals/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       proposal:
@@ -169,7 +170,6 @@ is-IS:
         withdrawn: Aftakað
       application_helper:
         filter_origin_values:
-          citizens: Borgarar
           official: Opinber
         filter_state_values:
           not_answered: Ekki svarað
diff --git a/decidim-proposals/config/locales/it.yml b/decidim-proposals/config/locales/it.yml
index b822e6bb417d8..62207094e9f10 100644
--- a/decidim-proposals/config/locales/it.yml
+++ b/decidim-proposals/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ it:
           valuator_role_id: Nome del valutatore
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo di documento non valido. I formati accettati sono: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -539,9 +536,9 @@ it:
           all: Tutti
         filter_origin_values:
           all: Tutti
-          citizens: Cittadini
           meetings: Incontri
           official: Ufficiale
+          participants: Utenti
           user_groups: Gruppi di utenti
         filter_scope_values:
           all: Tutti
@@ -713,12 +710,8 @@ it:
           description: Le coordinate verranno aggiornate quando si fa clic sul pulsante 'Anteprima'. Tuttavia, l'indirizzo non cambia.
           instructions: Puoi spostare il punto sulla mappa.
         edit:
-          add_documents: Documenti
-          add_images: File
           attachment_legend: "(Opzionale) Aggiungi un allegato"
           back: Indietro
-          delete_document: Elimina Documento
-          delete_image: Elimina Immagine
           gallery_legend: "(Facoltativo) Aggiungi un'immagine alla scheda proposta"
           select_a_category: Seleziona una categoria
           send: Inviare
diff --git a/decidim-proposals/config/locales/ja.yml b/decidim-proposals/config/locales/ja.yml
index 90896a6cda044..451fec91fe22e 100644
--- a/decidim-proposals/config/locales/ja.yml
+++ b/decidim-proposals/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ ja:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: '無効�種類�ドキュメント��。承��れ�フォーマット�次���り��: %{valid_mime_types}'
+              allowed_file_content_types: '無効�ドキュメントタイプ��。次�拡張�を��ファイル��許��れ����: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -397,6 +398,22 @@ ja:
           proposal_comments: コメント
           proposals: �案
         imports:
+          help:
+            answers: |
+              イン�ートドキュメント���CSVやExcelファイル�場��以下�カラム��JSONファイル�場��キー����れ��る必���り��:
+              <ul>
+              <li><b>id:</b> 回答�る�案�ID</li>
+              <li><b>state:</b> "accepted", "evaluating", "rejected"�����れ�</li>
+              <li><b>answer/en:</b> 英語��回答。�れ�プラットフォーム�言語設定��存���。</li>
+              </ul>
+            proposals: |
+              CSVファイルやExcelファイル�場��以下�カラム��JSONファイル�場��キー��必���:
+              <ul>
+              <li><b>title/en:</b> 英語��タイトル。�れ�プラットフォーム�言語設定��存���。</li>
+              <li><b>body/en:</b> 英語��本文。�れ�プラットフォーム�言語設定��存���。</li>
+              <li><b>scope/id:</b> スコープ�ID</li>
+              <li><b>category/id:</b> カテゴリー�ID</li>
+              </ul>
           label:
             answers: ファイル�ら回答をイン�ート
             proposals: ファイル�ら�案をイン�ート
@@ -586,9 +603,9 @@ ja:
           all: ���
         filter_origin_values:
           all: ���
-          citizens: 一般�加者
           meetings: ミーティング
           official: 事務局
+          participants: �加者
           user_groups: グループ
         filter_scope_values:
           all: ���
@@ -650,6 +667,8 @@ ja:
           filter_by: フィルター
           unfold: 展開�る
         new:
+          add_file: ファイルを追加
+          edit_file: ファイルを編集
           send: 続�る
         new_collaborative_draft_button:
           new_collaborative_draft: 新��共��案を作�
@@ -758,12 +777,12 @@ ja:
           description: '「プレビュー�ボタンをクリック�る�座標�更新�れ����アドレス�変更�れ��ん。'
           instructions: 地図上��イントを移動����。
         edit:
-          add_documents: ドキュメント
-          add_images: ファイル
+          add_documents: ドキュメントを追加
+          add_image: 画�を追加
           attachment_legend: "(オプション) 添付ファイルを追加"
           back: 戻る
-          delete_document: ドキュメント�削除
-          delete_image: 画�を削除
+          edit_documents: ドキュメントを編集
+          edit_image: 画�を編集
           gallery_legend: "(オプション) �案カード�画�を追加�る"
           select_a_category: カテゴリを�択������
           send: �信
diff --git a/decidim-proposals/config/locales/ka-GE.yml b/decidim-proposals/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-proposals/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-proposals/config/locales/lb.yml b/decidim-proposals/config/locales/lb.yml
index 8e91e4ea63618..612617c8867aa 100644
--- a/decidim-proposals/config/locales/lb.yml
+++ b/decidim-proposals/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activerecord:
     models:
diff --git a/decidim-proposals/config/locales/lt.yml b/decidim-proposals/config/locales/lt.yml
index 2750bceb4d801..4c8ce9f525a68 100644
--- a/decidim-proposals/config/locales/lt.yml
+++ b/decidim-proposals/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ lt:
           valuator_role_id: Vertintojo vardas ir pavardÄ—
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Netinkamas dokumento tipas. Priimtini formatai: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -606,9 +603,9 @@ lt:
           all: Visi
         filter_origin_values:
           all: Visi
-          citizens: Pilie�iai
           meetings: Susitikimai
           official: Oficialūs
+          participants: Dalyviai
           user_groups: GrupÄ—s
         filter_scope_values:
           all: Visi
@@ -672,6 +669,8 @@ lt:
           filter_by: Filtruoti pagal
           unfold: IÅ¡skleisti
         new:
+          add_file: PridÄ—ti failÄ…
+          edit_file: Redaguoti failÄ…
           send: Tęsti
         new_collaborative_draft_button:
           new_collaborative_draft: Naujas bendrasis projektas
@@ -786,12 +785,12 @@ lt:
           description: Koordinatės bus atnaujintos paspaudus mygtuką „Peržiūrėti“. Ta�iau adresas nesikei�ia.
           instructions: Galite perkelti tašką žemėlapyje.
         edit:
-          add_documents: Dokumentai
-          add_images: Rinkmena
+          add_documents: PridÄ—ti dokumentus
+          add_image: Pridėti paveikslėlį
           attachment_legend: "(Neprivaloma) PridÄ—ti priedÄ…"
           back: Atgal
-          delete_document: IÅ¡trinti DokumentÄ…
-          delete_image: Pašalinti Paveikslėlį
+          edit_documents: Redaguoti dokumentus
+          edit_image: Redaguoti atvaizdÄ…
           gallery_legend: "(Neprivaloma) Pridėkite vaizdą prie pasiūlymo kortelės"
           select_a_category: Pasirinkite kategorijÄ…
           send: Siųsti
diff --git a/decidim-proposals/config/locales/lv.yml b/decidim-proposals/config/locales/lv.yml
index 78ac29a2f964c..671ad5b147bf4 100644
--- a/decidim-proposals/config/locales/lv.yml
+++ b/decidim-proposals/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ lv:
           valuator_role_id: Vērtēt�ja v�rds
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Nederīgs dokumenta tips. Pieņemtie form�ti ir: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -484,7 +481,6 @@ lv:
           all: Visi
         filter_origin_values:
           all: Visi
-          citizens: Pilsoņi
           meetings: San�ksmes
           official: Ofici�l�
           user_groups: Grupas
@@ -652,7 +648,6 @@ lv:
             one: "%{count} priekšlikums"
             other: "%{count} priekšlikumi"
         edit:
-          add_documents: Dokumenti
           attachment_legend: "(Pēc izvēles) Pievienojiet pielikumu"
           back: Atpakaļ
           select_a_category: Lūdzu, izvēlieties kategoriju
diff --git a/decidim-proposals/config/locales/nl.yml b/decidim-proposals/config/locales/nl.yml
index fc60628359769..eb4ed4e4279b8 100644
--- a/decidim-proposals/config/locales/nl.yml
+++ b/decidim-proposals/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ nl:
           valuator_role_id: Naam beoordelaar
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ongeldig documenttype. Aanvaarde formaten zijn: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -553,9 +550,9 @@ nl:
           all: Alle
         filter_origin_values:
           all: Alle
-          citizens: Burgers
           meetings: vergaderingen
           official: Officieel
+          participants: Deelnemers
           user_groups: Groepen
         filter_scope_values:
           all: Alle
@@ -727,12 +724,8 @@ nl:
           description: De coördinaten worden bijgewerkt bij het klikken op de 'preview' knop. Het adres verandert echter niet.
           instructions: Je kunt het punt op de kaart verplaatsen.
         edit:
-          add_documents: Documenten
-          add_images: Bestand
           attachment_legend: "(Optioneel) Voeg een bijlage toe"
           back: Terug
-          delete_document: Document verwijderen
-          delete_image: Afbeelding verwijderen
           gallery_legend: "(Optioneel) Voeg een afbeelding toe aan het voorstel"
           select_a_category: Selecteer een categorie
           send: Verzenden
diff --git a/decidim-proposals/config/locales/no.yml b/decidim-proposals/config/locales/no.yml
index d30293f599ed7..ce71972eef995 100644
--- a/decidim-proposals/config/locales/no.yml
+++ b/decidim-proposals/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -39,10 +40,6 @@
         keep_authors: Behold originale forfattere
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ugyldig dokumenttype. Godkjente formater er: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -536,7 +533,6 @@
           all: Alle
         filter_origin_values:
           all: Alle
-          citizens: Borgere
           meetings: Møter
           official: Offisiell
           user_groups: Grupper
@@ -699,7 +695,6 @@
             one: "%{count} forslag"
             other: "%{count} forslag"
         edit:
-          add_documents: Dokumenter
           attachment_legend: "(Valgfritt) Legg til et vedlegg"
           back: Tilbake
           select_a_category: Velg en kategori
diff --git a/decidim-proposals/config/locales/pl.yml b/decidim-proposals/config/locales/pl.yml
index 8acabd02d8937..49bf337f78f08 100644
--- a/decidim-proposals/config/locales/pl.yml
+++ b/decidim-proposals/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -41,10 +42,6 @@ pl:
           valuator_role_id: ImiÄ™ weryfikatora
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Nieprawidłowy typ dokumentu. Akceptowane formaty to: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -56,6 +53,14 @@ pl:
               identical: I tytuł nie może być identyczny
             title:
               identical: I treść nie może być identyczna
+        proposals_merge:
+          attributes:
+            base:
+              not_official: Nieoficjalne
+        proposals_split:
+          attributes:
+            base:
+              supported: Otrzymano wsparcie lub potwierdzenia
     models:
       decidim/proposals/accepted_proposal_event: Wniosek został przyjęty
       decidim/proposals/admin/update_proposal_category_event: Zmieniono kategoriÄ™ propozycji
@@ -182,6 +187,8 @@ pl:
             answers_with_costs: Zezwalaj na koszty w odpowiedziach na propozycje
             automatic_hashtags: Hashtagi dodane do wszystkich propozycji
             comments_blocked: Komentarze zablokowane
+            default_sort_order_options:
+              most_voted: Najwiecej wsparć
             endorsements_blocked: Rekomendacje zostały zablokowane
             endorsements_enabled: Rekomendacje włączone
             proposal_answering_enabled: WÅ‚Ä…czono odpowiadanie na propozycjÄ™
@@ -357,6 +364,13 @@ pl:
         exports:
           proposal_comments: Komentarze
           proposals: Propozycje
+        imports:
+          resources:
+            answers:
+              one: odpowiedź na propozycję
+              few: odpowiedzi na propozycjÄ™
+              many: odpowiedzi na propozycjÄ™
+              other: odpowiedzi na propozycjÄ™
         models:
           proposal:
             name: Propozycja
@@ -535,7 +549,6 @@ pl:
           all: Wszystko
         filter_origin_values:
           all: Wszystko
-          citizens: Obywatele
           meetings: Spotkania
           official: Urzędnik
           user_groups: Grupy użytkowników
@@ -712,12 +725,8 @@ pl:
             many: "%{count} propozycji"
             other: "%{count} propozycji"
         edit:
-          add_documents: Dokumenty
-          add_images: Plik
           attachment_legend: "(Opcjonalnie) Dodaj załącznik"
           back: Wróć
-          delete_document: Usuń dokument
-          delete_image: Usuń obraz
           gallery_legend: "(Opcjonalnie) Dodaj obraz do karty propozycji"
           select_a_category: Wybierz kategoriÄ™
           send: Wyślij
diff --git a/decidim-proposals/config/locales/pt-BR.yml b/decidim-proposals/config/locales/pt-BR.yml
index 97178be069cd0..1c151761a26fd 100644
--- a/decidim-proposals/config/locales/pt-BR.yml
+++ b/decidim-proposals/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ pt-BR:
           valuator_role_id: Nome do Avaliador
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceitos são: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -526,7 +523,6 @@ pt-BR:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Cidadãos
           meetings: Reuniões
           official: Oficial
           user_groups: Grupos de usuários
@@ -700,12 +696,8 @@ pt-BR:
           description: As coordenadas serão atualizadas quando clicar no botão 'visualizar'. No entanto, o endereço não muda.
           instructions: Você pode mover o ponto no mapa.
         edit:
-          add_documents: Documentos
-          add_images: Arquivo
           attachment_legend: "(Opcional) Adicione um anexo"
           back: Voltar
-          delete_document: Apagar Documento
-          delete_image: Excluir Imagem
           gallery_legend: "(Opcional) Adicione uma imagem à carta da proposta"
           select_a_category: Selecione uma categoria
           send: Enviar
diff --git a/decidim-proposals/config/locales/pt.yml b/decidim-proposals/config/locales/pt.yml
index b9fe227aa1823..a8b926f3cabb0 100644
--- a/decidim-proposals/config/locales/pt.yml
+++ b/decidim-proposals/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ pt:
           valuator_role_id: Nome do avaliador
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Os formatos aceites são: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -560,7 +557,6 @@ pt:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Cidadãos
           meetings: Reuniões
           official: Oficial
           user_groups: Grupos
@@ -734,12 +730,8 @@ pt:
           description: As coordenadas serão actualizadas quando clicar no botão ‘pré-visualização’. No entanto, o endereço não será alterado.
           instructions: Pode mover o ponto no mapa.
         edit:
-          add_documents: Documentos
-          add_images: Ficheiro
           attachment_legend: "(Opcional) Adicione um anexo"
           back: Voltar
-          delete_document: Apagar Documento
-          delete_image: Apagar Imagem
           gallery_legend: "(Opcional) Adicionar uma imagem ao cartão da proposta"
           select_a_category: Por favor selecione uma categoria
           send: Enviar
diff --git a/decidim-proposals/config/locales/ro-RO.yml b/decidim-proposals/config/locales/ro-RO.yml
index ec1d1f717a72c..80b0fc861d018 100644
--- a/decidim-proposals/config/locales/ro-RO.yml
+++ b/decidim-proposals/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ ro:
           valuator_role_id: Numele evaluatorului
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tip de document invalid. Formatele acceptate sunt: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -583,9 +580,9 @@ ro:
           all: Toate
         filter_origin_values:
           all: Toate
-          citizens: Cetățeni
           meetings: Întâlniri
           official: Oficial
+          participants: Participanți
           user_groups: Grupuri
         filter_scope_values:
           all: Toate
@@ -760,12 +757,8 @@ ro:
           description: Coordonatele vor fi actualizate când apeși pe butonul 'previzualizează'. Cu toate acestea, adresa nu se schimbă.
           instructions: Poți muta punctul de pe hartă.
         edit:
-          add_documents: Documente
-          add_images: FiÅŸier
           attachment_legend: "(Opțional) Adaugă un atașament"
           back: ÃŽnapoi
-          delete_document: Șterge documentul
-          delete_image: Șterge imaginea
           gallery_legend: "(Opțional) Adaugă o imagine la cardul de propunere"
           select_a_category: Te rugăm selectează o categorie
           send: Trimite
diff --git a/decidim-proposals/config/locales/ru.yml b/decidim-proposals/config/locales/ru.yml
index e7a5cf2eba5cc..9c9ad306d883d 100644
--- a/decidim-proposals/config/locales/ru.yml
+++ b/decidim-proposals/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ ru:
         withdrawn: Отозван
       application_helper:
         filter_origin_values:
-          citizens: Граждане
           official: Служебные
         filter_state_values:
           not_answered: Без ответов
diff --git a/decidim-proposals/config/locales/sk.yml b/decidim-proposals/config/locales/sk.yml
index d90f3227d8a0e..55e73663b82ac 100644
--- a/decidim-proposals/config/locales/sk.yml
+++ b/decidim-proposals/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -39,10 +40,6 @@ sk:
           valuator_role_id: Meno hodnotiteľa
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Neplatný typ dokumentu. Prijateľné formáty sú: %{valid_mime_types} '
         proposal:
           attributes:
             add_documents:
@@ -488,7 +485,6 @@ sk:
           all: VÅ¡etko
         filter_origin_values:
           all: VÅ¡etko
-          citizens: Ob�ania
           meetings: Stretnutie
           official: Oficiálne
           user_groups: Skupiny užívateľov
@@ -660,7 +656,6 @@ sk:
             many: "%{count} návrhov"
             other: "%{count} návrhov"
         edit:
-          add_documents: Dokumenty
           attachment_legend: "(Voliteľné) Pridanie prílohy"
           back: Zadná
           select_a_category: Vyberte kategóriu
diff --git a/decidim-proposals/config/locales/sl.yml b/decidim-proposals/config/locales/sl.yml
index ffef06cec7573..1714ce7435cba 100644
--- a/decidim-proposals/config/locales/sl.yml
+++ b/decidim-proposals/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-proposals/config/locales/sr-CS.yml b/decidim-proposals/config/locales/sr-CS.yml
index 011e6b5cd6ead..1c6a7bbf6242e 100644
--- a/decidim-proposals/config/locales/sr-CS.yml
+++ b/decidim-proposals/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
@@ -109,8 +110,6 @@ sr:
             valuator: Procenjiva�
             valuators: Procenjiva�i
       proposals:
-        edit:
-          add_documents: Dokumenti
         show:
           back_to_list: Nazad na listu
           estimated_cost: Procenjen trošak
diff --git a/decidim-proposals/config/locales/sv.yml b/decidim-proposals/config/locales/sv.yml
index f4165f3209508..db6768353fad0 100644
--- a/decidim-proposals/config/locales/sv.yml
+++ b/decidim-proposals/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ sv:
           valuator_role_id: Värderarens namn
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ogiltig dokumenttyp. Godkända format är: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -439,6 +436,7 @@ sv:
             accepted: Accepterat
             answer_proposal: Svara
             evaluating: Utvärderas
+            not_answered: Ej besvarade
             rejected: Avvisat
             title: Svar på förslaget %{title}
         proposal_notes:
@@ -576,9 +574,9 @@ sv:
           all: Alla
         filter_origin_values:
           all: Alla
-          citizens: Medborgare
           meetings: Möten
           official: Officiella
+          participants: Deltagare
           user_groups: Grupper
         filter_scope_values:
           all: Alla
@@ -640,6 +638,7 @@ sv:
           filter_by: Filtrera efter
           unfold: Veckla ut
         new:
+          add_file: Lägg till fil
           send: Fortsätt
         new_collaborative_draft_button:
           new_collaborative_draft: Nytt gemensamt utkast
@@ -750,12 +749,10 @@ sv:
           description: Koordinaterna uppdateras när du klickar på knappen 'Förhandsgranska'. Adressen ändras dock inte.
           instructions: Nu kan du flytta markören på kartan.
         edit:
-          add_documents: Dokument
-          add_images: Bild
+          add_documents: Lägga till dokument
           attachment_legend: "(Frivilligt) Lägg till en bilaga"
           back: Tillbaka
-          delete_document: Radera dokument
-          delete_image: Radera bild
+          edit_documents: Ändra dokument
           gallery_legend: "(Frivilligt) Lägg till en bild"
           select_a_category: Välj en kategori
           send: Skicka
diff --git a/decidim-proposals/config/locales/tr-TR.yml b/decidim-proposals/config/locales/tr-TR.yml
index 9040a184cfdb1..1505718a194a2 100644
--- a/decidim-proposals/config/locales/tr-TR.yml
+++ b/decidim-proposals/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -41,10 +42,6 @@ tr:
           valuator_role_id: Bilirkişi adı
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz doküman tipi. Kabul edilen formatlar: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -518,7 +515,6 @@ tr:
           all: Tümü
         filter_origin_values:
           all: Tümü
-          citizens: VatandaÅŸlar
           meetings: Toplantılar
           official: Resmi
           user_groups: Gruplar
@@ -688,12 +684,8 @@ tr:
             one: "%{count} teklif"
             other: "%{count} teklif"
         edit:
-          add_documents: Dokümanlar
-          add_images: Dosya
           attachment_legend: "(İsteğe bağlı) Bir ek ekleyin"
           back: Geri
-          delete_document: Doküman Sil
-          delete_image: Resmi sil
           gallery_legend: "(İsteğe bağlı) Teklif kartına bir resim ekleyin"
           select_a_category: Lütfen bir kategori seçin
           send: Gönder
diff --git a/decidim-proposals/config/locales/uk.yml b/decidim-proposals/config/locales/uk.yml
index 7e2a5f4529f2a..81607b3e06853 100644
--- a/decidim-proposals/config/locales/uk.yml
+++ b/decidim-proposals/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ uk:
         withdrawn: Відкликана
       application_helper:
         filter_origin_values:
-          citizens: Громад�ни
           official: Службове
         filter_state_values:
           not_answered: Без відповідей
diff --git a/decidim-proposals/config/locales/zh-CN.yml b/decidim-proposals/config/locales/zh-CN.yml
index fd3511ab16753..33997b96654ed 100644
--- a/decidim-proposals/config/locales/zh-CN.yml
+++ b/decidim-proposals/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -38,10 +39,6 @@ zh-CN:
           valuator_role_id: 值�称
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接�的格�为： %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -498,7 +495,6 @@ zh-CN:
           all: 所有的
         filter_origin_values:
           all: 所有的
-          citizens: Citizens
           meetings: 会议
           official: 官方的
           user_groups: 群組
@@ -662,12 +658,8 @@ zh-CN:
           proposals_count:
             other: "%{count} 个�议"
         edit:
-          add_documents: www.un.org/webcast
-          add_images: 文件
           attachment_legend: "(�选) 添加附件"
           back: �退
-          delete_document: 删除文档
-          delete_image: 删除图�
           gallery_legend: "(�选) 添加图�到�案�"
           select_a_category: 请选择一个类别
           send: ��
diff --git a/decidim-proposals/db/migrate/20180529110230_move_authorships_to_coauthorships.rb b/decidim-proposals/db/migrate/20180529110230_move_authorships_to_coauthorships.rb
index 2ba3c977370d9..645698e8938c2 100644
--- a/decidim-proposals/db/migrate/20180529110230_move_authorships_to_coauthorships.rb
+++ b/decidim-proposals/db/migrate/20180529110230_move_authorships_to_coauthorships.rb
@@ -4,6 +4,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end
diff --git a/decidim-proposals/decidim-proposals.gemspec b/decidim-proposals/decidim-proposals.gemspec
index 58acd4394e290..6cb1c79fe653f 100644
--- a/decidim-proposals/decidim-proposals.gemspec
+++ b/decidim-proposals/decidim-proposals.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-proposals"
   s.summary = "Decidim proposals module"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-comments", Decidim::Proposals.version
   s.add_dependency "decidim-core", Decidim::Proposals.version
-  s.add_dependency "doc2text", "~> 0.4.4"
+  s.add_dependency "doc2text", "~> 0.4.5"
   s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
 
   s.add_development_dependency "decidim-admin", Decidim::Proposals.version
diff --git a/decidim-proposals/lib/decidim/proposals/component.rb b/decidim-proposals/lib/decidim/proposals/component.rb
index ea39e57c3d224..87b672128d801 100644
--- a/decidim-proposals/lib/decidim/proposals/component.rb
+++ b/decidim-proposals/lib/decidim/proposals/component.rb
@@ -266,26 +266,31 @@
         visibility: "all"
       ) do
         proposal = Decidim::Proposals::Proposal.new(params)
-        proposal.add_coauthor(participatory_space.organization)
+        meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+
+        coauthor = case n
+                   when 0
+                     Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 1
+                     Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 2
+                     Decidim::Meetings::Meeting.where(component: meeting_component).order(Arel.sql("RANDOM()")).first
+                   else
+                     participatory_space.organization
+                   end
+        proposal.add_coauthor(coauthor)
         proposal.save!
         proposal
       end
 
-      if n.positive?
-        Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
-        end
-      end
-
       if proposal.state.nil?
         email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -350,8 +355,8 @@
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -372,8 +377,8 @@
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,
diff --git a/decidim-proposals/lib/decidim/proposals/import/proposal_answer_creator.rb b/decidim-proposals/lib/decidim/proposals/import/proposal_answer_creator.rb
index 1b87a6a65c100..eb5e3f9b28382 100644
--- a/decidim-proposals/lib/decidim/proposals/import/proposal_answer_creator.rb
+++ b/decidim-proposals/lib/decidim/proposals/import/proposal_answer_creator.rb
@@ -40,26 +40,28 @@ def finish!
         private
 
         def resource
-          @resource ||= begin
-            proposal = Decidim::Proposals::Proposal.find_by(id: id)
-            return nil unless proposal
-            return nil if proposal.emendation?
-
-            if proposal.component != component
-              proposal.errors.add(:component, :invalid)
-              return proposal
-            end
-
-            proposal.answer = answer
-            proposal.answered_at = Time.current
-            if POSSIBLE_ANSWER_STATES.include?(state)
-              proposal.state = state
-              proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
-            else
-              proposal.errors.add(:state, :invalid)
-            end
-            proposal
+          @resource ||= fetch_resource
+        end
+
+        def fetch_resource
+          proposal = Decidim::Proposals::Proposal.find_by(id: id)
+          return nil unless proposal
+          return nil if proposal.emendation?
+
+          if proposal.component != component
+            proposal.errors.add(:component, :invalid)
+            return proposal
+          end
+
+          proposal.answer = answer
+          proposal.answered_at = Time.current
+          if POSSIBLE_ANSWER_STATES.include?(state)
+            proposal.state = state
+            proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
+          else
+            proposal.errors.add(:state, :invalid)
           end
+          proposal
         end
 
         def id
diff --git a/decidim-proposals/lib/decidim/proposals/test/factories.rb b/decidim-proposals/lib/decidim/proposals/test/factories.rb
index d0ef6c8b0d067..50d9f6b07de1b 100644
--- a/decidim-proposals/lib/decidim/proposals/test/factories.rb
+++ b/decidim-proposals/lib/decidim/proposals/test/factories.rb
@@ -305,7 +305,7 @@
       published_at { nil }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       after :build do |proposal|
         proposal.coauthorships.clear
         user = build(:user, organization: proposal.component.participatory_space.organization)
diff --git a/decidim-proposals/lib/decidim/proposals/version.rb b/decidim-proposals/lib/decidim/proposals/version.rb
index 44e2aed1bf912..d911e10fbfde0 100644
--- a/decidim-proposals/lib/decidim/proposals/version.rb
+++ b/decidim-proposals/lib/decidim/proposals/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-proposals/spec/cells/decidim/proposals/collaborative_draft_cell_spec.rb b/decidim-proposals/spec/cells/decidim/proposals/collaborative_draft_cell_spec.rb
index c8ab854f039dc..a9d32237c064b 100644
--- a/decidim-proposals/spec/cells/decidim/proposals/collaborative_draft_cell_spec.rb
+++ b/decidim-proposals/spec/cells/decidim/proposals/collaborative_draft_cell_spec.rb
@@ -14,7 +14,7 @@
   let!(:collaborative_draft) { create(:collaborative_draft, component: component) }
   let(:authors) { create_list(:user, 5, organization: component.organization) }
   let(:collaborative_draft_va) { create(:collaborative_draft, component: component, users: authors) }
-  let(:context) {}
+  let(:context) { nil }
 
   let(:card_label) { subject.find(".card__label") }
   let(:card_content) { subject.find(".card__content") }
diff --git a/decidim-proposals/spec/cells/decidim/proposals/proposal_m_cell_spec.rb b/decidim-proposals/spec/cells/decidim/proposals/proposal_m_cell_spec.rb
index 677555c20119b..c3ff16b2ef363 100644
--- a/decidim-proposals/spec/cells/decidim/proposals/proposal_m_cell_spec.rb
+++ b/decidim-proposals/spec/cells/decidim/proposals/proposal_m_cell_spec.rb
@@ -10,7 +10,7 @@ module Decidim::Proposals
 
     let(:my_cell) { cell("decidim/proposals/proposal_m", proposal, context: { show_space: show_space }) }
     let(:cell_html) { my_cell.call }
-    let(:created_at) { Time.current - 1.month }
+    let(:created_at) { 1.month.ago }
     let(:published_at) { Time.current }
     let(:component) { create(:proposal_component, :with_attachments_allowed) }
     let!(:proposal) { create(:proposal, component: component, created_at: created_at, published_at: published_at) }
@@ -81,7 +81,7 @@ module Decidim::Proposals
 
         it "renders the first image in the card whatever the order between attachments" do
           expect(subject).to have_css(".card__image")
-          expect(subject.find(".card__image")[:src]).to eq(attachment_2_img.thumbnail_url)
+          expect(subject.find(".card__image")[:src]).to eq(attachment_2_img.reload.thumbnail_url)
         end
       end
     end
@@ -230,19 +230,19 @@ module Decidim::Proposals
       end
 
       context "when the active participatory space step change" do
-        let(:step_1) { create(:participatory_process_step, participatory_process: participatory_process, active: step_1_active) }
+        let(:step1) { create(:participatory_process_step, participatory_process: participatory_process, active: step_1_active) }
         let(:step_1_active) { true }
-        let(:step_2) { create(:participatory_process_step, participatory_process: participatory_process, active: step_2_active) }
+        let(:step2) { create(:participatory_process_step, participatory_process: participatory_process, active: step_2_active) }
         let(:step_2_active) { false }
-        let(:step_3) { create(:participatory_process_step, participatory_process: participatory_process, active: step_3_active) }
+        let(:step3) { create(:participatory_process_step, participatory_process: participatory_process, active: step_3_active) }
         let(:step_3_active) { false }
         let(:component) do
           create(:proposal_component,
                  participatory_space: participatory_process,
                  step_settings: {
-                   step_1.id => { votes_enabled: false },
-                   step_2.id => { votes_enabled: true },
-                   step_3.id => { votes_enabled: false }
+                   step1.id => { votes_enabled: false },
+                   step2.id => { votes_enabled: true },
+                   step3.id => { votes_enabled: false }
                  })
         end
         let(:participatory_process) { create(:participatory_process) }
@@ -251,8 +251,8 @@ module Decidim::Proposals
           it "generates a different hash" do
             old_hash = my_cell.send(:cache_hash)
 
-            step_1.update!(active: false)
-            step_2.update!(active: true)
+            step1.update!(active: false)
+            step2.update!(active: true)
             proposal.reload
 
             expect(my_cell.send(:cache_hash)).not_to eq(old_hash)
@@ -266,8 +266,8 @@ module Decidim::Proposals
           it "generates a different hash" do
             old_hash = my_cell.send(:cache_hash)
 
-            step_2.update!(active: false)
-            step_3.update!(active: true)
+            step2.update!(active: false)
+            step3.update!(active: true)
             proposal.reload
 
             expect(my_cell.send(:cache_hash)).not_to eq(old_hash)
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/answer_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/answer_proposal_spec.rb
index d6f454e3fdfa7..ab128faa0ac36 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/answer_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/answer_proposal_spec.rb
@@ -63,7 +63,7 @@ module Admin
 
         context "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
index ddf1f3593ec45..38e11155fad98 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/create_proposal_spec.rb
@@ -54,7 +54,7 @@ module Admin
 
           describe "when the form is not valid" do
             before do
-              expect(form).to receive(:invalid?).and_return(true)
+              allow(form).to receive(:invalid?).and_return(true)
             end
 
             it "broadcasts invalid" do
@@ -135,13 +135,11 @@ module Admin
               expect(action_log.version).to be_present
             end
 
-            it "notifies the space followers" do
-              follower = create(:user, organization: component.participatory_space.organization)
-              create(:follow, followable: component.participatory_space, user: follower)
-
-              expect(Decidim::EventsManager)
-                .to receive(:publish)
-                .with(
+            context "when followers" do
+              let(:follower) { create(:user, organization: component.participatory_space.organization) }
+              let!(:follow) { create(:follow, followable: component.participatory_space, user: follower) }
+              let(:data) do
+                {
                   event: "decidim.events.proposals.proposal_published",
                   event_class: Decidim::Proposals::PublishProposalEvent,
                   resource: kind_of(Decidim::Proposals::Proposal),
@@ -149,9 +147,28 @@ module Admin
                   extra: {
                     participatory_space: true
                   }
-                )
+                }
+              end
+
+              it "notifies the space followers" do
+                expect(Decidim::EventsManager).to receive(:publish).with(data)
+
+                command.call
+              end
 
-              command.call
+              context "when active record is slow" do
+                let(:proposal) { build :proposal, component: component }
+
+                before do
+                  allow(command).to receive(:proposal).and_return(nil)
+                end
+
+                it "does not notifies the space followers" do
+                  expect(Decidim::EventsManager).not_to receive(:publish).with(data)
+
+                  command.call
+                end
+              end
             end
 
             context "when geocoding is enabled" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/import_participatory_text_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/import_participatory_text_spec.rb
index e22b9e111e514..cc6ab496ffb60 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/import_participatory_text_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/import_participatory_text_spec.rb
@@ -7,7 +7,7 @@ module Proposals
     module Admin
       describe ImportParticipatoryText do
         describe "call" do
-          let!(:document_file) { IO.read(Decidim::Dev.asset(document_name)) }
+          let!(:document_file) { File.read(Decidim::Dev.asset(document_name)) }
           let(:current_component) do
             create(
               :proposal_component,
@@ -70,7 +70,7 @@ module Admin
             it "doesn't create any proposal" do
               expect do
                 command.call
-              end.to change(Proposal, :count).by(0)
+              end.not_to change(Proposal, :count)
             end
           end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/import_proposals_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/import_proposals_spec.rb
index d08967d95e895..2327bcb539cb5 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/import_proposals_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/import_proposals_spec.rb
@@ -55,7 +55,7 @@ module Admin
             it "doesn't create the proposal" do
               expect do
                 command.call
-              end.to change(Proposal, :count).by(0)
+              end.not_to change(Proposal, :count)
             end
           end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
index 3c207ac3b4495..cb93cb5847522 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/merge_proposals_spec.rb
@@ -35,7 +35,7 @@ module Admin
             it "doesn't create the proposal" do
               expect do
                 command.call
-              end.to change(Proposal, :count).by(0)
+              end.not_to change(Proposal, :count)
             end
           end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/publish_participatory_text_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/publish_participatory_text_spec.rb
index dab4cebbb03bf..e9350c6f37230 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/publish_participatory_text_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/publish_participatory_text_spec.rb
@@ -64,9 +64,7 @@ module Admin
                   proposal.reload
 
                   expect(translated(proposal_form.title)).to eq translated(proposal.title)
-                  if proposal.participatory_text_level == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
-                    expect(translated(proposal_form.body.stringify_keys)).to eq translated(proposal.body)
-                  end
+                  expect(proposal_form.body).to eq translated(proposal.body) if proposal.participatory_text_level == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
                   expect(proposal_form.position).to eq proposal.position
                 end
               end
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/split_proposals_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/split_proposals_spec.rb
index 7496c3567c948..9ba854667713d 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/split_proposals_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/split_proposals_spec.rb
@@ -35,7 +35,7 @@ module Admin
             it "doesn't create the proposal" do
               expect do
                 command.call
-              end.to change(Proposal, :count).by(0)
+              end.not_to change(Proposal, :count)
             end
           end
 
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/update_participatory_text_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/update_participatory_text_spec.rb
index 5ba34221ba1cf..a9ec2a8af87f1 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/update_participatory_text_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/update_participatory_text_spec.rb
@@ -63,9 +63,7 @@ module Admin
                   proposal.reload
 
                   expect(translated(proposal_form.title)).to eq translated(proposal.title)
-                  if proposal.participatory_text_level == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
-                    expect(translated(proposal_form.body.stringify_keys)).to eq translated(proposal.body)
-                  end
+                  expect(proposal_form.body).to eq translated(proposal.body) if proposal.participatory_text_level == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
                   expect(proposal_form.position).to eq proposal.position
                 end
               end
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
index 65f37cf655ad4..e8604aa126042 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin/update_proposal_spec.rb
@@ -48,7 +48,7 @@
 
     describe "when the form is not valid" do
       before do
-        expect(form).to receive(:invalid?).and_return(true)
+        allow(form).to receive(:invalid?).and_return(true)
       end
 
       it "broadcasts invalid" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_note_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_note_spec.rb
index 267febbc45525..eeaea6cf57720 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_note_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_note_spec.rb
@@ -25,7 +25,7 @@ module Admin
 
           describe "when the form is not valid" do
             before do
-              expect(form).to receive(:invalid?).and_return(true)
+              allow(form).to receive(:invalid?).and_return(true)
             end
 
             it "broadcasts invalid" do
@@ -35,13 +35,13 @@ module Admin
             it "doesn't create the proposal note" do
               expect do
                 command.call
-              end.to change(ProposalVote, :count).by(0)
+              end.not_to change(ProposalVote, :count)
             end
           end
 
           describe "when the form is valid" do
             before do
-              expect(form).to receive(:invalid?).and_return(false)
+              allow(form).to receive(:invalid?).and_return(false)
             end
 
             it "broadcasts ok" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
index 2f53400a6e3af..31e095d5e3473 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/create_collaborative_draft_spec.rb
@@ -42,7 +42,7 @@ module Proposals
             has_address: has_address,
             latitude: latitude,
             longitude: longitude,
-            attachment: attachment_params,
+            add_documents: attachment_params,
             user_group_id: user_group.try(:id),
             suggested_hashtags: suggested_hashtags
           }
@@ -54,7 +54,7 @@ module Proposals
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -155,10 +155,12 @@ module Proposals
           context "when attachments are allowed" do
             let(:component) { create(:proposal_component, :with_attachments_allowed) }
             let(:attachment_params) do
-              {
-                title: "My attachment",
-                file: Decidim::Dev.test_file("city.jpeg", "image/jpeg")
-              }
+              [
+                {
+                  title: "My attachment",
+                  file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg")
+                }
+              ]
             end
 
             it "creates an atachment for the proposal" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb
index 0de82f71349ee..6d8e9563a9170 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb
@@ -41,7 +41,7 @@ module Proposals
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -104,7 +104,7 @@ module Proposals
               creator = proposal.creator
 
               expect(creator.author).to eq(author)
-              expect(creator.user_group).to eq(nil)
+              expect(creator.user_group).to be_nil
             end
 
             it "adds the author as a follower" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/publish_collaborative_draft_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/publish_collaborative_draft_spec.rb
index fe42f0056828f..c6bc8e721bea4 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/publish_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/publish_collaborative_draft_spec.rb
@@ -24,7 +24,7 @@ module Proposals
           let(:current_user) { create(:user, organization: component.organization) }
 
           it "broadcasts invalid" do
-            expect(collaborative_draft.authored_by?(current_user)).to eq(false)
+            expect(collaborative_draft.authored_by?(current_user)).to be(false)
             expect { command.call }.to broadcast(:invalid)
           end
         end
diff --git a/decidim-proposals/spec/commands/decidim/proposals/update_collaborative_draft_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/update_collaborative_draft_spec.rb
index 2c7d35d76975e..aa29e6c60bf65 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/update_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/update_collaborative_draft_spec.rb
@@ -50,7 +50,7 @@ module Proposals
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -66,7 +66,7 @@ module Proposals
 
         describe "when the collaborative draft is not editable by the user" do
           before do
-            expect(collaborative_draft).to receive(:editable_by?).and_return(false)
+            allow(collaborative_draft).to receive(:editable_by?).and_return(false)
           end
 
           it "broadcasts invalid" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
index dbc65d171b422..fb200b247bcaf 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/update_proposal_spec.rb
@@ -64,7 +64,7 @@ module Proposals
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -80,7 +80,7 @@ module Proposals
 
         describe "when the proposal is not editable by the user" do
           before do
-            expect(proposal).to receive(:editable_by?).and_return(false)
+            allow(proposal).to receive(:editable_by?).and_return(false)
           end
 
           it "broadcasts invalid" do
@@ -178,12 +178,14 @@ module Proposals
             let(:component) { create(:proposal_component, :with_attachments_allowed) }
             let(:uploaded_files) do
               [
-                Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
+                file: upload_test_file(Decidim::Dev.asset("Exampledocument.pdf"), content_type: "application/pdf")
               ]
             end
             let(:uploaded_photos) do
               [
-                Decidim::Dev.test_file("city.jpeg", "image/jpeg")
+                {
+                  file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg")
+                }
               ]
             end
 
@@ -209,13 +211,13 @@ module Proposals
             let(:component) { create(:proposal_component, :with_attachments_allowed) }
             let(:uploaded_files) do
               [
-                Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-                Decidim::Dev.test_file("verify_user_groups.csv", "text/csv")
+                { file: upload_test_file(Decidim::Dev.asset("Exampledocument.pdf"), content_type: "application/pdf") },
+                { file: upload_test_file(Decidim::Dev.asset("verify_user_groups.csv"), content_type: "text/csv") }
               ]
             end
 
             it "does not create atachments for the proposal" do
-              expect { command.call }.to change(Decidim::Attachment, :count).by(0)
+              expect { command.call }.not_to change(Decidim::Attachment, :count)
             end
 
             it "broadcasts invalid" do
@@ -225,12 +227,8 @@ module Proposals
 
           context "when documents and gallery are allowed" do
             let(:component) { create(:proposal_component, :with_attachments_allowed) }
-            let(:uploaded_photos) { [Decidim::Dev.test_file("city.jpeg", "image/jpeg")] }
-            let(:uploaded_files) do
-              [
-                Decidim::Dev.test_file("Exampledocument.pdf", "application/pdf")
-              ]
-            end
+            let(:uploaded_photos) { [{ file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg") }] }
+            let(:uploaded_files) { [{ file: upload_test_file(Decidim::Dev.asset("Exampledocument.pdf"), content_type: "application/pdf") }] }
 
             it "Create gallery and documents for the proposal" do
               expect { command.call }.to change(Decidim::Attachment, :count).by(2)
@@ -239,7 +237,7 @@ module Proposals
 
           context "when gallery are allowed" do
             let(:component) { create(:proposal_component, :with_attachments_allowed) }
-            let(:uploaded_photos) { [Decidim::Dev.test_file("city.jpeg", "image/jpeg")] }
+            let(:uploaded_photos) { [{ file: upload_test_file(Decidim::Dev.asset("city.jpeg"), content_type: "image/jpeg") }] }
 
             it "creates an image attachment for the proposal" do
               expect { command.call }.to change(Decidim::Attachment, :count).by(1)
diff --git a/decidim-proposals/spec/commands/decidim/proposals/vote_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/vote_proposal_spec.rb
index ee1a59a9ce1c0..adb3b91c87eb1 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/vote_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/vote_proposal_spec.rb
@@ -36,13 +36,13 @@ module Proposals
           it "doesn't create a new vote for the proposal" do
             expect do
               command.call
-            end.to change(ProposalVote, :count).by(0)
+            end.not_to change(ProposalVote, :count)
           end
         end
 
         context "when the threshold have been reached" do
           before do
-            expect(proposal).to receive(:maximum_votes_reached?).and_return(true)
+            allow(proposal).to receive(:maximum_votes_reached?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -52,8 +52,8 @@ module Proposals
 
         context "when the threshold have been reached but proposal can accumulate more votes" do
           before do
-            expect(proposal).to receive(:maximum_votes_reached?).and_return(true)
-            expect(proposal).to receive(:can_accumulate_supports_beyond_threshold).and_return(true)
+            allow(proposal).to receive(:maximum_votes_reached?).and_return(true)
+            allow(proposal).to receive(:can_accumulate_supports_beyond_threshold).and_return(true)
           end
 
           it "creates a new vote for the proposal" do
diff --git a/decidim-proposals/spec/commands/decidim/proposals/withdraw_proposal_spec.rb b/decidim-proposals/spec/commands/decidim/proposals/withdraw_proposal_spec.rb
index 60c495cefb988..d0a165fdbe250 100644
--- a/decidim-proposals/spec/commands/decidim/proposals/withdraw_proposal_spec.rb
+++ b/decidim-proposals/spec/commands/decidim/proposals/withdraw_proposal_spec.rb
@@ -19,7 +19,7 @@ module Proposals
           it "withdraws the proposal" do
             expect do
               expect { command.call }.to broadcast(:ok)
-            end.to change { Decidim::Proposals::Proposal.count }.by(0)
+            end.not_to change(Decidim::Proposals::Proposal, :count)
             expect(proposal.state).to eq("withdrawn")
           end
         end
@@ -32,7 +32,7 @@ module Proposals
           it "is not able to withdraw the proposal" do
             expect do
               expect { command.call }.to broadcast(:has_supports)
-            end.to change { Decidim::Proposals::Proposal.count }.by(0)
+            end.not_to change(Decidim::Proposals::Proposal, :count)
             expect(proposal.state).not_to eq("withdrawn")
           end
         end
diff --git a/decidim-proposals/spec/controllers/decidim/proposals/admin/participatory_texts_controller_spec.rb b/decidim-proposals/spec/controllers/decidim/proposals/admin/participatory_texts_controller_spec.rb
index d441f4e6366e2..e4c8f735c886d 100644
--- a/decidim-proposals/spec/controllers/decidim/proposals/admin/participatory_texts_controller_spec.rb
+++ b/decidim-proposals/spec/controllers/decidim/proposals/admin/participatory_texts_controller_spec.rb
@@ -10,7 +10,7 @@ module Admin
 
         let(:user) { create(:user, :confirmed, :admin, organization: component.organization) }
         let(:component) { create :proposal_component, :with_participatory_texts_enabled }
-        let(:document_file) { fixture_file_upload(Decidim::Dev.asset("participatory_text.md"), "text/markdown") }
+        let(:document_file) { upload_test_file(Decidim::Dev.asset("participatory_text.md"), content_type: "text/markdown") }
         let(:title) { { en: ::Faker::Book.title } }
         let(:params) do
           {
diff --git a/decidim-proposals/spec/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller_spec.rb b/decidim-proposals/spec/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller_spec.rb
index 73df8246204cb..3ea892bd07db3 100644
--- a/decidim-proposals/spec/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller_spec.rb
+++ b/decidim-proposals/spec/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller_spec.rb
@@ -12,7 +12,7 @@ module Proposals
       let(:user) { create(:user, :confirmed, organization: component.organization) }
       let(:author) { create(:user, :confirmed, organization: component.organization) }
       let!(:collaborative_draft) { create(:collaborative_draft, component: component, users: [author]) }
-      let(:user_2) { create(:user, :confirmed, organization: component.organization) }
+      let(:user2) { create(:user, :confirmed, organization: component.organization) }
 
       before do
         request.env["decidim.current_organization"] = component.organization
@@ -50,7 +50,7 @@ module Proposals
 
       describe "POST request_reject" do
         before do
-          sign_in user_2, scope: :user
+          sign_in user2, scope: :user
           post :request_access, params: { id: collaborative_draft.id, state: collaborative_draft.state }
           sign_in author, scope: :user
         end
diff --git a/decidim-proposals/spec/controllers/decidim/proposals/collaborative_drafts_controller_spec.rb b/decidim-proposals/spec/controllers/decidim/proposals/collaborative_drafts_controller_spec.rb
index c5da7f3ec0c86..054b6a47d096c 100644
--- a/decidim-proposals/spec/controllers/decidim/proposals/collaborative_drafts_controller_spec.rb
+++ b/decidim-proposals/spec/controllers/decidim/proposals/collaborative_drafts_controller_spec.rb
@@ -12,7 +12,7 @@ module Proposals
       let(:user) { create(:user, :confirmed, organization: component.organization) }
       let(:author) { create(:user, :confirmed, organization: component.organization) }
       let!(:collaborative_draft) { create(:collaborative_draft, component: component, users: [author]) }
-      let(:user_2) { create(:user, :confirmed, organization: component.organization) }
+      let(:user2) { create(:user, :confirmed, organization: component.organization) }
 
       before do
         request.env["decidim.current_organization"] = component.organization
diff --git a/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb b/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
index 151625cfc51e6..e8c39213ce1e1 100644
--- a/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/proposals/publish_proposal_event_spec.rb
@@ -107,11 +107,11 @@ module Proposals
 
       describe "translated notifications" do
         let(:en_body) { "A nice proposal" }
-        let(:body) { { "en": en_body, "machine_translations": { "ca": "Une belle idee" } } }
+        let(:body) { { en: en_body, machine_translations: { ca: "Une belle idee" } } }
         let(:resource) do
           create :proposal,
                  component: proposal_component,
-                 title: { "en": "A nice proposal", "machine_translations": { "ca": "Une belle idee" } },
+                 title: { en: "A nice proposal", machine_translations: { ca: "Une belle idee" } },
                  body: body
         end
 
diff --git a/decidim-proposals/spec/events/decidim/resource_endorsed_event_spec.rb b/decidim-proposals/spec/events/decidim/resource_endorsed_event_spec.rb
index 599483491eae7..7993b9935709c 100644
--- a/decidim-proposals/spec/events/decidim/resource_endorsed_event_spec.rb
+++ b/decidim-proposals/spec/events/decidim/resource_endorsed_event_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe Decidim::ResourceEndorsedEvent do
-  let(:resource) { create :proposal, :citizen_author, title: { en: "My proposal" } }
+  let(:resource) { create :proposal, :participant_author, title: { en: "My proposal" } }
   let(:resource_type) { "Proposal" }
   let(:resource_text) { resource.body }
 
diff --git a/decidim-proposals/spec/forms/decidim/proposals/admin/import_participatory_text_form_spec.rb b/decidim-proposals/spec/forms/decidim/proposals/admin/import_participatory_text_form_spec.rb
index 1779bc0c6a552..7ef6da6166b18 100644
--- a/decidim-proposals/spec/forms/decidim/proposals/admin/import_participatory_text_form_spec.rb
+++ b/decidim-proposals/spec/forms/decidim/proposals/admin/import_participatory_text_form_spec.rb
@@ -16,8 +16,8 @@ module Admin
             es: "Ya para ser feliz quiero un camión"
           }
         end
-        let(:description) {}
-        let(:document) { Decidim::Dev.test_file("participatory_text.md", "text/markdown") }
+        let(:description) { nil }
+        let(:document) { upload_test_file(Decidim::Dev.test_file("participatory_text.md", "text/markdown")) }
 
         let(:params) do
           {
diff --git a/decidim-proposals/spec/forms/decidim/proposals/amendable/create_amendment_form_spec.rb b/decidim-proposals/spec/forms/decidim/proposals/amendable/create_amendment_form_spec.rb
index 746252d26b181..cdbd9c2f46257 100644
--- a/decidim-proposals/spec/forms/decidim/proposals/amendable/create_amendment_form_spec.rb
+++ b/decidim-proposals/spec/forms/decidim/proposals/amendable/create_amendment_form_spec.rb
@@ -47,14 +47,14 @@ module Amendable
 
       context "when amendable body is not etiquette-compliant" do
         let(:amendable) { create(:proposal, body: "A") }
-        let(:emendation_params) { { title: "A title which is long enough", body: amendable.body } }
+        let(:emendation_params) { { title: "A title which is long enough", body: translated(amendable.body) } }
 
         it { is_expected.to be_valid }
       end
 
       context "when emendation adds more errors than original" do
         let(:amendable) { create(:proposal, title: "AAAAAAAAAAAAAAAAAAAAAAAAAA") }
-        let(:emendation_params) { { title: "AA", body: amendable.body } }
+        let(:emendation_params) { { title: "AA", body: translated(amendable.body) } }
 
         it "is invalid" do
           expect(form).to be_invalid
diff --git a/decidim-proposals/spec/forms/decidim/proposals/proposal_wizard_create_step_form_spec.rb b/decidim-proposals/spec/forms/decidim/proposals/proposal_wizard_create_step_form_spec.rb
index feb9521565f65..4574a1c91683f 100644
--- a/decidim-proposals/spec/forms/decidim/proposals/proposal_wizard_create_step_form_spec.rb
+++ b/decidim-proposals/spec/forms/decidim/proposals/proposal_wizard_create_step_form_spec.rb
@@ -44,7 +44,7 @@ module Proposals
 
         it "only adds errors to this field" do
           subject.valid?
-          expect(subject.errors.keys).to eq [:title]
+          expect(subject.errors.attribute_names).to eq [:title]
         end
       end
 
diff --git a/decidim-proposals/spec/helpers/application_helper_spec.rb b/decidim-proposals/spec/helpers/application_helper_spec.rb
index e3511ea54915f..345ae2e34a919 100644
--- a/decidim-proposals/spec/helpers/application_helper_spec.rb
+++ b/decidim-proposals/spec/helpers/application_helper_spec.rb
@@ -5,13 +5,7 @@
 module Decidim
   module Proposals
     describe ApplicationHelper do
-      let(:helper) do
-        Class.new.tap do |v|
-          v.extend(Decidim::Proposals::ApplicationHelper)
-        end
-      end
-
-      describe "humanize_proposal_state" do
+      describe "#humanize_proposal_state" do
         subject { helper.humanize_proposal_state(state) }
 
         context "when it is accepted" do
@@ -38,6 +32,47 @@ module Proposals
           it { is_expected.to eq("Withdrawn") }
         end
       end
+
+      describe "#render_proposal_body" do
+        subject { helper.render_proposal_body(proposal) }
+
+        before do
+          allow(helper).to receive(:present).with(proposal).and_return(Decidim::Proposals::ProposalPresenter.new(proposal))
+          allow(helper).to receive(:current_organization).and_return(proposal.organization)
+          helper.instance_variable_set(:@proposal, proposal)
+        end
+
+        let(:body) { "<ul><li>First</li><li>Second</li><li>Third</li></ul><script>alert('OK');</script>" }
+        let(:proposal_trait) { :participant_author }
+        let(:proposal) { create(:proposal, proposal_trait, body: { "en" => body }) }
+
+        it "renders a sanitized body" do
+          expect(subject).to eq(
+            <<~HTML.strip
+              <div>• First
+              <br />• Second
+              <br />• Third
+              </div>
+            HTML
+          )
+        end
+
+        context "with official meeting" do
+          let(:proposal_trait) { :official }
+
+          it "renders a sanitized body" do
+            expect(subject).to eq(
+              <<~HTML.strip
+                <div class="ql-editor-display"><ul>
+                <li>First</li>
+                <li>Second</li>
+                <li>Third</li>
+                </ul>alert('OK');</div>
+              HTML
+            )
+          end
+        end
+      end
     end
   end
 end
diff --git a/decidim-proposals/spec/helpers/map_helper_spec.rb b/decidim-proposals/spec/helpers/map_helper_spec.rb
index c5188d2194dba..def7166f0278d 100644
--- a/decidim-proposals/spec/helpers/map_helper_spec.rb
+++ b/decidim-proposals/spec/helpers/map_helper_spec.rb
@@ -60,7 +60,7 @@ module Proposals
           expect(subject["longitude"]).to eq(longitude)
           expect(subject["address"]).to eq(address)
           expect(subject["title"]).to eq("&lt;script&gt;alert(&quot;HEY&quot;)&lt;/script&gt; This is my title")
-          expect(subject["body"]).to eq("<div class=\"ql-editor ql-reset-decidim\">alert(&quot;HEY&quot;) This is my long, but still super interesting, body of my also long, but also super inte...</div>")
+          expect(subject["body"]).to eq(%(<div class="ql-editor-display">alert(&quot;HEY&quot;) This is my long, but still super interesting, body of my also long, but also super inte...</div>))
           expect(subject["link"]).to eq(Decidim::Proposals::ProposalPresenter.new(proposal).proposal_path)
           expect(subject["icon"]).to match(/<svg.+/)
         end
diff --git a/decidim-proposals/spec/lib/decidim/admin/import/importer_spec.rb b/decidim-proposals/spec/lib/decidim/admin/import/importer_spec.rb
index 5368005b4b197..812db63473136 100644
--- a/decidim-proposals/spec/lib/decidim/admin/import/importer_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/admin/import/importer_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe Decidim::Admin::Import::Importer do
-  subject { described_class.new(file: file, reader: reader, creator: creator, context: context) }
+  subject { described_class.new(file: blob, reader: reader, creator: creator, context: context) }
 
   let(:creator) { Decidim::Proposals::Import::ProposalCreator }
 
@@ -21,7 +21,7 @@
   let(:current_component) { create :component, manifest_name: :proposals, participatory_space: participatory_process }
 
   context "with CSV" do
-    let(:file) { File.new Decidim::Dev.asset("import_proposals.csv") }
+    let(:blob) { upload_test_file(Decidim::Dev.asset("import_proposals.csv"), return_blob: true) }
     let(:reader) { Decidim::Admin::Import::Readers::CSV }
 
     it_behaves_like "proposal importer"
@@ -51,14 +51,14 @@
   end
 
   context "with JSON" do
-    let(:file) { File.new Decidim::Dev.asset("import_proposals.json") }
+    let(:blob) { upload_test_file(Decidim::Dev.asset("import_proposals.json"), return_blob: true) }
     let(:reader) { Decidim::Admin::Import::Readers::JSON }
 
     it_behaves_like "proposal importer"
   end
 
   context "with XLSX" do
-    let(:file) { File.new Decidim::Dev.asset("import_proposals.xlsx") }
+    let(:blob) { upload_test_file(Decidim::Dev.asset("import_proposals.xlsx"), return_blob: true) }
     let(:reader) { Decidim::Admin::Import::Readers::XLSX }
 
     it_behaves_like "proposal importer"
diff --git a/decidim-proposals/spec/lib/decidim/content_parsers/proposal_parser_spec.rb b/decidim-proposals/spec/lib/decidim/content_parsers/proposal_parser_spec.rb
index ab4ac61d759f9..9e46eb43072bd 100644
--- a/decidim-proposals/spec/lib/decidim/content_parsers/proposal_parser_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/content_parsers/proposal_parser_spec.rb
@@ -14,7 +14,7 @@ module ContentParsers
         let(:content) { "" }
 
         it "must call ProposalParser.parse" do
-          expect(described_class).to receive(:new).with(content, context).and_return(parser)
+          allow(described_class).to receive(:new).with(content, context).and_return(parser)
 
           result = Decidim::ContentProcessor.parse(content, context)
 
diff --git a/decidim-proposals/spec/lib/decidim/content_renderers/proposal_renderer_spec.rb b/decidim-proposals/spec/lib/decidim/content_renderers/proposal_renderer_spec.rb
index 03e111d8cf3a2..87f7ad591f9ac 100644
--- a/decidim-proposals/spec/lib/decidim/content_renderers/proposal_renderer_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/content_renderers/proposal_renderer_spec.rb
@@ -38,17 +38,17 @@ module ContentRenderers
         end
 
         context "when content has many links" do
-          let(:proposal_1) { create(:proposal) }
-          let(:proposal_2) { create(:proposal) }
-          let(:proposal_3) { create(:proposal) }
+          let(:proposal1) { create(:proposal) }
+          let(:proposal2) { create(:proposal) }
+          let(:proposal3) { create(:proposal) }
           let(:content) do
-            gid1 = proposal_1.to_global_id
-            gid2 = proposal_2.to_global_id
-            gid3 = proposal_3.to_global_id
+            gid1 = proposal1.to_global_id
+            gid2 = proposal2.to_global_id
+            gid3 = proposal3.to_global_id
             "This content references the following proposals: #{gid1}, #{gid2} and #{gid3}. Great?I like them!"
           end
 
-          it { is_expected.to eq("This content references the following proposals: #{resource_as_html_link(proposal_1)}, #{resource_as_html_link(proposal_2)} and #{resource_as_html_link(proposal_3)}. Great?I like them!") }
+          it { is_expected.to eq("This content references the following proposals: #{resource_as_html_link(proposal1)}, #{resource_as_html_link(proposal2)} and #{resource_as_html_link(proposal3)}. Great?I like them!") }
         end
       end
 
diff --git a/decidim-proposals/spec/lib/decidim/proposals/component_spec.rb b/decidim-proposals/spec/lib/decidim/proposals/component_spec.rb
index 7de149d5470cf..bdb04c60c19e3 100644
--- a/decidim-proposals/spec/lib/decidim/proposals/component_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/proposals/component_spec.rb
@@ -12,7 +12,7 @@
       it "destroys the component" do
         expect do
           Decidim::Admin::DestroyComponent.call(component, current_user)
-        end.to change { Decidim::Component.count }.by(-1)
+        end.to change(Decidim::Component, :count).by(-1)
 
         expect(component).to be_destroyed
       end
@@ -94,14 +94,14 @@
       let(:stats_name) { :endorsements_count }
 
       before do
-        # rubocop:disable FactoryBot/CreateList
+        # rubocop:disable RSpec/FactoryBot/CreateList
         2.times do
           create(:endorsement, resource: proposal, author: build(:user, organization: organization))
         end
         3.times do
           create(:endorsement, resource: hidden_proposal, author: build(:user, organization: organization))
         end
-        # rubocop:enable FactoryBot/CreateList
+        # rubocop:enable RSpec/FactoryBot/CreateList
       end
 
       it "counts the endorsements from visible proposals" do
diff --git a/decidim-proposals/spec/lib/decidim/proposals/import/proposal_answer_creator_spec.rb b/decidim-proposals/spec/lib/decidim/proposals/import/proposal_answer_creator_spec.rb
index 673ecfc8b1604..31ab3d904f282 100644
--- a/decidim-proposals/spec/lib/decidim/proposals/import/proposal_answer_creator_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/proposals/import/proposal_answer_creator_spec.rb
@@ -63,7 +63,7 @@
       it "does not produce a record" do
         record = subject.produce
 
-        expect(record).to be(nil)
+        expect(record).to be_nil
       end
     end
   end
diff --git a/decidim-proposals/spec/lib/decidim/proposals/odt_to_markdown_spec.rb b/decidim-proposals/spec/lib/decidim/proposals/odt_to_markdown_spec.rb
index 0cfa634d9b5e3..d627a9a15cff7 100644
--- a/decidim-proposals/spec/lib/decidim/proposals/odt_to_markdown_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/proposals/odt_to_markdown_spec.rb
@@ -7,10 +7,10 @@ module Proposals
     describe OdtToMarkdown do
       context "when libreoffice odt file" do
         it "transforms into markdown" do
-          file = IO.read(Decidim::Dev.asset("participatory_text.odt"))
+          file = File.read(Decidim::Dev.asset("participatory_text.odt"))
           transformer = DocToMarkdown.new(file, DocToMarkdown::ODT_MIME_TYPE)
 
-          expected = IO.read(Decidim::Dev.asset("participatory_text.md"))
+          expected = File.read(Decidim::Dev.asset("participatory_text.md"))
           expected.strip!
           # doc2text does not support ordered lists use - instead
           expected.gsub!(/^\d\. /, "- ")
diff --git a/decidim-proposals/spec/permissions/decidim/proposals/admin/permissions_spec.rb b/decidim-proposals/spec/permissions/decidim/proposals/admin/permissions_spec.rb
index a452574516922..05b6f74e10e59 100644
--- a/decidim-proposals/spec/permissions/decidim/proposals/admin/permissions_spec.rb
+++ b/decidim-proposals/spec/permissions/decidim/proposals/admin/permissions_spec.rb
@@ -37,7 +37,7 @@
   let(:component_settings_participatory_texts_enabled?) { false }
   let(:current_settings_proposal_answering_enabled?) { true }
   let(:current_settings_publish_answers_immediately?) { true }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   shared_examples "can create proposal notes" do
     describe "proposal note creation" do
@@ -46,7 +46,7 @@
       end
 
       context "when the space allows it" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -58,19 +58,19 @@
       end
 
       context "when everything is OK" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when answering is disabled in the step level" do
         let(:current_settings_proposal_answering_enabled?) { false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
 
       context "when answering is disabled in the component level" do
         let(:component_settings_proposal_answering_enabled?) { false }
 
-        it { is_expected.to eq false }
+        it { is_expected.to be false }
       end
     end
   end
@@ -82,7 +82,7 @@
       end
 
       context "when everything is OK" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -109,7 +109,7 @@
         end
         let(:extra_context) { { valuator: user } }
 
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
     end
   end
@@ -124,19 +124,19 @@
     end
 
     context "when everything is OK" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when creation is disabled" do
       let(:creation_enabled?) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when official proposals are disabled" do
       let(:official_proposals_enabled?) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when participatory texts is enabled" do
@@ -161,7 +161,7 @@
       let(:proposal) { create :proposal, :official, component: current_component }
 
       context "when everything is OK" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when it has some votes" do
@@ -179,7 +179,7 @@
       { scope: :admin, action: :update, subject: :proposal_category }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "import proposals from another component" do
@@ -187,7 +187,7 @@
       { scope: :admin, action: :import, subject: :proposals }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "split proposals" do
@@ -195,7 +195,7 @@
       { scope: :admin, action: :split, subject: :proposals }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "merge proposals" do
@@ -203,7 +203,7 @@
       { scope: :admin, action: :merge, subject: :proposals }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "proposal answers publishing" do
@@ -212,12 +212,12 @@
       { scope: :admin, action: :publish_answers, subject: :proposals }
     end
 
-    it { is_expected.to eq false }
+    it { is_expected.to be false }
 
     context "when user is an admin" do
       let(:user) { create(:user, :admin) }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -226,7 +226,7 @@
       { scope: :admin, action: :assign_to_valuator, subject: :proposals }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "unassign proposals from a valuator" do
@@ -234,7 +234,7 @@
       { scope: :admin, action: :unassign_from_valuator, subject: :proposals }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   describe "manage participatory texts" do
@@ -243,6 +243,6 @@
       { scope: :admin, action: :manage, subject: :participatory_texts }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 end
diff --git a/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb b/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
index 03d893e0c2efe..9ac3ebe5ce961 100644
--- a/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
+++ b/decidim-proposals/spec/permissions/decidim/proposals/permissions_spec.rb
@@ -28,7 +28,7 @@
     }
   end
   let(:extra_settings) { {} }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
@@ -62,13 +62,13 @@
     context "when creation is disabled" do
       let(:extra_settings) { { creation_enabled?: false } }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when user is authorized" do
       let(:extra_settings) { { creation_enabled?: true } }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -84,13 +84,13 @@
     context "when proposal is editable" do
       let(:editable) { true }
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when proposal is not editable" do
       let(:editable) { false }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -100,13 +100,13 @@
     end
 
     context "when proposal author is the user trying to withdraw" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when trying by another user" do
       let(:user) { build :user }
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
   end
 
@@ -123,7 +123,7 @@
         }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when votes are blocked" do
@@ -134,7 +134,7 @@
         }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when the user has no more remaining votes" do
@@ -151,7 +151,7 @@
         create :proposal_vote, author: user, proposal: proposals[1]
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when the user is authorized" do
@@ -162,7 +162,7 @@
         }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -179,7 +179,7 @@
         }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when votes are blocked" do
@@ -190,7 +190,7 @@
         }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when the user is authorized" do
@@ -201,7 +201,7 @@
         }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 
@@ -217,7 +217,7 @@
         }
       end
 
-      it { is_expected.to eq false }
+      it { is_expected.to be false }
     end
 
     context "when the user is authorized" do
@@ -227,7 +227,7 @@
         }
       end
 
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 end
diff --git a/decidim-proposals/spec/queries/decidim/proposals/similar_proposals_spec.rb b/decidim-proposals/spec/queries/decidim/proposals/similar_proposals_spec.rb
index d13d8faa55715..9e36d4deb9db0 100644
--- a/decidim-proposals/spec/queries/decidim/proposals/similar_proposals_spec.rb
+++ b/decidim-proposals/spec/queries/decidim/proposals/similar_proposals_spec.rb
@@ -31,14 +31,14 @@
     end
   end
 
-  context "when machine_translations is disabled" do
+  context "when machine_translations is enabled" do
     let(:enabled) { true }
-    let(:proposal_body) { { "en": "100% match for body" } }
-    let(:proposal_title) { { "en": "100% match for title" } }
+    let(:proposal_body) { { en: "100% match for body" } }
+    let(:proposal_title) { { en: "100% match for title" } }
     let(:matching_body) { missing_body.merge({ machine_translations: proposal_body }) }
     let(:matching_title) { missing_title.merge({ machine_translations: proposal_title }) }
-    let(:missing_body) { { "ro": "Some Random body" } }
-    let(:missing_title) { { "ro": "Some random title" } }
+    let(:missing_body) { { ro: "Some Random body" } }
+    let(:missing_title) { { ro: "Some random title" } }
 
     it "finds the similar proposal" do
       Decidim::Proposals.similarity_threshold = 0.85
diff --git a/decidim-proposals/spec/requests/collaborative_draft_search_spec.rb b/decidim-proposals/spec/requests/collaborative_draft_search_spec.rb
new file mode 100644
index 0000000000000..cfb549334a187
--- /dev/null
+++ b/decidim-proposals/spec/requests/collaborative_draft_search_spec.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Collaborative draft search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) do
+    create(
+      :proposal_component,
+      :with_creation_enabled,
+      settings: { collaborative_drafts_enabled: true }
+    )
+  end
+  let(:user) { create :user, :confirmed, organization: organization }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:collaborative_draft1) { create(:collaborative_draft, title: { en: "A doggo" }, component: component) }
+  let!(:collaborative_draft2) { create(:collaborative_draft, body: { en: "There is a doggo in the office" }, component: component) }
+  let!(:collaborative_draft3) { create(:collaborative_draft, :open, component: component) }
+  let!(:collaborative_draft4) { create(:collaborative_draft, :published, component: component) }
+  let!(:collaborative_draft5) { create(:collaborative_draft, :withdrawn, component: component) }
+  let!(:collaborative_draft6) { create(:collaborative_draft, component: component) }
+  let!(:collaborative_draft7) { create(:collaborative_draft, component: component) }
+
+  let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_space) }
+  let(:meeting) { create :meeting, :published, component: meetings_component }
+
+  let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_space) }
+  let(:dummy_resource) { create :dummy_resource, component: dummy_component }
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).collaborative_drafts_path }
+
+  before do
+    meeting.link_resources([collaborative_draft6], "drafts_from_meeting")
+    collaborative_draft6.link_resources([meeting], "drafts_from_meeting")
+    dummy_resource.link_resources([collaborative_draft7], "included_collaborative_drafts")
+    collaborative_draft7.link_resources([dummy_resource], "included_collaborative_drafts")
+
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :collaborative_draft
+  it_behaves_like "a resource search with scopes", :collaborative_draft
+  it_behaves_like "a resource search with categories", :collaborative_draft
+
+  it "displays all collaborative drafts except published and withdrawn without any filters" do
+    expect(subject).to have_escaped_html(translated(collaborative_draft1.title))
+    expect(subject).to have_escaped_html(translated(collaborative_draft2.title))
+    expect(subject).to have_escaped_html(translated(collaborative_draft3.title))
+    expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+    expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+    expect(subject).to have_escaped_html(translated(collaborative_draft6.title))
+    expect(subject).to have_escaped_html(translated(collaborative_draft7.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "doggo" } }
+
+    it "displays only the collaborative drafts containing the search_text" do
+      expect(subject).to have_escaped_html(translated(collaborative_draft1.title))
+      expect(subject).to have_escaped_html(translated(collaborative_draft2.title))
+      expect(subject).not_to have_escaped_html(translated(collaborative_draft3.title))
+      expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+      expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+      expect(subject).not_to have_escaped_html(translated(collaborative_draft6.title))
+      expect(subject).not_to have_escaped_html(translated(collaborative_draft7.title))
+    end
+  end
+
+  context "when searching by state" do
+    let(:filter_params) { { with_any_state: states } }
+
+    context "and the status is open" do
+      let(:states) { %w(open) }
+
+      it "displays only open collaborative drafts" do
+        expect(subject).to have_escaped_html(translated(collaborative_draft1.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft2.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft3.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft6.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft7.title))
+      end
+    end
+
+    context "and the status is withdrawn" do
+      let(:states) { %w(withdrawn) }
+
+      it "displays only withdrawn collaborative drafts" do
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft1.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft2.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft3.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft5.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft6.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft7.title))
+      end
+    end
+
+    context "and the status is published" do
+      let(:states) { %w(published) }
+
+      it "displays only withdrawn proposals" do
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft1.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft2.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft3.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft4.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft6.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft7.title))
+      end
+    end
+  end
+
+  context "when searching by related to" do
+    let(:filter_params) { { related_to: related_to } }
+
+    context "and related to is set to meetings" do
+      let(:related_to) { "Decidim::Meetings::Meeting".underscore }
+
+      it "displays only proposals related to meetings" do
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft1.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft2.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft3.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft6.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft7.title))
+      end
+    end
+
+    context "and related to is set to resources" do
+      let(:related_to) { "Decidim::DummyResources::DummyResource".underscore }
+
+      it "displays only proposals related to resources" do
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft1.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft2.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft3.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft4.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft5.title))
+        expect(subject).not_to have_escaped_html(translated(collaborative_draft6.title))
+        expect(subject).to have_escaped_html(translated(collaborative_draft7.title))
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/requests/proposal_search_spec.rb b/decidim-proposals/spec/requests/proposal_search_spec.rb
new file mode 100644
index 0000000000000..80844445c8af7
--- /dev/null
+++ b/decidim-proposals/spec/requests/proposal_search_spec.rb
@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Proposal search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :proposal_component }
+  let(:user) { create :user, :confirmed, organization: organization }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:proposal1) { create(:proposal, title: "A doggo", component: component) }
+  let!(:proposal2) { create(:proposal, body: "There is a doggo in the office", component: component) }
+  let!(:proposal3) { create(:proposal, component: component, users: [user]) }
+  let!(:proposal4) { create(:proposal, :withdrawn, component: component) }
+  let!(:proposal5) { create(:proposal, :rejected, component: component) }
+  let!(:proposal6) { create(:proposal, :accepted, component: component) }
+  let!(:proposal7) { create(:proposal, :accepted, component: component) }
+
+  let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_space) }
+  let(:meeting) { create :meeting, :published, component: meetings_component }
+
+  let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_space) }
+  let(:dummy_resource) { create :dummy_resource, component: dummy_component }
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).proposals_path }
+
+  before do
+    create(:proposal_vote, proposal: proposal1, author: user)
+
+    meeting.link_resources([proposal6], "proposals_from_meeting")
+    proposal6.link_resources([meeting], "proposals_from_meeting")
+    dummy_resource.link_resources([proposal7], "included_proposals")
+    proposal7.link_resources([dummy_resource], "included_proposals")
+
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :proposal
+  it_behaves_like "a resource search with scopes", :proposal
+  it_behaves_like "a resource search with categories", :proposal
+  it_behaves_like "a resource search with origin", :proposal
+
+  it "displays all non-withdrawn and non-rejected proposals without any filters" do
+    expect(subject).to have_escaped_html(translated(proposal1.title))
+    expect(subject).to have_escaped_html(translated(proposal2.title))
+    expect(subject).to have_escaped_html(translated(proposal3.title))
+    expect(subject).not_to have_escaped_html(translated(proposal4.title))
+    expect(subject).not_to have_escaped_html(translated(proposal5.title))
+    expect(subject).to have_escaped_html(translated(proposal6.title))
+    expect(subject).to have_escaped_html(translated(proposal7.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "doggo" } }
+
+    it "displays only the proposals containing the search_text" do
+      expect(subject).to have_escaped_html(translated(proposal1.title))
+      expect(subject).to have_escaped_html(translated(proposal2.title))
+      expect(subject).not_to have_escaped_html(translated(proposal3.title))
+      expect(subject).not_to have_escaped_html(translated(proposal4.title))
+      expect(subject).not_to have_escaped_html(translated(proposal5.title))
+      expect(subject).not_to have_escaped_html(translated(proposal6.title))
+      expect(subject).not_to have_escaped_html(translated(proposal7.title))
+    end
+  end
+
+  context "when searching by state" do
+    let(:filter_params) { { with_any_state: states } }
+
+    context "and the status is empty or default" do
+      let(:states) { [] }
+
+      it "displays all except withdrawn proposals" do
+        expect(subject).to have_escaped_html(translated(proposal1.title))
+        expect(subject).to have_escaped_html(translated(proposal2.title))
+        expect(subject).to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).to have_escaped_html(translated(proposal5.title))
+        expect(subject).to have_escaped_html(translated(proposal6.title))
+        expect(subject).to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and the status is accepted, evaluating or state_not_published" do
+      let(:states) { %w(accepted evaluating state_not_published) }
+
+      it "does not display withdrawn or rejected proposals" do
+        expect(subject).to have_escaped_html(translated(proposal1.title))
+        expect(subject).to have_escaped_html(translated(proposal2.title))
+        expect(subject).to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).to have_escaped_html(translated(proposal6.title))
+        expect(subject).to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and the status is accepted" do
+      let(:states) { %w(accepted) }
+
+      it "displays only accepted proposals" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).to have_escaped_html(translated(proposal6.title))
+        expect(subject).to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and the status is rejected" do
+      let(:states) { %w(rejected) }
+
+      it "displays only rejected proposals" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).to have_escaped_html(translated(proposal5.title))
+        expect(subject).not_to have_escaped_html(translated(proposal6.title))
+        expect(subject).not_to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and the status is withdrawn" do
+      let(:filter_params) { { with_availability: "withdrawn" } }
+
+      it "displays only withdrawn proposals" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).not_to have_escaped_html(translated(proposal6.title))
+        expect(subject).not_to have_escaped_html(translated(proposal7.title))
+      end
+    end
+  end
+
+  context "when searching by related to" do
+    let(:filter_params) { { related_to: related_to } }
+
+    context "and related to is set to meetings" do
+      let(:related_to) { "Decidim::Meetings::Meeting".underscore }
+
+      it "displays only proposals related to meetings" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).to have_escaped_html(translated(proposal6.title))
+        expect(subject).not_to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and related to is set to resources" do
+      let(:related_to) { "Decidim::DummyResources::DummyResource".underscore }
+
+      it "displays only proposals related to resources" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).not_to have_escaped_html(translated(proposal6.title))
+        expect(subject).to have_escaped_html(translated(proposal7.title))
+      end
+    end
+  end
+
+  context "when searching by activity" do
+    let(:filter_params) { { activity: activity } }
+
+    before do
+      login_as user, scope: :user
+
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
+    context "and the activity is voted" do
+      let(:activity) { "voted" }
+
+      it "displays the proposals voted by the user" do
+        expect(subject).to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).not_to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).not_to have_escaped_html(translated(proposal6.title))
+        expect(subject).not_to have_escaped_html(translated(proposal7.title))
+      end
+    end
+
+    context "and the activity is my proposals" do
+      let(:activity) { "my_proposals" }
+
+      it "displays the proposals created by the user" do
+        expect(subject).not_to have_escaped_html(translated(proposal1.title))
+        expect(subject).not_to have_escaped_html(translated(proposal2.title))
+        expect(subject).to have_escaped_html(translated(proposal3.title))
+        expect(subject).not_to have_escaped_html(translated(proposal4.title))
+        expect(subject).not_to have_escaped_html(translated(proposal5.title))
+        expect(subject).not_to have_escaped_html(translated(proposal6.title))
+        expect(subject).not_to have_escaped_html(translated(proposal7.title))
+      end
+    end
+  end
+end
diff --git a/decidim-proposals/spec/services/decidim/proposals/collaborative_draft_search_spec.rb b/decidim-proposals/spec/services/decidim/proposals/collaborative_draft_search_spec.rb
deleted file mode 100644
index 860c2ce64b562..0000000000000
--- a/decidim-proposals/spec/services/decidim/proposals/collaborative_draft_search_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Proposals
-    describe CollaborativeDraftSearch do
-      subject { described_class.new(params).results }
-
-      let(:component) { create(:component, manifest_name: "proposals") }
-      let(:default_params) { { component: component, user: user } }
-      let(:params) { default_params }
-      let(:participatory_process) { component.participatory_space }
-      let(:user) { create(:user, organization: component.organization) }
-
-      it_behaves_like "a resource search", :collaborative_draft
-      it_behaves_like "a resource search with scopes", :collaborative_draft
-      it_behaves_like "a resource search with categories", :collaborative_draft
-
-      describe "results" do
-        let!(:collaborative_draft) { create(:collaborative_draft, component: component) }
-
-        describe "search_text filter" do
-          let(:params) { default_params.merge(search_text: search_text) }
-          let(:search_text) { "giraffe" }
-
-          it "returns the drafts containing the search in the title or the body" do
-            create_list(:collaborative_draft, 3, component: component)
-            create(:collaborative_draft, title: { en: "A giraffe" }, component: component)
-            create(:collaborative_draft, body: { en: "There is a giraffe in the office" }, component: component)
-
-            expect(subject.size).to eq(2)
-          end
-        end
-
-        describe "state filter" do
-          let(:params) { default_params.merge(state: states) }
-
-          context "when filtering open collaborative_drafts" do
-            let(:states) { %w(open) }
-
-            it "returns only open collaborative_drafts" do
-              open_drafts = create_list(:collaborative_draft, 3, :open, component: component)
-              create_list(:collaborative_draft, 2, :published, component: component)
-
-              expect(subject.size).to eq(4)
-              expect(subject).to match_array([collaborative_draft] + open_drafts)
-            end
-          end
-
-          context "when filtering withdrawn collaborative_drafts" do
-            let(:states) { %w(withdrawn) }
-
-            it "returns only withdrawn collaborative_drafts" do
-              create_list(:collaborative_draft, 3, component: component)
-              withdrawn_drafts = create_list(:collaborative_draft, 3, :withdrawn, component: component)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(withdrawn_drafts)
-            end
-          end
-
-          context "when filtering published collaborative_drafts" do
-            let(:states) { %w(published) }
-
-            it "returns only published collaborative_drafts" do
-              create_list(:collaborative_draft, 3, component: component)
-              published_drafts = create_list(:collaborative_draft, 3, :published, component: component)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(published_drafts)
-            end
-          end
-        end
-
-        describe "related_to filter" do
-          let(:params) { default_params.merge(related_to: related_to) }
-
-          context "when filtering by related to meetings" do
-            let(:related_to) { "Decidim::Meetings::Meeting".underscore }
-            let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_process) }
-            let(:meeting) { create :meeting, component: meetings_component }
-
-            it "returns only collaborative_drafts related to meetings" do
-              related_draft = create(:collaborative_draft, component: component)
-              related_draft2 = create(:collaborative_draft, component: component)
-              create_list(:collaborative_draft, 3, component: component)
-              meeting.link_resources([related_draft], "drafts_from_meeting")
-              related_draft2.link_resources([meeting], "drafts_from_meeting")
-
-              expect(subject).to match_array([related_draft, related_draft2])
-            end
-          end
-
-          context "when filtering by related to resources" do
-            let(:related_to) { "Decidim::DummyResources::DummyResource".underscore }
-            let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_process) }
-            let(:dummy_resource) { create :dummy_resource, component: dummy_component }
-
-            it "returns only collaborative_drafts related to results" do
-              related_draft = create(:collaborative_draft, component: component)
-              related_draft2 = create(:collaborative_draft, component: component)
-              create_list(:collaborative_draft, 3, component: component)
-              dummy_resource.link_resources([related_draft], "included_collaborative_drafts")
-              related_draft2.link_resources([dummy_resource], "included_collaborative_drafts")
-
-              expect(subject).to match_array([related_draft, related_draft2])
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb b/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb
deleted file mode 100644
index b2ecf7a702db9..0000000000000
--- a/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Proposals
-    describe ProposalSearch do
-      subject { described_class.new(params).results }
-
-      let(:component) { create(:component, manifest_name: "proposals") }
-      let(:default_params) { { component: component, user: user } }
-      let(:params) { default_params }
-      let(:participatory_process) { component.participatory_space }
-      let(:user) { create(:user, organization: component.organization) }
-
-      it_behaves_like "a resource search", :proposal
-      it_behaves_like "a resource search with scopes", :proposal
-      it_behaves_like "a resource search with categories", :proposal
-      it_behaves_like "a resource search with origin", :proposal
-
-      describe "results" do
-        let!(:proposal) { create(:proposal, component: component) }
-
-        describe "search_text filter" do
-          let(:params) { default_params.merge(search_text: search_text) }
-          let(:search_text) { "dog" }
-
-          it "returns the proposals containing the search in the title or the body" do
-            create_list(:proposal, 3, component: component)
-            create(:proposal, title: "A dog", component: component)
-            create(:proposal, body: "There is a dog in the office", component: component)
-
-            expect(subject.size).to eq(2)
-          end
-        end
-
-        describe "activity filter" do
-          let(:params) { default_params.merge(activity: activity) }
-
-          context "when filtering by supported" do
-            let(:activity) { "voted" }
-
-            it "returns the proposals voted by the user" do
-              create_list(:proposal, 3, component: component)
-              create(:proposal_vote, proposal: Proposal.first, author: user)
-
-              expect(subject.size).to eq(1)
-            end
-          end
-
-          context "when filtering by my proposals" do
-            let(:activity) { "my_proposals" }
-
-            it "returns the proposals created by the user" do
-              create_list(:proposal, 3, component: component)
-              create(:proposal, component: component, users: [user])
-
-              expect(subject.size).to eq(1)
-            end
-          end
-        end
-
-        describe "state filter" do
-          let(:params) { default_params.merge(state: states) }
-
-          context "when filtering for default states" do
-            let(:states) { [] }
-
-            it "returns all except withdrawn proposals" do
-              create_list(:proposal, 3, :withdrawn, component: component)
-              other_proposals = create_list(:proposal, 3, component: component)
-              other_proposals << proposal
-
-              expect(subject.size).to eq(4)
-              expect(subject).to match_array(other_proposals)
-            end
-          end
-
-          context "when filtering :except_rejected proposals" do
-            let(:states) { %w(accepted evaluating state_not_published) }
-
-            it "hides withdrawn and rejected proposals" do
-              create(:proposal, :withdrawn, component: component)
-              create(:proposal, :rejected, component: component)
-              accepted_proposal = create(:proposal, :accepted, component: component)
-
-              expect(subject.size).to eq(2)
-              expect(subject).to match_array([accepted_proposal, proposal])
-            end
-          end
-
-          context "when filtering accepted proposals" do
-            let(:states) { %w(accepted) }
-
-            it "returns only accepted proposals" do
-              accepted_proposals = create_list(:proposal, 3, :accepted, component: component)
-              create_list(:proposal, 3, component: component)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(accepted_proposals)
-            end
-          end
-
-          context "when filtering rejected proposals" do
-            let(:states) { %w(rejected) }
-
-            it "returns only rejected proposals" do
-              create_list(:proposal, 3, component: component)
-              rejected_proposals = create_list(:proposal, 3, :rejected, component: component)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(rejected_proposals)
-            end
-          end
-
-          context "when filtering withdrawn proposals" do
-            let(:params) { default_params.merge(state_withdraw: state_withdraw) }
-            let(:state_withdraw) { "withdrawn" }
-
-            it "returns only withdrawn proposals" do
-              create_list(:proposal, 3, component: component)
-              withdrawn_proposals = create_list(:proposal, 3, :withdrawn, component: component)
-
-              expect(subject.size).to eq(3)
-              expect(subject).to match_array(withdrawn_proposals)
-            end
-          end
-        end
-
-        describe "related_to filter" do
-          let(:params) { default_params.merge(related_to: related_to) }
-
-          context "when filtering by related to meetings" do
-            let(:related_to) { "Decidim::Meetings::Meeting".underscore }
-            let(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: participatory_process) }
-            let(:meeting) { create :meeting, component: meetings_component }
-
-            it "returns only proposals related to meetings" do
-              related_proposal = create(:proposal, :accepted, component: component)
-              related_proposal2 = create(:proposal, :accepted, component: component)
-              create_list(:proposal, 3, component: component)
-              meeting.link_resources([related_proposal], "proposals_from_meeting")
-              related_proposal2.link_resources([meeting], "proposals_from_meeting")
-
-              expect(subject).to match_array([related_proposal, related_proposal2])
-            end
-          end
-
-          context "when filtering by related to resources" do
-            let(:related_to) { "Decidim::DummyResources::DummyResource".underscore }
-            let(:dummy_component) { create(:component, manifest_name: "dummy", participatory_space: participatory_process) }
-            let(:dummy_resource) { create :dummy_resource, component: dummy_component }
-
-            it "returns only proposals related to results" do
-              related_proposal = create(:proposal, :accepted, component: component)
-              related_proposal2 = create(:proposal, :accepted, component: component)
-              create_list(:proposal, 3, component: component)
-              dummy_resource.link_resources([related_proposal], "included_proposals")
-              related_proposal2.link_resources([dummy_resource], "included_proposals")
-
-              expect(subject).to match_array([related_proposal, related_proposal2])
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-proposals/spec/services/decidim/proposals/searchable_proposal_resource_spec.rb b/decidim-proposals/spec/services/decidim/proposals/searchable_proposal_resource_spec.rb
index d2b4c7a12f957..f886e7e1d1780 100644
--- a/decidim-proposals/spec/services/decidim/proposals/searchable_proposal_resource_spec.rb
+++ b/decidim-proposals/spec/services/decidim/proposals/searchable_proposal_resource_spec.rb
@@ -17,7 +17,7 @@ module Decidim
         skip_injection: true,
         component: current_component,
         scope: scope1,
-        body: description_1,
+        body: description1,
         users: [author]
       )
     end
diff --git a/decidim-proposals/spec/shared/admin_manages_proposal_answer_imports_examples.rb b/decidim-proposals/spec/shared/admin_manages_proposal_answer_imports_examples.rb
index b2dea71a425a9..6da6ae41986fe 100644
--- a/decidim-proposals/spec/shared/admin_manages_proposal_answer_imports_examples.rb
+++ b/decidim-proposals/spec/shared/admin_manages_proposal_answer_imports_examples.rb
@@ -13,12 +13,12 @@
 
     it "returns error without a file" do
       click_button "Import"
-      expect(page).to have_content("There was a problem during the import")
+      expect(page).to have_content("There's an error in this field")
     end
 
     it "adds proposal answers after succesfully import" do
       File.write(json_file, JSON.pretty_generate(answers))
-      attach_file(:import_file, json_file)
+      dynamically_attach_file(:import_file, json_file)
 
       expect(Decidim::Proposals::Admin::NotifyProposalAnswer).to receive(:call).exactly(amount).times
 
@@ -35,7 +35,7 @@
 
     it "doesnt accept file without required headers" do
       File.write(json_file, JSON.pretty_generate(missing_answers))
-      attach_file(:import_file, json_file)
+      dynamically_attach_file(:import_file, json_file)
       click_button "Import"
       expect(page).to have_content("Missing column answer/en. Please check that the file contains required columns.")
     end
@@ -57,7 +57,7 @@
 
       it "adds proposal answers after succesfully import" do
         File.write(json_file, JSON.pretty_generate(answers))
-        attach_file(:import_file, json_file)
+        dynamically_attach_file(:import_file, json_file)
 
         expect(Decidim::Proposals::Admin::NotifyProposalAnswer).to receive(:call).exactly(amount).times
 
diff --git a/decidim-proposals/spec/shared/admin_manages_proposals_context.rb b/decidim-proposals/spec/shared/admin_manages_proposals_shared_context.rb
similarity index 100%
rename from decidim-proposals/spec/shared/admin_manages_proposals_context.rb
rename to decidim-proposals/spec/shared/admin_manages_proposals_shared_context.rb
diff --git a/decidim-proposals/spec/shared/import_proposals_examples.rb b/decidim-proposals/spec/shared/import_proposals_examples.rb
index 7a3160c556cec..bbbfcb7577c9d 100644
--- a/decidim-proposals/spec/shared/import_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/import_proposals_examples.rb
@@ -37,7 +37,7 @@
     end
 
     it "imports from a csv file" do
-      attach_file("proposals_file_import_file", Decidim::Dev.asset("import_proposals.csv"))
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals.csv"))
       click_button "Import"
 
       confirm_flash_message
@@ -45,7 +45,7 @@
     end
 
     it "imports from a json file" do
-      attach_file("proposals_file_import_file", Decidim::Dev.asset("import_proposals.json"))
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals.json"))
 
       click_button "Import"
 
@@ -54,7 +54,7 @@
     end
 
     it "imports from a excel file" do
-      attach_file("proposals_file_import_file", Decidim::Dev.asset("import_proposals.xlsx"))
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals.xlsx"))
 
       click_button "Import"
 
diff --git a/decidim-proposals/spec/shared/manage_proposals_examples.rb b/decidim-proposals/spec/shared/manage_proposals_examples.rb
index ff125f06a5599..f480563d31858 100644
--- a/decidim-proposals/spec/shared/manage_proposals_examples.rb
+++ b/decidim-proposals/spec/shared/manage_proposals_examples.rb
@@ -231,7 +231,11 @@
               fill_in_i18n :proposal_title, "#proposal-title-tabs", en: "Proposal with attachments"
               fill_in_i18n_editor :proposal_body, "#proposal-body-tabs", en: "This is my proposal and I want to upload attachments."
               fill_in :proposal_attachment_title, with: "My attachment"
-              attach_file :proposal_attachment_file, Decidim::Dev.asset("city.jpeg")
+            end
+
+            dynamically_attach_file(:proposal_photos, Decidim::Dev.asset("city.jpeg"))
+
+            within ".new_proposal" do
               find("*[type=submit]").click
             end
 
@@ -415,8 +419,8 @@
         end
 
         proposal.reload
-        expect(proposal.answered_at).to eq(nil)
-        expect(proposal.state_published_at).to eq(nil)
+        expect(proposal.answered_at).to be_nil
+        expect(proposal.state_published_at).to be_nil
       end
 
       it "can edit a proposal answer" do
diff --git a/decidim-proposals/spec/shared/proposal_form_examples.rb b/decidim-proposals/spec/shared/proposal_form_examples.rb
index 39b2802206cd3..fe45b2a1cf77a 100644
--- a/decidim-proposals/spec/shared/proposal_form_examples.rb
+++ b/decidim-proposals/spec/shared/proposal_form_examples.rb
@@ -76,9 +76,9 @@
     it "only adds errors to this field" do
       subject.valid?
       if options[:i18n]
-        expect(subject.errors.keys).to eq [:title_en]
+        expect(subject.errors.attribute_names).to eq [:title_en]
       else
-        expect(subject.errors.keys).to eq [:title]
+        expect(subject.errors.attribute_names).to eq [:title]
       end
     end
   end
@@ -154,9 +154,9 @@
       context "when the address is not present" do
         it "does not store the coordinates" do
           expect(subject).to be_valid
-          expect(subject.address).to be(nil)
-          expect(subject.latitude).to be(nil)
-          expect(subject.longitude).to be(nil)
+          expect(subject.address).to be_nil
+          expect(subject.latitude).to be_nil
+          expect(subject.longitude).to be_nil
         end
       end
 
@@ -181,8 +181,8 @@
 
         it "is valid" do
           expect(subject).to be_valid
-          expect(subject.latitude).to eq(nil)
-          expect(subject.longitude).to eq(nil)
+          expect(subject.latitude).to be_nil
+          expect(subject.longitude).to be_nil
         end
       end
 
@@ -240,13 +240,13 @@
     context "when the category does not exist" do
       let(:category_id) { 7654 }
 
-      it { is_expected.to eq(nil) }
+      it { is_expected.to be_nil }
     end
 
     context "when the category is from another process" do
       let(:category_id) { create(:category).id }
 
-      it { is_expected.to eq(nil) }
+      it { is_expected.to be_nil }
     end
   end
 
@@ -290,10 +290,10 @@
 
         if options[:i18n]
           expect(subject.errors.full_messages).to match_array(["Title en can't be blank", "Add photos Needs to be reattached"])
-          expect(subject.errors.keys).to match_array([:title_en, :add_photos])
+          expect(subject.errors.attribute_names).to match_array([:title_en, :add_photos])
         else
           expect(subject.errors.full_messages).to match_array(["Title can't be blank", "Title is too short (under 15 characters)", "Add photos Needs to be reattached"])
-          expect(subject.errors.keys).to match_array([:title, :add_photos])
+          expect(subject.errors.attribute_names).to match_array([:title, :add_photos])
         end
       end
     end
diff --git a/decidim-proposals/spec/shared/proposals_wizards_examples.rb b/decidim-proposals/spec/shared/proposals_wizards_examples.rb
index d43388a7154b1..a513834915145 100644
--- a/decidim-proposals/spec/shared/proposals_wizards_examples.rb
+++ b/decidim-proposals/spec/shared/proposals_wizards_examples.rb
@@ -336,7 +336,6 @@
     end
   end
 
-  # rubocop:disable RSpec/EmptyExampleGroup
   context "when creating a new proposal" do
     before do
       login_as user, scope: :user
@@ -347,5 +346,4 @@
     it_behaves_like "with address" if options[:with_address]
     it_behaves_like "without address" unless options[:with_address]
   end
-  # rubocop:enable RSpec/EmptyExampleGroup
 end
diff --git a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
index db78f32734e78..4851c8904fd52 100644
--- a/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_edits_proposal_spec.rb
@@ -59,7 +59,7 @@
       end
     end
 
-    context "when the proposal has attachement" do
+    context "when the proposal has attachment" do
       let!(:component) do
         create(:proposal_component,
                :with_creation_enabled,
diff --git a/decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb b/decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb
index 52903e1dc2862..53bf9002157f9 100644
--- a/decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb
@@ -40,7 +40,7 @@ def import_document
       en: "The description of some participatory text",
       es: "La descripción de algún texto participativo"
     )
-    attach_file :import_participatory_text_document, Decidim::Dev.asset("participatory_text.md")
+    dynamically_attach_file(:import_participatory_text_document, Decidim::Dev.asset("participatory_text.md"))
     click_button "Upload document"
     expect(page).to have_content "The following sections have been converted to proposals. Now you can review and adjust them before publishing."
     expect(page).to have_content "Preview participatory text"
@@ -156,19 +156,4 @@ def discard_participatory_text_drafts
       expect(translated(proposal.body).delete("\r")).to eq(new_body)
     end
   end
-
-  describe "updating participatory texts in draft mode" do
-    let!(:proposal) { create :proposal, :draft, component: current_component, participatory_text_level: "article" }
-    let!(:new_body) { Faker::Lorem.unique.sentences(number: 3).join("\n") }
-
-    it "persists changes and all proposals remain as drafts" do
-      visit_participatory_texts
-      validate_occurrences(sections: 0, subsections: 0, articles: 1)
-      edit_participatory_text_body(0, new_body)
-      save_participatory_text_drafts
-      validate_occurrences(sections: 0, subsections: 0, articles: 1)
-      proposal.reload
-      expect(translated(proposal.body).delete("\r")).to eq(new_body)
-    end
-  end
 end
diff --git a/decidim-proposals/spec/system/admin/admin_manages_proposals_spec.rb b/decidim-proposals/spec/system/admin/admin_manages_proposals_spec.rb
index a5e538c656336..0e53e4eb50a42 100644
--- a/decidim-proposals/spec/system/admin/admin_manages_proposals_spec.rb
+++ b/decidim-proposals/spec/system/admin/admin_manages_proposals_spec.rb
@@ -24,4 +24,8 @@
   it_behaves_like "merge proposals"
   it_behaves_like "split proposals"
   it_behaves_like "publish answers"
+
+  it_behaves_like "sorted moderations" do
+    let!(:reportables) { create_list(:proposal, 17, component: current_component) }
+  end
 end
diff --git a/decidim-proposals/spec/system/admin/import_proposal_answers_spec.rb b/decidim-proposals/spec/system/admin/import_proposal_answers_spec.rb
index 612e2b933fdf2..7e0a2c7cd7418 100644
--- a/decidim-proposals/spec/system/admin/import_proposal_answers_spec.rb
+++ b/decidim-proposals/spec/system/admin/import_proposal_answers_spec.rb
@@ -29,7 +29,7 @@
         id: proposal.id,
         state: %w(accepted rejected evaluating).sample,
         "answer/fi": Faker::Lorem.sentence,
-        "hello": "world"
+        hello: "world"
       }
     end
   end
diff --git a/decidim-proposals/spec/system/admin/import_proposals_spec.rb b/decidim-proposals/spec/system/admin/import_proposals_spec.rb
index d038298d9a9ba..1342c9ccb5d99 100644
--- a/decidim-proposals/spec/system/admin/import_proposals_spec.rb
+++ b/decidim-proposals/spec/system/admin/import_proposals_spec.rb
@@ -24,18 +24,19 @@
 
     it "returns error without a file" do
       click_button "Import"
-      expect(page).to have_content("There was a problem during the import")
+      expect(page).to have_content("There's an error in this field")
     end
 
     it "doesnt change proposal amount if one imported row fails" do
-      attach_file :proposals_file_import_file, Decidim::Dev.asset("import_proposals_broken.csv")
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals_broken.csv"))
+
       click_button "Import"
       expect(page).to have_content("Found an error in the import file on line 4")
       expect(Decidim::Proposals::Proposal.count).to eq(0)
     end
 
     it "creates proposals after succesfully import" do
-      attach_file :proposals_file_import_file, Decidim::Dev.asset("import_proposals.csv")
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals.csv"))
       click_button "Import"
       expect(page).to have_content("3 proposals successfully imported")
       expect(Decidim::Proposals::Proposal.count).to eq(3)
@@ -58,7 +59,7 @@
     it "links proposal to user group during the import" do
       page.find("#proposals_file_import_user_group_id").click
       select user_group.name, from: "proposals_file_import_user_group_id"
-      attach_file :proposals_file_import_file, Decidim::Dev.asset("import_proposals.csv")
+      dynamically_attach_file(:proposals_file_import_file, Decidim::Dev.asset("import_proposals.csv"))
       click_button "Import"
       expect(page).to have_content("3 proposals successfully imported")
       expect(Decidim::Proposals::Proposal.last.user_groups.count).to eq(1)
diff --git a/decidim-proposals/spec/system/admin/index_proposal_notes_spec.rb b/decidim-proposals/spec/system/admin/index_proposal_notes_spec.rb
index ae27e63ce9ec8..7a9d9adf69005 100644
--- a/decidim-proposals/spec/system/admin/index_proposal_notes_spec.rb
+++ b/decidim-proposals/spec/system/admin/index_proposal_notes_spec.rb
@@ -38,7 +38,7 @@
   end
 
   context "when the form has a text inside body" do
-    it "creates a proposal note ", :slow do
+    it "creates a proposal note", :slow do
       within ".new_proposal_note" do
         fill_in :proposal_note_body, with: body
 
diff --git a/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb b/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
index a2eed1021ce0c..85d3fe746cba8 100644
--- a/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
+++ b/decidim-proposals/spec/system/admin/view_proposal_details_from_admin_spec.rb
@@ -230,6 +230,7 @@
   context "with attached photos" do
     it "lists the documents" do
       image = create :attachment, :with_image, attached_to: proposal
+      image.reload
       go_to_admin_proposal_page(proposal)
 
       within "#photos" do
diff --git a/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb b/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
index c49b0405ba5de..906e8f9ca8169 100644
--- a/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
+++ b/decidim-proposals/spec/system/collaborative_drafts_fields_spec.rb
@@ -323,8 +323,11 @@
             within ".new_collaborative_draft" do
               fill_in :collaborative_draft_title, with: "Collaborative draft with attachments"
               fill_in :collaborative_draft_body, with: "This is my collaborative draft and I want to upload attachments."
-              fill_in :collaborative_draft_attachment_title, with: "My attachment"
-              attach_file :collaborative_draft_attachment_file, Decidim::Dev.asset("city.jpeg")
+            end
+
+            dynamically_attach_file(:collaborative_draft_documents, Decidim::Dev.asset("city.jpeg"), { title: "My attachment" })
+
+            within ".new_collaborative_draft" do
               find("*[type=submit]").click
             end
 
diff --git a/decidim-proposals/spec/system/collaborative_drafts_spec.rb b/decidim-proposals/spec/system/collaborative_drafts_spec.rb
index 4b3cc5cfb6d2e..89426dc169c23 100644
--- a/decidim-proposals/spec/system/collaborative_drafts_spec.rb
+++ b/decidim-proposals/spec/system/collaborative_drafts_spec.rb
@@ -50,7 +50,7 @@
           expect(page).to have_css(".success.card__text--status", text: "OPEN")
         end
         within ".filters" do
-          expect(find(:css, "input[name='filter[state][]'][value='open']")).to be_checked
+          expect(find(:css, "input[name='filter[with_any_state][]'][value='open']")).to be_checked
         end
       end
 
@@ -64,7 +64,7 @@
       end
 
       it "shows state filters" do
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           expect(page).to have_field("All")
           expect(page).to have_field("Open")
           expect(page).to have_field("Withdrawn")
@@ -73,7 +73,7 @@
       end
 
       it "shows category filters" do
-        within ".filters .category_id_check_boxes_tree_filter" do
+        within ".filters .with_any_category_check_boxes_tree_filter" do
           expect(page).to have_field("All")
           [category, category2, category3].each do |cat|
             expect(page).to have_field(cat.name[I18n.locale.to_s])
diff --git a/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb b/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
index c77a6b49da059..87f164bf64fc9 100644
--- a/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
+++ b/decidim-proposals/spec/system/edit_collaborative_draft_spec.rb
@@ -58,11 +58,9 @@
           click_link collaborative_draft.title
           click_link "Edit collaborative draft"
 
-          expect(page).to have_css "#collaborative_draft_attachment_file"
+          dynamically_attach_file(:collaborative_draft_documents, Decidim::Dev.asset("city.jpeg"), { title: "My attachment" })
 
           within "form.edit_collaborative_draft" do
-            fill_in :collaborative_draft_attachment_title, with: "My attachment"
-            attach_file :collaborative_draft_attachment_file, Decidim::Dev.asset("city.jpeg")
             find("*[type=submit]").click
           end
 
@@ -84,7 +82,8 @@
           click_button "Send"
         end
 
-        expect(page).to have_content("At least 15 characters", count: 2)
+        # The character counters are doubled because there is a separate screen reader character counter.
+        expect(page).to have_content("At least 15 characters", count: 4)
 
         within "form.edit_collaborative_draft" do
           fill_in :collaborative_draft_body, with: "WE DO NOT WANT TO SHOUT IN THE PROPOSAL BODY TEXT!"
diff --git a/decidim-proposals/spec/system/edit_proposal_spec.rb b/decidim-proposals/spec/system/edit_proposal_spec.rb
index f6315167160d6..fd28add18fcca 100644
--- a/decidim-proposals/spec/system/edit_proposal_spec.rb
+++ b/decidim-proposals/spec/system/edit_proposal_spec.rb
@@ -15,10 +15,6 @@
     switch_to_host user.organization.host
   end
 
-  def visit_proposal
-    click_link proposal_title, match: :first
-  end
-
   describe "editing my own proposal" do
     let(:new_title) { "This is my proposal new title" }
     let(:new_body) { "This is my proposal new body" }
@@ -30,7 +26,7 @@ def visit_proposal
     it "can be updated" do
       visit_component
 
-      visit_proposal
+      click_link proposal_title
       click_link "Edit proposal"
 
       expect(page).to have_content "EDIT PROPOSAL"
@@ -46,30 +42,101 @@ def visit_proposal
       expect(page).to have_content(new_body)
     end
 
-    context "with attachments allowed" do
+    context "when attachments are allowed" do
       let(:component) { create(:proposal_component, :with_attachments_allowed, participatory_space: participatory_process) }
-      let!(:file) { create(:attachment, :with_pdf, attached_to: proposal) }
-      let!(:photo) { create(:attachment, :with_image, attached_to: proposal) }
 
-      it "can delete attachments" do
+      before do
         visit_component
-        visit_proposal
-        expect(page).to have_content("RELATED DOCUMENTS")
-        expect(page).to have_content("RELATED IMAGES")
-        click_link "Edit proposal"
+        click_link translated(proposal.title)
+      end
 
-        within "#attachment_#{file.id}" do
-          click_button "Delete Document"
+      it "shows validation error when format is not accepted" do
+        click_link "Edit proposal"
+        dynamically_attach_file(:proposal_photos, Decidim::Dev.asset("participatory_text.md"), keep_modal_open: true) do
+          expect(page).to have_content("Accepted formats: #{Decidim::OrganizationSettings.for(organization).upload_allowed_file_extensions_image.join(", ")}")
         end
+        expect(page).to have_content("only files with the following extensions are allowed: bmp, gif, jpeg, jpg, pdf, png, rtf, txt")
+      end
+
+      context "with a file and photo" do
+        let!(:file) { create(:attachment, :with_pdf, weight: 1, attached_to: proposal) }
+        let!(:photo) { create(:attachment, :with_image, weight: 0, attached_to: proposal) }
+
+        it "can delete attachments" do
+          visit current_path
+          expect(page).to have_content("RELATED DOCUMENTS")
+          expect(page).to have_content("RELATED IMAGES")
+          click_link "Edit proposal"
+
+          click_button "Edit documents"
+          within ".upload-modal" do
+            find("button.remove-upload-item").click
+            click_button "Save"
+          end
+          click_button "Edit image"
+          within ".upload-modal" do
+            find("button.remove-upload-item").click
+            click_button "Save"
+          end
 
-        within "#attachment_#{photo.id}" do
-          click_button "Delete Image"
+          click_button "Send"
+
+          expect(page).to have_no_content("Related documents")
+          expect(page).to have_no_content("Related images")
         end
 
-        click_button "Send"
+        context "with attachment titles" do
+          let(:attachment_file_title) { ::Faker::Lorem.sentence }
+          let(:attachment_image_title) { ::Faker::Lorem.sentence }
+
+          it "can change attachment titles" do
+            click_link "Edit proposal"
+            click_button "Edit image"
+            within ".upload-modal" do
+              expect(page).to have_content("Preferrably a landscape image that does not have any text")
+              find(".attachment-title").set(attachment_image_title)
+              click_button "Save"
+            end
+            click_button "Edit documents"
+            within ".upload-modal" do
+              expect(page).to have_content("Has to be an image or a document")
+              find(".attachment-title").set(attachment_file_title)
+              click_button "Save"
+            end
+            click_button "Send"
+            expect(page).to have_selector("div.flash.callout.success")
+            expect(Decidim::Attachment.count).to eq(2)
+            expect(translated(Decidim::Attachment.find_by(attached_to_id: proposal.id, content_type: "image/jpeg").title)).to eq(attachment_image_title)
+            expect(translated(Decidim::Attachment.find_by(attached_to_id: proposal.id, content_type: "application/pdf").title)).to eq(attachment_file_title)
+          end
+        end
+      end
 
-        expect(page).to have_no_content("Related documents")
-        expect(page).to have_no_content("Related images")
+      context "with multiple images" do
+        it "can add many images many times" do
+          click_link "Edit proposal"
+          dynamically_attach_file(:proposal_photos, Decidim::Dev.asset("city.jpeg"))
+          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("icon.png"))
+          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("avatar.jpg"))
+          click_button "Send"
+          click_link "Edit proposal"
+          within ".photos_container" do
+            expect(page).to have_content("city.jpeg")
+          end
+          within ".attachments_container" do
+            expect(page).to have_content("icon.png")
+            expect(page).to have_content("avatar.jpg")
+          end
+          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city2.jpeg"))
+          dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city3.jpeg"))
+          click_button "Send"
+          expect(page).to have_selector("div.flash.callout.success")
+          expect(page).to have_selector(".thumbnail[alt='city']")
+          expect(page).to have_selector(".thumbnail[alt='icon']")
+          expect(page).to have_selector(".thumbnail[alt='avatar']")
+          expect(page).to have_selector(".thumbnail[alt='city2']")
+          expect(page).to have_selector(".thumbnail[alt='city3']")
+        end
       end
     end
 
@@ -88,11 +155,11 @@ def visit_proposal
       it "can be updated with address", :serves_geocoding_autocomplete do
         visit_component
 
-        visit_proposal
+        click_link translated(proposal.title)
         click_link "Edit proposal"
         check "proposal_has_address"
 
-        expect(page).to have_field("Title", with: proposal_title)
+        expect(page).to have_field("Title", with: translated(proposal.title))
         expect(page).to have_field("Body", with: translated(proposal.body))
         expect(page).to have_field("Address", with: proposal.address)
         expect(page).to have_css("[data-decidim-map]")
@@ -116,10 +183,10 @@ def visit_proposal
         it "allows filling an empty address and unchecking the has address checkbox" do
           visit_component
 
-          visit_proposal
+          click_link translated(proposal.title)
           click_link "Edit proposal"
 
-          expect(page).to have_field("Title", with: proposal_title)
+          expect(page).to have_field("Title", with: translated(proposal.title))
           expect(page).to have_field("Body", with: translated(proposal.body))
           expect(page).to have_field("Address", with: proposal.address)
 
@@ -144,7 +211,7 @@ def visit_proposal
       it "returns an error message" do
         visit_component
 
-        visit_proposal
+        click_link proposal_title
         click_link "Edit proposal"
 
         expect(page).to have_content "EDIT PROPOSAL"
@@ -154,7 +221,8 @@ def visit_proposal
           click_button "Send"
         end
 
-        expect(page).to have_content("At least 15 characters", count: 2)
+        # The character counters are doubled because there is a separate screen reader character counter.
+        expect(page).to have_content("At least 15 characters", count: 4)
 
         within "form.edit_proposal" do
           fill_in :proposal_body, with: "WE DO NOT WANT TO SHOUT IN THE PROPOSAL BODY TEXT!"
@@ -167,7 +235,7 @@ def visit_proposal
       it "keeps the submitted values" do
         visit_component
 
-        visit_proposal
+        click_link proposal_title
         click_link "Edit proposal"
 
         expect(page).to have_content "EDIT PROPOSAL"
@@ -197,7 +265,7 @@ def visit_proposal
           body["en"] = body_en
           proposal.update!(body: body)
           visit_component
-          visit_proposal
+          click_link proposal_title
         end
 
         it "doesnt change the href" do
@@ -223,7 +291,7 @@ def visit_proposal
     it "renders an error" do
       visit_component
 
-      visit_proposal
+      click_link proposal_title
       expect(page).to have_no_content("Edit proposal")
       visit "#{current_path}/edit"
 
@@ -241,7 +309,7 @@ def visit_proposal
     it "renders an error" do
       visit_component
 
-      visit_proposal
+      click_link proposal_title
       expect(page).to have_no_content("Edit proposal")
       visit "#{current_path}/edit"
 
diff --git a/decidim-proposals/spec/system/filter_proposals_spec.rb b/decidim-proposals/spec/system/filter_proposals_spec.rb
index c22b29062014f..d833a1248d111 100644
--- a/decidim-proposals/spec/system/filter_proposals_spec.rb
+++ b/decidim-proposals/spec/system/filter_proposals_spec.rb
@@ -31,6 +31,25 @@
     end
   end
 
+  context "when filtering proposals by TEXT" do
+    it "updates the current URL" do
+      create(:proposal, component: component, title: { en: "Foobar proposal" })
+      create(:proposal, component: component, title: { en: "Another proposal" })
+      visit_component
+
+      within "form.new_filter" do
+        fill_in("filter[search_text_cont]", with: "foobar")
+        click_button "Search"
+      end
+
+      expect(page).not_to have_content("Another proposal")
+      expect(page).to have_content("Foobar proposal")
+
+      filter_params = CGI.parse(URI.parse(page.current_url).query)
+      expect(filter_params["filter[search_text_cont]"]).to eq(["foobar"])
+    end
+  end
+
   context "when filtering proposals by ORIGIN" do
     context "when official_proposals setting is enabled" do
       before do
@@ -51,7 +70,7 @@
           create(:proposal, component: component, scope: scope)
           visit_component
 
-          within ".filters .origin_check_boxes_tree_filter" do
+          within ".filters .with_any_origin_check_boxes_tree_filter" do
             uncheck "All"
             check "Official"
           end
@@ -61,15 +80,15 @@
         end
       end
 
-      context "with 'citizens' origin" do
+      context "with 'participants' origin" do
         it "lists the filtered proposals" do
           create_list(:proposal, 2, component: component, scope: scope)
           create(:proposal, :official, component: component, scope: scope)
           visit_component
 
-          within ".filters .origin_check_boxes_tree_filter" do
+          within ".filters .with_any_origin_check_boxes_tree_filter" do
             uncheck "All"
-            check "Citizens"
+            check "Participants"
           end
 
           expect(page).to have_css(".card--proposal", count: 2)
@@ -112,7 +131,7 @@
 
     context "when selecting the global scope" do
       it "lists the filtered proposals", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check "Global"
         end
@@ -124,7 +143,7 @@
 
     context "when selecting one scope" do
       it "lists the filtered proposals", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check scope.name[I18n.locale.to_s]
         end
@@ -136,7 +155,7 @@
 
     context "when selecting the global scope and another scope" do
       it "lists the filtered proposals", :slow do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check "Global"
           check scope.name[I18n.locale.to_s]
@@ -149,7 +168,7 @@
 
     context "when unselecting the selected scope" do
       it "lists the filtered proposals" do
-        within ".filters .scope_id_check_boxes_tree_filter" do
+        within ".filters .with_any_scope_check_boxes_tree_filter" do
           uncheck "All"
           check scope.name[I18n.locale.to_s]
           check "Global"
@@ -215,7 +234,7 @@
           create(:proposal, :accepted, component: component, scope: scope)
           visit_component
 
-          within ".filters .state_check_boxes_tree_filter" do
+          within ".filters .with_any_state_check_boxes_tree_filter" do
             check "All"
             uncheck "All"
             check "Accepted"
@@ -233,7 +252,7 @@
           create(:proposal, :rejected, component: component, scope: scope)
           visit_component
 
-          within ".filters .state_check_boxes_tree_filter" do
+          within ".filters .with_any_state_check_boxes_tree_filter" do
             check "All"
             uncheck "All"
             check "Rejected"
@@ -257,7 +276,7 @@
           end
 
           it "shows only accepted proposals with published answers" do
-            within ".filters .state_check_boxes_tree_filter" do
+            within ".filters .with_any_state_check_boxes_tree_filter" do
               check "All"
               uncheck "All"
               check "Accepted"
@@ -272,7 +291,7 @@
           end
 
           it "shows accepted proposals with not published answers as not answered" do
-            within ".filters .state_check_boxes_tree_filter" do
+            within ".filters .with_any_state_check_boxes_tree_filter" do
               check "All"
               uncheck "All"
               check "Not answered"
@@ -340,7 +359,7 @@
       it "can be filtered by a category" do
         visit_component
 
-        within ".filters .category_id_check_boxes_tree_filter" do
+        within ".filters .with_any_category_check_boxes_tree_filter" do
           uncheck "All"
           check category.name[I18n.locale.to_s]
         end
@@ -351,7 +370,7 @@
       it "can be filtered by two categories" do
         visit_component
 
-        within ".filters .category_id_check_boxes_tree_filter" do
+        within ".filters .with_any_category_check_boxes_tree_filter" do
           uncheck "All"
           check category.name[I18n.locale.to_s]
           check category2.name[I18n.locale.to_s]
@@ -642,7 +661,7 @@
     end
 
     it "recover filters from initial pages" do
-      within ".filters .state_check_boxes_tree_filter" do
+      within ".filters .with_any_state_check_boxes_tree_filter" do
         check "Rejected"
       end
 
@@ -654,19 +673,19 @@
     end
 
     it "recover filters from previous pages" do
-      within ".filters .state_check_boxes_tree_filter" do
+      within ".filters .with_any_state_check_boxes_tree_filter" do
         check "All"
         uncheck "All"
       end
-      within ".filters .origin_check_boxes_tree_filter" do
+      within ".filters .with_any_origin_check_boxes_tree_filter" do
         uncheck "All"
       end
 
-      within ".filters .origin_check_boxes_tree_filter" do
+      within ".filters .with_any_origin_check_boxes_tree_filter" do
         check "Official"
       end
 
-      within ".filters .state_check_boxes_tree_filter" do
+      within ".filters .with_any_state_check_boxes_tree_filter" do
         check "Accepted"
       end
 
@@ -699,7 +718,7 @@
     it "saves and restores the filtering" do
       expect(page).to have_css(".card.card--proposal", count: 6)
 
-      within ".filters .state_check_boxes_tree_filter" do
+      within ".filters .with_any_state_check_boxes_tree_filter" do
         check "Rejected"
       end
 
diff --git a/decidim-proposals/spec/system/homepage_stats_spec.rb b/decidim-proposals/spec/system/homepage_stats_spec.rb
new file mode 100644
index 0000000000000..1c4285fbfd9f9
--- /dev/null
+++ b/decidim-proposals/spec/system/homepage_stats_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Homepage", type: :system do
+  include_context "with a component"
+  let(:manifest_name) { "proposals" }
+
+  let!(:meetings) { create_list(:proposal, 3, :published, component: component, users: [component.organization]) }
+  let!(:moderation) { create :moderation, reportable: meetings.first, hidden_at: 1.day.ago }
+
+  let(:day) { Time.zone.yesterday }
+  let(:author) { create(:user, organization: component.organization) }
+  let!(:comments) { create_list(:comment, 5, created_at: day, author: author, commentable: meetings.last) }
+  let!(:comment_moderation) { create :moderation, reportable: comments.last, hidden_at: 1.day.ago }
+
+  before do
+    create :content_block, organization: organization, scope_name: :homepage, manifest_name: :stats
+    visit decidim.root_path
+  end
+
+  it "display unhidden proposal count" do
+    within(".proposals_count") do
+      expect(page).to have_content(2)
+    end
+  end
+
+  it "display unhidden comments count" do
+    within(".comments_count") do
+      expect(page).to have_content(4)
+    end
+  end
+end
diff --git a/decidim-proposals/spec/system/index_proposals_spec.rb b/decidim-proposals/spec/system/index_proposals_spec.rb
index 51a78b6e1d107..57da7818b84a7 100644
--- a/decidim-proposals/spec/system/index_proposals_spec.rb
+++ b/decidim-proposals/spec/system/index_proposals_spec.rb
@@ -16,6 +16,41 @@
     end
   end
 
+  context "when checking withdrawn proposals" do
+    context "when there are no withrawn proposals" do
+      let!(:proposals) { create_list(:proposal, 3, component: component) }
+
+      before do
+        visit_component
+        click_link "See all withdrawn proposals"
+      end
+
+      it "shows an empty page with a message" do
+        expect(page).to have_content("There isn't any proposal with this criteria")
+        within ".callout.warning" do
+          expect(page).to have_content("You are viewing the list of proposals withdrawn by their authors. ")
+        end
+      end
+    end
+
+    context "when there are withrawn proposals" do
+      let!(:proposals) { create_list(:proposal, 3, component: component) }
+      let!(:withdrawn_proposals) { create_list(:proposal, 3, :withdrawn, component: component) }
+
+      before do
+        visit_component
+        click_link "See all withdrawn proposals"
+      end
+
+      it "shows all the withdrawn proposals" do
+        expect(page).to have_css(".card--proposal.alert", count: 3)
+        within ".callout.warning" do
+          expect(page).to have_content("You are viewing the list of proposals withdrawn by their authors.")
+        end
+      end
+    end
+  end
+
   context "when there are no proposals" do
     context "when there are no filters" do
       it "shows generic empty message" do
diff --git a/decidim-proposals/spec/system/participatory_texts_spec.rb b/decidim-proposals/spec/system/participatory_texts_spec.rb
index 26baa6b69a486..29b91942b2edd 100644
--- a/decidim-proposals/spec/system/participatory_texts_spec.rb
+++ b/decidim-proposals/spec/system/participatory_texts_spec.rb
@@ -143,11 +143,11 @@ def should_have_proposal(selector, proposal)
       end
 
       context "with existing amendments" do
-        let!(:emendation_1) { create(:proposal, :published, component: component) }
-        let!(:amendment_1) { create :amendment, amendable: proposals.first, emendation: emendation_1 }
-        let!(:emendation_2) { create(:proposal, component: component) }
-        let!(:amendment_2) { create(:amendment, amendable: proposals.first, emendation: emendation_2) }
-        let(:user) { amendment_1.amender }
+        let!(:emendation1) { create(:proposal, :published, component: component) }
+        let!(:amendment1) { create :amendment, amendable: proposals.first, emendation: emendation1 }
+        let!(:emendation2) { create(:proposal, component: component) }
+        let!(:amendment2) { create(:amendment, amendable: proposals.first, emendation: emendation2) }
+        let(:user) { amendment1.amender }
 
         context "when amendment CREATION is enabled" do
           before { update_step_settings(amendment_creation_enabled: true) }
@@ -200,7 +200,7 @@ def should_have_proposal(selector, proposal)
             before { update_step_settings(amendments_visibility: "all") }
 
             context "when the user is logged in" do
-              let(:user) { amendment_1.amender }
+              let(:user) { amendment1.amender }
 
               before { login_as user, scope: :user }
 
@@ -222,7 +222,7 @@ def should_have_proposal(selector, proposal)
             before { update_step_settings(amendments_visibility: "participants") }
 
             context "when the user is logged in" do
-              let(:user) { amendment_1.amender }
+              let(:user) { amendment1.amender }
 
               before { login_as user, scope: :user }
 
diff --git a/decidim-proposals/spec/system/proposals_fields_spec.rb b/decidim-proposals/spec/system/proposals_fields_spec.rb
index e0b25997f7a0c..85c68aceed605 100644
--- a/decidim-proposals/spec/system/proposals_fields_spec.rb
+++ b/decidim-proposals/spec/system/proposals_fields_spec.rb
@@ -106,7 +106,7 @@
                    })
           end
 
-          let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "He will not solve everything") }
+          let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "It will not solve everything") }
 
           it "creates a new proposal", :slow do
             visit complete_proposal_path(component, proposal_draft)
@@ -174,7 +174,7 @@
                    participatory_space: participatory_process)
           end
 
-          let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "He will not solve everything") }
+          let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "It will not solve everything") }
           let(:component_automatic_hashtags) { "AutoHashtag1 AutoHashtag2" }
           let(:component_suggested_hashtags) { "SuggestedHashtag1 SuggestedHashtag2" }
 
@@ -241,7 +241,7 @@
                      })
             end
 
-            let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "He will not solve everything") }
+            let(:proposal_draft) { create(:proposal, :draft, users: [user], component: component, title: "More sidewalks and less roads", body: "It will not solve everything") }
 
             it "creates a new proposal as a user group", :slow do
               visit complete_proposal_path(component, proposal_draft)
@@ -308,7 +308,11 @@
             within ".edit_proposal" do
               fill_in :proposal_title, with: "Proposal with attachments"
               fill_in :proposal_body, with: "This is my proposal and I want to upload attachments."
-              attach_file :proposal_add_photos, Decidim::Dev.asset("city.jpeg")
+            end
+
+            dynamically_attach_file(:proposal_photos, Decidim::Dev.asset("city.jpeg"))
+
+            within ".edit_proposal" do
               find("*[type=submit]").click
             end
 
@@ -320,6 +324,68 @@
               expect(page).to have_selector("img[src*=\"city.jpeg\"]", count: 1)
             end
           end
+
+          context "with multiple images" do
+            before do
+              visit complete_proposal_path(component, proposal_draft)
+
+              within ".edit_proposal" do
+                fill_in :proposal_title, with: "Proposal with attachments"
+                fill_in :proposal_body, with: "This is my proposal and I want to upload attachments."
+              end
+            end
+
+            it "sets the card image correctly with zero weight" do
+              # Attach one card image and two document images and go to preview
+              dynamically_attach_file(:proposal_photos, Decidim::Dev.asset("city.jpeg"))
+              dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city2.jpeg"))
+              dynamically_attach_file(:proposal_documents, Decidim::Dev.asset("city3.jpeg"))
+
+              within ".edit_proposal" do
+                find("*[type=submit]").click
+              end
+
+              # From preview, go back to edit
+              expect(page).to have_content("Your proposal has not yet been published")
+              click_link "Modify the proposal"
+
+              # See that the images are in correct positions and remove the card
+              # image.
+              within ".dynamic-uploads.upload-container-for-photos .active-uploads" do
+                expect(page).to have_content("city.jpeg")
+              end
+              within ".dynamic-uploads.upload-container-for-documents .active-uploads" do
+                expect(page).to have_content("city2.jpeg")
+                expect(page).to have_content("city3.jpeg")
+              end
+
+              within ".dynamic-uploads.upload-container-for-photos" do
+                click_button "Edit image"
+              end
+              within ".upload-modal" do
+                find("button.remove-upload-item").click
+                click_button "Save"
+              end
+
+              within ".edit_proposal" do
+                find("*[type=submit]").click
+              end
+
+              # From preview, go back to edit
+              expect(page).to have_content("Your proposal has not yet been published")
+              click_link "Modify the proposal"
+
+              # See that the card image is now empty and the two other images
+              # are still in the documents container as they should.
+              within ".dynamic-uploads.upload-container-for-photos .active-uploads" do
+                expect(page).not_to have_selector(".attachment-details")
+              end
+              within ".dynamic-uploads.upload-container-for-documents .active-uploads" do
+                expect(page).to have_content("city2.jpeg")
+                expect(page).to have_content("city3.jpeg")
+              end
+            end
+          end
         end
       end
 
diff --git a/decidim-proposals/spec/system/proposals_spec.rb b/decidim-proposals/spec/system/proposals_spec.rb
index 63998ab012607..bb909a2121f8c 100644
--- a/decidim-proposals/spec/system/proposals_spec.rb
+++ b/decidim-proposals/spec/system/proposals_spec.rb
@@ -592,7 +592,7 @@
 
       it "finds the correct proposal" do
         within "form.new_filter" do
-          find("input[name='filter[search_text]']", match: :first).set("lorem")
+          find("input[name='filter[search_text_cont]']", match: :first).set("lorem")
           find("*[type=submit]").click
         end
 
diff --git a/decidim-proposals/spec/system/report_proposal_spec.rb b/decidim-proposals/spec/system/report_proposal_spec.rb
index 1bf8c811c18e9..186b09ba44b1e 100644
--- a/decidim-proposals/spec/system/report_proposal_spec.rb
+++ b/decidim-proposals/spec/system/report_proposal_spec.rb
@@ -17,5 +17,33 @@
            participatory_space: participatory_process)
   end
 
+  context "when the author is a meeting" do
+    let!(:proposal) { create(:proposal, :official_meeting, component: component) }
+    let(:reportable) { proposal }
+    let(:reportable_path) { resource_locator(reportable).path }
+
+    before do
+      login_as user, scope: :user
+    end
+
+    it "reports the resource" do
+      visit reportable_path
+
+      expect(page).to have_selector(".author-data__extra")
+
+      within ".author-data__extra", match: :first do
+        page.find("button").click
+      end
+
+      expect(page).to have_css(".flag-modal", visible: :visible)
+
+      within ".flag-modal" do
+        click_button "Report"
+      end
+
+      expect(page).to have_content "report has been created"
+    end
+  end
+
   include_examples "reports"
 end
diff --git a/decidim-proposals/spec/system/search_proposals_spec.rb b/decidim-proposals/spec/system/search_proposals_spec.rb
index 8300cb0b2ca2a..6b4f2bdc98d39 100644
--- a/decidim-proposals/spec/system/search_proposals_spec.rb
+++ b/decidim-proposals/spec/system/search_proposals_spec.rb
@@ -9,7 +9,7 @@
   end
   let(:manifest_name) { "proposals" }
   let!(:searchables) { create_list(:proposal, 3, component: component) }
-  let!(:term) { translated(searchables.first.title).split(" ").last }
+  let!(:term) { translated(searchables.first.title).split.last }
   let(:component) { create(:proposal_component, participatory_space: participatory_process) }
   let(:hashtag) { "#decidim" }
 
diff --git a/decidim-proposals/spec/system/vote_proposal_spec.rb b/decidim-proposals/spec/system/vote_proposal_spec.rb
index 80cb0d11307d5..706eb61487a77 100644
--- a/decidim-proposals/spec/system/vote_proposal_spec.rb
+++ b/decidim-proposals/spec/system/vote_proposal_spec.rb
@@ -285,7 +285,7 @@ def expect_page_not_to_include_votes
       it "cannot be voted" do
         visit_component
 
-        within ".filters .state_check_boxes_tree_filter" do
+        within ".filters .with_any_state_check_boxes_tree_filter" do
           check "All"
           uncheck "All"
           check "Rejected"
diff --git a/decidim-proposals/spec/types/integration_schema_spec.rb b/decidim-proposals/spec/types/integration_schema_spec.rb
index 53e4154d44595..5f94b2934737d 100644
--- a/decidim-proposals/spec/types/integration_schema_spec.rb
+++ b/decidim-proposals/spec/types/integration_schema_spec.rb
@@ -8,7 +8,7 @@
   include_context "with a graphql decidim component"
   let(:component_type) { "Proposals" }
   let!(:current_component) { create :proposal_component, participatory_space: participatory_process }
-  let!(:proposal) { create(:proposal, :with_votes, :with_endorsements, :citizen_author, component: current_component, category: category) }
+  let!(:proposal) { create(:proposal, :with_votes, :with_endorsements, :participant_author, component: current_component, category: category) }
   let!(:amendments) { create_list(:proposal_amendment, 5, amendable: proposal, emendation: proposal) }
 
   let(:proposal_single_result) do
diff --git a/decidim-proposals/spec/types/proposal_type_spec.rb b/decidim-proposals/spec/types/proposal_type_spec.rb
index e93a775185316..7e1ce6b7a0744 100644
--- a/decidim-proposals/spec/types/proposal_type_spec.rb
+++ b/decidim-proposals/spec/types/proposal_type_spec.rb
@@ -53,7 +53,7 @@ module Proposals
           let(:component) { create(:proposal_component, :with_votes_hidden) }
 
           it "returns nil" do
-            expect(response["voteCount"]).to eq(nil)
+            expect(response["voteCount"]).to be_nil
           end
         end
       end
diff --git a/decidim-proposals/spec/validators/proposal_length_validator_spec.rb b/decidim-proposals/spec/validators/proposal_length_validator_spec.rb
index 96a1b538b8418..a58a960a18264 100644
--- a/decidim-proposals/spec/validators/proposal_length_validator_spec.rb
+++ b/decidim-proposals/spec/validators/proposal_length_validator_spec.rb
@@ -11,7 +11,7 @@ def self.model_name
         ActiveModel::Name.new(self, nil, "Validatable")
       end
 
-      include Virtus.model
+      include Decidim::AttributeObject::Model
       include ActiveModel::Validations
 
       attribute :body
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb
index 7efbb3a238c6b..7800389528744 100644
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb
+++ b/decidim-sortitions/app/commands/decidim/sortitions/admin/create_sortition.rb
@@ -4,7 +4,7 @@ module Decidim
   module Sortitions
     module Admin
       # Command that creates a sortition that selects proposals
-      class CreateSortition < Rectify::Command
+      class CreateSortition < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb
index f2e524aafb8e6..edd39ebe2db90 100644
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb
+++ b/decidim-sortitions/app/commands/decidim/sortitions/admin/destroy_sortition.rb
@@ -4,7 +4,7 @@ module Decidim
   module Sortitions
     module Admin
       # Command that cancels a sortition
-      class DestroySortition < Rectify::Command
+      class DestroySortition < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb b/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb
index 4ec8af6340512..94a14164a1912 100644
--- a/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb
+++ b/decidim-sortitions/app/commands/decidim/sortitions/admin/update_sortition.rb
@@ -4,7 +4,7 @@ module Decidim
   module Sortitions
     module Admin
       # Command that creates a sortition that selects proposals
-      class UpdateSortition < Rectify::Command
+      class UpdateSortition < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb
index 37c0e31f28c09..ba9864bc9b17f 100644
--- a/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb
+++ b/decidim-sortitions/app/controllers/decidim/sortitions/sortitions_controller.rb
@@ -15,29 +15,32 @@ class SortitionsController < Decidim::Sortitions::ApplicationController
 
       def index
         @sortitions = search
-                      .results
-                      .includes(:author)
+                      .result
                       .includes(:category)
 
         @sortitions = reorder(@sortitions)
         @sortitions = paginate(@sortitions)
       end
 
+      def show
+        raise ActionController::RoutingError, "Not Found" unless sortition
+      end
+
       private
 
       def sortition
-        Sortition.find(params[:id])
+        search_collection.find_by(id: params[:id])
       end
 
-      def search_klass
-        SortitionSearch
+      def search_collection
+        Sortition.where(component: current_component)
       end
 
       def default_filter_params
         {
-          search_text: "",
-          category_id: "",
-          state: "active"
+          search_text_cont: "",
+          with_category: "",
+          with_any_state: "active"
         }
       end
     end
diff --git a/decidim-sortitions/app/models/decidim/sortitions/sortition.rb b/decidim-sortitions/app/models/decidim/sortitions/sortition.rb
index 7cc8dbcc2f30e..24f1697281f43 100644
--- a/decidim-sortitions/app/models/decidim/sortitions/sortition.rb
+++ b/decidim-sortitions/app/models/decidim/sortitions/sortition.rb
@@ -14,6 +14,7 @@ class Sortition < ApplicationRecord
       include Decidim::Comments::CommentableWithComponent
       include Decidim::Randomable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       component_manifest_name "sortitions"
 
@@ -26,14 +27,11 @@ class Sortition < ApplicationRecord
                  class_name: "Decidim::User",
                  optional: true
 
-      scope :categorized_as, lambda { |category_id|
-        includes(:categorization)
-          .where("decidim_categorizations.decidim_category_id" => category_id)
-      }
-
       scope :active, -> { where(cancelled_on: nil) }
       scope :cancelled, -> { where.not(cancelled_on: nil) }
 
+      scope_search_multi :with_any_state, [:active, :cancelled]
+
       def self.log_presenter_class_for(_log)
         Decidim::Sortitions::AdminLog::SortitionPresenter
       end
@@ -45,7 +43,7 @@ def proposals
       def similar_count
         Sortition.where(component: component)
                  .where(decidim_proposals_component: decidim_proposals_component)
-                 .categorized_as(category&.id)
+                 .with_category(category&.id)
                  .where(target_items: target_items)
                  .count
       end
@@ -77,6 +75,14 @@ def comments_have_votes?
       def allow_resource_permissions?
         true
       end
+
+      # Create i18n ransackers for :title, :additional_info and :witnesses.
+      # Create the :search_text ransacker alias for searching from all of these.
+      ransacker_i18n_multi :search_text, [:title, :additional_info, :witnesses]
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_state, :with_category]
+      end
     end
   end
 end
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
index 3c97bc711e44e..3c6cd4da52b6a 100644
--- a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
+++ b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
@@ -4,7 +4,7 @@ module Decidim
   module Sortitions
     module Admin
       # Query that retrieves a list of proposal components
-      class ParticipatorySpaceProposalComponents < Rectify::Query
+      class ParticipatorySpaceProposalComponents < Decidim::Query
         attr_reader :participatory_space
 
         # Sugar syntax. Allow retrieving all proposal components for the
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
index 0b4157981523c..d9dae97f92b18 100644
--- a/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
+++ b/decidim-sortitions/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     module Admin
-      class ParticipatorySpaceProposals < Rectify::Query
+      class ParticipatorySpaceProposals < Decidim::Query
         # Sugar syntax. Retrieve all proposals for the given sortition.
         def self.for(sortition)
           new(sortition).query
@@ -25,7 +25,7 @@ def query
           if category.nil?
             return Decidim::Proposals::Proposal
                    .except_withdrawn
-                   .except_drafts
+                   .published
                    .except_rejected
                    .not_hidden
                    .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
@@ -37,7 +37,7 @@ def query
           Decidim::Proposals::Proposal
             .joins(:categorization)
             .except_withdrawn
-            .except_drafts
+            .published
             .except_rejected
             .not_hidden
             .where(component: sortition.decidim_proposals_component)
diff --git a/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb b/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb
index 7e8f3b754ff3e..e410b5e355d52 100644
--- a/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb
+++ b/decidim-sortitions/app/queries/decidim/sortitions/filtered_sortitions.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     # A class used to find sortitions filtered by components and a date range
-    class FilteredSortitions < Rectify::Query
+    class FilteredSortitions < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component
diff --git a/decidim-sortitions/app/services/decidim/sortitions/sortition_search.rb b/decidim-sortitions/app/services/decidim/sortitions/sortition_search.rb
deleted file mode 100644
index b766aa7d9d8b6..0000000000000
--- a/decidim-sortitions/app/services/decidim/sortitions/sortition_search.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    # A service to encapsualte all the logic when searching and filtering
-    # sortitions in a participatory process.
-    class SortitionSearch < ResourceSearch
-      text_search_fields :title, :additional_info, :witnesses
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the proposals from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(Sortition.all, options)
-      end
-
-      # Handle the state filter
-      def search_state
-        case state
-        when "active"
-          query.active
-        when "cancelled"
-          query.cancelled
-        else # Assume 'all'
-          query
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_filters.html.erb b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_filters.html.erb
index edbb85f1c4dc4..5f8aa44576871 100644
--- a/decidim-sortitions/app/views/decidim/sortitions/sortitions/_filters.html.erb
+++ b/decidim-sortitions/app/views/decidim/sortitions/sortitions/_filters.html.erb
@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="sortitions">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -15,7 +15,7 @@
   </div>
 
   <% if current_participatory_space.categories.any? %>
-    <%= form.categories_select :category_id,
+    <%= form.categories_select :with_category,
                                current_participatory_space.categories,
                                {
                                  legend_title: t(".category"),
@@ -28,7 +28,7 @@
                                "aria-controls": "sortitions" %>
   <% end %>
 
-  <%= form.collection_radio_buttons :state,
+  <%= form.collection_radio_buttons :with_any_state,
                                     [["all", t(".all")], ["active", t(".active")], ["cancelled", t(".cancelled")]],
                                     :first,
                                     :last,
diff --git a/decidim-sortitions/config/locales/ar.yml b/decidim-sortitions/config/locales/ar.yml
index e7e2c07d6377d..be21731c3faf9 100644
--- a/decidim-sortitions/config/locales/ar.yml
+++ b/decidim-sortitions/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -81,7 +82,6 @@ ar:
           index:
             title: Sortitions
           new:
-            confirm: بالضغط على الزر التالي ، سو� يسجل Decidim التاريخ والوقت (بدقة من الثواني) وجنبا إلى جنب مع ل�ة النرد ، سيتم استخدام هذه المعلومات لإنشاء اختيار عشوائي. لن يكون الإجراء قابلاً للرجوع إليه ، بمجرد النقر �وق الزر سيتم نشر نتيجة هذا السحب مع البيانات التي تم إدخالها �ي هذا النموذج ولا يمكن تعديلها ، يرجى التحقق من المحتوى بعناية
             create: إنشاء
             title: �رز جديد
           show:
diff --git a/decidim-sortitions/config/locales/bg.yml b/decidim-sortitions/config/locales/bg.yml
index d55e72dd1d977..0185d5de17008 100644
--- a/decidim-sortitions/config/locales/bg.yml
+++ b/decidim-sortitions/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-sortitions/config/locales/ca.yml b/decidim-sortitions/config/locales/ca.yml
index d973f87df7753..8053bc32561f0 100644
--- a/decidim-sortitions/config/locales/ca.yml
+++ b/decidim-sortitions/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -57,7 +58,7 @@ ca:
               other: Sortejos
         sortitions:
           confirm_destroy:
-            confirm_destroy: Estàs segura que vols cancel·lar aquest sorteig?
+            confirm_destroy: Segur que vols cancel·lar aquest sorteig?
             destroy: Cancel·lar el sorteig
             title: Cancel·lació del sorteig
           create:
@@ -76,7 +77,7 @@ ca:
           index:
             title: Sortejos
           new:
-            confirm: Pressionant el botó següent, Decidim registrarà la data i l'hora (amb precisió de segons) i, juntament amb la tirada de daus, aquesta informació s'utilitzarà per generar una selecció aleatòria. L'acció serà irreversible, una vegada que es faci clic al botó, es publicarà el resultat d'aquest sorteig, juntament amb les dades introduïdes en aquest formulari i que no es poden modificar. Si us plau, comprova el contingut acuradament
+            confirm: Pressionant el segëunt botó, la plataforma registrarà la data i l'hora (amb precisió de segons) i, juntament amb la tirada de daus, aquesta informació s'utilitzarà per generar una selecció aleatòria. L'acció serà irreversible, una vegada que es faci clic al botó, es publicarà el resultat d'aquest sorteig, juntament amb les dades introduïdes en aquest formulari i que no es poden modificar. Si us plau, comprova el contingut acuradament
             create: Crear
             title: Nou sorteig
           show:
diff --git a/decidim-sortitions/config/locales/cs.yml b/decidim-sortitions/config/locales/cs.yml
index 0eea85fb978dd..205a8e4f1a54b 100644
--- a/decidim-sortitions/config/locales/cs.yml
+++ b/decidim-sortitions/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -80,7 +81,7 @@ cs:
           index:
             title: Losování
           new:
-            confirm: Stisknutím dalšího tla�ítka Decidim zaznamená datum a �as (s přesností sekund) a spolu s vržením kostkou tyto informace budou použity k vytvoření náhodného výběru. Akce bude nevratná, po kliknutí na tla�ítko bude výsledek tohoto vrhu publikován, spolu s údaji zadanými v tomto formuláři a nelze je změnit, pe�livě zkontrolujte obsah
+            confirm: Stisknutím dalšího tla�ítka bude platforma zaznamenávat datum a �as (s přesností sekund) a spole�ně s kostkou, tyto informace budou použity k vytvoření náhodného výběru. Akce bude nevratná, po kliknutí na tla�ítko bude výsledek tohoto remízu publikován, spolu s údaji zadanými v tomto formuláři a nelze je změnit, pe�livě zkontrolujte obsah
             create: Vytvořit
             title: Nové losování
           show:
diff --git a/decidim-sortitions/config/locales/de.yml b/decidim-sortitions/config/locales/de.yml
index 68221e447133f..e25d28a82b021 100644
--- a/decidim-sortitions/config/locales/de.yml
+++ b/decidim-sortitions/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ de:
           index:
             title: Sortierungen
           new:
-            confirm: Durch Drücken des nächsten Knopfes zeichnet Decidim das Datum und die Zeit (mit der Genauigkeit von Sekunden) auf und zusammen mit dem Würfelwurf wird diese Information verwendet, um eine zufällige Auswahl zu erzeugen. Die Aktion wird unumkehrbar sein, sobald die Schaltfläche angeklickt wird, wird das Ergebnis dieser Verlosung veröffentlicht, zusammen mit den in diesem Formular eingegebenen Daten und kann nicht geändert werden, bitte überprüfen Sie den Inhalt sorgfältig
             create: Erstellen
             title: Neue Sortierung
           show:
diff --git a/decidim-sortitions/config/locales/el.yml b/decidim-sortitions/config/locales/el.yml
index eeada5a3a189a..95a50a06dc227 100644
--- a/decidim-sortitions/config/locales/el.yml
+++ b/decidim-sortitions/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -73,7 +74,6 @@ el:
           index:
             title: Κλη�ώσεις
           new:
-            confirm: Πατώντας το επόμενο κουμπί, το Decidim θα καταγ�άψει την ημε�ομηνία και την ώ�α (με ακ�ίβεια δευτε�ολέπτων) και μαζί με τη ζα�ιά, αυτές οι πλη�οφο�ίες θα χ�ησιμοποιηθο�ν για τη δημιου�γία μιας τυχαίας επιλογής. Η ενέ�γεια θα είναι μη αναστ�έψιμη, μόλις πατήσετε το κουμπί, θα δημοσιευτεί το αποτέλεσμα αυτής της κλή�ωσης, μαζί με τα δεδομένα που έχουν εισαχθεί σε αυτήν τη φό�μα και δεν μπο�ο�ν να τ�οποποιηθο�ν, ελέγξτε π�οσεκτικά το πε�ιεχόμενο
             create: Δημιου�γία
             title: �έα κλή�ωση
           show:
diff --git a/decidim-sortitions/config/locales/en.yml b/decidim-sortitions/config/locales/en.yml
index 0fe8669c910be..06af418c183f3 100644
--- a/decidim-sortitions/config/locales/en.yml
+++ b/decidim-sortitions/config/locales/en.yml
@@ -77,7 +77,7 @@ en:
           index:
             title: Sortitions
           new:
-            confirm: By pressing the next button Decidim will record the date and time (with precision of seconds) and together with the dice roll, this information will be used to generate a random selection. The action will be irreversible, once the button is clicked the result of this draw will be published, together with the data entered in this form and can not be modified, please check the content carefully
+            confirm: By pressing the next button the platform will record the date and time (with precision of seconds) and together with the dice roll, this information will be used to generate a random selection. The action will be irreversible, once the button is clicked the result of this draw will be published, together with the data entered in this form and can not be modified, please check the content carefully
             create: Create
             title: New sortition
           show:
diff --git a/decidim-sortitions/config/locales/es-MX.yml b/decidim-sortitions/config/locales/es-MX.yml
index 95a9674a46513..859bbd270b56a 100644
--- a/decidim-sortitions/config/locales/es-MX.yml
+++ b/decidim-sortitions/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ es-MX:
           index:
             title: Sorteos
           new:
-            confirm: Al presionar el botón siguiente, Decidim registrará la fecha y la hora (con precisión de segundos) y junto con la tirada de dados, esta información se usará para generar una selección aleatoria. La acción será irreversible, una vez que se haga clic en el botón, se publicará el resultado de este sorteo, junto con los datos ingresados ​​en este formulario y no se pueden modificar, compruebe el contenido detenidamente
+            confirm: Al hacer clic en el siguiente botón, la plataforma registrará la fecha y hora (con una precisión de segundos) y el resultado del dado, y esta información se utilizará para generar una selección aleatoria. Esta acción será irreversible y, una vez que hayas hecho clic en el botón, se publicará el resultado del sorteo junto con los datos facilitados en el presente formulario y no podrán modificarse. Te pedimos que revises el contenido cuidadosamente
             create: Crear
             title: Nuevo sorteo
           show:
diff --git a/decidim-sortitions/config/locales/es-PY.yml b/decidim-sortitions/config/locales/es-PY.yml
index 8c71cc21c225f..579928de6120d 100644
--- a/decidim-sortitions/config/locales/es-PY.yml
+++ b/decidim-sortitions/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ es-PY:
           index:
             title: Sorteos
           new:
-            confirm: Al presionar el botón siguiente, Decidim registrará la fecha y la hora (con precisión de segundos) y junto con la tirada de dados, esta información se usará para generar una selección aleatoria. La acción será irreversible, una vez que se haga clic en el botón, se publicará el resultado de este sorteo, junto con los datos ingresados ​​en este formulario y no se pueden modificar, compruebe el contenido detenidamente
+            confirm: Al hacer clic en el siguiente botón, la plataforma registrará la fecha y hora (con una precisión de segundos) y el resultado del dado, y esta información se utilizará para generar una selección aleatoria. Esta acción será irreversible y, una vez que hayas hecho clic en el botón, se publicará el resultado del sorteo junto con los datos facilitados en el presente formulario y no podrán modificarse. Te pedimos que revises el contenido cuidadosamente
             create: Crear
             title: Nuevo sorteo
           show:
diff --git a/decidim-sortitions/config/locales/es.yml b/decidim-sortitions/config/locales/es.yml
index 7071f28fbd455..8fbfaec1f56d2 100644
--- a/decidim-sortitions/config/locales/es.yml
+++ b/decidim-sortitions/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ es:
           index:
             title: Sorteos
           new:
-            confirm: Al presionar el botón siguiente, Decidim registrará la fecha y la hora (con precisión de segundos) y junto con la tirada de dados, esta información se usará para generar una selección aleatoria. La acción será irreversible, una vez que se haga clic en el botón, se publicará el resultado de este sorteo, junto con los datos ingresados ​​en este formulario y no se pueden modificar, compruebe el contenido detenidamente
+            confirm: Al hacer clic en el siguiente botón, la plataforma registrará la fecha y hora (con una precisión de segundos) y el resultado del dado, y esta información se utilizará para generar una selección aleatoria. Esta acción será irreversible y, una vez que hayas hecho clic en el botón, se publicará el resultado del sorteo junto con los datos facilitados en el presente formulario y no podrán modificarse. Te pedimos que revises el contenido cuidadosamente
             create: Crear
             title: Nuevo sorteo
           show:
diff --git a/decidim-sortitions/config/locales/eu.yml b/decidim-sortitions/config/locales/eu.yml
index e66ea4b0d088d..ec4757b566edd 100644
--- a/decidim-sortitions/config/locales/eu.yml
+++ b/decidim-sortitions/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ eu:
           index:
             title: Sortitions
           new:
-            confirm: Hurrengo botoia sakatuz gero, data eta ordua (segundotan zehaztuta) eta dadoen zerrendarekin batera grabatu egingo dira, informazio hori ausazko hautapena sortzeko erabiliko da. Ekintza atzeraezina izango da, botoia klik egitean zozketaren emaitza argitaratuko da, formulario honetan bildutako datuak eta ezin dira aldatu, egiaztatu edukia arretaz
             create: Sortu
             title: Sortion berria
           show:
diff --git a/decidim-sortitions/config/locales/fi-plain.yml b/decidim-sortitions/config/locales/fi-plain.yml
index 2db32d950c960..5078e2e5f5f74 100644
--- a/decidim-sortitions/config/locales/fi-plain.yml
+++ b/decidim-sortitions/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ fi-pl:
           index:
             title: Satunnaisvalinnat
           new:
-            confirm: Painamalla seuraavaa painiketta Decidim tallentaa päivämäärän ja kellonajan (sekuntien tarkkuudella) ja yhdessä nopan heiton kanssa näitä tietoja käytetään satunnaisvalinnan luomiseen. Toimenpide on peruuttamaton, kun painiketta painetaan valinnan tulos julkaistaan ​​yhdessä tämän lomakkeen tietojen kanssa eikä sitä voi muuttaa, tarkista sisältö huolellisesti
+            confirm: Kun painat painiketta, palvelin tallentaa päivämäärän ja kellonajan (sekunnin tarkkuudella) ja näitä tietoja käytetään yhdessä nopanheiton kanssa satunnaisen valinnan luomiseen. Toimintoa ei voi peruuttaa. Kun painiketta napsautetaan, arvonnan tulos julkaistaan yhdessä tähän lomakkeeseen syötettyjen tietojen kanssa. Tietoja ei voi muuttaa jälkikäteen, joten tarkista sisältö huolellisesti
             create: Luo
             title: Uusi satunnaisvalinta
           show:
diff --git a/decidim-sortitions/config/locales/fi.yml b/decidim-sortitions/config/locales/fi.yml
index f54768b4cf1ff..05ab9661d258a 100644
--- a/decidim-sortitions/config/locales/fi.yml
+++ b/decidim-sortitions/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ fi:
           index:
             title: Satunnaisvalinnat
           new:
-            confirm: Painamalla seuraavaa painiketta Decidim tallentaa päivämäärän ja kellonajan (sekuntien tarkkuudella) ja yhdessä nopan heiton kanssa näitä tietoja käytetään satunnaisvalinnan luomiseen. Toimenpide on peruuttamaton, kun painiketta painetaan valinnan tulos julkaistaan ​​yhdessä tämän lomakkeen tietojen kanssa eikä sitä voi muuttaa, tarkista sisältö huolellisesti
+            confirm: Kun painat painiketta, palvelin tallentaa päivämäärän ja kellonajan (sekunnin tarkkuudella) ja näitä tietoja käytetään yhdessä nopanheiton kanssa satunnaisen valinnan luomiseen. Toimintoa ei voi peruuttaa. Kun painiketta napsautetaan, arvonnan tulos julkaistaan yhdessä tähän lomakkeeseen syötettyjen tietojen kanssa. Tietoja ei voi muuttaa jälkikäteen, joten tarkista sisältö huolellisesti
             create: Luo
             title: Uusi satunnaisvalinta
           show:
diff --git a/decidim-sortitions/config/locales/fr-CA.yml b/decidim-sortitions/config/locales/fr-CA.yml
index db2a8fb40f007..33d57b7a507bd 100644
--- a/decidim-sortitions/config/locales/fr-CA.yml
+++ b/decidim-sortitions/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ fr-CA:
           index:
             title: Tirages au sort
           new:
-            confirm: 'En appuyant sur le bouton suivant, Decidim enregistrera la date et l''heure à la seconde près et, en association avec le résultat du tirage de dé, générera un choix aléatoire. Cette action est irréversible : une fois que vous aurez cliqué sur le bouton, le résultat du tirage ainsi que les données saisies dans le formulaire seront publiés et ne pourront pas être modifiés. Veillez donc bien à vérifier les informations renseignées en amont'
+            confirm: 'En appuyant sur le bouton suivant, la plateforme enregistrera la date et l''heure à la seconde près et, en association avec le résultat du tirage de dé, générera un choix aléatoire. Cette action est irréversible : une fois que vous aurez cliqué sur le bouton, le résultat du tirage ainsi que les données saisies dans le formulaire seront publiés et ne pourront pas être modifiés. Veillez donc bien à vérifier les informations renseignées en amont'
             create: Créer
             title: Nouveau tirage au sort
           show:
diff --git a/decidim-sortitions/config/locales/fr.yml b/decidim-sortitions/config/locales/fr.yml
index 640b70455b83f..7c35e6923f973 100644
--- a/decidim-sortitions/config/locales/fr.yml
+++ b/decidim-sortitions/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ fr:
           index:
             title: Tirages au sort
           new:
-            confirm: 'En appuyant sur le bouton suivant, Decidim enregistrera la date et l''heure à la seconde près et, en association avec le résultat du tirage de dé, générera un choix aléatoire. Cette action est irréversible : une fois que vous aurez cliqué sur le bouton, le résultat du tirage ainsi que les données saisies dans le formulaire seront publiés et ne pourront pas être modifiés. Veillez donc bien à vérifier les informations renseignées en amont'
+            confirm: 'En appuyant sur le bouton suivant, la plateforme enregistrera la date et l''heure à la seconde près et, en association avec le résultat du tirage de dé, générera un choix aléatoire. Cette action est irréversible : une fois que vous aurez cliqué sur le bouton, le résultat du tirage ainsi que les données saisies dans le formulaire seront publiés et ne pourront pas être modifiés. Veillez donc bien à vérifier les informations renseignées en amont'
             create: Créer
             title: Nouveau tirage au sort
           show:
diff --git a/decidim-sortitions/config/locales/ga-IE.yml b/decidim-sortitions/config/locales/ga-IE.yml
index d26d1ca61540c..0900d055b53c3 100644
--- a/decidim-sortitions/config/locales/ga-IE.yml
+++ b/decidim-sortitions/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-sortitions/config/locales/gl.yml b/decidim-sortitions/config/locales/gl.yml
index 961b1c7710839..29ec655d5d7cb 100644
--- a/decidim-sortitions/config/locales/gl.yml
+++ b/decidim-sortitions/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -76,7 +77,7 @@ gl:
           index:
             title: Edicións
           new:
-            confirm: Ao premer o botón seguinte, Decidim gravará a data e a hora (con precisión de segundos) e xunto co rolo de datos, esta información usarase para xerar unha selección aleatoria. A acción será irreversible, unha vez que se faga clic no botón, o resultado deste sorteo será publicado, xunto cos datos introducidos neste formulario e non se pode modificar, comprobe o contido con atención
+            confirm: Ao premer no seguinte botón, a plataforma rexistrará a data e hora (cunha precisión de segundos) e xunto coa tirada de dados, esta información empregarase para xerar unha escolla ao chou. Esta acción será irreversíbel, unha vez premido o botón publicarase o resultado deste sorteo xunto cos datos inseridos neste formulario e que non é posíbel modificar, por favor verifica o contido con coidado
             create: Crear
             title: Nova xeración
           show:
diff --git a/decidim-sortitions/config/locales/hu.yml b/decidim-sortitions/config/locales/hu.yml
index 1a606a12a6fac..77ddfa4dd8ddd 100644
--- a/decidim-sortitions/config/locales/hu.yml
+++ b/decidim-sortitions/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -73,7 +74,7 @@ hu:
           index:
             title: Sorsolások
           new:
-            confirm: A gomb megnyomását követően a Decidim rögzíti a dátumot és az időpontot (másodperc pontossággal), amiket a dobókocka feldobásának eredményével együtt felhasznál a véletlen kiválasztáshoz. A művelet visszavonhatatlan lesz miután rákattintottál a gombra és megjelent az eredmény. Kérlek, többször is ellenőrizd az itt szereplő adatokat, mert többször már nem tudod módosítani őket
+            confirm: A következő gomb megnyomásával a platform rögzíti a dátumot és az időt (másodperces pontossággal), és a kockadobással együtt ezt az információt véletlenszerű kiválasztáshoz használja fel. Az akció visszafordíthatatlan, a gombra kattintva a sorsolás eredménye ezen űrlapon megadott adatokkal együtt kerül közzétételre és nem módosítható, kérjük figyelmesen ellenőrizze a tartalmat
             create: Létrehozás
             title: Új sorsolás
           show:
diff --git a/decidim-sortitions/config/locales/id-ID.yml b/decidim-sortitions/config/locales/id-ID.yml
index ab3db52263a98..9de48dadbe54b 100644
--- a/decidim-sortitions/config/locales/id-ID.yml
+++ b/decidim-sortitions/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -71,7 +72,6 @@ id:
           index:
             title: Sortasi
           new:
-            confirm: Dengan menekan tombol berikutnya, Decidim akan merekam tanggal dan waktu (dengan ketepatan detik) dan bersama dengan gulungan dadu, informasi ini akan digunakan untuk menghasilkan pilihan acak. Tindakan ini tidak akan dapat dikembalikan, setelah tombol diklik, hasil undian ini akan dipublikasikan, bersama dengan data yang dimasukkan dalam formulir ini dan tidak dapat dimodifikasi, silakan periksa konten dengan cermat
             create: Membuat
             title: Pemilahan baru
           show:
diff --git a/decidim-sortitions/config/locales/is-IS.yml b/decidim-sortitions/config/locales/is-IS.yml
index 83dba7841aa2a..1d539eb2a07e9 100644
--- a/decidim-sortitions/config/locales/is-IS.yml
+++ b/decidim-sortitions/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       sortition:
@@ -63,7 +64,6 @@ is-IS:
           index:
             title: Flokkanir
           new:
-            confirm: Með því að ýta á næstu hnappinn mun Decidim skrá dagsetningu og tíma (með nákvæmni sekúndna) og ásamt dice rúlla, verða þessar upplýsingar notaðar til að búa til handahófi val. Aðgerðin verður óafturkræf, þegar hnappurinn er smelltur verður niðurstaðan af þessari teikningu birt, ásamt þeim gögnum sem slegnar eru inn á þessu eyðublaði og ekki hægt að breyta, vinsamlegast athugaðu efnið vandlega
             create: Búa til
             title: Ný flokkun
           show:
diff --git a/decidim-sortitions/config/locales/it.yml b/decidim-sortitions/config/locales/it.yml
index 6260127212f42..e57e578540ce4 100644
--- a/decidim-sortitions/config/locales/it.yml
+++ b/decidim-sortitions/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ it:
           index:
             title: Sorteggi
           new:
-            confirm: Premendo il pulsante successivo, Decidim registrerà la data e l'ora (con precisione dei secondi) e insieme al lancio dei dadi, queste informazioni verranno utilizzate per generare una selezione casuale. L'azione sarà irreversibile, una volta cliccato il pulsante verrà pubblicato il risultato di questa estrazione, insieme ai dati inseriti in questo modulo e non possono essere modificati, si prega di controllare attentamente il contenuto
             create: Creare
             title: Nuova sortizione
           show:
diff --git a/decidim-sortitions/config/locales/ja.yml b/decidim-sortitions/config/locales/ja.yml
index 16b17cdc5debf..1c14523d87655 100644
--- a/decidim-sortitions/config/locales/ja.yml
+++ b/decidim-sortitions/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -74,7 +75,7 @@ ja:
           index:
             title: 並�替�
           new:
-            confirm: 次�ボタンを押���日付�時刻(秒�精度�)�記録�れ�サイコロロール�一緒�記録�れ��。 ��情報�ランダム��択を生��る���使用�れ�� アクション�元�戻���ん。ボタンをクリック�る�����画��果�公開�れ��。 ��フォーム�入力�れ�データ�一緒�変更�る�������ん。コンテンツを注�深�確�������。
+            confirm: 次�ボタンを押���プラットフォーム�日付�時刻(秒���精度) を記録��サイコロ�よ��乱数�日時�情報を元�ランダム��択を行���。��抽���一度ボタンをクリック�る�入力�れ�データ��も��果�公開�れ�変更����ん。入力内容を注�深�確�������。
             create: 作�
             title: 新��ソート順
           show:
diff --git a/decidim-sortitions/config/locales/ka-GE.yml b/decidim-sortitions/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-sortitions/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-sortitions/config/locales/lt.yml b/decidim-sortitions/config/locales/lt.yml
index 9bad65ce9716e..c02af708a6358 100644
--- a/decidim-sortitions/config/locales/lt.yml
+++ b/decidim-sortitions/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -80,7 +81,7 @@ lt:
           index:
             title: Sprendimai burtų keliu
           new:
-            confirm: Spustelėjus kitą mygtuką, „Decim“ užregistruos datą ir laiką (sekundžių tikslumu). Kartu su kauliuko metimu ši informacija bus naudojama atsitiktinei atrankai vykdyti. Spustelėjus mygtuką, veiksmas bus negrįžtamas, o jo rezultatas bus paskelbtas kartu su šioje formoje įrašytais duomenimis ir jų nebus galima keisti, taigi, atidžiai patikrinkite turinį
+            confirm: Spustelėjus mygtuką, data ir laikas bus užregistruoti (sekundžių tikslumu). Kartu su kauliuko metimu ši informacija bus naudojama atsitiktinei atrankai vykdyti. Spustelėjus mygtuką, veiksmas bus negrįžtamas, o jo rezultatas bus paskelbtas kartu su šioje formoje įrašytais duomenimis ir jų nebus galima keisti, taigi, atidžiai patikrinkite turinį
             create: Sukurti
             title: Nauja galimybė spręsti burtų keliu
           show:
diff --git a/decidim-sortitions/config/locales/lv.yml b/decidim-sortitions/config/locales/lv.yml
index 5a61ff3c35a6c..5f93699737b16 100644
--- a/decidim-sortitions/config/locales/lv.yml
+++ b/decidim-sortitions/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -75,7 +76,6 @@ lv:
           index:
             title: Izlozes
           new:
-            confirm: Nospiežot n�kamo pogu, Decidim fiksēs datumu un laiku (ar sekundes precizit�ti) un kop� ar kauliņa metienu šo inform�ciju izmantos, lai ģenerētu nejaušu izvēli. Darbība kļūs neatgriezeniska brīdī, kad tiks noklikšķin�ts uz pogas. Izlozes rezult�ts tiks publicēts kop� ar šaj� veidlap� ievadītajiem datiem, un to nevar mainīt. Lūdzu, rūpīgi p�rbaudiet visu saturu.
             create: Izveidot
             title: Jauna izloze
           show:
diff --git a/decidim-sortitions/config/locales/nl.yml b/decidim-sortitions/config/locales/nl.yml
index 10e8b042d2e72..4f3f5011e1571 100644
--- a/decidim-sortitions/config/locales/nl.yml
+++ b/decidim-sortitions/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ nl:
           index:
             title: Lotingen
           new:
-            confirm: Door op de volgende knop te drukken, legt Decidim de datum en tijd vast (met een nauwkeurigheid van seconden) en samen met de dobbelsteenworp wordt deze informatie gebruikt om een ​​willekeurige selectie te genereren. De actie is onomkeerbaar, zodra op de knop is geklikt, wordt het resultaat van deze trekking gepubliceerd, samen met de gegevens die in dit formulier zijn ingevoerd en niet kunnen worden gewijzigd. Bekijk de inhoud zorgvuldig
             create: Aanmaken
             title: Nieuwe loting
           show:
diff --git a/decidim-sortitions/config/locales/no.yml b/decidim-sortitions/config/locales/no.yml
index 5390fc88ad7f4..0b0a278b214cd 100644
--- a/decidim-sortitions/config/locales/no.yml
+++ b/decidim-sortitions/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -76,7 +77,6 @@
           index:
             title: Sorteringer
           new:
-            confirm: Ved å trykke på neste knapp vil Decidim registrere dato og tid (med presisjon på sekunder) og sammen med terningkastet vil denne informasjonen bli brukt til å generere et tilfeldig valg. Denne handlingen vil ikke kunne gjøres om, når knappen er klikket blir resultatet av denne trekningen publisert, sammen med dataene som er lagt inn i dette skjemaet og ikke kan endres, vennligst sjekk innholdet nøye
             create: Opprett
             title: Ny sortering
           show:
diff --git a/decidim-sortitions/config/locales/pl.yml b/decidim-sortitions/config/locales/pl.yml
index d0a1ad82a30c4..ec4e62af516e1 100644
--- a/decidim-sortitions/config/locales/pl.yml
+++ b/decidim-sortitions/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -78,7 +79,6 @@ pl:
           index:
             title: Wybór losowy
           new:
-            confirm: Po naciśnięciu przycisku 'Ok' Decidim zapisze datę i godzinę (z dokładnością do sekund) i wraz z rzutem kości informacje te zostaną wykorzystane do wygenerowania losowego wyboru. Działanie to jest nieodwracalne, po kliknięciu przycisku wynik tego losowania zostanie opublikowany wraz z danymi wprowadzonymi w tym formularzu i nie będzie można go zmienić. Upewnij się, że dane z formularza są poprawne
             create: Utwórz
             title: Nowy wybór losowy
           show:
diff --git a/decidim-sortitions/config/locales/pt-BR.yml b/decidim-sortitions/config/locales/pt-BR.yml
index c616d5a7a3574..1a5437d2e5e27 100644
--- a/decidim-sortitions/config/locales/pt-BR.yml
+++ b/decidim-sortitions/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -74,7 +75,6 @@ pt-BR:
           index:
             title: Sorteios
           new:
-            confirm: Ao pressionar o botão seguinte, o Decidim registrará a data e a hora (com precisão de segundos) e, junto com o lançamento de dados, essa informação será usada para gerar uma seleção aleatória. A ação será irreversível, uma vez que o botão é clicado o resultado deste sorteio será publicado, juntamente com os dados inseridos neste formulário e não podem ser modificados, por favor, verifique o conteúdo cuidadosamente
             create: Criar
             title: Nova classificação
           show:
diff --git a/decidim-sortitions/config/locales/pt.yml b/decidim-sortitions/config/locales/pt.yml
index 1649fcbd05bdf..8e3624900b191 100644
--- a/decidim-sortitions/config/locales/pt.yml
+++ b/decidim-sortitions/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ pt:
           index:
             title: Sorteios
           new:
-            confirm: Ao pressionar o botão seguinte, o Decidim registará a data e a hora (com precisão de segundos) e, junto com o lançamento de dados, esta informação será usada para gerar uma seleção aleatória. A ação será irreversível, assim que o botão é clicado, o resultado deste sorteio será publicado, juntamente com os dados inseridos neste formulário e não podem ser modificados, por favor verifique o conteúdo cuidadosamente
             create: Criar
             title: Novo sorteio
           show:
diff --git a/decidim-sortitions/config/locales/ro-RO.yml b/decidim-sortitions/config/locales/ro-RO.yml
index ef76a53baeb1f..005dda2e04fc2 100644
--- a/decidim-sortitions/config/locales/ro-RO.yml
+++ b/decidim-sortitions/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -78,7 +79,6 @@ ro:
           index:
             title: Trageri la sorți
           new:
-            confirm: Prin apăsarea butonului următor Decidim va înregistra data şi ora (cu precizie de secunde) şi împreună cu aruncarea zarului, această informaţie va fi folosită pentru a genera o selecţie aleatorie. Acțiunea va fi ireversibilă, odată ce butonul este apăsat, rezultatul acestei trageri la sorți va fi publicat împreună cu datele introduse în acest formular și nu pot fi modificate. Te rugăm să verifici cu atenție conținutul
             create: Creează
             title: Tragere la sorți nouă
           show:
diff --git a/decidim-sortitions/config/locales/ru.yml b/decidim-sortitions/config/locales/ru.yml
index 7274f84b16ad0..8dd7a9104e8ae 100644
--- a/decidim-sortitions/config/locales/ru.yml
+++ b/decidim-sortitions/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -77,7 +78,6 @@ ru:
           index:
             title: Жеребьевки
           new:
-            confirm: По�ле нажати� �ледующей кнопки, Де�идим запишет дату и врем� (� точно�тью до �екунд) и вме�те � результатом бро�ка игрального кубика, �ти �ведени� будут и�пользованы дл� �лучайного выбора. Это дей�твие будет необратимым, по�ле нажати� кнопки и�ход бро�ани� жреби� будет обнародован вме�те � данными, введенными в �той форме, и их невозможно будет изменить. Пожалуй�та, тщательно проверьте �одержимое
             create: Создать
             title: Добавить жеребьевку
           show:
diff --git a/decidim-sortitions/config/locales/sk.yml b/decidim-sortitions/config/locales/sk.yml
index daf665079f74f..dbc90e1f8b286 100644
--- a/decidim-sortitions/config/locales/sk.yml
+++ b/decidim-sortitions/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -77,7 +78,6 @@ sk:
           index:
             title: Voľby losovaním
           new:
-            confirm: Stla�ením �alšieho tla�idla Decidim zaznamená dátum a �as (s presnosťou na sekundy) a spolo�ne s hodom kockami budú tieto informácie použité pre generovanie náhodného výberu. Akcia bude nevratná, po kliknutí na tla�idlo sa výsledky tejto kresby uverejní s údajmi uvedenými v tomto formulári a nemožno ich zmeniť, skontrolujte prosím pozorne obsah
             create: Vytvoriť
             title: Nové rozvrhnutie
           show:
diff --git a/decidim-sortitions/config/locales/sl.yml b/decidim-sortitions/config/locales/sl.yml
index 34b3a4a594c92..2a609d1dbd6b3 100644
--- a/decidim-sortitions/config/locales/sl.yml
+++ b/decidim-sortitions/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-sortitions/config/locales/sr-CS.yml b/decidim-sortitions/config/locales/sr-CS.yml
index de477c40cb855..283b6247a3ea7 100644
--- a/decidim-sortitions/config/locales/sr-CS.yml
+++ b/decidim-sortitions/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     sortitions:
diff --git a/decidim-sortitions/config/locales/sv.yml b/decidim-sortitions/config/locales/sv.yml
index dffa8e56fbe2b..0bf8199e7f091 100644
--- a/decidim-sortitions/config/locales/sv.yml
+++ b/decidim-sortitions/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -76,7 +77,6 @@ sv:
           index:
             title: Tilldelningar
           new:
-            confirm: När du trycker på nästa knapp kommer Decidim att registrera datum och tid (med precision i sekunder) och tillsammans med tärningskastet genereras ett slumpmässigt urval. Åtgärden kan inte ångras eller göras om. När knappen har klickats kommer resultatet av lottningen att publiceras, tillsammans med de uppgifter som anges i formuläret, och kan inte längre ändras. Kontrollera innehållet noggrant
             create: Skapa
             title: Ny tilldelning
           show:
diff --git a/decidim-sortitions/config/locales/tr-TR.yml b/decidim-sortitions/config/locales/tr-TR.yml
index 28531b2570f48..64effc7549a47 100644
--- a/decidim-sortitions/config/locales/tr-TR.yml
+++ b/decidim-sortitions/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -74,7 +75,6 @@ tr:
           index:
             title: Sıralama
           new:
-            confirm: Bir sonraki düğmeye basıldığında Decidim, tarih ve saati (saniyenin kesinliği ile) kaydedecek ve zar rulosuyla birlikte, bu bilgi rastgele bir seçim oluşturmak için kullanılacak. İşlem geri alınamaz, düğme tıklandıktan sonra bu çekilişin sonucu yayınlanacak, bu forma girilen verilerle birlikte değiştirilemez, lütfen içeriği dikkatlice kontrol edin
             create: OluÅŸtur
             title: Yeni sıralama
           show:
diff --git a/decidim-sortitions/config/locales/uk.yml b/decidim-sortitions/config/locales/uk.yml
index a01cc8ffc9493..b83f201ea11e4 100644
--- a/decidim-sortitions/config/locales/uk.yml
+++ b/decidim-sortitions/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -77,7 +78,6 @@ uk:
           index:
             title: Жеребкуванн�
           new:
-            confirm: Пі�л� нати�ненн� на�тупної кнопки, Де�ідім запише дату та ча� (з точні�тю до �екунд) і разом з ви�лідом киданн� гральної кі�тки, ці відомо�ті будуть викори�тані дл� випадкового вибору. Ц� ді� буде незворотною, пі�л� нати�ненн� кнопки ви�лід киданн� жеребу буде оприлюднено разом із даними, введеними в цій формі, і їх неможливо буде змінити. Будь ла�ка, ретельно перевірте вмі�т
             create: Створити
             title: Додати жеребкуванн�
           show:
diff --git a/decidim-sortitions/config/locales/zh-CN.yml b/decidim-sortitions/config/locales/zh-CN.yml
index f5dce2c16e143..0e5bdff86fb32 100644
--- a/decidim-sortitions/config/locales/zh-CN.yml
+++ b/decidim-sortitions/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -72,7 +73,6 @@ zh-CN:
           index:
             title: �谊会
           new:
-            confirm: 按下下一个按钮�，Decidim将录制日期和时间(精确度为秒)，并�时录制染色�， 此信�将用于生��机选择。 此动作将��逆，一旦点击此按钮，绘图的结果将被�布， 请仔细检查内容，并在此表�中输入的数�，�能修改
             create: 创建
             title: 新的排�方�
           show:
diff --git a/decidim-sortitions/decidim-sortitions.gemspec b/decidim-sortitions/decidim-sortitions.gemspec
index fe41bed10dfc6..0f31563b8e136 100644
--- a/decidim-sortitions/decidim-sortitions.gemspec
+++ b/decidim-sortitions/decidim-sortitions.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["jsperezg@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-sortitions"
   s.summary = "Decidim sortitions module"
diff --git a/decidim-sortitions/lib/decidim/sortitions/version.rb b/decidim-sortitions/lib/decidim/sortitions/version.rb
index e7ca5cf21c499..67d6535ab7a0d 100644
--- a/decidim-sortitions/lib/decidim/sortitions/version.rb
+++ b/decidim-sortitions/lib/decidim/sortitions/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-sortitions/spec/commands/decidim/sortitions/admin/create_sortition_spec.rb b/decidim-sortitions/spec/commands/decidim/sortitions/admin/create_sortition_spec.rb
index 5cee939e116b0..1ed22d89a7a73 100644
--- a/decidim-sortitions/spec/commands/decidim/sortitions/admin/create_sortition_spec.rb
+++ b/decidim-sortitions/spec/commands/decidim/sortitions/admin/create_sortition_spec.rb
@@ -43,7 +43,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -53,7 +53,7 @@ module Admin
           it "doesn't create the sortition" do
             expect do
               command.call
-            end.to change { Sortition.where(component: sortition_component).count }.by(0)
+            end.not_to(change { Sortition.where(component: sortition_component).count })
           end
         end
 
@@ -65,7 +65,7 @@ module Admin
           end
 
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
           end
 
           it "broadcasts ok" do
@@ -104,7 +104,7 @@ module Admin
           it "has no category" do
             command.call
             sortition = Sortition.where(component: sortition_component).last
-            expect(sortition.category).to eq(nil)
+            expect(sortition.category).to be_nil
           end
 
           context "when restricted to a category without proposals" do
diff --git a/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb b/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb
index 81003a37afeed..21426f5656ecf 100644
--- a/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb
+++ b/decidim-sortitions/spec/commands/decidim/sortitions/admin/destroy_sortition_spec.rb
@@ -36,7 +36,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -52,7 +52,7 @@ module Admin
 
         describe "when the form is valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb b/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb
index 67a414bc53e7c..cfb454d3c9bb7 100644
--- a/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb
+++ b/decidim-sortitions/spec/commands/decidim/sortitions/admin/update_sortition_spec.rb
@@ -32,7 +32,7 @@ module Admin
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -42,7 +42,7 @@ module Admin
 
         describe "when the form is valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(false)
+            allow(form).to receive(:invalid?).and_return(false)
           end
 
           it "broadcasts ok" do
diff --git a/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb b/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb
index 9f1df2627668b..b3df07ee2737c 100644
--- a/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb
+++ b/decidim-sortitions/spec/controllers/decidim/sortitions/admin/sortitions_controller_spec.rb
@@ -51,7 +51,7 @@ module Admin
           let(:target_items) { ::Faker::Number.between(from: 1, to: 10) }
           let(:params) do
             {
-              participatory_process_slug: component.participatory_space.slug,
+              participatory_process_slug: sortition.component.participatory_space.slug,
               sortition: {
                 decidim_proposals_component_id: decidim_proposals_component_id,
                 decidim_category_id: decidim_category_id,
@@ -170,8 +170,8 @@ module Admin
           let(:sortition) { create(:sortition) }
           let(:params) do
             {
+              participatory_process_slug: component.participatory_space.slug,
               component_id: sortition.component.id,
-              participatory_process_slug: sortition.component.participatory_space.slug,
               id: sortition.id
             }
           end
diff --git a/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb b/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb
index a6dcebfe83eb8..7d97b17dd819a 100644
--- a/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb
+++ b/decidim-sortitions/spec/permissions/decidim/sortitions/admin/permissions_spec.rb
@@ -14,7 +14,7 @@
   end
   let(:sortition_component) { create :sortition_component }
   let(:sortition) { create :sortition, component: sortition_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:registrations_enabled) { true }
   let(:action) do
     { scope: :admin, action: action_name, subject: :sortition }
@@ -46,13 +46,13 @@
   context "when reading a sortition" do
     let(:action_name) { :read }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when creating a sortition" do
     let(:action_name) { :create }
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when destroying a sortition" do
@@ -60,7 +60,7 @@
 
     context "when sortition is present" do
       context "when sortition is not cancelled" do
-        it { is_expected.to eq true }
+        it { is_expected.to be true }
       end
 
       context "when sortition is cancelled" do
@@ -81,7 +81,7 @@
     let(:action_name) { :update }
 
     context "when sortition is present" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
 
     context "when sortition is missing" do
diff --git a/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb b/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb
index f478369f3be9b..364d68d980ea1 100644
--- a/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb
+++ b/decidim-sortitions/spec/permissions/decidim/sortitions/permissions_spec.rb
@@ -14,7 +14,7 @@
   end
   let(:sortition_component) { create :sortition_component }
   let(:sortition) { create :sortition, component: sortition_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
   let(:registrations_enabled) { true }
 
   context "when scope is admin" do
diff --git a/decidim-sortitions/spec/requests/sortition_search_spec.rb b/decidim-sortitions/spec/requests/sortition_search_spec.rb
new file mode 100644
index 0000000000000..8aa31295205a8
--- /dev/null
+++ b/decidim-sortitions/spec/requests/sortition_search_spec.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Sortition search", type: :request do
+  include Decidim::ComponentPathHelper
+
+  subject { response.body }
+
+  let(:component) { create :sortition_component }
+  let(:participatory_space) { component.participatory_space }
+  let(:organization) { participatory_space.organization }
+  let(:filter_params) { {} }
+
+  let!(:sortition1) { create(:sortition, title: { en: "A doggo" }, component: component) }
+  let!(:sortition2) { create(:sortition, additional_info: { en: "There is a doggo in the office" }, component: component) }
+  let!(:sortition3) { create(:sortition, witnesses: { en: "My doggo was there" }, component: component) }
+  let!(:sortition4) { create(:sortition, component: component) }
+  let!(:sortition5) { create(:sortition, :cancelled, component: component) }
+
+  let(:request_path) { Decidim::EngineRouter.main_proxy(component).sortitions_path }
+
+  before do
+    get(
+      request_path,
+      params: { filter: filter_params },
+      headers: { "HOST" => component.organization.host }
+    )
+  end
+
+  it_behaves_like "a resource search", :sortition
+  it_behaves_like "a resource search with categories", :sortition, :single
+
+  it "displays all non-cancelled sortitions without any filters" do
+    expect(subject).to include(translated(sortition1.title))
+    expect(subject).to include(translated(sortition2.title))
+    expect(subject).to include(translated(sortition3.title))
+    expect(subject).to include(translated(sortition4.title))
+    expect(subject).not_to include(translated(sortition5.title))
+  end
+
+  context "when searching by text" do
+    let(:filter_params) { { search_text_cont: "doggo" } }
+
+    it "displays only the sortitions containing the search_text" do
+      expect(subject).to include(translated(sortition1.title))
+      expect(subject).to include(translated(sortition2.title))
+      expect(subject).to include(translated(sortition3.title))
+      expect(subject).not_to include(translated(sortition4.title))
+      expect(subject).not_to include(translated(sortition5.title))
+    end
+  end
+
+  context "when searching by state" do
+    let(:filter_params) { { with_any_state: state } }
+
+    context "and the state is active" do
+      let(:state) { "active" }
+
+      it "displays the active sortitions" do
+        expect(subject).to include(translated(sortition1.title))
+        expect(subject).to include(translated(sortition2.title))
+        expect(subject).to include(translated(sortition3.title))
+        expect(subject).to include(translated(sortition4.title))
+        expect(subject).not_to include(translated(sortition5.title))
+      end
+    end
+
+    context "and the state is cancelled" do
+      let(:state) { "cancelled" }
+
+      it "displays only the cancelled sortition" do
+        expect(subject).not_to include(translated(sortition1.title))
+        expect(subject).not_to include(translated(sortition2.title))
+        expect(subject).not_to include(translated(sortition3.title))
+        expect(subject).not_to include(translated(sortition4.title))
+        expect(subject).to include(translated(sortition5.title))
+      end
+    end
+
+    context "and the state is all" do
+      let(:state) { "all" }
+
+      it "displays all the sortitions" do
+        expect(subject).to include(translated(sortition1.title))
+        expect(subject).to include(translated(sortition2.title))
+        expect(subject).to include(translated(sortition3.title))
+        expect(subject).to include(translated(sortition4.title))
+        expect(subject).to include(translated(sortition5.title))
+      end
+    end
+  end
+end
diff --git a/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb b/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb
index ba07000ba8b31..79223484030e1 100644
--- a/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb
+++ b/decidim-sortitions/spec/services/decidim/sortitions/admin/draw_spec.rb
@@ -25,9 +25,10 @@ module Admin
             decidim_proposals_component: proposal_component
           )
         end
+        let(:initial_draw) { Draw.for(sortition) }
 
         it "Draw can be reproduced several times" do
-          expect(Draw.for(sortition)).to eq(Draw.for(sortition))
+          expect(Draw.for(sortition)).to eq(initial_draw)
         end
       end
     end
diff --git a/decidim-sortitions/spec/services/decidim/sortitions/sortition_search_spec.rb b/decidim-sortitions/spec/services/decidim/sortitions/sortition_search_spec.rb
deleted file mode 100644
index e7f64e76a7585..0000000000000
--- a/decidim-sortitions/spec/services/decidim/sortitions/sortition_search_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
-  module Sortitions
-    describe SortitionSearch do
-      subject { described_class.new(params).results }
-
-      let(:component) { create(:component, manifest_name: "sortitions") }
-      let(:default_params) { { component: component } }
-      let(:params) { default_params }
-      let(:participatory_process) { component.participatory_space }
-
-      it_behaves_like "a resource search", :sortition
-      it_behaves_like "a resource search with categories", :sortition
-
-      describe "results" do
-        describe "search_text filter" do
-          let(:params) { default_params.merge(search_text: search_text) }
-          let(:search_text) { "dog" }
-
-          it "returns the sortitions containing the search in the title or the aditional info or or witnesses" do
-            create_list(:sortition, 3, component: component)
-            create(:sortition, title: { en: "A dog" }, component: component)
-            create(:sortition, additional_info: { en: "There is a dog in the office" }, component: component)
-            create(:sortition, witnesses: { en: "My dog was there" }, component: component)
-
-            expect(subject.size).to eq(3)
-          end
-        end
-
-        describe "state filter" do
-          let!(:cancelled) { create(:sortition, :cancelled, component: component) }
-          let!(:active) { create(:sortition, component: component) }
-          let(:params) { default_params.merge(state: state) }
-
-          context "when Cancelled" do
-            let(:state) { "cancelled" }
-
-            it "Returns sortitions with the given state" do
-              expect(subject.size).to eq(1)
-            end
-          end
-
-          context "when Active" do
-            let(:state) { "active" }
-
-            it "Returns sortitions with the given state" do
-              expect(subject.size).to eq(1)
-            end
-          end
-
-          context "when all" do
-            let(:state) { "all" }
-
-            it "Returns sortitions whatever its state is" do
-              expect(subject.size).to eq(2)
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb
index ae7a7ec617b4f..d904fdfe5817e 100644
--- a/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb
+++ b/decidim-sortitions/spec/system/decidim/sortitions/show_spec.rb
@@ -54,7 +54,7 @@
     let!(:sortition) { create(:sortition, :cancelled, component: component) }
 
     before do
-      page.visit "#{main_component_path(component)}?filter[state]=cancelled"
+      page.visit "#{main_component_path(component)}?filter[with_any_state]=cancelled"
       click_link "View"
     end
 
diff --git a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
index 65c37c5d815f9..495cead29a303 100644
--- a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
+++ b/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
@@ -47,4 +47,25 @@
       it_behaves_like "a paginated resource"
     end
   end
+
+  describe "filters" do
+    context "when filtering by text" do
+      it "updates the current URL" do
+        create(:sortition, component: component, title: { en: "Foobar sortition" })
+        create(:sortition, component: component, title: { en: "Another sortition" })
+        visit_component
+
+        within "form.new_filter" do
+          fill_in("filter[search_text_cont]", with: "foobar")
+          click_button "Search"
+        end
+
+        expect(page).not_to have_content("Another sortition")
+        expect(page).to have_content("Foobar sortition")
+
+        filter_params = CGI.parse(URI.parse(page.current_url).query)
+        expect(filter_params["filter[search_text_cont]"]).to eq(["foobar"])
+      end
+    end
+  end
 end
diff --git a/decidim-surveys/README.md b/decidim-surveys/README.md
index d8bf0898a418e..9056cdc457a63 100644
--- a/decidim-surveys/README.md
+++ b/decidim-surveys/README.md
@@ -22,10 +22,6 @@ This is on the default Decidim installation so you shouldn't change anything to
 
 ![Use survey](docs/screenshot02.png)
 
-## Documentation
-
-Read more about this component on [Admin Manual](https://docs.decidim.org/admin-manual/en/processess/#surveys).
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).
diff --git a/decidim-surveys/app/commands/decidim/surveys/create_survey.rb b/decidim-surveys/app/commands/decidim/surveys/create_survey.rb
index 6c6c128cd71e1..21cd9c2c837ce 100644
--- a/decidim-surveys/app/commands/decidim/surveys/create_survey.rb
+++ b/decidim-surveys/app/commands/decidim/surveys/create_survey.rb
@@ -4,7 +4,7 @@ module Decidim
   module Surveys
     # Command that gets called whenever a component's survey has to be created. It
     # usually happens as a callback when the component itself is created.
-    class CreateSurvey < Rectify::Command
+    class CreateSurvey < Decidim::Command
       def initialize(component)
         @component = component
       end
diff --git a/decidim-surveys/config/locales/ar.yml b/decidim-surveys/config/locales/ar.yml
index a20442cea980a..cb3fce03b672c 100644
--- a/decidim-surveys/config/locales/ar.yml
+++ b/decidim-surveys/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/bg.yml b/decidim-surveys/config/locales/bg.yml
index 3fb04c560f5ff..bb348535b1445 100644
--- a/decidim-surveys/config/locales/bg.yml
+++ b/decidim-surveys/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/ca.yml b/decidim-surveys/config/locales/ca.yml
index ce810124df9aa..a30c89114521e 100644
--- a/decidim-surveys/config/locales/ca.yml
+++ b/decidim-surveys/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/cs.yml b/decidim-surveys/config/locales/cs.yml
index 99d752c355188..26693b7fbfc5b 100644
--- a/decidim-surveys/config/locales/cs.yml
+++ b/decidim-surveys/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/de.yml b/decidim-surveys/config/locales/de.yml
index b94a93630d90e..a26e262fb758b 100644
--- a/decidim-surveys/config/locales/de.yml
+++ b/decidim-surveys/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/el.yml b/decidim-surveys/config/locales/el.yml
index 458e5389be033..51a0b0a639f30 100644
--- a/decidim-surveys/config/locales/el.yml
+++ b/decidim-surveys/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/es-MX.yml b/decidim-surveys/config/locales/es-MX.yml
index 91e98ac86a335..1cf728ce07dbd 100644
--- a/decidim-surveys/config/locales/es-MX.yml
+++ b/decidim-surveys/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/es-PY.yml b/decidim-surveys/config/locales/es-PY.yml
index ae725c35f3e1d..e67138bbf6fdf 100644
--- a/decidim-surveys/config/locales/es-PY.yml
+++ b/decidim-surveys/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/es.yml b/decidim-surveys/config/locales/es.yml
index f559b4b251dc8..1305eb8d59847 100644
--- a/decidim-surveys/config/locales/es.yml
+++ b/decidim-surveys/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/eu.yml b/decidim-surveys/config/locales/eu.yml
index c0640600d566a..c828a2dfaff92 100644
--- a/decidim-surveys/config/locales/eu.yml
+++ b/decidim-surveys/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/fi-plain.yml b/decidim-surveys/config/locales/fi-plain.yml
index 66bb174245ea9..3bf478577c167 100644
--- a/decidim-surveys/config/locales/fi-plain.yml
+++ b/decidim-surveys/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/fi.yml b/decidim-surveys/config/locales/fi.yml
index 0f230dc37e81c..30c0bf967442c 100644
--- a/decidim-surveys/config/locales/fi.yml
+++ b/decidim-surveys/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/fr-CA.yml b/decidim-surveys/config/locales/fr-CA.yml
index 6da7ca2f7c7d0..d4f6261b5633e 100644
--- a/decidim-surveys/config/locales/fr-CA.yml
+++ b/decidim-surveys/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/fr.yml b/decidim-surveys/config/locales/fr.yml
index abc5be0c91e1f..c030a9fb0937c 100644
--- a/decidim-surveys/config/locales/fr.yml
+++ b/decidim-surveys/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/ga-IE.yml b/decidim-surveys/config/locales/ga-IE.yml
index d9c50a776478d..eb36c5f73cd6e 100644
--- a/decidim-surveys/config/locales/ga-IE.yml
+++ b/decidim-surveys/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   decidim:
     components:
diff --git a/decidim-surveys/config/locales/gl.yml b/decidim-surveys/config/locales/gl.yml
index 8ed814b5881b3..ecec13c810401 100644
--- a/decidim-surveys/config/locales/gl.yml
+++ b/decidim-surveys/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/hu.yml b/decidim-surveys/config/locales/hu.yml
index 16ceaf6e68081..593a08cfe4e26 100644
--- a/decidim-surveys/config/locales/hu.yml
+++ b/decidim-surveys/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/id-ID.yml b/decidim-surveys/config/locales/id-ID.yml
index 0a0b2394fae9d..13ad3eb49ac43 100644
--- a/decidim-surveys/config/locales/id-ID.yml
+++ b/decidim-surveys/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/is-IS.yml b/decidim-surveys/config/locales/is-IS.yml
index 660e82f6af183..915bd7e0ca1d4 100644
--- a/decidim-surveys/config/locales/is-IS.yml
+++ b/decidim-surveys/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     components:
       surveys:
diff --git a/decidim-surveys/config/locales/it.yml b/decidim-surveys/config/locales/it.yml
index fd3850a56b9db..d7447ab071028 100644
--- a/decidim-surveys/config/locales/it.yml
+++ b/decidim-surveys/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/ja.yml b/decidim-surveys/config/locales/ja.yml
index 21c874e498be1..2775a654abe7f 100644
--- a/decidim-surveys/config/locales/ja.yml
+++ b/decidim-surveys/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/ka-GE.yml b/decidim-surveys/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-surveys/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-surveys/config/locales/lb.yml b/decidim-surveys/config/locales/lb.yml
index a33a0ffe01375..57b706a87e69c 100644
--- a/decidim-surveys/config/locales/lb.yml
+++ b/decidim-surveys/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/lt.yml b/decidim-surveys/config/locales/lt.yml
index a02909c4e1435..6687894b1ddbd 100644
--- a/decidim-surveys/config/locales/lt.yml
+++ b/decidim-surveys/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/lv.yml b/decidim-surveys/config/locales/lv.yml
index fae775fead0dc..f8a5ccbb9e509 100644
--- a/decidim-surveys/config/locales/lv.yml
+++ b/decidim-surveys/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/nl.yml b/decidim-surveys/config/locales/nl.yml
index dc31813bcf64f..a3d2c4b230257 100644
--- a/decidim-surveys/config/locales/nl.yml
+++ b/decidim-surveys/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/no.yml b/decidim-surveys/config/locales/no.yml
index 8f36b987bb0d5..628ffa403d299 100644
--- a/decidim-surveys/config/locales/no.yml
+++ b/decidim-surveys/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/pl.yml b/decidim-surveys/config/locales/pl.yml
index 36d38f0f6693b..24b59af552354 100644
--- a/decidim-surveys/config/locales/pl.yml
+++ b/decidim-surveys/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/pt-BR.yml b/decidim-surveys/config/locales/pt-BR.yml
index 63267105bb062..295e61b9d7bfd 100644
--- a/decidim-surveys/config/locales/pt-BR.yml
+++ b/decidim-surveys/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/pt.yml b/decidim-surveys/config/locales/pt.yml
index 12f4c81e5f6fa..ac51f304745fa 100644
--- a/decidim-surveys/config/locales/pt.yml
+++ b/decidim-surveys/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/ro-RO.yml b/decidim-surveys/config/locales/ro-RO.yml
index 57b59b947b0fa..d4e7633a95b4b 100644
--- a/decidim-surveys/config/locales/ro-RO.yml
+++ b/decidim-surveys/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     models:
@@ -32,6 +33,7 @@ ro:
           step:
             allow_answers: Permite răspunsuri
             allow_unregistered: Permite utilizatorilor neînregistrați să răspundă la sondaj
+            allow_unregistered_help: Dacă este activ, nu va fi necesară nicio autentificare pentru a răspunde la chestionar. Acest lucru poate duce la date slabe sau nefiabile și va fi mai vulnerabil la atacuri automate. Utilizați cu prudență! Rețineți că un participant poate răspunde aceluiași sondaj de mai multe ori, utilizând diferite browsere sau funcția de "navigare privată" a browser-ului său web.
             announcement: Anunţ
     events:
       surveys:
diff --git a/decidim-surveys/config/locales/ru.yml b/decidim-surveys/config/locales/ru.yml
index 0b322792c5814..c2fb732b3d40d 100644
--- a/decidim-surveys/config/locales/ru.yml
+++ b/decidim-surveys/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/sk.yml b/decidim-surveys/config/locales/sk.yml
index c9b1f7945df10..e2f74b2959b1e 100644
--- a/decidim-surveys/config/locales/sk.yml
+++ b/decidim-surveys/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/sl.yml b/decidim-surveys/config/locales/sl.yml
index fd9544b24fdf2..dc748e1178cec 100644
--- a/decidim-surveys/config/locales/sl.yml
+++ b/decidim-surveys/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activerecord:
     models:
diff --git a/decidim-surveys/config/locales/sv.yml b/decidim-surveys/config/locales/sv.yml
index 9f8673ef5ac67..7fb9435880341 100644
--- a/decidim-surveys/config/locales/sv.yml
+++ b/decidim-surveys/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     models:
@@ -30,6 +31,7 @@ sv:
           step:
             allow_answers: Tillåt svar
             allow_unregistered: Tillåt ej registrerade användare att besvara enkäten
+            allow_unregistered_help: Om valt krävs det ingen inloggning för att besvara enkäten. Detta kan leda till dåliga eller opålitliga data och det kommer att vara mer sårbart för automatiserade attacker. Använd med försiktighet! Det blir också möjligt för en deltagare att besvara enkäten flera gånger igenom att använda olika webbläsare eller surfa privat.
             announcement: Meddelande
     events:
       surveys:
diff --git a/decidim-surveys/config/locales/tr-TR.yml b/decidim-surveys/config/locales/tr-TR.yml
index 64e5a4de912e5..ea3b23bba5dd6 100644
--- a/decidim-surveys/config/locales/tr-TR.yml
+++ b/decidim-surveys/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/uk.yml b/decidim-surveys/config/locales/uk.yml
index c8be041e5b7e4..94ad366473a7d 100644
--- a/decidim-surveys/config/locales/uk.yml
+++ b/decidim-surveys/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     models:
diff --git a/decidim-surveys/config/locales/zh-CN.yml b/decidim-surveys/config/locales/zh-CN.yml
index 74de305e517ea..ba25ab0f9bd86 100644
--- a/decidim-surveys/config/locales/zh-CN.yml
+++ b/decidim-surveys/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     models:
diff --git a/decidim-surveys/decidim-surveys.gemspec b/decidim-surveys/decidim-surveys.gemspec
index f04a49d6064fb..4d546d2ee96c7 100644
--- a/decidim-surveys/decidim-surveys.gemspec
+++ b/decidim-surveys/decidim-surveys.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-surveys"
   s.summary = "Decidim surveys module"
diff --git a/decidim-surveys/lib/decidim/surveys/version.rb b/decidim-surveys/lib/decidim/surveys/version.rb
index 42baedd377225..87c26137484f5 100644
--- a/decidim-surveys/lib/decidim/surveys/version.rb
+++ b/decidim-surveys/lib/decidim/surveys/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-surveys/spec/commands/decidim/surveys/create_survey_spec.rb b/decidim-surveys/spec/commands/decidim/surveys/create_survey_spec.rb
index 1c3a4ae17d36c..a5a0f9c63d0e3 100644
--- a/decidim-surveys/spec/commands/decidim/surveys/create_survey_spec.rb
+++ b/decidim-surveys/spec/commands/decidim/surveys/create_survey_spec.rb
@@ -12,7 +12,7 @@ module Surveys
         describe "when the survey is not saved" do
           before do
             # rubocop:disable RSpec/AnyInstance
-            expect_any_instance_of(Survey).to receive(:save).and_return(false)
+            allow_any_instance_of(Survey).to receive(:save).and_return(false)
             # rubocop:enable RSpec/AnyInstance
           end
 
diff --git a/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb b/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
index 1ffccdf88cb54..473cd4ce468c8 100644
--- a/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
+++ b/decidim-surveys/spec/lib/decidim/surveys/component_spec.rb
@@ -40,7 +40,7 @@
     end
 
     it "create a survey component" do
-      expect { subject.manifest.run_hooks(:copy, old_component: component, new_component: new_component) }.to change { Decidim::Surveys::Survey.count }.by(1)
+      expect { subject.manifest.run_hooks(:copy, old_component: component, new_component: new_component) }.to change(Decidim::Surveys::Survey, :count).by(1)
     end
   end
 end
diff --git a/decidim-surveys/spec/permissions/decidim/surveys/admin/permissions_spec.rb b/decidim-surveys/spec/permissions/decidim/surveys/admin/permissions_spec.rb
index 5d282d3b25445..77e596076d2ca 100644
--- a/decidim-surveys/spec/permissions/decidim/surveys/admin/permissions_spec.rb
+++ b/decidim-surveys/spec/permissions/decidim/surveys/admin/permissions_spec.rb
@@ -12,7 +12,7 @@
     }
   end
   let(:survey_component) { create :surveys_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is not admin" do
     let(:action) do
@@ -43,7 +43,7 @@
       { scope: :admin, action: :export_answers, subject: :questionnaire }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when updating a survey" do
@@ -51,7 +51,7 @@
       { scope: :admin, action: :update, subject: :questionnaire }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when indexing a survey's answers" do
@@ -59,7 +59,7 @@
       { scope: :admin, action: :index, subject: :questionnaire_answers }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when showing a participant's survey answers" do
@@ -67,7 +67,7 @@
       { scope: :admin, action: :show, subject: :questionnaire_answers }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when exporting a participant's survey answers" do
@@ -75,6 +75,6 @@
       { scope: :admin, action: :export_response, subject: :questionnaire_answers }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 end
diff --git a/decidim-surveys/spec/permissions/decidim/surveys/permissions_spec.rb b/decidim-surveys/spec/permissions/decidim/surveys/permissions_spec.rb
index 84b1e58f69808..8f5fc524bf45a 100644
--- a/decidim-surveys/spec/permissions/decidim/surveys/permissions_spec.rb
+++ b/decidim-surveys/spec/permissions/decidim/surveys/permissions_spec.rb
@@ -12,7 +12,7 @@
     }
   end
   let(:survey_component) { create :surveys_component }
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is admin" do
     let(:action) do
@@ -52,7 +52,7 @@
     end
 
     context "when user is authorized" do
-      it { is_expected.to eq true }
+      it { is_expected.to be true }
     end
   end
 end
diff --git a/decidim-surveys/spec/types/survey_type_spec.rb b/decidim-surveys/spec/types/survey_type_spec.rb
index 8e29c32bf495c..de22779824e0a 100644
--- a/decidim-surveys/spec/types/survey_type_spec.rb
+++ b/decidim-surveys/spec/types/survey_type_spec.rb
@@ -36,7 +36,7 @@ module Surveys
       describe "questionnaire" do
         let(:query) { "{ questionnaire { id }} " }
 
-        it "returns the questionnaire " do
+        it "returns the questionnaire" do
           expect(response["questionnaire"]["id"]).to eq(model.questionnaire.id.to_s)
         end
       end
diff --git a/decidim-system/README.md b/decidim-system/README.md
index ba4e245bd0943..fc52966468b56 100644
--- a/decidim-system/README.md
+++ b/decidim-system/README.md
@@ -40,22 +40,34 @@ When using Decidim as multi-tenant, you should keep these in mind:
 
 ## Managing System admins
 
-Currently Decidim doesn't provide a way to create the first System Admin in a new deployment. To do it, you should open a Rails console in your application and
-create it:
+For logging in to this dashboard, you'll need to create a system admin account from your terminal:
 
-```ruby
-Decidim::System::Admin.create!(
-  email: "your-email@example.org",
-  password: "your-safe-password",
-  password_confirmation: "your-safe-password"
-)
+```bash
+bin/rails decidim_system:create_admin
 ```
 
-Once you have created your first admin you can access the system dashboard at `https://your-decidim-deployment-host/system` and login with your newly created user.
+You'll be asked for an email and a password. For security, the password will not get displayed back at you and you'll need to confirm it.
+
+Once you have created your first admin you can access the system dashboard at `/system`. For instance, if you have Decidim running at `https://example.org`, this URL would be `https://example.org/system`.
+You'll be able to login with your newly created user.
+
 From the system dashboard you can add new admins.
 
 ⚠� If you need to reset your administrator password you'll need to do it by entering the Rails console and changing it manually. ⚠�
 
+. Open the rails console:
+```bash
+bin/rails console
+```
+. Run the following instructions, changing them accordingly:
+```ruby
+system_admin = Decidim::System::Admin.order(:id).first                        # for the first system admin
+system_admin = Decidim::System::Admin.find_by_email "system@example.org"      # if you already know the email
+system_admin.password = "decidim123456789"                                    # change for something secure
+system_admin.password_confirmation = "decidim123456789"
+system_admin.save
+```
+
 ## Managing organizations
 
 Once you have your system admin setup you can also start managing the organizations in your deploy. To do it, login at the system dashboard and create a new organization
diff --git a/decidim-system/app/commands/decidim/system/create_admin.rb b/decidim-system/app/commands/decidim/system/create_admin.rb
index ef33ef2a25cfe..f8912d316386f 100644
--- a/decidim-system/app/commands/decidim/system/create_admin.rb
+++ b/decidim-system/app/commands/decidim/system/create_admin.rb
@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when creating a new admin in
     # the system.
-    class CreateAdmin < Rectify::Command
+    class CreateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-system/app/commands/decidim/system/create_default_content_blocks.rb b/decidim-system/app/commands/decidim/system/create_default_content_blocks.rb
index 4054c4bcbbd09..ecae29b8d3bf3 100644
--- a/decidim-system/app/commands/decidim/system/create_default_content_blocks.rb
+++ b/decidim-system/app/commands/decidim/system/create_default_content_blocks.rb
@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic to create the default content blocks
     # for a newly-created organization.
-    class CreateDefaultContentBlocks < Rectify::Command
+    class CreateDefaultContentBlocks < Decidim::Command
       DEFAULT_CONTENT_BLOCKS =
         [:hero, :sub_hero, :highlighted_content_banner, :how_to_participate, :stats, :metrics, :footer_sub_hero].freeze
 
diff --git a/decidim-system/app/commands/decidim/system/create_default_pages.rb b/decidim-system/app/commands/decidim/system/create_default_pages.rb
index 11ccf6d6fa028..933ea5720a254 100644
--- a/decidim-system/app/commands/decidim/system/create_default_pages.rb
+++ b/decidim-system/app/commands/decidim/system/create_default_pages.rb
@@ -5,7 +5,7 @@ module System
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class CreateDefaultPages < Rectify::Command
+    class CreateDefaultPages < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-system/app/commands/decidim/system/create_oauth_application.rb b/decidim-system/app/commands/decidim/system/create_oauth_application.rb
index 8f5bad455333f..140b7c6293183 100644
--- a/decidim-system/app/commands/decidim/system/create_oauth_application.rb
+++ b/decidim-system/app/commands/decidim/system/create_oauth_application.rb
@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Creates an OAuthApplication.
-    class CreateOAuthApplication < Rectify::Command
+    class CreateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # form - The source fo data for this OAuthApplication.
diff --git a/decidim-system/app/commands/decidim/system/destroy_oauth_application.rb b/decidim-system/app/commands/decidim/system/destroy_oauth_application.rb
index 5dc3e856727ef..2e91fbcd75db2 100644
--- a/decidim-system/app/commands/decidim/system/destroy_oauth_application.rb
+++ b/decidim-system/app/commands/decidim/system/destroy_oauth_application.rb
@@ -3,7 +3,7 @@
 module Decidim
   module System
     # This command deals with destroying an application from the admin panel.
-    class DestroyOAuthApplication < Rectify::Command
+    class DestroyOAuthApplication < Decidim::Command
       # Public: Initializes the command.
       #
       # application - The OAuthApplication to be destroyed.
diff --git a/decidim-system/app/commands/decidim/system/populate_help.rb b/decidim-system/app/commands/decidim/system/populate_help.rb
index 085515e5dc4da..ff7e302ce2285 100644
--- a/decidim-system/app/commands/decidim/system/populate_help.rb
+++ b/decidim-system/app/commands/decidim/system/populate_help.rb
@@ -3,7 +3,7 @@
 module Decidim
   module System
     # A command that will create default help pages for an organization.
-    class PopulateHelp < Rectify::Command
+    class PopulateHelp < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - An organization
@@ -49,8 +49,8 @@ def call
         end
       end
 
-      def multi_translation(key, *arguments)
-        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, *arguments)
+      def multi_translation(key, **arguments)
+        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, **arguments)
       end
     end
   end
diff --git a/decidim-system/app/commands/decidim/system/register_organization.rb b/decidim-system/app/commands/decidim/system/register_organization.rb
index c6517a650bcfd..0654453770c68 100644
--- a/decidim-system/app/commands/decidim/system/register_organization.rb
+++ b/decidim-system/app/commands/decidim/system/register_organization.rb
@@ -5,7 +5,7 @@ module System
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class RegisterOrganization < Rectify::Command
+    class RegisterOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
@@ -24,6 +24,7 @@ def call
 
         @organization = nil
         invite_form = nil
+        invitation_failed = false
 
         transaction do
           @organization = create_organization
@@ -31,8 +32,10 @@ def call
           PopulateHelp.call(@organization)
           CreateDefaultContentBlocks.call(@organization)
           invite_form = invite_user_form(@organization)
-          return broadcast(:invalid) if invite_form.invalid?
+          invitation_failed = invite_form.invalid?
         end
+        return broadcast(:invalid) if invitation_failed
+
         Decidim::InviteUser.call(invite_form) if @organization && invite_form
 
         broadcast(:ok)
diff --git a/decidim-system/app/commands/decidim/system/update_admin.rb b/decidim-system/app/commands/decidim/system/update_admin.rb
index cd4cfe8368724..4cc80803820b9 100644
--- a/decidim-system/app/commands/decidim/system/update_admin.rb
+++ b/decidim-system/app/commands/decidim/system/update_admin.rb
@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when updating an admin in
     # the system.
-    class UpdateAdmin < Rectify::Command
+    class UpdateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-system/app/commands/decidim/system/update_oauth_application.rb b/decidim-system/app/commands/decidim/system/update_oauth_application.rb
index 0e5c1b47a5b88..2ab464e842ae1 100644
--- a/decidim-system/app/commands/decidim/system/update_oauth_application.rb
+++ b/decidim-system/app/commands/decidim/system/update_oauth_application.rb
@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Updates the OAuth application given form data.
-    class UpdateOAuthApplication < Rectify::Command
+    class UpdateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # application - The OAuthApplication to update.
diff --git a/decidim-system/app/commands/decidim/system/update_organization.rb b/decidim-system/app/commands/decidim/system/update_organization.rb
index 01fca7d3edbf2..d831b0f9e915c 100644
--- a/decidim-system/app/commands/decidim/system/update_organization.rb
+++ b/decidim-system/app/commands/decidim/system/update_organization.rb
@@ -5,7 +5,7 @@ module System
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
-    class UpdateOrganization < Rectify::Command
+    class UpdateOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
diff --git a/decidim-system/app/forms/decidim/system/file_upload_settings_form.rb b/decidim-system/app/forms/decidim/system/file_upload_settings_form.rb
index 1817b6b1dd9d2..92e59e868fc6d 100644
--- a/decidim-system/app/forms/decidim/system/file_upload_settings_form.rb
+++ b/decidim-system/app/forms/decidim/system/file_upload_settings_form.rb
@@ -10,34 +10,31 @@ class FileUploadSettingsForm < Form
 
       mimic :organization_file_uploads
 
-      attribute :allowed_file_extensions, Hash[Symbol => String]
-      attribute :allowed_content_types, Hash[Symbol => String]
-      attribute :maximum_file_size, Hash[Symbol => Float]
+      attribute(:allowed_file_extensions, { Symbol => String })
+      attribute(:allowed_content_types, { Symbol => String })
+      attribute(:maximum_file_size, { Symbol => Float })
 
       def map_model(settings_hash)
-        settings_hash = begin
-          if settings_hash.is_a?(Hash)
-            default_settings.deep_merge(settings_hash.deep_stringify_keys)
-          else
-            default_settings
-          end
-        end
+        settings_hash = if settings_hash.is_a?(Hash)
+                          default_settings.deep_merge(settings_hash.deep_stringify_keys)
+                        else
+                          default_settings
+                        end
 
-        attribute_set.each do |attr|
-          key = attr.name.to_s
-          next unless settings_hash.has_key?(key)
+        csv_attributes.each do |attr|
+          next unless settings_hash.has_key?(attr.to_s)
 
           # For the view, the array values need to be in comma separated format
           # in order for them to work correctly with the tags inputs.
-          value = Rectify::FormAttribute.new(attr).value_from(
-            settings_hash[key]
-          )
+          value = settings_hash[attr.to_s]
           value.each do |k, v|
             value[k] = v.join(",") if v.is_a?(Array)
           end
 
-          self[key] = value
+          send("#{attr}=", value)
         end
+
+        self.maximum_file_size = settings_hash["maximum_file_size"]
       end
 
       # This turns the attributes passed from the view into the final
@@ -46,8 +43,7 @@ def map_model(settings_hash)
       # the view layer. Before we save those attributes, they need to be
       # converted into arrays which is what this method does.
       def final
-        csv_attributes = [:allowed_file_extensions, :allowed_content_types]
-        attributes.tap do |attr|
+        to_h.tap do |attr|
           csv_attributes.each do |key|
             attr[key] = csv_array_setting(attr[key])
           end
@@ -60,6 +56,10 @@ def default_settings
         Decidim::OrganizationSettings.default(:upload)
       end
 
+      def csv_attributes
+        @csv_attributes ||= [:allowed_file_extensions, :allowed_content_types]
+      end
+
       def csv_array_setting(original)
         original.transform_values do |value|
           value.split(",")
diff --git a/decidim-system/app/packs/entrypoints/decidim_system.js b/decidim-system/app/packs/entrypoints/decidim_system.js
index 7757d6cdb5e96..f2c09ba7eb711 100644
--- a/decidim-system/app/packs/entrypoints/decidim_system.js
+++ b/decidim-system/app/packs/entrypoints/decidim_system.js
@@ -1,2 +1,3 @@
 import "src/decidim/system/application"
 import "entrypoints/decidim_system.scss"
+import "src/decidim/direct_uploads/upload_field"
diff --git a/decidim-system/app/packs/stylesheets/decidim/system/application.scss b/decidim-system/app/packs/stylesheets/decidim/system/application.scss
index c434805d2c301..f7dc46bb39f77 100644
--- a/decidim-system/app/packs/stylesheets/decidim/system/application.scss
+++ b/decidim-system/app/packs/stylesheets/decidim/system/application.scss
@@ -15,6 +15,7 @@ $-zf-bp-value: null;
 @import "stylesheets/decidim/system/forms";
 @import "stylesheets/decidim/editor";
 @import "stylesheets/decidim/utils/fontface";
+@import "stylesheets/decidim/modules/upload_modal";
 
 body{
   font-family: 'Source Sans Pro', sans-serif;
diff --git a/decidim-system/config/locales/ar.yml b/decidim-system/config/locales/ar.yml
index 9bb9317e25ea1..1a1e1919e4b76 100644
--- a/decidim-system/config/locales/ar.yml
+++ b/decidim-system/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/bg.yml b/decidim-system/config/locales/bg.yml
index 3b27a63d6f71e..849f5e5a8b107 100644
--- a/decidim-system/config/locales/bg.yml
+++ b/decidim-system/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   decidim:
     system:
diff --git a/decidim-system/config/locales/ca.yml b/decidim-system/config/locales/ca.yml
index c480d76dbd3dd..841b419393381 100644
--- a/decidim-system/config/locales/ca.yml
+++ b/decidim-system/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -34,7 +35,7 @@ ca:
   decidim:
     system:
       actions:
-        confirm_destroy: Segur que ho vols eliminar?
+        confirm_destroy: Segur que ho vols eliminar això?
         destroy: Suprimeix
         edit: Edita
         new: Nou
diff --git a/decidim-system/config/locales/cs.yml b/decidim-system/config/locales/cs.yml
index 0d64c53b3edf7..47d827ba83c83 100644
--- a/decidim-system/config/locales/cs.yml
+++ b/decidim-system/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/de.yml b/decidim-system/config/locales/de.yml
index 5ae3cf0d88cbb..14178256c175a 100644
--- a/decidim-system/config/locales/de.yml
+++ b/decidim-system/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/el.yml b/decidim-system/config/locales/el.yml
index e7e09f1a96ff8..6b24af4a91d45 100644
--- a/decidim-system/config/locales/el.yml
+++ b/decidim-system/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   decidim:
     system:
diff --git a/decidim-system/config/locales/es-MX.yml b/decidim-system/config/locales/es-MX.yml
index 75d35841e78ec..8d09413457589 100644
--- a/decidim-system/config/locales/es-MX.yml
+++ b/decidim-system/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/es-PY.yml b/decidim-system/config/locales/es-PY.yml
index 2edb5a19244fa..ef6b546430c86 100644
--- a/decidim-system/config/locales/es-PY.yml
+++ b/decidim-system/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/es.yml b/decidim-system/config/locales/es.yml
index f08ebaad9ca9e..afcd71b6f827e 100644
--- a/decidim-system/config/locales/es.yml
+++ b/decidim-system/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/eu.yml b/decidim-system/config/locales/eu.yml
index 1fd2c5e934150..1ba2973a96159 100644
--- a/decidim-system/config/locales/eu.yml
+++ b/decidim-system/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/fi-plain.yml b/decidim-system/config/locales/fi-plain.yml
index b615f18dcf3c0..1d0d0af2d6ed2 100644
--- a/decidim-system/config/locales/fi-plain.yml
+++ b/decidim-system/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/fi.yml b/decidim-system/config/locales/fi.yml
index f51cb220b7014..b3d84eec9e829 100644
--- a/decidim-system/config/locales/fi.yml
+++ b/decidim-system/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/fr-CA.yml b/decidim-system/config/locales/fr-CA.yml
index 0d14dfb442a7b..e7a0e3916be4d 100644
--- a/decidim-system/config/locales/fr-CA.yml
+++ b/decidim-system/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/fr.yml b/decidim-system/config/locales/fr.yml
index 6237840bb51ad..3d36e0d92e591 100644
--- a/decidim-system/config/locales/fr.yml
+++ b/decidim-system/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/ga-IE.yml b/decidim-system/config/locales/ga-IE.yml
index 812a62a0d2e07..f55e21565be6b 100644
--- a/decidim-system/config/locales/ga-IE.yml
+++ b/decidim-system/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/gl.yml b/decidim-system/config/locales/gl.yml
index f1a3339efa189..d32f98971416e 100644
--- a/decidim-system/config/locales/gl.yml
+++ b/decidim-system/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/hu.yml b/decidim-system/config/locales/hu.yml
index f1cdc5c6eb681..c5365bcfcc483 100644
--- a/decidim-system/config/locales/hu.yml
+++ b/decidim-system/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   decidim:
     system:
diff --git a/decidim-system/config/locales/id-ID.yml b/decidim-system/config/locales/id-ID.yml
index e2433004c1d25..d954eb89637ba 100644
--- a/decidim-system/config/locales/id-ID.yml
+++ b/decidim-system/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   decidim:
     system:
diff --git a/decidim-system/config/locales/is-IS.yml b/decidim-system/config/locales/is-IS.yml
index 38b7d5dba5e14..0e8e0128f8cce 100644
--- a/decidim-system/config/locales/is-IS.yml
+++ b/decidim-system/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     system:
       actions:
diff --git a/decidim-system/config/locales/it.yml b/decidim-system/config/locales/it.yml
index ca6cf8ee20cfc..a6bf8db7fab59 100644
--- a/decidim-system/config/locales/it.yml
+++ b/decidim-system/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/ja.yml b/decidim-system/config/locales/ja.yml
index d68bc6386fd7d..67282a9b9faf1 100644
--- a/decidim-system/config/locales/ja.yml
+++ b/decidim-system/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/ka-GE.yml b/decidim-system/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-system/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-system/config/locales/lb.yml b/decidim-system/config/locales/lb.yml
index b1413e8cd3576..d3c2d7d6490e4 100644
--- a/decidim-system/config/locales/lb.yml
+++ b/decidim-system/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/lt.yml b/decidim-system/config/locales/lt.yml
index 39fbfff86b631..2a8b56bcc868e 100644
--- a/decidim-system/config/locales/lt.yml
+++ b/decidim-system/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/lv.yml b/decidim-system/config/locales/lv.yml
index bb7acac276c69..c36c559143e14 100644
--- a/decidim-system/config/locales/lv.yml
+++ b/decidim-system/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   decidim:
     system:
diff --git a/decidim-system/config/locales/nl.yml b/decidim-system/config/locales/nl.yml
index 657ca6a1583f8..bf7ea7af59773 100644
--- a/decidim-system/config/locales/nl.yml
+++ b/decidim-system/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/no.yml b/decidim-system/config/locales/no.yml
index a5260cd1a706d..e2ab9d9690d4f 100644
--- a/decidim-system/config/locales/no.yml
+++ b/decidim-system/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/pl.yml b/decidim-system/config/locales/pl.yml
index b7634f5aeab80..e6001823ed855 100644
--- a/decidim-system/config/locales/pl.yml
+++ b/decidim-system/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/pt-BR.yml b/decidim-system/config/locales/pt-BR.yml
index f3fa9347cc6b1..3aa6fff67af41 100644
--- a/decidim-system/config/locales/pt-BR.yml
+++ b/decidim-system/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/pt.yml b/decidim-system/config/locales/pt.yml
index 62f361049a74f..4b58d46392f26 100644
--- a/decidim-system/config/locales/pt.yml
+++ b/decidim-system/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/ro-RO.yml b/decidim-system/config/locales/ro-RO.yml
index 6bfbe28180624..35c224d2cb137 100644
--- a/decidim-system/config/locales/ro-RO.yml
+++ b/decidim-system/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/ru.yml b/decidim-system/config/locales/ru.yml
index 3f9b4b03738d4..a2969e2a8c21d 100644
--- a/decidim-system/config/locales/ru.yml
+++ b/decidim-system/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   decidim:
     system:
diff --git a/decidim-system/config/locales/sk.yml b/decidim-system/config/locales/sk.yml
index 33eecfa674ef1..4361c997bb3e7 100644
--- a/decidim-system/config/locales/sk.yml
+++ b/decidim-system/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   decidim:
     system:
diff --git a/decidim-system/config/locales/sl.yml b/decidim-system/config/locales/sl.yml
index 58ebb961bb35f..ba1f397f9f25d 100644
--- a/decidim-system/config/locales/sl.yml
+++ b/decidim-system/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   decidim:
     system:
diff --git a/decidim-system/config/locales/sr-CS.yml b/decidim-system/config/locales/sr-CS.yml
index af74ff2d53c5f..25e8912f51d63 100644
--- a/decidim-system/config/locales/sr-CS.yml
+++ b/decidim-system/config/locales/sr-CS.yml
@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     system:
diff --git a/decidim-system/config/locales/sv.yml b/decidim-system/config/locales/sv.yml
index 3f4f2f78cc048..8a23c8aa0dd1d 100644
--- a/decidim-system/config/locales/sv.yml
+++ b/decidim-system/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/tr-TR.yml b/decidim-system/config/locales/tr-TR.yml
index 8b77133e3a48a..bb736d522906b 100644
--- a/decidim-system/config/locales/tr-TR.yml
+++ b/decidim-system/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
diff --git a/decidim-system/config/locales/uk.yml b/decidim-system/config/locales/uk.yml
index f1e98bedab6cc..cf12e7fae6b7d 100644
--- a/decidim-system/config/locales/uk.yml
+++ b/decidim-system/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   decidim:
     system:
diff --git a/decidim-system/config/locales/zh-CN.yml b/decidim-system/config/locales/zh-CN.yml
index d0c9494a812cd..daf25d3bfe83e 100644
--- a/decidim-system/config/locales/zh-CN.yml
+++ b/decidim-system/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
diff --git a/decidim-system/db/seeds.rb b/decidim-system/db/seeds.rb
index 57f5d508145ec..4ab5bb988f965 100644
--- a/decidim-system/db/seeds.rb
+++ b/decidim-system/db/seeds.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-system...\n" unless Rails.env.test?
 
-  password = ENV["DECIDIM_SYSTEM_USER_PASSWORD"] || "decidim123456"
+  password = ENV.fetch("DECIDIM_SYSTEM_USER_PASSWORD", "decidim123456789")
 
   Decidim::System::Admin.find_or_initialize_by(email: "system@example.org").update!(
     password: password,
diff --git a/decidim-system/decidim-system.gemspec b/decidim-system/decidim-system.gemspec
index 0d06d34c1b0e6..7815e91f6f564 100644
--- a/decidim-system/decidim-system.gemspec
+++ b/decidim-system/decidim-system.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-system"
   s.summary = "Decidim system administration"
diff --git a/decidim-system/lib/decidim/system/engine.rb b/decidim-system/lib/decidim/system/engine.rb
index da70ee4dde054..d3fc1a5d36a4b 100644
--- a/decidim-system/lib/decidim/system/engine.rb
+++ b/decidim-system/lib/decidim/system/engine.rb
@@ -7,7 +7,6 @@
 require "devise-i18n"
 require "decidim/core"
 require "foundation_rails_helper"
-require "rectify"
 
 module Decidim
   module System
diff --git a/decidim-system/lib/decidim/system/test/factories.rb b/decidim-system/lib/decidim/system/test/factories.rb
index 4e77b3dcac35d..b0a33df6601eb 100644
--- a/decidim-system/lib/decidim/system/test/factories.rb
+++ b/decidim-system/lib/decidim/system/test/factories.rb
@@ -4,8 +4,8 @@
 
 FactoryBot.define do
   factory :admin, class: "Decidim::System::Admin" do
-    sequence(:email) { |n| "admin#{n}@citizen.corp" }
-    password { "decidim123456" }
-    password_confirmation { "decidim123456" }
+    sequence(:email) { |n| "admin#{n}@example.org" }
+    password { "decidim123456789" }
+    password_confirmation { "decidim123456789" }
   end
 end
diff --git a/decidim-system/lib/decidim/system/version.rb b/decidim-system/lib/decidim/system/version.rb
index f7500378f88de..530f20b0bb346 100644
--- a/decidim-system/lib/decidim/system/version.rb
+++ b/decidim-system/lib/decidim/system/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-system/spec/commands/decidim/system/create_default_pages_spec.rb b/decidim-system/spec/commands/decidim/system/create_default_pages_spec.rb
index bbd793dc0eaa3..2f20cdcbe9e6e 100644
--- a/decidim-system/spec/commands/decidim/system/create_default_pages_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/create_default_pages_spec.rb
@@ -42,7 +42,7 @@ module System
           organization1.static_pages.find_by(
             slug: "terms-and-conditions"
           ).allow_public_access
-        ).to eq(true)
+        ).to be(true)
       end
     end
   end
diff --git a/decidim-system/spec/commands/decidim/system/register_organization_spec.rb b/decidim-system/spec/commands/decidim/system/register_organization_spec.rb
index 251f03c51f842..7dc169d410058 100644
--- a/decidim-system/spec/commands/decidim/system/register_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/register_organization_spec.rb
@@ -58,7 +58,7 @@ module System
             expect(organization.external_domain_whitelist).to match_array(["decidim.org", "github.com"])
             expect(organization.smtp_settings["from"]).to eq("Decide Gotham <decide@gotham.gov>")
             expect(organization.smtp_settings["from_email"]).to eq("decide@gotham.gov")
-            expect(organization.omniauth_settings["omniauth_settings_facebook_enabled"]).to eq(true)
+            expect(organization.omniauth_settings["omniauth_settings_facebook_enabled"]).to be(true)
             expect(organization.file_upload_settings).to eq(upload_settings)
             expect(
               Decidim::AttributeEncryptor.decrypt(organization.omniauth_settings["omniauth_settings_facebook_app_id"])
@@ -155,7 +155,7 @@ module System
         private
 
         def params_for_uploads(hash)
-          hash.map do |key, value|
+          hash.to_h do |key, value|
             case value
             when Hash
               value = params_for_uploads(value)
@@ -164,7 +164,7 @@ def params_for_uploads(hash)
             end
 
             [key, value]
-          end.to_h
+          end
         end
       end
     end
diff --git a/decidim-system/spec/commands/decidim/system/update_oauth_application_spec.rb b/decidim-system/spec/commands/decidim/system/update_oauth_application_spec.rb
index 8def9c0a53203..b21982cd05dc5 100644
--- a/decidim-system/spec/commands/decidim/system/update_oauth_application_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/update_oauth_application_spec.rb
@@ -17,10 +17,7 @@ module Decidim::System
       }
     end
     let(:file) do
-      fixture_file_upload(
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        "image/jpeg"
-      )
+      upload_test_file(Decidim::Dev.test_file("city.jpeg", "image/jpeg"))
     end
     let(:application) { create(:oauth_application) }
     let(:organization) { application.organization }
diff --git a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
index 87638ddd77dc7..ed8b694acca0a 100644
--- a/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
+++ b/decidim-system/spec/commands/decidim/system/update_organization_spec.rb
@@ -54,7 +54,7 @@ module System
             expect(organization.users_registration_mode).to eq("existing")
             expect(organization.smtp_settings["from"]).to eq("Decide Gotham <decide@gotham.gov>")
             expect(organization.smtp_settings["from_email"]).to eq("decide@gotham.gov")
-            expect(organization.omniauth_settings["omniauth_settings_facebook_enabled"]).to eq(true)
+            expect(organization.omniauth_settings["omniauth_settings_facebook_enabled"]).to be(true)
             expect(organization.file_upload_settings).to eq(upload_settings)
             expect(
               Decidim::AttributeEncryptor.decrypt(organization.omniauth_settings["omniauth_settings_facebook_app_id"])
@@ -95,7 +95,7 @@ module System
         private
 
         def params_for_uploads(hash)
-          hash.map do |key, value|
+          hash.to_h do |key, value|
             case value
             when Hash
               value = params_for_uploads(value)
@@ -104,7 +104,7 @@ def params_for_uploads(hash)
             end
 
             [key, value]
-          end.to_h
+          end
         end
       end
     end
diff --git a/decidim-system/spec/forms/decidim/system/file_upload_settings_form_spec.rb b/decidim-system/spec/forms/decidim/system/file_upload_settings_form_spec.rb
index d86bf4d67bb96..88fcb20ad0b46 100644
--- a/decidim-system/spec/forms/decidim/system/file_upload_settings_form_spec.rb
+++ b/decidim-system/spec/forms/decidim/system/file_upload_settings_form_spec.rb
@@ -16,13 +16,13 @@ module Decidim::System
 
         it "sets the default settings for the view" do
           expect(subject.allowed_file_extensions).to eq(
-            defaults["allowed_file_extensions"].map { |k, v| [k.to_sym, v.join(",")] }.to_h
+            defaults["allowed_file_extensions"].to_h { |k, v| [k.to_sym, v.join(",")] }
           )
           expect(subject.allowed_content_types).to eq(
-            defaults["allowed_content_types"].map { |k, v| [k.to_sym, v.join(",")] }.to_h
+            defaults["allowed_content_types"].to_h { |k, v| [k.to_sym, v.join(",")] }
           )
           expect(subject.maximum_file_size).to eq(
-            defaults["maximum_file_size"].map { |k, v| [k.to_sym, v.to_f] }.to_h
+            defaults["maximum_file_size"].to_h { |k, v| [k.to_sym, v.to_f] }
           )
         end
       end
diff --git a/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb b/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
index 301048370c98d..e2f7331207f72 100644
--- a/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
+++ b/decidim-system/spec/forms/decidim/system/update_organization_form_spec.rb
@@ -27,12 +27,12 @@ module Decidim::System
 
     let(:smtp_settings) do
       {
-        address: "mail.gotham.gov",
-        port: 25,
-        user_name: "f.laguardia",
-        password: password,
-        from_email: "decide@gotham.gov",
-        from_label: from_label
+        "address" => "mail.gotham.gov",
+        "port" => 25,
+        "user_name" => "f.laguardia",
+        "password" => password,
+        "from_email" => "decide@gotham.gov",
+        "from_label" => from_label
       }
     end
     let(:password) { "secret_password" }
@@ -45,7 +45,7 @@ module Decidim::System
 
       describe "omniauth_settings" do
         it "contains attributes as plain text" do
-          expect(subject.omniauth_settings_facebook_enabled).to eq(true)
+          expect(subject.omniauth_settings_facebook_enabled).to be(true)
           expect(subject.omniauth_settings_facebook_app_id).to eq(facebook_app_id)
           expect(subject.omniauth_settings_facebook_app_secret).to eq(facebook_app_secret)
         end
@@ -55,7 +55,7 @@ module Decidim::System
         it "encrypts sensible attributes" do
           encrypted_settings = subject.encrypted_omniauth_settings
 
-          expect(encrypted_settings["omniauth_settings_facebook_enabled"]).to eq(true)
+          expect(encrypted_settings["omniauth_settings_facebook_enabled"]).to be(true)
           expect(
             Decidim::AttributeEncryptor.decrypt(encrypted_settings["omniauth_settings_facebook_app_id"])
           ).to eq(facebook_app_id)
@@ -85,7 +85,7 @@ module Decidim::System
 
       describe "smtp_settings" do
         it "handles SMTP password properly" do
-          expect(subject.smtp_settings).to eq(smtp_settings.except(:password))
+          expect(subject.smtp_settings).to eq(smtp_settings.except("password"))
           expect(Decidim::AttributeEncryptor.decrypt(subject.encrypted_smtp_settings[:encrypted_password])).to eq(password)
         end
       end
diff --git a/decidim-system/spec/lib/tasks/decidim_system_create_admin_spec.rb b/decidim-system/spec/lib/tasks/decidim_system_create_admin_spec.rb
index 1e12697032797..ad7a827c72724 100644
--- a/decidim-system/spec/lib/tasks/decidim_system_create_admin_spec.rb
+++ b/decidim-system/spec/lib/tasks/decidim_system_create_admin_spec.rb
@@ -32,7 +32,7 @@
 
     context "when provided data is valid" do
       it "creates an admin" do
-        expect { task.execute }.to change { Decidim::System::Admin.count }.by(1)
+        expect { task.execute }.to change(Decidim::System::Admin, :count).by(1)
         expect($stdout.string).to include("System admin created successfully")
       end
     end
@@ -43,7 +43,7 @@
         let(:password_confirmation) { "invalid" }
 
         it "prevents creation of admin and displays validation errors" do
-          expect { task.execute }.not_to(change { Decidim::System::Admin.count })
+          expect { task.execute }.not_to(change(Decidim::System::Admin, :count))
 
           expect($stdout.string).to include("Some errors prevented creation of admin")
           expect($stdout.string).to include("Email is invalid")
@@ -56,7 +56,7 @@
         let(:password_confirmation) { "password1234" }
 
         it "prevents creation of admin and displays validation errors" do
-          expect { task.execute }.not_to(change { Decidim::System::Admin.count })
+          expect { task.execute }.not_to(change(Decidim::System::Admin, :count))
 
           expect($stdout.string).to include("Some errors prevented creation of admin")
           expect($stdout.string).to include("Password is too common")
diff --git a/decidim-system/spec/system/manage_admins_spec.rb b/decidim-system/spec/system/manage_admins_spec.rb
index 8c015482f2f6e..481bfcc68d66f 100644
--- a/decidim-system/spec/system/manage_admins_spec.rb
+++ b/decidim-system/spec/system/manage_admins_spec.rb
@@ -18,8 +18,8 @@
 
         within ".new_admin" do
           fill_in :admin_email, with: "admin@foo.bar"
-          fill_in :admin_password, with: "decidim123456"
-          fill_in :admin_password_confirmation, with: "decidim123456"
+          fill_in :admin_password, with: "decidim123456789"
+          fill_in :admin_password_confirmation, with: "decidim123456789"
 
           find("*[type=submit]").click
         end
diff --git a/decidim-system/spec/system/manage_oauth_applications_spec.rb b/decidim-system/spec/system/manage_oauth_applications_spec.rb
index bbc6389229796..dd338fe519854 100644
--- a/decidim-system/spec/system/manage_oauth_applications_spec.rb
+++ b/decidim-system/spec/system/manage_oauth_applications_spec.rb
@@ -22,8 +22,11 @@
       select organization.name, from: :oauth_application_decidim_organization_id
       fill_in :oauth_application_organization_name, with: "Ajuntament de Barcelona"
       fill_in :oauth_application_organization_url, with: "https://www.barcelona.cat"
-      attach_file "Organization logo", Decidim::Dev.asset("city.jpeg")
+    end
+
+    dynamically_attach_file(:oauth_application_organization_logo, Decidim::Dev.asset("city.jpeg"))
 
+    within ".new_oauth_application" do
       find("*[type=submit]").click
     end
 
diff --git a/decidim-system/spec/system/organizations_spec.rb b/decidim-system/spec/system/organizations_spec.rb
index 0a8916a49d96c..5ce62a6f3c505 100644
--- a/decidim-system/spec/system/organizations_spec.rb
+++ b/decidim-system/spec/system/organizations_spec.rb
@@ -30,11 +30,11 @@
 
       it "creates a new organization" do
         fill_in "Name", with: "Citizen Corp"
-        fill_in "Host", with: "www.citizen.corp"
-        fill_in "Secondary hosts", with: "foo.citizen.corp\n\rbar.citizen.corp"
+        fill_in "Host", with: "www.example.org"
+        fill_in "Secondary hosts", with: "foo.example.org\n\rbar.example.org"
         fill_in "Reference prefix", with: "CCORP"
         fill_in "Organization admin name", with: "City Mayor"
-        fill_in "Organization admin email", with: "mayor@citizen.corp"
+        fill_in "Organization admin email", with: "mayor@example.org"
         check "organization_available_locales_en"
         choose "organization_default_locale_en"
         choose "Allow participants to register and login"
@@ -87,8 +87,8 @@
 
       it "edits the data" do
         fill_in "Name", with: "Citizens Rule!"
-        fill_in "Host", with: "www.foo.org"
-        fill_in "Secondary hosts", with: "foobar.citizen.corp\n\rbar.citizen.corp"
+        fill_in "Host", with: "www.example.org"
+        fill_in "Secondary hosts", with: "foobar.example.org\n\rbar.example.org"
         choose "Don't allow participants to register, but allow existing participants to login"
         check "Example authorization (Direct)"
 
diff --git a/decidim-system/spec/system/sessions_spec.rb b/decidim-system/spec/system/sessions_spec.rb
index aef10a9c0f49b..90f4e4d605fb7 100644
--- a/decidim-system/spec/system/sessions_spec.rb
+++ b/decidim-system/spec/system/sessions_spec.rb
@@ -5,8 +5,8 @@
 describe "Sessions", type: :system do
   let!(:admin) do
     create(:admin, email: "admin@example.org",
-                   password: "decidim123456",
-                   password_confirmation: "decidim123456")
+                   password: "decidim123456789",
+                   password_confirmation: "decidim123456789")
   end
 
   before do
@@ -17,7 +17,7 @@
     it "lets you into the system panel" do
       within ".new_admin" do
         fill_in :admin_email, with: "admin@example.org"
-        fill_in :admin_password, with: "decidim123456"
+        fill_in :admin_password, with: "decidim123456789"
         find("*[type=submit]").click
       end
 
diff --git a/decidim-templates/app/commands/decidim/templates/admin/apply_questionnaire_template.rb b/decidim-templates/app/commands/decidim/templates/admin/apply_questionnaire_template.rb
index aa184b1d8c499..978d82d3f2845 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/apply_questionnaire_template.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/apply_questionnaire_template.rb
@@ -4,7 +4,7 @@ module Decidim
   module Templates
     # A command with all the business logic when duplicating a questionnaire template
     module Admin
-      class ApplyQuestionnaireTemplate < Rectify::Command
+      class ApplyQuestionnaireTemplate < Decidim::Command
         include Decidim::Templates::Admin::QuestionnaireCopier
 
         # Public: Initializes the command.
diff --git a/decidim-templates/app/commands/decidim/templates/admin/copy_questionnaire_template.rb b/decidim-templates/app/commands/decidim/templates/admin/copy_questionnaire_template.rb
index d8379d196abfa..48fd71f144fc5 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/copy_questionnaire_template.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/copy_questionnaire_template.rb
@@ -4,14 +4,15 @@ module Decidim
   module Templates
     # A command with all the business logic when duplicating a questionnaire template
     module Admin
-      class CopyQuestionnaireTemplate < Rectify::Command
+      class CopyQuestionnaireTemplate < Decidim::Command
         include Decidim::Templates::Admin::QuestionnaireCopier
 
         # Public: Initializes the command.
         #
         # template - A template we want to duplicate
-        def initialize(template)
+        def initialize(template, user)
           @template = template
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -23,9 +24,11 @@ def initialize(template)
         def call
           return broadcast(:invalid) unless @template.valid?
 
-          Template.transaction do
-            copy_template
-            copy_questionnaire_questions(@template.templatable, @copied_template.templatable)
+          Decidim.traceability.perform_action!("duplicate", @template, @user) do
+            Template.transaction do
+              copy_template
+              copy_questionnaire_questions(@template.templatable, @copied_template.templatable)
+            end
           end
 
           broadcast(:ok, @copied_template)
diff --git a/decidim-templates/app/commands/decidim/templates/admin/create_questionnaire_template.rb b/decidim-templates/app/commands/decidim/templates/admin/create_questionnaire_template.rb
index 24632e30c6d88..7fdcf847ebb7b 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/create_questionnaire_template.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/create_questionnaire_template.rb
@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # Creates a QuestionnaireTemplate.
-      class CreateQuestionnaireTemplate < Rectify::Command
+      class CreateQuestionnaireTemplate < Decidim::Command
         # Initializes the command.
         #
         # form - The source for this QuestionnaireTemplate.
diff --git a/decidim-templates/app/commands/decidim/templates/admin/destroy_template.rb b/decidim-templates/app/commands/decidim/templates/admin/destroy_template.rb
index 1d692955ce579..3033864e50fc7 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/destroy_template.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/destroy_template.rb
@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # This command deals with destroying a template from the admin panel.
-      class DestroyTemplate < Rectify::Command
+      class DestroyTemplate < Decidim::Command
         # Public: Initializes the command.
         #
         # template - The Template to be destroyed.
diff --git a/decidim-templates/app/commands/decidim/templates/admin/questionnaire_copier.rb b/decidim-templates/app/commands/decidim/templates/admin/questionnaire_copier.rb
index 23b999010f492..f927445fdb9b3 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/questionnaire_copier.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/questionnaire_copier.rb
@@ -7,7 +7,7 @@ module Admin
       module QuestionnaireCopier
         def copy_questionnaire_questions(original_questionnaire, new_questionnaire)
           # start by copying the questions so that they already exist when cross referencing them in the conditions
-          original_questionnaire.questions.includes(:answer_options, :matrix_rows, :display_conditions).load
+          original_questionnaire.reload.questions.includes(:answer_options, :matrix_rows, :display_conditions)
           original_questionnaire.questions.each do |original_question|
             new_question = original_question.dup
             new_question.questionnaire = new_questionnaire
@@ -49,6 +49,7 @@ def copy_question_display_conditions(original_question, destination_question)
               new_display_condition.answer_option = find_answer_option_by_body(destination_question_to_be_checked.answer_options, original_display_condition.answer_option.body)
             end
             new_display_condition.save!
+            destination_question.display_conditions << new_display_condition
           end
         end
 
diff --git a/decidim-templates/app/commands/decidim/templates/admin/update_template.rb b/decidim-templates/app/commands/decidim/templates/admin/update_template.rb
index 94ba7be7a19ce..2c90c97f430ae 100644
--- a/decidim-templates/app/commands/decidim/templates/admin/update_template.rb
+++ b/decidim-templates/app/commands/decidim/templates/admin/update_template.rb
@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # Updates the questionnaire template given form data.
-      class UpdateTemplate < Rectify::Command
+      class UpdateTemplate < Decidim::Command
         # Initializes the command.
         #
         # template - The Template to update.
diff --git a/decidim-templates/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb b/decidim-templates/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
index 1fcfdcb4e3868..36944dc2c0cac 100644
--- a/decidim-templates/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
+++ b/decidim-templates/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
@@ -54,7 +54,7 @@ def create
         def copy
           enforce_permission_to :copy, :template
 
-          CopyQuestionnaireTemplate.call(template) do
+          CopyQuestionnaireTemplate.call(template, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("templates.copy.success", scope: "decidim.admin")
               redirect_to action: :index
diff --git a/decidim-templates/app/helpers/decidim/templates/admin/templates_helper.rb b/decidim-templates/app/helpers/decidim/templates/admin/templates_helper.rb
deleted file mode 100644
index 2866af0871bab..0000000000000
--- a/decidim-templates/app/helpers/decidim/templates/admin/templates_helper.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Templates
-    module Admin
-      # Custom helpers, scoped to the templates engine.
-      #
-      module TemplatesHelper
-        def select_template(form, templates)
-          prompt_options = {
-            url: decidim_admin_templates.questionnaire_templates_url(format: :json),
-            change_url: decidim_admin_templates.preview_questionnaire_templates_url(format: :js),
-            placeholder: t("placeholder", scope: "decidim.templates.admin.questionnaire_templates.choose")
-          }
-
-          default_options = templates.last(5).map { |questionnaire_template| { value: questionnaire_template.id, label: translated_attribute(questionnaire_template.name) } }
-
-          form.autocomplete_select(
-            :questionnaire_template_id,
-            false,
-            {
-              multiple: false,
-              label: t("label", scope: "decidim.templates.admin.questionnaire_templates.choose"),
-              default_options: default_options
-            },
-            prompt_options
-          )
-        end
-      end
-    end
-  end
-end
diff --git a/decidim-templates/app/models/decidim/templates/template.rb b/decidim-templates/app/models/decidim/templates/template.rb
index 48cfbbce260a1..6f1bdbb167a3d 100644
--- a/decidim-templates/app/models/decidim/templates/template.rb
+++ b/decidim-templates/app/models/decidim/templates/template.rb
@@ -11,6 +11,8 @@
 module Decidim
   module Templates
     class Template < ApplicationRecord
+      include Decidim::Traceable
+
       belongs_to :organization,
                  foreign_key: "decidim_organization_id",
                  class_name: "Decidim::Organization"
@@ -28,6 +30,10 @@ def resource_name
       def destroy_templatable
         templatable.destroy
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Templates::AdminLog::TemplatePresenter
+      end
     end
   end
 end
diff --git a/decidim-templates/app/packs/entrypoints/decidim_templates.js b/decidim-templates/app/packs/entrypoints/decidim_templates.js
index d00bd9882d7ef..0d16cf94ac3bd 100644
--- a/decidim-templates/app/packs/entrypoints/decidim_templates.js
+++ b/decidim-templates/app/packs/entrypoints/decidim_templates.js
@@ -1,3 +1,4 @@
+import "src/decidim/templates/admin/choose_template"
 import "entrypoints/decidim_templates.scss";
 
 // Images
diff --git a/decidim-templates/app/packs/src/decidim/templates/admin/choose_template.js b/decidim-templates/app/packs/src/decidim/templates/admin/choose_template.js
new file mode 100644
index 0000000000000..a363914c451fb
--- /dev/null
+++ b/decidim-templates/app/packs/src/decidim/templates/admin/choose_template.js
@@ -0,0 +1,30 @@
+import { datalistSelect } from "src/decidim/datalist_select";
+
+$(() => {
+  const wrapper = document.querySelector("#choose-template");
+  if (!wrapper) {
+    return;
+  }
+
+  const preview = (id) => {
+    const options = wrapper.dataset;
+    const previewURL = options.previewurl;
+    if (!previewURL) {
+      return;
+    }
+    const params = new URLSearchParams({ id: id });
+    fetch(`${previewURL}?${params.toString()}`, {
+      method: "GET",
+      headers: { "Content-Type": "application/json" }
+    }).then((response) => response.text()).then((data) => {
+      const script = document.createElement("script");
+      script.type = "text/javascript";
+      script.innerHTML = data;
+      document.getElementsByTagName("head")[0].appendChild(script);
+    }).catch((error) => {
+      console.error(error); // eslint-disable-line no-console
+    });
+  }
+
+  datalistSelect(wrapper, preview)
+})
diff --git a/decidim-templates/app/presenters/decidim/templates/admin_log/template_presenter.rb b/decidim-templates/app/presenters/decidim/templates/admin_log/template_presenter.rb
new file mode 100644
index 0000000000000..83b2be920e856
--- /dev/null
+++ b/decidim-templates/app/presenters/decidim/templates/admin_log/template_presenter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Template`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    TemplatePresenter.new(action_log, view_helpers).present
+      class TemplatePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            name: :i18n,
+            description: :i18n
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "update", "delete", "duplicate"
+            "decidim.templates.admin_log.template.#{action}"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb b/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
index b2c0d322d9ca7..96878a695c543 100644
--- a/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
+++ b/decidim-templates/app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
@@ -12,9 +12,18 @@
     </div>
 
     <%= decidim_form_for([questionnaire], url: decidim_admin_templates.apply_questionnaire_templates_url(questionnaire_id: questionnaire, url: request.url), method: :post, html: { class: "form choose_questionnaire_templates" }) do |form| %>
-      <div class="row column">
-        <%= select_template form, templates %>
-      </div>
+      <%= datalist_select(templates,
+        {
+          id: "choose-template",
+          list: "template-list",
+          label: t(".label"),
+          name: "select-template",
+          placeholder: t("placeholder", scope: "decidim.templates.admin.questionnaire_templates.choose"),
+          data: {
+            previewurl: decidim_admin_templates.preview_questionnaire_templates_url(format: :js)
+          }
+        }
+      ) { form.hidden_field :questionnaire_template_id } %>
 
       <div class="card-section questionnaire-template-preview">
         <h3 class="template-name"></h3>
@@ -32,4 +41,5 @@
   </div>
 </div>
 
+<%= javascript_pack_tag "decidim_templates" %>
 <%= stylesheet_pack_tag "decidim_templates", media: "all" %>
diff --git a/decidim-templates/config/locales/ar.yml b/decidim-templates/config/locales/ar.yml
index 5fddbaf18f312..024ef143647cd 100644
--- a/decidim-templates/config/locales/ar.yml
+++ b/decidim-templates/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/ca.yml b/decidim-templates/config/locales/ca.yml
index ca407acc63033..88d29533bda5e 100644
--- a/decidim-templates/config/locales/ca.yml
+++ b/decidim-templates/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ ca:
             current_step: Pas %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: En participar acceptes els Termes i condicions d'ús
+      admin_log:
+        template:
+          create: "%{user_name} ha actualitzat la plantilla del qüestionari %{resource_name}"
+          delete: "%{user_name} ha esborrat la plantilla del qüestionari %{resource_name}"
+          duplicate: "%{user_name} ha duplicat la plantilla del qüestionari %{resource_name}"
+          update: "%{user_name} ha actualitzat la plantilla del qüestionari %{resource_name}"
       template_types:
         questionnaires: Qüestionari
diff --git a/decidim-templates/config/locales/cs.yml b/decidim-templates/config/locales/cs.yml
index b6eb7ed775441..22c2ea5bf95eb 100644
--- a/decidim-templates/config/locales/cs.yml
+++ b/decidim-templates/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ cs:
             current_step: Krok %{step}
             of_total_steps: z %{total_steps}
             tos_agreement: Zú�astněním souhlasíte s podmínkami služby
+      admin_log:
+        template:
+          create: "%{user_name} vytvořil šablonu dotazníku %{resource_name}"
+          delete: "%{user_name} odstranil šablonu dotazníku %{resource_name}"
+          duplicate: "%{user_name} zkopíroval šablonu dotazníku %{resource_name}"
+          update: "%{user_name} aktualizoval šablonu dotazníku %{resource_name}"
       template_types:
         questionnaires: Dotazníky
diff --git a/decidim-templates/config/locales/de.yml b/decidim-templates/config/locales/de.yml
index d62abed408f5d..2df0c2e3e536e 100644
--- a/decidim-templates/config/locales/de.yml
+++ b/decidim-templates/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/en.yml b/decidim-templates/config/locales/en.yml
index 5682ec36398b0..414dcf7bcb273 100644
--- a/decidim-templates/config/locales/en.yml
+++ b/decidim-templates/config/locales/en.yml
@@ -64,5 +64,11 @@ en:
             current_step: Step %{step}
             of_total_steps: of %{total_steps}
             tos_agreement: By participating you accept its Terms of Service
+      admin_log:
+        template:
+          create: "%{user_name} created the %{resource_name} questionnaire template"
+          delete: "%{user_name} deleted the %{resource_name} questionnaire template"
+          duplicate: "%{user_name} duplicated the %{resource_name} questionnaire template"
+          update: "%{user_name} updated the %{resource_name} questionnaire template"
       template_types:
         questionnaires: Questionnaires
diff --git a/decidim-templates/config/locales/es-MX.yml b/decidim-templates/config/locales/es-MX.yml
index f3b9302195c7b..10ac3ebf9a50f 100644
--- a/decidim-templates/config/locales/es-MX.yml
+++ b/decidim-templates/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es-MX:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios
diff --git a/decidim-templates/config/locales/es-PY.yml b/decidim-templates/config/locales/es-PY.yml
index 4f29c357ef5ee..b5b1f8feb91cd 100644
--- a/decidim-templates/config/locales/es-PY.yml
+++ b/decidim-templates/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es-PY:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios
diff --git a/decidim-templates/config/locales/es.yml b/decidim-templates/config/locales/es.yml
index 9d0a4124cdd95..d3f803957e634 100644
--- a/decidim-templates/config/locales/es.yml
+++ b/decidim-templates/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios
diff --git a/decidim-templates/config/locales/eu.yml b/decidim-templates/config/locales/eu.yml
index 22fe7143093b3..1fb9c10a7a65f 100644
--- a/decidim-templates/config/locales/eu.yml
+++ b/decidim-templates/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/fi-plain.yml b/decidim-templates/config/locales/fi-plain.yml
index ebec082bb8b52..2957039cbdd26 100644
--- a/decidim-templates/config/locales/fi-plain.yml
+++ b/decidim-templates/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fi-pl:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: Osallistumalla hyväksyt käyttöehdot
+      admin_log:
+        template:
+          create: "%{user_name} loi kyselymallin %{resource_name}"
+          delete: "%{user_name} poisti kyselymallin %{resource_name}"
+          duplicate: "%{user_name} kopioi kyselymallin %{resource_name}"
+          update: "%{user_name} päivitti kyselymallia %{resource_name}"
       template_types:
         questionnaires: Kyselyt
diff --git a/decidim-templates/config/locales/fi.yml b/decidim-templates/config/locales/fi.yml
index 018e4708c3c50..4b3489645198e 100644
--- a/decidim-templates/config/locales/fi.yml
+++ b/decidim-templates/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fi:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: Osallistumalla hyväksyt käyttöehdot
+      admin_log:
+        template:
+          create: "%{user_name} loi kyselymallin %{resource_name}"
+          delete: "%{user_name} poisti kyselymallin %{resource_name}"
+          duplicate: "%{user_name} kopioi kyselymallin %{resource_name}"
+          update: "%{user_name} päivitti kyselymallia %{resource_name}"
       template_types:
         questionnaires: Kyselyt
diff --git a/decidim-templates/config/locales/fr-CA.yml b/decidim-templates/config/locales/fr-CA.yml
index aaf898c49e2ff..a5a4b15297330 100644
--- a/decidim-templates/config/locales/fr-CA.yml
+++ b/decidim-templates/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fr-CA:
             current_step: Étape %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: En participant, vous acceptez ses conditions d'utilisation
+      admin_log:
+        template:
+          create: "%{user_name} a créé le modèle de questionnaire %{resource_name}"
+          delete: "%{user_name} a supprimé le modèle de questionnaire %{resource_name}"
+          duplicate: "%{user_name} a dupliqué le modèle de questionnaire %{resource_name}"
+          update: "%{user_name} a modifié le modèle de questionnaire %{resource_name}"
       template_types:
         questionnaires: Questionnaires
diff --git a/decidim-templates/config/locales/fr.yml b/decidim-templates/config/locales/fr.yml
index f2ef2af395953..6fa4637d43216 100644
--- a/decidim-templates/config/locales/fr.yml
+++ b/decidim-templates/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fr:
             current_step: Étape %{step}
             of_total_steps: sur %{total_steps}
             tos_agreement: En participant, vous acceptez ces conditions d'utilisation
+      admin_log:
+        template:
+          create: "%{user_name} a créé le modèle de questionnaire %{resource_name}"
+          delete: "%{user_name} a supprimé le modèle de questionnaire %{resource_name}"
+          duplicate: "%{user_name} a dupliqué le modèle de questionnaire %{resource_name}"
+          update: "%{user_name} a modifié le modèle de questionnaire %{resource_name}"
       template_types:
         questionnaires: Questionnaires
diff --git a/decidim-templates/config/locales/ga-IE.yml b/decidim-templates/config/locales/ga-IE.yml
index 66a51da15edb2..4935e34e56b95 100644
--- a/decidim-templates/config/locales/ga-IE.yml
+++ b/decidim-templates/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/gl.yml b/decidim-templates/config/locales/gl.yml
index 56229770574d5..86f1d8168a792 100644
--- a/decidim-templates/config/locales/gl.yml
+++ b/decidim-templates/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/hu.yml b/decidim-templates/config/locales/hu.yml
index 61aa68f88a3e2..c197c411c5f3e 100644
--- a/decidim-templates/config/locales/hu.yml
+++ b/decidim-templates/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -62,5 +63,11 @@ hu:
             current_step: Lépés %{step}
             of_total_steps: 'ennyiből: %{total_steps}'
             tos_agreement: A részvétellel elfogadja az �ltalános Szerződési Feltételeket
+      admin_log:
+        template:
+          create: "%{user_name} létrehozta a(z) %{resource_name} kérdőív sablont"
+          delete: "%{user_name} törölte a(z) %{resource_name} kérdőív sablont"
+          duplicate: "%{user_name} duplikálta a(z) %{resource_name} kérdőív sablont"
+          update: "%{user_name} frissítette a(z) %{resource_name} kérdőív sablont"
       template_types:
         questionnaires: Kérdőívek
diff --git a/decidim-templates/config/locales/it.yml b/decidim-templates/config/locales/it.yml
index 328763f2bb6d9..c70f2d7d018f4 100644
--- a/decidim-templates/config/locales/it.yml
+++ b/decidim-templates/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/ja.yml b/decidim-templates/config/locales/ja.yml
index 62402901cc4af..fdf8aa5a97cc3 100644
--- a/decidim-templates/config/locales/ja.yml
+++ b/decidim-templates/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ ja:
             current_step: ステップ %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: �加�る���より�利用�約������。
+      admin_log:
+        template:
+          create: "%{user_name} � %{resource_name} アンケートテンプレートを作�����"
+          delete: "%{user_name} � %{resource_name} アンケートテンプレートを削除����"
+          duplicate: "%{user_name} � %{resource_name} アンケートテンプレートを複製����"
+          update: "%{user_name} � %{resource_name} アンケートテンプレートを更新����"
       template_types:
         questionnaires: アンケート
diff --git a/decidim-templates/config/locales/ka-GE.yml b/decidim-templates/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-templates/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-templates/config/locales/lt.yml b/decidim-templates/config/locales/lt.yml
index 3032f62183654..eb3e39e6cf725 100644
--- a/decidim-templates/config/locales/lt.yml
+++ b/decidim-templates/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
@@ -62,5 +63,11 @@ lt:
             current_step: Žingsnis %{step}
             of_total_steps: iš%{total_steps}
             tos_agreement: Dalyvaudami sutinkate su paslaugos teikimo sÄ…lygomis
+      admin_log:
+        template:
+          create: "%{user_name} atnaujino %{resource_name} klausimyno Å¡ablonÄ…"
+          delete: "%{user_name} ištrynė %{resource_name} klausimyno šabloną"
+          duplicate: "%{user_name} dublikavo %{resource_name} klausimyno Å¡ablonÄ…"
+          update: "%{user_name} atnaujino %{resource_name} klausimyno Å¡ablonÄ…"
       template_types:
         questionnaires: Klausimynai
diff --git a/decidim-templates/config/locales/nl.yml b/decidim-templates/config/locales/nl.yml
index bc73be66ef68d..57ab8eb13271e 100644
--- a/decidim-templates/config/locales/nl.yml
+++ b/decidim-templates/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/no.yml b/decidim-templates/config/locales/no.yml
index 60dbbdfd5a8d1..0eb8fd83c9421 100644
--- a/decidim-templates/config/locales/no.yml
+++ b/decidim-templates/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/pl.yml b/decidim-templates/config/locales/pl.yml
index 0cad572fb1dc5..f154b3042b1ab 100644
--- a/decidim-templates/config/locales/pl.yml
+++ b/decidim-templates/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   decidim:
     admin:
diff --git a/decidim-templates/config/locales/pt-BR.yml b/decidim-templates/config/locales/pt-BR.yml
index 60277f2801d7f..c1af88cfd5b69 100644
--- a/decidim-templates/config/locales/pt-BR.yml
+++ b/decidim-templates/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/pt.yml b/decidim-templates/config/locales/pt.yml
index 93c0b3ac4fc60..b8733e2058c75 100644
--- a/decidim-templates/config/locales/pt.yml
+++ b/decidim-templates/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
diff --git a/decidim-templates/config/locales/ro-RO.yml b/decidim-templates/config/locales/ro-RO.yml
index d6a50f94ab9ff..fdab449b41b16 100644
--- a/decidim-templates/config/locales/ro-RO.yml
+++ b/decidim-templates/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ ro:
             current_step: Pasul %{step}
             of_total_steps: din %{total_steps}
             tos_agreement: Prin participare accepți Termenii și condițiile sale de utilizare
+      admin_log:
+        template:
+          create: "%{user_name} a creat șablonul chestionarului %{resource_name}"
+          delete: "%{user_name} a șters șablonul chestionarului %{resource_name}"
+          duplicate: "%{user_name} a duplicat șablonul chestionarului %{resource_name}"
+          update: "%{user_name} a actualizat șablonul chestionarului %{resource_name}"
       template_types:
         questionnaires: Chestionare
diff --git a/decidim-templates/config/locales/sv.yml b/decidim-templates/config/locales/sv.yml
index 71db39e30fb9d..85cdf49d819c8 100644
--- a/decidim-templates/config/locales/sv.yml
+++ b/decidim-templates/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -31,5 +32,6 @@ sv:
             save: Spara
           preview:
             current_step: Steg %{step} av
+            of_total_steps: av %{total_steps}
       template_types:
         questionnaires: Enkäter
diff --git a/decidim-templates/config/locales/tr-TR.yml b/decidim-templates/config/locales/tr-TR.yml
index 3cdaddb4bf9d4..b170870d8cd84 100644
--- a/decidim-templates/config/locales/tr-TR.yml
+++ b/decidim-templates/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   decidim:
     admin:
diff --git a/decidim-templates/config/locales/zh-CN.yml b/decidim-templates/config/locales/zh-CN.yml
index 24e6cfa0cf00e..7c834c936b58e 100644
--- a/decidim-templates/config/locales/zh-CN.yml
+++ b/decidim-templates/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   decidim:
     admin:
diff --git a/decidim-templates/db/seeds.rb b/decidim-templates/db/seeds.rb
index 3f3f1ed5621d1..596e913f92ce1 100644
--- a/decidim-templates/db/seeds.rb
+++ b/decidim-templates/db/seeds.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-templates...\n" unless Rails.env.test?
 
   require "decidim/faker/localized"
diff --git a/decidim-templates/decidim-templates.gemspec b/decidim-templates/decidim-templates.gemspec
index 49ef115894455..a806cd9a7c67e 100644
--- a/decidim-templates/decidim-templates.gemspec
+++ b/decidim-templates/decidim-templates.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["vrojman@protonmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim-module-templates"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim-templates"
   s.summary = "A decidim templates module"
diff --git a/decidim-templates/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb b/decidim-templates/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb
index cc17a9d774190..fa180e608c57b 100644
--- a/decidim-templates/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb
+++ b/decidim-templates/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb
@@ -9,7 +9,7 @@
     context "when there are no templates" do
       before do
         questionnaire.update_columns(
-          created_at: Time.zone.now - 1.day,
+          created_at: 1.day.ago,
           updated_at: Time.zone.now
         )
       end
@@ -27,7 +27,7 @@
       context "when it is an existing questionnaire" do
         before do
           questionnaire.update_columns(
-            created_at: Time.zone.now - 1.day,
+            created_at: 1.day.ago,
             updated_at: Time.zone.now
           )
         end
@@ -53,16 +53,17 @@
           expect(page).to have_content("Choose template")
         end
 
-        it "loads the last 5 templates in the select" do
-          page.find(".Select-control").click
+        it "loads the templates in the select" do
+          page.find("input[name='select-template']").click
 
-          within ".Select-menu" do
-            expect(page).to have_selector(".Select-option:not(.is-focused)", count: 5)
+          within "#template-list", visible: :hidden do
+            expect(page).to have_selector("option", visible: :hidden, count: 6)
           end
         end
 
         it "displays the preview when a template is selected" do
-          autocomplete_select template.name["en"], from: :questionnaire_template_id
+          select(template.name["en"], from: "select-template")
+
           within ".questionnaire-template-preview" do
             expect(page).to have_i18n_content(template.name)
             expect(page).to have_i18n_content(question.body)
@@ -88,7 +89,7 @@
       )
       visit questionnaire_edit_path
 
-      autocomplete_select template.name["en"], from: :questionnaire_template_id
+      select(template.name["en"], from: "select-template")
 
       within ".create-from-template" do
         find("*[type=submit]").click
diff --git a/decidim-templates/lib/decidim/templates/version.rb b/decidim-templates/lib/decidim/templates/version.rb
index 74e29749ee0dc..db5516b7015bd 100644
--- a/decidim-templates/lib/decidim/templates/version.rb
+++ b/decidim-templates/lib/decidim/templates/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-templates/spec/commands/decidim/templates/admin/copy_questionnaire_template_spec.rb b/decidim-templates/spec/commands/decidim/templates/admin/copy_questionnaire_template_spec.rb
index b2396672a5e68..538ead2cb948b 100644
--- a/decidim-templates/spec/commands/decidim/templates/admin/copy_questionnaire_template_spec.rb
+++ b/decidim-templates/spec/commands/decidim/templates/admin/copy_questionnaire_template_spec.rb
@@ -7,7 +7,9 @@ module Decidim
   module Templates
     module Admin
       describe CopyQuestionnaireTemplate do
-        let(:template) { create(:questionnaire_template) }
+        let(:organization) { create(:organization) }
+        let(:template) { create(:questionnaire_template, organization: organization) }
+        let(:user) { create(:user, organization: organization) }
 
         describe "when the template is invalid" do
           before do
@@ -15,13 +17,13 @@ module Admin
           end
 
           it "broadcasts invalid" do
-            expect { described_class.call(template) }.to broadcast(:invalid)
+            expect { described_class.call(template, user) }.to broadcast(:invalid)
           end
         end
 
         describe "when the template is valid" do
           let(:destination_questionnaire) do
-            events = described_class.call(template)
+            events = described_class.call(template, user)
             # events => { :ok => copied_template }
             expect(events).to have_key(:ok)
             events[:ok].templatable
@@ -33,6 +35,17 @@ module Admin
             expect(destination_questionnaire.tos).to eq(template.templatable.tos)
           end
 
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with("duplicate", Decidim::Templates::Template, user)
+              .and_call_original
+
+            expect { described_class.call(template, user) }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.version).to be_present
+          end
+
           context "when the questionnaire has all question types and display conditions" do
             let!(:template) { create(:questionnaire_template, :with_all_questions) }
 
diff --git a/decidim-templates/spec/commands/decidim/templates/admin/create_questionnaire_template_spec.rb b/decidim-templates/spec/commands/decidim/templates/admin/create_questionnaire_template_spec.rb
new file mode 100644
index 0000000000000..bccd213954472
--- /dev/null
+++ b/decidim-templates/spec/commands/decidim/templates/admin/create_questionnaire_template_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Templates
+    module Admin
+      describe CreateQuestionnaireTemplate do
+        subject { described_class.new(form) }
+
+        let(:organization) { create :organization }
+        let(:user) { create :user, :admin, :confirmed, organization: organization }
+
+        let(:form) do
+          instance_double(
+            TemplateForm,
+            invalid?: invalid,
+            valid?: !invalid,
+            current_user: user,
+            current_organization: organization,
+            name: "name",
+            description: "description"
+          )
+        end
+        let(:invalid) { false }
+
+        context "when the form is not valid" do
+          let(:invalid) { true }
+
+          it "is not valid" do
+            expect { subject.call }.to broadcast(:invalid)
+          end
+        end
+
+        context "when the form is valid" do
+          it "broadcasts ok" do
+            expect { subject.call }.to broadcast(:ok)
+          end
+
+          it "create a new template for the organization" do
+            expect { subject.call }.to change { Decidim::Templates::Template.all.count }.by(1)
+          end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::Templates::Template, user, {})
+              .and_call_original
+
+            expect { subject.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.version).to be_present
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-templates/spec/commands/decidim/templates/admin/destroy_template_spec.rb b/decidim-templates/spec/commands/decidim/templates/admin/destroy_template_spec.rb
new file mode 100644
index 0000000000000..d451bb1cfb300
--- /dev/null
+++ b/decidim-templates/spec/commands/decidim/templates/admin/destroy_template_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Templates
+    module Admin
+      describe DestroyTemplate do
+        subject { described_class.new(template, user) }
+
+        let(:organization) { create :organization }
+        let(:user) { create :user, :admin, :confirmed, organization: organization }
+        let(:template) { create :questionnaire_template, organization: organization }
+
+        it "broadcasts ok" do
+          expect { subject.call }.to broadcast(:ok)
+        end
+
+        it "destroy the template" do
+          subject.call
+          expect { template.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it "traces the action", versioning: true do
+          expect(Decidim.traceability)
+            .to receive(:perform_action!)
+            .with(:delete, template, user)
+            .and_call_original
+
+          expect { subject.call }.to change(Decidim::ActionLog, :count)
+          action_log = Decidim::ActionLog.last
+          expect(action_log.version).to be_present
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-templates/spec/commands/decidim/templates/admin/update_template_spec.rb b/decidim-templates/spec/commands/decidim/templates/admin/update_template_spec.rb
new file mode 100644
index 0000000000000..4be3a41b100fa
--- /dev/null
+++ b/decidim-templates/spec/commands/decidim/templates/admin/update_template_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Templates
+    module Admin
+      describe UpdateTemplate do
+        subject { described_class.new(template, form, user) }
+
+        let(:organization) { create :organization }
+        let(:user) { create :user, :admin, :confirmed, organization: organization }
+        let(:template) { create :questionnaire_template, organization: organization }
+        let(:name) { "test" }
+        let(:description) { "description" }
+
+        let(:form) do
+          instance_double(
+            TemplateForm,
+            invalid?: invalid,
+            valid?: !invalid,
+            current_user: user,
+            current_organization: organization,
+            name: name,
+            description: description
+          )
+        end
+        let(:invalid) { false }
+
+        context "when the form is not valid" do
+          let(:invalid) { true }
+
+          it "is not valid" do
+            expect { subject.call }.to broadcast(:invalid)
+          end
+        end
+
+        context "when the form is valid" do
+          it "broadcasts ok" do
+            expect { subject.call }.to broadcast(:ok)
+          end
+
+          it "update the template" do
+            subject.call
+            expect(template.name).to eq(name)
+            expect(template.description).to eq(description)
+          end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, template, user, {})
+              .and_call_original
+
+            expect { subject.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.version).to be_present
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-templates/spec/permissions/decidim/templates/admin/permissions_spec.rb b/decidim-templates/spec/permissions/decidim/templates/admin/permissions_spec.rb
index 2cb3186d1ac7b..6a4a0408ce676 100644
--- a/decidim-templates/spec/permissions/decidim/templates/admin/permissions_spec.rb
+++ b/decidim-templates/spec/permissions/decidim/templates/admin/permissions_spec.rb
@@ -12,7 +12,7 @@
       current_organization: create(:organization)
     }
   end
-  let(:permission_action) { Decidim::PermissionAction.new(action) }
+  let(:permission_action) { Decidim::PermissionAction.new(**action) }
 
   context "when scope is not admin" do
     let(:action) do
@@ -43,7 +43,7 @@
       { scope: scope, action: action, subject: subject }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 
   context "when indexing templates" do
@@ -75,6 +75,6 @@
       { scope: :admin, action: :foo, subject: :questionnaire }
     end
 
-    it { is_expected.to eq true }
+    it { is_expected.to be true }
   end
 end
diff --git a/decidim-verifications/README.md b/decidim-verifications/README.md
index 7c39b6f233607..92e3a48b48874 100644
--- a/decidim-verifications/README.md
+++ b/decidim-verifications/README.md
@@ -43,7 +43,7 @@ Decidim implements two type of authorization methods:
 
 * _Form authorizations_.
 
-  When your verification method is simple enough, you can use a `Rectify::Form`
+  When your verification method is simple enough, you can use a `Decidim::Form`
   to implement it. "Simple" here means that the authorization can be granted
   with the submission of a single form. For example, to validate a user against
   a census API you will need a form with some fields that your users will use to
@@ -150,7 +150,7 @@ Decidim::Verifications.register_workflow(:my_workflow) do |workflow|
 end
 ```
 
-The format of the options you can define is the standard for a virtus attribute,
+The format of the options you can define is the standard for a Decidim attribute,
 plus an additional `required` (true by default) option were you can choose
 whether the option is compulsory when configuring the workflow as a permission
 for an action or not.
diff --git a/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb b/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb
index 744433ced2165..8475fbd6a050d 100644
--- a/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/authorize_user.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to authorize a user with an authorization handler.
-    class AuthorizeUser < Rectify::Command
+    class AuthorizeUser < Decidim::Command
       # Public: Initializes the command.
       #
       # handler - An AuthorizationHandler object.
@@ -40,7 +40,7 @@ def notify_admins(conflict)
           event: "decidim.events.verifications.managed_user_error_event",
           event_class: Decidim::Verifications::ManagedUserErrorEvent,
           resource: conflict,
-          affected_users: Decidim::User.where(admin: true, organization: @organization)
+          affected_users: @organization.admins
         )
       end
 
diff --git a/decidim-verifications/app/commands/decidim/verifications/confirm_user_authorization.rb b/decidim-verifications/app/commands/decidim/verifications/confirm_user_authorization.rb
index 2769e3b40f550..43320816ff503 100644
--- a/decidim-verifications/app/commands/decidim/verifications/confirm_user_authorization.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/confirm_user_authorization.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to confirm a previous partial authorization.
-    class ConfirmUserAuthorization < Rectify::Command
+    class ConfirmUserAuthorization < Decidim::Command
       # Number of failed confirmation attempts before throttling.
       MAX_FAILED_ATTEMPTS = 2
 
diff --git a/decidim-verifications/app/commands/decidim/verifications/csv_census/admin/create_census_data.rb b/decidim-verifications/app/commands/decidim/verifications/csv_census/admin/create_census_data.rb
index a85e0e3b8d3ee..b1508935aea37 100644
--- a/decidim-verifications/app/commands/decidim/verifications/csv_census/admin/create_census_data.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/csv_census/admin/create_census_data.rb
@@ -6,7 +6,7 @@ module CsvCensus
       module Admin
         # A command with the business logic to create census data for a
         # organization.
-        class CreateCensusData < Rectify::Command
+        class CreateCensusData < Decidim::Command
           def initialize(form, organization)
             @form = form
             @organization = organization
@@ -20,8 +20,11 @@ def initialize(form, organization)
           def call
             return broadcast(:invalid) unless @form.file
 
+            data = @form.data
+            return broadcast(:invalid) unless data
+
             # rubocop:disable Rails/SkipsModelValidations
-            CsvDatum.insert_all(@organization, @form.data.values)
+            CsvDatum.insert_all(@organization, data.values)
             # rubocop:enable Rails/SkipsModelValidations
             RemoveDuplicatesJob.perform_later(@organization)
 
diff --git a/decidim-verifications/app/commands/decidim/verifications/destroy_user_authorization.rb b/decidim-verifications/app/commands/decidim/verifications/destroy_user_authorization.rb
index 541dc330e2681..9c90a11322193 100644
--- a/decidim-verifications/app/commands/decidim/verifications/destroy_user_authorization.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/destroy_user_authorization.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to Destroy the Authorization of a user.
-    class DestroyUserAuthorization < Rectify::Command
+    class DestroyUserAuthorization < Decidim::Command
       def initialize(authorization)
         @authorization = authorization
       end
diff --git a/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/confirm_user_offline_authorization.rb b/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/confirm_user_offline_authorization.rb
index ba9c2420313c9..50b2d78322008 100644
--- a/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/confirm_user_offline_authorization.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/confirm_user_offline_authorization.rb
@@ -5,7 +5,7 @@ module Verifications
     module IdDocuments
       module Admin
         # A command to confirm a previous partial offline authorization.
-        class ConfirmUserOfflineAuthorization < Rectify::Command
+        class ConfirmUserOfflineAuthorization < Decidim::Command
           # Public: Initializes the command.
           #
           # form - A form object with the verification data to confirm it.
diff --git a/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/update_config.rb b/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/update_config.rb
index 29ceda82c9af3..3b847934c293b 100644
--- a/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/update_config.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/id_documents/admin/update_config.rb
@@ -4,7 +4,7 @@ module Decidim
   module Verifications
     module IdDocuments
       module Admin
-        class UpdateConfig < Rectify::Command
+        class UpdateConfig < Decidim::Command
           def initialize(form)
             @form = form
           end
diff --git a/decidim-verifications/app/commands/decidim/verifications/perform_authorization_step.rb b/decidim-verifications/app/commands/decidim/verifications/perform_authorization_step.rb
index db86881499667..7622d360de91c 100644
--- a/decidim-verifications/app/commands/decidim/verifications/perform_authorization_step.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/perform_authorization_step.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to create a partial authorization for a user.
-    class PerformAuthorizationStep < Rectify::Command
+    class PerformAuthorizationStep < Decidim::Command
       # Public: Initializes the command.
       #
       # authorization - An Authorization object.
diff --git a/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb b/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
index d8454a512ed37..55101ef1536e4 100644
--- a/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/revoke_all_authorizations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to revoke authorizations
-    class RevokeAllAuthorizations < Rectify::Command
+    class RevokeAllAuthorizations < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - Organization object.
diff --git a/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb b/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
index 01cee99b5a3c5..3cd174b333b18 100644
--- a/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
+++ b/decidim-verifications/app/commands/decidim/verifications/revoke_by_condition_authorizations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # A command to revoke authorizations with filter
-    class RevokeByConditionAuthorizations < Rectify::Command
+    class RevokeByConditionAuthorizations < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - Organization object.
diff --git a/decidim-verifications/app/controllers/decidim/verifications/application_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/application_controller.rb
index a091f7286a644..d9a7aca7237d4 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/application_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/application_controller.rb
@@ -22,7 +22,7 @@ def renew
       private
 
       def confirmed_user
-        return true if !current_user || current_user && current_user.verifiable?
+        return true if !current_user || (current_user && current_user.verifiable?)
 
         redirect_back(
           fallback_location: root_path,
diff --git a/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
index 98b6f5495f4cd..a0e995f0c9673 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
@@ -71,9 +71,19 @@ def handler_name
       def valid_handler
         return true if handler
 
-        logger.warn "Invalid authorization handler given: #{handler_name} doesn't"\
-          "exist or you haven't added it to `Decidim.authorization_handlers`"
+        msg = <<-MSG
+        Invalid authorization handler given: #{handler_name} doesn't
+        exist or you haven't added it to `Decidim.authorization_handlers.
 
+        Make sure this name matches with your registrations:\n\n
+        Decidim::Verifications.register_workflow(:#{handler_name}) do
+          ...
+        end
+        MSG
+
+        raise msg if Rails.env.development?
+
+        logger.warn msg
         redirect_to(authorizations_path) && (return false)
       end
 
diff --git a/decidim-verifications/app/controllers/decidim/verifications/csv_census/admin/census_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/csv_census/admin/census_controller.rb
index b5d715fe8853a..6cbf7db531724 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/csv_census/admin/census_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/csv_census/admin/census_controller.rb
@@ -19,16 +19,18 @@ def index
           def create
             enforce_permission_to :create, :authorization
             @form = form(CensusDataForm).from_params(params)
+            @status = Status.new(current_organization)
             CreateCensusData.call(@form, current_organization) do
               on(:ok) do
                 flash[:notice] = t(".success", count: @form.data.values.count, errors: @form.data.errors.count)
+                redirect_to census_path
               end
 
               on(:invalid) do
                 flash[:alert] = t(".error")
+                render :index
               end
             end
-            redirect_to census_path
           end
 
           def destroy_all
diff --git a/decidim-verifications/app/controllers/decidim/verifications/id_documents/authorizations_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/id_documents/authorizations_controller.rb
index b904ecaa5f4c6..29c83a0313ccd 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/id_documents/authorizations_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/id_documents/authorizations_controller.rb
@@ -77,11 +77,9 @@ def update
 
         private
 
-        # rubocop:disable Naming/MemoizedInstanceVariableName
         def authorization
           @authorization_presenter ||= AuthorizationPresenter.new(@authorization)
         end
-        # rubocop:enable Naming/MemoizedInstanceVariableName
 
         def load_authorization
           @authorization = Decidim::Authorization.find_or_initialize_by(
diff --git a/decidim-verifications/app/controllers/decidim/verifications/postal_letter/authorizations_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/postal_letter/authorizations_controller.rb
index f444017d7bad9..3effa8eb8715e 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/postal_letter/authorizations_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/postal_letter/authorizations_controller.rb
@@ -60,11 +60,9 @@ def update
 
         private
 
-        # rubocop:disable Naming/MemoizedInstanceVariableName
         def authorization
           @authorization_presenter ||= AuthorizationPresenter.new(@authorization)
         end
-        # rubocop:enable Naming/MemoizedInstanceVariableName
 
         def load_authorization
           @authorization = Decidim::Authorization.find_or_initialize_by(
diff --git a/decidim-verifications/app/forms/decidim/verifications/csv_census/admin/census_data_form.rb b/decidim-verifications/app/forms/decidim/verifications/csv_census/admin/census_data_form.rb
index 92601a05694b2..ca3de3e076990 100644
--- a/decidim-verifications/app/forms/decidim/verifications/csv_census/admin/census_data_form.rb
+++ b/decidim-verifications/app/forms/decidim/verifications/csv_census/admin/census_data_form.rb
@@ -12,6 +12,10 @@ class CensusDataForm < Form
 
           def data
             CsvCensus::Data.new(file.path)
+          rescue CSV::MalformedCSVError
+            errors.add(:file, :malformed)
+
+            nil
           end
         end
       end
diff --git a/decidim-verifications/app/forms/decidim/verifications/id_documents/upload_form.rb b/decidim-verifications/app/forms/decidim/verifications/id_documents/upload_form.rb
index 227103f52cc69..ab20a5904651a 100644
--- a/decidim-verifications/app/forms/decidim/verifications/id_documents/upload_form.rb
+++ b/decidim-verifications/app/forms/decidim/verifications/id_documents/upload_form.rb
@@ -8,7 +8,7 @@ module IdDocuments
       class UploadForm < InformationForm
         mimic :id_document_upload
 
-        attribute :verification_attachment, String
+        attribute :verification_attachment
 
         validates :verification_attachment,
                   passthru: { to: Decidim::Authorization },
diff --git a/decidim-verifications/app/queries/decidim/verifications/authorizations.rb b/decidim-verifications/app/queries/decidim/verifications/authorizations.rb
index 15f0a447ad860..78787941f82b6 100644
--- a/decidim-verifications/app/queries/decidim/verifications/authorizations.rb
+++ b/decidim-verifications/app/queries/decidim/verifications/authorizations.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # Finds authorizations by different criteria
-    class Authorizations < Rectify::Query
+    class Authorizations < Decidim::Query
       # Initializes the class.
       #
       # @param organization [Organization] The organization where this authorization belongs to
diff --git a/decidim-verifications/app/queries/decidim/verifications/authorizations_before_date.rb b/decidim-verifications/app/queries/decidim/verifications/authorizations_before_date.rb
index 874cc3f0dfee9..6cabd87fe65e4 100644
--- a/decidim-verifications/app/queries/decidim/verifications/authorizations_before_date.rb
+++ b/decidim-verifications/app/queries/decidim/verifications/authorizations_before_date.rb
@@ -3,7 +3,7 @@
 module Decidim
   module Verifications
     # Finds authorizations by different criteria
-    class AuthorizationsBeforeDate < Rectify::Query
+    class AuthorizationsBeforeDate < Decidim::Query
       # Initializes the class.
       #
       # @param organization [Organization] The organization where this authorization belongs to
diff --git a/decidim-verifications/app/services/decidim/authorization_handler.rb b/decidim-verifications/app/services/decidim/authorization_handler.rb
index 35ce093d228a8..a598f05616b7d 100644
--- a/decidim-verifications/app/services/decidim/authorization_handler.rb
+++ b/decidim-verifications/app/services/decidim/authorization_handler.rb
@@ -29,12 +29,12 @@ def unique_id
       nil
     end
 
-    # THe attributes of the handler that should be exposed as form input when
+    # The attributes of the handler that should be exposed as form input when
     # rendering the handler in a form.
     #
     # Returns an Array of Strings.
     def form_attributes
-      attributes.except(:id, :user).keys
+      attributes.except("id", "user").keys
     end
 
     # The String partial path so Rails can render the handler as a form. This
diff --git a/decidim-verifications/app/views/decidim/verifications/csv_census/admin/census/index.html.erb b/decidim-verifications/app/views/decidim/verifications/csv_census/admin/census/index.html.erb
index d1eb72451edab..1c313ef642e43 100644
--- a/decidim-verifications/app/views/decidim/verifications/csv_census/admin/census/index.html.erb
+++ b/decidim-verifications/app/views/decidim/verifications/csv_census/admin/census/index.html.erb
@@ -34,9 +34,9 @@
     ...
     ...
     </pre>
-    <%= form_tag census_path, multipart: true, class: "form" do %>
-      <%= label_tag :name, t("admin.new.file", scope: "decidim.verifications.csv_census") %>
-      <%= file_field_tag :file %>
+    <%= decidim_form_for @form, url: census_path, multipart: true do |form| %>
+      <%= label_tag :file, t("admin.new.file", scope: "decidim.verifications.csv_census") %>
+      <%= form.file_field :file %>
       <%= submit_tag t("admin.new.submit", scope: "decidim.verifications.csv_census"), class: "button" %>
     <% end %>
   </div>
diff --git a/decidim-verifications/config/locales/ar.yml b/decidim-verifications/config/locales/ar.yml
index 29ada95a99720..8380dbae45c7b 100644
--- a/decidim-verifications/config/locales/ar.yml
+++ b/decidim-verifications/config/locales/ar.yml
@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -145,7 +146,7 @@ ar:
               verification_number: 'التحقق #%{n}'
           rejections:
             create:
-              success: تم ر�ض التحقق. ستتم مطالبة المشاركة بتعديل مستنداتها
+              success: تم ر�ض التحقق. ستتم مطالبة المشاركين بتعديل مستنداتها
         authorizations:
           choose:
             choose_a_type: 'الرجاء تحديد الطريقة التي تريد التحقق منها:'
diff --git a/decidim-verifications/config/locales/bg.yml b/decidim-verifications/config/locales/bg.yml
index 080b440550004..88bcfe13feb4f 100644
--- a/decidim-verifications/config/locales/bg.yml
+++ b/decidim-verifications/config/locales/bg.yml
@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/ca.yml b/decidim-verifications/config/locales/ca.yml
index 01a2fea0e48db..52c23b86d7fa6 100644
--- a/decidim-verifications/config/locales/ca.yml
+++ b/decidim-verifications/config/locales/ca.yml
@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ ca:
       postal_letter_postage:
         full_address: Adreça completa
         verification_code: Codi de verificació
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Arxiu d'importació mal formatat, si us plau, llegeix les instruccions curosament i assegura't que l'arxiu està codificat en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/cs.yml b/decidim-verifications/config/locales/cs.yml
index 6a19ecd378d28..1b2d78d621a85 100644
--- a/decidim-verifications/config/locales/cs.yml
+++ b/decidim-verifications/config/locales/cs.yml
@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ cs:
       postal_letter_postage:
         full_address: Celá poštovní adresa
         verification_code: Ověřovací kód
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Chybný importní soubor, pře�těte si pozorně pokyny a ujistěte se, že soubor je kódovaný UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/de.yml b/decidim-verifications/config/locales/de.yml
index bf56ccfadb9d8..b1bbd256a1949 100644
--- a/decidim-verifications/config/locales/de.yml
+++ b/decidim-verifications/config/locales/de.yml
@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/el.yml b/decidim-verifications/config/locales/el.yml
index 046c4e8ab67a4..ee01f5adb15a5 100644
--- a/decidim-verifications/config/locales/el.yml
+++ b/decidim-verifications/config/locales/el.yml
@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/en.yml b/decidim-verifications/config/locales/en.yml
index 908dfc52ce8e6..59c977ca8d6c9 100644
--- a/decidim-verifications/config/locales/en.yml
+++ b/decidim-verifications/config/locales/en.yml
@@ -24,6 +24,12 @@ en:
       postal_letter_postage:
         full_address: Full address
         verification_code: Verification code
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Malformed import file, please read through the instructions carefully and make sure the file is UTF-8 encoded.
   decidim:
     admin:
       menu:
@@ -192,7 +198,7 @@ en:
               verification_number: 'Verification #%{n}'
           rejections:
             create:
-              success: Verification rejected. Participant will be prompted to amend her documents
+              success: Verification rejected. Participant will be prompted to amend their documents
         authorizations:
           choose:
             choose_a_type: 'Please select how you want to be verified:'
diff --git a/decidim-verifications/config/locales/es-MX.yml b/decidim-verifications/config/locales/es-MX.yml
index 407bc80631ae5..78a62d425bcd6 100644
--- a/decidim-verifications/config/locales/es-MX.yml
+++ b/decidim-verifications/config/locales/es-MX.yml
@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ es-MX:
       postal_letter_postage:
         full_address: Dirección completa
         verification_code: Código de verificación
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/es-PY.yml b/decidim-verifications/config/locales/es-PY.yml
index 699cf72a89fd3..fb2dfd91ac742 100644
--- a/decidim-verifications/config/locales/es-PY.yml
+++ b/decidim-verifications/config/locales/es-PY.yml
@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ es-PY:
       postal_letter_postage:
         full_address: Dirección completa
         verification_code: Código de verificación
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/es.yml b/decidim-verifications/config/locales/es.yml
index 5e53c3ec46a78..821e8d41a5241 100644
--- a/decidim-verifications/config/locales/es.yml
+++ b/decidim-verifications/config/locales/es.yml
@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ es:
       postal_letter_postage:
         full_address: Dirección completa
         verification_code: Código de verificación
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Archivo de importación mal formateado, por favor lea las instrucciones cuidadosamente y asegúrese de que el archivo está codificado en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/eu.yml b/decidim-verifications/config/locales/eu.yml
index b84cc8bc7e1d6..f609afe1140c1 100644
--- a/decidim-verifications/config/locales/eu.yml
+++ b/decidim-verifications/config/locales/eu.yml
@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ eu:
       postal_letter_postage:
         full_address: Helbide osoa
         verification_code: Egiaztapen kodea
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Fitxategia akastuna da. Irakurri arretaz jarraibideak eta ziurtatu fitxategia UTF-8an kodifikatuta dagoela.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/fi-plain.yml b/decidim-verifications/config/locales/fi-plain.yml
index 10763f8fd4930..4569d774b5f6e 100644
--- a/decidim-verifications/config/locales/fi-plain.yml
+++ b/decidim-verifications/config/locales/fi-plain.yml
@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ fi-pl:
       postal_letter_postage:
         full_address: Koko osoite
         verification_code: Vahvistuskoodi
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/fi.yml b/decidim-verifications/config/locales/fi.yml
index af7061f12ef8c..2cff8ee5ebe2d 100644
--- a/decidim-verifications/config/locales/fi.yml
+++ b/decidim-verifications/config/locales/fi.yml
@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ fi:
       postal_letter_postage:
         full_address: Koko osoite
         verification_code: Vahvistuskoodi
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Virheellinen tuontitiedosto, lue ohjeet huolellisesti ja varmista, että tiedosto on UTF-8 muodossa.
   decidim:
     admin:
       menu:
@@ -191,7 +198,7 @@ fi:
               verification_number: 'Vahvistus #%{n}'
           rejections:
             create:
-              success: Vahvistus hylätty. Käyttäjää pyydetään muuttamaan asiakirjojaan
+              success: Vahvistus hylätty. Käyttäjää pyydetään päivittämään lataamiaan asiakirjoja
         authorizations:
           choose:
             choose_a_type: 'Valitse, kuinka haluat varmistaa henkilöllisyytesi:'
diff --git a/decidim-verifications/config/locales/fr-CA.yml b/decidim-verifications/config/locales/fr-CA.yml
index 9bb8e27c1b43c..4371ec2d0ed4e 100644
--- a/decidim-verifications/config/locales/fr-CA.yml
+++ b/decidim-verifications/config/locales/fr-CA.yml
@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ fr-CA:
       postal_letter_postage:
         full_address: Adresse complète
         verification_code: Code de vérification
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/fr.yml b/decidim-verifications/config/locales/fr.yml
index f2a06ad189ef6..27a444c7d883a 100644
--- a/decidim-verifications/config/locales/fr.yml
+++ b/decidim-verifications/config/locales/fr.yml
@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ fr:
       postal_letter_postage:
         full_address: Adresse complète
         verification_code: Code de vérification
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: Fichier d'importation mal formé, veuillez lire attentivement les instructions et assurez-vous que le fichier est encodé en UTF-8.
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/ga-IE.yml b/decidim-verifications/config/locales/ga-IE.yml
index abe9c047c0e3f..a8b500ab29c86 100644
--- a/decidim-verifications/config/locales/ga-IE.yml
+++ b/decidim-verifications/config/locales/ga-IE.yml
@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/gl.yml b/decidim-verifications/config/locales/gl.yml
index a0b136f8f2072..b937f46752e0f 100644
--- a/decidim-verifications/config/locales/gl.yml
+++ b/decidim-verifications/config/locales/gl.yml
@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/hu.yml b/decidim-verifications/config/locales/hu.yml
index 8ea8a0c846731..eed9dd4d22db0 100644
--- a/decidim-verifications/config/locales/hu.yml
+++ b/decidim-verifications/config/locales/hu.yml
@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/id-ID.yml b/decidim-verifications/config/locales/id-ID.yml
index 4cf6be11f8a32..545f34d72e459 100644
--- a/decidim-verifications/config/locales/id-ID.yml
+++ b/decidim-verifications/config/locales/id-ID.yml
@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/is-IS.yml b/decidim-verifications/config/locales/is-IS.yml
index be476da65973f..b7b9b5903840a 100644
--- a/decidim-verifications/config/locales/is-IS.yml
+++ b/decidim-verifications/config/locales/is-IS.yml
@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       id_document_information:
diff --git a/decidim-verifications/config/locales/it.yml b/decidim-verifications/config/locales/it.yml
index bfe3251ec2e78..ac5022f756b01 100644
--- a/decidim-verifications/config/locales/it.yml
+++ b/decidim-verifications/config/locales/it.yml
@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/ja.yml b/decidim-verifications/config/locales/ja.yml
index 75ffd2b1cd4d7..9e751db5d8025 100644
--- a/decidim-verifications/config/locales/ja.yml
+++ b/decidim-verifications/config/locales/ja.yml
@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -23,6 +24,12 @@ ja:
       postal_letter_postage:
         full_address: フルアドレス
         verification_code: 確�コード
+    errors:
+      models:
+        census_data:
+          attributes:
+            file:
+              malformed: イン�ートファイル�形��正���り��ん。手順を見直���ファイル�UTF-8�エンコード�れ��る��を確�������。
   decidim:
     admin:
       menu:
diff --git a/decidim-verifications/config/locales/ka-GE.yml b/decidim-verifications/config/locales/ka-GE.yml
new file mode 100644
index 0000000000000..57a95cb04703c
--- /dev/null
+++ b/decidim-verifications/config/locales/ka-GE.yml
@@ -0,0 +1 @@
+ka:
diff --git a/decidim-verifications/config/locales/lb.yml b/decidim-verifications/config/locales/lb.yml
index a86128179c188..2cb82ed2fd6e7 100644
--- a/decidim-verifications/config/locales/lb.yml
+++ b/decidim-verifications/config/locales/lb.yml
@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/lt.yml b/decidim-verifications/config/locales/lt.yml
index 5196bcc42effd..397f8dcaff134 100644
--- a/decidim-verifications/config/locales/lt.yml
+++ b/decidim-verifications/config/locales/lt.yml
@@ -1,3 +1,4 @@
+---
 lt:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/lv.yml b/decidim-verifications/config/locales/lv.yml
index 7292ba7f4c95d..d484619c1d25c 100644
--- a/decidim-verifications/config/locales/lv.yml
+++ b/decidim-verifications/config/locales/lv.yml
@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/nl.yml b/decidim-verifications/config/locales/nl.yml
index cfd81ae625f43..8d3443053d6e2 100644
--- a/decidim-verifications/config/locales/nl.yml
+++ b/decidim-verifications/config/locales/nl.yml
@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -184,7 +185,7 @@ nl:
               verification_number: 'Verificatie # %{n}'
           rejections:
             create:
-              success: Verificatie geweigerd. De deelnemer wordt gevraagd om haar documenten te wijzigen
+              success: Verificatie geweigerd. De deelnemer wordt gevraagd om zijn/haar documenten te wijzigen
         authorizations:
           choose:
             choose_a_type: 'Selecteer alstublieft hoe u wilt worden geverifieerd:'
diff --git a/decidim-verifications/config/locales/no.yml b/decidim-verifications/config/locales/no.yml
index 5acd5ae2981e0..f1ebee0f8c319 100644
--- a/decidim-verifications/config/locales/no.yml
+++ b/decidim-verifications/config/locales/no.yml
@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/pl.yml b/decidim-verifications/config/locales/pl.yml
index 25f0836cfd45f..97481ff85a78d 100644
--- a/decidim-verifications/config/locales/pl.yml
+++ b/decidim-verifications/config/locales/pl.yml
@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/pt-BR.yml b/decidim-verifications/config/locales/pt-BR.yml
index ef6a4b6107682..7fd94c2c35804 100644
--- a/decidim-verifications/config/locales/pt-BR.yml
+++ b/decidim-verifications/config/locales/pt-BR.yml
@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/pt.yml b/decidim-verifications/config/locales/pt.yml
index d7d5dfc090f2d..0584cf60b4d56 100644
--- a/decidim-verifications/config/locales/pt.yml
+++ b/decidim-verifications/config/locales/pt.yml
@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/ro-RO.yml b/decidim-verifications/config/locales/ro-RO.yml
index 33f388bdde885..a12d490bc1318 100644
--- a/decidim-verifications/config/locales/ro-RO.yml
+++ b/decidim-verifications/config/locales/ro-RO.yml
@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/ru.yml b/decidim-verifications/config/locales/ru.yml
index 969906a4b9d14..53b086e7992ab 100644
--- a/decidim-verifications/config/locales/ru.yml
+++ b/decidim-verifications/config/locales/ru.yml
@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/sk.yml b/decidim-verifications/config/locales/sk.yml
index 2aeca83b278fa..3d109c80f2dc9 100644
--- a/decidim-verifications/config/locales/sk.yml
+++ b/decidim-verifications/config/locales/sk.yml
@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/sl.yml b/decidim-verifications/config/locales/sl.yml
index c9430e8728686..84968e4d26900 100644
--- a/decidim-verifications/config/locales/sl.yml
+++ b/decidim-verifications/config/locales/sl.yml
@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/sv.yml b/decidim-verifications/config/locales/sv.yml
index d3a28e35a5617..1ab1d40e9e84b 100644
--- a/decidim-verifications/config/locales/sv.yml
+++ b/decidim-verifications/config/locales/sv.yml
@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/tr-TR.yml b/decidim-verifications/config/locales/tr-TR.yml
index 6adc71ceacd76..893415c49d3b3 100644
--- a/decidim-verifications/config/locales/tr-TR.yml
+++ b/decidim-verifications/config/locales/tr-TR.yml
@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/uk.yml b/decidim-verifications/config/locales/uk.yml
index 242940955fcaa..79ee5630f4040 100644
--- a/decidim-verifications/config/locales/uk.yml
+++ b/decidim-verifications/config/locales/uk.yml
@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
diff --git a/decidim-verifications/config/locales/zh-CN.yml b/decidim-verifications/config/locales/zh-CN.yml
index 7732e473877ba..c8b43fe2b63b8 100644
--- a/decidim-verifications/config/locales/zh-CN.yml
+++ b/decidim-verifications/config/locales/zh-CN.yml
@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
diff --git a/decidim-verifications/decidim-verifications.gemspec b/decidim-verifications/decidim-verifications.gemspec
index f41d9a291e8f2..9c33e671599fa 100644
--- a/decidim-verifications/decidim-verifications.gemspec
+++ b/decidim-verifications/decidim-verifications.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors = ["David Rodriguez"]
   s.email = ["deivid.rodriguez@riseup.net"]
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.summary = "Decidim verifications module"
   s.description = "Several verification methods for your decidim instance"
diff --git a/decidim-verifications/lib/decidim/verifications/sms/example_gateway.rb b/decidim-verifications/lib/decidim/verifications/sms/example_gateway.rb
index 6cb98aacc880d..931b408ee629b 100644
--- a/decidim-verifications/lib/decidim/verifications/sms/example_gateway.rb
+++ b/decidim-verifications/lib/decidim/verifications/sms/example_gateway.rb
@@ -12,7 +12,7 @@ def initialize(mobile_phone_number, code)
         end
 
         def deliver_code
-          Rails.logger.debug("Example SMS gateway service, verification code is: #{code}, should have been delivered to #{mobile_phone_number}")
+          Rails.logger.debug { "Example SMS gateway service, verification code is: #{code}, should have been delivered to #{mobile_phone_number}" }
           true
         end
       end
diff --git a/decidim-verifications/lib/decidim/verifications/version.rb b/decidim-verifications/lib/decidim/verifications/version.rb
index 04c10bad66cce..61977fe68dc0e 100644
--- a/decidim-verifications/lib/decidim/verifications/version.rb
+++ b/decidim-verifications/lib/decidim/verifications/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-verifications version.
   module Verifications
     def self.version
-      "0.26.4"
+      "0.27.2"
     end
   end
 end
diff --git a/decidim-verifications/lib/decidim/verifications/workflow_manifest.rb b/decidim-verifications/lib/decidim/verifications/workflow_manifest.rb
index 7e9420818e8c5..c74f43e38fe61 100644
--- a/decidim-verifications/lib/decidim/verifications/workflow_manifest.rb
+++ b/decidim-verifications/lib/decidim/verifications/workflow_manifest.rb
@@ -10,7 +10,7 @@ module Verifications
     # This class serves as a DSL to declaratively specify a verification method.
     #
     # To define a direct verification method, you need to specify the `form`
-    # attribute as a `Rectify::Form` that will be valid if the authorization is
+    # attribute as a `Decidim::Form` that will be valid if the authorization is
     # valid.
     #
     # To define a deferred verification method, you need specify the `engine`
@@ -27,10 +27,10 @@ module Verifications
     #
     class WorkflowManifest
       include ActiveModel::Model
-      include Virtus.model
+      include Decidim::AttributeObject::Model
 
-      attribute :engine, Rails::Engine
-      attribute :admin_engine, Rails::Engine
+      attribute :engine, Rails::Engine, **{}
+      attribute :admin_engine, Rails::Engine, **{}
       attribute :form, String
       attribute :expires_in, ActiveSupport::Duration, default: 0.minutes
       attribute :action_authorizer, String
@@ -62,8 +62,8 @@ def description
       end
 
       def action_authorizer_class
-        if @action_authorizer.present?
-          @action_authorizer.constantize
+        if action_authorizer.present?
+          action_authorizer.constantize
         else
           DefaultActionAuthorizer
         end
diff --git a/decidim-verifications/spec/commands/decidim/verifications/authorize_user_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/authorize_user_spec.rb
index 0477679378acf..d3d8a07c4160c 100644
--- a/decidim-verifications/spec/commands/decidim/verifications/authorize_user_spec.rb
+++ b/decidim-verifications/spec/commands/decidim/verifications/authorize_user_spec.rb
@@ -20,7 +20,7 @@ module Decidim::Verifications
 
     context "when the form is not authorized" do
       before do
-        expect(handler).to receive(:valid?).and_return(false)
+        allow(handler).to receive(:valid?).and_return(false)
       end
 
       it "is not valid" do
@@ -66,7 +66,7 @@ module Decidim::Verifications
         end
 
         it "is invalid if there's another authorization with the same id" do
-          expect { subject.call }.to change(authorizations, :count).by(0)
+          expect { subject.call }.not_to change(authorizations, :count)
         end
       end
     end
diff --git a/decidim-verifications/spec/commands/decidim/verifications/csv_census/admin/create_census_data_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/csv_census/admin/create_census_data_spec.rb
new file mode 100644
index 0000000000000..8b7e0734f06c0
--- /dev/null
+++ b/decidim-verifications/spec/commands/decidim/verifications/csv_census/admin/create_census_data_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Verifications::CsvCensus::Admin
+  describe CreateCensusData do
+    subject { described_class.new(form, organization) }
+
+    let(:form) { CensusDataForm.new(file: file) }
+    let(:organization) { create(:organization) }
+
+    context "when the file is in invalid format" do
+      let(:file) { Decidim::Dev.test_file("import_participatory_space_private_users_iso8859-1.csv", "text/csv") }
+
+      it "is not valid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/spec/commands/decidim/verifications/id_documents/admin/update_config_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/id_documents/admin/update_config_spec.rb
index 1647871443802..b9fd0d76eb8ee 100644
--- a/decidim-verifications/spec/commands/decidim/verifications/id_documents/admin/update_config_spec.rb
+++ b/decidim-verifications/spec/commands/decidim/verifications/id_documents/admin/update_config_spec.rb
@@ -21,7 +21,7 @@ module Decidim::Verifications::IdDocuments::Admin
 
     context "when the form is not authorized" do
       before do
-        expect(form).to receive(:valid?).and_return(false)
+        allow(form).to receive(:valid?).and_return(false)
       end
 
       it "is not valid" do
diff --git a/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb b/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
index ac7118001bc61..88d984ef8f354 100644
--- a/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
+++ b/decidim-verifications/spec/commands/decidim/verifications/revoke_all_authorizations_spec.rb
@@ -46,7 +46,7 @@ module Decidim::Verifications
 
     describe "When creating a revoke all authorizations command" do
       context "with organization not set" do
-        let(:subject) { described_class.new(nil, current_user) }
+        subject { described_class.new(nil, current_user) }
 
         it "is not valid" do
           expect { subject.call }.to broadcast(:invalid)
diff --git a/decidim-verifications/spec/events/decidim/verifications/managed_user_error_event_spec.rb b/decidim-verifications/spec/events/decidim/verifications/managed_user_error_event_spec.rb
index 480cd64a0f545..10ae10dd6c03f 100644
--- a/decidim-verifications/spec/events/decidim/verifications/managed_user_error_event_spec.rb
+++ b/decidim-verifications/spec/events/decidim/verifications/managed_user_error_event_spec.rb
@@ -7,7 +7,7 @@
 
   let(:event_name) { "decidim.events.verifications.managed_user_error_event" }
   let(:resource) { create :conflict }
-  let(:organization_host) { resource.current_user.organization.host }
+  let(:organization_host) { "#{resource.current_user.organization.host}:#{Capybara.server_port}" }
 
   describe "resource_title" do
     it "is generated correctly" do
diff --git a/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb b/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb
new file mode 100644
index 0000000000000..26dc6f4ba2675
--- /dev/null
+++ b/decidim-verifications/spec/forms/decidim/verifications/csv_census/admin/census_data_form_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Verifications::CsvCensus::Admin
+  describe CensusDataForm do
+    subject { described_class.from_params(file: file) }
+
+    describe "#data" do
+      context "when the file is in invalid format" do
+        let(:file) { Decidim::Dev.test_file("import_participatory_space_private_users_iso8859-1.csv", "text/csv") }
+
+        it { is_expected.not_to be_nil }
+      end
+    end
+  end
+end
diff --git a/decidim-verifications/spec/lib/decidim/verifications/adapter_spec.rb b/decidim-verifications/spec/lib/decidim/verifications/adapter_spec.rb
index 7ee64c894f971..d46f38cd3f4b5 100644
--- a/decidim-verifications/spec/lib/decidim/verifications/adapter_spec.rb
+++ b/decidim-verifications/spec/lib/decidim/verifications/adapter_spec.rb
@@ -54,7 +54,7 @@
 
     context "when the main engine is not defined" do
       it "raises a MissingEngine error" do
-        expect(wrapper).to receive(:respond_to?).with("decidim_#{handler}").and_return(false)
+        allow(wrapper).to receive(:respond_to?).with("decidim_#{handler}").and_return(false)
 
         expect { wrapper.resume_authorization_path }.to raise_error(
           Decidim::Verifications::MissingEngine
@@ -93,7 +93,7 @@
 
     context "when the main engine is not defined" do
       it "raises a MissingEngine error" do
-        expect(wrapper).to receive(:respond_to?).with("decidim_#{handler}").and_return(false)
+        allow(wrapper).to receive(:respond_to?).with("decidim_#{handler}").and_return(false)
 
         expect { wrapper.renew_path }.to raise_error(
           Decidim::Verifications::MissingEngine
diff --git a/decidim-verifications/spec/queries/decidim/verifications/authorizations_before_date_spec.rb b/decidim-verifications/spec/queries/decidim/verifications/authorizations_before_date_spec.rb
index 485a35bbdd2ab..3371af7f9d309 100644
--- a/decidim-verifications/spec/queries/decidim/verifications/authorizations_before_date_spec.rb
+++ b/decidim-verifications/spec/queries/decidim/verifications/authorizations_before_date_spec.rb
@@ -60,7 +60,7 @@
   end
 
   shared_examples_for "a correct usage of the query" do
-    subject { described_class.new(parameters).query }
+    subject { described_class.new(**parameters).query }
 
     it { is_expected.to match_array(expectation) }
     it { is_expected.not_to include(external_organization_authorization) }
@@ -220,22 +220,4 @@
       end
     end
   end
-
-  describe "when granted only, not impersonated" do
-    it_behaves_like "a correct usage of the query" do
-      let(:parameters) do
-        { organization: organization, date: prev_month, granted: true }
-      end
-
-      let(:expectation) do
-        [
-          granted_now,
-          granted_prev_week,
-          granted_prev_month,
-          granted_prev_year,
-          granted_managed
-        ]
-      end
-    end
-  end
 end
diff --git a/decidim-verifications/spec/queries/decidim/verifications/authorizations_spec.rb b/decidim-verifications/spec/queries/decidim/verifications/authorizations_spec.rb
index ba3ebf25f0130..4e66a5214a991 100644
--- a/decidim-verifications/spec/queries/decidim/verifications/authorizations_spec.rb
+++ b/decidim-verifications/spec/queries/decidim/verifications/authorizations_spec.rb
@@ -42,7 +42,7 @@
   end
 
   shared_examples_for "a correct usage of the query" do
-    subject { described_class.new(parameters).query }
+    subject { described_class.new(**parameters).query }
 
     it { is_expected.to match_array(expectation) }
     it { is_expected.not_to include(external_organization_authorization) }
diff --git a/decidim-verifications/spec/services/decidim/authorization_handler_spec.rb b/decidim-verifications/spec/services/decidim/authorization_handler_spec.rb
index 5c16878690021..2106e6a537f42 100644
--- a/decidim-verifications/spec/services/decidim/authorization_handler_spec.rb
+++ b/decidim-verifications/spec/services/decidim/authorization_handler_spec.rb
@@ -10,7 +10,7 @@ module Decidim
     describe "form_attributes" do
       subject { handler.form_attributes }
 
-      it { is_expected.to match_array([:handler_name]) }
+      it { is_expected.to match_array(["handler_name"]) }
       it { is_expected.not_to match_array([:id, :user]) }
     end
 
@@ -47,21 +47,21 @@ module Decidim
       context "when the handler does not exist" do
         let(:name) { "decidim/foo" }
 
-        it { is_expected.to eq(nil) }
+        it { is_expected.to be_nil }
       end
 
       context "when the handler exists" do
         context "when the handler is not valid" do
           let(:name) { "decidim/authorization_handler" }
 
-          it { is_expected.to eq(nil) }
+          it { is_expected.to be_nil }
         end
 
         context "when the handler is valid" do
           let(:name) { "dummy_authorization_handler" }
 
           context "when the handler is not configured", with_authorization_workflows: [] do
-            it { is_expected.to eq(nil) }
+            it { is_expected.to be_nil }
           end
 
           context "when the handler is configured" do
diff --git a/decidim-verifications/spec/system/action_authorization_spec.rb b/decidim-verifications/spec/system/action_authorization_spec.rb
index bb65253dfcaf2..b28af8a953bc8 100644
--- a/decidim-verifications/spec/system/action_authorization_spec.rb
+++ b/decidim-verifications/spec/system/action_authorization_spec.rb
@@ -33,7 +33,7 @@
 
     context "and action authorized" do
       let(:permissions) do
-        { create: { authorization_handlers: { "dummy_authorization_handler": {} } } }
+        { create: { authorization_handlers: { dummy_authorization_handler: {} } } }
       end
 
       before do
@@ -67,7 +67,7 @@
         {
           create: {
             authorization_handlers: {
-              "dummy_authorization_handler": {
+              dummy_authorization_handler: {
                 options: {
                   allowed_postal_codes: "1234, 4567",
                   allowed_scope_id: scope.id
@@ -107,7 +107,7 @@
                                  metadata: { postal_code: "1234", scope_id: other_scope.id })
         end
 
-        it "prompts user to check her authorization status" do
+        it "prompts user to check their authorization status" do
           click_link "New proposal"
 
           expect(page).to have_content("Not authorized")
@@ -127,7 +127,7 @@
         context "when the postal code is missing" do
           let(:postal_code) { "" }
 
-          it "prompts user to check her authorization status" do
+          it "prompts user to check their authorization status" do
             click_link "New proposal"
 
             expect(page).to have_content("Not authorized")
@@ -140,7 +140,7 @@
         context "when the scope is missing" do
           let(:user_scope) { nil }
 
-          it "prompts user to check her authorization status" do
+          it "prompts user to check their authorization status" do
             click_link "New proposal"
 
             expect(page).to have_content("Not authorized")
@@ -151,9 +151,9 @@
 
         context "when the scope and postal code is missing" do
           let(:user_scope) { nil }
-          let(:postal_code) {}
+          let(:postal_code) { nil }
 
-          it "prompts user to check her authorization status" do
+          it "prompts user to check their authorization status" do
             click_link "New proposal"
 
             expect(page).to have_content("Not authorized")
@@ -167,7 +167,7 @@
 
     context "and action authorized and authorization expired" do
       let(:permissions) do
-        { create: { authorization_handlers: { "dummy_authorization_handler": {} } } }
+        { create: { authorization_handlers: { dummy_authorization_handler: {} } } }
       end
 
       before do
@@ -176,7 +176,7 @@
         click_link "New proposal"
       end
 
-      it "prompts user to check her authorization status" do
+      it "prompts user to check their authorization status" do
         expect(page).to have_content("Authorization required")
         expect(page)
           .to have_content("Your authorization has expired. In order to perform this action, you need to be reauthorized with \"Example authorization\"")
@@ -208,7 +208,7 @@
 
     context "and action authorized" do
       let(:permissions) do
-        { create: { authorization_handlers: { "dummy_authorization_workflow": {} } } }
+        { create: { authorization_handlers: { dummy_authorization_workflow: {} } } }
       end
 
       before do
@@ -230,7 +230,7 @@
 
     context "and action authorized and authorization already started" do
       let(:permissions) do
-        { create: { authorization_handlers: { "dummy_authorization_workflow": {} } } }
+        { create: { authorization_handlers: { dummy_authorization_workflow: {} } } }
       end
 
       before do
@@ -239,7 +239,7 @@
         click_link "New proposal"
       end
 
-      it "prompts user to check her authorization status" do
+      it "prompts user to check their authorization status" do
         expect(page).to have_content("Authorization is still in progress")
         expect(page)
           .to have_content("In order to perform this action, you need to be authorized with \"Dummy authorization workflow\", but your authorization is still in progress")
@@ -254,7 +254,7 @@
 
     context "and action authorized and authorization expired" do
       let(:permissions) do
-        { create: { authorization_handlers: { "dummy_authorization_workflow": {} } } }
+        { create: { authorization_handlers: { dummy_authorization_workflow: {} } } }
       end
 
       before do
@@ -263,7 +263,7 @@
         click_link "New proposal"
       end
 
-      it "prompts user to check her authorization status" do
+      it "prompts user to check their authorization status" do
         expect(page).to have_content("Authorization required")
         expect(page)
           .to have_content("Your authorization has expired. In order to perform this action, you need to be reauthorized with \"Dummy authorization workflow\"")
diff --git a/decidim-verifications/spec/system/authorizations_spec.rb b/decidim-verifications/spec/system/authorizations_spec.rb
index 988840b33242e..2c7276ff663a8 100644
--- a/decidim-verifications/spec/system/authorizations_spec.rb
+++ b/decidim-verifications/spec/system/authorizations_spec.rb
@@ -21,7 +21,7 @@
 
         within "form.new_user" do
           fill_in :session_user_email, with: user.email
-          fill_in :session_user_password, with: "decidim123456"
+          fill_in :session_user_password, with: "decidim123456789"
           find("*[type=submit]").click
         end
       end
@@ -51,7 +51,7 @@
 
         within "form.new_user" do
           fill_in :session_user_email, with: user.email
-          fill_in :session_user_password, with: "decidim123456"
+          fill_in :session_user_password, with: "decidim123456789"
           find("*[type=submit]").click
         end
       end
@@ -62,7 +62,7 @@
     end
   end
 
-  context "when existing user from her account" do
+  context "when existing user from their account" do
     let(:organization) { create :organization, available_authorizations: authorizations }
     let(:user) { create(:user, :confirmed, organization: organization) }
 
diff --git a/decidim-verifications/spec/system/id_documents/id_document_offline_request_spec.rb b/decidim-verifications/spec/system/id_documents/id_document_offline_request_spec.rb
index 38977910ddf1b..8e1c378898136 100644
--- a/decidim-verifications/spec/system/id_documents/id_document_offline_request_spec.rb
+++ b/decidim-verifications/spec/system/id_documents/id_document_offline_request_spec.rb
@@ -25,7 +25,7 @@
     expect(page).to have_content("This is my explanation text")
   end
 
-  it "allows the user fill in her identity document" do
+  it "allows the user fill in their identity document" do
     submit_upload_form(
       doc_type: "DNI",
       doc_number: "XXXXXXXX"
diff --git a/decidim-verifications/spec/system/id_documents/id_document_online_review_spec.rb b/decidim-verifications/spec/system/id_documents/id_document_online_review_spec.rb
index 0e38bb8e6ad6f..c9f21a4c57060 100644
--- a/decidim-verifications/spec/system/id_documents/id_document_online_review_spec.rb
+++ b/decidim-verifications/spec/system/id_documents/id_document_online_review_spec.rb
@@ -52,7 +52,7 @@
     before { click_link "Reject" }
 
     it "dismisses the verification from the list" do
-      expect(page).to have_content("Verification rejected. Participant will be prompted to amend her documents")
+      expect(page).to have_content("Verification rejected. Participant will be prompted to amend their documents")
       expect(page).to have_no_content("Verification #")
     end
 
@@ -103,7 +103,7 @@ def submit_verification_form(doc_type:, doc_number:)
   def submit_reupload_form(doc_type:, doc_number:, file_name:)
     select doc_type, from: "Type of your document"
     fill_in "Document number (with letter)", with: doc_number
-    attach_file "Scanned copy of your document", Decidim::Dev.asset(file_name)
+    dynamically_attach_file(:id_document_upload_verification_attachment, Decidim::Dev.asset(file_name))
 
     click_button "Request verification again"
   end
diff --git a/decidim-verifications/spec/system/id_documents/id_document_online_upload_spec.rb b/decidim-verifications/spec/system/id_documents/id_document_online_upload_spec.rb
index c13da1fa2d4db..01c6f626a1492 100644
--- a/decidim-verifications/spec/system/id_documents/id_document_online_upload_spec.rb
+++ b/decidim-verifications/spec/system/id_documents/id_document_online_upload_spec.rb
@@ -19,7 +19,7 @@
     expect(page).to have_content("Upload your identity document")
   end
 
-  it "allows the user to upload her identity document" do
+  it "allows the user to upload their identity document" do
     submit_upload_form(
       doc_type: "DNI",
       doc_number: "XXXXXXXX",
@@ -44,7 +44,7 @@
   def submit_upload_form(doc_type:, doc_number:, file_name:)
     select doc_type, from: "Type of your document"
     fill_in "Document number (with letter)", with: doc_number
-    attach_file "Scanned copy of your document", Decidim::Dev.asset(file_name)
+    dynamically_attach_file(:id_document_upload_verification_attachment, Decidim::Dev.asset(file_name)) if file_name
 
     click_button "Request verification"
   end
diff --git a/decidim-verifications/spec/system/id_documents/id_document_request_edition_spec.rb b/decidim-verifications/spec/system/id_documents/id_document_request_edition_spec.rb
index d4f8bf8c09277..69438a71588c8 100644
--- a/decidim-verifications/spec/system/id_documents/id_document_request_edition_spec.rb
+++ b/decidim-verifications/spec/system/id_documents/id_document_request_edition_spec.rb
@@ -43,7 +43,8 @@
       submit_upload_form(
         doc_type: "DNI",
         doc_number: "XXXXXXXY",
-        file_name: "dni.jpg"
+        file_name: "dni.jpg",
+        remove_before: true
       )
       expect(page).to have_content("Document successfully reuploaded")
       authorization.reload
@@ -100,7 +101,8 @@
         submit_upload_form(
           doc_type: "DNI",
           doc_number: "XXXXXXXY",
-          file_name: "dni.jpg"
+          file_name: "dni.jpg",
+          remove_before: true
         )
 
         expect(page).to have_content("Document successfully reuploaded")
@@ -135,10 +137,11 @@
 
   private
 
-  def submit_upload_form(doc_type:, doc_number:, file_name: nil)
+  def submit_upload_form(doc_type:, doc_number:, file_name: nil, remove_before: false)
     select doc_type, from: "Type of your document"
     fill_in "Document number (with letter)", with: doc_number
-    attach_file "Scanned copy of your document", Decidim::Dev.asset(file_name) if file_name
+    options = { remove_before: remove_before }
+    dynamically_attach_file(:id_document_upload_verification_attachment, Decidim::Dev.asset(file_name), options) if file_name
 
     click_button "Request verification again"
   end
diff --git a/decidim-verifications/spec/system/revocation_auths_spec.rb b/decidim-verifications/spec/system/revocation_auths_spec.rb
index f64cba26c7683..75f4d264cc2bf 100644
--- a/decidim-verifications/spec/system/revocation_auths_spec.rb
+++ b/decidim-verifications/spec/system/revocation_auths_spec.rb
@@ -60,13 +60,13 @@
         end
       end
 
-      it "allows the user to see Verification's revocation menu. Revoke all option " do
+      it "allows the user to see Verification's revocation menu. Revoke all option" do
         within ".container" do
           expect(page).to have_content(t("decidim.admin.menu.authorization_revocation.button"))
         end
       end
 
-      it "allows the user to see Verification's revocation menu. Before date option " do
+      it "allows the user to see Verification's revocation menu. Before date option" do
         within ".container" do
           expect(page).to have_content(t("decidim.admin.menu.authorization_revocation.before_date_info"))
           expect(page).to have_content(t("decidim.admin.menu.authorization_revocation.button_before"))
diff --git a/decidim.gemspec b/decidim.gemspec
index ecc763e022725..69c29b331ad92 100644
--- a/decidim.gemspec
+++ b/decidim.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0"
   s.homepage = "https://github.com/decidim/decidim"
-  s.required_ruby_version = ">= 2.7"
+  s.required_ruby_version = ">= 3.0"
 
   s.name = "decidim"
 
diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock
index 6ddd4e0f29425..535a11b05ddeb 100644
--- a/decidim_app-design/Gemfile.lock
+++ b/decidim_app-design/Gemfile.lock
@@ -1,72 +1,62 @@
-GIT
-  remote: https://github.com/sgruhier/foundation_rails_helper.git
-  revision: 45709e28f567b2e619a06091eb63d4f050f861d8
-  specs:
-    foundation_rails_helper (3.0.0)
-      actionpack (>= 4.1, < 7.0)
-      activemodel (>= 4.1, < 7.0)
-      activesupport (>= 4.1, < 7.0)
-      railties (>= 4.1, < 7.0)
-
 PATH
   remote: ..
   specs:
-    decidim (0.26.4)
-      decidim-accountability (= 0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-api (= 0.26.4)
-      decidim-assemblies (= 0.26.4)
-      decidim-blogs (= 0.26.4)
-      decidim-budgets (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-debates (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-generators (= 0.26.4)
-      decidim-meetings (= 0.26.4)
-      decidim-pages (= 0.26.4)
-      decidim-participatory_processes (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-      decidim-sortitions (= 0.26.4)
-      decidim-surveys (= 0.26.4)
-      decidim-system (= 0.26.4)
-      decidim-templates (= 0.26.4)
-      decidim-verifications (= 0.26.4)
-    decidim-accountability (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-admin (0.26.4)
+    decidim (0.27.2)
+      decidim-accountability (= 0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-api (= 0.27.2)
+      decidim-assemblies (= 0.27.2)
+      decidim-blogs (= 0.27.2)
+      decidim-budgets (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-debates (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-generators (= 0.27.2)
+      decidim-meetings (= 0.27.2)
+      decidim-pages (= 0.27.2)
+      decidim-participatory_processes (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+      decidim-sortitions (= 0.27.2)
+      decidim-surveys (= 0.27.2)
+      decidim-system (= 0.27.2)
+      decidim-templates (= 0.27.2)
+      decidim-verifications (= 0.27.2)
+    decidim-accountability (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-admin (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-api (0.26.4)
+    decidim-api (0.27.2)
       graphql (~> 1.12, < 1.13)
+      graphql-docs (~> 2.1.0)
       rack-cors (~> 1.0)
+    decidim-assemblies (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-blogs (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-budgets (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-comments (0.27.2)
+      decidim-core (= 0.27.2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-assemblies (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-blogs (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-budgets (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-comments (0.26.4)
-      decidim-core (= 0.26.4)
-      redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-meetings (= 0.26.4)
+    decidim-conferences (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-meetings (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-consultations (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-core (0.26.4)
+    decidim-consultations (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-core (0.27.2)
       active_link_to (~> 1.0)
       acts_as_list (~> 0.9)
       batch-loader (~> 1.2)
@@ -75,17 +65,17 @@ PATH
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
-      date_validator (~> 0.9.0)
-      decidim-api (= 0.26.4)
+      date_validator (~> 0.12.0)
+      decidim-api (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       diffy (~> 3.3)
       doorkeeper (~> 5.1)
       doorkeeper-i18n (~> 4.0)
-      file_validators (~> 2.1)
+      file_validators (~> 3.0)
       fog-local (~> 0.6)
-      foundation_rails_helper
-      geocoder (~> 1.7.5)
+      foundation_rails_helper (~> 4.0)
+      geocoder (~> 1.8)
       hashdiff (>= 0.4.0, < 2.0.0)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
@@ -104,144 +94,145 @@ PATH
       premailer-rails (~> 1.10)
       rack (~> 2.2, >= 2.2.3)
       rack-attack (~> 6.0)
-      rails (~> 6.0.4)
+      rails (~> 6.1.0)
       rails-i18n (~> 6.0)
       ransack (~> 2.4.1)
-      rectify (~> 0.13.0)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
-      searchlight (~> 4.1)
       seven_zip_ruby (~> 1.3)
       social-share-button (~> 1.2, >= 1.2.1)
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
+      webpush (~> 1.1)
       wisper (~> 2.0)
-    decidim-debates (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-dev (0.26.4)
+    decidim-debates (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-dev (0.27.2)
       axe-core-rspec (~> 4.1.0)
       byebug (~> 11.0)
       capybara (~> 3.24)
       db-query-matchers (~> 0.10.0)
-      decidim (= 0.26.4)
+      decidim (= 0.27.2)
       erb_lint (~> 0.0.35)
       factory_bot_rails (~> 4.8)
       i18n-tasks (~> 0.9.18)
       mdl (~> 0.5)
-      nokogiri (~> 1.12)
+      nokogiri (~> 1.13)
+      parallel_tests (~> 3.7)
       puma (~> 5.0)
       rails-controller-testing (~> 1.0)
-      rspec-cells (~> 0.3.4)
+      rspec-cells (~> 0.3.7)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 4.0)
       rspec-retry (~> 0.6.2)
       rspec_junit_formatter (~> 0.3.0)
-      rubocop (~> 0.92.0)
-      rubocop-rails (~> 2.8)
-      rubocop-rspec (= 1.43.2)
-      selenium-webdriver (~> 3.142)
-      simplecov (~> 0.19.0)
-      simplecov-cobertura (~> 1.3.1)
-      system_test_html_screenshots (~> 0.2)
+      rubocop (~> 1.28.0)
+      rubocop-rails (~> 2.14)
+      rubocop-rspec (~> 2.10)
+      selenium-webdriver (~> 4.1.0)
+      simplecov (~> 0.21.0)
+      simplecov-cobertura (~> 2.1.0)
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.26.4)
-      decidim-bulletin_board (= 0.22.3)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-proposals (= 0.26.4)
+    decidim-elections (0.27.2)
+      decidim-bulletin_board (= 0.23)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-proposals (= 0.27.2)
       rack-attack (~> 6.0)
-      voting_schemes-dummy (= 0.22.3)
-      voting_schemes-electionguard (= 0.22.3)
-    decidim-forms (0.26.4)
-      decidim-core (= 0.26.4)
+      voting_schemes-dummy (= 0.23)
+      voting_schemes-electionguard (= 0.23)
+    decidim-forms (0.27.2)
+      decidim-core (= 0.27.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-initiatives (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-verifications (= 0.26.4)
+    decidim-generators (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-initiatives (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-verifications (= 0.27.2)
       origami (~> 2.1)
-      virtus-multiparams (~> 0.1)
+      rexml (~> 3.2.5)
       wicked (~> 1.3)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-meetings (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
+    decidim-meetings (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
       icalendar (~> 2.5)
-    decidim-pages (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-participatory_processes (0.26.4)
-      decidim-core (= 0.26.4)
-    decidim-proposals (0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      doc2text (~> 0.4.4)
+    decidim-pages (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-participatory_processes (0.27.2)
+      decidim-core (= 0.27.2)
+    decidim-proposals (0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      doc2text (~> 0.4.5)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.26.4)
-      decidim-admin (= 0.26.4)
-      decidim-comments (= 0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-proposals (= 0.26.4)
-    decidim-surveys (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-      decidim-templates (= 0.26.4)
-    decidim-system (0.26.4)
+    decidim-sortitions (0.27.2)
+      decidim-admin (= 0.27.2)
+      decidim-comments (= 0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-proposals (= 0.27.2)
+    decidim-surveys (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+      decidim-templates (= 0.27.2)
+    decidim-system (0.27.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.4)
+      decidim-core (= 0.27.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-templates (0.26.4)
-      decidim-core (= 0.26.4)
-      decidim-forms (= 0.26.4)
-    decidim-verifications (0.26.4)
-      decidim-core (= 0.26.4)
+    decidim-templates (0.27.2)
+      decidim-core (= 0.27.2)
+      decidim-forms (= 0.27.2)
+    decidim-verifications (0.27.2)
+      decidim-core (= 0.27.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4.1)
-      actionpack (= 6.0.4.1)
+    actioncable (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionmailbox (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
+    actionmailer (6.1.6)
+      actionpack (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activesupport (= 6.1.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.6)
+      actionview (= 6.1.6)
+      activesupport (= 6.1.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actiontext (6.1.6)
+      actionpack (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (6.1.6)
+      activesupport (= 6.1.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -249,31 +240,33 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activejob (6.1.6)
+      activesupport (= 6.1.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activestorage (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4.1)
+    activemodel (6.1.6)
+      activesupport (= 6.1.6)
+    activerecord (6.1.6)
+      activemodel (= 6.1.6)
+      activesupport (= 6.1.6)
+    activestorage (6.1.6)
+      actionpack (= 6.1.6)
+      activejob (= 6.1.6)
+      activerecord (= 6.1.6)
+      activesupport (= 6.1.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    axe-core-api (4.5.0)
+    axe-core-api (4.6.0)
       dumb_delegator
       virtus
     axe-core-rspec (4.1.0)
@@ -295,9 +288,9 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.7.5)
-      msgpack (~> 1.0)
-    brakeman (5.1.1)
+    bootsnap (1.10.3)
+      msgpack (~> 1.2)
+    brakeman (5.2.2)
     browser (2.7.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -310,7 +303,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (2.2.3)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -330,9 +323,9 @@ GEM
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (18.0.172)
+    chef-utils (18.1.0)
       concurrent-ruby
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coffee-rails (5.0.0)
@@ -343,21 +336,22 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    commonmarker (0.23.8)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.12.0)
+    css_parser (1.14.0)
       addressable
-    date_validator (0.9.0)
-      activemodel
-      activesupport
+    date_validator (0.12.0)
+      activemodel (>= 3)
+      activesupport (>= 3)
     db-query-matchers (0.10.0)
       activesupport (>= 4.0, < 7)
       rspec (~> 3.0)
-    decidim-bulletin_board (0.22.3)
+    decidim-bulletin_board (0.23.0)
       byebug (~> 11.0)
-      graphlient (~> 0.4.0)
+      graphlient (~> 0.5.0)
       jwt (~> 2.2.2)
       rails (~> 6.0, >= 5.0.0)
       wisper (~> 2.0.0)
@@ -374,20 +368,19 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.10.2)
       devise (>= 4.8.0)
-    devise_invitable (2.0.6)
+    devise_invitable (2.0.7)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.0)
     diffy (3.4.2)
-    doc2text (0.4.4)
-      nokogiri (>= 1.12.5, < 1.13.0)
+    doc2text (0.4.5)
+      nokogiri (>= 1.13.2, < 1.14.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.0)
+    doorkeeper (5.6.4)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
     dumb_delegator (1.0.0)
-    equalizer (0.0.11)
     erb_lint (0.0.37)
       activesupport
       better_html (~> 1.0.7)
@@ -399,16 +392,19 @@ GEM
     erbse (0.1.4)
       temple
     erubi (1.10.0)
-    excon (0.94.0)
+    escape_utils (1.3.0)
+    excon (0.99.0)
     execjs (2.8.1)
+    extended-markdown-filter (0.7.0)
+      html-pipeline (~> 2.9)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faker (2.18.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -433,8 +429,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.1)
-    file_validators (2.3.0)
+    ffi (1.15.5)
+    file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
     fog-core (2.3.0)
@@ -445,10 +441,16 @@ GEM
     fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     formatador (1.1.0)
-    geocoder (1.7.5)
-    globalid (0.5.2)
+    foundation_rails_helper (4.0.1)
+      actionpack (>= 4.1, < 7.1)
+      activemodel (>= 4.1, < 7.1)
+      activesupport (>= 4.1, < 7.1)
+      railties (>= 4.1, < 7.1)
+    gemoji (3.0.1)
+    geocoder (1.8.1)
+    globalid (1.0.0)
       activesupport (>= 5.0)
-    graphlient (0.4.0)
+    graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
@@ -456,12 +458,24 @@ GEM
     graphql-client (0.18.0)
       activesupport (>= 3.0)
       graphql
+    graphql-docs (2.1.0)
+      commonmarker (~> 0.16)
+      escape_utils (~> 1.2)
+      extended-markdown-filter (~> 0.4)
+      gemoji (~> 3.0)
+      graphql (~> 1.12)
+      html-pipeline (~> 2.9)
+      sass (~> 3.4)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    highline (2.0.3)
+    highline (2.1.0)
+    hkdf (0.3.0)
+    html-pipeline (2.14.3)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -482,7 +496,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    json (2.6.2)
+    json (2.6.3)
     jwt (2.2.3)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -502,13 +516,14 @@ GEM
       kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    letter_opener_web (1.4.0)
-      actionmailer (>= 3.2)
-      letter_opener (~> 1.0)
-      railties (>= 3.2)
-    listen (3.5.1)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    letter_opener_web (2.0.0)
+      actionmailer (>= 5.2)
+      letter_opener (~> 1.7)
+      railties (>= 5.2)
+      rexml
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.3.1)
@@ -528,26 +543,26 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    msgpack (1.4.2)
+    msgpack (1.4.5)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     mustache (1.1.1)
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -562,7 +577,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -591,14 +606,16 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parallel_tests (3.7.3)
+      parallel
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    premailer (1.18.0)
+    premailer (1.19.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -606,35 +623,35 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    public_suffix (4.0.6)
-    puma (5.5.2)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (3.0.3)
+    rack-protection (3.0.5)
       rack
-    rack-proxy (0.7.4)
+    rack-proxy (0.7.6)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.1)
-      actioncable (= 6.0.4.1)
-      actionmailbox (= 6.0.4.1)
-      actionmailer (= 6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actiontext (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.4.1)
+    rails (6.1.6)
+      actioncable (= 6.1.6)
+      actionmailbox (= 6.1.6)
+      actionmailer (= 6.1.6)
+      actionpack (= 6.1.6)
+      actiontext (= 6.1.6)
+      actionview (= 6.1.6)
+      activejob (= 6.1.6)
+      activemodel (= 6.1.6)
+      activerecord (= 6.1.6)
+      activestorage (= 6.1.6)
+      activesupport (= 6.1.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -648,35 +665,29 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (6.1.6)
+      actionpack (= 6.1.6)
+      activesupport (= 6.1.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rectify (0.13.0)
-      activemodel (>= 4.1.0)
-      activerecord (>= 4.1.0)
-      activesupport (>= 4.1.0)
-      virtus (~> 1.0.5)
-      wisper (>= 1.6.1)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
     redis (4.8.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.3.1)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -685,15 +696,15 @@ GEM
     rspec-cells (0.3.8)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (>= 3.0.0, < 6.1.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (4.1.2)
@@ -709,26 +720,26 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.92.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
@@ -737,18 +748,26 @@ GEM
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    searchlight (4.1.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     seven_zip_ruby (1.3.0)
-    simplecov (0.19.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-cobertura (1.3.1)
-      simplecov (~> 0.8)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
@@ -767,34 +786,29 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.1)
-    system_test_html_screenshots (0.2.0)
-      actionpack (>= 5.2, < 6.1.a)
-    temple (0.9.1)
+    temple (0.10.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
-    timeout (0.3.0)
+    timeout (0.3.1)
     tomlrb (2.0.3)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.1.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
     version_gem (1.1.1)
-    virtus (1.0.5)
+    virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    virtus-multiparams (0.1.1)
-      virtus (~> 1.0)
-    voting_schemes-dummy (0.22.3)
+    voting_schemes-dummy (0.23.0)
       rails (>= 5.0.0)
-    voting_schemes-electionguard (0.22.3)
+    voting_schemes-electionguard (0.23.0)
       rails (>= 5.0.0)
     w3c_rspec_validators (0.3.0)
       rails
@@ -806,7 +820,7 @@ GEM
       rexml (~> 3.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.0.4)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -820,6 +834,9 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webpush (1.1.0)
+      hkdf (~> 0.2)
+      jwt (~> 2.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -829,17 +846,17 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap (~> 1.4)
-  brakeman (~> 5.1)
+  brakeman (~> 5.2)
   byebug (~> 11.0)
   decidim!
   decidim-conferences!
@@ -849,18 +866,17 @@ DEPENDENCIES
   decidim-initiatives!
   decidim-templates!
   faker (~> 2.14)
-  foundation_rails_helper!
-  letter_opener_web (~> 1.3)
+  letter_opener_web (~> 2.0)
   listen (~> 3.1)
-  puma (>= 5.5.1)
+  parallel_tests (~> 3.7)
+  puma (>= 5.6.2)
   rubocop-faker
-  simplecov (~> 0.19.0)
   spring (~> 2.0)
   spring-watcher-listen (~> 2.0)
-  web-console (= 4.0.4)
+  web-console (~> 4.2)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.5
+   2.3.20
diff --git a/decidim_app-design/app/packs/src/vizzs/datacharts.js b/decidim_app-design/app/packs/src/vizzs/datacharts.js
index 24e1db97edc19..749d9eeb7c6c6 100644
--- a/decidim_app-design/app/packs/src/vizzs/datacharts.js
+++ b/decidim_app-design/app/packs/src/vizzs/datacharts.js
@@ -1,9 +1,8 @@
 /* eslint-disable max-lines */
-/* global areachart, renderLineCharts, renderRowCharts */
 
-import renderLineCharts from 'src/decidim/vizzs/linechart';
-import areachart from 'src/decidim/vizzs/areachart';
-import renderRowCharts from 'src/decidim/vizzs/rowchart';
+import renderLineCharts from "src/decidim/vizzs/linechart";
+import areachart from "src/decidim/vizzs/areachart";
+import renderRowCharts from "src/decidim/vizzs/rowchart";
 
 // NOTE: This file purpose is only to populate data for charts
 let DATACHARTS = {}
@@ -23,15 +22,13 @@ $(() => {
       return arr
     }
 
-    return $(".areachart:visible").each((id, container) => {
-      const $container = $(`#${container.id}`)
-
+    return $(".areachart:visible").each((id, container) =>
       areachart({
-        container: $container.selector,
+        container,
         data: mockData(),
-        ...$container.data()
-      });
-    })
+        ...Object.assign({}, container.dataset)
+      })
+    );
   }
 
   DATACHARTS["linechart-0"] = [
diff --git a/decidim_app-design/app/views/layouts/public.html.erb b/decidim_app-design/app/views/layouts/public.html.erb
index 364b927abe1d1..d1246770347df 100644
--- a/decidim_app-design/app/views/layouts/public.html.erb
+++ b/decidim_app-design/app/views/layouts/public.html.erb
@@ -4,7 +4,6 @@
     <title><%= @title || "Decidim Design" %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= stylesheet_pack_tag "public", media: "all", 'data-turbolinks-track': "reload" %>
-    <%= javascript_pack_tag "public", defer: false, 'data-turbolinks-track': "reload" %>
     <%= favicon_pack_tag "media/images/favicon.png" %>
     <%= snippets.display(:head) %>
   </head>
@@ -12,8 +11,11 @@
   <body>
     <%= yield %>
 
+    <%= snippets.display(:foot) %>
     <script>
-    Decidim.config.set(<%== { icons_path: asset_pack_path("media/images/icons.svg") }.to_json %>);
+      Decidim.config.set(<%== { icons_path: asset_pack_path("media/images/icons.svg") }.to_json %>);
     </script>
+
+    <%= javascript_pack_tag "public", defer: false, 'data-turbolinks-track': "reload" %>
   </body>
 </html>
diff --git a/decidim_app-design/app/views/public/partials/_cookie_bar.html.erb b/decidim_app-design/app/views/public/partials/_cookie_bar.html.erb
index 414b7efeb6bbf..a2838452b0cf0 100644
--- a/decidim_app-design/app/views/public/partials/_cookie_bar.html.erb
+++ b/decidim_app-design/app/views/public/partials/_cookie_bar.html.erb
@@ -1,11 +1,11 @@
-<div class="cookie-warning" role="region">
+<div class="dataconsent-warning" role="region">
   Aquest lloc web fa servir cookies pròpies i de tercers per millorar
   l’experiència de navegació, i oferir continguts i serveis d’interès.
   En continuar la navegació entenem que s’accepta
     <a href="http://www.barcelona.cat/ca/cookies.html" target="_blank">
       la nostra política de cookies (més informació)
     </a>.
-    <div class="cookie-warning__action">
+    <div class="dataconsent-warning__action">
       <button class="button tiny cookie-bar__button">D'acord</button>
     </div>
 </div>
diff --git a/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify.erb b/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify.erb
index dfb4c16f1672d..21b72e953d72d 100644
--- a/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify.erb
+++ b/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify.erb
@@ -11,7 +11,7 @@
       <% if locals[:error] %>
         <div class="callout alert mt-s">
           <h5>This participant is not listed in the census.</h5>
-          <p>She must go to the census complaint office or contact support.</p>
+          <p>They must go to the census complaint office or contact support.</p>
         </div>
       <% else %>
         <div class="row mt-sm">
diff --git a/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify_success.erb b/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify_success.erb
index a81a01ebff789..1fd3e9eefc494 100644
--- a/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify_success.erb
+++ b/decidim_app-design/app/views/public/partials/_polling_officer_zone_identify_success.erb
@@ -13,7 +13,7 @@
         </div>
         <div class="row mt-sm">
           <div class="columns large-7">
-            <p><strong>Check that her data is correct:</strong></p>
+            <p><strong>Check that their data is correct:</strong></p>
             <div class="card--secondary">
               <div class="card__content">
                 <form>
diff --git a/decidim_app-design/app/views/public/partials/_polling_officer_zone_questions.erb b/decidim_app-design/app/views/public/partials/_polling_officer_zone_questions.erb
index a73d33cd42fde..d94ebf6b91482 100644
--- a/decidim_app-design/app/views/public/partials/_polling_officer_zone_questions.erb
+++ b/decidim_app-design/app/views/public/partials/_polling_officer_zone_questions.erb
@@ -11,7 +11,7 @@
       <% end %>
       <% if locals[:warning] %>
         <div class="callout warning mt-s">
-          <p>This participant has already voted online. If she continues the process, she will override her previous vote.</p>
+          <p>This participant has already voted online. If they continue the process, they will override their previous vote.</p>
         </div>
       <% end %>
       <% if locals[:error] %>
@@ -20,7 +20,7 @@
         </div>
       <% end %>
       <% if locals[:success] || locals[:warning] %>
-        <p class="mt-sm"><strong>She is entitled to vote on the following questions:</strong></p>
+        <p class="mt-sm"><strong>They are entitled to vote on the following questions:</strong></p>
         <ul class="accordion js-sortable evote__preview"
           data-accordion
           data-multi-expand="true"
@@ -70,7 +70,7 @@
             </button>
           </div>
           <p class="text-center">
-            This person hasn't voted yet, but you are about to cancel the process. Her vote will not be counted. Are you sure?
+            This person hasn't voted yet, but you are about to cancel the process. Their vote will not be counted. Are you sure?
           </p>
           <div class="row">
             <div class="columns medium-8 medium-offset-2">
diff --git a/decidim_app-design/bin/webpack b/decidim_app-design/bin/webpack
index 42c74e1f5db69..118fb29ac3bc8 100755
--- a/decidim_app-design/bin/webpack
+++ b/decidim_app-design/bin/webpack
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["RAILS_ENV"] ||= ENV.fetch("RACK_ENV", "development")
 ENV["NODE_ENV"] ||= "development"
 
 require "pathname"
diff --git a/decidim_app-design/bin/webpack-dev-server b/decidim_app-design/bin/webpack-dev-server
index 7f9e64a020e88..c1ee58bbe6dc7 100755
--- a/decidim_app-design/bin/webpack-dev-server
+++ b/decidim_app-design/bin/webpack-dev-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["RAILS_ENV"] ||= ENV.fetch("RACK_ENV", "development")
 ENV["NODE_ENV"] ||= "development"
 
 require "pathname"
diff --git a/decidim_app-design/package-lock.json b/decidim_app-design/package-lock.json
index 9d5beaabb0b6e..f6644d05168fd 100644
--- a/decidim_app-design/package-lock.json
+++ b/decidim_app-design/package-lock.json
@@ -25,35 +25,47 @@
         "yaml-jest": "^1.0.5"
       },
       "engines": {
-        "node": "^16.9.1",
-        "npm": "^7.21.1"
+        "node": ">=16.9.1",
+        "npm": ">=7.21.1"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.1.2",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@apollo/client": {
-      "version": "3.3.20",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.20.tgz",
-      "integrity": "sha512-hS7UmBwJweudw/J3M0RAcusMHNiRuGqkRH6g91PM2ev8cXScIMdXr/++9jo7wD1nAITMCMF4HQQ3LFaw/Or0Bw==",
+      "version": "3.5.10",
+      "integrity": "sha512-tL3iSpFe9Oldq7gYikZK1dcYxp1c01nlSwtsMz75382HcI6fvQXyFXUCJTTK3wgO2/ckaBvRGw7VqjFREdVoRw==",
       "dependencies": {
         "@graphql-typed-document-node/core": "^3.0.0",
-        "@types/zen-observable": "^0.8.0",
         "@wry/context": "^0.6.0",
         "@wry/equality": "^0.5.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graphql-tag": "^2.12.0",
+        "@wry/trie": "^0.3.0",
+        "graphql-tag": "^2.12.3",
         "hoist-non-react-statics": "^3.3.2",
-        "optimism": "^0.16.0",
+        "optimism": "^0.16.1",
         "prop-types": "^15.7.2",
         "symbol-observable": "^4.0.0",
-        "ts-invariant": "^0.7.0",
-        "tslib": "^1.10.0",
-        "zen-observable": "^0.8.14"
+        "ts-invariant": "^0.9.4",
+        "tslib": "^2.3.0",
+        "zen-observable-ts": "^1.2.0"
       },
       "peerDependencies": {
-        "graphql": "^14.0.0 || ^15.0.0",
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+        "graphql-ws": "^5.5.5",
         "react": "^16.8.0 || ^17.0.0",
-        "subscriptions-transport-ws": "^0.9.0"
+        "subscriptions-transport-ws": "^0.9.0 || ^0.11.0"
       },
       "peerDependenciesMeta": {
+        "graphql-ws": {
+          "optional": true
+        },
         "react": {
           "optional": true
         },
@@ -62,50 +74,49 @@
         }
       }
     },
-    "node_modules/@apollo/client/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    "node_modules/@apollo/client/node_modules/symbol-observable": {
+      "version": "4.0.0",
+      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
+      "engines": {
+        "node": ">=0.10"
+      }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.16.7",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "version": "7.17.0",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
+      "version": "7.17.5",
+      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helpers": "^7.17.2",
+        "@babel/parser": "^7.17.3",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -116,9 +127,8 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.5.tgz",
-      "integrity": "sha512-20BlOHuGf3UXS7z1QPyllM9Gz8SEgcp/UcKeUmdHIFZO6HF1n+3KaLpeyfwWvjY/Os/ynPX3k8qXE/nZ5dw/0g==",
+      "version": "7.17.0",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "dependencies": {
         "eslint-scope": "^5.1.1",
         "eslint-visitor-keys": "^2.1.0",
@@ -129,15 +139,14 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.11.0",
-        "eslint": ">=7.5.0"
+        "eslint": "^7.5.0 || ^8.0.0"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
+      "version": "7.17.3",
+      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
       "dependencies": {
-        "@babel/types": "^7.15.0",
+        "@babel/types": "^7.17.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -146,36 +155,33 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
+      "version": "7.16.7",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
+      "version": "7.16.7",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
+      "version": "7.16.7",
+      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "@babel/compat-data": "^7.16.4",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -186,16 +192,16 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==",
+      "version": "7.17.6",
+      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -205,12 +211,11 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "version": "7.17.0",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -219,22 +224,9 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.14.5.tgz",
-      "integrity": "sha512-spfQRnoChdYWwyFetQDBSDBgH42VskaquRI52kbLei5MjV7s3NPq30/sh2S3YdT20Ku/ZpaNnTVgmDo20NWylg==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+      "version": "0.3.1",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.13.0",
         "@babel/helper-module-imports": "^7.12.13",
@@ -249,220 +241,212 @@
         "@babel/core": "^7.4.0-0"
       }
     },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.16.7",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
+      "version": "7.16.7",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
       "dependencies": {
-        "@babel/types": "^7.15.0"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
+      "version": "7.17.6",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.16.7",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
+      "version": "7.16.8",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
+      "version": "7.16.7",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
+      "version": "7.16.7",
+      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
       "dependencies": {
-        "@babel/types": "^7.14.8"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
+      "version": "7.16.0",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+      "version": "7.16.7",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "version": "7.16.7",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
+      "version": "7.16.8",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
-      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
+      "version": "7.17.2",
+      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
       "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.16.10",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -471,9 +455,8 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
-      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
+      "version": "7.17.3",
+      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -481,14 +464,26 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -498,12 +493,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
+      "version": "7.16.8",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -514,12 +508,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "version": "7.16.7",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -529,12 +522,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==",
+      "version": "7.17.6",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -545,11 +537,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "version": "7.16.7",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
@@ -560,11 +551,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "version": "7.16.7",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
@@ -575,11 +565,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
@@ -590,11 +579,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "version": "7.16.7",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -605,11 +593,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "version": "7.16.7",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -620,11 +607,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "version": "7.16.7",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
@@ -635,15 +621,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "version": "7.17.3",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
       "dependencies": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+        "@babel/plugin-transform-parameters": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -653,11 +638,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
@@ -668,12 +652,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -684,12 +667,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "version": "7.16.11",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -699,13 +681,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -716,12 +697,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=4"
@@ -732,7 +712,6 @@
     },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -743,7 +722,6 @@
     },
     "node_modules/@babel/plugin-syntax-bigint": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
       "dependencies": {
@@ -755,7 +733,6 @@
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
@@ -766,7 +743,6 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -780,7 +756,6 @@
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -791,7 +766,6 @@
     },
     "node_modules/@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -802,7 +776,6 @@
     },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
       "dependencies": {
@@ -814,7 +787,6 @@
     },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -824,11 +796,10 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+      "version": "7.16.7",
+      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -839,7 +810,6 @@
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -850,7 +820,6 @@
     },
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -861,7 +830,6 @@
     },
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -872,7 +840,6 @@
     },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -883,7 +850,6 @@
     },
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -894,7 +860,6 @@
     },
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -905,7 +870,6 @@
     },
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -919,7 +883,6 @@
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -931,12 +894,25 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "version": "7.16.7",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -946,13 +922,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+      "version": "7.16.8",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -962,11 +937,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -976,11 +950,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.16.7",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -990,16 +963,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
+      "version": "7.16.7",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1010,11 +983,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "version": "7.16.7",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1024,11 +996,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "version": "7.17.3",
+      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1038,12 +1009,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "version": "7.16.7",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1053,11 +1023,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "version": "7.16.7",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1067,12 +1036,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "version": "7.16.7",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1082,11 +1050,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
+      "version": "7.16.7",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1096,12 +1063,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1111,11 +1078,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "version": "7.16.7",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1125,11 +1091,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1139,12 +1104,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "version": "7.16.7",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1155,13 +1119,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz",
-      "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==",
+      "version": "7.16.8",
+      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1172,14 +1135,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
+      "version": "7.16.7",
+      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1190,12 +1152,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "version": "7.16.7",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1205,11 +1166,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "version": "7.16.8",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1219,11 +1179,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1233,12 +1192,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "version": "7.16.7",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1248,11 +1206,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
+      "version": "7.16.7",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1262,26 +1219,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-mutators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.14.5.tgz",
-      "integrity": "sha512-J/KZdYrLy/mugVWk7Q/him83ba0QGI8twLgov130GGerT6UKrNHeSnZANp96H4S6VOecy2S/9rhH4j8nCauoSw==",
+      "version": "7.16.7",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dependencies": {
-        "@babel/helper-define-map": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1291,11 +1232,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz",
-      "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1305,15 +1245,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz",
-      "integrity": "sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==",
+      "version": "7.17.3",
+      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-jsx": "^7.16.7",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1323,11 +1262,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1337,12 +1275,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1352,9 +1289,8 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "version": "7.16.7",
+      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
       "dependencies": {
         "regenerator-transform": "^0.14.2"
       },
@@ -1366,11 +1302,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "version": "7.16.7",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,15 +1315,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz",
-      "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
+      "version": "7.17.0",
+      "integrity": "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1399,11 +1333,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1413,12 +1346,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "version": "7.16.7",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1428,11 +1360,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "version": "7.16.7",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1442,11 +1373,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "version": "7.16.7",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1456,11 +1386,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "version": "7.16.7",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1470,11 +1399,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "version": "7.16.7",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1484,12 +1412,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "version": "7.16.7",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1499,30 +1426,30 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
-      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
-      "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.14.5",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+      "version": "7.16.11",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "dependencies": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
@@ -1537,44 +1464,44 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.14.5",
-        "@babel/plugin-transform-classes": "^7.14.9",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.14.5",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.14.5",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1585,9 +1512,8 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -1600,16 +1526,15 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1619,9 +1544,8 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+      "version": "7.17.2",
+      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -1630,13 +1554,11 @@
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz",
-      "integrity": "sha512-cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg==",
+      "version": "7.17.2",
+      "integrity": "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "core-js-pure": "^3.14.0",
+        "core-js-pure": "^3.20.2",
         "regenerator-runtime": "^0.13.4"
       },
       "engines": {
@@ -1644,30 +1566,29 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.16.7",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
+      "version": "7.17.3",
+      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.3",
+        "@babel/types": "^7.17.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1676,11 +1597,10 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "version": "7.17.0",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1689,13 +1609,11 @@
     },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
     "node_modules/@cnakazawa/watch": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
       "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
       "dev": true,
       "dependencies": {
@@ -1709,12 +1627,175 @@
         "node": ">=0.1.95"
       }
     },
-    "node_modules/@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
+    "node_modules/@codemirror/highlight": {
+      "version": "0.19.7",
+      "integrity": "sha512-3W32hBCY0pbbv/xidismw+RDMKuIag+fo4kZIbD7WoRj+Ttcaxjf+vP6RttRHXLaaqbWh031lTeON8kMlDhMYw==",
+      "dependencies": {
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/rangeset": "^0.19.0",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "0.19.7",
+      "integrity": "sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q==",
+      "dependencies": {
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.5",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "node_modules/@codemirror/rangeset": {
+      "version": "0.19.8",
+      "integrity": "sha512-1vusIkxSD0vK5KQ22JO/4Ejfww5268PgM/CpKNBSpTpWZEFlZbmOPyRiY4HXO2oEzOpypbA/walMiNInWnrT0Q==",
+      "dependencies": {
+        "@codemirror/state": "^0.19.0"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "0.19.9",
+      "integrity": "sha512-psOzDolKTZkx4CgUqhBQ8T8gBc0xN5z4gzed109aF6x7D7umpDRoimacI/O6d9UGuyl4eYuDCZmDFr2Rq7aGOw==",
+      "dependencies": {
+        "@codemirror/text": "^0.19.0"
+      }
+    },
+    "node_modules/@codemirror/stream-parser": {
+      "version": "0.19.6",
+      "integrity": "sha512-dmPtoz/MR3IphxAsgywEyvSjOJCb2ikAgqp6BGIlwBEJVRiap0wFK4b3f/3DKIHUG4GezWRYQumXNyb3GNQevw==",
+      "dependencies": {
+        "@codemirror/highlight": "^0.19.0",
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "node_modules/@codemirror/text": {
+      "version": "0.19.6",
+      "integrity": "sha512-T9jnREMIygx+TPC1bOuepz18maGq/92q2a+n4qTqObKwvNMg+8cMTslb8yxeEDEq7S3kpgGWxgO1UWbQRij0dA=="
+    },
+    "node_modules/@codemirror/view": {
+      "version": "0.19.45",
+      "integrity": "sha512-wR19UBYvJMeV9axa5Xo6ATbAP1jl30BPFZ5buu3cJjYXwlRhJDjzw2wUbxk1zsR1LtAe5jrRNeWEtGA+IPacxw==",
+      "dependencies": {
+        "@codemirror/rangeset": "^0.19.5",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/text": "^0.19.0",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.0.2",
+      "integrity": "sha512-uayvFqfa0hITPwVduxRYNL9YBD/anTqula0tu2llalaxblEd7QPuETSN3gB5PvTYxSfd0d8kS4Fypgo5JaUJ6A==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.0",
+      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.0",
+      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.0",
+      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.0",
+      "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.0",
+      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.0.1",
+      "integrity": "sha512-Bnly2FWWSTZX20hDJLYHpurhp1ot+ZGvojLOsrHa9frzOVruOv4oPYMZ6wQomi9KsbZZ+Af/CuRYaGReTyGtEg==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.2.0",
+      "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
     "node_modules/@decidim/browserslist-config": {
@@ -1726,9 +1807,9 @@
       "link": true
     },
     "node_modules/@decidim/decidim-bulletin_board": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.22.3.tgz",
-      "integrity": "sha512-LN7wIK9IB9Zegr++fvEY2vAWdUvReLPCe3sbPMGadX3b2aurrx/SK3B38OfRdN2eqblksMzyNYtXALszA9dU2w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.23.0.tgz",
+      "integrity": "sha512-kCFVv8bgq5+7cizkS+PchiWczsmsFAqQ4phbDm99xA+wz0Rq0iG4SpkNij5Xin0bvGDdVOQ1sU5HPlIePheEZQ==",
       "dependencies": {
         "@apollo/client": "^3.2.7",
         "core-js": "^3.8.3",
@@ -1740,6 +1821,13 @@
         "webpack-cli": "^4.2.0"
       }
     },
+    "node_modules/@decidim/decidim-bulletin_board/node_modules/graphql": {
+      "version": "15.8.0",
+      "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/@decidim/dev": {
       "resolved": "packages/dev",
       "link": true
@@ -1757,32 +1845,46 @@
       "link": true
     },
     "node_modules/@decidim/voting_schemes-dummy": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.22.3.tgz",
-      "integrity": "sha512-Z5CwSUJNYW2KkoE5anAqAIwHnQHqpgGL4Xu2I7YqEn3thThlbWlY9U9Eq0O6fq7/pfBQLiAFFiBBAnCDv0HC2g=="
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.23.0.tgz",
+      "integrity": "sha512-pTXJm6HsL4RmuR9TfKih8iShUk5WK6jZBUESl+T+XDXs4x60Sxi8xJ8GxUb+keTUgYG3hecYnlPez9Okc4WYqw=="
     },
     "node_modules/@decidim/voting_schemes-electionguard": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.22.3.tgz",
-      "integrity": "sha512-RZn/1GO5PM6a2SuN8h/SoS4EeLYnHPWw6/tl2M26ms/Xzf1ewJIgBSiByxk4qHoqvE892rccH4+G56h6iVrIqg=="
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.23.0.tgz",
+      "integrity": "sha512-o5/UXRc6v0Cp2BG/MtNpVAEtyNO3VdfFjJSX75E5W7G2yIu7na+D1HZyHyqIk1rgHPqdJmdg0DT7JI16fDcbXQ=="
     },
     "node_modules/@decidim/webpacker": {
       "resolved": "packages/webpacker",
       "link": true
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "version": "0.5.6",
+      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
-      "peer": true,
+    "node_modules/@endemolshinegroup/cosmiconfig-typescript-loader": {
+      "version": "3.0.2",
+      "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==",
+      "dependencies": {
+        "lodash.get": "^4",
+        "make-error": "^1",
+        "ts-node": "^9",
+        "tslib": "^2"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "cosmiconfig": ">=6"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1798,10 +1900,17 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1813,9 +1922,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "peer": true,
       "engines": {
@@ -1826,77 +1946,282 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "0.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
-      "integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==",
+      "version": "0.3.0",
+      "integrity": "sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w==",
+      "deprecated": "Please upgrade to 6.1.0. https://fontawesome.com/docs/changelog/",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz",
-      "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==",
+      "version": "1.3.0",
+      "integrity": "sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg==",
+      "deprecated": "Please upgrade to 6.1.0. https://fontawesome.com/docs/changelog/",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.3.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-regular-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==",
+      "version": "5.15.4",
+      "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/@fortawesome/free-regular-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@fortawesome/free-solid-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==",
+      "version": "5.15.4",
+      "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/@fortawesome/free-solid-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@graphiql/toolkit": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.2.2.tgz",
-      "integrity": "sha512-kDgYhqnS4p4LqSo1KvLd3tbX8Hhdj0ZrgQuGsosjjEnahiPYmmylxUL1p9lj6348OsypcTlCncGpEjeb9S3TiQ==",
+      "version": "0.4.2",
+      "integrity": "sha512-14uG67QrONbRrhXwvBJFsMfcQfexmGhj7dgkputesx9xuPUkcCDNmVULnVA8sGYt8P/rSvjkfQYx3rtfW+GhAQ==",
       "dependencies": {
-        "@n1ru4l/push-pull-async-iterable-iterator": "^2.1.4",
-        "graphql-ws": "^4.3.2",
+        "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0",
         "meros": "^1.1.4"
       },
-      "optionalDependencies": {
-        "subscriptions-transport-ws": "^0.9.18"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0",
+        "graphql-ws": ">= 4.5.0"
+      }
+    },
+    "node_modules/@graphql-tools/batch-execute": {
+      "version": "8.3.2",
+      "integrity": "sha512-ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/delegate": {
+      "version": "8.5.1",
+      "integrity": "sha512-/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw==",
+      "dependencies": {
+        "@graphql-tools/batch-execute": "^8.3.2",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "graphql-executor": "0.0.18",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/graphql-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg==",
+      "dependencies": {
+        "@graphql-tools/import": "^6.6.6",
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/import": {
+      "version": "6.6.6",
+      "integrity": "sha512-a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w==",
+      "dependencies": {
+        "@graphql-tools/utils": "8.6.2",
+        "resolve-from": "5.0.0",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/json-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/load": {
+      "version": "7.5.2",
+      "integrity": "sha512-URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g==",
+      "dependencies": {
+        "@graphql-tools/schema": "8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "p-limit": "3.1.0",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/merge": {
+      "version": "8.2.3",
+      "integrity": "sha512-XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/schema": {
+      "version": "8.3.2",
+      "integrity": "sha512-77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg==",
+      "dependencies": {
+        "@graphql-tools/merge": "^8.2.3",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/url-loader": {
+      "version": "7.7.2",
+      "integrity": "sha512-7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA==",
+      "dependencies": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/utils": "^8.6.2",
+        "@graphql-tools/wrap": "^8.4.2",
+        "@n1ru4l/graphql-live-query": "^0.9.0",
+        "@types/websocket": "^1.0.4",
+        "@types/ws": "^8.0.0",
+        "cross-undici-fetch": "^0.1.19",
+        "dset": "^3.1.0",
+        "extract-files": "^11.0.0",
+        "graphql-sse": "^1.0.1",
+        "graphql-ws": "^5.4.1",
+        "isomorphic-ws": "^4.0.1",
+        "meros": "^1.1.4",
+        "subscriptions-transport-ws": "^0.11.0",
+        "sync-fetch": "^0.3.1",
+        "tslib": "^2.3.0",
+        "valid-url": "^1.0.9",
+        "value-or-promise": "^1.0.11",
+        "ws": "^8.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/url-loader/node_modules/ws": {
+      "version": "8.5.0",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@graphql-tools/utils": {
+      "version": "8.6.2",
+      "integrity": "sha512-x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA==",
+      "dependencies": {
+        "tslib": "~2.3.0"
       },
       "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/wrap": {
+      "version": "8.4.2",
+      "integrity": "sha512-U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ==",
+      "dependencies": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
     "node_modules/@graphql-typed-document-node/core": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz",
-      "integrity": "sha512-wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg==",
+      "version": "3.1.1",
+      "integrity": "sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==",
       "peerDependencies": {
-        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "peer": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "dependencies": {
@@ -1910,9 +2235,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "engines": {
@@ -1921,7 +2265,6 @@
     },
     "node_modules/@jest/console": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
       "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "dependencies": {
@@ -1938,7 +2281,6 @@
     },
     "node_modules/@jest/console/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -1952,9 +2294,8 @@
       }
     },
     "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -1969,7 +2310,6 @@
     },
     "node_modules/@jest/console/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -1981,13 +2321,11 @@
     },
     "node_modules/@jest/console/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -1996,7 +2334,6 @@
     },
     "node_modules/@jest/console/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2008,7 +2345,6 @@
     },
     "node_modules/@jest/core": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
       "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "dependencies": {
@@ -2047,7 +2383,6 @@
     },
     "node_modules/@jest/core/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2061,9 +2396,8 @@
       }
     },
     "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2078,7 +2412,6 @@
     },
     "node_modules/@jest/core/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2090,13 +2423,11 @@
     },
     "node_modules/@jest/core/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2105,7 +2436,6 @@
     },
     "node_modules/@jest/core/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2117,7 +2447,6 @@
     },
     "node_modules/@jest/environment": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
       "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "dependencies": {
@@ -2132,7 +2461,6 @@
     },
     "node_modules/@jest/fake-timers": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
       "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "dependencies": {
@@ -2149,7 +2477,6 @@
     },
     "node_modules/@jest/globals": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
       "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "dependencies": {
@@ -2163,7 +2490,6 @@
     },
     "node_modules/@jest/reporters": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
       "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "dependencies": {
@@ -2201,7 +2527,6 @@
     },
     "node_modules/@jest/reporters/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2215,9 +2540,8 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2232,7 +2556,6 @@
     },
     "node_modules/@jest/reporters/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2244,22 +2567,33 @@
     },
     "node_modules/@jest/reporters/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/reporters/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/reporters/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2268,7 +2602,6 @@
     },
     "node_modules/@jest/reporters/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2280,7 +2613,6 @@
     },
     "node_modules/@jest/source-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
       "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "dependencies": {
@@ -2294,7 +2626,6 @@
     },
     "node_modules/@jest/source-map/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2303,7 +2634,6 @@
     },
     "node_modules/@jest/test-result": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
       "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "dependencies": {
@@ -2318,7 +2648,6 @@
     },
     "node_modules/@jest/test-sequencer": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
       "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "dependencies": {
@@ -2334,7 +2663,6 @@
     },
     "node_modules/@jest/transform": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
       "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "dependencies": {
@@ -2360,7 +2688,6 @@
     },
     "node_modules/@jest/transform/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2374,9 +2701,8 @@
       }
     },
     "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2391,7 +2717,6 @@
     },
     "node_modules/@jest/transform/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2403,13 +2728,11 @@
     },
     "node_modules/@jest/transform/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/transform/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2418,7 +2741,6 @@
     },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2427,7 +2749,6 @@
     },
     "node_modules/@jest/transform/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2439,7 +2760,6 @@
     },
     "node_modules/@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
       "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "dependencies": {
@@ -2455,7 +2775,6 @@
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2469,9 +2788,8 @@
       }
     },
     "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2486,7 +2804,6 @@
     },
     "node_modules/@jest/types/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2498,13 +2815,11 @@
     },
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2513,7 +2828,6 @@
     },
     "node_modules/@jest/types/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2524,15 +2838,15 @@
       }
     },
     "node_modules/@joeattardi/emoji-button": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@joeattardi/emoji-button/-/emoji-button-4.6.0.tgz",
-      "integrity": "sha512-KwOE1j+YxX47JmT0pXNCa+9Ai4Wf2fmABtvuxy6JBJ5QV0HdoThRKjL6CxAreVwwLbNQ/PDoR36xpc5QJjLXPA==",
+      "version": "4.6.2",
+      "integrity": "sha512-FhuzTmW3nVHLVp2BJfNX17CYV77fqtKZlx328D4h6Dw3cPTT1gJRNXN0jV7BvHgsl6Q/tN8DIQQxTUIO4jW3gQ==",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.28",
         "@fortawesome/free-regular-svg-icons": "^5.13.0",
         "@fortawesome/free-solid-svg-icons": "^5.13.0",
         "@popperjs/core": "^2.4.0",
         "@types/twemoji": "^12.1.1",
+        "escape-html": "^1.0.3",
         "focus-trap": "^5.1.0",
         "fuzzysort": "^1.1.4",
         "tiny-emitter": "^2.1.0",
@@ -2540,17 +2854,52 @@
         "twemoji": "^13.0.0"
       }
     },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@lezer/common": {
+      "version": "0.15.11",
+      "integrity": "sha512-vv0nSdIaVCRcJ8rPuDdsrNVfBOYe/4Szr/LhF929XyDmBndLDuWiCCHooGlGlJfzELyO608AyDhVsuX/ZG36NA=="
+    },
+    "node_modules/@lezer/lr": {
+      "version": "0.15.8",
+      "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+      "dependencies": {
+        "@lezer/common": "^0.15.0"
+      }
+    },
+    "node_modules/@n1ru4l/graphql-live-query": {
+      "version": "0.9.0",
+      "integrity": "sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==",
+      "peerDependencies": {
+        "graphql": "^15.4.0 || ^16.0.0"
+      }
+    },
     "node_modules/@n1ru4l/push-pull-async-iterable-iterator": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.4.tgz",
-      "integrity": "sha512-qLIvoOUJ+zritv+BlzcBMePKNjKQzH9Rb2i9W98YXxf/M62Lye8qH0peyiU8yJ1tL0kfulWi31BoK10E6BKJeA==",
+      "version": "3.2.0",
+      "integrity": "sha512-3fkKj25kEjsfObL6IlKPAlHYPq/oYwUkkQ03zsTTiDjD7vg/RxjdiLeCydqtxHZP0JgsXL3D/X5oAkMGzuUp/Q==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -2562,16 +2911,14 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2580,35 +2927,20 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "version": "2.11.2",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
       }
     },
     "node_modules/@rails/ujs": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@rails/ujs/-/ujs-6.1.3.tgz",
-      "integrity": "sha512-9mip5o+LVouWAqLMNJWhxda+D5uP+4RziNECgOGJlL6k3rc5SC/ljCHpV9Cym4i3oeGZkpZJ2tu4frCwt84kzQ=="
+      "version": "6.1.4",
+      "integrity": "sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw=="
     },
     "node_modules/@rails/webpacker": {
       "version": "6.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@rails/webpacker/-/webpacker-6.0.0-rc.5.tgz",
       "integrity": "sha512-GOEhRs+mRRVZIiZbnLQ1WTxRCuu687rO4cvUVP7WMJ+z5uFr3EQkCaLq5VOtonWHzYbZIBEWH4rCWv0uZnrywQ==",
       "dependencies": {
         "@babel/core": "^7.15.0",
@@ -2634,34 +2966,119 @@
         "yarn": ">=1 <4"
       }
     },
-    "node_modules/@rails/webpacker/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/@rails/webpacker/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/@rails/webpacker/node_modules/compression-webpack-plugin": {
+      "version": "8.0.1",
+      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^6.0.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dev": true,
+    "node_modules/@rails/webpacker/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@rollup/plugin-babel": {
+      "version": "5.3.1",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "@types/babel__core": "^7.1.9",
+        "rollup": "^1.20.0||^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/babel__core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "11.2.1",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-replace": {
+      "version": "2.4.2",
+      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0 || ^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "3.1.0",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
+      "version": "0.0.39",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/fake-timers": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
       "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
       "dev": true,
       "dependencies": {
@@ -2670,7 +3087,6 @@
     },
     "node_modules/@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
       "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
       "dev": true,
       "peer": true,
@@ -2684,8 +3100,8 @@
     },
     "node_modules/@stylelint/postcss-markdown": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
       "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
+      "deprecated": "Use the original unforked package instead: postcss-markdown",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -2697,9 +3113,36 @@
         "postcss-syntax": ">=0.36.2"
       }
     },
+    "node_modules/@surma/rollup-plugin-off-main-thread": {
+      "version": "2.2.3",
+      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "dependencies": {
+        "ejs": "^3.1.6",
+        "json5": "^2.2.0",
+        "magic-string": "^0.25.0",
+        "string.prototype.matchall": "^4.0.6"
+      }
+    },
+    "node_modules/@tarekraafat/autocomplete.js": {
+      "version": "10.2.6",
+      "integrity": "sha512-M3awL75YTQVHev4XlWGRKJalwVG3MGgtNnbRdtNipcyMcAV1sfkireBM8BKL/vhFhrus+6/5KZfj/DJDu8X0mg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/autocompletejs"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/TarekRaafat"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/TarekRaafat"
+        }
+      ]
+    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
       "engines": {
@@ -2707,10 +3150,9 @@
       }
     },
     "node_modules/@types/babel__core": {
-      "version": "7.1.14",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
-      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
-      "dev": true,
+      "version": "7.1.18",
+      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "devOptional": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -2720,82 +3162,65 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
-      "dev": true,
+      "version": "7.6.4",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "devOptional": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
-      "dev": true,
+      "version": "7.4.1",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "devOptional": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
-      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
-      "dev": true,
+      "version": "7.14.2",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "devOptional": true,
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+      "version": "8.4.1",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "version": "3.7.3",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "node_modules/@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
+      "version": "0.0.51",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
       "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "dependencies": {
@@ -2804,7 +3229,6 @@
     },
     "node_modules/@types/istanbul-reports": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
       "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "dependencies": {
@@ -2813,20 +3237,16 @@
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "version": "3.0.10",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -2834,85 +3254,93 @@
       }
     },
     "node_modules/@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.2",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true,
       "peer": true
     },
     "node_modules/@types/node": {
-      "version": "15.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="
+      "version": "17.0.21",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==",
+      "version": "2.4.4",
+      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
       "dev": true
     },
-    "node_modules/@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+    "node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.2",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+    },
     "node_modules/@types/twemoji": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@types/twemoji/-/twemoji-12.1.1.tgz",
-      "integrity": "sha512-dW1B1WHTfrWmEzXb/tp8xsZqQHAyMB9JwLwbBqkIQVzmNUI02R7lJqxUpKFM114ygNZHKA1r74oPugCAiYHt1A=="
+      "version": "12.1.2",
+      "integrity": "sha512-3eMyKenMi0R1CeKzBYtk/Z2JIHsTMQrIrTah0q54o45pHTpWVNofU2oHx0jS8tqsDRhis2TbB6238WP9oh2l2w=="
     },
     "node_modules/@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
+      "version": "2.0.6",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
       "dev": true,
       "peer": true
     },
+    "node_modules/@types/websocket": {
+      "version": "1.0.5",
+      "integrity": "sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.2",
+      "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
-    "node_modules/@types/zen-observable": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz",
-      "integrity": "sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="
+    "node_modules/@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.1",
@@ -2921,22 +3349,18 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
       "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
       "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
       "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
@@ -2946,12 +3370,10 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
       "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -2962,7 +3384,6 @@
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
@@ -2970,7 +3391,6 @@
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "dependencies": {
         "@xtuc/long": "4.2.2"
@@ -2978,12 +3398,10 @@
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
       "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -2998,7 +3416,6 @@
     },
     "node_modules/@webassemblyjs/wasm-gen": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3010,7 +3427,6 @@
     },
     "node_modules/@webassemblyjs/wasm-opt": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3021,7 +3437,6 @@
     },
     "node_modules/@webassemblyjs/wasm-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3034,7 +3449,6 @@
     },
     "node_modules/@webassemblyjs/wast-printer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3042,18 +3456,16 @@
       }
     },
     "node_modules/@webpack-cli/configtest": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-      "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+      "version": "1.1.1",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
       "peerDependencies": {
         "webpack": "4.x.x || 5.x.x",
         "webpack-cli": "4.x.x"
       }
     },
     "node_modules/@webpack-cli/info": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-      "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+      "version": "1.4.1",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
       "dependencies": {
         "envinfo": "^7.7.3"
       },
@@ -3062,9 +3474,8 @@
       }
     },
     "node_modules/@webpack-cli/serve": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
+      "version": "1.6.1",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
       "peerDependencies": {
         "webpack-cli": "4.x.x"
       },
@@ -3075,33 +3486,30 @@
       }
     },
     "node_modules/@wry/context": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz",
-      "integrity": "sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==",
+      "version": "0.6.1",
+      "integrity": "sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@wry/equality": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz",
-      "integrity": "sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==",
+      "version": "0.5.2",
+      "integrity": "sha512-oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@wry/trie": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz",
-      "integrity": "sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==",
+      "version": "0.3.1",
+      "integrity": "sha512-WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
@@ -3109,48 +3517,34 @@
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/@zeitiger/appendaround": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@zeitiger/appendaround/-/appendaround-1.0.0.tgz",
       "integrity": "sha1-v4V4Prdpa6h5Irym42X0O1SH4Ns="
     },
     "node_modules/abab": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "event-target-shim": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6.5"
       }
     },
     "node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "7.4.1",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3160,7 +3554,6 @@
     },
     "node_modules/acorn-globals": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dev": true,
       "dependencies": {
@@ -3168,46 +3561,23 @@
         "acorn-walk": "^7.1.1"
       }
     },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz",
-      "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "peer": true,
+      "version": "5.3.2",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "dependencies": {
@@ -3217,21 +3587,8 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/airbnb-prop-types": {
       "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
       "dev": true,
       "dependencies": {
@@ -3254,7 +3611,6 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -3267,32 +3623,48 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "peer": true,
       "engines": {
@@ -3301,7 +3673,6 @@
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "dependencies": {
@@ -3314,28 +3685,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -3346,8 +3704,8 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3356,64 +3714,18 @@
         "node": ">= 8"
       }
     },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "node_modules/are-we-there-yet/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/are-we-there-yet/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria-query": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
@@ -3424,7 +3736,6 @@
     },
     "node_modules/arr-diff": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true,
       "engines": {
@@ -3433,7 +3744,6 @@
     },
     "node_modules/arr-flatten": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true,
       "engines": {
@@ -3442,40 +3752,22 @@
     },
     "node_modules/arr-union": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
     "node_modules/array-includes": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
-      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3486,7 +3778,6 @@
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "engines": {
         "node": ">=8"
@@ -3494,7 +3785,6 @@
     },
     "node_modules/array-unique": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true,
       "engines": {
@@ -3502,16 +3792,15 @@
       }
     },
     "node_modules/array.prototype.filter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz",
-      "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0",
+        "es-abstract": "^1.19.0",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3521,27 +3810,26 @@
       }
     },
     "node_modules/array.prototype.find": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
-      "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
+      "version": "2.1.2",
+      "integrity": "sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q==",
       "dev": true,
       "dependencies": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "es-abstract": "^1.19.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
-      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3551,16 +3839,13 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
-      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3571,7 +3856,6 @@
     },
     "node_modules/arrify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true,
       "peer": true,
@@ -3579,25 +3863,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true,
       "engines": {
@@ -3606,14 +3873,11 @@
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "peer": true,
       "engines": {
@@ -3621,36 +3885,27 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
     },
-    "node_modules/async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
     },
     "node_modules/atob": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
       "bin": {
@@ -3660,163 +3915,53 @@
         "node": ">= 4.5.0"
       }
     },
-    "node_modules/attrobj": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/attrobj/-/attrobj-3.1.0.tgz",
-      "integrity": "sha512-YFN+wZSEgER2w5IdIkmNkPiGqi6lRrNKL+VPl+7WnAPenZvnPC6bEmQuxka06Ilwx265x/K6QRh9W5Klav738Q=="
-    },
-    "node_modules/aug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/aug/-/aug-4.0.0.tgz",
-      "integrity": "sha512-2cr7AHg5B+Cbjma7qhs+DZbKznzKwpkjfSCb48WVJfEF/+Hwxsu4GPGuqUblt/0gVYBiqdeAIrerlTjt8edyKg=="
-    },
     "node_modules/autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "version": "10.4.2",
+      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
       "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
+        "browserslist": "^4.19.1",
+        "caniuse-lite": "^1.0.30001297",
+        "fraction.js": "^4.1.2",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "bin": {
         "autoprefixer": "bin/autoprefixer"
       },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "engines": {
-        "node": "*"
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "node_modules/axe-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz",
-      "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==",
+      "version": "4.4.1",
+      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.4",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "dependencies": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "node_modules/axobject-query": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-    },
-    "node_modules/babel-code-frame/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dependencies": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "node_modules/babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dependencies": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
+      "dev": true
     },
     "node_modules/babel-jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
       "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "dependencies": {
@@ -3838,7 +3983,6 @@
     },
     "node_modules/babel-jest/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -3852,9 +3996,8 @@
       }
     },
     "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3869,7 +4012,6 @@
     },
     "node_modules/babel-jest/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -3881,13 +4023,11 @@
     },
     "node_modules/babel-jest/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/babel-jest/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -3896,7 +4036,6 @@
     },
     "node_modules/babel-jest/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -3907,9 +4046,8 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.2.3",
+      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
@@ -3924,41 +4062,22 @@
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dependencies": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "node_modules/babel-plugin-__coverage__": {
-      "version": "1.11.111",
-      "resolved": "https://registry.npmjs.org/babel-plugin-__coverage__/-/babel-plugin-__coverage__-1.11.111.tgz",
-      "integrity": "sha1-AdD4396mrPvqJ3U/oteELwZcxXk=",
-      "dependencies": {
-        "babel-helper-function-name": "^6.5.0",
-        "babel-template": "^6.8.0"
-      }
-    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dependencies": {
         "object.assign": "^4.1.0"
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       },
       "engines": {
@@ -3967,7 +4086,6 @@
     },
     "node_modules/babel-plugin-jest-hoist": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
       "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "dependencies": {
@@ -3981,12 +4099,11 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "version": "0.3.1",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "dependencies": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -3994,63 +4111,28 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz",
-      "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==",
+      "version": "0.5.2",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.9.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "version": "0.3.1",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "node_modules/babel-preset-airbnb": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-airbnb/-/babel-preset-airbnb-5.0.0.tgz",
-      "integrity": "sha512-Y5nqHhnhu4RpwbmQj4H+srdk1kb413pX81PfJsT1IZQOuEuRzUDXmgN4Ut1GgpQJnfRpjjEuQy0/uzcLMMP1cQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-transform-classes": "^7.9.2",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-property-mutators": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.4",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0"
-      }
-    },
     "node_modules/babel-preset-current-node-syntax": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "dependencies": {
@@ -4073,7 +4155,6 @@
     },
     "node_modules/babel-preset-jest": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
       "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "dependencies": {
@@ -4087,112 +4168,12 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
-    "node_modules/babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "node_modules/babel-types/node_modules/to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
-    },
     "node_modules/backo2": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "optional": true
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "node_modules/bail": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
       "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
       "dev": true,
       "peer": true,
@@ -4203,12 +4184,10 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/base": {
       "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "dependencies": {
@@ -4226,7 +4205,6 @@
     },
     "node_modules/base/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -4238,7 +4216,6 @@
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
@@ -4257,132 +4234,29 @@
     },
     "node_modules/base64url": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/big.js": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dependencies": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "node_modules/bonjour/node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
     },
     "node_modules/bootstrap-tagsinput": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-tagsinput/-/bootstrap-tagsinput-0.7.1.tgz",
       "integrity": "sha1-/+Owa74qEGlF7ygUVoAFqU8hGTc="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -4391,7 +4265,6 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dependencies": {
         "fill-range": "^7.0.1"
@@ -4402,20 +4275,18 @@
     },
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.16.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
-      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+      "version": "4.19.3",
+      "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001251",
-        "colorette": "^1.3.0",
-        "electron-to-chromium": "^1.3.811",
+        "caniuse-lite": "^1.0.30001312",
+        "electron-to-chromium": "^1.4.71",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.75"
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4430,7 +4301,6 @@
     },
     "node_modules/bser": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
       "dependencies": {
@@ -4439,7 +4309,6 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "funding": [
         {
@@ -4460,6 +4329,11 @@
         "ieee754": "^1.1.13"
       }
     },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha1-MyLNMH2Cltqx9gRhhZOyYaP63o8="
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -4469,53 +4343,21 @@
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "node_modules/buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+      "version": "1.1.2",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+    "node_modules/builtin-modules": {
+      "version": "3.2.0",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
+        "node": ">=6"
       },
-      "engines": {
-        "node": ">= 10"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cache-base": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "dependencies": {
@@ -4535,7 +4377,6 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -4545,39 +4386,8 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-callsite/node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "engines": {
         "node": ">=6"
@@ -4585,60 +4395,46 @@
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "optional": true,
+      "version": "6.2.2",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001252",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-      "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "version": "1.0.30001355",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001355.tgz",
+      "integrity": "sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
       "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "dev": true,
       "dependencies": {
@@ -4648,14 +4444,8 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "node_modules/chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -4668,7 +4458,6 @@
     },
     "node_modules/char-regex": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
       "engines": {
@@ -4677,7 +4466,6 @@
     },
     "node_modules/character-entities": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true,
       "peer": true,
@@ -4688,7 +4476,6 @@
     },
     "node_modules/character-entities-legacy": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
       "dev": true,
       "peer": true,
@@ -4699,7 +4486,6 @@
     },
     "node_modules/character-reference-invalid": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true,
       "peer": true,
@@ -4708,14 +4494,8 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-    },
     "node_modules/cheerio": {
       "version": "1.0.0-rc.10",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
       "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
       "dev": true,
       "dependencies": {
@@ -4736,7 +4516,6 @@
     },
     "node_modules/cheerio-select": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
       "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
       "dev": true,
       "dependencies": {
@@ -4750,26 +4529,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "dependencies": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.1"
-      }
-    },
     "node_modules/chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -4780,7 +4539,6 @@
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "engines": {
         "node": ">=6.0"
@@ -4788,19 +4546,16 @@
     },
     "node_modules/ci-info": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
     "node_modules/cjs-module-lexer": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
       "dev": true
     },
     "node_modules/class-utils": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "dependencies": {
@@ -4815,7 +4570,6 @@
     },
     "node_modules/class-utils/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -4827,7 +4581,6 @@
     },
     "node_modules/class-utils/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -4839,7 +4592,6 @@
     },
     "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -4851,7 +4603,6 @@
     },
     "node_modules/class-utils/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -4863,7 +4614,6 @@
     },
     "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -4875,7 +4625,6 @@
     },
     "node_modules/class-utils/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -4889,7 +4638,6 @@
     },
     "node_modules/class-utils/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -4898,20 +4646,10 @@
     },
     "node_modules/classnames": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cliui": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "dependencies": {
@@ -4922,7 +4660,6 @@
     },
     "node_modules/clone": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "engines": {
         "node": ">=0.8"
@@ -4930,7 +4667,6 @@
     },
     "node_modules/clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dependencies": {
         "is-plain-object": "^2.0.4",
@@ -4943,7 +4679,6 @@
     },
     "node_modules/clone-regexp": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
       "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
       "dev": true,
       "peer": true,
@@ -4954,9 +4689,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/clone-regexp/node_modules/is-regexp": {
+      "version": "2.1.0",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true,
       "engines": {
@@ -4964,54 +4707,29 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/codemirror": {
-      "version": "5.61.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
-      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
+      "version": "5.65.2",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "node_modules/codemirror-graphql": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.0.2.tgz",
-      "integrity": "sha512-D4+BdYa6iQnDlio4mBk1Yap5ROCqEWapSFLkiKGatx/I0dF6euzdwd0um3Ndudw6rFQbNuT7hpcH8tnBO6VOfQ==",
+      "version": "1.2.12",
+      "integrity": "sha512-irP+E8HOWtgIdU3PNTU77bNmpEXQYADRRDmKqkjh3w1m0welbxl6HtZgp+c+Mkkz+FXY1+3+gF6nEEj+eJ1xdg==",
       "dependencies": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-parser": "^1.9.0"
+        "@codemirror/stream-parser": "^0.19.2",
+        "graphql-language-service": "^4.1.5"
       },
       "peerDependencies": {
-        "codemirror": "^5.54.0",
-        "graphql": ">= v14.5.0 <= 15.5.0"
+        "codemirror": "^5.58.2",
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
       "dev": true
     },
     "node_modules/collection-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "dependencies": {
@@ -5022,18 +4740,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.4"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
         "color-name": "1.1.3"
@@ -5041,27 +4749,16 @@
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "node_modules/color-string": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-      "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "node_modules/colorette": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
+      "version": "2.0.16",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -5071,54 +4768,29 @@
     },
     "node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "node_modules/component-emitter": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/compression-webpack-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-8.0.1.tgz",
-      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
+      "version": "9.2.0",
+      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
       "dependencies": {
-        "schema-utils": "^3.0.0",
+        "schema-utils": "^4.0.0",
         "serialize-javascript": "^6.0.0"
       },
       "engines": {
@@ -5132,60 +4804,57 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/compression-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/compression-webpack-plugin/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/compression-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+    "node_modules/compression-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dependencies": {
-        "randombytes": "^2.1.0"
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/compression-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/compression-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
       "dependencies": {
-        "ms": "2.0.0"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "node_modules/concat-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
       "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "dev": true,
       "engines": [
@@ -5198,64 +4867,20 @@
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
     },
     "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dependencies": {
         "safe-buffer": "~5.1.1"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true,
       "engines": {
@@ -5264,16 +4889,14 @@
     },
     "node_modules/copy-to-clipboard": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
       "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "dependencies": {
         "toggle-selection": "^1.0.6"
       }
     },
     "node_modules/core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
+      "version": "3.21.1",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -5281,11 +4904,10 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.16.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.4.tgz",
-      "integrity": "sha512-IzCSomxRdahCYb6G3HiN6pl3JCiM0NMunRcNa1pIeC7g17Vd6Ue3AT9anQiENPIm/svThUVer1pIbLMDERIsFw==",
+      "version": "3.21.1",
+      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
       "dependencies": {
-        "browserslist": "^4.16.8",
+        "browserslist": "^4.19.1",
         "semver": "7.0.0"
       },
       "funding": {
@@ -5295,33 +4917,24 @@
     },
     "node_modules/core-js-compat/node_modules/semver": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
       "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
+      "version": "3.21.1",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
       "dev": true,
       "hasInstallScript": true,
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
     "node_modules/cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "version": "7.0.1",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -5333,18 +4946,19 @@
         "node": ">=10"
       }
     },
-    "node_modules/create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
+    "node_modules/cosmiconfig-toml-loader": {
+      "version": "1.0.0",
+      "integrity": "sha512-H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA==",
       "dependencies": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "@iarna/toml": "^2.2.5"
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -5355,135 +4969,83 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
+    "node_modules/cross-undici-fetch": {
+      "version": "0.1.25",
+      "integrity": "sha512-KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw==",
       "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-blank-pseudo": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "abort-controller": "^3.0.0",
+        "form-data-encoder": "^1.7.1",
+        "formdata-node": "^4.3.1",
+        "node-fetch": "^2.6.7",
+        "undici": "^4.9.3",
+        "web-streams-polyfill": "^3.2.0"
       }
     },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "dependencies": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
+      "version": "3.0.4",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "bin": {
-        "css-has-pseudo": "cli.js"
+        "postcss-selector-parser": "^6.0.9"
       },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
       "bin": {
-        "cssesc": "bin/cssesc"
+        "css-has-pseudo": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz",
-      "integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==",
+      "version": "6.6.0",
+      "integrity": "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==",
       "dependencies": {
-        "camelcase": "^6.0.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.3",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.1",
-        "semver": "^7.3.2"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.5",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.27.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/css-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+        "webpack": "^5.0.0"
       }
     },
     "node_modules/css-loader/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -5495,139 +5057,37 @@
         "node": ">=10"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-jFa0Siplmfef4ndKglpVaduY47oHQwioAOEGK0f0vAX0s+vc+SmP6cCMoc+8Adau5600RnOEld5VVdC8CQau7w==",
-      "dependencies": {
-        "cacache": "^15.0.5",
-        "cssnano": "^4.1.10",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.3.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "webpack-sources": "^1.4.3"
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "postcss": "^8.4"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/css-select": {
+      "version": "4.2.1",
+      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "dev": true,
       "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-prefers-color-scheme": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "boolbase": "^1.0.0",
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/css-what": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+      "version": "5.1.0",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
       "dev": true,
       "engines": {
         "node": ">= 6"
@@ -5637,13 +5097,11 @@
       }
     },
     "node_modules/cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+      "version": "6.4.0",
+      "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA=="
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "bin": {
         "cssesc": "bin/cssesc"
@@ -5652,186 +5110,13 @@
         "node": ">=4"
       }
     },
-    "node_modules/cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano/node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cssom": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
       "dev": true
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "dependencies": {
@@ -5843,26 +5128,11 @@
     },
     "node_modules/cssstyle/node_modules/cssom": {
       "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
       "dev": true
     },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/d3": {
       "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.4.0.tgz",
       "integrity": "sha1-CQGZqFadHeI9BKP/B/4TYJX+p04=",
       "dependencies": {
         "d3-array": "1",
@@ -5900,17 +5170,14 @@
     },
     "node_modules/d3-array": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
       "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
     },
     "node_modules/d3-axis": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
       "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
     },
     "node_modules/d3-brush": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
       "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -5922,7 +5189,6 @@
     },
     "node_modules/d3-chord": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
       "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
       "dependencies": {
         "d3-array": "1",
@@ -5931,17 +5197,14 @@
     },
     "node_modules/d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "node_modules/d3-color": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
       "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "node_modules/d3-contour": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
       "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
       "dependencies": {
         "d3-array": "^1.1.1"
@@ -5949,12 +5212,10 @@
     },
     "node_modules/d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
       "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
     },
     "node_modules/d3-drag": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
       "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -5963,7 +5224,6 @@
     },
     "node_modules/d3-dsv": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
       "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
       "dependencies": {
         "commander": "2",
@@ -5984,12 +5244,10 @@
     },
     "node_modules/d3-ease": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
       "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
     },
     "node_modules/d3-fetch": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
       "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
       "dependencies": {
         "d3-dsv": "1"
@@ -5997,7 +5255,6 @@
     },
     "node_modules/d3-force": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
       "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
       "dependencies": {
         "d3-collection": "1",
@@ -6008,12 +5265,10 @@
     },
     "node_modules/d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
       "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
     },
     "node_modules/d3-geo": {
       "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
       "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
       "dependencies": {
         "d3-array": "1"
@@ -6021,12 +5276,10 @@
     },
     "node_modules/d3-hierarchy": {
       "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
       "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "node_modules/d3-interpolate": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
       "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "dependencies": {
         "d3-color": "1"
@@ -6034,27 +5287,22 @@
     },
     "node_modules/d3-path": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "node_modules/d3-polygon": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
       "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
     },
     "node_modules/d3-quadtree": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
       "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
     },
     "node_modules/d3-random": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
       "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
     },
     "node_modules/d3-scale": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
       "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "dependencies": {
         "d3-array": "^1.2.0",
@@ -6067,7 +5315,6 @@
     },
     "node_modules/d3-scale-chromatic": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
       "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
       "dependencies": {
         "d3-color": "1",
@@ -6076,12 +5323,10 @@
     },
     "node_modules/d3-selection": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
       "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
     },
     "node_modules/d3-shape": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
       "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "dependencies": {
         "d3-path": "1"
@@ -6089,12 +5334,10 @@
     },
     "node_modules/d3-time": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
       "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "node_modules/d3-time-format": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
       "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
       "dependencies": {
         "d3-time": "1"
@@ -6102,12 +5345,10 @@
     },
     "node_modules/d3-timer": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
       "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
     },
     "node_modules/d3-transition": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
       "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
       "dependencies": {
         "d3-color": "1",
@@ -6120,12 +5361,10 @@
     },
     "node_modules/d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
       "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
     },
     "node_modules/d3-zoom": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
       "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -6136,26 +5375,12 @@
       }
     },
     "node_modules/damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
+      "version": "1.0.8",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
     },
     "node_modules/data-urls": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
       "dev": true,
       "dependencies": {
@@ -6167,10 +5392,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/dataloader": {
+      "version": "2.0.0",
+      "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
+    },
     "node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.3",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6185,15 +5418,14 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/decamelize-keys": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "peer": true,
@@ -6205,24 +5437,35 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "node_modules/decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true,
       "engines": {
         "node": ">=0.10"
       }
     },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "node_modules/deep-equal": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
       "dependencies": {
         "is-arguments": "^1.0.4",
@@ -6237,81 +5480,18 @@
       }
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/default-gateway/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/default-gateway/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-gateway/node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/define-properties": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dependencies": {
         "object-keys": "^1.0.12"
@@ -6322,7 +5502,6 @@
     },
     "node_modules/define-property": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "dependencies": {
@@ -6333,80 +5512,24 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/denque": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz",
-      "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
     "node_modules/diff": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
       "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "engines": {
         "node": ">=0.3.1"
@@ -6414,7 +5537,6 @@
     },
     "node_modules/diff-sequences": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true,
       "engines": {
@@ -6423,7 +5545,6 @@
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dependencies": {
         "path-type": "^4.0.0"
@@ -6434,37 +5555,12 @@
     },
     "node_modules/discontinuous-range": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
       "dev": true
     },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "node_modules/dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "dependencies": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dependencies": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -6474,7 +5570,6 @@
     },
     "node_modules/dom-serializer": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
       "dev": true,
       "dependencies": {
@@ -6486,15 +5581,10 @@
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/domassist": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domassist/-/domassist-2.2.0.tgz",
-      "integrity": "sha512-fz/B/YgI88m+/fw49tFi1syaGuBuBGA8DkS3J53jkzH+9wD0B8zUwdiExZjQnnJAwI1aXTgNj4nlTlx797zFqQ=="
-    },
     "node_modules/domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
       "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -6504,7 +5594,6 @@
     },
     "node_modules/domexception": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
       "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dev": true,
       "dependencies": {
@@ -6516,7 +5605,6 @@
     },
     "node_modules/domexception/node_modules/webidl-conversions": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
       "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
       "dev": true,
       "engines": {
@@ -6524,9 +5612,8 @@
       }
     },
     "node_modules/domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "version": "4.3.0",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
       "dev": true,
       "dependencies": {
         "domelementtype": "^2.2.0"
@@ -6538,20 +5625,9 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/domodule": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/domodule/-/domodule-8.1.0.tgz",
-      "integrity": "sha512-ION9hZ7tFVNkfLSx2t8gOM5YweUNb3jUezD4JXR7Vqb8S9pZt4kyuCJE25JvxozdkDXBIE9RUUAxDaOPUQV8Vw==",
-      "dependencies": {
-        "attrobj": "^3.1.0",
-        "aug": "^4.0.0",
-        "domassist": "^2.2.0"
-      }
-    },
     "node_modules/domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "version": "2.8.0",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "^1.0.1",
@@ -6562,61 +5638,34 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dset": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz",
-      "integrity": "sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
     "node_modules/ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "hasInstallScript": true,
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.824",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.824.tgz",
-      "integrity": "sha512-Fk+5aD0HDi9i9ZKt9n2VPOZO1dQy7PV++hz2wJ/KIn+CvVfu4fny39squHtyVDPuHNuoJGAZIbuReEklqYIqfA=="
+      "version": "1.4.75",
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "node_modules/emittery": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true,
       "engines": {
@@ -6627,39 +5676,27 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "version": "5.9.1",
+      "integrity": "sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6670,7 +5707,6 @@
     },
     "node_modules/enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "peer": true,
       "dependencies": {
@@ -6682,25 +5718,13 @@
     },
     "node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/envinfo": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
       "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
       "bin": {
         "envinfo": "dist/cli.js"
@@ -6711,7 +5735,6 @@
     },
     "node_modules/enzyme": {
       "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
       "dependencies": {
@@ -6744,7 +5767,6 @@
     },
     "node_modules/enzyme-adapter-react-16": {
       "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz",
       "integrity": "sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==",
       "dev": true,
       "dependencies": {
@@ -6769,7 +5791,6 @@
     },
     "node_modules/enzyme-adapter-react-16/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -6778,7 +5799,6 @@
     },
     "node_modules/enzyme-adapter-utils": {
       "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
       "integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
       "dev": true,
       "dependencies": {
@@ -6799,7 +5819,6 @@
     },
     "node_modules/enzyme-adapter-utils/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -6808,7 +5827,6 @@
     },
     "node_modules/enzyme-shallow-equal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
       "integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
       "dev": true,
       "dependencies": {
@@ -6821,28 +5839,30 @@
     },
     "node_modules/error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -6858,18 +5878,15 @@
     },
     "node_modules/es-array-method-boxes-properly": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
     "node_modules/es-module-lexer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-      "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="
+      "version": "0.9.3",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dependencies": {
         "is-callable": "^1.1.4",
@@ -6885,20 +5902,10 @@
     },
     "node_modules/es6-promise": {
       "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
       "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
-    "node_modules/es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dependencies": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "engines": {
         "node": ">=6"
@@ -6906,12 +5913,10 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "engines": {
         "node": ">=0.8.0"
@@ -6919,7 +5924,6 @@
     },
     "node_modules/escodegen": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "dependencies": {
@@ -6939,9 +5943,44 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/escodegen/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "optional": true,
@@ -6949,14 +5988,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "7.32.0",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "peer": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -7005,12 +6055,48 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      },
+      "engines": {
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
     "node_modules/eslint-config-prettier": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "version": "8.5.0",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
       "dev": true,
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -7020,7 +6106,6 @@
     },
     "node_modules/eslint-config-standard": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
       "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==",
       "dev": true,
       "peer": true,
@@ -7033,42 +6118,29 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.7.3",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "pkg-dir": "^2.0.0"
+        "find-up": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
@@ -7076,20 +6148,16 @@
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils/node_modules/find-up": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "locate-path": "^2.0.0"
       },
@@ -7099,10 +6167,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/locate-path": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -7113,10 +6179,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/p-limit": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-try": "^1.0.0"
       },
@@ -7126,10 +6190,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/p-locate": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-limit": "^1.1.0"
       },
@@ -7137,42 +6199,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-module-utils/node_modules/path-exists": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-es": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
       "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "peer": true,
@@ -7191,51 +6227,43 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.25.4",
+      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.2",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.8.0",
+        "is-glob": "^4.0.3",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
+        "object.values": "^1.1.5",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.12.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7243,246 +6271,117 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
-    "node_modules/eslint-plugin-import/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "p-try": "^1.0.0"
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "node_modules/eslint-plugin-node": {
+      "version": "11.1.0",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "p-limit": "^1.1.0"
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+    "node_modules/eslint-plugin-node/node_modules/ignore": {
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 4"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+    "node_modules/eslint-plugin-promise": {
+      "version": "3.8.0",
+      "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.29.2",
+      "integrity": "sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "engines": {
         "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
-        "emoji-regex": "^9.0.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
-        "language-tags": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
       },
       "peerDependencies": {
-        "eslint": ">=5.16.0"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
-      "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.3.0",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
-        "doctrine": "^2.1.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
-        "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
     "node_modules/eslint-plugin-react/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7492,10 +6391,8 @@
     },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
       "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
       "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -7506,7 +6403,6 @@
     },
     "node_modules/eslint-plugin-standard": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
       "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
       "dev": true,
       "peer": true,
@@ -7516,7 +6412,6 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -7528,7 +6423,6 @@
     },
     "node_modules/eslint-scope/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "engines": {
         "node": ">=4.0"
@@ -7536,7 +6430,6 @@
     },
     "node_modules/eslint-utils": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "peer": true,
       "dependencies": {
@@ -7551,7 +6444,6 @@
     },
     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "peer": true,
       "engines": {
@@ -7560,7 +6452,6 @@
     },
     "node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "engines": {
         "node": ">=10"
@@ -7568,7 +6459,6 @@
     },
     "node_modules/eslint/node_modules/@babel/code-frame": {
       "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
       "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "peer": true,
       "dependencies": {
@@ -7577,7 +6467,6 @@
     },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "peer": true,
       "dependencies": {
@@ -7590,10 +6479,17 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -7608,7 +6504,6 @@
     },
     "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "peer": true,
       "dependencies": {
@@ -7620,13 +6515,11 @@
     },
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "peer": true
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "peer": true,
       "engines": {
@@ -7637,9 +6530,8 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -7653,55 +6545,26 @@
     },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "peer": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "peer": true,
       "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.8.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/eslint/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "peer": true,
       "dependencies": {
@@ -7716,7 +6579,6 @@
     },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "peer": true,
       "dependencies": {
@@ -7726,21 +6588,8 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "peer": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "peer": true,
       "engines": {
@@ -7752,7 +6601,6 @@
     },
     "node_modules/espree": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "peer": true,
       "dependencies": {
@@ -7764,21 +6612,8 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "peer": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "peer": true,
       "engines": {
@@ -7787,7 +6622,6 @@
     },
     "node_modules/esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "bin": {
         "esparse": "bin/esparse.js",
@@ -7799,9 +6633,7 @@
     },
     "node_modules/esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "peer": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -7811,7 +6643,6 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -7821,37 +6652,36 @@
       }
     },
     "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "5.3.0",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "1.0.1",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
     "node_modules/eventemitter3": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
       "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
     },
     "node_modules/events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "engines": {
         "node": ">=0.8.x"
@@ -7859,13 +6689,11 @@
     },
     "node_modules/exec-sh": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "node_modules/execa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "dependencies": {
@@ -7888,7 +6716,6 @@
     },
     "node_modules/execall": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
       "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
       "dev": true,
       "peer": true,
@@ -7901,7 +6728,6 @@
     },
     "node_modules/exit": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true,
       "engines": {
@@ -7910,7 +6736,6 @@
     },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "dependencies": {
@@ -7928,7 +6753,6 @@
     },
     "node_modules/expand-brackets/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -7937,7 +6761,6 @@
     },
     "node_modules/expand-brackets/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -7949,7 +6772,6 @@
     },
     "node_modules/expand-brackets/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -7961,7 +6783,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -7973,7 +6794,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -7985,7 +6805,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -7997,7 +6816,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -8009,7 +6827,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -8023,7 +6840,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -8032,7 +6848,6 @@
     },
     "node_modules/expand-brackets/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -8041,13 +6856,11 @@
     },
     "node_modules/expand-brackets/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
     "node_modules/expect": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
       "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "dependencies": {
@@ -8064,7 +6877,6 @@
     },
     "node_modules/expect/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -8079,7 +6891,6 @@
     },
     "node_modules/expect/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -8091,13 +6902,11 @@
     },
     "node_modules/expect/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/expose-loader": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-2.0.0.tgz",
       "integrity": "sha512-WBpSGlNkn7YwbU2us7O+h0XsoFrB43Y/VCNSpRV4OZFXXKgw8W800BgNxLV0S97N3+KGnFYSCAJi1AV86NO22w==",
       "engines": {
         "node": ">= 10.13.0"
@@ -8110,75 +6919,12 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "dependencies": {
@@ -8191,7 +6937,6 @@
     },
     "node_modules/extglob": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "dependencies": {
@@ -8210,7 +6955,6 @@
     },
     "node_modules/extglob/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -8222,7 +6966,6 @@
     },
     "node_modules/extglob/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -8234,158 +6977,84 @@
     },
     "node_modules/extglob/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extract-files": {
+      "version": "11.0.0",
+      "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==",
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jaydenseric"
+      }
+    },
     "node_modules/extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dependencies": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
       },
       "bin": {
         "extract-zip": "cli.js"
-      }
-    },
-    "node_modules/extract-zip/node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/extract-zip/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/extract-zip/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/extract-zip/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/extract-zip/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
       "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.11",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
     },
     "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.13.0",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/fb-watchman": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
       "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "dev": true,
       "dependencies": {
@@ -8402,9 +7071,7 @@
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "peer": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -8412,59 +7079,46 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "engines": {
-        "node": ">= 0.4.0"
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dependencies": {
+        "minimatch": "^5.0.1"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dependencies": {
-        "ms": "2.0.0"
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "3.3.2",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8479,7 +7133,6 @@
     },
     "node_modules/find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -8491,9 +7144,7 @@
     },
     "node_modules/flat-cache": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "peer": true,
       "dependencies": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -8503,19 +7154,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "peer": true
-    },
-    "node_modules/flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+      "version": "3.2.5",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
     },
     "node_modules/focus-trap": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.1.0.tgz",
       "integrity": "sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==",
       "dependencies": {
         "tabbable": "^4.0.0",
@@ -8523,9 +7166,8 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.9",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
       "funding": [
         {
           "type": "individual",
@@ -8543,24 +7185,14 @@
     },
     "node_modules/for-in": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "dependencies": {
@@ -8572,37 +7204,57 @@
         "node": ">= 6"
       }
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+    "node_modules/form-data-encoder": {
+      "version": "1.7.1",
+      "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
+    },
+    "node_modules/formdata-node": {
+      "version": "4.3.2",
+      "integrity": "sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg==",
+      "dependencies": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.1"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12.20"
+      }
+    },
+    "node_modules/formdata-node/node_modules/web-streams-polyfill": {
+      "version": "4.0.0-beta.1",
+      "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==",
+      "engines": {
+        "node": ">= 12"
       }
     },
     "node_modules/foundation-datepicker": {
       "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foundation-datepicker/-/foundation-datepicker-1.5.6.tgz",
       "integrity": "sha1-bciR8/ZCICghn3QoTRaEVIqMpL8="
     },
     "node_modules/foundation-sites": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.7.0.tgz",
-      "integrity": "sha512-dajdL/7i5rn5F70I2FMnfDOlgXD5klCw8OS9a+Y3rM2fyj9f8JZkJ50eYukmeEM4zVnj+Xo6rJfciLxN/QEYWQ==",
-      "dependencies": {
-        "puppeteer": "^1.11.0"
-      },
+      "version": "6.7.4",
+      "integrity": "sha512-2QPaZJ0Od0DyklhQyKC3zPbr8AAUXSkr1scZJrQTgj/KTLresuCgUBfi7ft32NlOWhuqVXisjOgTE8N5EPS3cg==",
       "engines": {
         "node": ">=12.0"
       },
       "peerDependencies": {
-        "jquery": ">=2.2.0",
-        "what-input": ">=4.1.0"
+        "jquery": ">=3.6.0",
+        "motion-ui": "latest",
+        "what-input": ">=5.2.10"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.1.3",
+      "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
       }
     },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "dependencies": {
@@ -8612,17 +7264,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -8635,7 +7278,6 @@
     },
     "node_modules/fs-extra/node_modules/jsonfile": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
@@ -8652,43 +7294,22 @@
         "node": ">= 8"
       }
     },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
-      "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
+      "version": "1.1.5",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.0",
         "functions-have-names": "^1.2.2"
       },
       "engines": {
@@ -8700,116 +7321,22 @@
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "peer": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "node_modules/functions-have-names": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
       "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fuzzy": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz",
-      "integrity": "sha1-THbsL/CsGjap3M+aAN+GIweNTtg=",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/fuzzysort": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
-      "integrity": "sha512-JzK/lHjVZ6joAg3OnCjylwYXYVjRiwTY6Yb25LvfpJHK8bjisfnZJ5bY8aVWwTwCXgxPNgLAtmHL+Hs5q1ddLQ=="
-    },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "node_modules/gauge/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "globule": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
+      "version": "1.2.1",
+      "integrity": "sha512-egTSF3U6H6T9tXtAhEm5P5guSSDjd96/NUWrbmoGlIu3ATMdXra13gwQdEFRY6ehsFe8xec7UnQz+k34CGWCIg=="
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "engines": {
         "node": ">=6.9.0"
@@ -8817,16 +7344,14 @@
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
       "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -8837,9 +7362,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
     "node_modules/get-package-type": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
       "engines": {
@@ -8847,20 +7375,20 @@
       }
     },
     "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "optional": true,
+      "version": "8.0.0",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/get-stream": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -8871,27 +7399,31 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-value": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8909,7 +7441,6 @@
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -8920,12 +7451,10 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "node_modules/global-modules": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
       "dev": true,
       "peer": true,
@@ -8938,7 +7467,6 @@
     },
     "node_modules/global-prefix": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
       "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
       "dev": true,
       "peer": true,
@@ -8953,7 +7481,6 @@
     },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "peer": true,
@@ -8966,22 +7493,20 @@
     },
     "node_modules/globals": {
       "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -8992,38 +7517,20 @@
       }
     },
     "node_modules/globby/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/globjoin": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true,
       "peer": true
     },
-    "node_modules/globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/gonzales-pe": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
       "dev": true,
       "peer": true,
@@ -9037,416 +7544,190 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/google-protobuf": {
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.20.0.tgz",
+      "integrity": "sha512-hhXv5IKLDIkb0pEm53G053UZGhRAhw3wM5Jk7ly5sGIQRkO1s63FaDqM9QjlrPHygKEE2awUlLP9fFrG6M9vfQ=="
+    },
     "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.9",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "node_modules/graphiql": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.4.2.tgz",
-      "integrity": "sha512-TQDuuU/ZqTWV1yQDpVEiKskg0IYA+Wck37DYrrFzLlpgZWRbWiyab1PyHKiRep7J540CgScBg6C/gGCymKyO3g==",
+      "version": "1.6.0",
+      "integrity": "sha512-VUxnzehiv5BiJzoHQOL7CVFfVjMidate93wSRvFotW7gZluF6PQE45B+LeVWLMRoC59KIUcL+6gtgLHJ5FssvA==",
       "dependencies": {
-        "@graphiql/toolkit": "^0.2.0",
-        "codemirror": "^5.54.0",
-        "codemirror-graphql": "^1.0.0",
+        "@graphiql/toolkit": "^0.4.2",
+        "codemirror": "^5.58.2",
+        "codemirror-graphql": "^1.2.12",
         "copy-to-clipboard": "^3.2.0",
         "dset": "^3.1.0",
         "entities": "^2.0.0",
-        "graphql-language-service": "^3.1.2",
-        "markdown-it": "^10.0.0"
+        "escape-html": "^1.0.3",
+        "graphql-language-service": "^4.1.5",
+        "markdown-it": "^12.2.0"
       },
       "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0",
-        "react": "^16.8.0",
-        "react-dom": "^16.8.0"
+        "graphql": "^15.5.0 || ^16.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/graphql": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
-      "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==",
+      "version": "16.3.0",
+      "integrity": "sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==",
+      "peer": true,
       "engines": {
-        "node": ">= 10.x"
+        "node": "^12.22.0 || ^14.16.0 || >=16.0.0"
       }
     },
-    "node_modules/graphql-docs": {
-      "version": "0.2.1",
-      "resolved": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-      "integrity": "sha512-cfcgxsPudAO5nda6wux/GOJpPVCvuj7oq8DK1CYl91hRijqctyj2ZfM6Q/dxQRNAzkSC1U3o2jmAIrCdrI7Ynw==",
-      "license": "SEE LICENSE IN LICENSE",
+    "node_modules/graphql-config": {
+      "version": "4.1.0",
+      "integrity": "sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==",
       "dependencies": {
-        "marked": "^0.3.5",
-        "react-typeahead": "^2.0.0-alpha.5",
-        "request": "^2.74.0",
-        "yargs": "^5.0.0"
+        "@endemolshinegroup/cosmiconfig-typescript-loader": "3.0.2",
+        "@graphql-tools/graphql-file-loader": "^7.3.2",
+        "@graphql-tools/json-file-loader": "^7.3.2",
+        "@graphql-tools/load": "^7.4.1",
+        "@graphql-tools/merge": "^8.2.1",
+        "@graphql-tools/url-loader": "^7.4.2",
+        "@graphql-tools/utils": "^8.5.1",
+        "cosmiconfig": "7.0.1",
+        "cosmiconfig-toml-loader": "1.0.0",
+        "minimatch": "3.0.4",
+        "string-env-interpolation": "1.0.1"
       },
       "engines": {
-        "node": ">= 4.4.0"
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+    "node_modules/graphql-config/node_modules/minimatch": {
+      "version": "3.0.4",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/graphql-docs/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+    "node_modules/graphql-executor": {
+      "version": "0.0.18",
+      "integrity": "sha512-upUSl7tfZCZ5dWG1XkOvpG70Yk3duZKcCoi/uJso4WxJVT6KIrcK4nZ4+2X/hzx46pL8wAukgYHY6iNmocRN+g==",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "node": "^12.22.0 || ^14.16.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+    "node_modules/graphql-language-service": {
+      "version": "4.1.5",
+      "integrity": "sha512-6vvZ+4L1xMNpQdlt6a9BaEzZD3ZIiaTmFdjKu81UTIVRh02QKfbW6tcz4UJNTY+4LsTWjR1rNtG3H4pVNrKJ2Q==",
       "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "graphql-language-service-interface": "^2.10.2",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "graphql": "dist/temp-bin.js"
+      },
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-    },
-    "node_modules/graphql-docs/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+    "node_modules/graphql-language-service-interface": {
+      "version": "2.10.2",
+      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
       "dependencies": {
-        "number-is-nan": "^1.0.0"
+        "graphql-config": "^4.1.0",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1",
+        "vscode-languageserver-types": "^3.15.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+    "node_modules/graphql-language-service-parser": {
+      "version": "1.10.4",
+      "integrity": "sha512-duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA==",
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graphql-language-service-types": "^1.8.7"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+    "node_modules/graphql-language-service-types": {
+      "version": "1.8.7",
+      "integrity": "sha512-LP/Mx0nFBshYEyD0Ny6EVGfacJAGVx+qXtlJP4hLzUdBNOGimfDNtMVIdZANBXHXcM41MDgMHTnyEx2g6/Ttbw==",
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "graphql-config": "^4.1.0",
+        "vscode-languageserver-types": "^3.15.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+    "node_modules/graphql-language-service-utils": {
+      "version": "2.7.1",
+      "integrity": "sha512-Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA==",
       "dependencies": {
-        "pinkie-promise": "^2.0.0"
+        "@types/json-schema": "7.0.9",
+        "graphql-language-service-types": "^1.8.7",
+        "nullthrows": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
+    "node_modules/graphql-sse": {
+      "version": "1.0.6",
+      "integrity": "sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "graphql": ">=0.11 <=16"
       }
     },
-    "node_modules/graphql-docs/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
       "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "tslib": "^2.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
+    "node_modules/graphql-ws": {
+      "version": "5.6.2",
+      "integrity": "sha512-TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ==",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "node_modules/graphql-docs/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-    },
-    "node_modules/graphql-docs/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
-    },
-    "node_modules/graphql-docs/node_modules/yargs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
-      "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
-      "dependencies": {
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "lodash.assign": "^4.2.0",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "window-size": "^0.2.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^3.2.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/yargs-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
-      "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "lodash.assign": "^4.1.0"
-      }
-    },
-    "node_modules/graphql-language-service": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-3.1.4.tgz",
-      "integrity": "sha512-AF98AT4wLxkE9q1gRf20Yn0EPgd5SctRiw1IkGFivPr98pEX0sKqUcIcIHePn2mxqf73jlWUJV5v6l/CB1gdqQ==",
-      "dependencies": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-types": "^1.8.0"
-      },
-      "bin": {
-        "graphql": "dist/temp-bin.js"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-interface": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.8.4.tgz",
-      "integrity": "sha512-myW8z7HOZkYfhYGKDc0URFkTZChp41Po890W92zuBIhGccckgtiWSJGXaLX+r9QAwVIeZhKaNgEacsyvQb1f/g==",
-      "dependencies": {
-        "graphql-language-service-parser": "^1.9.0",
-        "graphql-language-service-types": "^1.8.0",
-        "graphql-language-service-utils": "^2.5.1",
-        "vscode-languageserver-types": "^3.15.1"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-parser": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.9.2.tgz",
-      "integrity": "sha512-3txms73cJsXDfJQdR5hI83N2rpTuq9FD6aijdrXAeSuI5B60g32DxjelUkt4Ge+2BvBEDLn5ppXlpVYDC9UQHQ==",
-      "dependencies": {
-        "graphql-language-service-types": "^1.8.0"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-types": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz",
-      "integrity": "sha512-Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw==",
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-utils": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.5.3.tgz",
-      "integrity": "sha512-ydevEZ0AgzEKQF3hiCbLXuS0o7189Ww/T30WtCKCLaRHDYk9Yyb2PZWdhSTWLxYZTaX2TccV6NtFWvzIC7UP3g==",
-      "dependencies": {
-        "graphql-language-service-types": "^1.8.0",
-        "nullthrows": "^1.0.0"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-tag": {
-      "version": "2.12.4",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz",
-      "integrity": "sha512-VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
-      }
-    },
-    "node_modules/graphql-ws": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz",
-      "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": ">=0.11 <=15"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": ">=0.11 <=16"
       }
     },
     "node_modules/growly": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true,
       "optional": true
     },
-    "node_modules/gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dependencies": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gzip-size/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
       "peer": true,
@@ -9456,12 +7737,10 @@
     },
     "node_modules/harmony-reflect": {
       "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
       "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
     },
     "node_modules/has": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dependencies": {
         "function-bind": "^1.1.1"
@@ -9470,28 +7749,8 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9499,16 +7758,14 @@
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -9516,16 +7773,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true,
-      "peer": true
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/has-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "dependencies": {
@@ -9539,7 +7801,6 @@
     },
     "node_modules/has-values": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "dependencies": {
@@ -9552,7 +7813,6 @@
     },
     "node_modules/has-values/node_modules/is-number": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "dependencies": {
@@ -9564,7 +7824,6 @@
     },
     "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -9576,7 +7835,6 @@
     },
     "node_modules/has-values/node_modules/kind-of": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
       "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
       "dev": true,
       "dependencies": {
@@ -9586,78 +7844,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "dependencies": {
         "react-is": "^16.7.0"
       }
     },
-    "node_modules/hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "node_modules/hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
     },
     "node_modules/html-element-map": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
       "dev": true,
       "dependencies": {
@@ -9670,7 +7870,6 @@
     },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
       "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
       "dev": true,
       "dependencies": {
@@ -9680,20 +7879,13 @@
         "node": ">=10"
       }
     },
-    "node_modules/html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
-    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
     "node_modules/html-tags": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
       "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
       "dev": true,
       "peer": true,
@@ -9703,12 +7895,10 @@
     },
     "node_modules/html5sortable": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
       "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
     },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "funding": [
@@ -9725,52 +7915,8 @@
         "entities": "^2.0.0"
       }
     },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
-    },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/http-proxy-agent": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "dependencies": {
@@ -9782,54 +7928,8 @@
         "node": ">= 6"
       }
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/http-proxy/node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dev": true,
       "dependencies": {
@@ -9842,7 +7942,6 @@
     },
     "node_modules/human-signals": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
       "engines": {
@@ -9851,7 +7950,6 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -9861,19 +7959,21 @@
       }
     },
     "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
+      "version": "5.1.0",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
+    "node_modules/idb": {
+      "version": "6.1.5",
+      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+    },
     "node_modules/identity-obj-proxy": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
       "dependencies": {
         "harmony-reflect": "^1.4.6"
@@ -9884,7 +7984,6 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "funding": [
         {
@@ -9903,16 +8002,17 @@
     },
     "node_modules/ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "peer": true,
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/immutable": {
+      "version": "4.0.0",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -9927,7 +8027,6 @@
     },
     "node_modules/import-fresh/node_modules/resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "engines": {
         "node": ">=4"
@@ -9935,7 +8034,6 @@
     },
     "node_modules/import-lazy": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
       "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
       "dev": true,
       "peer": true,
@@ -9944,9 +8042,8 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -9956,11 +8053,13 @@
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "engines": {
         "node": ">=0.8.19"
@@ -9968,25 +8067,15 @@
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dependencies": {
         "once": "^1.3.0",
@@ -9995,39 +8084,17 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true,
       "peer": true
     },
-    "node_modules/internal-ip": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
-      "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==",
-      "dependencies": {
-        "default-gateway": "^6.0.0",
-        "ipaddr.js": "^1.9.1",
-        "is-ip": "^3.1.0",
-        "p-event": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/internal-ip?sponsor=1"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
       "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
@@ -10039,7 +8106,6 @@
     },
     "node_modules/interpret": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
       "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
       "engines": {
         "node": ">= 0.10"
@@ -10047,69 +8113,21 @@
     },
     "node_modules/intl": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
       "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/invert-kv": {
+    "node_modules/is-accessor-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "node_modules/ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-alphabetical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true,
       "peer": true,
@@ -10120,7 +8138,6 @@
     },
     "node_modules/is-alphanumerical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
       "dev": true,
       "peer": true,
@@ -10134,11 +8151,11 @@
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10149,34 +8166,24 @@
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "version": "1.0.4",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "has-bigints": "^1.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10187,14 +8194,12 @@
     },
     "node_modules/is-buffer": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10204,7 +8209,6 @@
     },
     "node_modules/is-ci": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "dependencies": {
@@ -10214,23 +8218,9 @@
         "is-ci": "bin.js"
       }
     },
-    "node_modules/is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "dependencies": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
     "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.8.1",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -10240,7 +8230,6 @@
     },
     "node_modules/is-data-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
       "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "dependencies": {
@@ -10251,9 +8240,11 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "version": "1.0.5",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10263,7 +8254,6 @@
     },
     "node_modules/is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "dev": true,
       "peer": true,
@@ -10274,7 +8264,6 @@
     },
     "node_modules/is-descriptor": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
       "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "dependencies": {
@@ -10286,18 +8275,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "optional": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -10310,7 +8292,6 @@
     },
     "node_modules/is-extendable": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
       "dependencies": {
@@ -10322,28 +8303,13 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
         "node": ">=8"
@@ -10351,7 +8317,6 @@
     },
     "node_modules/is-generator-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
       "engines": {
@@ -10359,9 +8324,8 @@
       }
     },
     "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -10371,7 +8335,6 @@
     },
     "node_modules/is-hexadecimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true,
       "peer": true,
@@ -10380,21 +8343,13 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-ip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
-      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
-      "dependencies": {
-        "ip-regex": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "version": "2.0.2",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10404,16 +8359,17 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10422,42 +8378,23 @@
       }
     },
     "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "version": "1.0.1",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "version": "1.1.0",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dependencies": {
         "isobject": "^3.0.1"
@@ -10468,17 +8405,15 @@
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10488,32 +8423,35 @@
       }
     },
     "node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "peer": true,
+      "version": "1.0.0",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "version": "2.0.1",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "version": "1.0.7",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10523,13 +8461,11 @@
     },
     "node_modules/is-subset": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
       "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
       "dev": true
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dependencies": {
         "has-symbols": "^1.0.2"
@@ -10543,12 +8479,11 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
       "peer": true,
@@ -10559,14 +8494,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-windows": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
       "engines": {
@@ -10575,8 +8514,9 @@
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -10586,45 +8526,44 @@
     },
     "node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "node_modules/isobject": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    "node_modules/isomorphic-ws": {
+      "version": "4.0.1",
+      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
+      "peerDependencies": {
+        "ws": "*"
+      }
     },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.1.0",
+      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -10633,7 +8572,6 @@
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dev": true,
       "dependencies": {
@@ -10647,7 +8585,6 @@
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -10656,7 +8593,6 @@
     },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -10667,9 +8603,8 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "version": "4.0.1",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
@@ -10677,12 +8612,11 @@
         "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -10690,9 +8624,8 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.4",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -10704,73 +8637,29 @@
     },
     "node_modules/iterall": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
-      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
-      "optional": true
-    },
-    "node_modules/jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
-      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^26.6.3"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
-      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
+      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="
     },
-    "node_modules/jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
-      "dev": true,
+    "node_modules/jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
       "dependencies": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
       },
       "bin": {
-        "jest": "bin/jest.js"
+        "jake": "bin/cli.js"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
+    "node_modules/jake/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10781,11 +8670,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
+    "node_modules/jake/node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10797,11 +8690,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
+    "node_modules/jake/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10809,26 +8701,23 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-cli/node_modules/color-name": {
+    "node_modules/jake/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/jest-cli/node_modules/has-flag": {
+    "node_modules/jake/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-cli/node_modules/supports-color": {
+    "node_modules/jake/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10836,229 +8725,208 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-config": {
+    "node_modules/jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
         "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-changed-files": {
+      "version": "26.6.2",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus": {
+      "version": "27.5.1",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+    "node_modules/jest-circus/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
       "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+    "node_modules/jest-circus/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
       "dev": true,
       "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "node_modules/jest-each": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
-      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
+    "node_modules/jest-circus/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11071,10 +8939,20 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11087,9 +8965,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/color-convert": {
+    "node_modules/jest-circus/node_modules/ci-info": {
+      "version": "3.3.0",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+      "dev": true
+    },
+    "node_modules/jest-circus/node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
+    },
+    "node_modules/jest-circus/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11099,301 +8986,405 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/color-name": {
+    "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/execa": {
+      "version": "5.1.1",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
-      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+    "node_modules/jest-circus/node_modules/expect": {
+      "version": "27.5.1",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jsdom": "^16.4.0"
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
-      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+    "node_modules/jest-circus/node_modules/get-stream": {
+      "version": "6.0.1",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+      "engines": {
+        "node": ">=10"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+    "node_modules/jest-circus/node_modules/human-signals": {
+      "version": "2.1.0",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/jest-haste-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
-      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+    "node_modules/jest-circus/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.1.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
-      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+    "node_modules/jest-circus/node_modules/jest-each": {
+      "version": "27.5.1",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
+        "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^26.6.2",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2",
-        "throat": "^5.0.0"
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/jest-circus/node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
     },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+    "node_modules/jest-circus/node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-localstorage-mock": {
-      "version": "2.4.14",
-      "resolved": "https://registry.npmjs.org/jest-localstorage-mock/-/jest-localstorage-mock-2.4.14.tgz",
-      "integrity": "sha512-B+Y0y3J4wBOHdmcFSicWmVYMFAZFbJvjs1EfRIzUJRg2UAK+YVVUgTn7/MdjENey5xbBKmraBmKY5EX+x1NJXA==",
+    "node_modules/jest-circus/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
       "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
       "engines": {
-        "node": ">=6.16.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dev": true,
       "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/jest-validate": {
+      "version": "27.5.1",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/jest-circus/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-circus/node_modules/react-is": {
+      "version": "17.0.2",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+    "node_modules/jest-circus/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11403,29 +9394,39 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+    "node_modules/jest-circus/node_modules/throat": {
+      "version": "6.0.1",
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+      "dev": true
+    },
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
+        "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
+    "node_modules/jest-cli/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11438,10 +9439,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11454,9 +9454,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-convert": {
+    "node_modules/jest-cli/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11466,24 +9465,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-name": {
+    "node_modules/jest-cli/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-message-util/node_modules/has-flag": {
+    "node_modules/jest-cli/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util/node_modules/supports-color": {
+    "node_modules/jest-cli/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11493,81 +9489,44 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
-      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+    "node_modules/jest-config": {
+      "version": "26.6.3",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
         "@jest/types": "^26.6.2",
-        "@types/node": "*"
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
       },
       "peerDependencies": {
-        "jest-resolve": "*"
+        "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
-        "jest-resolve": {
+        "ts-node": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
-      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.6.2",
-        "read-pkg-up": "^7.0.1",
-        "resolve": "^1.18.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
-      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
+    "node_modules/jest-config/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11580,10 +9539,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11596,9 +9554,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-convert": {
+    "node_modules/jest-config/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11608,24 +9565,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-name": {
+    "node_modules/jest-config/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-resolve/node_modules/has-flag": {
+    "node_modules/jest-config/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/supports-color": {
+    "node_modules/jest-config/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11635,40 +9589,22 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
-      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.7.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-leak-detector": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
+    "node_modules/jest-diff/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11681,10 +9617,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11697,9 +9632,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/color-convert": {
+    "node_modules/jest-diff/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11709,24 +9643,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/color-name": {
+    "node_modules/jest-diff/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-runner/node_modules/has-flag": {
+    "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner/node_modules/supports-color": {
+    "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11736,50 +9667,34 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.6.2",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-snapshot": "^26.6.2",
+        "jest-get-type": "^26.3.0",
         "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest-runtime": "bin/jest-runtime.js"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
+    "node_modules/jest-each/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11792,10 +9707,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11808,9 +9722,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-convert": {
+    "node_modules/jest-each/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11820,24 +9733,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-name": {
+    "node_modules/jest-each/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
+    "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/supports-color": {
+    "node_modules/jest-each/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11847,151 +9757,103 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-serializer": {
+    "node_modules/jest-environment-jsdom": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
-      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "graceful-fs": "^4.2.4"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot": {
+    "node_modules/jest-environment-node": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
-      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.0.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^26.6.2",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
-        "semver": "^7.3.2"
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-haste-map": {
+      "version": "26.6.2",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">= 10.14.2"
       },
-      "engines": {
-        "node": ">=8"
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
       }
     },
-    "node_modules/jest-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+    "node_modules/jest-jasmine2": {
+      "version": "26.6.3",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
         "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
+    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12004,10 +9866,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12020,9 +9881,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/color-convert": {
+    "node_modules/jest-jasmine2/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12032,24 +9892,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
+    "node_modules/jest-jasmine2/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-util/node_modules/has-flag": {
+    "node_modules/jest-jasmine2/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-util/node_modules/supports-color": {
+    "node_modules/jest-jasmine2/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12059,26 +9916,42 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate": {
+    "node_modules/jest-leak-detector": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-localstorage-mock": {
+      "version": "2.4.19",
+      "integrity": "sha512-TW7Cw6dbg4mgpxVUKmHU/sjOaUrUU2kp1DiWAY7JaPGDN1cRC/yXx1ewcJyPZ4d4qAd0UtJOER50sDjJSwVYGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.16.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "leven": "^3.1.0",
         "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12091,22 +9964,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12119,9 +9979,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/color-convert": {
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12131,24 +9990,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/color-name": {
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-validate/node_modules/has-flag": {
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate/node_modules/supports-color": {
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12158,27 +10014,27 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher": {
+    "node_modules/jest-message-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
+        "@babel/code-frame": "^7.0.0",
         "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
+        "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
-        "string-length": "^4.0.1"
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12191,10 +10047,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12207,9 +10062,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-convert": {
+    "node_modules/jest-message-util/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12219,24 +10073,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-name": {
+    "node_modules/jest-message-util/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-watcher/node_modules/has-flag": {
+    "node_modules/jest-message-util/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher/node_modules/supports-color": {
+    "node_modules/jest-message-util/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12246,542 +10097,551 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-worker": {
+    "node_modules/jest-mock": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">=6"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
-    },
-    "node_modules/jquery-serializejson": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-2.9.0.tgz",
-      "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
-    },
-    "node_modules/jquery.autocomplete": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jquery.autocomplete/-/jquery.autocomplete-1.2.0.tgz",
-      "integrity": "sha512-aoJC3KVrPpRGaZBUo9UxhwznYmQ0UuYd+FfjP9RAKmyB+1T3OLIjuQImT8pKX6eKpBt1z9JmD48GiD2Dx303bA==",
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
       "engines": {
-        "node": ">=4.2"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    "node_modules/jest-resolve": {
+      "version": "26.6.2",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     },
-    "node_modules/jsdom": {
-      "version": "16.6.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
-      "integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.5",
-        "xml-name-validator": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
       },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
+    "node_modules/jest-resolve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "peer": true
+    "node_modules/jest-resolve/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    "node_modules/jest-resolve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz",
-      "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
       "dependencies": {
-        "universalify": "^0.1.2"
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
-      "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "array-includes": "^3.1.2",
-        "object.assign": "^4.1.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+    "node_modules/jest-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+    "node_modules/jest-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/known-css-properties": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
-      "peer": true
-    },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
     },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
-        "invert-kv": "^1.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/leaflet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.1.tgz",
-      "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
-    },
-    "node_modules/leaflet-svgicon": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-svgicon/-/leaflet-svgicon-0.0.2.tgz",
-      "integrity": "sha512-9hGBLBHHcCSZAdVLwdiZbU2c/Z47eziDQslDrRQRcBNomEazH4NXvqY8egDMw+zGh/nBQub6jvTl1ty2nlEwmQ==",
+    "node_modules/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
-        "src": "^1.1.2"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/leaflet-tilelayer-here": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-tilelayer-here/-/leaflet-tilelayer-here-1.0.2.tgz",
-      "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
+    "node_modules/jest-runtime/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/leaflet.markercluster": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz",
-      "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
-      "peerDependencies": {
-        "leaflet": "~1.3.1"
+    "node_modules/jest-runtime/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+    "node_modules/jest-serializer": {
+      "version": "26.6.2",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
-    },
-    "node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+    "node_modules/jest-snapshot": {
+      "version": "26.6.2",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+    "node_modules/jest-snapshot/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "peer": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+    "node_modules/jest-snapshot/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=6.11.5"
+        "node": ">=10"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/lockfile": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
-      "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
-      "dependencies": {
-        "signal-exit": "^3.0.2"
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "peer": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "node_modules/lodash.escape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
-      "dev": true
-    },
-    "node_modules/lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "node_modules/lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "peer": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "peer": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
+    "node_modules/jest-validate/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12792,12 +10652,21 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12809,12 +10678,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
+    "node_modules/jest-validate/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12822,29 +10689,23 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/log-symbols/node_modules/color-name": {
+    "node_modules/jest-validate/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
-    "node_modules/log-symbols/node_modules/has-flag": {
+    "node_modules/jest-validate/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
+    "node_modules/jest-validate/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12852,1658 +10713,1662 @@
         "node": ">=8"
       }
     },
-    "node_modules/long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
-    "node_modules/longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+    "node_modules/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/jest-watcher/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "devOptional": true,
-      "peer": true,
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "object-visit": "^1.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
-    },
-    "node_modules/marked": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
-      "bin": {
-        "marked": "bin/marked"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
+        "has-flag": "^4.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
-      "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/jquery-serializejson": {
+      "version": "2.9.0",
+      "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
     },
-    "node_modules/mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
+    "node_modules/js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/mem?sponsor=1"
+        "node": ">=12"
       }
     },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dependencies": {
-        "fs-monkey": "1.0.3"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">= 4.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
       "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/meow/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/meow/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/meow/node_modules/parse-json": {
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "node_modules/json5": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "optional": true,
-      "peer": true,
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/meow/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsonfile": {
+      "version": "5.0.0",
+      "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
       "dependencies": {
-        "pinkie-promise": "^2.0.0"
+        "universalify": "^0.1.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/meow/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
+    "node_modules/jsonpointer": {
+      "version": "5.0.0",
+      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsx-ast-utils": {
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
+      "dev": true,
       "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "array-includes": "^3.1.3",
+        "object.assign": "^4.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/meow/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "engines": {
+        "node": ">= 8"
+      }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/meros": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz",
-      "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "@types/node": ">=12"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
+    "node_modules/known-css-properties": {
+      "version": "0.21.0",
+      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.21",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+      "dev": true
     },
-    "node_modules/micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "peer": true,
       "dependencies": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
+        "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
+    "node_modules/leaflet": {
+      "version": "1.3.1",
+      "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
+    "node_modules/leaflet-tilelayer-here": {
+      "version": "1.0.2",
+      "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
+    },
+    "node_modules/leaflet.markercluster": {
+      "version": "1.4.1",
+      "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
+      "peerDependencies": {
+        "leaflet": "~1.3.1"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dependencies": {
-        "mime-db": "1.48.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
       }
     },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz",
-      "integrity": "sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
-      },
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.0.0"
+        "node": ">=6.11.5"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+    "node_modules/loader-utils": {
+      "version": "1.4.0",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+    "node_modules/loader-utils/node_modules/json5": {
+      "version": "1.0.1",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "node_modules/lockfile": {
+      "version": "1.0.4",
+      "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "signal-exit": "^3.0.2"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    "node_modules/lodash.escape": {
+      "version": "4.0.1",
+      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+      "dev": true
     },
-    "node_modules/minimist-options": {
+    "node_modules/lodash.flattendeep": {
+      "version": "4.4.0",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "node_modules/lodash.has": {
+      "version": "4.5.2",
+      "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "peer": true
+    },
+    "node_modules/log-symbols": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minimist-options/node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/long": {
+      "version": "5.2.0",
+      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
     },
-    "node_modules/moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
-      "engines": {
-        "node": "*"
+    "node_modules/longest-streak": {
+      "version": "2.0.4",
+      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/moo": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
-      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
-      "dev": true
-    },
-    "node_modules/morphdom": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
-      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dependencies": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       },
       "bin": {
-        "multicast-dns": "cli.js"
+        "loose-envify": "cli.js"
       }
     },
-    "node_modules/multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    "node_modules/magic-string": {
+      "version": "0.25.8",
+      "integrity": "sha512-n9NlSgfkB2rPYjSd/EZDoQcsXzwYAv4CIB/vi3ZSvZ2Tjax5W5Ie1NMy4HG3PVdcL4bBMMR20Ng4UcISMzqRLw==",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
     },
-    "node_modules/nearley": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
-      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
-      "dev": true,
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dependencies": {
-        "commander": "^2.19.0",
-        "moo": "^0.5.0",
-        "railroad-diagrams": "^1.0.0",
-        "randexp": "0.4.6"
+        "semver": "^6.0.0"
       },
-      "bin": {
-        "nearley-railroad": "bin/nearley-railroad.js",
-        "nearley-test": "bin/nearley-test.js",
-        "nearley-unparse": "bin/nearley-unparse.js",
-        "nearleyc": "bin/nearleyc.js"
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "individual",
-        "url": "https://nearley.js.org/#give-to-nearley"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "engines": {
-        "node": ">= 0.6"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
     },
-    "node_modules/node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
-      "optional": true,
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
       "engines": {
-        "node": ">= 10.12.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-gyp/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "optional": true,
-      "peer": true,
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "object-visit": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node_modules/node-jose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.0.0.tgz",
-      "integrity": "sha512-j8zoFze1gijl8+DK/dSXXqX7+o2lMYv1XS+ptnXgGV/eloQaqq1YjNtieepbKs9jBS4WTnMOqyKSaQuunJzx0A==",
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dependencies": {
-        "base64url": "^3.0.1",
-        "buffer": "^5.5.0",
-        "es6-promise": "^4.2.8",
-        "lodash": "^4.17.15",
-        "long": "^4.0.0",
-        "node-forge": "^0.10.0",
-        "pako": "^1.0.11",
-        "process": "^0.11.10",
-        "uuid": "^3.3.3"
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
       }
     },
-    "node_modules/node-jose/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/node-notifier": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
-      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+    "node_modules/mdast-util-from-markdown": {
+      "version": "0.8.5",
+      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
       "dev": true,
-      "optional": true,
+      "peer": true,
       "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-string": "^2.0.0",
+        "micromark": "~2.11.0",
+        "parse-entities": "^2.0.0",
+        "unist-util-stringify-position": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/node-notifier/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/mdast-util-to-markdown": {
+      "version": "0.6.5",
+      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
       "dev": true,
-      "optional": true,
+      "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@types/unist": "^2.0.0",
+        "longest-streak": "^2.0.0",
+        "mdast-util-to-string": "^2.0.0",
+        "parse-entities": "^2.0.0",
+        "repeat-string": "^1.0.0",
+        "zwitch": "^1.0.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/node-releases": {
-      "version": "1.1.75",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
-      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
+    "node_modules/mdast-util-to-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
     },
-    "node_modules/node-sass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
-      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
-      "hasInstallScript": true,
-      "optional": true,
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^7.0.3",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^7.1.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "bin": {
-        "node-sass": "bin/node-sass"
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-sass/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
+    "node_modules/meow/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
       "peer": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "optional": true,
+    "node_modules/meow/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
       "peer": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "optional": true,
+    "node_modules/meow/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "optional": true,
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
+      "engines": {
+        "node": ">=10"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-sass/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/supports-color": {
+    "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "optional": true,
-      "peer": true,
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "abbrev": "1"
+    "node_modules/meros": {
+      "version": "1.2.0",
+      "integrity": "sha512-3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ==",
+      "engines": {
+        "node": ">=12"
       },
-      "bin": {
-        "nopt": "bin/nopt.js"
+      "peerDependencies": {
+        "@types/node": ">=12"
       },
-      "engines": {
-        "node": ">=6"
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+    "node_modules/micromark": {
+      "version": "2.11.4",
+      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "peer": true,
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "debug": "^4.0.0",
+        "parse-entities": "^2.0.0"
       }
     },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/micromatch": {
+      "version": "4.0.4",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=8.6"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "dependencies": {
+        "mime-db": "1.51.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.5.3",
+      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
       "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
-      "dev": true,
+    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "boolbase": "^1.0.0"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/nullthrows": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
-      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
+    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
     },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
+    "node_modules/minipass": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
+    "node_modules/moment": {
+      "version": "2.29.1",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/moo": {
+      "version": "0.5.1",
+      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
+      "dev": true
     },
-    "node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/morphdom": {
+      "version": "2.6.1",
+      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
     },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/motion-ui": {
+      "version": "2.0.3",
+      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
+      "peer": true,
+      "peerDependencies": {
+        "jquery": ">=2.2.0"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.1",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.0"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "node_modules/nearley": {
+      "version": "2.20.1",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "nearley-railroad": "bin/nearley-railroad.js",
+        "nearley-test": "bin/nearley-test.js",
+        "nearley-unparse": "bin/nearley-unparse.js",
+        "nearleyc": "bin/nearleyc.js"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "individual",
+        "url": "https://nearley.js.org/#give-to-nearley"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10.5.0"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
-      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
-      "dev": true,
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "4.x || >=6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 6.13.0"
       }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
     },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+    "node_modules/node-jose": {
+      "version": "2.1.0",
+      "integrity": "sha512-Zmm8vFPJabphGBc5Wz1/LUMPS+1cynqw16RIhgVNQMEI2yEQrvl7Gx2EwN9GhP8tkm8f7SH53K2nIx8TeNTIdg==",
       "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "engines": {
-        "node": ">= 0.8"
+        "base64url": "^3.0.1",
+        "buffer": "^6.0.3",
+        "es6-promise": "^4.2.8",
+        "lodash": "^4.17.21",
+        "long": "^5.2.0",
+        "node-forge": "^1.2.1",
+        "pako": "^2.0.4",
+        "process": "^0.11.10",
+        "uuid": "^8.3.2"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "node_modules/node-jose/node_modules/buffer": {
+      "version": "6.0.3",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "wrappy": "1"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
       }
     },
-    "node_modules/open": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
-      "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
+    "node_modules/node-notifier/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "lru-cache": "^6.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
+    "node_modules/node-releases": {
+      "version": "2.0.2",
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
-    "node_modules/optimism": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz",
-      "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "dependencies": {
-        "@wry/context": "^0.6.0",
-        "@wry/trie": "^0.3.0"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "peer": true
     },
-    "node_modules/p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dependencies": {
-        "p-timeout": "^3.1.0"
+        "path-key": "^3.0.0"
       },
       "engines": {
         "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+    "node_modules/nullthrows": {
+      "version": "1.1.1",
+      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "is-descriptor": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
       "dependencies": {
-        "@types/retry": "^0.12.0",
-        "retry": "^0.13.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
       "dependencies": {
-        "p-finally": "^1.0.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.hasown": {
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optimism": {
+      "version": "0.16.1",
+      "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
+      "dependencies": {
+        "@wry/context": "^0.6.0",
+        "@wry/trie": "^0.3.0"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.2.0",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-try": {
+      "version": "2.2.0",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "version": "2.0.4",
+      "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
     },
     "node_modules/parchment": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
       "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dependencies": {
         "callsites": "^3.0.0"
@@ -14514,7 +12379,6 @@
     },
     "node_modules/parse-entities": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "dev": true,
       "peer": true,
@@ -14533,7 +12397,6 @@
     },
     "node_modules/parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
@@ -14550,30 +12413,19 @@
     },
     "node_modules/parse5": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
       "dependencies": {
         "parse5": "^6.0.1"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/pascalcase": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true,
       "engines": {
@@ -14582,12 +12434,10 @@
     },
     "node_modules/path-complete-extname": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
       "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
         "node": ">=8"
@@ -14595,7 +12445,6 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "engines": {
         "node": ">=0.10.0"
@@ -14603,7 +12452,6 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
         "node": ">=8"
@@ -14611,17 +12459,10 @@
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "engines": {
         "node": ">=8"
@@ -14634,13 +12475,15 @@
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
         "node": ">=8.6"
       },
@@ -14650,47 +12493,22 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -14698,95 +12516,8 @@
         "node": ">=8"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pnp-webpack-plugin": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
       "integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
       "dependencies": {
         "ts-pnp": "^1.1.6"
@@ -14795,41 +12526,8 @@
         "node": ">=6"
       }
     },
-    "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true,
       "engines": {
@@ -14837,16 +12535,15 @@
       }
     },
     "node_modules/postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "8.4.7",
+      "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
       "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "nanoid": "^3.3.1",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^10 || ^12 || >=14"
       },
       "funding": {
         "type": "opencollective",
@@ -14854,352 +12551,195 @@
       }
     },
     "node_modules/postcss-attribute-case-insensitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
-      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
+      "version": "5.0.0",
+      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
       "dependencies": {
-        "postcss": "^7.0.2",
         "postcss-selector-parser": "^6.0.2"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "dependencies": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.2"
       }
     },
     "node_modules/postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
+      "version": "4.2.2",
+      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
+      "version": "8.0.3",
+      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
       "dependencies": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "7.0.2",
+      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
+      "version": "8.0.0",
+      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "version": "12.1.4",
+      "integrity": "sha512-i6AytuTCoDLJkWN/MtAIGriJz3j7UX6bV7Z5t+KgFz+dwZS15/mlTJY1S0kRizlk6ba0V8u8hN50Fz5Nm7tdZw==",
       "dependencies": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "version": "6.0.0",
+      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+        "node": ">=10.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.1.2"
       }
     },
-    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.4",
+      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
       "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.0",
+      "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+    "node_modules/postcss-env-function": {
+      "version": "4.0.5",
+      "integrity": "sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA==",
       "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-flexbugs-fixes": {
+      "version": "5.0.2",
+      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "peerDependencies": {
+        "postcss": "^8.1.4"
       }
     },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "dependencies": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "dependencies": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
-      "dependencies": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.3",
+      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+    "node_modules/postcss-html": {
+      "version": "0.36.0",
+      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "htmlparser2": "^3.10.0"
       },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "dependencies": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
-      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "htmlparser2": "^3.10.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=5.0.0",
-        "postcss-syntax": ">=0.36.0"
+      "peerDependencies": {
+        "postcss": ">=5.0.0",
+        "postcss-syntax": ">=0.36.0"
       }
     },
     "node_modules/postcss-html/node_modules/dom-serializer": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
       "peer": true,
@@ -15210,7 +12750,6 @@
     },
     "node_modules/postcss-html/node_modules/dom-serializer/node_modules/domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
       "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
       "dev": true,
       "funding": [
@@ -15223,7 +12762,6 @@
     },
     "node_modules/postcss-html/node_modules/dom-serializer/node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
       "peer": true,
@@ -15233,14 +12771,12 @@
     },
     "node_modules/postcss-html/node_modules/domelementtype": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true,
       "peer": true
     },
     "node_modules/postcss-html/node_modules/domhandler": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "peer": true,
@@ -15250,7 +12786,6 @@
     },
     "node_modules/postcss-html/node_modules/domutils": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
       "peer": true,
@@ -15261,14 +12796,12 @@
     },
     "node_modules/postcss-html/node_modules/entities": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true,
       "peer": true
     },
     "node_modules/postcss-html/node_modules/htmlparser2": {
       "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
       "peer": true,
@@ -15282,60 +12815,56 @@
       }
     },
     "node_modules/postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "version": "4.0.6",
+      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.2",
+      "integrity": "sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==",
       "dependencies": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
-    "node_modules/postcss-import/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-initial": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
-      "integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
+      "version": "4.0.1",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "version": "4.1.1",
+      "integrity": "sha512-j3Z0WQCimY2tMle++YcmygnnVbt6XdnrCV1FO2IpzaCSmtTF2oO8h4ZYUA1Q+QHYroIiaWPvNHt9uBR4riCksQ==",
       "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-less": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
       "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
       "dev": true,
       "peer": true,
@@ -15346,17 +12875,48 @@
         "node": ">=6.14.4"
       }
     },
+    "node_modules/postcss-less/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/postcss-less/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-less/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "version": "6.2.1",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -15369,7 +12929,6 @@
     },
     "node_modules/postcss-loader/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -15382,617 +12941,335 @@
       }
     },
     "node_modules/postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
+      "version": "5.0.4",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
+      "version": "5.0.0",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-media-query-parser": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true,
       "peer": true
     },
-    "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
+        "icss-utils": "^5.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+    "node_modules/postcss-nesting": {
+      "version": "10.1.2",
+      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
       "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-selector-parser": "^6.0.8"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.2",
+      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==",
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
       "engines": {
-        "node": ">= 6"
+        "node": "^12 || ^14 || >=16"
       }
     },
-    "node_modules/postcss-modules-local-by-default": {
+    "node_modules/postcss-overflow-shorthand": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
+      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">= 6"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "peerDependencies": {
+        "postcss": "^8"
       }
     },
-    "node_modules/postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
+    "node_modules/postcss-place": {
+      "version": "7.0.4",
+      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
       "dependencies": {
-        "postcss": "^7.0.2"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dependencies": {
-        "postcss": "^7.0.0"
+    "node_modules/postcss-preset-env": {
+      "version": "7.4.2",
+      "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
+      "dependencies": {
+        "@csstools/postcss-color-function": "^1.0.2",
+        "@csstools/postcss-font-format-keywords": "^1.0.0",
+        "@csstools/postcss-hwb-function": "^1.0.0",
+        "@csstools/postcss-ic-unit": "^1.0.0",
+        "@csstools/postcss-is-pseudo-class": "^2.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.0",
+        "@csstools/postcss-oklab-function": "^1.0.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.2.0",
+        "autoprefixer": "^10.4.2",
+        "browserslist": "^4.19.3",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^6.4.0",
+        "postcss-attribute-case-insensitive": "^5.0.0",
+        "postcss-color-functional-notation": "^4.2.2",
+        "postcss-color-hex-alpha": "^8.0.3",
+        "postcss-color-rebeccapurple": "^7.0.2",
+        "postcss-custom-media": "^8.0.0",
+        "postcss-custom-properties": "^12.1.4",
+        "postcss-custom-selectors": "^6.0.0",
+        "postcss-dir-pseudo-class": "^6.0.4",
+        "postcss-double-position-gradients": "^3.1.0",
+        "postcss-env-function": "^4.0.5",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.3",
+        "postcss-image-set-function": "^4.0.6",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.1.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.2",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.3",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.4",
+        "postcss-pseudo-class-any-link": "^7.1.1",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^5.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.1",
+      "integrity": "sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg==",
       "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "peerDependencies": {
+        "postcss": "^8.0.3"
       }
     },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/postcss-normalize-repeat-style": {
+    "node_modules/postcss-safe-parser": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.26"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    "node_modules/postcss-safe-parser/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+    "node_modules/postcss-safe-parser/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "dependencies": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
         "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
+    "node_modules/postcss-safe-parser/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+    "node_modules/postcss-sass": {
+      "version": "0.4.4",
+      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "postcss": "^7.0.2"
+        "gonzales-pe": "^4.3.0",
+        "postcss": "^7.0.21"
       }
     },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+    "node_modules/postcss-sass/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
       "peer": true
     },
-    "node_modules/postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
+    "node_modules/postcss-sass/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "postcss": "^7.0.26"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
         "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
+    "node_modules/postcss-sass/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "dependencies": {
-        "postcss": "^7.0.6"
-      },
+      "version": "4.0.3",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
       }
     },
     "node_modules/postcss-selector-not": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
-      "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
+      "version": "5.0.0",
+      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "balanced-match": "^1.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.9",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -16001,27 +13278,8 @@
         "node": ">=4"
       }
     },
-    "node_modules/postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-syntax": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
       "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
       "dev": true,
       "peer": true,
@@ -16029,68 +13287,29 @@
         "postcss": ">=5.0.0"
       }
     },
-    "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "node_modules/postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6.14.4"
-      }
+      "version": "4.2.0",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "engines": {
         "node": ">=6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/pretty-format": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
       "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "dependencies": {
@@ -16105,7 +13324,6 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -16120,7 +13338,6 @@
     },
     "node_modules/pretty-format/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -16132,46 +13349,32 @@
     },
     "node_modules/pretty-format/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/pretty-format/node_modules/react-is": {
       "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "node_modules/process": {
       "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
     "node_modules/progress": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
     "node_modules/prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
@@ -16182,18 +13385,16 @@
       }
     },
     "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       }
     },
     "node_modules/prop-types-exact": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
       "dev": true,
       "dependencies": {
@@ -16202,33 +13403,14 @@
         "reflect.ownkeys": "^0.2.0"
       }
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "node_modules/psl": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "node_modules/pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -16236,120 +13418,13 @@
     },
     "node_modules/punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/puppeteer": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
-      "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^2.2.1",
-        "mime": "^2.0.3",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.4.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/puppeteer/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/puppeteer/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "funding": [
         {
@@ -16368,7 +13443,6 @@
     },
     "node_modules/quick-lru": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
       "peer": true,
@@ -16378,7 +13452,6 @@
     },
     "node_modules/quill": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
       "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
       "dependencies": {
         "clone": "^2.1.1",
@@ -16391,7 +13464,6 @@
     },
     "node_modules/quill-delta": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
       "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
       "dependencies": {
         "deep-equal": "^1.0.1",
@@ -16404,7 +13476,6 @@
     },
     "node_modules/raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "dependencies": {
         "performance-now": "^2.1.0"
@@ -16412,13 +13483,11 @@
     },
     "node_modules/railroad-diagrams": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
       "dev": true
     },
     "node_modules/randexp": {
       "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
       "dev": true,
       "dependencies": {
@@ -16431,37 +13500,13 @@
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/react": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -16474,7 +13519,6 @@
     },
     "node_modules/react-dom": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -16488,7 +13532,6 @@
     },
     "node_modules/react-i18nify": {
       "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/react-i18nify/-/react-i18nify-1.11.18.tgz",
       "integrity": "sha512-flSSBzMI2gvJvCC+byP6Cl7vtyUsNH88VxjyER4zj8Fdl5rsLmXoJ9K4kNz8A6JUTmdFMWbTIp6aPXVIEbpE8w==",
       "dependencies": {
         "intl": "^1.2",
@@ -16499,39 +13542,12 @@
         "react": "^16.0.0"
       }
     },
-    "node_modules/react-input-autosize": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
-      "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
-      "dependencies": {
-        "prop-types": "^15.5.8"
-      },
-      "peerDependencies": {
-        "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0"
-      }
-    },
     "node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
-      "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
-      "dependencies": {
-        "classnames": "^2.2.4",
-        "prop-types": "^15.5.8",
-        "react-input-autosize": "^2.1.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0",
-        "react-dom": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0"
-      }
-    },
     "node_modules/react-test-renderer": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "dev": true,
       "dependencies": {
@@ -16544,28 +13560,8 @@
         "react": "^16.14.0"
       }
     },
-    "node_modules/react-typeahead": {
-      "version": "2.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/react-typeahead/-/react-typeahead-2.0.0-alpha.8.tgz",
-      "integrity": "sha1-fwJfjudCAvBPqEJ8r+onMtUU9Yo=",
-      "dependencies": {
-        "classnames": "^1.2.0",
-        "create-react-class": "^15.5.2",
-        "fuzzy": "^0.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14"
-      }
-    },
-    "node_modules/react-typeahead/node_modules/classnames": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.2.tgz",
-      "integrity": "sha1-6WoqAiLYSSXdj62yBdZuEviI7fk="
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dependencies": {
         "pify": "^2.3.0"
@@ -16573,7 +13569,6 @@
     },
     "node_modules/read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "dependencies": {
@@ -16588,7 +13583,6 @@
     },
     "node_modules/read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "dependencies": {
@@ -16605,7 +13599,6 @@
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
       "engines": {
@@ -16614,7 +13607,6 @@
     },
     "node_modules/read-pkg/node_modules/type-fest": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
       "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true,
       "engines": {
@@ -16623,8 +13615,8 @@
     },
     "node_modules/readable-stream": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -16634,21 +13626,9 @@
         "node": ">= 6"
       }
     },
-    "node_modules/readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
     "node_modules/rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "version": "0.7.1",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
       "dependencies": {
         "resolve": "^1.9.0"
       },
@@ -16657,112 +13637,43 @@
       }
     },
     "node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redent/node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redis": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
-      "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "dependencies": {
-        "denque": "^1.5.0",
-        "redis-commands": "^1.7.0",
-        "redis-errors": "^1.2.0",
-        "redis-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-redis"
-      }
-    },
-    "node_modules/redis-commands": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
-      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
-    },
-    "node_modules/redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/redis-parser": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "redis-errors": "^1.0.0"
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/redis-url": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/redis-url/-/redis-url-0.2.0.tgz",
-      "integrity": "sha1-G3otrMw+qCZLH7ZWwNkB2cqcVHA=",
-      "dependencies": {
-        "redis": ">= 0.0.1"
+        "node": ">=8"
       }
     },
     "node_modules/reflect.ownkeys": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
       "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
       "dev": true
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dependencies": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
       "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -16770,7 +13681,6 @@
     },
     "node_modules/regex-not": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "dependencies": {
@@ -16782,9 +13692,8 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.1",
+      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -16797,10 +13706,8 @@
       }
     },
     "node_modules/regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "peer": true,
+      "version": "3.2.0",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "engines": {
         "node": ">=8"
       },
@@ -16809,30 +13716,27 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+      "version": "0.6.0",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
     },
     "node_modules/regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.8.4",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "dependencies": {
         "jsesc": "~0.5.0"
       },
@@ -16842,7 +13746,6 @@
     },
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
       "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -16850,7 +13753,6 @@
     },
     "node_modules/remark": {
       "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
       "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
       "dev": true,
       "peer": true,
@@ -16866,7 +13768,6 @@
     },
     "node_modules/remark-parse": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
       "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
       "dev": true,
       "peer": true,
@@ -16880,7 +13781,6 @@
     },
     "node_modules/remark-stringify": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
       "peer": true,
@@ -16894,13 +13794,10 @@
     },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "node_modules/repeat-element": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
       "engines": {
@@ -16909,126 +13806,42 @@
     },
     "node_modules/repeat-string": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true,
       "engines": {
         "node": ">=0.10"
       }
     },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "devOptional": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17036,7 +13849,6 @@
     },
     "node_modules/resolve-cwd": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dependencies": {
         "resolve-from": "^5.0.0"
@@ -17047,7 +13859,6 @@
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "engines": {
         "node": ">=8"
@@ -17055,50 +13866,36 @@
     },
     "node_modules/resolve-url": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
+    "node_modules/resolve.exports": {
+      "version": "1.1.0",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ret": {
       "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true,
       "engines": {
         "node": ">=0.12"
       }
     },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "node_modules/rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dependencies": {
         "glob": "^7.1.3"
@@ -17110,9 +13907,41 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rollup": {
+      "version": "2.69.0",
+      "integrity": "sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rollup-plugin-terser": {
+      "version": "7.0.2",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0"
+      }
+    },
+    "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/rst-selector-parser": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
       "dev": true,
       "dependencies": {
@@ -17122,7 +13951,6 @@
     },
     "node_modules/rsvp": {
       "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true,
       "engines": {
@@ -17131,7 +13959,6 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "funding": [
         {
@@ -17153,12 +13980,10 @@
     },
     "node_modules/rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "node_modules/rxjs": {
       "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dependencies": {
         "tslib": "^1.9.0"
@@ -17169,17 +13994,14 @@
     },
     "node_modules/rxjs/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "dependencies": {
@@ -17188,13 +14010,12 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sane": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
       "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
       "dev": true,
       "dependencies": {
         "@cnakazawa/watch": "^1.0.3",
@@ -17216,7 +14037,6 @@
     },
     "node_modules/sane/node_modules/anymatch": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "dependencies": {
@@ -17226,7 +14046,6 @@
     },
     "node_modules/sane/node_modules/braces": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "dependencies": {
@@ -17247,7 +14066,6 @@
     },
     "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17259,7 +14077,6 @@
     },
     "node_modules/sane/node_modules/cross-spawn": {
       "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "dependencies": {
@@ -17275,7 +14092,6 @@
     },
     "node_modules/sane/node_modules/execa": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "dependencies": {
@@ -17293,7 +14109,6 @@
     },
     "node_modules/sane/node_modules/fill-range": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "dependencies": {
@@ -17308,7 +14123,6 @@
     },
     "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17320,7 +14134,6 @@
     },
     "node_modules/sane/node_modules/get-stream": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
       "dependencies": {
@@ -17332,7 +14145,6 @@
     },
     "node_modules/sane/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -17341,7 +14153,6 @@
     },
     "node_modules/sane/node_modules/is-number": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "dependencies": {
@@ -17353,7 +14164,6 @@
     },
     "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -17365,7 +14175,6 @@
     },
     "node_modules/sane/node_modules/is-stream": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true,
       "engines": {
@@ -17374,7 +14183,6 @@
     },
     "node_modules/sane/node_modules/micromatch": {
       "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "dependencies": {
@@ -17398,7 +14206,6 @@
     },
     "node_modules/sane/node_modules/normalize-path": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "dependencies": {
@@ -17410,7 +14217,6 @@
     },
     "node_modules/sane/node_modules/npm-run-path": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "dependencies": {
@@ -17422,7 +14228,6 @@
     },
     "node_modules/sane/node_modules/path-key": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
       "dev": true,
       "engines": {
@@ -17431,7 +14236,6 @@
     },
     "node_modules/sane/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -17440,7 +14244,6 @@
     },
     "node_modules/sane/node_modules/shebang-command": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "dependencies": {
@@ -17452,7 +14255,6 @@
     },
     "node_modules/sane/node_modules/shebang-regex": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true,
       "engines": {
@@ -17461,7 +14263,6 @@
     },
     "node_modules/sane/node_modules/to-regex-range": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "dependencies": {
@@ -17474,7 +14275,6 @@
     },
     "node_modules/sane/node_modules/which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "dependencies": {
@@ -17484,236 +14284,81 @@
         "which": "bin/which"
       }
     },
-    "node_modules/sass": {
-      "version": "1.34.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
-      "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
+    "node_modules/sass-embedded": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.0.tgz",
+      "integrity": "sha512-WCYA7FR0euku/VkpejpjTE6zjL8+h0eFZrLLjx42wCjb9/qKKyFWLdgsErXwnq3jDOMyUY4dYJfenRIVMcEXog==",
+      "hasInstallScript": true,
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
+        "buffer-builder": "^0.2.0",
+        "extract-zip": "^2.0.1",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "node-fetch": "^2.6.0",
+        "rxjs": "^7.4.0",
+        "semver": "^7.3.5",
+        "shelljs": "^0.8.4",
+        "supports-color": "^8.1.1",
+        "tar": "^6.0.5"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/sass-graph/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/lru-cache": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
+      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/sass-graph/node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/rxjs": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/sass-graph/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/sass-graph/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/semver": {
+      "version": "7.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "lru-cache": "^7.4.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/sass-graph/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sass-graph/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sass-graph/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/sass-graph/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.1.1.tgz",
-      "integrity": "sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==",
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
-        "sass": "^1.3.0",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
     "node_modules/saxes": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dev": true,
       "dependencies": {
@@ -17725,7 +14370,6 @@
     },
     "node_modules/scheduler": {
       "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -17734,7 +14378,6 @@
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dependencies": {
         "@types/json-schema": "^7.0.5",
@@ -17749,181 +14392,31 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      }
-    },
-    "node_modules/scss-tokenizer/node_modules/source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
-    },
-    "node_modules/selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
-      "dependencies": {
-        "node-forge": "^0.10.0"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
     "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "6.0.0",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "node_modules/set-value": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "dependencies": {
@@ -17938,7 +14431,6 @@
     },
     "node_modules/set-value/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17950,21 +14442,14 @@
     },
     "node_modules/set-value/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dependencies": {
         "kind-of": "^6.0.2"
@@ -17975,7 +14460,6 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -17986,25 +14470,55 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/shelljs/node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/shelljs/node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/shellwords": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true,
       "optional": true
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -18015,32 +14529,16 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+      "version": "3.0.7",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "engines": {
         "node": ">=8"
@@ -18048,7 +14546,6 @@
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "peer": true,
       "dependencies": {
@@ -18065,7 +14562,6 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "peer": true,
       "dependencies": {
@@ -18080,7 +14576,6 @@
     },
     "node_modules/slice-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "peer": true,
       "dependencies": {
@@ -18092,13 +14587,11 @@
     },
     "node_modules/slice-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "peer": true
     },
     "node_modules/snapdragon": {
       "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "dependencies": {
@@ -18117,7 +14610,6 @@
     },
     "node_modules/snapdragon-node": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "dependencies": {
@@ -18131,7 +14623,6 @@
     },
     "node_modules/snapdragon-node/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -18143,7 +14634,6 @@
     },
     "node_modules/snapdragon-util": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "dependencies": {
@@ -18155,7 +14645,6 @@
     },
     "node_modules/snapdragon-util/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18167,7 +14656,6 @@
     },
     "node_modules/snapdragon/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -18176,7 +14664,6 @@
     },
     "node_modules/snapdragon/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -18188,7 +14675,6 @@
     },
     "node_modules/snapdragon/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -18200,7 +14686,6 @@
     },
     "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -18212,7 +14697,6 @@
     },
     "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18224,7 +14708,6 @@
     },
     "node_modules/snapdragon/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -18236,7 +14719,6 @@
     },
     "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18248,7 +14730,6 @@
     },
     "node_modules/snapdragon/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -18262,7 +14743,6 @@
     },
     "node_modules/snapdragon/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -18271,7 +14751,6 @@
     },
     "node_modules/snapdragon/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -18280,54 +14759,29 @@
     },
     "node_modules/snapdragon/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/social-share-button": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/social-share-button/-/social-share-button-2.2.0.tgz",
-      "integrity": "sha512-8OatmjB10MFqnbgVFJe4SjRXBIwepla/FOo2gsC6w/PsQ1RuS5oKwe9kixv2TfWcTA1GCcT6m+lEylFRPrr71g==",
-      "dependencies": {
-        "domassist": "^2.2.0",
-        "domodule": "^8.0.0"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/sockjs/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "node_modules/source-map": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-loader": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "dependencies": {
         "async": "^2.5.0",
@@ -18339,8 +14793,8 @@
     },
     "node_modules/source-map-resolve": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
@@ -18351,9 +14805,8 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -18361,7 +14814,6 @@
     },
     "node_modules/source-map-support/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
@@ -18369,14 +14821,22 @@
     },
     "node_modules/source-map-url": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
+    "node_modules/spark-md5": {
+      "version": "3.0.2",
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+    },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -18384,54 +14844,25 @@
     },
     "node_modules/spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
+      "version": "3.0.11",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
     },
     "node_modules/specificity": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
       "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
       "dev": true,
       "peer": true,
@@ -18441,7 +14872,6 @@
     },
     "node_modules/split-string": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "dependencies": {
@@ -18453,75 +14883,21 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "node_modules/src": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/src/-/src-1.1.2.tgz",
-      "integrity": "sha1-eKvdHAjKyibMbPRb1YC1bZOs+38=",
+    "node_modules/stack-utils": {
+      "version": "2.0.5",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "dev": true,
       "dependencies": {
-        "redis-url": "~0.2.0",
-        "underscore": "~1.6.0",
-        "uuid": "~1.4.1"
-      }
-    },
-    "node_modules/src/node_modules/uuid": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz",
-      "integrity": "sha1-RTAZ9oaWam34PNxSROfJkOzDMvw=",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details."
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "escape-string-regexp": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=10"
       }
     },
     "node_modules/stack-utils/node_modules/escape-string-regexp": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
       "engines": {
@@ -18530,7 +14906,6 @@
     },
     "node_modules/static-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "dependencies": {
@@ -18543,7 +14918,6 @@
     },
     "node_modules/static-extend/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -18555,7 +14929,6 @@
     },
     "node_modules/static-extend/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -18567,7 +14940,6 @@
     },
     "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18579,7 +14951,6 @@
     },
     "node_modules/static-extend/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -18591,7 +14962,6 @@
     },
     "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18603,7 +14973,6 @@
     },
     "node_modules/static-extend/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -18617,69 +14986,24 @@
     },
     "node_modules/static-extend/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/stdout-stream/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/stdout-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/string_decoder/node_modules/safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -18695,9 +15019,12 @@
         }
       ]
     },
+    "node_modules/string-env-interpolation": {
+      "version": "1.0.1",
+      "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "dependencies": {
@@ -18709,28 +15036,28 @@
       }
     },
     "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "node_modules/string.prototype.matchall": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz",
-      "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==",
-      "dev": true,
-      "peer": true,
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
@@ -18742,14 +15069,13 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
-      "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18760,7 +15086,6 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
       "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -18772,7 +15097,6 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
       "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -18782,12 +15106,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/stringify-object": {
+      "version": "3.3.0",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -18795,16 +15130,21 @@
     },
     "node_modules/strip-bom": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true,
       "engines": {
@@ -18813,33 +15153,26 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "optional": true,
+      "version": "3.0.0",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
+        "min-indent": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -18848,90 +15181,31 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
+      "version": "3.3.1",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/style-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/style-loader/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
+    "node_modules/style-mod": {
+      "version": "4.0.0",
+      "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
     },
     "node_modules/style-search": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true,
       "peer": true
     },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/stylelint": {
       "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz",
       "integrity": "sha512-DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==",
       "dev": true,
       "peer": true,
@@ -18998,7 +15272,6 @@
     },
     "node_modules/stylelint/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "peer": true,
@@ -19012,28 +15285,31 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/stylelint/node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+    "node_modules/stylelint/node_modules/autoprefixer": {
+      "version": "9.8.8",
+      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001109",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "picocolors": "^0.2.1",
+        "postcss": "^7.0.32",
+        "postcss-value-parser": "^4.1.0"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
       }
     },
     "node_modules/stylelint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -19049,7 +15325,6 @@
     },
     "node_modules/stylelint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "peer": true,
@@ -19062,27 +15337,12 @@
     },
     "node_modules/stylelint/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true,
       "peer": true
     },
-    "node_modules/stylelint/node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stylelint/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "peer": true,
@@ -19090,218 +15350,133 @@
         "node": ">=8"
       }
     },
-    "node_modules/stylelint/node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/stylelint/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/stylelint/node_modules/map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+    "node_modules/stylelint/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "peer": true
     },
-    "node_modules/stylelint/node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+    "node_modules/stylelint/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/stylelint/node_modules/normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+    "node_modules/stylelint/node_modules/postcss-scss": {
+      "version": "2.1.1",
+      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
+        "postcss": "^7.0.6"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/stylelint/node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+    "node_modules/stylelint/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/stylelint/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/stylelint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/stylelint/node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/subscriptions-transport-ws": {
+      "version": "0.11.0",
+      "integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==",
+      "deprecated": "The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws    For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md",
       "dependencies": {
-        "min-indent": "^1.0.0"
+        "backo2": "^1.0.2",
+        "eventemitter3": "^3.1.0",
+        "iterall": "^1.2.1",
+        "symbol-observable": "^1.0.4",
+        "ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "graphql": "^15.7.2 || ^16.0.0"
       }
     },
-    "node_modules/stylelint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/subscriptions-transport-ws/node_modules/eventemitter3": {
+      "version": "3.1.2",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+    },
+    "node_modules/sugarss": {
+      "version": "2.0.0",
+      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "postcss": "^7.0.2"
       }
     },
-    "node_modules/stylelint/node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+    "node_modules/sugarss/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "peer": true
     },
-    "node_modules/stylelint/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+    "node_modules/sugarss/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/stylelint/node_modules/yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+    "node_modules/sugarss/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/subscriptions-transport-ws": {
-      "version": "0.9.19",
-      "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz",
-      "integrity": "sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==",
-      "optional": true,
-      "dependencies": {
-        "backo2": "^1.0.2",
-        "eventemitter3": "^3.1.0",
-        "iterall": "^1.2.1",
-        "symbol-observable": "^1.0.4",
-        "ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
-      },
-      "peerDependencies": {
-        "graphql": ">=0.10.0"
-      }
-    },
-    "node_modules/subscriptions-transport-ws/node_modules/eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
-      "optional": true
-    },
-    "node_modules/subscriptions-transport-ws/node_modules/symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
     "node_modules/supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -19312,7 +15487,6 @@
     },
     "node_modules/supports-hyperlinks": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "dependencies": {
@@ -19325,7 +15499,6 @@
     },
     "node_modules/supports-hyperlinks/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -19334,7 +15507,6 @@
     },
     "node_modules/supports-hyperlinks/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -19344,151 +15516,74 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true,
       "peer": true
     },
     "node_modules/svg4everybody": {
       "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/svg4everybody/-/svg4everybody-2.1.9.tgz",
       "integrity": "sha1-W9n23vwTOFmgRGRtR0P6vCjbfi0=",
       "engines": {
         "node": ">=0.8.0"
       }
     },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/svgo/node_modules/css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/svgo/node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "node_modules/svgo/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/svgo/node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
     "node_modules/symbol-observable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
-      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
+      "version": "1.2.0",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "node_modules/sync-fetch": {
+      "version": "0.3.1",
+      "integrity": "sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==",
+      "dependencies": {
+        "buffer": "^5.7.0",
+        "node-fetch": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tabbable": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
       "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.0",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "peer": true,
       "dependencies": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -19503,22 +15598,20 @@
     },
     "node_modules/table/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "peer": true
     },
     "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "version": "2.2.1",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -19531,9 +15624,41 @@
         "node": ">= 10"
       }
     },
+    "node_modules/temp-dir": {
+      "version": "2.0.0",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tempy": {
+      "version": "0.6.0",
+      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "dependencies": {
+        "is-stream": "^2.0.0",
+        "temp-dir": "^2.0.0",
+        "type-fest": "^0.16.0",
+        "unique-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tempy/node_modules/type-fest": {
+      "version": "0.16.0",
+      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/terminal-link": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dev": true,
       "dependencies": {
@@ -19548,13 +15673,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "version": "5.12.0",
+      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
       "dependencies": {
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
         "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
       },
       "bin": {
         "terser": "bin/terser"
@@ -19564,16 +15689,14 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-      "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+      "version": "5.3.1",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
       "dependencies": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.7.0"
+        "terser": "^5.7.2"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -19584,20 +15707,29 @@
       },
       "peerDependencies": {
         "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-      "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -19607,26 +15739,11 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
+        "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
         "ajv-keywords": "^3.5.2"
       },
@@ -19638,17 +15755,8 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
@@ -19656,7 +15764,6 @@
     },
     "node_modules/terser-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -19668,9 +15775,18 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/terser/node_modules/source-map": {
       "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "engines": {
         "node": ">= 8"
@@ -19678,7 +15794,6 @@
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "dependencies": {
@@ -19692,40 +15807,24 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "peer": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "node_modules/throat": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
       "dev": true
     },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "node_modules/tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "engines": {
         "node": ">=4"
@@ -19733,7 +15832,6 @@
     },
     "node_modules/to-object-path": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "dependencies": {
@@ -19745,7 +15843,6 @@
     },
     "node_modules/to-object-path/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -19757,7 +15854,6 @@
     },
     "node_modules/to-regex": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "dependencies": {
@@ -19772,7 +15868,6 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -19783,20 +15878,10 @@
     },
     "node_modules/toggle-selection": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/tough-cookie": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "dependencies": {
@@ -19810,7 +15895,6 @@
     },
     "node_modules/tr46": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "dependencies": {
@@ -19822,22 +15906,19 @@
     },
     "node_modules/tributejs": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
       "integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
     },
     "node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "optional": true,
+      "version": "3.0.1",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/trough": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
       "dev": true,
       "peer": true,
@@ -19846,25 +15927,9 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.1.2"
-      }
-    },
-    "node_modules/tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
     "node_modules/ts-invariant": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.7.3.tgz",
-      "integrity": "sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==",
+      "version": "0.9.4",
+      "integrity": "sha512-63jtX/ZSwnUNi/WhXjnK8kz4cHHpYS60AnmA6ixz17l7E12a5puCWFlNpkne5Rl0J8TBPVHpGjsj4fxs8ObVLQ==",
       "dependencies": {
         "tslib": "^2.1.0"
       },
@@ -19872,9 +15937,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/ts-node": {
+      "version": "9.1.1",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dependencies": {
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.7"
+      }
+    },
+    "node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/ts-pnp": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
       "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
       "engines": {
         "node": ">=6"
@@ -19886,11 +15981,9 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.12.0",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
@@ -19900,10 +15993,8 @@
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -19913,38 +16004,18 @@
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "version": "2.3.1",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "node_modules/twemoji": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-13.1.0.tgz",
       "integrity": "sha512-e3fZRl2S9UQQdBFLYXtTBT6o4vidJMnpWUAhJA+yLGR+kaUTZAt3PixC0cGvvxWSuq2MSz/o0rJraOXrWw/4Ew==",
       "dependencies": {
         "fs-extra": "^8.0.1",
@@ -19955,16 +16026,13 @@
     },
     "node_modules/twemoji-parser": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-13.1.0.tgz",
       "integrity": "sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg=="
     },
     "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+      "version": "0.4.0",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dependencies": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -19972,7 +16040,6 @@
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
       "engines": {
@@ -19981,7 +16048,6 @@
     },
     "node_modules/type-fest": {
       "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "engines": {
@@ -19991,40 +16057,37 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/typedarray": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/typescript": {
+      "version": "4.6.2",
+      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/uc.micro": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
       "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -20036,56 +16099,52 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+    "node_modules/undici": {
+      "version": "4.14.1",
+      "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ==",
+      "engines": {
+        "node": ">=12.18"
+      }
     },
     "node_modules/unfetch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.2.tgz",
       "integrity": "sha512-L0qrK7ZeAudGiKYw6nzFjnJ2D5WHblUBwmHIqtPS6oKUd+Hcpk7/hKsSmcHsTlpd1TbTNsiRBUKRq3bHLNIqIw=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "version": "2.0.0",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "version": "2.0.0",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+      "version": "9.2.2",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -20103,7 +16162,6 @@
     },
     "node_modules/unified/node_modules/is-buffer": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
       "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true,
       "funding": [
@@ -20125,9 +16183,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/unified/node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "dependencies": {
@@ -20142,42 +16208,24 @@
     },
     "node_modules/union-value/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "node_modules/uniqs": {
+    "node_modules/unique-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "dependencies": {
-        "imurmurhash": "^0.1.4"
+        "crypto-random-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/unist-util-find-all-after": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
       "dev": true,
       "peer": true,
@@ -20191,7 +16239,6 @@
     },
     "node_modules/unist-util-is": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
       "peer": true,
@@ -20202,7 +16249,6 @@
     },
     "node_modules/unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
       "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "peer": true,
@@ -20216,28 +16262,33 @@
     },
     "node_modules/universalify": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/unpipe": {
+    "node_modules/unixify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=",
+      "dependencies": {
+        "normalize-path": "^2.1.1"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+    "node_modules/unixify/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/unset-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "dependencies": {
@@ -20250,7 +16301,6 @@
     },
     "node_modules/unset-value/node_modules/has-value": {
       "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
       "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
       "dev": true,
       "dependencies": {
@@ -20264,7 +16314,6 @@
     },
     "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
       "dev": true,
       "dependencies": {
@@ -20276,16 +16325,22 @@
     },
     "node_modules/unset-value/node_modules/has-values": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
       "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -20293,28 +16348,12 @@
     },
     "node_modules/urix": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-    },
     "node_modules/use": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true,
       "engines": {
@@ -20323,49 +16362,21 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "optional": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
     },
     "node_modules/v8-to-istanbul": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
       "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "dependencies": {
@@ -20379,55 +16390,34 @@
     },
     "node_modules/v8-to-istanbul/node_modules/source-map": {
       "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true,
       "engines": {
         "node": ">= 8"
       }
     },
+    "node_modules/valid-url": {
+      "version": "1.0.9",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+    "node_modules/value-or-promise": {
+      "version": "1.0.11",
+      "integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "node": ">=12"
       }
     },
     "node_modules/vfile": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
       "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
       "peer": true,
@@ -20444,7 +16434,6 @@
     },
     "node_modules/vfile-message": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
       "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
       "peer": true,
@@ -20459,7 +16448,6 @@
     },
     "node_modules/vfile/node_modules/is-buffer": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
       "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true,
       "funding": [
@@ -20483,21 +16471,22 @@
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
       "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.4",
+      "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw=="
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
       "dependencies": {
@@ -20508,18 +16497,16 @@
       }
     },
     "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "dependencies": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "node_modules/watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
+      "version": "2.3.1",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -20528,17 +16515,15 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
+    "node_modules/web-streams-polyfill": {
+      "version": "3.2.0",
+      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==",
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/webidl-conversions": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true,
       "engines": {
@@ -20546,12 +16531,11 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.51.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz",
-      "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==",
+      "version": "5.69.1",
+      "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.50",
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
@@ -20559,12 +16543,12 @@
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.7.1",
+        "enhanced-resolve": "^5.8.3",
+        "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -20572,8 +16556,8 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^3.2.0"
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -20592,9 +16576,8 @@
       }
     },
     "node_modules/webpack-assets-manifest": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-assets-manifest/-/webpack-assets-manifest-5.0.6.tgz",
-      "integrity": "sha512-CW94ylPHurZTmxnYajSFA8763Cv/QFIKNgBwqBLaIOnBjH1EbDUAf8Eq1/i+o8qaKyKXJ3aX7r4/jtpXD88ldg==",
+      "version": "5.1.0",
+      "integrity": "sha512-kPuTMEjBrqZQVJ5M6yXNBCEdFbQQn7p+loNXt8NOeDFaAbsNFWqqwR0YL1mfG5LbwhK5FLXWXpuK3GuIIZ46rg==",
       "dependencies": {
         "chalk": "^4.0",
         "deepmerge": "^4.0",
@@ -20613,7 +16596,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -20626,9 +16608,8 @@
       }
     },
     "node_modules/webpack-assets-manifest/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -20642,7 +16623,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -20653,23 +16633,20 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/webpack-assets-manifest/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/webpack-assets-manifest/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
+        "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
         "ajv-keywords": "^3.5.2"
       },
@@ -20683,7 +16660,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -20692,79 +16668,21 @@
         "node": ">=8"
       }
     },
-    "node_modules/webpack-bundle-analyzer": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
-      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.19",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "bin": {
-        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
-      },
-      "engines": {
-        "node": ">= 6.14.4"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
     "node_modules/webpack-cli": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
-      "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
+      "version": "4.9.2",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.4",
-        "@webpack-cli/info": "^1.3.0",
-        "@webpack-cli/serve": "^1.5.2",
-        "colorette": "^1.2.1",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
         "commander": "^7.0.0",
         "execa": "^5.0.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^2.2.0",
         "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
         "webpack-merge": "^5.7.3"
       },
       "bin": {
@@ -20793,7 +16711,6 @@
     },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "engines": {
         "node": ">= 10"
@@ -20801,7 +16718,6 @@
     },
     "node_modules/webpack-cli/node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dependencies": {
         "cross-spawn": "^7.0.3",
@@ -20823,7 +16739,6 @@
     },
     "node_modules/webpack-cli/node_modules/get-stream": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "engines": {
         "node": ">=10"
@@ -20834,66 +16749,48 @@
     },
     "node_modules/webpack-cli/node_modules/human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "engines": {
         "node": ">=10.17.0"
       }
     },
-    "node_modules/webpack-config-utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-config-utils/-/webpack-config-utils-2.3.1.tgz",
-      "integrity": "sha512-0uC5uj7sThFTePTQjfpe5Wqcbw3KSCxqswOmW96lwk2ZI2CU098rWY2ZqOVGJQYJ3hfEltmjcLNkKutw8LJAlg==",
-      "bundleDependencies": [
-        "webpack-combine-loaders",
-        "qs"
-      ],
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "dependencies": {
-        "webpack-combine-loaders": "2.0.4"
-      }
-    },
-    "node_modules/webpack-config-utils/node_modules/qs": {
-      "version": "6.5.2",
-      "inBundle": true,
-      "license": "BSD-3-Clause",
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
       "engines": {
-        "node": ">=0.6"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/webpack-config-utils/node_modules/webpack-combine-loaders": {
-      "version": "2.0.4",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "qs": "^6.5.2"
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz",
-      "integrity": "sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==",
-      "dependencies": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
-        "memfs": "^3.2.2",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "acorn": "^8"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+    "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
       "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -20908,334 +16805,366 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack-dev-server": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz",
-      "integrity": "sha512-ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ==",
-      "dependencies": {
-        "ansi-html": "^0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.1",
-        "colorette": "^1.2.2",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
-        "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
-        "schema-utils": "^3.1.0",
-        "selfsigned": "^1.10.11",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^5.0.0",
-        "ws": "^8.1.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
+    "node_modules/what-input": {
+      "version": "5.2.10",
+      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
+      "peer": true
     },
-    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",
-      "integrity": "sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "engines": {
-        "node": ">= 10"
-      }
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
     },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=10"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz",
-      "integrity": "sha512-UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg==",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dependencies": {
-        "ansi-regex": "^6.0.0"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "node-which": "bin/node-which"
       },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/workbox-background-sync": {
+      "version": "6.5.0",
+      "integrity": "sha512-rrekt/gt6qOIZsisj6QZfmAFPAnocq1Z603zAjt+qHmeXY8DLPOklVtvrXSaHoHH3qIjUq3SQY5s2x240iTIKw==",
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "node_modules/workbox-broadcast-update": {
+      "version": "6.5.0",
+      "integrity": "sha512-JC97c7tYqoGWcCfbKO9KHG6lkU+WhXCnDB2j1oFWEiv53nUHy3yjPpzMmAGNLD9oV5lInO15n6V18HfwgkhISw==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "node_modules/workbox-build": {
+      "version": "6.5.0",
+      "integrity": "sha512-da0/1b6//P9+ts7ofcIKcMVPyN6suJvjJASXokF7DsqvUmgRBPcCVV4KCy8QWjgfcz7mzuTpkSbdVHcPFJ/p0A==",
+      "dependencies": {
+        "@apideck/better-ajv-errors": "^0.3.1",
+        "@babel/core": "^7.11.1",
+        "@babel/preset-env": "^7.11.0",
+        "@babel/runtime": "^7.11.2",
+        "@rollup/plugin-babel": "^5.2.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.4.1",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
+        "ajv": "^8.6.0",
+        "common-tags": "^1.8.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "lodash": "^4.17.20",
+        "pretty-bytes": "^5.3.0",
+        "rollup": "^2.43.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "source-map": "^0.8.0-beta.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^2.0.1",
+        "tempy": "^0.6.0",
+        "upath": "^1.2.0",
+        "workbox-background-sync": "6.5.0",
+        "workbox-broadcast-update": "6.5.0",
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-google-analytics": "6.5.0",
+        "workbox-navigation-preload": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-range-requests": "6.5.0",
+        "workbox-recipes": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0",
+        "workbox-streams": "6.5.0",
+        "workbox-sw": "6.5.0",
+        "workbox-window": "6.5.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==",
+    "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
+      "version": "0.3.3",
+      "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
+      "dependencies": {
+        "json-schema": "^0.4.0",
+        "jsonpointer": "^5.0.0",
+        "leven": "^3.1.0"
+      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "ajv": ">=8"
       }
     },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/workbox-build/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/workbox-build/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=10"
+      }
+    },
+    "node_modules/workbox-build/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/workbox-build/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+    "node_modules/workbox-build/node_modules/source-map": {
+      "version": "0.8.0-beta.0",
+      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
       "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
+        "whatwg-url": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+    "node_modules/workbox-build/node_modules/tr46": {
+      "version": "1.0.1",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/workbox-build/node_modules/universalify": {
+      "version": "2.0.0",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/what-input": {
-      "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
-      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
-      "peer": true
+    "node_modules/workbox-build/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
+    "node_modules/workbox-build/node_modules/whatwg-url": {
+      "version": "7.1.0",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "dependencies": {
-        "iconv-lite": "0.4.24"
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
       }
     },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
+    "node_modules/workbox-cacheable-response": {
+      "version": "6.5.0",
+      "integrity": "sha512-sqAtWAiBwWvI8HG/2Do7BeKPhHuUczt22ORkAjkH9DfTq9LuWRFd6T4HAMqX5G8F1gM9XA2UPlxRrEeSpFIz/A==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
+      }
     },
-    "node_modules/whatwg-url": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz",
-      "integrity": "sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==",
-      "dev": true,
+    "node_modules/workbox-core": {
+      "version": "6.5.0",
+      "integrity": "sha512-5SPwNipUzYBhrneLVT02JFA0fw3LG82jFAN/G2NzxkIW10t4MVZuML2nU94bbkgjq25u0fkY8+4JXzMfHgxEWQ=="
+    },
+    "node_modules/workbox-expiration": {
+      "version": "6.5.0",
+      "integrity": "sha512-y3WRkKRy/gMuZZNkrLFahjY0QZtLoq+QfhTbVAsOGHVg1CCtnNbeFAnEidQs7UisI2BK76VqQPvM7hEOFyZ92A==",
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/workbox-google-analytics": {
+      "version": "6.5.0",
+      "integrity": "sha512-CHHh55wMNCc/BV1URrzEM2Zjgf6g2CV6QpAAc1pBRqaLY5755PeQZbp3o8KbJEM7YsC9mIBeQVsOkSKkGS30bg==",
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "workbox-background-sync": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+    "node_modules/workbox-navigation-preload": {
+      "version": "6.5.0",
+      "integrity": "sha512-ktrRQzXJ0zFy0puOtCa49wE3BSBGUB8KRMot3tEieikCkSO0wMLmiCb9GwTVvNMJLl0THRlsdFoI93si04nTxA==",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "devOptional": true
+    "node_modules/workbox-precaching": {
+      "version": "6.5.0",
+      "integrity": "sha512-IVLzgHx38T6LphJyEOltd7XAvpDi73p85uCT2ZtT1HHg9FAYC49a+5iHUVOnqye73fLW20eiAMFcnehGxz9RWg==",
+      "dependencies": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-range-requests": {
+      "version": "6.5.0",
+      "integrity": "sha512-+qTELdGZE5rOjuv+ifFrfRDN8Uvzpbm5Fal7qSUqB1V1DLCMxPwHCj6mWwQBRKBpW7G09kAwewH7zA3Asjkf/Q==",
       "dependencies": {
-        "string-width": "^1.0.2 || 2"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/workbox-recipes": {
+      "version": "6.5.0",
+      "integrity": "sha512-7hWZAIcXmvr31NwYSWaQIrnThCH/Dx9+eYv/YdkpUeWIXRiHRkYvP1FdiHItbLSjL4Y6K7cy2Y9y5lGCkgaE4w==",
+      "dependencies": {
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/workbox-routing": {
+      "version": "6.5.0",
+      "integrity": "sha512-w1A9OVa/yYStu9ds0Dj+TC6zOAoskKlczf+wZI5mrM9nFCt/KOMQiFp1/41DMFPrrN/8KlZTS3Cel/Ttutw93Q==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-strategies": {
+      "version": "6.5.0",
+      "integrity": "sha512-Ngnwo+tfGw4uKSlTz3h1fYKb/lCV7SDI/dtTb8VaJzRl0N9XssloDGYERBmF6BN/DV/x3bnRsshfobnKI/3z0g==",
       "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-streams": {
+      "version": "6.5.0",
+      "integrity": "sha512-ZbeaZINkju4x45P9DFyRbOYInE+dyNAJIelflz4f9AOAdm+zZUJCooU4MdfsedVhHiTIA6pCD/3jCmW1XbvlbA==",
       "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0"
       }
     },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    "node_modules/workbox-sw": {
+      "version": "6.5.0",
+      "integrity": "sha512-uPGJ9Yost4yabnCko/IuhouquoQKrWOEqLq7L/xVYtltWe4+J8Hw8iPCVtxvXQ26hffd7MaFWUAN83j2ZWbxRg=="
     },
-    "node_modules/window-size": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=",
-      "bin": {
-        "window-size": "cli.js"
+    "node_modules/workbox-webpack-plugin": {
+      "version": "6.5.0",
+      "integrity": "sha512-wy4uCBJELNfJVf2b4Tg3mjJQySq/aReWv4Q1RxQweJkY9ihq7DOGA3wLlXvoauek+MX/SuQfS3it+eXIfHKjvg==",
+      "dependencies": {
+        "fast-json-stable-stringify": "^2.1.0",
+        "pretty-bytes": "^5.4.1",
+        "upath": "^1.2.0",
+        "webpack-sources": "^1.4.3",
+        "workbox-build": "6.5.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0 || ^5.9.0"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+    "node_modules/workbox-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/workbox-window": {
+      "version": "6.5.0",
+      "integrity": "sha512-DOrhiTnWup/CsNstO2uvfdKM4kdStgHd31xGGvBcoCE3Are3DRcy5s3zz3PedcAR1AKskQj3BXz0UhzQiOq8nA==",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "6.5.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "dependencies": {
@@ -21249,7 +17178,6 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -21264,7 +17192,6 @@
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -21276,18 +17203,15 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "dependencies": {
@@ -21298,10 +17222,8 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "devOptional": true,
+      "version": "7.5.7",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -21320,19 +17242,16 @@
     },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "engines": {
         "node": ">=0.4"
@@ -21340,35 +17259,30 @@
     },
     "node_modules/y18n": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/yaml-jest": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/yaml-jest/-/yaml-jest-1.0.5.tgz",
-      "integrity": "sha1-KI5UG64bVR0RPUhk1suPMW4b0zE=",
+      "version": "1.2.0",
+      "integrity": "sha512-rrUNn3ovs5J8td7i3k6rJfh3leBydnM+3YqKJcVyTFRiSiEAdKMy7uhqBxJfsJ+w1le5AGCkMTldNEMY8oqbPg==",
       "dev": true,
       "dependencies": {
-        "js-yaml": "^3.7.0"
+        "js-yaml": "^4.1.0"
       }
     },
     "node_modules/yargs": {
       "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "dependencies": {
@@ -21390,7 +17304,6 @@
     },
     "node_modules/yargs-parser": {
       "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "dependencies": {
@@ -21410,9 +17323,15 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "engines": {
         "node": ">=10"
@@ -21423,12 +17342,17 @@
     },
     "node_modules/zen-observable": {
       "version": "0.8.15",
-      "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
       "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
     },
+    "node_modules/zen-observable-ts": {
+      "version": "1.2.3",
+      "integrity": "sha512-hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g==",
+      "dependencies": {
+        "zen-observable": "0.8.15"
+      }
+    },
     "node_modules/zwitch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
       "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
       "dev": true,
       "peer": true,
@@ -21439,35 +17363,35 @@
     },
     "packages/browserslist-config": {
       "name": "@decidim/browserslist-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0"
     },
     "packages/core": {
       "name": "@decidim/core",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@joeattardi/emoji-button": "^4.6.0",
+        "@joeattardi/emoji-button": "^4.6.2",
+        "@rails/activestorage": "^6.0.4",
+        "@tarekraafat/autocomplete.js": "^10.2.6",
         "@zeitiger/appendaround": "^1.0.0",
-        "axios": "^0.21.1",
+        "axios": "^0.21.4",
         "bootstrap-tagsinput": "^0.7.1",
         "classnames": "^2.2.5",
         "d3": "5.4.0",
+        "dayjs": "^1.11.0",
         "diff": "^5.0.0",
         "foundation-datepicker": "1.5.6",
         "foundation-sites": "^6.7.0",
-        "graphiql": "^1.4.2",
-        "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
+        "graphiql": "^1.4.7",
         "html5sortable": "0.10.0",
         "identity-obj-proxy": "^3.0.0",
         "jquery": "^3.2.1",
         "jquery-serializejson": "2.9.0",
-        "jquery.autocomplete": "1.2.0",
+        "js-cookie": "^3.0.1",
         "leaflet": "1.3.1",
-        "leaflet-svgicon": "^0.0.2",
         "leaflet-tilelayer-here": "1.0.2",
         "leaflet.markercluster": "1.4.1",
-        "moment": "2.29.1",
         "morphdom": "2.6.1",
         "prop-types": "^15.7.2",
         "quill": "1.3.7",
@@ -21475,22 +17399,22 @@
         "react": "^16.3.0",
         "react-dom": "^16.3.0",
         "react-i18nify": "^1.8.8",
-        "react-select": "^1.2.1",
         "select": "^1.1.2",
-        "social-share-button": "2.2.0",
         "svg4everybody": "2.1.9",
         "tributejs": "5.1.3",
         "unfetch": "^3.0.0",
         "uuid": "^3.2.1"
-      },
-      "engines": {
-        "node": "^16.9.1",
-        "npm": "^7.21.1"
+      }
+    },
+    "packages/core/node_modules/@rails/activestorage": {
+      "version": "6.1.4",
+      "integrity": "sha512-1Tm8uaVBhLTDEG4YaFPvqguhjbUGSPVItm0CfkRpIFZIkybWzFAxatIrk4YVOOxB8ZdXS7GdeYa1qVwjdiDkgQ==",
+      "dependencies": {
+        "spark-md5": "^3.0.0"
       }
     },
     "packages/core/node_modules/uuid": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "bin": {
@@ -21499,7 +17423,7 @@
     },
     "packages/dev": {
       "name": "@decidim/dev",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "dependencies": {
@@ -21508,17 +17432,17 @@
     },
     "packages/elections": {
       "name": "@decidim/elections",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@decidim/decidim-bulletin_board": "0.22.3",
-        "@decidim/voting_schemes-dummy": "0.22.3",
-        "@decidim/voting_schemes-electionguard": "0.22.3"
+        "@decidim/decidim-bulletin_board": "0.23.0",
+        "@decidim/voting_schemes-dummy": "0.23.0",
+        "@decidim/voting_schemes-electionguard": "0.23.0"
       }
     },
     "packages/eslint-config": {
       "name": "@decidim/eslint-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "peerDependencies": {
@@ -21535,7 +17459,7 @@
     },
     "packages/stylelint-config": {
       "name": "@decidim/stylelint-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "peerDependencies": {
@@ -21544,1431 +17468,3989 @@
     },
     "packages/webpacker": {
       "name": "@decidim/webpacker",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@babel/core": "^7.13.13",
-        "@babel/eslint-parser": "^7.13.14",
-        "@babel/plugin-transform-classes": "^7.13.0",
+        "@babel/core": "^7.15.5",
+        "@babel/eslint-parser": "^7.16.5",
+        "@babel/plugin-transform-classes": "^7.16.7",
         "@babel/plugin-transform-regenerator": "^7.13.15",
-        "@babel/plugin-transform-runtime": "^7.13.15",
-        "@babel/preset-env": "^7.13.5",
+        "@babel/plugin-transform-runtime": "^7.15.0",
+        "@babel/preset-env": "^7.15.6",
         "@babel/preset-react": "^7.12.13",
-        "@babel/types": "^7.0.0-beta.40",
+        "@babel/runtime": "^7.15.4",
         "@rails/ujs": "^6.1.3",
         "@rails/webpacker": "6.0.0-rc.5",
-        "@webpack-cli/serve": "^1.3.1",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.0.4",
-        "babel-plugin-__coverage__": "^1.11.111",
-        "babel-preset-airbnb": "^5.0.0",
-        "core-js": "^3.9.1",
-        "css-loader": "^4.3.0",
-        "css-minimizer-webpack-plugin": "^1.3.0",
+        "autoprefixer": "^10.4.1",
+        "babel-loader": "^8.2.2",
+        "compression-webpack-plugin": "^9.0.0",
+        "css-loader": "^6.5.1",
         "expose-loader": "^2.0.0",
-        "mini-css-extract-plugin": "^1.4.0",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-import": "^12.0.1",
-        "postcss-loader": "^5.2.0",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-scss": "^2.1.1",
-        "sass": "^1.32.8",
-        "sass-loader": "^11.0.1",
+        "glob": "^7.2.0",
+        "js-yaml": "^4.1.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "path-complete-extname": "^1.0.0",
+        "pnp-webpack-plugin": "^1.7.0",
+        "postcss": "^8.4.5",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-import": "^14.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-preset-env": "^7.1.0",
+        "postcss-scss": "^4.0.2",
+        "sass-embedded": "^1.49.9",
         "source-map-loader": "^0.2.4",
-        "style-loader": "^2.0.0",
-        "webpack": "^5.11.0",
-        "webpack-bundle-analyzer": "^3.8.0",
-        "webpack-cli": "^4.2.0",
-        "webpack-config-utils": "^2.3.1",
-        "webpack-dev-server": "^4.0.0"
-      }
-    }
-  },
-  "dependencies": {
-    "@apollo/client": {
-      "version": "3.3.20",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.20.tgz",
-      "integrity": "sha512-hS7UmBwJweudw/J3M0RAcusMHNiRuGqkRH6g91PM2ev8cXScIMdXr/++9jo7wD1nAITMCMF4HQQ3LFaw/Or0Bw==",
-      "requires": {
-        "@graphql-typed-document-node/core": "^3.0.0",
-        "@types/zen-observable": "^0.8.0",
-        "@wry/context": "^0.6.0",
-        "@wry/equality": "^0.5.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graphql-tag": "^2.12.0",
-        "hoist-non-react-statics": "^3.3.2",
-        "optimism": "^0.16.0",
-        "prop-types": "^15.7.2",
-        "symbol-observable": "^4.0.0",
-        "ts-invariant": "^0.7.0",
-        "tslib": "^1.10.0",
-        "zen-observable": "^0.8.14"
+        "style-loader": "^3.0.0",
+        "terser-webpack-plugin": "^5.2.4",
+        "webpack": "^5.53.0",
+        "webpack-assets-manifest": "^5.0.6",
+        "webpack-cli": "^4.8.0",
+        "webpack-merge": "^5.8.0",
+        "webpack-sources": "^3.2.1",
+        "workbox-recipes": "^6.4.2",
+        "workbox-webpack-plugin": "^6.4.2"
       },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+      "devDependencies": {
+        "eslint": "^8.6.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "jest": "^27.4.5"
       }
     },
-    "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
-      "requires": {
-        "@babel/highlight": "^7.14.5"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
-    },
-    "@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/eslint-parser": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.5.tgz",
-      "integrity": "sha512-20BlOHuGf3UXS7z1QPyllM9Gz8SEgcp/UcKeUmdHIFZO6HF1n+3KaLpeyfwWvjY/Os/ynPX3k8qXE/nZ5dw/0g==",
-      "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+    "packages/webpacker/node_modules/@eslint/eslintrc": {
+      "version": "1.2.0",
+      "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.1",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
-      "requires": {
-        "@babel/types": "^7.15.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+    "packages/webpacker/node_modules/@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/core": {
+      "version": "27.5.1",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+    "packages/webpacker/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+    "packages/webpacker/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.14.5.tgz",
-      "integrity": "sha512-spfQRnoChdYWwyFetQDBSDBgH42VskaquRI52kbLei5MjV7s3NPq30/sh2S3YdT20Ku/ZpaNnTVgmDo20NWylg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/reporters": {
+      "version": "27.5.1",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+    "packages/webpacker/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/test-sequencer": {
+      "version": "27.5.1",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
-      "requires": {
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/babel-jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/babel-plugin-jest-hoist": {
+      "version": "27.5.1",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
-      "requires": {
-        "@babel/types": "^7.14.8"
+    "packages/webpacker/node_modules/babel-preset-jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
+    "packages/webpacker/node_modules/ci-info": {
+      "version": "3.3.0",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+      "dev": true
     },
-    "@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
+    "packages/webpacker/node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
     },
-    "@babel/helpers": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
-      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
-      "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/cliui": {
+      "version": "7.0.4",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+    "packages/webpacker/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "@babel/parser": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
-      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="
+    "packages/webpacker/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+    "packages/webpacker/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+    "packages/webpacker/node_modules/emittery": {
+      "version": "0.8.1",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+    "packages/webpacker/node_modules/eslint": {
+      "version": "8.10.0",
+      "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.2.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.6.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+    "packages/webpacker/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+    "packages/webpacker/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
       }
     },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+    "packages/webpacker/node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+    "packages/webpacker/node_modules/eslint/node_modules/ignore": {
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+    "packages/webpacker/node_modules/espree": {
+      "version": "9.3.1",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+    "packages/webpacker/node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
-      "requires": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+    "packages/webpacker/node_modules/execa": {
+      "version": "5.1.1",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+    "packages/webpacker/node_modules/expect": {
+      "version": "27.5.1",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+    "packages/webpacker/node_modules/get-stream": {
+      "version": "6.0.1",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+    "packages/webpacker/node_modules/globals": {
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/human-signals": {
+      "version": "2.1.0",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
       }
     },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+    "packages/webpacker/node_modules/jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-changed-files": {
+      "version": "27.5.1",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-cli": {
+      "version": "27.5.1",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+    "packages/webpacker/node_modules/jest-config": {
+      "version": "27.5.1",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+    "packages/webpacker/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-docblock": {
+      "version": "27.5.1",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-each": {
+      "version": "27.5.1",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+    "packages/webpacker/node_modules/jest-environment-jsdom": {
+      "version": "27.5.1",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jsdom": "^16.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-environment-node": {
+      "version": "27.5.1",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+    "packages/webpacker/node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-jasmine2": {
+      "version": "27.5.1",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-leak-detector": {
+      "version": "27.5.1",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+    "packages/webpacker/node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "globals": "^11.1.0"
+    "packages/webpacker/node_modules/jest-runner": {
+      "version": "27.5.1",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-validate": {
+      "version": "27.5.1",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-watcher": {
+      "version": "27.5.1",
+      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^27.5.1",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "packages/webpacker/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz",
-      "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
+    "packages/webpacker/node_modules/react-is": {
+      "version": "17.0.2",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
     },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "packages/webpacker/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+    "packages/webpacker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
+    "packages/webpacker/node_modules/throat": {
+      "version": "6.0.1",
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+      "dev": true
     },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+    "packages/webpacker/node_modules/type-fest": {
+      "version": "0.20.2",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/v8-to-istanbul": {
+      "version": "8.1.1",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.12.0"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.3",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "@babel/plugin-transform-property-mutators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.14.5.tgz",
-      "integrity": "sha512-J/KZdYrLy/mugVWk7Q/him83ba0QGI8twLgov130GGerT6UKrNHeSnZANp96H4S6VOecy2S/9rhH4j8nCauoSw==",
-      "requires": {
-        "@babel/helper-define-map": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz",
-      "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/y18n": {
+      "version": "5.0.8",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz",
-      "integrity": "sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/yargs": {
+      "version": "16.2.0",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+    "packages/webpacker/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.1.2",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@jridgewell/trace-mapping": "^0.3.0"
       }
     },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+    "@apollo/client": {
+      "version": "3.5.10",
+      "integrity": "sha512-tL3iSpFe9Oldq7gYikZK1dcYxp1c01nlSwtsMz75382HcI6fvQXyFXUCJTTK3wgO2/ckaBvRGw7VqjFREdVoRw==",
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@graphql-typed-document-node/core": "^3.0.0",
+        "@wry/context": "^0.6.0",
+        "@wry/equality": "^0.5.0",
+        "@wry/trie": "^0.3.0",
+        "graphql-tag": "^2.12.3",
+        "hoist-non-react-statics": "^3.3.2",
+        "optimism": "^0.16.1",
+        "prop-types": "^15.7.2",
+        "symbol-observable": "^4.0.0",
+        "ts-invariant": "^0.9.4",
+        "tslib": "^2.3.0",
+        "zen-observable-ts": "^1.2.0"
+      },
+      "dependencies": {
+        "symbol-observable": {
+          "version": "4.0.0",
+          "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="
+        }
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+    "@babel/code-frame": {
+      "version": "7.16.7",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz",
-      "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
+    "@babel/compat-data": {
+      "version": "7.17.0",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="
+    },
+    "@babel/core": {
+      "version": "7.17.5",
+      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helpers": "^7.17.2",
+        "@babel/parser": "^7.17.3",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
         "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+    "@babel/eslint-parser": {
+      "version": "7.17.0",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+    "@babel/generator": {
+      "version": "7.17.3",
+      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+        "@babel/types": "^7.17.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       }
     },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.16.7",
+      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/compat-data": "^7.16.4",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
+        "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.17.6",
+      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.0",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       }
     },
-    "@babel/preset-env": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
-      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.14.5",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.14.5",
-        "@babel/plugin-transform-classes": "^7.14.9",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.14.5",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.14.5",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
-        "semver": "^6.3.0"
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       }
     },
-    "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+    "@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+    "@babel/helper-function-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/runtime-corejs3": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz",
-      "integrity": "sha512-cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg==",
-      "dev": true,
-      "peer": true,
+    "@babel/helper-get-function-arity": {
+      "version": "7.16.7",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "requires": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+    "@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+    "@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+    "@babel/helper-module-transforms": {
+      "version": "7.17.6",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
+      }
     },
-    "@cnakazawa/watch": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
-      "dev": true,
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "requires": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
+    "@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="
     },
-    "@decidim/browserslist-config": {
-      "version": "file:packages/browserslist-config"
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
     },
-    "@decidim/core": {
-      "version": "file:packages/core",
+    "@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "requires": {
-        "@joeattardi/emoji-button": "^4.6.0",
-        "@zeitiger/appendaround": "^1.0.0",
-        "axios": "^0.21.1",
-        "bootstrap-tagsinput": "^0.7.1",
-        "classnames": "^2.2.5",
-        "d3": "5.4.0",
-        "diff": "^5.0.0",
-        "foundation-datepicker": "1.5.6",
-        "foundation-sites": "^6.7.0",
-        "graphiql": "^1.4.2",
-        "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-        "html5sortable": "0.10.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jquery": "^3.2.1",
-        "jquery-serializejson": "2.9.0",
-        "jquery.autocomplete": "1.2.0",
-        "leaflet": "1.3.1",
-        "leaflet-svgicon": "^0.0.2",
-        "leaflet-tilelayer-here": "1.0.2",
-        "leaflet.markercluster": "1.4.1",
-        "moment": "2.29.1",
-        "morphdom": "2.6.1",
-        "prop-types": "^15.7.2",
-        "quill": "1.3.7",
-        "raf": "^3.4.1",
-        "react": "^16.3.0",
-        "react-dom": "^16.3.0",
-        "react-i18nify": "^1.8.8",
-        "react-select": "^1.2.1",
-        "select": "^1.1.2",
-        "social-share-button": "2.2.0",
-        "svg4everybody": "2.1.9",
-        "tributejs": "5.1.3",
-        "unfetch": "^3.0.0",
-        "uuid": "^3.2.1"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/decidim-bulletin_board": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.22.3.tgz",
-      "integrity": "sha512-LN7wIK9IB9Zegr++fvEY2vAWdUvReLPCe3sbPMGadX3b2aurrx/SK3B38OfRdN2eqblksMzyNYtXALszA9dU2w==",
+    "@babel/helper-simple-access": {
+      "version": "7.16.7",
+      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
       "requires": {
-        "@apollo/client": "^3.2.7",
-        "core-js": "^3.8.3",
-        "graphql": "^15.4.0",
-        "node-jose": "^2.0.0",
-        "regenerator-runtime": "^0.13.7",
-        "rxjs": "^6.6.3",
-        "webpack": "^5.11.0",
-        "webpack-cli": "^4.2.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/dev": {
-      "version": "file:packages/dev",
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "requires": {
-        "axe-core": "^4.1.4"
+        "@babel/types": "^7.16.0"
       }
     },
-    "@decidim/elections": {
-      "version": "file:packages/elections",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "requires": {
-        "@decidim/decidim-bulletin_board": "0.22.3",
-        "@decidim/voting_schemes-dummy": "0.22.3",
-        "@decidim/voting_schemes-electionguard": "0.22.3"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/eslint-config": {
-      "version": "file:packages/eslint-config",
-      "requires": {}
+    "@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
     },
-    "@decidim/stylelint-config": {
-      "version": "file:packages/stylelint-config",
-      "requires": {}
+    "@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
     },
-    "@decidim/voting_schemes-dummy": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.22.3.tgz",
-      "integrity": "sha512-Z5CwSUJNYW2KkoE5anAqAIwHnQHqpgGL4Xu2I7YqEn3thThlbWlY9U9Eq0O6fq7/pfBQLiAFFiBBAnCDv0HC2g=="
+    "@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "requires": {
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
     },
-    "@decidim/voting_schemes-electionguard": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.22.3.tgz",
-      "integrity": "sha512-RZn/1GO5PM6a2SuN8h/SoS4EeLYnHPWw6/tl2M26ms/Xzf1ewJIgBSiByxk4qHoqvE892rccH4+G56h6iVrIqg=="
+    "@babel/helpers": {
+      "version": "7.17.2",
+      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+      "requires": {
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
+      }
     },
-    "@decidim/webpacker": {
-      "version": "file:packages/webpacker",
+    "@babel/highlight": {
+      "version": "7.16.10",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "requires": {
-        "@babel/core": "^7.13.13",
-        "@babel/eslint-parser": "^7.13.14",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-regenerator": "^7.13.15",
-        "@babel/plugin-transform-runtime": "^7.13.15",
-        "@babel/preset-env": "^7.13.5",
-        "@babel/preset-react": "^7.12.13",
-        "@babel/types": "^7.0.0-beta.40",
-        "@rails/ujs": "^6.1.3",
-        "@rails/webpacker": "6.0.0-rc.5",
-        "@webpack-cli/serve": "^1.3.1",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.0.4",
-        "babel-plugin-__coverage__": "^1.11.111",
-        "babel-preset-airbnb": "^5.0.0",
-        "core-js": "^3.9.1",
-        "css-loader": "^4.3.0",
-        "css-minimizer-webpack-plugin": "^1.3.0",
-        "expose-loader": "^2.0.0",
-        "mini-css-extract-plugin": "^1.4.0",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-import": "^12.0.1",
-        "postcss-loader": "^5.2.0",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-scss": "^2.1.1",
-        "sass": "^1.32.8",
-        "sass-loader": "^11.0.1",
-        "source-map-loader": "^0.2.4",
-        "style-loader": "^2.0.0",
-        "webpack": "^5.11.0",
-        "webpack-bundle-analyzer": "^3.8.0",
-        "webpack-cli": "^4.2.0",
-        "webpack-config-utils": "^2.3.1",
-        "webpack-dev-server": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       }
     },
-    "@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="
+    "@babel/parser": {
+      "version": "7.17.3",
+      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="
     },
-    "@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
-      "peer": true,
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
       "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "13.9.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
-          "peer": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "peer": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "@fortawesome/fontawesome-common-types": {
-      "version": "0.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
-      "integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw=="
-    },
-    "@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz",
-      "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==",
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.16.7",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
       }
     },
-    "@fortawesome/free-regular-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==",
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.16.8",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "@fortawesome/free-solid-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==",
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "@graphiql/toolkit": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.2.2.tgz",
-      "integrity": "sha512-kDgYhqnS4p4LqSo1KvLd3tbX8Hhdj0ZrgQuGsosjjEnahiPYmmylxUL1p9lj6348OsypcTlCncGpEjeb9S3TiQ==",
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.6",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
       "requires": {
-        "@n1ru4l/push-pull-async-iterable-iterator": "^2.1.4",
-        "graphql-ws": "^4.3.2",
-        "meros": "^1.1.4",
-        "subscriptions-transport-ws": "^0.9.18"
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
-    "@graphql-typed-document-node/core": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz",
-      "integrity": "sha512-wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg==",
-      "requires": {}
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.16.7",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
     },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.16.7",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
       "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.16.7",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
     },
-    "@jest/console": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
-      "dev": true,
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.16.7",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.16.7",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.17.3",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "requires": {
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.16.7"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.16.7",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.16.11",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.16.7",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.16.7",
+      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.16.8",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.16.7",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.16.7",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.17.3",
+      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.16.7",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.16.7",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.16.7",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.16.7",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.16.8",
+      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.16.7",
+      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.16.7",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.16.8",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.16.7",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.16.7",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.16.7",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-display-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.17.3",
+      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-jsx": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-development": {
+      "version": "7.16.7",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+      "requires": {
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.16.7",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.16.7",
+      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.16.7",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.17.0",
+      "integrity": "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.16.7",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.16.7",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.16.11",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "requires": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.5",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/preset-react": {
+      "version": "7.16.7",
+      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.17.2",
+      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.17.2",
+      "integrity": "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==",
+      "dev": true,
+      "requires": {
+        "core-js-pure": "^3.20.2",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.16.7",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.17.3",
+      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.3",
+        "@babel/types": "^7.17.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.17.0",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.4",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@codemirror/highlight": {
+      "version": "0.19.7",
+      "integrity": "sha512-3W32hBCY0pbbv/xidismw+RDMKuIag+fo4kZIbD7WoRj+Ttcaxjf+vP6RttRHXLaaqbWh031lTeON8kMlDhMYw==",
+      "requires": {
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/rangeset": "^0.19.0",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "@codemirror/language": {
+      "version": "0.19.7",
+      "integrity": "sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q==",
+      "requires": {
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.5",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "@codemirror/rangeset": {
+      "version": "0.19.8",
+      "integrity": "sha512-1vusIkxSD0vK5KQ22JO/4Ejfww5268PgM/CpKNBSpTpWZEFlZbmOPyRiY4HXO2oEzOpypbA/walMiNInWnrT0Q==",
+      "requires": {
+        "@codemirror/state": "^0.19.0"
+      }
+    },
+    "@codemirror/state": {
+      "version": "0.19.9",
+      "integrity": "sha512-psOzDolKTZkx4CgUqhBQ8T8gBc0xN5z4gzed109aF6x7D7umpDRoimacI/O6d9UGuyl4eYuDCZmDFr2Rq7aGOw==",
+      "requires": {
+        "@codemirror/text": "^0.19.0"
+      }
+    },
+    "@codemirror/stream-parser": {
+      "version": "0.19.6",
+      "integrity": "sha512-dmPtoz/MR3IphxAsgywEyvSjOJCb2ikAgqp6BGIlwBEJVRiap0wFK4b3f/3DKIHUG4GezWRYQumXNyb3GNQevw==",
+      "requires": {
+        "@codemirror/highlight": "^0.19.0",
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "@codemirror/text": {
+      "version": "0.19.6",
+      "integrity": "sha512-T9jnREMIygx+TPC1bOuepz18maGq/92q2a+n4qTqObKwvNMg+8cMTslb8yxeEDEq7S3kpgGWxgO1UWbQRij0dA=="
+    },
+    "@codemirror/view": {
+      "version": "0.19.45",
+      "integrity": "sha512-wR19UBYvJMeV9axa5Xo6ATbAP1jl30BPFZ5buu3cJjYXwlRhJDjzw2wUbxk1zsR1LtAe5jrRNeWEtGA+IPacxw==",
+      "requires": {
+        "@codemirror/rangeset": "^0.19.5",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/text": "^0.19.0",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "@csstools/postcss-color-function": {
+      "version": "1.0.2",
+      "integrity": "sha512-uayvFqfa0hITPwVduxRYNL9YBD/anTqula0tu2llalaxblEd7QPuETSN3gB5PvTYxSfd0d8kS4Fypgo5JaUJ6A==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-font-format-keywords": {
+      "version": "1.0.0",
+      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-hwb-function": {
+      "version": "1.0.0",
+      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-ic-unit": {
+      "version": "1.0.0",
+      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.0",
+      "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      }
+    },
+    "@csstools/postcss-normalize-display-values": {
+      "version": "1.0.0",
+      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-oklab-function": {
+      "version": "1.0.1",
+      "integrity": "sha512-Bnly2FWWSTZX20hDJLYHpurhp1ot+ZGvojLOsrHa9frzOVruOv4oPYMZ6wQomi9KsbZZ+Af/CuRYaGReTyGtEg==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-progressive-custom-properties": {
+      "version": "1.2.0",
+      "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@decidim/browserslist-config": {
+      "version": "file:packages/browserslist-config"
+    },
+    "@decidim/core": {
+      "version": "file:packages/core",
+      "requires": {
+        "@joeattardi/emoji-button": "^4.6.2",
+        "@rails/activestorage": "^6.0.4",
+        "@tarekraafat/autocomplete.js": "^10.2.6",
+        "@zeitiger/appendaround": "^1.0.0",
+        "axios": "^0.21.4",
+        "bootstrap-tagsinput": "^0.7.1",
+        "classnames": "^2.2.5",
+        "d3": "5.4.0",
+        "dayjs": "^1.11.0",
+        "diff": "^5.0.0",
+        "foundation-datepicker": "1.5.6",
+        "foundation-sites": "^6.7.0",
+        "graphiql": "^1.4.7",
+        "html5sortable": "0.10.0",
+        "identity-obj-proxy": "^3.0.0",
+        "jquery": "^3.2.1",
+        "jquery-serializejson": "2.9.0",
+        "js-cookie": "^3.0.1",
+        "leaflet": "1.3.1",
+        "leaflet-tilelayer-here": "1.0.2",
+        "leaflet.markercluster": "1.4.1",
+        "morphdom": "2.6.1",
+        "prop-types": "^15.7.2",
+        "quill": "1.3.7",
+        "raf": "^3.4.1",
+        "react": "^16.3.0",
+        "react-dom": "^16.3.0",
+        "react-i18nify": "^1.8.8",
+        "select": "^1.1.2",
+        "svg4everybody": "2.1.9",
+        "tributejs": "5.1.3",
+        "unfetch": "^3.0.0",
+        "uuid": "^3.2.1"
+      },
+      "dependencies": {
+        "@rails/activestorage": {
+          "version": "6.1.4",
+          "integrity": "sha512-1Tm8uaVBhLTDEG4YaFPvqguhjbUGSPVItm0CfkRpIFZIkybWzFAxatIrk4YVOOxB8ZdXS7GdeYa1qVwjdiDkgQ==",
+          "requires": {
+            "spark-md5": "^3.0.0"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
+      }
+    },
+    "@decidim/decidim-bulletin_board": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.23.0.tgz",
+      "integrity": "sha512-kCFVv8bgq5+7cizkS+PchiWczsmsFAqQ4phbDm99xA+wz0Rq0iG4SpkNij5Xin0bvGDdVOQ1sU5HPlIePheEZQ==",
+      "requires": {
+        "@apollo/client": "^3.2.7",
+        "core-js": "^3.8.3",
+        "graphql": "^15.4.0",
+        "node-jose": "^2.0.0",
+        "regenerator-runtime": "^0.13.7",
+        "rxjs": "^6.6.3",
+        "webpack": "^5.11.0",
+        "webpack-cli": "^4.2.0"
+      },
+      "dependencies": {
+        "graphql": {
+          "version": "15.8.0",
+          "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="
+        }
+      }
+    },
+    "@decidim/dev": {
+      "version": "file:packages/dev",
+      "requires": {
+        "axe-core": "^4.1.4"
+      }
+    },
+    "@decidim/elections": {
+      "version": "file:packages/elections",
+      "requires": {
+        "@decidim/decidim-bulletin_board": "0.23.0",
+        "@decidim/voting_schemes-dummy": "0.23.0",
+        "@decidim/voting_schemes-electionguard": "0.23.0"
+      }
+    },
+    "@decidim/eslint-config": {
+      "version": "file:packages/eslint-config",
+      "requires": {}
+    },
+    "@decidim/stylelint-config": {
+      "version": "file:packages/stylelint-config",
+      "requires": {}
+    },
+    "@decidim/voting_schemes-dummy": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.23.0.tgz",
+      "integrity": "sha512-pTXJm6HsL4RmuR9TfKih8iShUk5WK6jZBUESl+T+XDXs4x60Sxi8xJ8GxUb+keTUgYG3hecYnlPez9Okc4WYqw=="
+    },
+    "@decidim/voting_schemes-electionguard": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.23.0.tgz",
+      "integrity": "sha512-o5/UXRc6v0Cp2BG/MtNpVAEtyNO3VdfFjJSX75E5W7G2yIu7na+D1HZyHyqIk1rgHPqdJmdg0DT7JI16fDcbXQ=="
+    },
+    "@decidim/webpacker": {
+      "version": "file:packages/webpacker",
+      "requires": {
+        "@babel/core": "^7.15.5",
+        "@babel/eslint-parser": "^7.16.5",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.13.15",
+        "@babel/plugin-transform-runtime": "^7.15.0",
+        "@babel/preset-env": "^7.15.6",
+        "@babel/preset-react": "^7.12.13",
+        "@babel/runtime": "^7.15.4",
+        "@rails/ujs": "^6.1.3",
+        "@rails/webpacker": "6.0.0-rc.5",
+        "autoprefixer": "^10.4.1",
+        "babel-loader": "^8.2.2",
+        "compression-webpack-plugin": "^9.0.0",
+        "css-loader": "^6.5.1",
+        "eslint": "^8.6.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "expose-loader": "^2.0.0",
+        "glob": "^7.2.0",
+        "jest": "^27.4.5",
+        "js-yaml": "^4.1.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "path-complete-extname": "^1.0.0",
+        "pnp-webpack-plugin": "^1.7.0",
+        "postcss": "^8.4.5",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-import": "^14.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-preset-env": "^7.1.0",
+        "postcss-scss": "^4.0.2",
+        "sass-embedded": "^1.49.9",
+        "source-map-loader": "^0.2.4",
+        "style-loader": "^3.0.0",
+        "terser-webpack-plugin": "^5.2.4",
+        "webpack": "^5.53.0",
+        "webpack-assets-manifest": "^5.0.6",
+        "webpack-cli": "^4.8.0",
+        "webpack-merge": "^5.8.0",
+        "webpack-sources": "^3.2.1",
+        "workbox-recipes": "^6.4.2",
+        "workbox-webpack-plugin": "^6.4.2"
+      },
+      "dependencies": {
+        "@eslint/eslintrc": {
+          "version": "1.2.0",
+          "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.4",
+            "debug": "^4.3.2",
+            "espree": "^9.3.1",
+            "globals": "^13.9.0",
+            "ignore": "^4.0.6",
+            "import-fresh": "^3.2.1",
+            "js-yaml": "^4.1.0",
+            "minimatch": "^3.0.4",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "@humanwhocodes/config-array": {
+          "version": "0.9.5",
+          "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+          "dev": true,
+          "requires": {
+            "@humanwhocodes/object-schema": "^1.2.1",
+            "debug": "^4.1.1",
+            "minimatch": "^3.0.4"
+          }
+        },
+        "@jest/console": {
+          "version": "27.5.1",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/core": {
+          "version": "27.5.1",
+          "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/reporters": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "jest-changed-files": "^27.5.1",
+            "jest-config": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-resolve-dependencies": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "jest-watcher": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "rimraf": "^3.0.0",
+            "slash": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "dev": true,
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/reporters": {
+          "version": "27.5.1",
+          "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+          "dev": true,
+          "requires": {
+            "@bcoe/v8-coverage": "^0.2.3",
+            "@jest/console": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "exit": "^0.1.2",
+            "glob": "^7.1.2",
+            "graceful-fs": "^4.2.9",
+            "istanbul-lib-coverage": "^3.0.0",
+            "istanbul-lib-instrument": "^5.1.0",
+            "istanbul-lib-report": "^3.0.0",
+            "istanbul-lib-source-maps": "^4.0.0",
+            "istanbul-reports": "^3.1.3",
+            "jest-haste-map": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.0",
+            "string-length": "^4.0.1",
+            "terminal-link": "^2.0.0",
+            "v8-to-istanbul": "^8.1.0"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "dev": true,
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/test-sequencer": {
+          "version": "27.5.1",
+          "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+          "dev": true,
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-runtime": "^27.5.1"
+          }
+        },
+        "@jest/transform": {
+          "version": "27.5.1",
+          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^27.5.1",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "babel-jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+          "dev": true,
+          "requires": {
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__core": "^7.1.14",
+            "babel-plugin-istanbul": "^6.1.1",
+            "babel-preset-jest": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "slash": "^3.0.0"
+          }
+        },
+        "babel-plugin-jest-hoist": {
+          "version": "27.5.1",
+          "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.3.3",
+            "@babel/types": "^7.3.3",
+            "@types/babel__core": "^7.0.0",
+            "@types/babel__traverse": "^7.0.6"
+          }
+        },
+        "babel-preset-jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+          "dev": true,
+          "requires": {
+            "babel-plugin-jest-hoist": "^27.5.1",
+            "babel-preset-current-node-syntax": "^1.0.0"
+          }
+        },
+        "camelcase": {
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "ci-info": {
+          "version": "3.3.0",
+          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+          "dev": true
+        },
+        "cjs-module-lexer": {
+          "version": "1.2.2",
+          "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+          "dev": true
+        },
+        "emittery": {
+          "version": "0.8.1",
+          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "eslint": {
+          "version": "8.10.0",
+          "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
+          "dev": true,
+          "requires": {
+            "@eslint/eslintrc": "^1.2.0",
+            "@humanwhocodes/config-array": "^0.9.2",
+            "ajv": "^6.10.0",
+            "chalk": "^4.0.0",
+            "cross-spawn": "^7.0.2",
+            "debug": "^4.3.2",
+            "doctrine": "^3.0.0",
+            "escape-string-regexp": "^4.0.0",
+            "eslint-scope": "^7.1.1",
+            "eslint-utils": "^3.0.0",
+            "eslint-visitor-keys": "^3.3.0",
+            "espree": "^9.3.1",
+            "esquery": "^1.4.0",
+            "esutils": "^2.0.2",
+            "fast-deep-equal": "^3.1.3",
+            "file-entry-cache": "^6.0.1",
+            "functional-red-black-tree": "^1.0.1",
+            "glob-parent": "^6.0.1",
+            "globals": "^13.6.0",
+            "ignore": "^5.2.0",
+            "import-fresh": "^3.0.0",
+            "imurmurhash": "^0.1.4",
+            "is-glob": "^4.0.0",
+            "js-yaml": "^4.1.0",
+            "json-stable-stringify-without-jsonify": "^1.0.1",
+            "levn": "^0.4.1",
+            "lodash.merge": "^4.6.2",
+            "minimatch": "^3.0.4",
+            "natural-compare": "^1.4.0",
+            "optionator": "^0.9.1",
+            "regexpp": "^3.2.0",
+            "strip-ansi": "^6.0.1",
+            "strip-json-comments": "^3.1.0",
+            "text-table": "^0.2.0",
+            "v8-compile-cache": "^2.0.3"
+          },
+          "dependencies": {
+            "eslint-visitor-keys": {
+              "version": "3.3.0",
+              "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+              "dev": true
+            },
+            "ignore": {
+              "version": "5.2.0",
+              "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+              "dev": true
+            }
+          }
+        },
+        "eslint-scope": {
+          "version": "7.1.1",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "eslint-utils": {
+          "version": "3.0.0",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "espree": {
+          "version": "9.3.1",
+          "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+          "dev": true,
+          "requires": {
+            "acorn": "^8.7.0",
+            "acorn-jsx": "^5.3.1",
+            "eslint-visitor-keys": "^3.3.0"
+          },
+          "dependencies": {
+            "eslint-visitor-keys": {
+              "version": "3.3.0",
+              "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+              "dev": true
+            }
+          }
+        },
+        "execa": {
+          "version": "5.1.1",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "expect": {
+          "version": "27.5.1",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        },
+        "globals": {
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+          "dev": true
+        },
+        "jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^27.5.1",
+            "import-local": "^3.0.2",
+            "jest-cli": "^27.5.1"
+          }
+        },
+        "jest-changed-files": {
+          "version": "27.5.1",
+          "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "execa": "^5.0.0",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-cli": {
+          "version": "27.5.1",
+          "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "import-local": "^3.0.2",
+            "jest-config": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "prompts": "^2.0.1",
+            "yargs": "^16.2.0"
+          }
+        },
+        "jest-config": {
+          "version": "27.5.1",
+          "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.8.0",
+            "@jest/test-sequencer": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "babel-jest": "^27.5.1",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.9",
+            "jest-circus": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-jasmine2": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "parse-json": "^5.2.0",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-docblock": {
+          "version": "27.5.1",
+          "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+          "dev": true,
+          "requires": {
+            "detect-newline": "^3.0.0"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-environment-jsdom": {
+          "version": "27.5.1",
+          "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jsdom": "^16.6.0"
+          }
+        },
+        "jest-environment-node": {
+          "version": "27.5.1",
+          "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "jest-get-type": {
+          "version": "27.5.1",
+          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^27.5.1",
+            "jest-serializer": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-jasmine2": {
+          "version": "27.5.1",
+          "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "co": "^4.6.0",
+            "expect": "^27.5.1",
+            "is-generator-fn": "^2.0.0",
+            "jest-each": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-leak-detector": {
+          "version": "27.5.1",
+          "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+          "dev": true,
+          "requires": {
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+          "dev": true
+        },
+        "jest-resolve": {
+          "version": "27.5.1",
+          "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-resolve-dependencies": {
+          "version": "27.5.1",
+          "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-snapshot": "^27.5.1"
+          }
+        },
+        "jest-runner": {
+          "version": "27.5.1",
+          "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/environment": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "graceful-fs": "^4.2.9",
+            "jest-docblock": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-leak-detector": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "source-map-support": "^0.5.6",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-serializer": {
+          "version": "27.5.1",
+          "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.9"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "27.5.1",
+          "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "leven": "^3.1.0",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-watcher": {
+          "version": "27.5.1",
+          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+          "dev": true,
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "jest-util": "^27.5.1",
+            "string-length": "^4.0.1"
+          }
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "pretty-format": {
+          "version": "27.5.1",
+          "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+              "dev": true
+            }
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "throat": {
+          "version": "6.0.1",
+          "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        },
+        "v8-to-istanbul": {
+          "version": "8.1.1",
+          "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.1",
+            "convert-source-map": "^1.6.0",
+            "source-map": "^0.7.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.3",
+              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+              "dev": true
+            }
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.9",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true
+        }
+      }
+    },
+    "@discoveryjs/json-ext": {
+      "version": "0.5.6",
+      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="
+    },
+    "@endemolshinegroup/cosmiconfig-typescript-loader": {
+      "version": "3.0.2",
+      "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==",
+      "requires": {
+        "lodash.get": "^4",
+        "make-error": "^1",
+        "ts-node": "^9",
+        "tslib": "^2"
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "peer": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "globals": {
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "peer": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "peer": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "peer": true
+        }
+      }
+    },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "0.3.0",
+      "integrity": "sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="
+    },
+    "@fortawesome/fontawesome-svg-core": {
+      "version": "1.3.0",
+      "integrity": "sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.3.0"
+      }
+    },
+    "@fortawesome/free-regular-svg-icons": {
+      "version": "5.15.4",
+      "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      },
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": {
+          "version": "0.2.36",
+          "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+        }
+      }
+    },
+    "@fortawesome/free-solid-svg-icons": {
+      "version": "5.15.4",
+      "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      },
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": {
+          "version": "0.2.36",
+          "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+        }
+      }
+    },
+    "@graphiql/toolkit": {
+      "version": "0.4.2",
+      "integrity": "sha512-14uG67QrONbRrhXwvBJFsMfcQfexmGhj7dgkputesx9xuPUkcCDNmVULnVA8sGYt8P/rSvjkfQYx3rtfW+GhAQ==",
+      "requires": {
+        "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0",
+        "meros": "^1.1.4"
+      }
+    },
+    "@graphql-tools/batch-execute": {
+      "version": "8.3.2",
+      "integrity": "sha512-ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/delegate": {
+      "version": "8.5.1",
+      "integrity": "sha512-/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw==",
+      "requires": {
+        "@graphql-tools/batch-execute": "^8.3.2",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "graphql-executor": "0.0.18",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/graphql-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg==",
+      "requires": {
+        "@graphql-tools/import": "^6.6.6",
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      }
+    },
+    "@graphql-tools/import": {
+      "version": "6.6.6",
+      "integrity": "sha512-a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w==",
+      "requires": {
+        "@graphql-tools/utils": "8.6.2",
+        "resolve-from": "5.0.0",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/json-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      }
+    },
+    "@graphql-tools/load": {
+      "version": "7.5.2",
+      "integrity": "sha512-URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g==",
+      "requires": {
+        "@graphql-tools/schema": "8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "p-limit": "3.1.0",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/merge": {
+      "version": "8.2.3",
+      "integrity": "sha512-XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/schema": {
+      "version": "8.3.2",
+      "integrity": "sha512-77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg==",
+      "requires": {
+        "@graphql-tools/merge": "^8.2.3",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/url-loader": {
+      "version": "7.7.2",
+      "integrity": "sha512-7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA==",
+      "requires": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/utils": "^8.6.2",
+        "@graphql-tools/wrap": "^8.4.2",
+        "@n1ru4l/graphql-live-query": "^0.9.0",
+        "@types/websocket": "^1.0.4",
+        "@types/ws": "^8.0.0",
+        "cross-undici-fetch": "^0.1.19",
+        "dset": "^3.1.0",
+        "extract-files": "^11.0.0",
+        "graphql-sse": "^1.0.1",
+        "graphql-ws": "^5.4.1",
+        "isomorphic-ws": "^4.0.1",
+        "meros": "^1.1.4",
+        "subscriptions-transport-ws": "^0.11.0",
+        "sync-fetch": "^0.3.1",
+        "tslib": "^2.3.0",
+        "valid-url": "^1.0.9",
+        "value-or-promise": "^1.0.11",
+        "ws": "^8.3.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.5.0",
+          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+          "requires": {}
+        }
+      }
+    },
+    "@graphql-tools/utils": {
+      "version": "8.6.2",
+      "integrity": "sha512-x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA==",
+      "requires": {
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/wrap": {
+      "version": "8.4.2",
+      "integrity": "sha512-U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ==",
+      "requires": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-typed-document-node/core": {
+      "version": "3.1.1",
+      "integrity": "sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==",
+      "requires": {}
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "peer": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "@iarna/toml": {
+      "version": "2.2.5",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "dev": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jest/console": {
+      "version": "26.6.2",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "jest-message-util": "^26.6.2",
@@ -22978,7 +21460,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -22986,9 +21467,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -22997,7 +21477,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23006,19 +21485,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23029,7 +21505,6 @@
     },
     "@jest/core": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
       "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "requires": {
@@ -23065,7 +21540,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23073,9 +21547,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23084,7 +21557,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23093,19 +21565,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23116,7 +21585,6 @@
     },
     "@jest/environment": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
       "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
@@ -23128,7 +21596,6 @@
     },
     "@jest/fake-timers": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
       "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
@@ -23142,7 +21609,6 @@
     },
     "@jest/globals": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
       "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "requires": {
@@ -23153,7 +21619,6 @@
     },
     "@jest/reporters": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
       "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "requires": {
@@ -23186,7 +21651,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23194,9 +21658,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23205,7 +21668,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23214,25 +21676,32 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "istanbul-lib-instrument": {
+          "version": "4.0.3",
+          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.5",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23243,7 +21712,6 @@
     },
     "@jest/source-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
       "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "requires": {
@@ -23254,7 +21722,6 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
@@ -23262,7 +21729,6 @@
     },
     "@jest/test-result": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
       "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "requires": {
@@ -23274,7 +21740,6 @@
     },
     "@jest/test-sequencer": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
       "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "requires": {
@@ -23287,7 +21752,6 @@
     },
     "@jest/transform": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
       "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "requires": {
@@ -23310,7 +21774,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23318,9 +21781,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23329,7 +21791,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23338,25 +21799,21 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23367,7 +21824,6 @@
     },
     "@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
       "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
@@ -23380,7 +21836,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23388,9 +21843,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23399,7 +21853,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23408,19 +21861,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23430,15 +21880,15 @@
       }
     },
     "@joeattardi/emoji-button": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@joeattardi/emoji-button/-/emoji-button-4.6.0.tgz",
-      "integrity": "sha512-KwOE1j+YxX47JmT0pXNCa+9Ai4Wf2fmABtvuxy6JBJ5QV0HdoThRKjL6CxAreVwwLbNQ/PDoR36xpc5QJjLXPA==",
+      "version": "4.6.2",
+      "integrity": "sha512-FhuzTmW3nVHLVp2BJfNX17CYV77fqtKZlx328D4h6Dw3cPTT1gJRNXN0jV7BvHgsl6Q/tN8DIQQxTUIO4jW3gQ==",
       "requires": {
         "@fortawesome/fontawesome-svg-core": "^1.2.28",
         "@fortawesome/free-regular-svg-icons": "^5.13.0",
         "@fortawesome/free-solid-svg-icons": "^5.13.0",
         "@popperjs/core": "^2.4.0",
         "@types/twemoji": "^12.1.1",
+        "escape-html": "^1.0.3",
         "focus-trap": "^5.1.0",
         "fuzzysort": "^1.1.4",
         "tiny-emitter": "^2.1.0",
@@ -23446,14 +21896,44 @@
         "twemoji": "^13.0.0"
       }
     },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "@lezer/common": {
+      "version": "0.15.11",
+      "integrity": "sha512-vv0nSdIaVCRcJ8rPuDdsrNVfBOYe/4Szr/LhF929XyDmBndLDuWiCCHooGlGlJfzELyO608AyDhVsuX/ZG36NA=="
+    },
+    "@lezer/lr": {
+      "version": "0.15.8",
+      "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+      "requires": {
+        "@lezer/common": "^0.15.0"
+      }
+    },
+    "@n1ru4l/graphql-live-query": {
+      "version": "0.9.0",
+      "integrity": "sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==",
+      "requires": {}
+    },
     "@n1ru4l/push-pull-async-iterable-iterator": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.4.tgz",
-      "integrity": "sha512-qLIvoOUJ+zritv+BlzcBMePKNjKQzH9Rb2i9W98YXxf/M62Lye8qH0peyiU8yJ1tL0kfulWi31BoK10E6BKJeA=="
+      "version": "3.2.0",
+      "integrity": "sha512-3fkKj25kEjsfObL6IlKPAlHYPq/oYwUkkQ03zsTTiDjD7vg/RxjdiLeCydqtxHZP0JgsXL3D/X5oAkMGzuUp/Q=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "requires": {
         "@nodelib/fs.stat": "2.0.5",
@@ -23462,40 +21942,26 @@
     },
     "@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
-    "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "requires": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      }
-    },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.11.2",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
     },
     "@rails/ujs": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@rails/ujs/-/ujs-6.1.3.tgz",
-      "integrity": "sha512-9mip5o+LVouWAqLMNJWhxda+D5uP+4RziNECgOGJlL6k3rc5SC/ljCHpV9Cym4i3oeGZkpZJ2tu4frCwt84kzQ=="
+      "version": "6.1.4",
+      "integrity": "sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw=="
     },
     "@rails/webpacker": {
       "version": "6.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@rails/webpacker/-/webpacker-6.0.0-rc.5.tgz",
       "integrity": "sha512-GOEhRs+mRRVZIiZbnLQ1WTxRCuu687rO4cvUVP7WMJ+z5uFr3EQkCaLq5VOtonWHzYbZIBEWH4rCWv0uZnrywQ==",
       "requires": {
         "@babel/core": "^7.15.0",
@@ -23517,24 +21983,70 @@
         "webpack-sources": "^3.2.0"
       },
       "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        "compression-webpack-plugin": {
+          "version": "8.0.1",
+          "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
+          "requires": {
+            "schema-utils": "^3.0.0",
+            "serialize-javascript": "^6.0.0"
+          }
         },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+        "schema-utils": {
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "argparse": "^2.0.1"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
+    "@rollup/plugin-babel": {
+      "version": "5.3.1",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "11.2.1",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      }
+    },
+    "@rollup/plugin-replace": {
+      "version": "2.4.2",
+      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.1.0",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "dependencies": {
+        "@types/estree": {
+          "version": "0.0.39",
+          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+        }
+      }
+    },
     "@sinonjs/commons": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
       "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
@@ -23543,7 +22055,6 @@
     },
     "@sinonjs/fake-timers": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
       "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
       "dev": true,
       "requires": {
@@ -23552,7 +22063,6 @@
     },
     "@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
       "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
       "dev": true,
       "peer": true,
@@ -23562,7 +22072,6 @@
     },
     "@stylelint/postcss-markdown": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
       "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
       "dev": true,
       "peer": true,
@@ -23571,17 +22080,29 @@
         "unist-util-find-all-after": "^3.0.2"
       }
     },
+    "@surma/rollup-plugin-off-main-thread": {
+      "version": "2.2.3",
+      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "requires": {
+        "ejs": "^3.1.6",
+        "json5": "^2.2.0",
+        "magic-string": "^0.25.0",
+        "string.prototype.matchall": "^4.0.6"
+      }
+    },
+    "@tarekraafat/autocomplete.js": {
+      "version": "10.2.6",
+      "integrity": "sha512-M3awL75YTQVHev4XlWGRKJalwVG3MGgtNnbRdtNipcyMcAV1sfkireBM8BKL/vhFhrus+6/5KZfj/DJDu8X0mg=="
+    },
     "@tootallnate/once": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
     "@types/babel__core": {
-      "version": "7.1.14",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
-      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
-      "dev": true,
+      "version": "7.1.18",
+      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "devOptional": true,
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -23591,82 +22112,65 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
-      "dev": true,
+      "version": "7.6.4",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "devOptional": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
-      "dev": true,
+      "version": "7.4.1",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "devOptional": true,
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__traverse": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
-      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
-      "dev": true,
+      "version": "7.14.2",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "devOptional": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
     "@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+      "version": "8.4.1",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "version": "3.7.3",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
+      "version": "0.0.51",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/graceful-fs": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
       "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "requires": {
@@ -23675,7 +22179,6 @@
     },
     "@types/istanbul-reports": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
       "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
@@ -23684,20 +22187,16 @@
     },
     "@types/json-schema": {
       "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "version": "3.0.10",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -23705,85 +22204,93 @@
       }
     },
     "@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.2",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true,
       "peer": true
     },
     "@types/node": {
-      "version": "15.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="
+      "version": "17.0.21",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==",
+      "version": "2.4.4",
+      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
       "dev": true
     },
-    "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
-    },
-    "@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+    "@types/resolve": {
+      "version": "1.17.1",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "@types/trusted-types": {
+      "version": "2.0.2",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+    },
     "@types/twemoji": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@types/twemoji/-/twemoji-12.1.1.tgz",
-      "integrity": "sha512-dW1B1WHTfrWmEzXb/tp8xsZqQHAyMB9JwLwbBqkIQVzmNUI02R7lJqxUpKFM114ygNZHKA1r74oPugCAiYHt1A=="
+      "version": "12.1.2",
+      "integrity": "sha512-3eMyKenMi0R1CeKzBYtk/Z2JIHsTMQrIrTah0q54o45pHTpWVNofU2oHx0jS8tqsDRhis2TbB6238WP9oh2l2w=="
     },
     "@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
+      "version": "2.0.6",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
       "dev": true,
       "peer": true
     },
+    "@types/websocket": {
+      "version": "1.0.5",
+      "integrity": "sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "8.5.2",
+      "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
-    "@types/zen-observable": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz",
-      "integrity": "sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="
+    "@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
@@ -23792,22 +22299,18 @@
     },
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
       "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
       "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
       "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
@@ -23817,12 +22320,10 @@
     },
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
       "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23833,7 +22334,6 @@
     },
     "@webassemblyjs/ieee754": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
@@ -23841,7 +22341,6 @@
     },
     "@webassemblyjs/leb128": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "requires": {
         "@xtuc/long": "4.2.2"
@@ -23849,12 +22348,10 @@
     },
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
       "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23869,7 +22366,6 @@
     },
     "@webassemblyjs/wasm-gen": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23881,7 +22377,6 @@
     },
     "@webassemblyjs/wasm-opt": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23892,7 +22387,6 @@
     },
     "@webassemblyjs/wasm-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23905,7 +22399,6 @@
     },
     "@webassemblyjs/wast-printer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23913,148 +22406,100 @@
       }
     },
     "@webpack-cli/configtest": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-      "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+      "version": "1.1.1",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
       "requires": {}
     },
     "@webpack-cli/info": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-      "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+      "version": "1.4.1",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
       "requires": {
         "envinfo": "^7.7.3"
       }
     },
     "@webpack-cli/serve": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
+      "version": "1.6.1",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
       "requires": {}
     },
     "@wry/context": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz",
-      "integrity": "sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==",
+      "version": "0.6.1",
+      "integrity": "sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@wry/equality": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz",
-      "integrity": "sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==",
+      "version": "0.5.2",
+      "integrity": "sha512-oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@wry/trie": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz",
-      "integrity": "sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==",
+      "version": "0.3.1",
+      "integrity": "sha512-WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zeitiger/appendaround": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@zeitiger/appendaround/-/appendaround-1.0.0.tgz",
       "integrity": "sha1-v4V4Prdpa6h5Irym42X0O1SH4Ns="
     },
     "abab": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true,
-      "peer": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+    "abort-controller": {
+      "version": "3.0.0",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "event-target-shim": "^5.0.0"
       }
     },
     "acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="
+      "version": "7.4.1",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        }
       }
     },
-    "acorn-import-assertions": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz",
-      "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==",
-      "requires": {}
-    },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "peer": true,
+      "version": "5.3.2",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
     },
     "agent-base": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "requires": {
         "debug": "4"
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "airbnb-prop-types": {
       "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
       "dev": true,
       "requires": {
@@ -24071,7 +22516,6 @@
     },
     "ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -24080,52 +22524,53 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-formats": {
+      "version": "2.1.1",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "requires": {
+        "ajv": "^8.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        }
+      }
+    },
     "ajv-keywords": {
       "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "requires": {}
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true,
-      "peer": true
-    },
     "ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "peer": true
     },
     "ansi-escapes": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.21.3"
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
-    },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "5.0.1",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
         "color-convert": "^1.9.0"
@@ -24133,73 +22578,25 @@
     },
     "anymatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "optional": true,
-      "peer": true
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
+    "arg": {
+      "version": "4.1.3",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "aria-query": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
@@ -24207,307 +22604,156 @@
     },
     "arr-diff": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
     "arr-flatten": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-union": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "optional": true,
-      "peer": true
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
     "array-includes": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
-      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       }
     },
     "array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
     },
     "array-unique": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
     "array.prototype.filter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz",
-      "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0",
+        "es-abstract": "^1.19.0",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       }
     },
     "array.prototype.find": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
-      "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
+      "version": "2.1.2",
+      "integrity": "sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "es-abstract": "^1.19.0"
       }
     },
     "array.prototype.flat": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
-      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "es-abstract": "^1.19.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
-      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.0"
       }
     },
     "arrify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true,
       "peer": true
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
     "assign-symbols": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
     "ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "peer": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
     },
-    "async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "optional": true,
-      "peer": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
     "atob": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "attrobj": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/attrobj/-/attrobj-3.1.0.tgz",
-      "integrity": "sha512-YFN+wZSEgER2w5IdIkmNkPiGqi6lRrNKL+VPl+7WnAPenZvnPC6bEmQuxka06Ilwx265x/K6QRh9W5Klav738Q=="
-    },
-    "aug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/aug/-/aug-4.0.0.tgz",
-      "integrity": "sha512-2cr7AHg5B+Cbjma7qhs+DZbKznzKwpkjfSCb48WVJfEF/+Hwxsu4GPGuqUblt/0gVYBiqdeAIrerlTjt8edyKg=="
-    },
     "autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "version": "10.4.2",
+      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
       "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
+        "browserslist": "^4.19.1",
+        "caniuse-lite": "^1.0.30001297",
+        "fraction.js": "^4.1.2",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "axe-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz",
-      "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==",
+      "version": "4.4.1",
+      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
       "dev": true
     },
     "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.4",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "axobject-query": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
+      "dev": true
     },
     "babel-jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
       "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "requires": {
@@ -24523,7 +22769,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -24531,9 +22776,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -24542,7 +22786,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -24551,19 +22794,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -24573,9 +22813,8 @@
       }
     },
     "babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.2.3",
+      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
       "requires": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
@@ -24583,47 +22822,27 @@
         "schema-utils": "^2.6.5"
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-__coverage__": {
-      "version": "1.11.111",
-      "resolved": "https://registry.npmjs.org/babel-plugin-__coverage__/-/babel-plugin-__coverage__-1.11.111.tgz",
-      "integrity": "sha1-AdD4396mrPvqJ3U/oteELwZcxXk=",
-      "requires": {
-        "babel-helper-function-name": "^6.5.0",
-        "babel-template": "^6.8.0"
-      }
-    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "requires": {
         "object.assign": "^4.1.0"
       }
     },
     "babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       }
     },
     "babel-plugin-jest-hoist": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
       "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "requires": {
@@ -24634,63 +22853,31 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "version": "0.3.1",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "requires": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz",
-      "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==",
+      "version": "0.5.2",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.9.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "version": "0.3.1",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
-      }
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "babel-preset-airbnb": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-airbnb/-/babel-preset-airbnb-5.0.0.tgz",
-      "integrity": "sha512-Y5nqHhnhu4RpwbmQj4H+srdk1kb413pX81PfJsT1IZQOuEuRzUDXmgN4Ut1GgpQJnfRpjjEuQy0/uzcLMMP1cQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-transform-classes": "^7.9.2",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-property-mutators": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.4",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       }
     },
     "babel-preset-current-node-syntax": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "requires": {
@@ -24710,7 +22897,6 @@
     },
     "babel-preset-jest": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
       "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "requires": {
@@ -24718,119 +22904,22 @@
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-        }
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
-    },
     "backo2": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "optional": true
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "bail": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
       "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
       "dev": true,
       "peer": true
     },
     "balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base": {
       "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
@@ -24845,7 +22934,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -24856,123 +22944,27 @@
     },
     "base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "base64url": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
     },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
     "big.js": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-        }
-      }
-    },
     "boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
     },
     "bootstrap-tagsinput": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-tagsinput/-/bootstrap-tagsinput-0.7.1.tgz",
       "integrity": "sha1-/+Owa74qEGlF7ygUVoAFqU8hGTc="
     },
     "brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
@@ -24981,7 +22973,6 @@
     },
     "braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "requires": {
         "fill-range": "^7.0.1"
@@ -24989,25 +22980,22 @@
     },
     "browser-process-hrtime": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
     "browserslist": {
-      "version": "4.16.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
-      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+      "version": "4.19.3",
+      "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001251",
-        "colorette": "^1.3.0",
-        "electron-to-chromium": "^1.3.811",
+        "caniuse-lite": "^1.0.30001312",
+        "electron-to-chromium": "^1.4.71",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.75"
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
       }
     },
     "bser": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
       "requires": {
@@ -25016,60 +23004,32 @@
     },
     "buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "requires": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
       }
     },
+    "buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha1-MyLNMH2Cltqx9gRhhZOyYaP63o8="
+    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "version": "1.1.2",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "requires": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      }
+    "builtin-modules": {
+      "version": "3.2.0",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
     },
     "cache-base": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
@@ -25086,100 +23046,47 @@
     },
     "call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "requires": {
-        "callsites": "^2.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
-        }
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "requires": {
-        "caller-callsite": "^2.0.0"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       }
     },
     "callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "devOptional": true
+      "dev": true
     },
     "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "optional": true,
+      "version": "6.2.2",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001252",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-      "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw=="
+      "version": "1.0.30001355",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001355.tgz",
+      "integrity": "sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g=="
     },
     "capture-exit": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
       "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "dev": true,
       "requires": {
         "rsvp": "^4.8.4"
       }
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -25189,39 +23096,29 @@
     },
     "char-regex": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true
     },
     "character-entities": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true,
       "peer": true
     },
     "character-entities-legacy": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
       "dev": true,
       "peer": true
     },
     "character-reference-invalid": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true,
       "peer": true
     },
-    "check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-    },
     "cheerio": {
       "version": "1.0.0-rc.10",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
       "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
       "dev": true,
       "requires": {
@@ -25236,7 +23133,6 @@
     },
     "cheerio-select": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
       "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
       "dev": true,
       "requires": {
@@ -25247,21 +23143,6 @@
         "domutils": "^2.7.0"
       }
     },
-    "chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "requires": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      }
-    },
     "chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -25269,24 +23150,20 @@
     },
     "chrome-trace-event": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "ci-info": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
     "cjs-module-lexer": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
       "dev": true
     },
     "class-utils": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
@@ -25298,7 +23175,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -25307,7 +23183,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -25316,7 +23191,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -25327,7 +23201,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -25336,7 +23209,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -25347,7 +23219,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -25358,7 +23229,6 @@
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
@@ -25366,17 +23236,10 @@
     },
     "classnames": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-    },
     "cliui": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "requires": {
@@ -25387,12 +23250,10 @@
     },
     "clone": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
     },
     "clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "requires": {
         "is-plain-object": "^2.0.4",
@@ -25402,58 +23263,45 @@
     },
     "clone-regexp": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
       "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
       "dev": true,
       "peer": true,
       "requires": {
         "is-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "is-regexp": {
+          "version": "2.1.0",
+          "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "co": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
     "codemirror": {
-      "version": "5.61.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
-      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
+      "version": "5.65.2",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "codemirror-graphql": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.0.2.tgz",
-      "integrity": "sha512-D4+BdYa6iQnDlio4mBk1Yap5ROCqEWapSFLkiKGatx/I0dF6euzdwd0um3Ndudw6rFQbNuT7hpcH8tnBO6VOfQ==",
+      "version": "1.2.12",
+      "integrity": "sha512-irP+E8HOWtgIdU3PNTU77bNmpEXQYADRRDmKqkjh3w1m0welbxl6HtZgp+c+Mkkz+FXY1+3+gF6nEEj+eJ1xdg==",
       "requires": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-parser": "^1.9.0"
+        "@codemirror/stream-parser": "^0.19.2",
+        "graphql-language-service": "^4.1.5"
       }
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
       "dev": true
     },
     "collection-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
@@ -25461,18 +23309,8 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.4"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "requires": {
         "color-name": "1.1.3"
@@ -25480,126 +23318,84 @@
     },
     "color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "color-string": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-      "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "colorette": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
+      "version": "2.0.16",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
     },
     "combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
+    "common-tags": {
+      "version": "1.8.2",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
+    },
     "commondir": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "component-emitter": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+    "compression-webpack-plugin": {
+      "version": "9.2.0",
+      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
       "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "requires": {
-            "ms": "2.0.0"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "compression-webpack-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-8.0.1.tgz",
-      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
-      "requires": {
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "schema-utils": {
+          "version": "4.0.0",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "requires": {
-            "randombytes": "^2.1.0"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
     },
     "concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
       "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "dev": true,
       "requires": {
@@ -25609,472 +23405,174 @@
         "typedarray": "^0.0.6"
       }
     },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true,
-      "peer": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "copy-to-clipboard": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
-      "requires": {
-        "toggle-selection": "^1.0.6"
-      }
-    },
-    "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
-    },
-    "core-js-compat": {
-      "version": "3.16.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.4.tgz",
-      "integrity": "sha512-IzCSomxRdahCYb6G3HiN6pl3JCiM0NMunRcNa1pIeC7g17Vd6Ue3AT9anQiENPIm/svThUVer1pIbLMDERIsFw==",
-      "requires": {
-        "browserslist": "^4.16.8",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
-        }
-      }
-    },
-    "core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true,
-      "peer": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
-      "requires": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      }
-    },
-    "css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "css-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz",
-      "integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==",
-      "requires": {
-        "camelcase": "^6.0.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.3",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.1",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "css-minimizer-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-jFa0Siplmfef4ndKglpVaduY47oHQwioAOEGK0f0vAX0s+vc+SmP6cCMoc+8Adau5600RnOEld5VVdC8CQau7w==",
-      "requires": {
-        "cacache": "^15.0.5",
-        "cssnano": "^4.1.10",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.3.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "webpack-sources": "^1.4.3"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
+    "convert-source-map": {
+      "version": "1.8.0",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "requires": {
-        "postcss": "^7.0.5"
+        "safe-buffer": "~5.1.1"
       }
     },
-    "css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-to-clipboard": {
+      "version": "3.3.1",
+      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "toggle-selection": "^1.0.6"
       }
     },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
+    "core-js": {
+      "version": "3.21.1",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
     },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+    "core-js-compat": {
+      "version": "3.21.1",
+      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
       "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
+        "browserslist": "^4.19.1",
+        "semver": "7.0.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "semver": {
+          "version": "7.0.0",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
         }
       }
     },
-    "css-what": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+    "core-js-pure": {
+      "version": "3.21.1",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
       "dev": true
     },
-    "cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+    "cosmiconfig": {
+      "version": "7.0.1",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      }
     },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    "cosmiconfig-toml-loader": {
+      "version": "1.0.0",
+      "integrity": "sha512-H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA==",
+      "requires": {
+        "@iarna/toml": "^2.2.5"
+      }
     },
-    "cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
+    "create-require": {
+      "version": "1.1.1",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-          "requires": {
-            "import-fresh": "^2.0.0",
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.13.1",
-            "parse-json": "^4.0.0"
-          }
-        },
-        "import-fresh": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-          "requires": {
-            "caller-path": "^2.0.0",
-            "resolve-from": "^3.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
-        }
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
-    "cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8="
+    "cross-undici-fetch": {
+      "version": "0.1.25",
+      "integrity": "sha512-KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "form-data-encoder": "^1.7.1",
+        "formdata-node": "^4.3.1",
+        "node-fetch": "^2.6.7",
+        "undici": "^4.9.3",
+        "web-streams-polyfill": "^3.2.0"
+      }
     },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0="
+    "crypto-random-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
     },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+    "css-blank-pseudo": {
+      "version": "3.0.3",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
+    "css-has-pseudo": {
+      "version": "3.0.4",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      }
     },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+    "css-loader": {
+      "version": "6.6.0",
+      "integrity": "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==",
       "requires": {
-        "css-tree": "^1.1.2"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.5",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.5"
       },
       "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
+            "lru-cache": "^6.0.0"
           }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
+    "css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "requires": {}
+    },
+    "css-select": {
+      "version": "4.2.1",
+      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      }
+    },
+    "css-what": {
+      "version": "5.1.0",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "dev": true
+    },
+    "cssdb": {
+      "version": "6.4.0",
+      "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA=="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    },
     "cssom": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
       "dev": true
     },
     "cssstyle": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "requires": {
@@ -26083,25 +23581,13 @@
       "dependencies": {
         "cssom": {
           "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
           "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
           "dev": true
         }
       }
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "d3": {
       "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.4.0.tgz",
       "integrity": "sha1-CQGZqFadHeI9BKP/B/4TYJX+p04=",
       "requires": {
         "d3-array": "1",
@@ -26139,17 +23625,14 @@
     },
     "d3-array": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
       "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
     },
     "d3-axis": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
       "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
     },
     "d3-brush": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
       "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
       "requires": {
         "d3-dispatch": "1",
@@ -26161,7 +23644,6 @@
     },
     "d3-chord": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
       "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
       "requires": {
         "d3-array": "1",
@@ -26170,17 +23652,14 @@
     },
     "d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
       "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "d3-contour": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
       "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
       "requires": {
         "d3-array": "^1.1.1"
@@ -26188,12 +23667,10 @@
     },
     "d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
       "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
     },
     "d3-drag": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
       "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
       "requires": {
         "d3-dispatch": "1",
@@ -26202,7 +23679,6 @@
     },
     "d3-dsv": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
       "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
       "requires": {
         "commander": "2",
@@ -26212,12 +23688,10 @@
     },
     "d3-ease": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
       "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
     },
     "d3-fetch": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
       "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
       "requires": {
         "d3-dsv": "1"
@@ -26225,7 +23699,6 @@
     },
     "d3-force": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
       "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
       "requires": {
         "d3-collection": "1",
@@ -26236,12 +23709,10 @@
     },
     "d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
       "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
     },
     "d3-geo": {
       "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
       "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
       "requires": {
         "d3-array": "1"
@@ -26249,12 +23720,10 @@
     },
     "d3-hierarchy": {
       "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
       "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "d3-interpolate": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
       "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "requires": {
         "d3-color": "1"
@@ -26262,27 +23731,22 @@
     },
     "d3-path": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "d3-polygon": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
       "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
     },
     "d3-quadtree": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
       "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
     },
     "d3-random": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
       "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
     },
     "d3-scale": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
       "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "requires": {
         "d3-array": "^1.2.0",
@@ -26295,7 +23759,6 @@
     },
     "d3-scale-chromatic": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
       "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
       "requires": {
         "d3-color": "1",
@@ -26304,12 +23767,10 @@
     },
     "d3-selection": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
       "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
     },
     "d3-shape": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
       "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "requires": {
         "d3-path": "1"
@@ -26317,12 +23778,10 @@
     },
     "d3-time": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
       "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "d3-time-format": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
       "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
       "requires": {
         "d3-time": "1"
@@ -26330,12 +23789,10 @@
     },
     "d3-timer": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
       "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
     },
     "d3-transition": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
       "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
       "requires": {
         "d3-color": "1",
@@ -26348,12 +23805,10 @@
     },
     "d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
       "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
     },
     "d3-zoom": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
       "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
       "requires": {
         "d3-dispatch": "1",
@@ -26364,23 +23819,12 @@
       }
     },
     "damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true,
-      "peer": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
+      "version": "1.0.8",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
     },
     "data-urls": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
       "dev": true,
       "requires": {
@@ -26389,45 +23833,62 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "dataloader": {
+      "version": "2.0.0",
+      "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="
+    },
+    "dayjs": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
+    },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.3",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "requires": {
         "ms": "2.1.2"
       }
     },
     "decamelize": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
     },
     "decamelize-keys": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "peer": true,
       "requires": {
         "decamelize": "^1.1.0",
         "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "map-obj": {
+          "version": "1.0.1",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "dedent": {
+      "version": "0.7.0",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "deep-equal": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
       "requires": {
         "is-arguments": "^1.0.4",
@@ -26439,59 +23900,15 @@
       }
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
     },
-    "default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "requires": {
-        "execa": "^5.0.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-        },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-        }
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-    },
     "define-properties": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "requires": {
         "object-keys": "^1.0.12"
@@ -26499,7 +23916,6 @@
     },
     "define-property": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
@@ -26507,73 +23923,27 @@
         "isobject": "^3.0.1"
       }
     },
-    "del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true,
-      "peer": true
-    },
-    "denque": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz",
-      "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
     },
     "detect-newline": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true
     },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
     "diff": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
       "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
     },
     "diff-sequences": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "requires": {
         "path-type": "^4.0.0"
@@ -26581,44 +23951,18 @@
     },
     "discontinuous-range": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
       "dev": true
     },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "peer": true,
       "requires": {
         "esutils": "^2.0.2"
       }
     },
     "dom-serializer": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
       "dev": true,
       "requires": {
@@ -26627,19 +23971,13 @@
         "entities": "^2.0.0"
       }
     },
-    "domassist": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domassist/-/domassist-2.2.0.tgz",
-      "integrity": "sha512-fz/B/YgI88m+/fw49tFi1syaGuBuBGA8DkS3J53jkzH+9wD0B8zUwdiExZjQnnJAwI1aXTgNj4nlTlx797zFqQ=="
-    },
     "domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true
     },
     "domexception": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
       "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dev": true,
       "requires": {
@@ -26648,35 +23986,22 @@
       "dependencies": {
         "webidl-conversions": {
           "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
           "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
           "dev": true
         }
       }
     },
     "domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "version": "4.3.0",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.2.0"
       }
     },
-    "domodule": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/domodule/-/domodule-8.1.0.tgz",
-      "integrity": "sha512-ION9hZ7tFVNkfLSx2t8gOM5YweUNb3jUezD4JXR7Vqb8S9pZt4kyuCJE25JvxozdkDXBIE9RUUAxDaOPUQV8Vw==",
-      "requires": {
-        "attrobj": "^3.1.0",
-        "aug": "^4.0.0",
-        "domassist": "^2.2.0"
-      }
-    },
     "domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "version": "2.8.0",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "requires": {
         "dom-serializer": "^1.0.1",
@@ -26684,82 +24009,47 @@
         "domhandler": "^4.2.0"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "dset": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz",
-      "integrity": "sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw=="
-    },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+    "ejs": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "jake": "^10.8.5"
       }
     },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
-    },
     "electron-to-chromium": {
-      "version": "1.3.824",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.824.tgz",
-      "integrity": "sha512-Fk+5aD0HDi9i9ZKt9n2VPOZO1dQy7PV++hz2wJ/KIn+CvVfu4fny39squHtyVDPuHNuoJGAZIbuReEklqYIqfA=="
+      "version": "1.4.75",
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "emittery": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
     },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
     "end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
     },
     "enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "version": "5.9.1",
+      "integrity": "sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==",
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -26767,7 +24057,6 @@
     },
     "enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "peer": true,
       "requires": {
@@ -26776,24 +24065,14 @@
     },
     "entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
-    "env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "optional": true,
-      "peer": true
-    },
     "envinfo": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
       "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="
     },
     "enzyme": {
       "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
       "requires": {
@@ -26823,7 +24102,6 @@
     },
     "enzyme-adapter-react-16": {
       "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz",
       "integrity": "sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==",
       "dev": true,
       "requires": {
@@ -26840,7 +24118,6 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
@@ -26848,7 +24125,6 @@
     },
     "enzyme-adapter-utils": {
       "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
       "integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
       "dev": true,
       "requires": {
@@ -26863,7 +24139,6 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
@@ -26871,7 +24146,6 @@
     },
     "enzyme-shallow-equal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
       "integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
       "dev": true,
       "requires": {
@@ -26881,28 +24155,30 @@
     },
     "error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -26912,18 +24188,15 @@
     },
     "es-array-method-boxes-properly": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
     "es-module-lexer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-      "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="
+      "version": "0.9.3",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "requires": {
         "is-callable": "^1.1.4",
@@ -26933,35 +24206,22 @@
     },
     "es6-promise": {
       "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-    },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "escalade": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
@@ -26972,23 +24232,57 @@
         "source-map": "~0.6.1"
       },
       "dependencies": {
+        "levn": {
+          "version": "0.3.0",
+          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
+          }
+        },
+        "optionator": {
+          "version": "0.8.3",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "dev": true,
+          "requires": {
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.1.2",
+          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
+        },
+        "type-check": {
+          "version": "0.3.2",
+          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2"
+          }
         }
       }
     },
     "eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "7.32.0",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "peer": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -27030,7 +24324,6 @@
       "dependencies": {
         "@babel/code-frame": {
           "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
           "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
           "peer": true,
           "requires": {
@@ -27039,17 +24332,23 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "peer": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "peer": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -27058,7 +24357,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "peer": true,
           "requires": {
@@ -27067,20 +24365,17 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "peer": true
         },
         "escape-string-regexp": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "peer": true
         },
         "globals": {
-          "version": "13.9.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
           "peer": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -27088,43 +24383,20 @@
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "peer": true
         },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "peer": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
           "peer": true,
           "requires": {
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-          "peer": true
-        },
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "peer": true,
           "requires": {
@@ -27133,113 +24405,101 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "peer": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
         },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "peer": true,
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        },
         "type-fest": {
           "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
           "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
           "peer": true
         }
       }
     },
+    "eslint-config-airbnb": {
+      "version": "19.0.4",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "requires": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      }
+    },
     "eslint-config-prettier": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "version": "8.5.0",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
       "dev": true,
-      "peer": true,
       "requires": {}
     },
     "eslint-config-standard": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
       "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==",
       "dev": true,
       "peer": true,
       "requires": {}
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "peer": true
         }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.7.3",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "debug": "^3.2.7",
-        "pkg-dir": "^2.0.0"
+        "find-up": "^2.1.0"
       },
       "dependencies": {
         "debug": {
           "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "find-up": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
-          "peer": true,
           "requires": {
             "locate-path": "^2.0.0"
           }
         },
         "locate-path": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
           "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-locate": "^2.0.0",
             "path-exists": "^3.0.0"
@@ -27247,53 +24507,29 @@
         },
         "p-limit": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
           "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-try": "^1.0.0"
           }
         },
         "p-locate": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
           "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-limit": "^1.1.0"
           }
         },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
+          "dev": true
         }
       }
     },
     "eslint-plugin-es": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
       "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "peer": true,
@@ -27303,185 +24539,69 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.25.4",
+      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.2",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.8.0",
+        "is-glob": "^4.0.3",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
+        "object.values": "^1.1.5",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.12.0"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "peer": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
-          "peer": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "peer": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "peer": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
+          "dev": true
         }
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
+      "version": "6.5.1",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@babel/runtime": "^7.11.2",
+        "@babel/runtime": "^7.16.3",
         "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
+        "array-includes": "^3.1.4",
         "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
+        "axe-core": "^4.3.5",
         "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
-        "emoji-regex": "^9.0.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
-        "language-tags": "^1.0.5"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true,
-          "peer": true
-        }
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
       }
     },
     "eslint-plugin-node": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
       "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
       "peer": true,
@@ -27495,9 +24615,8 @@
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true,
           "peer": true
         }
@@ -27505,48 +24624,43 @@
     },
     "eslint-plugin-promise": {
       "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
       "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
       "dev": true,
       "peer": true
     },
     "eslint-plugin-react": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+      "version": "7.29.2",
+      "integrity": "sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
         "doctrine": "^2.1.0",
-        "has": "^1.0.3",
+        "estraverse": "^5.3.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
         "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "dependencies": {
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
-          "peer": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
         "resolve": {
           "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
           "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
           "dev": true,
-          "peer": true,
           "requires": {
             "is-core-module": "^2.2.0",
             "path-parse": "^1.0.6"
@@ -27554,9 +24668,15 @@
         }
       }
     },
+    "eslint-plugin-react-hooks": {
+      "version": "4.3.0",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
     "eslint-plugin-standard": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
       "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
       "dev": true,
       "peer": true,
@@ -27564,7 +24684,6 @@
     },
     "eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "requires": {
         "esrecurse": "^4.3.0",
@@ -27573,14 +24692,12 @@
       "dependencies": {
         "estraverse": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
           "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         }
       }
     },
     "eslint-utils": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "peer": true,
       "requires": {
@@ -27589,7 +24706,6 @@
       "dependencies": {
         "eslint-visitor-keys": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
           "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "peer": true
         }
@@ -27597,12 +24713,10 @@
     },
     "eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
     },
     "espree": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "peer": true,
       "requires": {
@@ -27611,15 +24725,8 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "peer": true
-        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
           "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "peer": true
         }
@@ -27627,60 +24734,53 @@
     },
     "esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "peer": true,
       "requires": {
         "estraverse": "^5.1.0"
       }
     },
     "esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "requires": {
         "estraverse": "^5.2.0"
       }
     },
     "estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+      "version": "5.3.0",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+    },
+    "estree-walker": {
+      "version": "1.0.1",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
     },
     "esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    "event-target-shim": {
+      "version": "5.0.1",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
     },
     "eventemitter3": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
       "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
     },
     "events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
     "exec-sh": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "requires": {
@@ -27697,7 +24797,6 @@
     },
     "execall": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
       "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
       "dev": true,
       "peer": true,
@@ -27707,13 +24806,11 @@
     },
     "exit": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true
     },
     "expand-brackets": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
@@ -27728,7 +24825,6 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -27737,7 +24833,6 @@
         },
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -27746,7 +24841,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -27755,7 +24849,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -27764,7 +24857,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -27775,7 +24867,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -27784,7 +24875,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -27795,7 +24885,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -27806,19 +24895,16 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
@@ -27826,7 +24912,6 @@
     },
     "expect": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
       "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
@@ -27840,7 +24925,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -27849,7 +24933,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -27858,7 +24941,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
@@ -27866,75 +24948,15 @@
     },
     "expose-loader": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-2.0.0.tgz",
       "integrity": "sha512-WBpSGlNkn7YwbU2us7O+h0XsoFrB43Y/VCNSpRV4OZFXXKgw8W800BgNxLV0S97N3+KGnFYSCAJi1AV86NO22w==",
       "requires": {}
     },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
     "extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
@@ -27944,7 +24966,6 @@
     },
     "extglob": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
@@ -27960,7 +24981,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -27969,7 +24989,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -27978,141 +24997,66 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
+    "extract-files": {
+      "version": "11.0.0",
+      "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ=="
+    },
     "extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "requires": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-          "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-diff": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
       "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
     },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.11",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fastest-levenshtein": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
     },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.13.0",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "requires": {
         "reusify": "^1.0.4"
       }
     },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
     "fb-watchman": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
       "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "dev": true,
       "requires": {
@@ -28129,59 +25073,47 @@
     },
     "file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "peer": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
     },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "minimatch": "^5.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "requires": {
-            "ms": "2.0.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
         }
       }
     },
+    "fill-range": {
+      "version": "7.0.1",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "3.3.2",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "requires": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -28190,7 +25122,6 @@
     },
     "find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "requires": {
         "locate-path": "^5.0.0",
@@ -28199,28 +25130,18 @@
     },
     "flat-cache": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "peer": true,
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
       }
     },
     "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "peer": true
-    },
-    "flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+      "version": "3.2.5",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
     },
     "focus-trap": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.1.0.tgz",
       "integrity": "sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==",
       "requires": {
         "tabbable": "^4.0.0",
@@ -28228,24 +25149,16 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.14.9",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "for-in": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
     "form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "requires": {
@@ -28254,41 +25167,47 @@
         "mime-types": "^2.1.12"
       }
     },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    "form-data-encoder": {
+      "version": "1.7.1",
+      "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
+    },
+    "formdata-node": {
+      "version": "4.3.2",
+      "integrity": "sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg==",
+      "requires": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.1"
+      },
+      "dependencies": {
+        "web-streams-polyfill": {
+          "version": "4.0.0-beta.1",
+          "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ=="
+        }
+      }
     },
     "foundation-datepicker": {
       "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foundation-datepicker/-/foundation-datepicker-1.5.6.tgz",
       "integrity": "sha1-bciR8/ZCICghn3QoTRaEVIqMpL8="
     },
     "foundation-sites": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.7.0.tgz",
-      "integrity": "sha512-dajdL/7i5rn5F70I2FMnfDOlgXD5klCw8OS9a+Y3rM2fyj9f8JZkJ50eYukmeEM4zVnj+Xo6rJfciLxN/QEYWQ==",
-      "requires": {
-        "puppeteer": "^1.11.0"
-      }
+      "version": "6.7.4",
+      "integrity": "sha512-2QPaZJ0Od0DyklhQyKC3zPbr8AAUXSkr1scZJrQTgj/KTLresuCgUBfi7ft32NlOWhuqVXisjOgTE8N5EPS3cg==",
+      "requires": {}
+    },
+    "fraction.js": {
+      "version": "4.1.3",
+      "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg=="
     },
     "fragment-cache": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
     },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
     "fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "requires": {
         "graceful-fs": "^4.2.0",
@@ -28298,7 +25217,6 @@
       "dependencies": {
         "jsonfile": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "requires": {
             "graceful-fs": "^4.1.6"
@@ -28314,143 +25232,49 @@
         "minipass": "^3.0.0"
       }
     },
-    "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
     "fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "function.prototype.name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
-      "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
+      "version": "1.1.5",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.0",
         "functions-have-names": "^1.2.2"
       }
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "peer": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "functions-have-names": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
       "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
       "dev": true
     },
-    "fuzzy": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz",
-      "integrity": "sha1-THbsL/CsGjap3M+aAN+GIweNTtg="
-    },
     "fuzzysort": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
-      "integrity": "sha512-JzK/lHjVZ6joAg3OnCjylwYXYVjRiwTY6Yb25LvfpJHK8bjisfnZJ5bY8aVWwTwCXgxPNgLAtmHL+Hs5q1ddLQ=="
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true,
-          "peer": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
+      "version": "1.2.1",
+      "integrity": "sha512-egTSF3U6H6T9tXtAhEm5P5guSSDjd96/NUWrbmoGlIu3ATMdXra13gwQdEFRY6ehsFe8xec7UnQz+k34CGWCIg=="
     },
     "gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "devOptional": true
+      "dev": true
     },
     "get-intrinsic": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
       "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "requires": {
         "function-bind": "^1.1.1",
@@ -28458,46 +25282,44 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
     "get-package-type": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true
     },
     "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "optional": true,
+      "version": "8.0.0",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
       "peer": true
     },
     "get-stream": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
       "requires": {
         "pump": "^3.0.0"
       }
     },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "get-value": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -28509,7 +25331,6 @@
     },
     "glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
@@ -28517,12 +25338,10 @@
     },
     "glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "global-modules": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
       "dev": true,
       "peer": true,
@@ -28532,7 +25351,6 @@
     },
     "global-prefix": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
       "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
       "dev": true,
       "peer": true,
@@ -28544,7 +25362,6 @@
       "dependencies": {
         "which": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "peer": true,
@@ -28556,51 +25373,34 @@
     },
     "globals": {
       "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
         }
       }
     },
     "globjoin": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true,
       "peer": true
     },
-    "globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      }
-    },
     "gonzales-pe": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
       "dev": true,
       "peer": true,
@@ -28608,381 +25408,172 @@
         "minimist": "^1.2.5"
       }
     },
+    "google-protobuf": {
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.20.0.tgz",
+      "integrity": "sha512-hhXv5IKLDIkb0pEm53G053UZGhRAhw3wM5Jk7ly5sGIQRkO1s63FaDqM9QjlrPHygKEE2awUlLP9fFrG6M9vfQ=="
+    },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.9",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "graphiql": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.4.2.tgz",
-      "integrity": "sha512-TQDuuU/ZqTWV1yQDpVEiKskg0IYA+Wck37DYrrFzLlpgZWRbWiyab1PyHKiRep7J540CgScBg6C/gGCymKyO3g==",
+      "version": "1.6.0",
+      "integrity": "sha512-VUxnzehiv5BiJzoHQOL7CVFfVjMidate93wSRvFotW7gZluF6PQE45B+LeVWLMRoC59KIUcL+6gtgLHJ5FssvA==",
       "requires": {
-        "@graphiql/toolkit": "^0.2.0",
-        "codemirror": "^5.54.0",
-        "codemirror-graphql": "^1.0.0",
+        "@graphiql/toolkit": "^0.4.2",
+        "codemirror": "^5.58.2",
+        "codemirror-graphql": "^1.2.12",
         "copy-to-clipboard": "^3.2.0",
         "dset": "^3.1.0",
         "entities": "^2.0.0",
-        "graphql-language-service": "^3.1.2",
-        "markdown-it": "^10.0.0"
+        "escape-html": "^1.0.3",
+        "graphql-language-service": "^4.1.5",
+        "markdown-it": "^12.2.0"
       }
     },
     "graphql": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
-      "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA=="
+      "version": "16.3.0",
+      "integrity": "sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==",
+      "peer": true
     },
-    "graphql-docs": {
-      "version": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-      "integrity": "sha512-cfcgxsPudAO5nda6wux/GOJpPVCvuj7oq8DK1CYl91hRijqctyj2ZfM6Q/dxQRNAzkSC1U3o2jmAIrCdrI7Ynw==",
+    "graphql-config": {
+      "version": "4.1.0",
+      "integrity": "sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==",
       "requires": {
-        "marked": "^0.3.5",
-        "react-typeahead": "^2.0.0-alpha.5",
-        "request": "^2.74.0",
-        "yargs": "^5.0.0"
+        "@endemolshinegroup/cosmiconfig-typescript-loader": "3.0.2",
+        "@graphql-tools/graphql-file-loader": "^7.3.2",
+        "@graphql-tools/json-file-loader": "^7.3.2",
+        "@graphql-tools/load": "^7.4.1",
+        "@graphql-tools/merge": "^8.2.1",
+        "@graphql-tools/url-loader": "^7.4.2",
+        "@graphql-tools/utils": "^8.5.1",
+        "cosmiconfig": "7.0.1",
+        "cosmiconfig-toml-loader": "1.0.0",
+        "minimatch": "3.0.4",
+        "string-env-interpolation": "1.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          }
-        },
-        "y18n": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
-        },
-        "yargs": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
-          "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
-          "requires": {
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "lodash.assign": "^4.2.0",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "window-size": "^0.2.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^3.2.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
-          "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
+        "minimatch": {
+          "version": "3.0.4",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "requires": {
-            "camelcase": "^3.0.0",
-            "lodash.assign": "^4.1.0"
+            "brace-expansion": "^1.1.7"
           }
         }
       }
     },
+    "graphql-executor": {
+      "version": "0.0.18",
+      "integrity": "sha512-upUSl7tfZCZ5dWG1XkOvpG70Yk3duZKcCoi/uJso4WxJVT6KIrcK4nZ4+2X/hzx46pL8wAukgYHY6iNmocRN+g==",
+      "requires": {}
+    },
     "graphql-language-service": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-3.1.4.tgz",
-      "integrity": "sha512-AF98AT4wLxkE9q1gRf20Yn0EPgd5SctRiw1IkGFivPr98pEX0sKqUcIcIHePn2mxqf73jlWUJV5v6l/CB1gdqQ==",
+      "version": "4.1.5",
+      "integrity": "sha512-6vvZ+4L1xMNpQdlt6a9BaEzZD3ZIiaTmFdjKu81UTIVRh02QKfbW6tcz4UJNTY+4LsTWjR1rNtG3H4pVNrKJ2Q==",
       "requires": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-types": "^1.8.0"
+        "graphql-language-service-interface": "^2.10.2",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1"
       }
     },
     "graphql-language-service-interface": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.8.4.tgz",
-      "integrity": "sha512-myW8z7HOZkYfhYGKDc0URFkTZChp41Po890W92zuBIhGccckgtiWSJGXaLX+r9QAwVIeZhKaNgEacsyvQb1f/g==",
+      "version": "2.10.2",
+      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
       "requires": {
-        "graphql-language-service-parser": "^1.9.0",
-        "graphql-language-service-types": "^1.8.0",
-        "graphql-language-service-utils": "^2.5.1",
+        "graphql-config": "^4.1.0",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1",
         "vscode-languageserver-types": "^3.15.1"
       }
     },
     "graphql-language-service-parser": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.9.2.tgz",
-      "integrity": "sha512-3txms73cJsXDfJQdR5hI83N2rpTuq9FD6aijdrXAeSuI5B60g32DxjelUkt4Ge+2BvBEDLn5ppXlpVYDC9UQHQ==",
+      "version": "1.10.4",
+      "integrity": "sha512-duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA==",
       "requires": {
-        "graphql-language-service-types": "^1.8.0"
+        "graphql-language-service-types": "^1.8.7"
       }
     },
     "graphql-language-service-types": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz",
-      "integrity": "sha512-Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw==",
-      "requires": {}
+      "version": "1.8.7",
+      "integrity": "sha512-LP/Mx0nFBshYEyD0Ny6EVGfacJAGVx+qXtlJP4hLzUdBNOGimfDNtMVIdZANBXHXcM41MDgMHTnyEx2g6/Ttbw==",
+      "requires": {
+        "graphql-config": "^4.1.0",
+        "vscode-languageserver-types": "^3.15.1"
+      }
     },
     "graphql-language-service-utils": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.5.3.tgz",
-      "integrity": "sha512-ydevEZ0AgzEKQF3hiCbLXuS0o7189Ww/T30WtCKCLaRHDYk9Yyb2PZWdhSTWLxYZTaX2TccV6NtFWvzIC7UP3g==",
+      "version": "2.7.1",
+      "integrity": "sha512-Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA==",
       "requires": {
-        "graphql-language-service-types": "^1.8.0",
+        "@types/json-schema": "7.0.9",
+        "graphql-language-service-types": "^1.8.7",
         "nullthrows": "^1.0.0"
       }
     },
+    "graphql-sse": {
+      "version": "1.0.6",
+      "integrity": "sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==",
+      "requires": {}
+    },
     "graphql-tag": {
-      "version": "2.12.4",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz",
-      "integrity": "sha512-VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww==",
+      "version": "2.12.6",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
       "requires": {
         "tslib": "^2.1.0"
       }
     },
     "graphql-ws": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz",
-      "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==",
+      "version": "5.6.2",
+      "integrity": "sha512-TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ==",
       "requires": {}
     },
     "growly": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true,
       "optional": true
     },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "hard-rejection": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
       "peer": true
     },
     "harmony-reflect": {
       "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
       "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
     },
     "has": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        }
-      }
-    },
     "has-bigints": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
     },
     "has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+      "version": "1.0.3",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true,
-      "peer": true
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
     },
     "has-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
@@ -28993,7 +25584,6 @@
     },
     "has-values": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
@@ -29003,7 +25593,6 @@
       "dependencies": {
         "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
@@ -29012,7 +25601,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -29023,7 +25611,6 @@
         },
         "kind-of": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
@@ -29032,77 +25619,20 @@
         }
       }
     },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
     "hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "requires": {
         "react-is": "^16.7.0"
       }
     },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
-    },
     "hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
     },
     "html-element-map": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
       "dev": true,
       "requires": {
@@ -29112,39 +25642,29 @@
     },
     "html-encoding-sniffer": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
       "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
       "dev": true,
       "requires": {
         "whatwg-encoding": "^1.0.5"
       }
     },
-    "html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
-    },
     "html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
     "html-tags": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
       "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
       "dev": true,
       "peer": true
     },
     "html5sortable": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
       "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
     },
     "htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "requires": {
@@ -29154,55 +25674,8 @@
         "entities": "^2.0.0"
       }
     },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "dependencies": {
-        "eventemitter3": {
-          "version": "4.0.7",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-          "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-        }
-      }
-    },
     "http-proxy-agent": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "requires": {
@@ -29211,38 +25684,8 @@
         "debug": "4"
       }
     },
-    "http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
-      "requires": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-          "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dev": true,
       "requires": {
@@ -29252,29 +25695,27 @@
     },
     "human-signals": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true
     },
     "iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
+      "version": "5.1.0",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "requires": {}
+    },
+    "idb": {
+      "version": "6.1.5",
+      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
     },
     "identity-obj-proxy": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
       "requires": {
         "harmony-reflect": "^1.4.6"
@@ -29282,18 +25723,18 @@
     },
     "ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "peer": true
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+    },
+    "immutable": {
+      "version": "4.0.0",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
     },
     "import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "requires": {
         "parent-module": "^1.0.0",
@@ -29302,22 +25743,19 @@
       "dependencies": {
         "resolve-from": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
     "import-lazy": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
       "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
       "dev": true,
       "peer": true
     },
     "import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "requires": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -29325,27 +25763,16 @@
     },
     "imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "indent-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "peer": true
     },
     "inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
         "once": "^1.3.0",
@@ -29354,33 +25781,17 @@
     },
     "inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true,
       "peer": true
     },
-    "internal-ip": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
-      "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==",
-      "requires": {
-        "default-gateway": "^6.0.0",
-        "ipaddr.js": "^1.9.1",
-        "is-ip": "^3.1.0",
-        "p-event": "^4.2.0"
-      }
-    },
     "internal-slot": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
       "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "peer": true,
       "requires": {
         "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
@@ -29389,50 +25800,14 @@
     },
     "interpret": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
       "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="
     },
     "intl": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
       "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
     },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
-    },
     "is-accessor-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
       "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
@@ -29441,14 +25816,12 @@
     },
     "is-alphabetical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true,
       "peer": true
     },
     "is-alphanumerical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
       "dev": true,
       "peer": true,
@@ -29458,83 +25831,58 @@
       }
     },
     "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "version": "1.0.4",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "requires": {
-        "binary-extensions": "^2.0.0"
+        "has-bigints": "^1.0.1"
       }
     },
     "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "requires": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-buffer": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
     "is-ci": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "requires": {
         "ci-info": "^2.0.0"
       }
     },
-    "is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "requires": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
     "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.8.1",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "requires": {
         "has": "^1.0.3"
       }
     },
     "is-data-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
       "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
@@ -29542,20 +25890,20 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
+      "version": "1.0.5",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "dev": true,
       "peer": true
     },
     "is-descriptor": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
       "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "requires": {
@@ -29564,19 +25912,14 @@
         "kind-of": "^6.0.2"
       }
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
-    },
     "is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "optional": true
     },
     "is-extendable": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
       "requires": {
@@ -29585,90 +25928,61 @@
     },
     "is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true,
-      "peer": true
-    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-generator-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
     },
     "is-hexadecimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true,
       "peer": true
     },
-    "is-ip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
-      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
-      "requires": {
-        "ip-regex": "^4.0.0"
-      }
+    "is-module": {
+      "version": "1.0.0",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
     },
     "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+      "version": "2.0.2",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
     "is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+      "version": "1.0.1",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
     },
     "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "version": "1.1.0",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true,
       "peer": true
     },
     "is-plain-object": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
         "isobject": "^3.0.1"
@@ -29676,50 +25990,43 @@
     },
     "is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "peer": true
+      "version": "1.0.0",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    "is-shared-array-buffer": {
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
     },
     "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+      "version": "2.0.1",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
     },
     "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
+      "version": "1.0.7",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-subset": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
       "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
       "dev": true
     },
     "is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "requires": {
         "has-symbols": "^1.0.2"
@@ -29727,76 +26034,73 @@
     },
     "is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
       "peer": true
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    "is-weakref": {
+      "version": "1.0.2",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "is-windows": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
     "is-wsl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
       "requires": {
         "is-docker": "^2.0.0"
       }
     },
     "isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    "isomorphic-ws": {
+      "version": "4.0.1",
+      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
+      "requires": {}
     },
     "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.1.0",
+      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       }
     },
     "istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dev": true,
       "requires": {
@@ -29807,59 +26111,112 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.4",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "iterall": {
+      "version": "1.3.0",
+      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="
+    },
+    "jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "requires": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "async": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "iterall": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
-      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
-      "optional": true
-    },
     "jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
       "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "requires": {
@@ -29870,7 +26227,6 @@
     },
     "jest-changed-files": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
       "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "requires": {
@@ -29879,9 +26235,513 @@
         "throat": "^5.0.0"
       }
     },
+    "jest-circus": {
+      "version": "27.5.1",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
+      },
+      "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "dev": true,
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "dev": true,
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/transform": {
+          "version": "27.5.1",
+          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^27.5.1",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "camelcase": {
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "ci-info": {
+          "version": "3.3.0",
+          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+          "dev": true
+        },
+        "cjs-module-lexer": {
+          "version": "1.2.2",
+          "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+          "dev": true
+        },
+        "execa": {
+          "version": "5.1.1",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "expect": {
+          "version": "27.5.1",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+          "dev": true
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-get-type": {
+          "version": "27.5.1",
+          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^27.5.1",
+            "jest-serializer": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+          "dev": true
+        },
+        "jest-resolve": {
+          "version": "27.5.1",
+          "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-serializer": {
+          "version": "27.5.1",
+          "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.9"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "27.5.1",
+          "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "leven": "^3.1.0",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "pretty-format": {
+          "version": "27.5.1",
+          "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+              "dev": true
+            }
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "throat": {
+          "version": "6.0.1",
+          "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+          "dev": true
+        }
+      }
+    },
     "jest-cli": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
       "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
       "dev": true,
       "requires": {
@@ -29902,7 +26762,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -29910,9 +26769,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -29921,7 +26779,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -29930,19 +26787,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -29953,7 +26807,6 @@
     },
     "jest-config": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
       "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "requires": {
@@ -29979,7 +26832,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -29987,9 +26839,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -29998,7 +26849,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30007,19 +26857,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30030,7 +26877,6 @@
     },
     "jest-diff": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
       "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
@@ -30042,7 +26888,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30050,9 +26895,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30061,7 +26905,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30070,19 +26913,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30093,7 +26933,6 @@
     },
     "jest-docblock": {
       "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
       "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
       "dev": true,
       "requires": {
@@ -30102,7 +26941,6 @@
     },
     "jest-each": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
       "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
@@ -30115,7 +26953,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30123,9 +26960,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30134,7 +26970,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30143,19 +26978,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30166,7 +26998,6 @@
     },
     "jest-environment-jsdom": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
       "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
@@ -30181,7 +27012,6 @@
     },
     "jest-environment-node": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
       "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "requires": {
@@ -30195,13 +27025,11 @@
     },
     "jest-get-type": {
       "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
       "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true
     },
     "jest-haste-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
       "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "requires": {
@@ -30223,7 +27051,6 @@
     },
     "jest-jasmine2": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
       "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "requires": {
@@ -30249,7 +27076,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30257,9 +27083,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30268,7 +27093,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30277,19 +27101,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30300,7 +27121,6 @@
     },
     "jest-leak-detector": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
       "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "requires": {
@@ -30309,14 +27129,12 @@
       }
     },
     "jest-localstorage-mock": {
-      "version": "2.4.14",
-      "resolved": "https://registry.npmjs.org/jest-localstorage-mock/-/jest-localstorage-mock-2.4.14.tgz",
-      "integrity": "sha512-B+Y0y3J4wBOHdmcFSicWmVYMFAZFbJvjs1EfRIzUJRg2UAK+YVVUgTn7/MdjENey5xbBKmraBmKY5EX+x1NJXA==",
+      "version": "2.4.19",
+      "integrity": "sha512-TW7Cw6dbg4mgpxVUKmHU/sjOaUrUU2kp1DiWAY7JaPGDN1cRC/yXx1ewcJyPZ4d4qAd0UtJOER50sDjJSwVYGQ==",
       "dev": true
     },
     "jest-matcher-utils": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
       "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
@@ -30328,7 +27146,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30336,9 +27153,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30347,7 +27163,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30356,19 +27171,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30379,7 +27191,6 @@
     },
     "jest-message-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
       "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
@@ -30396,7 +27207,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30404,9 +27214,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30415,7 +27224,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30424,19 +27232,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30447,7 +27252,6 @@
     },
     "jest-mock": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
       "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
@@ -30457,20 +27261,17 @@
     },
     "jest-pnp-resolver": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "dev": true,
       "requires": {}
     },
     "jest-regex-util": {
       "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
       "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
       "dev": true
     },
     "jest-resolve": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
       "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
@@ -30486,7 +27287,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30494,9 +27294,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30505,7 +27304,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30514,19 +27312,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30537,7 +27332,6 @@
     },
     "jest-resolve-dependencies": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
       "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "requires": {
@@ -30548,7 +27342,6 @@
     },
     "jest-runner": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
       "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "dev": true,
       "requires": {
@@ -30576,7 +27369,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30584,9 +27376,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30595,7 +27386,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30604,19 +27394,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30627,7 +27414,6 @@
     },
     "jest-runtime": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
       "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "requires": {
@@ -30662,7 +27448,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30670,9 +27455,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30681,7 +27465,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30690,19 +27473,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30713,7 +27493,6 @@
     },
     "jest-serializer": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
       "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "requires": {
@@ -30723,7 +27502,6 @@
     },
     "jest-snapshot": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
       "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
@@ -30747,7 +27525,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30755,9 +27532,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30766,7 +27542,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30775,19 +27550,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
@@ -30796,7 +27568,6 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30807,7 +27578,6 @@
     },
     "jest-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
       "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
       "dev": true,
       "requires": {
@@ -30821,7 +27591,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30829,9 +27598,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30840,7 +27608,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30849,19 +27616,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30872,7 +27636,6 @@
     },
     "jest-validate": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
       "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
@@ -30886,7 +27649,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30894,15 +27656,13 @@
           }
         },
         "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30911,7 +27671,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30920,19 +27679,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30943,7 +27699,6 @@
     },
     "jest-watcher": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
       "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
@@ -30958,7 +27713,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30966,9 +27720,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30977,7 +27730,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30986,19 +27738,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -31009,7 +27758,6 @@
     },
     "jest-worker": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
       "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "requires": {
         "@types/node": "*",
@@ -31019,12 +27767,10 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -31034,49 +27780,31 @@
     },
     "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
       "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
     "jquery-serializejson": {
       "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-2.9.0.tgz",
       "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
     },
-    "jquery.autocomplete": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jquery.autocomplete/-/jquery.autocomplete-1.2.0.tgz",
-      "integrity": "sha512-aoJC3KVrPpRGaZBUo9UxhwznYmQ0UuYd+FfjP9RAKmyB+1T3OLIjuQImT8pKX6eKpBt1z9JmD48GiD2Dx303bA=="
-    },
-    "js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
-      "optional": true,
-      "peer": true
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
     },
     "js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "4.1.0",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
     "jsdom": {
-      "version": "16.6.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
-      "integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
+      "version": "16.7.0",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "requires": {
         "abab": "^2.0.5",
@@ -31104,49 +27832,43 @@
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
         "whatwg-url": "^8.5.0",
-        "ws": "^7.4.5",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "dev": true
+        }
       }
     },
     "jsesc": {
       "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "peer": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
     "json5": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "requires": {
         "minimist": "^1.2.5"
@@ -31154,184 +27876,99 @@
     },
     "jsonfile": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz",
       "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
       "requires": {
         "graceful-fs": "^4.1.6",
         "universalify": "^0.1.2"
       }
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
+    "jsonpointer": {
+      "version": "5.0.0",
+      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="
     },
     "jsx-ast-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
-      "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.2",
+        "array-includes": "^3.1.3",
         "object.assign": "^4.1.2"
       }
     },
     "kind-of": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "kleur": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
     "klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
+      "version": "2.0.5",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
     },
     "known-css-properties": {
       "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
       "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
       "dev": true,
       "peer": true
     },
     "language-subtag-registry": {
       "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
       "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "language-tags": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
       "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
-      "peer": true,
       "requires": {
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
     "leaflet": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.1.tgz",
       "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
     },
-    "leaflet-svgicon": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-svgicon/-/leaflet-svgicon-0.0.2.tgz",
-      "integrity": "sha512-9hGBLBHHcCSZAdVLwdiZbU2c/Z47eziDQslDrRQRcBNomEazH4NXvqY8egDMw+zGh/nBQub6jvTl1ty2nlEwmQ==",
-      "requires": {
-        "src": "^1.1.2"
-      }
-    },
     "leaflet-tilelayer-here": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-tilelayer-here/-/leaflet-tilelayer-here-1.0.2.tgz",
       "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
     },
     "leaflet.markercluster": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz",
       "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
       "requires": {}
     },
     "leven": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
     },
     "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
+      "version": "0.4.1",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       }
     },
     "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+      "version": "1.2.4",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "version": "3.0.3",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "requires": {
         "uc.micro": "^1.0.1"
       }
     },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "peer": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "loader-runner": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
       "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
     },
     "loader-utils": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
       "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "requires": {
         "big.js": "^5.2.2",
@@ -31341,7 +27978,6 @@
       "dependencies": {
         "json5": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "requires": {
             "minimist": "^1.2.0"
@@ -31351,7 +27987,6 @@
     },
     "locate-path": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "requires": {
         "p-locate": "^4.1.0"
@@ -31359,7 +27994,6 @@
     },
     "lockfile": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
       "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
       "requires": {
         "signal-exit": "^3.0.2"
@@ -31367,78 +28001,50 @@
     },
     "lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "peer": true
-    },
     "lodash.debounce": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
     "lodash.escape": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
       "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
       "dev": true
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
     "lodash.get": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
     "lodash.has": {
       "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
       "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
     },
     "lodash.isequal": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
       "dev": true
     },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
     "lodash.merge": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "peer": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
     "lodash.truncate": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "peer": true
     },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
-    },
     "log-symbols": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "peer": true,
@@ -31449,7 +28055,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "peer": true,
@@ -31458,9 +28063,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -31470,7 +28074,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "peer": true,
@@ -31480,21 +28083,18 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "peer": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "peer": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "peer": true,
@@ -31505,85 +28105,68 @@
       }
     },
     "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.0",
+      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
     },
     "longest-streak": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
       "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
       "dev": true,
       "peer": true
     },
     "loose-envify": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
     "lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "requires": {
         "yallist": "^4.0.0"
       }
     },
+    "magic-string": {
+      "version": "0.25.8",
+      "integrity": "sha512-n9NlSgfkB2rPYjSd/EZDoQcsXzwYAv4CIB/vi3ZSvZ2Tjax5W5Ie1NMy4HG3PVdcL4bBMMR20Ng4UcISMzqRLw==",
+      "requires": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
     "make-dir": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "requires": {
         "semver": "^6.0.0"
       }
     },
+    "make-error": {
+      "version": "1.3.6",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+    },
     "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
       "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
+        "tmpl": "1.0.5"
       }
     },
     "map-cache": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
     "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "devOptional": true,
+      "version": "4.3.0",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
       "peer": true
     },
     "map-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
@@ -31591,39 +28174,30 @@
       }
     },
     "markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+      "version": "12.3.2",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "requires": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
       },
       "dependencies": {
         "entities": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-          "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
+          "version": "2.1.0",
+          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
         }
       }
     },
-    "marked": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
-    },
     "mathml-tag-names": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true,
       "peer": true
     },
     "mdast-util-from-markdown": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
       "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
       "dev": true,
       "peer": true,
@@ -31637,7 +28211,6 @@
     },
     "mdast-util-to-markdown": {
       "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
       "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
       "dev": true,
       "peer": true,
@@ -31652,190 +28225,93 @@
     },
     "mdast-util-to-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
       "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
       "dev": true,
       "peer": true
     },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
     "mdurl": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
-        }
-      }
-    },
-    "memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
-      "requires": {
-        "fs-monkey": "1.0.3"
-      }
-    },
     "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "optional": true,
+      "version": "9.0.0",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "optional": true,
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "lru-cache": "^6.0.0"
           }
         },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "optional": true,
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
           }
         },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "optional": true,
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
+            "lru-cache": "^6.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
+        "type-fest": {
+          "version": "0.18.1",
+          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+          "dev": true,
+          "peer": true
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
+        "yargs-parser": {
+          "version": "20.2.9",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true,
+          "peer": true
         }
       }
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
     "merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
     "meros": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz",
-      "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==",
+      "version": "1.2.0",
+      "integrity": "sha512-3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ==",
       "requires": {}
     },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
     "micromark": {
       "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
       "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
       "dev": true,
       "peer": true,
@@ -31846,110 +28322,87 @@
     },
     "micromatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
       "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
         "braces": "^3.0.1",
         "picomatch": "^2.2.3"
       }
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
     "mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "requires": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.51.0"
       }
     },
     "mimic-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "min-indent": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
       "peer": true
     },
     "mini-css-extract-plugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz",
-      "integrity": "sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw==",
+      "version": "2.5.3",
+      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
       "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
+        "schema-utils": "^4.0.0"
       },
       "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+        "schema-utils": {
+          "version": "4.0.0",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "minimist-options": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
       "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
       "peer": true,
@@ -31957,49 +28410,16 @@
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
         "kind-of": "^6.0.3"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-          "dev": true,
-          "peer": true
-        }
       }
     },
     "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
       "requires": {
         "yallist": "^4.0.0"
       }
     },
-    "minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
@@ -32011,7 +28431,6 @@
     },
     "mixin-deep": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
@@ -32026,49 +28445,33 @@
     },
     "moment": {
       "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "moo": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
       "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
       "dev": true
     },
     "morphdom": {
       "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
       "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
     },
+    "motion-ui": {
+      "version": "2.0.3",
+      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
+      "peer": true,
+      "requires": {}
+    },
     "ms": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "optional": true,
-      "peer": true
+    "nanoid": {
+      "version": "3.3.1",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
     },
     "nanomatch": {
       "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
@@ -32087,12 +28490,10 @@
     },
     "natural-compare": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "nearley": {
       "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
       "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
       "dev": true,
       "requires": {
@@ -32102,96 +28503,81 @@
         "randexp": "0.4.6"
       }
     },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
     "neo-async": {
       "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "nice-try": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+    "node-domexception": {
+      "version": "1.0.0",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
     },
-    "node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
-      "optional": true,
-      "peer": true,
+    "node-fetch": {
+      "version": "2.6.7",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
+        "whatwg-url": "^5.0.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "optional": true,
-          "peer": true,
+        "tr46": {
+          "version": "0.0.3",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
           "requires": {
-            "lru-cache": "^6.0.0"
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
           }
         }
       }
     },
+    "node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+    },
     "node-int64": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true
     },
     "node-jose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.0.0.tgz",
-      "integrity": "sha512-j8zoFze1gijl8+DK/dSXXqX7+o2lMYv1XS+ptnXgGV/eloQaqq1YjNtieepbKs9jBS4WTnMOqyKSaQuunJzx0A==",
+      "version": "2.1.0",
+      "integrity": "sha512-Zmm8vFPJabphGBc5Wz1/LUMPS+1cynqw16RIhgVNQMEI2yEQrvl7Gx2EwN9GhP8tkm8f7SH53K2nIx8TeNTIdg==",
       "requires": {
         "base64url": "^3.0.1",
-        "buffer": "^5.5.0",
+        "buffer": "^6.0.3",
         "es6-promise": "^4.2.8",
-        "lodash": "^4.17.15",
-        "long": "^4.0.0",
-        "node-forge": "^0.10.0",
-        "pako": "^1.0.11",
+        "lodash": "^4.17.21",
+        "long": "^5.2.0",
+        "node-forge": "^1.2.1",
+        "pako": "^2.0.4",
         "process": "^0.11.10",
-        "uuid": "^3.3.3"
+        "uuid": "^8.3.2"
       },
       "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        "buffer": {
+          "version": "6.0.3",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
         }
       }
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
     "node-notifier": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
       "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
@@ -32206,7 +28592,6 @@
       "dependencies": {
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "optional": true,
@@ -32217,106 +28602,13 @@
       }
     },
     "node-releases": {
-      "version": "1.1.75",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
-      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
-    },
-    "node-sass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
-      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^7.0.3",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^7.1.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true,
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "optional": true,
-          "peer": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "abbrev": "1"
-      }
+      "version": "2.0.2",
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
     "normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -32326,58 +28618,36 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
     "normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
     },
     "normalize-selector": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true,
       "peer": true
     },
-    "normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
-    },
     "npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "requires": {
         "path-key": "^3.0.0"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
     "nth-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
+      "version": "2.0.1",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
       "dev": true,
       "requires": {
         "boolbase": "^1.0.0"
@@ -32385,38 +28655,25 @@
     },
     "nullthrows": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
       "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
     },
     "num2fraction": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true,
+      "peer": true
     },
     "nwsapi": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
@@ -32427,7 +28684,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -32436,7 +28692,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -32445,7 +28700,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -32454,7 +28708,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -32465,7 +28718,6 @@
           "dependencies": {
             "kind-of": {
               "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
               "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
               "dev": true
             }
@@ -32473,7 +28725,6 @@
         },
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -32483,13 +28734,11 @@
       }
     },
     "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+      "version": "1.12.0",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
     },
     "object-is": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "requires": {
         "call-bind": "^1.0.2",
@@ -32498,12 +28747,10 @@
     },
     "object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object-visit": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
@@ -32512,7 +28759,6 @@
     },
     "object.assign": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
       "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
         "call-bind": "^1.0.0",
@@ -32522,41 +28768,36 @@
       }
     },
     "object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "object.fromentries": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
-      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "es-abstract": "^1.19.1"
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+    "object.hasown": {
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "object.pick": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
@@ -32564,36 +28805,17 @@
       }
     },
     "object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
+        "es-abstract": "^1.19.1"
       }
     },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
     "once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
         "wrappy": "1"
@@ -32601,30 +28823,13 @@
     },
     "onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "requires": {
         "mimic-fn": "^2.1.0"
       }
     },
-    "open": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
-      "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
-    },
     "optimism": {
       "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz",
       "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
       "requires": {
         "@wry/context": "^0.6.0",
@@ -32632,110 +28837,69 @@
       }
     },
     "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "version": "0.9.1",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "requires": {
-        "lcid": "^1.0.0"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       }
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
     "p-each-series": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
       "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
-    "p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
-      "requires": {
-        "p-timeout": "^3.1.0"
-      }
-    },
     "p-finally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
     },
     "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.1.0",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "requires": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "requires": {
         "p-limit": "^2.2.0"
-      }
-    },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-      "requires": {
-        "@types/retry": "^0.12.0",
-        "retry": "^0.13.1"
-      }
-    },
-    "p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "requires": {
-        "p-finally": "^1.0.0"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "2.3.0",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        }
       }
     },
     "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+      "version": "1.0.0",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
     },
     "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "version": "2.0.4",
+      "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
     },
     "parchment": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
       "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "requires": {
         "callsites": "^3.0.0"
@@ -32743,7 +28907,6 @@
     },
     "parse-entities": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "dev": true,
       "peer": true,
@@ -32758,7 +28921,6 @@
     },
     "parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -32769,63 +28931,44 @@
     },
     "parse5": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
       "requires": {
         "parse5": "^6.0.1"
       }
     },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
     "pascalcase": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
     "path-complete-extname": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
       "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
     },
     "path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
     "path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pend": {
@@ -32835,446 +28978,153 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "version": "2.3.1",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.5",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true
     },
     "pkg-dir": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "requires": {
         "find-up": "^4.0.0"
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "pnp-webpack-plugin": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
       "integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
       "requires": {
         "ts-pnp": "^1.1.6"
       }
     },
-    "portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
     "posix-character-classes": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
     "postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "8.4.7",
+      "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
       "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "nanoid": "^3.3.1",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-attribute-case-insensitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
-      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
+      "version": "5.0.0",
+      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
       "requires": {
-        "postcss": "^7.0.2",
         "postcss-selector-parser": "^6.0.2"
       }
     },
-    "postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "requires": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
     "postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
+      "version": "4.2.2",
+      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
-      "requires": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
-      }
-    },
-    "postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
+      "version": "8.0.3",
+      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "7.0.2",
+      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
       "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
+      "version": "8.0.0",
+      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
+      "requires": {}
     },
     "postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "version": "12.1.4",
+      "integrity": "sha512-i6AytuTCoDLJkWN/MtAIGriJz3j7UX6bV7Z5t+KgFz+dwZS15/mlTJY1S0kRizlk6ba0V8u8hN50Fz5Nm7tdZw==",
       "requires": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "version": "6.0.0",
+      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
+        "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "version": "6.0.4",
+      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
+      "version": "3.1.0",
+      "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
       "requires": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+      "version": "4.0.5",
+      "integrity": "sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "requires": {
-        "postcss": "^7.0.26"
-      }
+      "version": "5.0.2",
+      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "requires": {}
     },
     "postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
+      "version": "6.0.4",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "requires": {
-        "postcss": "^7.0.2"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
+      "version": "5.0.4",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "requires": {
-        "postcss": "^7.0.2"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-font-variant": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
-      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.0",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "requires": {}
     },
     "postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.3",
+      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
+      "requires": {}
     },
     "postcss-html": {
       "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
       "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
       "dev": true,
       "peer": true,
@@ -33284,7 +29134,6 @@
       "dependencies": {
         "dom-serializer": {
           "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
           "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
           "dev": true,
           "peer": true,
@@ -33295,14 +29144,12 @@
           "dependencies": {
             "domelementtype": {
               "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
               "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
               "dev": true,
               "peer": true
             },
             "entities": {
               "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
               "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
               "dev": true,
               "peer": true
@@ -33311,14 +29158,12 @@
         },
         "domelementtype": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
           "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
           "dev": true,
           "peer": true
         },
         "domhandler": {
           "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
           "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
           "dev": true,
           "peer": true,
@@ -33328,7 +29173,6 @@
         },
         "domutils": {
           "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
           "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
           "dev": true,
           "peer": true,
@@ -33339,14 +29183,12 @@
         },
         "entities": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
           "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
           "dev": true,
           "peer": true
         },
         "htmlparser2": {
           "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
           "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
           "dev": true,
           "peer": true,
@@ -33362,73 +29204,78 @@
       }
     },
     "postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "version": "4.0.6",
+      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.2",
+      "integrity": "sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==",
       "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
       }
     },
     "postcss-initial": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
-      "integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.1",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "requires": {}
     },
     "postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "version": "4.1.1",
+      "integrity": "sha512-j3Z0WQCimY2tMle++YcmygnnVbt6XdnrCV1FO2IpzaCSmtTF2oO8h4ZYUA1Q+QHYroIiaWPvNHt9uBR4riCksQ==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-less": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
       "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.14"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "version": "6.2.1",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "requires": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
       },
       "dependencies": {
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
             "lru-cache": "^6.0.0"
@@ -33437,610 +29284,251 @@
       }
     },
     "postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.4",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "requires": {}
     },
     "postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.0",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "requires": {}
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true,
       "peer": true
     },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
     "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
+      "version": "3.0.0",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "version": "4.0.0",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "requires": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
+        "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "version": "3.0.0",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "version": "4.0.0",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "requires": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+        "icss-utils": "^5.0.0"
       }
     },
     "postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "version": "10.1.2",
+      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-selector-parser": "^6.0.8"
       }
     },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
+    "postcss-opacity-percentage": {
+      "version": "1.1.2",
+      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w=="
     },
     "postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.3",
+      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
+      "requires": {}
     },
     "postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.4",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "requires": {}
     },
     "postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
+      "version": "7.0.4",
+      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "requires": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
+      "version": "7.4.2",
+      "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
+      "requires": {
+        "@csstools/postcss-color-function": "^1.0.2",
+        "@csstools/postcss-font-format-keywords": "^1.0.0",
+        "@csstools/postcss-hwb-function": "^1.0.0",
+        "@csstools/postcss-ic-unit": "^1.0.0",
+        "@csstools/postcss-is-pseudo-class": "^2.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.0",
+        "@csstools/postcss-oklab-function": "^1.0.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.2.0",
+        "autoprefixer": "^10.4.2",
+        "browserslist": "^4.19.3",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^6.4.0",
+        "postcss-attribute-case-insensitive": "^5.0.0",
+        "postcss-color-functional-notation": "^4.2.2",
+        "postcss-color-hex-alpha": "^8.0.3",
+        "postcss-color-rebeccapurple": "^7.0.2",
+        "postcss-custom-media": "^8.0.0",
+        "postcss-custom-properties": "^12.1.4",
+        "postcss-custom-selectors": "^6.0.0",
+        "postcss-dir-pseudo-class": "^6.0.4",
+        "postcss-double-position-gradients": "^3.1.0",
+        "postcss-env-function": "^4.0.5",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.3",
+        "postcss-image-set-function": "^4.0.6",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.1.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.2",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.3",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.4",
+        "postcss-pseudo-class-any-link": "^7.1.1",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^5.0.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "version": "7.1.1",
+      "integrity": "sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg==",
       "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.0",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "requires": {}
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
       "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
       "dev": true,
       "peer": true
     },
     "postcss-safe-parser": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
       "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.26"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-sass": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
       "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
       "dev": true,
       "peer": true,
       "requires": {
         "gonzales-pe": "^4.3.0",
         "postcss": "^7.0.21"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "requires": {
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.3",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "requires": {}
     },
     "postcss-selector-not": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
-      "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
+      "version": "5.0.0",
+      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
       "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "balanced-match": "^1.0.0"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.9",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "requires": {
         "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "util-deprecate": "^1.0.2"
       }
     },
     "postcss-syntax": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
       "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
       "dev": true,
       "peer": true,
       "requires": {}
     },
-    "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
     "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
+      "version": "4.2.0",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+      "version": "1.2.1",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+    },
+    "pretty-bytes": {
+      "version": "5.6.0",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="
     },
     "pretty-format": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
       "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
@@ -34052,7 +29540,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -34061,7 +29548,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -34070,13 +29556,11 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "react-is": {
           "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
           "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
           "dev": true
         }
@@ -34084,28 +29568,16 @@
     },
     "process": {
       "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
     "progress": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "peer": true
     },
     "prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
@@ -34113,18 +29585,16 @@
       }
     },
     "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       }
     },
     "prop-types-exact": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
       "dev": true,
       "requires": {
@@ -34133,30 +29603,14 @@
         "reflect.ownkeys": "^0.2.0"
       }
     },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "psl": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -34164,104 +29618,20 @@
     },
     "punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "puppeteer": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
-      "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
-      "requires": {
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^2.2.1",
-        "mime": "^2.0.3",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-          "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.2.7",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-              "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            }
-          }
-        },
-        "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
     "queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "quick-lru": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
       "peer": true
     },
     "quill": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
       "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
       "requires": {
         "clone": "^2.1.1",
@@ -34274,7 +29644,6 @@
     },
     "quill-delta": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
       "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
       "requires": {
         "deep-equal": "^1.0.1",
@@ -34284,7 +29653,6 @@
     },
     "raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "requires": {
         "performance-now": "^2.1.0"
@@ -34292,13 +29660,11 @@
     },
     "railroad-diagrams": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
       "dev": true
     },
     "randexp": {
       "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
       "dev": true,
       "requires": {
@@ -34308,31 +29674,13 @@
     },
     "randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "requires": {
         "safe-buffer": "^5.1.0"
       }
     },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "react": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -34342,7 +29690,6 @@
     },
     "react-dom": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -34353,7 +29700,6 @@
     },
     "react-i18nify": {
       "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/react-i18nify/-/react-i18nify-1.11.18.tgz",
       "integrity": "sha512-flSSBzMI2gvJvCC+byP6Cl7vtyUsNH88VxjyER4zj8Fdl5rsLmXoJ9K4kNz8A6JUTmdFMWbTIp6aPXVIEbpE8w==",
       "requires": {
         "intl": "^1.2",
@@ -34361,32 +29707,12 @@
         "prop-types": "^15.6.1"
       }
     },
-    "react-input-autosize": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
-      "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
-      "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
-      "requires": {
-        "classnames": "^2.2.4",
-        "prop-types": "^15.5.8",
-        "react-input-autosize": "^2.1.2"
-      }
-    },
     "react-test-renderer": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "dev": true,
       "requires": {
@@ -34396,27 +29722,8 @@
         "scheduler": "^0.19.1"
       }
     },
-    "react-typeahead": {
-      "version": "2.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/react-typeahead/-/react-typeahead-2.0.0-alpha.8.tgz",
-      "integrity": "sha1-fwJfjudCAvBPqEJ8r+onMtUU9Yo=",
-      "requires": {
-        "classnames": "^1.2.0",
-        "create-react-class": "^15.5.2",
-        "fuzzy": "^0.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "dependencies": {
-        "classnames": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.2.tgz",
-          "integrity": "sha1-6WoqAiLYSSXdj62yBdZuEviI7fk="
-        }
-      }
-    },
     "read-cache": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "requires": {
         "pify": "^2.3.0"
@@ -34424,7 +29731,6 @@
     },
     "read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "requires": {
@@ -34436,7 +29742,6 @@
       "dependencies": {
         "type-fest": {
           "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
           "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
           "dev": true
         }
@@ -34444,7 +29749,6 @@
     },
     "read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "requires": {
@@ -34455,7 +29759,6 @@
       "dependencies": {
         "type-fest": {
           "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
           "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
         }
@@ -34463,117 +29766,53 @@
     },
     "readable-stream": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
         "util-deprecate": "^1.0.1"
       }
     },
-    "readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
     "rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "version": "0.7.1",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
       "requires": {
         "resolve": "^1.9.0"
       }
     },
     "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "dependencies": {
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        }
-      }
-    },
-    "redis": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
-      "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "requires": {
-        "denque": "^1.5.0",
-        "redis-commands": "^1.7.0",
-        "redis-errors": "^1.2.0",
-        "redis-parser": "^3.0.0"
-      }
-    },
-    "redis-commands": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
-      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
-    },
-    "redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60="
-    },
-    "redis-parser": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
-      "requires": {
-        "redis-errors": "^1.0.0"
-      }
-    },
-    "redis-url": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/redis-url/-/redis-url-0.2.0.tgz",
-      "integrity": "sha1-G3otrMw+qCZLH7ZWwNkB2cqcVHA=",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "peer": true,
       "requires": {
-        "redis": ">= 0.0.1"
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
       }
     },
     "reflect.ownkeys": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
       "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
       "dev": true
     },
     "regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "requires": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
       "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "requires": {
         "@babel/runtime": "^7.8.4"
@@ -34581,7 +29820,6 @@
     },
     "regex-not": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
@@ -34590,56 +29828,48 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.1",
+      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "peer": true
+      "version": "3.2.0",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
     "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+      "version": "0.6.0",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
     },
     "regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.8.4",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "requires": {
         "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
         }
       }
     },
     "remark": {
       "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
       "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
       "dev": true,
       "peer": true,
@@ -34651,7 +29881,6 @@
     },
     "remark-parse": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
       "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
       "dev": true,
       "peer": true,
@@ -34661,7 +29890,6 @@
     },
     "remark-stringify": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
       "peer": true,
@@ -34671,119 +29899,43 @@
     },
     "remove-trailing-separator": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
     },
     "require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
     "require-main-filename": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "devOptional": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "dev": true
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-cwd": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "requires": {
         "resolve-from": "^5.0.0"
@@ -34791,52 +29943,62 @@
     },
     "resolve-from": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
     },
     "resolve-url": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "resolve.exports": {
+      "version": "1.1.0",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "dev": true
+    },
     "ret": {
       "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
-    },
     "reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
     "rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "requires": {
         "glob": "^7.1.3"
       }
     },
+    "rollup": {
+      "version": "2.69.0",
+      "integrity": "sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==",
+      "requires": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "rollup-plugin-terser": {
+      "version": "7.0.2",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "dependencies": {
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        }
+      }
+    },
     "rst-selector-parser": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
       "dev": true,
       "requires": {
@@ -34846,13 +30008,11 @@
     },
     "rsvp": {
       "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true
     },
     "run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "requires": {
         "queue-microtask": "^1.2.2"
@@ -34860,12 +30020,10 @@
     },
     "rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "rxjs": {
       "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "requires": {
         "tslib": "^1.9.0"
@@ -34873,19 +30031,16 @@
       "dependencies": {
         "tslib": {
           "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
     "safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -34894,12 +30049,10 @@
     },
     "safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sane": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
       "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
       "dev": true,
       "requires": {
@@ -34916,7 +30069,6 @@
       "dependencies": {
         "anymatch": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
           "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
@@ -34926,7 +30078,6 @@
         },
         "braces": {
           "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
@@ -34944,7 +30095,6 @@
           "dependencies": {
             "extend-shallow": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
@@ -34955,7 +30105,6 @@
         },
         "cross-spawn": {
           "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
@@ -34968,7 +30117,6 @@
         },
         "execa": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
@@ -34983,7 +30131,6 @@
         },
         "fill-range": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
@@ -34995,7 +30142,6 @@
           "dependencies": {
             "extend-shallow": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
@@ -35006,7 +30152,6 @@
         },
         "get-stream": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
@@ -35015,13 +30160,11 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
@@ -35030,7 +30173,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35041,13 +30183,11 @@
         },
         "is-stream": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
           "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "micromatch": {
           "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
@@ -35068,7 +30208,6 @@
         },
         "normalize-path": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
@@ -35077,7 +30216,6 @@
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
           "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
@@ -35086,19 +30224,16 @@
         },
         "path-key": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
           "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
         "shebang-command": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
           "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
@@ -35107,13 +30242,11 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
           "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "to-regex-range": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
           "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
@@ -35123,7 +30256,6 @@
         },
         "which": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
@@ -35132,181 +30264,61 @@
         }
       }
     },
-    "sass": {
-      "version": "1.34.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
-      "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
+    "sass-embedded": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.0.tgz",
+      "integrity": "sha512-WCYA7FR0euku/VkpejpjTE6zjL8+h0eFZrLLjx42wCjb9/qKKyFWLdgsErXwnq3jDOMyUY4dYJfenRIVMcEXog==",
       "requires": {
-        "chokidar": ">=3.0.0 <4.0.0"
-      }
-    },
-    "sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+        "buffer-builder": "^0.2.0",
+        "extract-zip": "^2.0.1",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "node-fetch": "^2.6.0",
+        "rxjs": "^7.4.0",
+        "semver": "^7.3.5",
+        "shelljs": "^0.8.4",
+        "supports-color": "^8.1.1",
+        "tar": "^6.0.5"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "optional": true,
-          "peer": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "optional": true,
-          "peer": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "optional": true,
-          "peer": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "optional": true,
-          "peer": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "optional": true,
-          "peer": true,
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "lru-cache": {
+          "version": "7.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
+          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw=="
+        },
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
           "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "tslib": "^2.1.0"
           }
         },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "optional": true,
-          "peer": true,
+        "semver": {
+          "version": "7.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
+            "lru-cache": "^7.4.0"
           }
         },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "optional": true,
-          "peer": true,
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "sass-loader": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.1.1.tgz",
-      "integrity": "sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==",
-      "requires": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
     "saxes": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dev": true,
       "requires": {
@@ -35315,7 +30327,6 @@
     },
     "scheduler": {
       "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -35324,7 +30335,6 @@
     },
     "schema-utils": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "requires": {
         "@types/json-schema": "^7.0.5",
@@ -35332,171 +30342,28 @@
         "ajv-keywords": "^3.5.2"
       }
     },
-    "scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
-    },
-    "selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
-      "requires": {
-        "node-forge": "^0.10.0"
-      }
-    },
     "semver": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
     "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "6.0.0",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "requires": {
         "randombytes": "^2.1.0"
       }
     },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-value": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
@@ -35508,7 +30375,6 @@
       "dependencies": {
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -35517,20 +30383,13 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
     "shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "requires": {
         "kind-of": "^6.0.2"
@@ -35538,7 +30397,6 @@
     },
     "shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "requires": {
         "shebang-regex": "^3.0.0"
@@ -35546,22 +30404,42 @@
     },
     "shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
+    "shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "dependencies": {
+        "interpret": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+          "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
+        },
+        "rechoir": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+          "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+          "requires": {
+            "resolve": "^1.1.6"
+          }
+        }
+      }
+    },
     "shellwords": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true,
       "optional": true
     },
     "side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -35569,39 +30447,20 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        }
-      }
+      "version": "3.0.7",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "peer": true,
       "requires": {
@@ -35612,7 +30471,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "peer": true,
           "requires": {
@@ -35621,7 +30479,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "peer": true,
           "requires": {
@@ -35630,7 +30487,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "peer": true
         }
@@ -35638,7 +30494,6 @@
     },
     "snapdragon": {
       "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
@@ -35654,7 +30509,6 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -35663,7 +30517,6 @@
         },
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -35672,7 +30525,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -35681,7 +30533,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -35690,7 +30541,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35701,7 +30551,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -35710,7 +30559,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35721,7 +30569,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -35732,19 +30579,16 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
@@ -35752,7 +30596,6 @@
     },
     "snapdragon-node": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
@@ -35763,7 +30606,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -35774,7 +30616,6 @@
     },
     "snapdragon-util": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
@@ -35783,7 +30624,6 @@
       "dependencies": {
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -35792,45 +30632,20 @@
         }
       }
     },
-    "social-share-button": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/social-share-button/-/social-share-button-2.2.0.tgz",
-      "integrity": "sha512-8OatmjB10MFqnbgVFJe4SjRXBIwepla/FOo2gsC6w/PsQ1RuS5oKwe9kixv2TfWcTA1GCcT6m+lEylFRPrr71g==",
-      "requires": {
-        "domassist": "^2.2.0",
-        "domodule": "^8.0.0"
-      }
-    },
-    "sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
     "source-list-map": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "source-map": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-js": {
+      "version": "1.0.2",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    },
     "source-map-loader": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "requires": {
         "async": "^2.5.0",
@@ -35839,7 +30654,6 @@
     },
     "source-map-resolve": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
@@ -35851,9 +30665,8 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -35861,21 +30674,27 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
     "source-map-url": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
+    "spark-md5": {
+      "version": "3.0.2",
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+    },
     "spdx-correct": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -35883,58 +30702,31 @@
     },
     "spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
     },
     "spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
+      "version": "3.0.11",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
     },
     "specificity": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
       "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
       "dev": true,
       "peer": true
     },
     "split-string": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
@@ -35943,59 +30735,11 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "src": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/src/-/src-1.1.2.tgz",
-      "integrity": "sha1-eKvdHAjKyibMbPRb1YC1bZOs+38=",
-      "requires": {
-        "redis-url": "~0.2.0",
-        "underscore": "~1.6.0",
-        "uuid": "~1.4.1"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz",
-          "integrity": "sha1-RTAZ9oaWam34PNxSROfJkOzDMvw="
-        }
-      }
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "requires": {
-        "minipass": "^3.1.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
     "stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -36003,7 +30747,6 @@
       "dependencies": {
         "escape-string-regexp": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
           "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
           "dev": true
         }
@@ -36011,7 +30754,6 @@
     },
     "static-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
@@ -36021,7 +30763,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -36030,7 +30771,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -36039,7 +30779,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -36050,7 +30789,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -36059,7 +30797,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -36070,7 +30807,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -36081,73 +30817,32 @@
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
     },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
-    "stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
     "string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.2.0"
       },
       "dependencies": {
         "safe-buffer": {
           "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
         }
       }
     },
+    "string-env-interpolation": {
+      "version": "1.0.1",
+      "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="
+    },
     "string-length": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
@@ -36156,25 +30851,27 @@
       }
     },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        }
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz",
-      "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==",
-      "dev": true,
-      "peer": true,
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
@@ -36183,19 +30880,17 @@
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
-      "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "string.prototype.trimend": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
       "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "requires": {
         "call-bind": "^1.0.2",
@@ -36204,117 +30899,76 @@
     },
     "string.prototype.trimstart": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
       "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
+    "stringify-object": {
+      "version": "3.3.0",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "requires": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      }
+    },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true
     },
+    "strip-comments": {
+      "version": "2.0.1",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="
+    },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
     "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "optional": true,
+      "version": "3.0.0",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "min-indent": "^1.0.0"
       }
     },
     "strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "peer": true
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
+      "version": "3.3.1",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "requires": {}
+    },
+    "style-mod": {
+      "version": "4.0.0",
+      "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
     },
     "style-search": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true,
       "peer": true
     },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
     "stylelint": {
       "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz",
       "integrity": "sha512-DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==",
       "dev": true,
       "peer": true,
@@ -36371,7 +31025,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "peer": true,
@@ -36379,22 +31032,24 @@
             "color-convert": "^2.0.1"
           }
         },
-        "camelcase-keys": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-          "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+        "autoprefixer": {
+          "version": "9.8.8",
+          "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "camelcase": "^5.3.1",
-            "map-obj": "^4.0.0",
-            "quick-lru": "^4.0.1"
+            "browserslist": "^4.12.0",
+            "caniuse-lite": "^1.0.30001109",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "picocolors": "^0.2.1",
+            "postcss": "^7.0.32",
+            "postcss-value-parser": "^4.1.0"
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -36404,7 +31059,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "peer": true,
@@ -36413,153 +31067,68 @@
           }
         },
         "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "peer": true
-        },
-        "get-stdin": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-          "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "peer": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "peer": true
         },
-        "hosted-git-info": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true,
           "peer": true
         },
-        "map-obj": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-          "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true,
           "peer": true
         },
-        "meow": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-          "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/minimist": "^1.2.0",
-            "camelcase-keys": "^6.2.2",
-            "decamelize": "^1.2.0",
-            "decamelize-keys": "^1.1.0",
-            "hard-rejection": "^2.1.0",
-            "minimist-options": "4.1.0",
-            "normalize-package-data": "^3.0.0",
-            "read-pkg-up": "^7.0.1",
-            "redent": "^3.0.0",
-            "trim-newlines": "^3.0.0",
-            "type-fest": "^0.18.0",
-            "yargs-parser": "^20.2.3"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-          "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "redent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-          "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "indent-string": "^4.0.0",
-            "strip-indent": "^3.0.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+        "postcss-scss": {
+          "version": "2.1.1",
+          "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "postcss": "^7.0.6"
           }
         },
-        "strip-indent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
-          "peer": true,
-          "requires": {
-            "min-indent": "^1.0.0"
-          }
+          "peer": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "peer": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "trim-newlines": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-          "dev": true,
-          "peer": true
-        },
-        "type-fest": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-          "dev": true,
-          "peer": true
-        },
-        "yargs-parser": {
-          "version": "20.2.7",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-          "dev": true,
-          "peer": true
         }
       }
     },
     "subscriptions-transport-ws": {
-      "version": "0.9.19",
-      "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz",
-      "integrity": "sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==",
-      "optional": true,
+      "version": "0.11.0",
+      "integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==",
       "requires": {
         "backo2": "^1.0.2",
         "eventemitter3": "^3.1.0",
@@ -36570,31 +31139,45 @@
       "dependencies": {
         "eventemitter3": {
           "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
-          "optional": true
-        },
-        "symbol-observable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-          "optional": true
+          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
         }
       }
     },
     "sugarss": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.2"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
         "has-flag": "^3.0.0"
@@ -36602,7 +31185,6 @@
     },
     "supports-hyperlinks": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
@@ -36612,13 +31194,11 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -36627,131 +31207,56 @@
         }
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true,
       "peer": true
     },
     "svg4everybody": {
       "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/svg4everybody/-/svg4everybody-2.1.9.tgz",
       "integrity": "sha1-W9n23vwTOFmgRGRtR0P6vCjbfi0="
     },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-          "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^3.2.1",
-            "domutils": "^1.7.0",
-            "nth-check": "^1.0.2"
-          }
-        },
-        "css-what": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-          "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
-        },
-        "dom-serializer": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-          "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "entities": "^2.0.0"
-          }
-        },
-        "domutils": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          },
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.3.1",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-              "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-            }
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        }
-      }
-    },
     "symbol-observable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
-      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="
+      "version": "1.2.0",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "sync-fetch": {
+      "version": "0.3.1",
+      "integrity": "sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==",
+      "requires": {
+        "buffer": "^5.7.0",
+        "node-fetch": "^2.6.1"
+      }
+    },
     "tabbable": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
       "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.0",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "peer": true,
       "requires": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -36762,21 +31267,19 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "peer": true
         }
       }
     },
     "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="
+      "version": "2.2.1",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -36786,9 +31289,28 @@
         "yallist": "^4.0.0"
       }
     },
+    "temp-dir": {
+      "version": "2.0.0",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
+    },
+    "tempy": {
+      "version": "0.6.0",
+      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "requires": {
+        "is-stream": "^2.0.0",
+        "temp-dir": "^2.0.0",
+        "type-fest": "^0.16.0",
+        "unique-string": "^2.0.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.16.0",
+          "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="
+        }
+      }
+    },
     "terminal-link": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dev": true,
       "requires": {
@@ -36797,84 +31319,64 @@
       }
     },
     "terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "version": "5.12.0",
+      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
       "requires": {
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
         "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
       },
       "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
+        },
         "source-map": {
           "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-      "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+      "version": "5.3.1",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
       "requires": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.7.0"
+        "terser": "^5.7.2"
       },
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-worker": {
-          "version": "27.0.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-          "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
           "requires": {
             "@types/node": "*",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
         },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
+            "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
         },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
           "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -36884,7 +31386,6 @@
     },
     "test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "requires": {
@@ -36895,45 +31396,28 @@
     },
     "text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "peer": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "throat": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
       "dev": true
     },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
     "to-object-path": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
@@ -36942,7 +31426,6 @@
       "dependencies": {
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -36953,7 +31436,6 @@
     },
     "to-regex": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
@@ -36965,7 +31447,6 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "requires": {
         "is-number": "^7.0.0"
@@ -36973,17 +31454,10 @@
     },
     "toggle-selection": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
     "tough-cookie": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "requires": {
@@ -36994,7 +31468,6 @@
     },
     "tr46": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "requires": {
@@ -37003,57 +31476,53 @@
     },
     "tributejs": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
       "integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
     },
     "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "optional": true,
+      "version": "3.0.1",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
       "peer": true
     },
     "trough": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
       "dev": true,
       "peer": true
     },
-    "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "optional": true,
-      "peer": true,
+    "ts-invariant": {
+      "version": "0.9.4",
+      "integrity": "sha512-63jtX/ZSwnUNi/WhXjnK8kz4cHHpYS60AnmA6ixz17l7E12a5puCWFlNpkne5Rl0J8TBPVHpGjsj4fxs8ObVLQ==",
       "requires": {
-        "glob": "^7.1.2"
+        "tslib": "^2.1.0"
       }
     },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
-    "ts-invariant": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.7.3.tgz",
-      "integrity": "sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==",
+    "ts-node": {
+      "version": "9.1.1",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
       "requires": {
-        "tslib": "^2.1.0"
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "4.0.2",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+        }
       }
     },
     "ts-pnp": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
       "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
     },
     "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.12.0",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
@@ -37063,44 +31532,25 @@
       "dependencies": {
         "json5": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
-          "peer": true,
           "requires": {
             "minimist": "^1.2.0"
           }
         },
         "strip-bom": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
     "tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "version": "2.3.1",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "twemoji": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-13.1.0.tgz",
       "integrity": "sha512-e3fZRl2S9UQQdBFLYXtTBT6o4vidJMnpWUAhJA+yLGR+kaUTZAt3PixC0cGvvxWSuq2MSz/o0rJraOXrWw/4Ew==",
       "requires": {
         "fs-extra": "^8.0.1",
@@ -37111,61 +31561,49 @@
     },
     "twemoji-parser": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-13.1.0.tgz",
       "integrity": "sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg=="
     },
     "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+      "version": "0.4.0",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       }
     },
     "type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true
     },
     "type-fest": {
       "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
     "typedarray": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
       "requires": {
         "is-typedarray": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "4.6.2",
+      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "peer": true
+    },
     "uc.micro": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "unbox-primitive": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
       "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "requires": {
         "function-bind": "^1.1.1",
@@ -37174,44 +31612,37 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+    "undici": {
+      "version": "4.14.1",
+      "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ=="
     },
     "unfetch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.2.tgz",
       "integrity": "sha512-L0qrK7ZeAudGiKYw6nzFjnJ2D5WHblUBwmHIqtPS6oKUd+Hcpk7/hKsSmcHsTlpd1TbTNsiRBUKRq3bHLNIqIw=="
     },
     "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
+      "version": "2.0.0",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
     },
     "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="
+      "version": "2.0.0",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
+      "version": "2.0.0",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
     },
     "unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+      "version": "9.2.2",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -37225,16 +31656,20 @@
       "dependencies": {
         "is-buffer": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
           "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
           "dev": true,
           "peer": true
+        },
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+          "dev": true,
+          "peer": true
         }
       }
     },
     "union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
@@ -37246,41 +31681,20 @@
       "dependencies": {
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "uniqs": {
+    "unique-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "crypto-random-string": "^2.0.0"
       }
     },
     "unist-util-find-all-after": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
       "dev": true,
       "peer": true,
@@ -37290,14 +31704,12 @@
     },
     "unist-util-is": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
       "peer": true
     },
     "unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
       "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "peer": true,
@@ -37307,22 +31719,26 @@
     },
     "universalify": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
-    "unpipe": {
+    "unixify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+      "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=",
+      "requires": {
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
     },
     "unset-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
@@ -37332,7 +31748,6 @@
       "dependencies": {
         "has-value": {
           "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
@@ -37343,7 +31758,6 @@
           "dependencies": {
             "isobject": {
               "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
               "dev": true,
               "requires": {
@@ -37354,15 +31768,17 @@
         },
         "has-values": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
         }
       }
     },
+    "upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+    },
     "uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
@@ -37370,68 +31786,28 @@
     },
     "urix": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        }
-      }
-    },
     "use": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
     "uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
     },
     "v8-to-istanbul": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
       "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
@@ -37442,44 +31818,30 @@
       "dependencies": {
         "source-map": {
           "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         }
       }
     },
+    "valid-url": {
+      "version": "1.0.9",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
+    "value-or-promise": {
+      "version": "1.0.11",
+      "integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg=="
     },
     "vfile": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
       "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
       "peer": true,
@@ -37492,7 +31854,6 @@
       "dependencies": {
         "is-buffer": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
           "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
           "dev": true,
           "peer": true
@@ -37501,7 +31862,6 @@
     },
     "vfile-message": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
       "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
       "peer": true,
@@ -37512,21 +31872,22 @@
     },
     "vscode-languageserver-types": {
       "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
       "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
       "requires": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
+    "w3c-keyname": {
+      "version": "2.2.4",
+      "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw=="
+    },
     "w3c-xmlserializer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
       "requires": {
@@ -37534,44 +31895,36 @@
       }
     },
     "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "requires": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
+      "version": "2.3.1",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
       }
     },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
+    "web-streams-polyfill": {
+      "version": "3.2.0",
+      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA=="
     },
     "webidl-conversions": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true
     },
     "webpack": {
-      "version": "5.51.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz",
-      "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==",
+      "version": "5.69.1",
+      "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
       "requires": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.50",
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
@@ -37579,12 +31932,12 @@
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.7.1",
+        "enhanced-resolve": "^5.8.3",
+        "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -37592,13 +31945,21 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^3.2.0"
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
       },
       "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
+        },
+        "acorn-import-assertions": {
+          "version": "1.8.0",
+          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+          "requires": {}
+        },
         "schema-utils": {
           "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -37609,9 +31970,8 @@
       }
     },
     "webpack-assets-manifest": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-assets-manifest/-/webpack-assets-manifest-5.0.6.tgz",
-      "integrity": "sha512-CW94ylPHurZTmxnYajSFA8763Cv/QFIKNgBwqBLaIOnBjH1EbDUAf8Eq1/i+o8qaKyKXJ3aX7r4/jtpXD88ldg==",
+      "version": "5.1.0",
+      "integrity": "sha512-kPuTMEjBrqZQVJ5M6yXNBCEdFbQQn7p+loNXt8NOeDFaAbsNFWqqwR0YL1mfG5LbwhK5FLXWXpuK3GuIIZ46rg==",
       "requires": {
         "chalk": "^4.0",
         "deepmerge": "^4.0",
@@ -37624,16 +31984,14 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -37641,7 +31999,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
             "color-name": "~1.1.4"
@@ -37649,27 +32006,23 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
+            "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -37677,77 +32030,30 @@
         }
       }
     },
-    "webpack-bundle-analyzer": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
-      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.19",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
     "webpack-cli": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
-      "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
+      "version": "4.9.2",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.4",
-        "@webpack-cli/info": "^1.3.0",
-        "@webpack-cli/serve": "^1.5.2",
-        "colorette": "^1.2.1",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
         "commander": "^7.0.0",
         "execa": "^5.0.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^2.2.0",
         "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
         "webpack-merge": "^5.7.3"
       },
       "dependencies": {
         "commander": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
         },
         "execa": {
           "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
           "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "requires": {
             "cross-spawn": "^7.0.3",
@@ -37763,133 +32069,16 @@
         },
         "get-stream": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
           "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
         },
         "human-signals": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
           "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
         }
       }
     },
-    "webpack-config-utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-config-utils/-/webpack-config-utils-2.3.1.tgz",
-      "integrity": "sha512-0uC5uj7sThFTePTQjfpe5Wqcbw3KSCxqswOmW96lwk2ZI2CU098rWY2ZqOVGJQYJ3hfEltmjcLNkKutw8LJAlg==",
-      "requires": {
-        "webpack-combine-loaders": "2.0.4"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "bundled": true
-        },
-        "webpack-combine-loaders": {
-          "version": "2.0.4",
-          "bundled": true,
-          "requires": {
-            "qs": "^6.5.2"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz",
-      "integrity": "sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==",
-      "requires": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
-        "memfs": "^3.2.2",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz",
-      "integrity": "sha512-ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ==",
-      "requires": {
-        "ansi-html": "^0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.1",
-        "colorette": "^1.2.2",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
-        "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
-        "schema-utils": "^3.1.0",
-        "selfsigned": "^1.10.11",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^5.0.0",
-        "ws": "^8.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",
-          "integrity": "sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ=="
-        },
-        "ipaddr.js": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-          "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz",
-          "integrity": "sha512-UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg==",
-          "requires": {
-            "ansi-regex": "^6.0.0"
-          }
-        },
-        "ws": {
-          "version": "8.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-          "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
-          "requires": {}
-        }
-      }
-    },
     "webpack-merge": {
       "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
       "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "requires": {
         "clone-deep": "^4.0.1",
@@ -37897,34 +32086,16 @@
       }
     },
     "webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+      "version": "3.2.3",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
     },
     "what-input": {
       "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
       "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
       "peer": true
     },
     "whatwg-encoding": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
       "dev": true,
       "requires": {
@@ -37933,14 +32104,12 @@
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz",
-      "integrity": "sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==",
+      "version": "8.7.0",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "requires": {
         "lodash": "^4.7.0",
@@ -37950,7 +32119,6 @@
     },
     "which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "requires": {
         "isexe": "^2.0.0"
@@ -37958,7 +32126,6 @@
     },
     "which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "requires": {
         "is-bigint": "^1.0.1",
@@ -37970,75 +32137,274 @@
     },
     "which-module": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "devOptional": true
+      "dev": true
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
-      "peer": true,
+    "wildcard": {
+      "version": "2.0.0",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
+    "workbox-background-sync": {
+      "version": "6.5.0",
+      "integrity": "sha512-rrekt/gt6qOIZsisj6QZfmAFPAnocq1Z603zAjt+qHmeXY8DLPOklVtvrXSaHoHH3qIjUq3SQY5s2x240iTIKw==",
       "requires": {
-        "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "optional": true,
-          "peer": true
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-broadcast-update": {
+      "version": "6.5.0",
+      "integrity": "sha512-JC97c7tYqoGWcCfbKO9KHG6lkU+WhXCnDB2j1oFWEiv53nUHy3yjPpzMmAGNLD9oV5lInO15n6V18HfwgkhISw==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-build": {
+      "version": "6.5.0",
+      "integrity": "sha512-da0/1b6//P9+ts7ofcIKcMVPyN6suJvjJASXokF7DsqvUmgRBPcCVV4KCy8QWjgfcz7mzuTpkSbdVHcPFJ/p0A==",
+      "requires": {
+        "@apideck/better-ajv-errors": "^0.3.1",
+        "@babel/core": "^7.11.1",
+        "@babel/preset-env": "^7.11.0",
+        "@babel/runtime": "^7.11.2",
+        "@rollup/plugin-babel": "^5.2.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.4.1",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
+        "ajv": "^8.6.0",
+        "common-tags": "^1.8.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "lodash": "^4.17.20",
+        "pretty-bytes": "^5.3.0",
+        "rollup": "^2.43.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "source-map": "^0.8.0-beta.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^2.0.1",
+        "tempy": "^0.6.0",
+        "upath": "^1.2.0",
+        "workbox-background-sync": "6.5.0",
+        "workbox-broadcast-update": "6.5.0",
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-google-analytics": "6.5.0",
+        "workbox-navigation-preload": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-range-requests": "6.5.0",
+        "workbox-recipes": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0",
+        "workbox-streams": "6.5.0",
+        "workbox-sw": "6.5.0",
+        "workbox-window": "6.5.0"
+      },
+      "dependencies": {
+        "@apideck/better-ajv-errors": {
+          "version": "0.3.3",
+          "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
+          "requires": {
+            "json-schema": "^0.4.0",
+            "jsonpointer": "^5.0.0",
+            "leven": "^3.1.0"
+          }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "optional": true,
-          "peer": true
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "optional": true,
-          "peer": true,
+        "fs-extra": {
+          "version": "9.1.0",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "optional": true,
-          "peer": true,
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.8.0-beta.0",
+          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+          "requires": {
+            "whatwg-url": "^7.0.0"
+          }
+        },
+        "tr46": {
+          "version": "1.0.1",
+          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        },
+        "webidl-conversions": {
+          "version": "4.0.2",
+          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+        },
+        "whatwg-url": {
+          "version": "7.1.0",
+          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
           }
         }
       }
     },
-    "wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    "workbox-cacheable-response": {
+      "version": "6.5.0",
+      "integrity": "sha512-sqAtWAiBwWvI8HG/2Do7BeKPhHuUczt22ORkAjkH9DfTq9LuWRFd6T4HAMqX5G8F1gM9XA2UPlxRrEeSpFIz/A==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
     },
-    "window-size": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
+    "workbox-core": {
+      "version": "6.5.0",
+      "integrity": "sha512-5SPwNipUzYBhrneLVT02JFA0fw3LG82jFAN/G2NzxkIW10t4MVZuML2nU94bbkgjq25u0fkY8+4JXzMfHgxEWQ=="
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    "workbox-expiration": {
+      "version": "6.5.0",
+      "integrity": "sha512-y3WRkKRy/gMuZZNkrLFahjY0QZtLoq+QfhTbVAsOGHVg1CCtnNbeFAnEidQs7UisI2BK76VqQPvM7hEOFyZ92A==",
+      "requires": {
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-google-analytics": {
+      "version": "6.5.0",
+      "integrity": "sha512-CHHh55wMNCc/BV1URrzEM2Zjgf6g2CV6QpAAc1pBRqaLY5755PeQZbp3o8KbJEM7YsC9mIBeQVsOkSKkGS30bg==",
+      "requires": {
+        "workbox-background-sync": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-navigation-preload": {
+      "version": "6.5.0",
+      "integrity": "sha512-ktrRQzXJ0zFy0puOtCa49wE3BSBGUB8KRMot3tEieikCkSO0wMLmiCb9GwTVvNMJLl0THRlsdFoI93si04nTxA==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-precaching": {
+      "version": "6.5.0",
+      "integrity": "sha512-IVLzgHx38T6LphJyEOltd7XAvpDi73p85uCT2ZtT1HHg9FAYC49a+5iHUVOnqye73fLW20eiAMFcnehGxz9RWg==",
+      "requires": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-range-requests": {
+      "version": "6.5.0",
+      "integrity": "sha512-+qTELdGZE5rOjuv+ifFrfRDN8Uvzpbm5Fal7qSUqB1V1DLCMxPwHCj6mWwQBRKBpW7G09kAwewH7zA3Asjkf/Q==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-recipes": {
+      "version": "6.5.0",
+      "integrity": "sha512-7hWZAIcXmvr31NwYSWaQIrnThCH/Dx9+eYv/YdkpUeWIXRiHRkYvP1FdiHItbLSjL4Y6K7cy2Y9y5lGCkgaE4w==",
+      "requires": {
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-routing": {
+      "version": "6.5.0",
+      "integrity": "sha512-w1A9OVa/yYStu9ds0Dj+TC6zOAoskKlczf+wZI5mrM9nFCt/KOMQiFp1/41DMFPrrN/8KlZTS3Cel/Ttutw93Q==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-strategies": {
+      "version": "6.5.0",
+      "integrity": "sha512-Ngnwo+tfGw4uKSlTz3h1fYKb/lCV7SDI/dtTb8VaJzRl0N9XssloDGYERBmF6BN/DV/x3bnRsshfobnKI/3z0g==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-streams": {
+      "version": "6.5.0",
+      "integrity": "sha512-ZbeaZINkju4x45P9DFyRbOYInE+dyNAJIelflz4f9AOAdm+zZUJCooU4MdfsedVhHiTIA6pCD/3jCmW1XbvlbA==",
+      "requires": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0"
+      }
+    },
+    "workbox-sw": {
+      "version": "6.5.0",
+      "integrity": "sha512-uPGJ9Yost4yabnCko/IuhouquoQKrWOEqLq7L/xVYtltWe4+J8Hw8iPCVtxvXQ26hffd7MaFWUAN83j2ZWbxRg=="
+    },
+    "workbox-webpack-plugin": {
+      "version": "6.5.0",
+      "integrity": "sha512-wy4uCBJELNfJVf2b4Tg3mjJQySq/aReWv4Q1RxQweJkY9ihq7DOGA3wLlXvoauek+MX/SuQfS3it+eXIfHKjvg==",
+      "requires": {
+        "fast-json-stable-stringify": "^2.1.0",
+        "pretty-bytes": "^5.4.1",
+        "upath": "^1.2.0",
+        "webpack-sources": "^1.4.3",
+        "workbox-build": "6.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "workbox-window": {
+      "version": "6.5.0",
+      "integrity": "sha512-DOrhiTnWup/CsNstO2uvfdKM4kdStgHd31xGGvBcoCE3Are3DRcy5s3zz3PedcAR1AKskQj3BXz0UhzQiOq8nA==",
+      "requires": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "6.5.0"
+      }
     },
     "wrap-ansi": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "requires": {
@@ -38049,7 +32415,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -38058,7 +32423,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -38067,7 +32431,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
@@ -38075,12 +32438,10 @@
     },
     "wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "requires": {
@@ -38091,57 +32452,47 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "devOptional": true,
+      "version": "7.5.7",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
     "xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "devOptional": true
+      "dev": true
     },
     "yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yaml-jest": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/yaml-jest/-/yaml-jest-1.0.5.tgz",
-      "integrity": "sha1-KI5UG64bVR0RPUhk1suPMW4b0zE=",
+      "version": "1.2.0",
+      "integrity": "sha512-rrUNn3ovs5J8td7i3k6rJfh3leBydnM+3YqKJcVyTFRiSiEAdKMy7uhqBxJfsJ+w1le5AGCkMTldNEMY8oqbPg==",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.7.0"
+        "js-yaml": "^4.1.0"
       }
     },
     "yargs": {
       "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "requires": {
@@ -38160,7 +32511,6 @@
     },
     "yargs-parser": {
       "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "requires": {
@@ -38177,19 +32527,27 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "yn": {
+      "version": "3.1.1",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    },
     "yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     },
     "zen-observable": {
       "version": "0.8.15",
-      "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
       "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
     },
+    "zen-observable-ts": {
+      "version": "1.2.3",
+      "integrity": "sha512-hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g==",
+      "requires": {
+        "zen-observable": "0.8.15"
+      }
+    },
     "zwitch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
       "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
       "dev": true,
       "peer": true
diff --git a/decidim_app-design/package.json b/decidim_app-design/package.json
index d58443c2ba8bf..7023f9cd50702 100644
--- a/decidim_app-design/package.json
+++ b/decidim_app-design/package.json
@@ -3,8 +3,8 @@
   "description": "Note: this is not a package, just the dependencies for the project in the dev environment.",
   "private": true,
   "engines": {
-    "node": "^16.9.1",
-    "npm": "^7.21.1"
+    "node": ">=16.9.1",
+    "npm": ">=7.21.1"
   },
   "files": [
     "packages/**/*"
diff --git a/decidim_app-design/packages/browserslist-config/package.json b/decidim_app-design/packages/browserslist-config/package.json
index 036979a3b8d61..4e8a3c428d035 100644
--- a/decidim_app-design/packages/browserslist-config/package.json
+++ b/decidim_app-design/packages/browserslist-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/browserslist-config",
   "description": "The Browserslist configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/decidim_app-design/packages/core/package.json b/decidim_app-design/packages/core/package.json
index 028cc4436b852..8c15e8f48782a 100644
--- a/decidim_app-design/packages/core/package.json
+++ b/decidim_app-design/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/core",
   "description": "The core dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -9,32 +9,28 @@
   },
   "author": "Decidim Contributors",
   "license": "AGPL-3.0",
-  "engines": {
-    "node": "^16.9.1",
-    "npm": "^7.21.1"
-  },
   "dependencies": {
-    "@joeattardi/emoji-button": "^4.6.0",
+    "@joeattardi/emoji-button": "^4.6.2",
+    "@rails/activestorage": "^6.0.4",
+    "@tarekraafat/autocomplete.js": "^10.2.6",
     "@zeitiger/appendaround": "^1.0.0",
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "bootstrap-tagsinput": "^0.7.1",
     "classnames": "^2.2.5",
     "d3": "5.4.0",
+    "dayjs": "^1.11.0",
     "diff": "^5.0.0",
     "foundation-datepicker": "1.5.6",
     "foundation-sites": "^6.7.0",
-    "graphiql": "^1.4.2",
-    "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
+    "graphiql": "^1.4.7",
     "html5sortable": "0.10.0",
     "identity-obj-proxy": "^3.0.0",
     "jquery": "^3.2.1",
     "jquery-serializejson": "2.9.0",
-    "jquery.autocomplete": "1.2.0",
+    "js-cookie": "^3.0.1",
     "leaflet": "1.3.1",
-    "leaflet-svgicon": "^0.0.2",
     "leaflet-tilelayer-here": "1.0.2",
     "leaflet.markercluster": "1.4.1",
-    "moment": "2.29.1",
     "morphdom": "2.6.1",
     "prop-types": "^15.7.2",
     "quill": "1.3.7",
@@ -42,12 +38,10 @@
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-i18nify": "^1.8.8",
-    "react-select": "^1.2.1",
     "select": "^1.1.2",
-    "social-share-button": "2.2.0",
     "svg4everybody": "2.1.9",
     "tributejs": "5.1.3",
     "unfetch": "^3.0.0",
     "uuid": "^3.2.1"
   }
-}
\ No newline at end of file
+}
diff --git a/decidim_app-design/packages/dev/package.json b/decidim_app-design/packages/dev/package.json
index 5d7e41d108ba9..0d33b3c597716 100644
--- a/decidim_app-design/packages/dev/package.json
+++ b/decidim_app-design/packages/dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/dev",
   "description": "The dev dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/decidim_app-design/packages/elections/package.json b/decidim_app-design/packages/elections/package.json
index 792013cb0df5d..225820a042aa9 100644
--- a/decidim_app-design/packages/elections/package.json
+++ b/decidim_app-design/packages/elections/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/elections",
   "description": "The elections and votings dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -10,8 +10,8 @@
   "author": "Decidim Contributors",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@decidim/decidim-bulletin_board": "0.22.3",
-    "@decidim/voting_schemes-dummy": "0.22.3",
-    "@decidim/voting_schemes-electionguard": "0.22.3"
+    "@decidim/decidim-bulletin_board": "0.23.0",
+    "@decidim/voting_schemes-dummy": "0.23.0",
+    "@decidim/voting_schemes-electionguard": "0.23.0"
   }
-}
\ No newline at end of file
+}
diff --git a/decidim_app-design/packages/eslint-config/package.json b/decidim_app-design/packages/eslint-config/package.json
index df75dded763a3..3a74b428dfb15 100644
--- a/decidim_app-design/packages/eslint-config/package.json
+++ b/decidim_app-design/packages/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/eslint-config",
   "description": "The eslint configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/decidim_app-design/packages/stylelint-config/package.json b/decidim_app-design/packages/stylelint-config/package.json
index e1fce92515b18..0735561300951 100644
--- a/decidim_app-design/packages/stylelint-config/package.json
+++ b/decidim_app-design/packages/stylelint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/stylelint-config",
   "description": "The stylelint configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/decidim_app-design/packages/webpacker/index.js b/decidim_app-design/packages/webpacker/index.js
index 4b8d8bfd81dea..33298453eb095 100644
--- a/decidim_app-design/packages/webpacker/index.js
+++ b/decidim_app-design/packages/webpacker/index.js
@@ -1,6 +1,7 @@
-const webpacker = require("@rails/webpacker");
+const { webpackConfig, ...restOpts } = require("@rails/webpacker");
 const overrideConfig = require("./src/override-config");
 
-module.exports = Object.assign(webpacker, { // eslint-disable-line
-  webpackConfig: overrideConfig(webpacker.webpackConfig)
-});
+module.exports = {
+  webpackConfig: overrideConfig(webpackConfig),
+  ...restOpts
+};
diff --git a/decidim_app-design/packages/webpacker/package.json b/decidim_app-design/packages/webpacker/package.json
index 9f4da510d2b29..88234c13de886 100644
--- a/decidim_app-design/packages/webpacker/package.json
+++ b/decidim_app-design/packages/webpacker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/webpacker",
   "description": "The webpacker dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -11,40 +11,51 @@
   "license": "AGPL-3.0",
   "main": "index.js",
   "dependencies": {
-    "@babel/core": "^7.13.13",
-    "@babel/eslint-parser": "^7.13.14",
-    "@babel/plugin-transform-classes": "^7.13.0",
+    "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/plugin-transform-runtime": "^7.15.0",
+    "@babel/plugin-transform-classes": "^7.16.7",
     "@babel/plugin-transform-regenerator": "^7.13.15",
-    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/preset-env": "^7.13.5",
+    "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.12.13",
-    "@babel/types": "^7.0.0-beta.40",
+    "@babel/runtime": "^7.15.4",
     "@rails/ujs": "^6.1.3",
     "@rails/webpacker": "6.0.0-rc.5",
-    "@webpack-cli/serve": "^1.3.1",
-    "autoprefixer": "^9.8.6",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-__coverage__": "^1.11.111",
-    "babel-preset-airbnb": "^5.0.0",
-    "core-js": "^3.9.1",
-    "css-loader": "^4.3.0",
-    "css-minimizer-webpack-plugin": "^1.3.0",
+    "autoprefixer": "^10.4.1",
+    "babel-loader": "^8.2.2",
+    "compression-webpack-plugin": "^9.0.0",
+    "css-loader": "^6.5.1",
     "expose-loader": "^2.0.0",
-    "mini-css-extract-plugin": "^1.4.0",
-    "postcss": "^7.0.36",
-    "postcss-flexbugs-fixes": "^4.2.1",
-    "postcss-import": "^12.0.1",
-    "postcss-loader": "^5.2.0",
-    "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^2.1.1",
-    "sass": "^1.32.8",
-    "sass-loader": "^11.0.1",
+    "glob": "^7.2.0",
+    "js-yaml": "^4.1.0",
+    "mini-css-extract-plugin": "^2.4.5",
+    "path-complete-extname": "^1.0.0",
+    "postcss": "^8.4.5",
+    "postcss-flexbugs-fixes": "^5.0.2",
+    "postcss-import": "^14.0.2",
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "^7.1.0",
+    "postcss-scss": "^4.0.2",
+    "pnp-webpack-plugin": "^1.7.0",
+    "sass-embedded": "^1.49.9",
     "source-map-loader": "^0.2.4",
-    "style-loader": "^2.0.0",
-    "webpack": "^5.11.0",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-cli": "^4.2.0",
-    "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^4.0.0"
+    "style-loader": "^3.0.0",
+    "terser-webpack-plugin": "^5.2.4",
+    "webpack": "^5.53.0",
+    "webpack-assets-manifest": "^5.0.6",
+    "webpack-cli": "^4.8.0",
+    "webpack-merge": "^5.8.0",
+    "webpack-sources": "^3.2.1",
+    "workbox-recipes": "^6.4.2",
+    "workbox-webpack-plugin": "^6.4.2"
+  },
+  "devDependencies": {
+    "eslint": "^8.6.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.28.0",
+    "jest": "^27.4.5"
   }
-}
\ No newline at end of file
+}
diff --git a/decidim_app-design/packages/webpacker/src/loaders/decidim-sass-loader.js b/decidim_app-design/packages/webpacker/src/loaders/decidim-sass-loader.js
new file mode 100644
index 0000000000000..393267179e59f
--- /dev/null
+++ b/decidim_app-design/packages/webpacker/src/loaders/decidim-sass-loader.js
@@ -0,0 +1,88 @@
+const sass = require("sass-embedded");
+const url = require("url");
+const path = require("path");
+const { config: { additional_paths: loadPaths, stylesheet_imports: stylesheetImports  } } = require("@rails/webpacker");
+
+const decidimImporter = {
+  canonicalize(importUrl, options) {
+    if (!options.fromImport) {
+      return null;
+    }
+    if (!importUrl.startsWith("!decidim-style-")) {
+      return null;
+    }
+    return new URL(`decidim:${importUrl}`);
+  },
+  load(canonicalUrl) {
+    const matches = decodeURI(canonicalUrl.toString()).match(/^decidim:!decidim-style-([^[]+)\[([^\]]+)\]$/);
+    if (!matches) {
+      return { contents: "", syntax: "scss" };
+    }
+
+    if (!stylesheetImports) {
+      return { contents: "", syntax: "scss" };
+    }
+
+    const type = matches[1];
+    const group = matches[2];
+    if (!stylesheetImports[type] || !stylesheetImports[type][group]) {
+      // If the group is not defined, return an empty configuration because
+      // otherwise the importer would continue finding the asset through
+      // paths which obviously fails.
+      return { contents: "", syntax: "scss" };
+    }
+
+    const statements = stylesheetImports[type][group].map((style) => `@import "${style}";`);
+
+    return { contents: statements.join("\n"), syntax: "scss" };
+  }
+};
+
+/**
+ * Custom loader for compiling Sass.
+ *
+ * @param {String} content The content to compile
+ * @returns {void}
+ */
+module.exports = function(content) { // eslint-disable-line no-undef
+  const callback = this.async();
+
+  let result = null;
+
+  try {
+    result = sass.compileString(
+      content,
+      {
+        loadPaths,
+        importers: [decidimImporter],
+        sourceMap: true,
+        sourceMapIncludeSources: true,
+        style: "expanded"
+      },
+    );
+  } catch (error) {
+    if (error.span && typeof error.span.url !== "undefined") {
+      this.addDependency(url.fileURLToPath(error.span.url));
+    }
+
+    callback(error);
+
+    return;
+  }
+
+  if (typeof result.loadedUrls !== "undefined") {
+    result.loadedUrls.forEach((includedFile) => {
+      if (includedFile.protocol !== "file:") {
+        return;
+      }
+      const normalizedIncludedFile = url.fileURLToPath(includedFile);
+
+      // Custom `importer` can return only `contents` so includedFile will be relative
+      if (path.isAbsolute(normalizedIncludedFile)) {
+        this.addDependency(normalizedIncludedFile);
+      }
+    });
+  }
+
+  callback(null, result.css.toString(), result.sourceMap);
+};
diff --git a/decidim_app-design/packages/webpacker/src/override-config.js b/decidim_app-design/packages/webpacker/src/override-config.js
index d5f11ee7b50ba..1de9ccb0919a5 100644
--- a/decidim_app-design/packages/webpacker/src/override-config.js
+++ b/decidim_app-design/packages/webpacker/src/override-config.js
@@ -1,52 +1,53 @@
-const { config } = require("@rails/webpacker");
+const path = require("path");
+const miniCssExtractPlugin = require("mini-css-extract-plugin");
+const { inliningCss } = require("@rails/webpacker");
 
 const overrideSassRule = (modifyConfig) => {
+  const sassLoaderPath = path.resolve(__dirname, "loaders/decidim-sass-loader") // eslint-disable-line no-undef
+
   const sassRule = modifyConfig.module.rules.find(
     (rule) => rule.test.toString() === "/\\.(scss|sass)(\\.erb)?$/i"
   );
-  if (!sassRule) {
-    return modifyConfig;
-  }
-
-  const sassLoader = sassRule.use.find((use) => {
-    return (typeof use === "object") && use.loader.match(/sass-loader/);
-  });
-  if (!sassLoader) {
-    return modifyConfig;
-  }
+  if (sassRule) {
+    const existingLoader = sassRule.use.find((use) => {
+      return (typeof use === "object") && use.loader.match(/sass-loader/);
+    });
+    if (existingLoader) {
+      existingLoader.loader = sassLoaderPath;
+    } else {
+      sassRule.use.push({ loader: sassLoaderPath });
+    }
+  } else {
+    // Add the sass rule
+    let baseLoader = "style-loader";
+    if (!inliningCss) {
+      baseLoader = miniCssExtractPlugin.loader;
+    }
 
-  const imports = config.stylesheet_imports;
-  if (!imports) {
-    return modifyConfig;
+    modifyConfig.module.rules.push({
+      test: /\.(scss|sass)(\.erb)?$/i,
+      use: [
+        baseLoader,
+        {
+          loader: require.resolve("css-loader"),
+          options: {
+            sourceMap: true,
+            importLoaders: 2
+          }
+        },
+        {
+          loader: "postcss-loader",
+          options: { sourceMap: true }
+        },
+        {
+          loader: sassLoaderPath
+        }
+      ]
+    })
   }
 
-  // Add the extra importer to the sass-loader to load the import statements for
-  // Decidim modules.
-  sassLoader.options.sassOptions.importer = [
-    (url) => {
-      const matches = url.match(/^!decidim-style-([^[]+)\[([^\]]+)\]$/);
-      if (!matches) {
-        return null;
-      }
-
-      const type = matches[1];
-      const group = matches[2];
-      if (!imports[type] || !imports[type][group]) {
-        // If the group is not defined, return an empty configuration because
-        // otherwise the importer would continue finding the asset through
-        // paths which obviously fails.
-        return { contents: "" };
-      }
-
-      const statements = imports[type][group].map((style) => `@import "${style}";`);
-
-      return { contents: statements.join("\n") };
-    }
-  ];
-
   return modifyConfig;
 }
 
-module.exports = (originalConfig) => { // eslint-disable-line
-  return overrideSassRule(originalConfig);
-};
+// Since all modifiers are functions, we can use a reduce clause to apply all them
+module.exports = (originalConfig) => [overrideSassRule].reduce((acc, modifier) => modifier(acc), originalConfig)
diff --git a/docs/README.adoc b/docs/README.adoc
index 8079992119141..ee7bd998d28fe 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -36,20 +36,7 @@ If you want to try changes in this folder and how it'd be shown in https://docs.
 . Build the antora playbook
 . Open the generated website with your web browser
 
-In detail each one of these steps are:
-
-[source,bash]
-----
-# 1. Clone the repository
-git clone https://github.com/decidim/documentation
-# 2. Install dependencies
-npm
-# 3. Change the antora-playbook.yml url key in source
-# 4. Build the antora playbook
-npm run build
-# 5. Open the generated website with your web browser
-xdg-open build/site/index.html
-----
+For instructions on how to clone the repository, install dependencies, build the antora playbook and open the generated webiste, see https://github.com/decidim/documentation[Decidim's documentation repository README file].
 
 Regarding "3. Change the antora-playbook.yml url key in source", if this is the configuration at antora-playbook.yml:
 
@@ -69,6 +56,8 @@ Then the result would be:
      branches: develop
 ----
 
+If building locally doesn't show any change, then check also that the branch corresponds with the one that you're working locally.
+
 == Add a new link in the sidebar
 
 For adding a new link in the sidebar you need to add it in https://raw.githubusercontent.com/decidim/documentation/master/en/modules/ROOT/nav.adoc[nav.adoc file]
diff --git a/docs/antora.yml b/docs/antora.yml
index 1bb34d5f9d147..2d4ad034c6b35 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,6 +1,6 @@
 name: en
 title: "Decidim Documentation"
-version: v0.26
+version: v0.27
 asciidoc:
   attributes:
     page-lang: en@
diff --git a/docs/modules/configure/pages/environment_variables.adoc b/docs/modules/configure/pages/environment_variables.adoc
index 268908b0d3241..b7829a56e252b 100644
--- a/docs/modules/configure/pages/environment_variables.adoc
+++ b/docs/modules/configure/pages/environment_variables.adoc
@@ -2,66 +2,870 @@
 
 We try to let most of the things defined through Environment Variables, as https://12factor.net/config[12factor applications's config]. You'll need to configure through your hosting provider (for example in Heroku), through a gem like `figaro` or through docker-compose `env_file`.
 
-.Decidim Env Vars
+This is an extensive list of all the Env variables supported for an application created with the default `decidim` generator (ie: `decidim my-application`). Custom applications may modify or customize the default decidim initializer (`config/initializers/decidim.rb`) in such a a way that this will have no effect.
+
+Finally, take into account that there are some config variables not available as Env vars, this is because it is not enough to set them in order to make that particular feature to work, it requires the user to add some custom code (usually a service class that acts a wrapper for an external API). These are the case for initializers such as `sms_gateway_service`, `timestamp_service`, `pdf_signature_service` or `machine_translation_service`. For more information about these extra services check the xref:configure:initializer.adoc[Initializer documentation].
+
+The next tables show all the default Env Vars available when running a default Decidim application (note that customized Decidim apps might differ). The ones marked in *bold* are the minimal required to run a production server. The ones marked as _italic_ are only required for development.
+
+.Required Decidim Env Vars
+[%autowidth.stretch]
 |===
-|Name |Value
+|Name |Value |Default value|Multitenant's System configurable
 
-|DATABASE_HOST
-|Hostname for the Postgres database. Default is `localhost`.
+|_DATABASE_HOST_
+|Hostname for the Postgres database.
+|localhost
+|No
 
-|DATABASE_PASSWORD
+|_DATABASE_PASSWORD_
 |Password for the Postgres database
+|
+|No
+
+|_DATABASE_PORT_
+|Port for the Postgres database.
+|5432
+|No
+
+|_DATABASE_USERNAME_
+|Username for the Postgres database. Note that database name is autogenerated in development mode thus there's no config var here.
+|
+|No
+
+|*DATABASE_URL*
+|For production environments database needs to be defined as a string following the scheme: `postgres://USERNAME:PASSWORD@HOST/DATABASE_NAME``
+|
+|No
+
+|*RAILS_ENV*
+|Environment for Ruby on Rails. If it's on your local machine for development, then it should be `development`. If it's on server it should be `production`. Please take care that this has security implications. You DON'T want to be running a production application on development mode.
+|development
+|No
+
+|*SECRET_KEY_BASE*
+|Secret key base for the Application. It's specially important that this is kept secret from the outside word; do NOT publish it on GitHub/GitLab/BitBucket.
+|
+|No
+
+|*SMTP_ADDRESS*
+|Hostname for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|
+|*Yes*
+
+|*SMTP_DOMAIN*
+|Domain for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|
+|*Yes*
+
+|*SMTP_PASSWORD*
+|Password for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|
+|*Yes*
+
+|*SMTP_USERNAME*
+|Username for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|
+|*Yes*
+
+|*DECIDIM_APPLICATION_NAME*
+|Default name (shown in the browser's title status and search engines) for the Decidim instance.
+|My Application Name
+|*Yes*
+
+|*DECIDIM_MAILER_SENDER*
+|Default Reply email for any email sent (transactional or newsletters).
+|change-me@example.org
+|*Yes*
+
+|SMTP_PORT
+|Port for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|587
+|*Yes*
+
+|SMTP_STARTTLS_AUTO
+|Automatically use STARTTLS protocol for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|true
+|*Yes*
+
+|SMTP_AUTHENTICATION
+|Type of authentication for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|plain
+|*Yes*
+
+|QUEUE_ADAPTER
+|Use this var to establish the https://guides.rubyonrails.org/active_job_basics.html#backends[backend used to process jobs] in your application.
+
+*Note that every backend requires some additional configuration steps.*
+
+*Also take into account that the default value (async) is not suitable for production environments*
+
+Common values are `sidekiq` and `delayed_job`.
+
+If you decide to use `sidekiq`, you can easily generate the additional required files with the `--queue` option in the `decidim` generator (delayed_job is not supported yet, but you can easily follow the official instructions).
+
+- Check the https://github.com/collectiveidea/delayed_job[Delayed Job info]
+- Check the https://github.com/mperham/sidekiq/wiki[Sidekiq info]
+|async
+|No
+
+|SIDEKIQ_CONCURRENCY
+|If you are using `sidekiq` as your job processor backend. You can use this var to tune the number of concurrent sidekiq processes running in parallel (this only applies if you are using the default `config/sidekiq.yml` file generated by the `decidim` generator).
+
+*Note that each process consumes a database connection. You need to be sure you infrastructure is properly configured not to exceed the concurrent number of connections that your database supports.* For this matter, check also the RAILS_MAX_THREADS param if you are using Puma.
+|5
+|No
+
+|===
+
+If you want to use a cloud provider to storage user uploads. this can be done via next extra configuration variables.
+
+Different providers require extra gems to be specified in your Gemfile. You can generate a new application with the appropriated gems with the command `decidim --storage=[provider] my-application`.
+
+.Optional Decidim Env Vars for cloud storage settings
+[%autowidth.stretch]
+|===
+|Name |Value |Default value|Multitenant's System configurable
+
+|STORAGE_PROVIDER
+|Which storage provider is going to be used for the application, provides support for the most popular options. Options are `local`, `s3` (compatible with any AWS-S3 service provider), `azure` (for Microsoft Cloud Storage), `gcs` (Google Cloud Services).
+
+*If this setting is set to any other value than `local`, and additional gem for the specified service must be installed in the Gemfile of your application*. See https://edgeguides.rubyonrails.org/active_storage_overview.html#setup[the official Rails guide] for details.
+|local
+|No
+
+|STORAGE_CDN_HOST
+|If you are using a cloud provider, having a CDN on top of it is probably a good idea. For instance, using a CloudFront distribution on top of a S3 configuration. But other services can be used as well (you can use https://cloudflare.com[CloudFlare] for free with excellent results).
+
+Set the protocol, host and path to your CDN and all the user-generated files (through Active Storage) will be prefixed with this instead of serving files directly from the same domain of your application.
+
+*Note that this is not the same as the RAILS_ASSET_HOST var. This other variable is used for static, compiled assets while STORAGE_CDN_HOST is for files dynamically generated within the application by users or admins.*
+|
+|No
+
+|*AWS_ACCESS_KEY_ID*
+|If STORAGE_PROVIDER is set to `s3`, define here your AWS KEY ID with permissions to access the bucket for the application.
+
+Also, be sure to add the line `gem "aws-sdk-s3", require: false` in your Gemfile.
+|
+|No
+
+|*AWS_SECRET_ACCESS_KEY*
+|If STORAGE_PROVIDER is set to `s3`, define here your AWS SECRET KEY with permissions to access the bucket for the application.
+|
+|No
+
+|*AWS_BUCKET*
+|If STORAGE_PROVIDER is set to `s3`, define here the bucket used for uploading files and images.
+|
+|No
+
+|*AWS_REGION*
+|If STORAGE_PROVIDER is set to `s3`, define here your region (in case your S3 provider requires it, required if `AWS_ENDPOINT` is empty).
+|
+|No
+
+|*AWS_ENDPOINT*
+|If STORAGE_PROVIDER is set to `s3`, define here your endpoint (this is mandatory if using any provider that is not AWS, can be empty if using AWS and `AWS_REGION` is specified).
+|
+|No
+
+|*AZURE_STORAGE_ACCESS_KEY*
+|If STORAGE_PROVIDER is set to `azure`, define here your AZURE ACCESS KEY with permissions to access the container for the application. Needs to be encoded in Base64.
+
+Also, be sure to add the line `gem "azure-storage-blob", require: false` in your Gemfile.
+|
+|No
+
+|*AZURE_STORAGE_ACCOUNT_NAME*
+|If STORAGE_PROVIDER is set to `azure`, define here your AZURE ACCOUNT NAME with permissions to access the container for the application.
+|
+|No
+
+|*AZURE_CONTAINER*
+|If STORAGE_PROVIDER is set to `azure`, define here your AZURE CONTAINER used for uploading files and images.
+|
+|No
+
+|*GCS_PROJECT*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD PROJECT with permissions to access the bucket for the application.
+
+Also, be sure to add the line `gem "google-cloud-storage", "~> 1.11", require: false` in your Gemfile.
 
-|DATABASE_PORT
-|Port for the Postgres database. Default is `5432`.
+*GOOGLE CLOUD SERVICES require some amount of parameters. You should be able to extract them from a `keyfile.json` file.*
+|
+|No
 
-|DATABASE_USERNAME
-|Username for the Postgres database
+|*GCS_BUCKET*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD BUCKET used for uploading files and images.
+|
+|No
 
-|GEOCODER_API_KEY
-|API key for Geocoder HERE.com
+|GCS_TYPE
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD SERVICE TYPE.
+|service_account
+|No
+
+|*GCS_PROJECT_ID*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD PROJECT ID.
+|
+|No
+
+|*GCS_PRIVATE_KEY_ID*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD PRIVATE KEY ID.
+|
+|No
+
+|*GCS_PRIVATE_KEY*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD PRIVATE KEY.
+|
+|No
+
+|*GCS_CLIENT_EMAIL*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD CLIENT EMAIL.
+|
+|No
+
+|*GCS_CLIENT_ID*
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD CLIENT ID.
+|
+|No
+
+|GCS_AUTH_URI
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD AUTH URI (if needed)
+|https://accounts.google.com/o/oauth2/auth
+|No
+
+|GCS_TOKEN_URI
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD TOKEN URI (if needed)
+|https://accounts.google.com/o/oauth2/token
+|No
+
+|GCS_AUTH_PROVIDER_X509_CERT_URL
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD AUTH X509 CERT URI (if needed)
+|https://www.googleapis.com/oauth2/v1/certs
+|No
+
+|GCS_CLIENT_X509_CERT_URL
+|If STORAGE_PROVIDER is set to `gcs`, define here your GOOGLE CLOUD X509 CERT URI (if needed)
+|
+|No
+
+|===
+
+Next variables are additional services such as geolocation, etherpad and other simple integrations.
+Also some more refined configurations:
+
+.Optional Decidim Env Vars for external services integrations
+[%autowidth.stretch]
+|===
+|Name |Value |Default value|Multitenant's System configurable
+
+
+|MAPS_PROVIDER
+|For a simple geolocation and tile maps service configuration define this value to one of the supported providers, currently `here` for https://HERE.com[HERE Maps] or `osm` for https://www.openstreetmap.org[OpenStreatMap]. See xref:services:maps.adoc[Maps].
+|
+|No
+
+|MAPS_API_KEY
+|For a simple geolocation and tile maps service configuration define this value in case the provider needs it (if you are using Here Maps, you will need an API key). See xref:services:maps.adoc[Maps].
+
+*Note that if you are using the `here` service you don't need to do anything else. If using `osm` however check the rest of env vars related to maps for a proper configuration*
+|
+|No
+
+|MAPS_DYNAMIC_URL
+|If you are using a `osm` as a provider, you need to define this variable. Keep in mind that OpenStreetMap cannot be used directly due its non-commercial license in many cases. See xref:services:maps.adoc[Maps].
+
+*You need to define this variable if using `osm` as a provider, usually the URL goes in the form of `https://tile.openstreetmap.org/\{z}/\{x}/\{y}.png?key=\{apiKey}&\{foo}`*
+|
+|No
+
+|MAPS_STATIC_URL
+|If you are using a `osm` as a provider, you need to define this variable. Keep in mind that OpenStreetMap cannot be used directly due its non-commercial license in many cases. See xref:services:maps.adoc[Maps].
+
+*You need to define this variable if using `osm` as a provider, usually the URL goes in the form of `http://staticmap.openstreetmap.de/`*
+|https://image.maps.ls.hereapi.com/mia/1.6/mapview (only if using Here Maps)
+|No
+
+|MAPS_ATTRIBUTION
+|If you are using a `osm` as a provider, you need to define this variable. OpenStreeMap requires you to show the credits and that's what this does. See xref:services:maps.adoc[Maps].
+
+*You need to define this variable if using `osm` as a provider, the next text is a pretty common value: `<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors`*
+|
+|No
+
+|MAPS_EXTRA_VARS
+|Some providers may require you to send additional variables in the dynamic tile request (custom api keys, secrets, etc). Use this to do that, you can define as many pairs of "variable"/"value" in a URL-encoded string. See xref:services:maps.adoc[Maps].
+
+*Note that to defined this variable might not be necessary in most cases, if you do it must look something like `api_key=true&foo=bar%3Dbaz`*
+|
+|No
+
+|MAPS_GEOCODING_HOST
+|If you are using a `osm` as a provider, you need to define this variable to define the geocoder service to to translate addresses into latitude/longitude coordinates. See xref:services:maps.adoc[Maps].
+
+*You need to define this variable if using `osm` as a provider, usually the URL goes in the form of `https://nominatim.openstreetmap.org`*
+|
+|No
+
+|MAPS_DYNAMIC_PROVIDER
+|For advanced cases, you can define this value instead or in combination of MAPS_PROVIDER (which will be the default). This allows to set up different providers for the static tile provider than the dynamic. See xref:services:maps.adoc[Maps].
+
+*Note that you don't need to define this variable for the most common, simple, one provider cases.*
+|
+|No
+
+|MAPS_STATIC_PROVIDER
+|For advanced cases, you can define this value instead or in combination of MAPS_PROVIDER (which will be the default). This allows to set up different providers for the static tile provider than the dynamic. See xref:services:maps.adoc[Maps].
+
+*Note that you don't need to define this variable for the most common, simple, one provider cases.*
+|
+|No
+
+|MAPS_STATIC_API_KEY
+|For advanced cases, you can define this value instead or in combination of MAPS_API_KEY (which will be the default). This allows to set up different providers for the static tile provider than the dynamic requiring different API KEYS. See xref:services:maps.adoc[Maps].
+
+*Note that you don't need to define this variable for the most common, simple, one provider cases.*
+|
+|No
+
+|MAPS_DYNAMIC_API_KEY
+|For advanced cases, you can define this value instead or in combination of MAPS_API_KEY (which will be the default). This allows to set up different providers for the static tile provider than the dynamic requiring different API KEYS. See xref:services:maps.adoc[Maps].
+
+*Note that you don't need to define this variable for the most common, simple, one provider cases.*
+|
+|No
+
+|ETHERPAD_SERVER
+|URL for an https://etherpad.org/[Etherpad.org] server to integrate in Decidim for collaborative, real time writing events. See xref:services:etherpad.adoc[Etherpad].
+|
+|No
+
+|ETHERPAD_API_KEY
+|API key for communicating with the Etherpad server. See xref:services:etherpad.adoc[Etherpad].
+|
+|No
+
+|ETHERPAD_API_VERSION
+|Etherpad API version, this is unlikely to be needed to be changed. See xref:services:etherpad.adoc[Etherpad].
+|1.2.1
+|No
 
 |OMNIAUTH_FACEBOOK_APP_ID
-|App ID for enabling access through Facebook.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|App ID for enabling access through Facebook.com accounts. See xref:services:social_providers.adoc[Social Providers]. Note that defining this variable automatically renders the "login with" button.
+|
+|*Yes*
 
 |OMNIAUTH_FACEBOOK_APP_SECRET
 |App Secret for enabling access through Facebook.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|
+|*Yes*
 
 |OMNIAUTH_GOOGLE_CLIENT_ID
 |Client ID for enabling access through Google.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|
+|*Yes*
 
 |OMNIAUTH_GOOGLE_CLIENT_SECRET
 |Client Secret for enabling access through Google.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|
+|*Yes*
 
 |OMNIAUTH_TWITTER_API_KEY
-|API Key for enabling access through Google.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|API Key for enabling access through Twitter.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|
+|*Yes*
 
 |OMNIAUTH_TWITTER_API_SECRET
-|API Secret for enabling access through Google.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|API Secret for enabling access through Twitter.com accounts. See xref:services:social_providers.adoc[Social Providers].
+|
+|*Yes*
 
-|PORT
-|Specifies the `port` that Puma will listen on to receive requests. Default is 3000.
+|BULLETIN_BOARD_SERVER
+|The full URL to identify a https://github.com/decidim/decidim-bulletin-board[Bulletin Board Server]. *It must point to the Graphql API* (ie: https://bulletinboard.example.org/api) See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
 
-|RAILS_ENV
-|Environment for Ruby on Rails. If it's on your local machine for development, then it should be `development`. If it's on server it should be `production`. Please take care that this has security implications. You DON'T want to be running a production application on development mode.
+|BULLETIN_BOARD_PUBLIC_KEY
+|The public RSA key used to verify the Bulletin Board Server. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|BULLETIN_BOARD_API_KEY
+|An additional API key to add additional security with the communications with the Elections Bulletin Board Server. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|AUTHORITY_NAME
+|The name of the Authority registered in the Bulletin Board Server corresponding to this Decidim instance. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|AUTHORITY_PRIVATE_KEY
+|The private RSA key of this Decidim instance corresponding to the Authority public key registered in the Bulletin Board Server. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|ELECTIONS_SCHEME_NAME
+|The type of strategy used in the Bulletin Board Server used for encrypting the Election. *Currently only `electionguard` is available for production* See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|electionguard
+|No
+
+|ELECTIONS_NUMBER_OF_TRUSTEES
+|Number of trustees for `electionguard` election scheme, minimum number is 2. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|ELECTIONS_QUORUM
+|Number of trustees required to be present in order to decrypt an election in case of the `electionguard` scheme. Minimum is 2, maximum the number of trustees. See xref:services:elections_bulletin_board.adoc[Elections Bulletin Board].
+|
+|No
+
+|ELECTIONS_SETUP_MINIMUM_HOURS_BEFORE_START
+|Public Setting that defines how many hours should the setup be run before the election starts
+|3
+|No
+
+|ELECTIONS_START_VOTE_MAXIMUM_HOURS_BEFORE_START
+|Public Setting that defines how many hours the ballot box can be opened before the election starts
+|6
+|No
+
+|ELECTIONS_VOTER_TOKEN_EXPIRATION_MINUTES
+|How long any time of message sent to the bulletin board will be valid for any kind of processing.
+|120
+|No
+
+|VOTINGS_CHECK_CENSUS_MAX_REQUESTS
+|Max requests in a time period to check the census. Only applied in production and test.
+|5
+|No
+
+|VOTINGS_THROTTLING_PERIOD
+|Time window in which the VOTINGS_CHECK_CENSUS_MAX_REQUESTS throttling is applied (in minutes).
+|1
+|No
+
+|VOTINGS_CENSUS_ACCESS_CODES_EXPORT_EXPIRY_TIME
+|How long the census access codes export file will are available in the server (in days)
+|2
+|No
+
+|VAPID_PUBLIC_KEY
+|VAPID public key that will be used to sign the Push API requests. It can be generated running the task: `rails decidim:pwa:generate_vapid_keys`
+|
+|No
+
+|VAPID_PRIVATE_KEY
+|VAPID private key that will be used to sign the Push API requests. It can be generated running the task: `rails decidim:pwa:generate_vapid_keys`
+|
+|No
+
+|===
+
+.Additional Optional Decidim Env Vars for the setting up the application
+[%autowidth.stretch]
+|===
+|Name |Value |Default value|Multitenant's System configurable
+
+|DECIDIM_AVAILABLE_LOCALES
+|a list of, coma separated, locales that will be available for each organization configured in the System configuration. Check for the https://github.com/decidim/decidim/blob/3d4ec74bdce406e2ee6934b830d3c06398ab72c0/decidim-core/lib/decidim/core.rb#L166[Supported values] in ISO639 format.
+
+*Be careful while setting up this value, you can easily shoot yourself in the food as Decidim will crash if one of the languages is not supported*
+|ca, cs, de, en, es, eu, fi, fr, it, ja, nl, pl, pt, ro
+|*Partially*, Only when creating a new organization the admin needs to choose between these values
+
+|DECIDIM_DEFAULT_LOCALE
+|The default locale to be used as a fallback (note that, in practice, this value must always be defined in the System configuration for each organization anyway).
+
+*Note that `DECIDIM_AVALABLE_LOCALES` must include this value*
+|en
+|*Partially*, Only when creating a new organization
+
+|DECIDIM_FORCE_SSL
+|By default, Decidim enforces a SSL connection (https), sometimes it is necessary to disable it in order to handle this through a proxy system (note that use Decidim without SSL at all is NOT RECOMMENDED). This value can take 3 values:
+
+`auto`: Will be `true` for Rails Production or Staging environments and `false` for development or test. If undefined, defaults to this value.
+
+`true`: Will redirect to HTTPS always
+
+`false`: Won't redirect to HTTPS
+
+|auto
+|No
+
+|DECIDIM_ENABLE_HTML_HEADER_SNIPPETS
+|Set to `true` in order to allow administrators to define an arbitrary custom HTML code in the `<head></head>` section any Decidim page.
+
+The most common use is to integrate third-party services that require some
+extra JavaScript or CSS. Also, you can use it to add extra meta tags to the
+HTML. Note that this will only be rendered in public pages, not in the admin
+section.
+
+Before enabling this you should ensure that any tracking that might be done
+is in accordance with the rules and regulations that apply to your
+environment and usage scenarios. This component also comes with the risk
+that an organization's administrator injects malicious scripts to spy on or
+take over user accounts.
+|
+|No
+
+|DECIDIM_CURRENCY_UNIT
+|Currency unit is used in view showing monetary actions, such as budgets. It does not affect any internal calculations.
+|€
+|No
+
+|DECIDIM_CORS_ENABLED
+|The SVG do not support CORS. When using custom asset host different than root url, set this value to `true`, in order to activate the available workaround.
+|false
+|No
+
+|DECIDIM_IMAGE_UPLOADER_QUALITY
+|Defines the quality of image uploads after processing. Image uploads are processed by Decidim, this value helps reduce the size of the files.
+|80
+|No
+
+|DECIDIM_MAXIMUM_ATTACHMENT_SIZE
+|The maximum file size of an attachment (in Megabytes).
+
+Mind that this depends on your environment, for instance you could also need to change your web server configuration (nginx, apache, etc).
+|10
+|*Yes*
+
+|DECIDIM_MAXIMUM_AVATAR_SIZE
+|The maximum file size for a user avatar (in Megabytes).
+
+Mind that this depends on your environment, for instance you could also need to change your web server configuration (nginx, apache, etc).
+|5
+|*Yes*
+
+|DECIDIM_MAX_REPORTS_BEFORE_HIDING
+|The number of reports which a resource can receive before hiding it. This affects moderations for resources such as proposals or users (spammers).
+|3
+|No
+
+|DECIDIM_TRACK_NEWSLETTER_LINKS
+|Allow organizations admins to track newsletter links, trough UTMs. See https://en.wikipedia.org/wiki/UTM_parameters[UTM parameters in Wikipedia]. Set it to `true` or `false`, if undefined defaults to `true`.
+|true
+|No
+
+|DECIDIM_DOWNLOAD_YOUR_DATA_EXPIRY_TIME
+|Number of days that the download your data files will be available in the server.
+|7
+|No
+
+|DECIDIM_THROTTLING_MAX_REQUESTS
+|Max requests in a time period to prevent DoS attacks. Only applied on production. Note that this is used by the Gem https://github.com/rack/rack-attack#throttlename-options-block[Rack::Attack] and blocks are based on the detected remote IP. Different proxy configurations (such as load balancers) may affect this, we recommend to read the documentation for this gem.
+|100
+|No
+
+|DECIDIM_THROTTLING_PERIOD
+|Time window (in number of minutes) in which the throttling is applied.
+|1
+|No
+
+|DECIDIM_UNCONFIRMED_ACCESS_FOR
+|Time window (in number of days) were users can access the website even if their email is not confirmed.
+|0
+|No
+
+|DECIDIM_SYSTEM_ACCESSLIST_IPS
+|For extra security, restrict access to the system part with an authorized ip list.
+
+You can use a single ip like `1.2.3.4`, or an ip subnet like `1.2.3.4/24`
+You may specify multiple ip in an array, separating by commas, such as `1.2.3.4, 1.2.3.4/24`
+|
+|No
+
+|DECIDIM_BASE_UPLOADS_PATH
+|A base path for the uploads. If set, make sure it ends in a slash.
+Uploads will be set to `<base_path>/uploads/`. This can be useful if you
+want to use the same uploads place for both staging and production
+environments, but in different folders.
+
+If not set, it will be ignored.
+|
+|No
+
+|DECIDIM_DEFAULT_CSV_COL_SEP
+|Sets Decidim::Exporters::CSV's default column separator. This is used in general in any activity that generates a CSV file.
+|;
+|No
+
+|DECIDIM_CONSENT_COOKIE_NAME
+|Defines the name of the cookie used to check if the user allows Decidim to set cookies. This is needed due the GDPR regulations.
+|decidim-cc
+|No
+
+|DECIDIM_EXPIRE_SESSION_AFTER
+|In minutes, How long can a user remained logged in before the session expires.
+
+Notice that this is also maximum time that user can idle before getting automatically signed out.
+|30
+|No
+
+|DECIDIM_ENABLE_REMEMBER_ME
+|If set to true, users have option to "remember me".
+
+Notice that expire_session_after won't take effect when the user wants to be remembered.
+|true
+|No
+
+|DECIDIM_SESSION_TIMEOUT_INTERVAL
+|In seconds, defines how often `session_timeouter.js` checks time between the current moment and the last request. This is a periodic poll method (performed by a JS script) that is used to show users an alert that the session is about to expire after a period of inactivity.
+|10
+|No
+
+|DECIDIM_FOLLOW_HTTP_X_FORWARDED_HOST
+|Exposes a configuration option: `HTTP_X_FORWADED_HOST` header follow-up.
+
+If a caching system is in place, it can also allow cache and log poisoning attacks, allowing attackers to control the contents of caches and logs that could be used for other attacks.
+|false
+|No
+
+|DECIDIM_MAXIMUM_CONVERSATION_MESSAGE_LENGTH
+|The maximum length (number of characters) for conversation messages. Conversations are private threads between two or more users or groups.
+
+This does not affect comments as its length can be configured by administrators in the component's settings.
+|1000
+|No
+
+|DECIDIM_PASSWORD_BLACKLIST
+|Blacklisted passwords. Array may contain strings and regex entries.
+
+Separate each item of the array with a comma AND a space, for instance:
+`i-dont-like-this-password, i-dont-like-this-one-either, password123456`
+|
+|No
+
+|DECIDIM_ALLOW_OPEN_REDIRECTS
+|Disable the redirection to the external host when performing redirect back.
+
+*This is not recommended to activate unless you know what you are doing*
+
+More details at https://github.com/rails/rails/issues/39643[Rails issue #39643]
+
+Additional context: This has been revealed as an issue during a security audit on the Future of Europe installation
+
+|false
+|No
+
+|DECIDIM_ADMIN_PASSWORD_STRONG
+|Enable strong password rules for admin users.
+|true
+|No
+
+|DECIDIM_ADMIN_PASSWORD_EXPIRATION_DAYS
+|Defines how many days admin passwords are valid before they need to be reset.
+|90
+|No
+
+|DECIDIM_ADMIN_PASSWORD_REPETITION_TIMES
+|Defines how many previous passwords are compared against new admin user passwords.
+|5
+|No
+
+|DECIDIM_ADMIN_PASSWORD_MIN_LENGTH
+|The minimum character length for admin user passwords.
+|15
+|No
+
+|*DECIDIM_SERVICE_WORKER_ENABLED*
+|Enable/Disable the service worker. This is used to enable offline support and to deliver push notifications. In development it's recommended to be disabled because its aggresive cache configuration might cause some issues when submitting forms.
+|false
+|No
+
+
+|===
+
+.Optional Env Vars fine tuning some Decidim modules (such the API or Proposal behaviors)
+[%autowidth.stretch]
+|===
+|Name |Value |Default value|Multitenant's System configurable
+
+|API_SCHEMA_MAX_PER_PAGE
+|Set this number to define the default limit for the number of items returned and queried from the database in any collection returned in the GraphQL API.
+|50
+|No
+
+|API_SCHEMA_MAX_COMPLEXITY
+|Complexity is a number based on the GraphQL query sent to the API. Too complex queries may cause a degradation of performance, lower or increase this number according your needs.
+|5000
+|No
+
+|API_SCHEMA_MAX_DEPTH
+|GraphQL nested queries can generated equally deeply nested queries on the database. To prevent this set this limit to prevent too unperformant queries.
+|15
+|No
+
+|PROPOSALS_SIMILARITY_THRESHOLD
+|When users create proposals, there are presented with a list of alternative, similar, proposals already created.
+Similarity goes from 0 (no similar at all) to 1 (exactly the same content).
+
+Lower this number to require less coincidences between the texts to create the alternative list.
+Increase this number to force the alternative proposal be very similar in order to be considered an alternative.
+
+Using a very high number (ie: 0.99) can effectively deactivate the comparison step when creating proposals.
+|0.25
+|No
+
+|PROPOSALS_SIMILARITY_LIMIT
+|Max number of proposals from the alternative, similar, proposals to be presented to the user.
+|10
+|No
+
+|PROPOSALS_PARTICIPATORY_SPACE_HIGHLIGHTED_PROPOSALS_LIMIT
+|Number of proposals to be shown in blocks with highlighted content across different participatory spaces.
+|4
+|No
+
+|PROPOSALS_PROCESS_GROUP_HIGHLIGHTED_PROPOSALS_LIMIT
+|Number of proposals to be shown in blocks with highlighted content in processes groups only.
+|3
+|No
+
+|MEETINGS_UPCOMING_MEETING_NOTIFICATION
+|Number of days before scheduled to send a reminder notification to users registered in a meeting.
+|2
+|No
+
+|MEETINGS_ENABLE_PROPOSAL_LINKING
+|If true, enables several relationships between meetings and proposals. By default is active if Proposals are active (which is true always at the moment).
+
+*We recommend not to tamper with this setting unless you know what are you doing*
+|auto
+|No
+
+|MEETINGS_EMBEDDABLE_SERVICES
+|A list (separated by spaces) of allowed services that can be embedded in a iframe when creating an online meeting.
+|www.youtube.com www.twitch.tv meet.jit.si
+|No
+
+|BUDGETS_ENABLE_PROPOSAL_LINKING
+|If true, enables several relationships between budgets and proposals. By default is active if Proposals are active (which is true always at the moment).
+
+*We recommend not to tamper with this setting unless you know what are you doing*
+|auto
+|No
+
+|ACCOUNTABILITY_ENABLE_PROPOSAL_LINKING
+|If true, enables several relationships between the accountability module and proposals. By default is active if Proposals are active (which is true always at the moment).
+
+*We recommend not to tamper with this setting unless you know what are you doing*
+|auto
+|No
+
+|INITIATIVES_CREATION_ENABLED
+|If false, regular users cannot create initiatives.
+|true
+|No
+
+|INITIATIVES_SIMILARITY_THRESHOLD
+|Acts as the proposals similarity threshold, use a number between 0 and 1 to establish how similar have to be 2 initiatives to be listed the alternate list.
+
+0 will require no similarity at all
+1 will require for two initiatives to contain exactly the same text
+|0.25
+|No
+
+|INITIATIVES_SIMILARITY_LIMIT
+|Number of similar initiatives presented to the user before publishing a new one.
+|5
+|No
+
+|INITIATIVES_MINIMUM_COMMITTEE_MEMBERS
+|Minimum number of committee members required to pass the initiative to technical validation phase. Only applies to initiatives created by individuals.
+|2
+|No
+
+|INITIATIVES_DEFAULT_SIGNATURE_TIME_PERIOD_LENGTH
+|Number of days available to collect supports after an initiative has been published.
+|120
+|No
+
+|INITIATIVES_DEFAULT_COMPONENTS
+|Components enabled by default for a new initiative (administrators can add more).
+|pages, meetings
+|No
+
+|INITIATIVES_FIRST_NOTIFICATION_PERCENTAGE
+|Notifies when the given percentage of supports is reached for an initiative.
+|33
+|No
+
+|INITIATIVES_SECOND_NOTIFICATION_PERCENTAGE
+|Notifies when the given percentage of supports is reached for an initiative.
+|66
+|No
+
+|INITIATIVES_STATS_CACHE_EXPIRATION_TIME
+|Sets the expiration time for the statistic data.
+|5
+|No
+
+|INITIATIVES_MAX_TIME_IN_VALIDATING_STATE
+|Maximum amount of time in validating state.
+
+After this time the initiative will be moved to discarded state.
+|60
+|No
+
+|INITIATIVES_PRINT_ENABLED
+|Print functionality enabled. Allows users to get a printed version of the initiative.
+|true
+|No
+
+|INITIATIVES_DO_NOT_REQUIRE_AUTHORIZATION
+|If true, This flag allows creating initiatives to unauthorized users.
+|false
+|No
+
+|===
+
+.Optional Env Vars for extra Rails configuration
+[%autowidth.stretch]
+|===
+|Name |Value |Default value|Multitenant's System configurable
 
 |RAILS_LOG_TO_STDOUT
-|If true it'll show the log contents on the shell Standard Out. It's special relevant on certain hosting providers (for example, Heroku or Docker). It's also part of https://12factor.net/logs[12factor's recomendations].
+|If defined (value is indifferent) it'll show the log content on the shell Standard Out. It's special relevant on certain hosting providers (for example, Heroku or Docker). It's also part of https://12factor.net/logs[12factor's recommendations].
+|
+|No
 
-|SECRET_KEY_BASE
-|Secret key base for the Application. It's specially important that this is kept secret from the outside word; do NOT publish it on GitHub/GitLab/BitBucket.
+|RAILS_SERVE_STATIC_FILES
+|If defined (value is indifferent) it'll serve static files present in the `public` folder of Rails. It's special relevant on certain hosting providers (for example, Heroku or Docker).
+|
+|No
 
-|SMTP_ADDRESS
-|Hostname for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|RAILS_LOG_LEVEL
+|The log level for the application. This makes more or less verbose the logger. Usually, it is a good choice to use `info` after a period of testing a production application.
 
-|SMTP_DOMAIN
-|Domain for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+It must be one of these: `debug`, `info`, `warn`, `error`, `fatal`
 
-|SMTP_PASSWORD
-|Password for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+Note that this only applies to production environments.
+|debug
+|No
 
-|SMTP_USERNAME
-|Username for the SMTP server, for sending emails. See xref:services:smtp.adoc[SMTP]
+|RAILS_ASSET_HOST
+|If you use a CDN or another type of assets management, you can specify the host (and path) for it so, instead of Rails serving your assets (CSS, Javascript, Images) will use your custom system. For instance `https://assets.example.org`
+|
+|No
+
+|PORT
+|Specifies the `port` that Puma will listen on to receive requests. This does not apply to alternative application servers such as Passenger.
+|3000
+|No
+
+|RAILS_MAX_THREADS
+|Specifies the maximum number of concurrent database connections and `threads` that Puma will use to serve requests. Please refer to http://guides.rubyonrails.org/configuring.html#database-pooling[Database pooling at Rails Guides] for more information.
+|5
+|No
+
+|REDIS_URL
+|If using Sidekiq as a queue adapter for processing background jobs, a Redis database is needed. Sidekiq uses this env var if defined, if not defaults to `localhost:6379`. Please refer to https://github.com/mperham/sidekiq/wiki/Using-Redis[Sidekiq documentation] for more information.
+|5
+|No
 
 |===
 
diff --git a/docs/modules/configure/pages/index.adoc b/docs/modules/configure/pages/index.adoc
index caff6d01c4cdb..48bf6b85db396 100644
--- a/docs/modules/configure/pages/index.adoc
+++ b/docs/modules/configure/pages/index.adoc
@@ -2,6 +2,46 @@
 
 Decidim is a Ruby on Rails library, and as such we try to follow their conventions. Please read https://guides.rubyonrails.org/configuring.html[Configuring Rails Applications].
 
+Decidim is also a command line executable capable of generating your own Decidim installation.
+
+Install it as:
+
+[source,console]
+----
+gem install decidim
+----
+
+For a simple, bare application, just run:
+
+[source,console]
+----
+decidim my_decidim_application
+----
+
+However you can take advantage of the optional flags to automatically configure some aspects of the application.
+Check the available options using the `--help` modifier:
+
+[source,console]
+----
+decidim --help
+----
+
+For instance, if you are planing to use some external cloud storage service (such as S3), create a Decidim application using the `--storage` modifier:
+
+[source,console]
+----
+decidim --storage s3 my_decidim_application
+----
+
+It is also recommended to use a proper Job Queue processor such as `sidekiq` or `delayed_job`. The `--queue` modifier allows you to generate a Decidim Application with a proper Sidekiq configuration (DelayedJob is not supported yet, PR wellcomed, but you can easily just follow the https://github.com/collectiveidea/delayed_job[official instructions]):
+
+[source,console]
+----
+decidim --queue sidekiq my_decidim_application
+----
+
+Then make use of the related xref:configure:environment_variables.adoc[Environment Variables] to configure your particular provider.
+
 Just as a reminder, these files are important:
 
 * config/database.yml
diff --git a/docs/modules/configure/pages/initializer.adoc b/docs/modules/configure/pages/initializer.adoc
index c4ae9990389ef..50b7d120766a1 100644
--- a/docs/modules/configure/pages/initializer.adoc
+++ b/docs/modules/configure/pages/initializer.adoc
@@ -1,8 +1,12 @@
 = Initializer
 
-There are some settings that you'll need to change in the `config/initializer/decidim.rb` file.
+There are some settings that you'll need to change in the `config/initializer/decidim.rb` file. We recommend that, whenever it is possible, you use xref:configure:environment_variables.adoc[Environment Variables], as just cleaner and easier to work with.
 
-This is where you can change the behaviour defined on the diferent components (most notably from `decidim-core`).
+If you need to add special logic or if you feel more comfortable working with Ruby code instead of Environment Variables, then you can of course do all the changes that you need directly in the initializer file. Take into account that this file could be published in a Version Control System (like `git`) so you should be careful with the secrets/API keys that you add here.
+
+Remember to restart your server when making changes in this file.
+
+This is where you can change the behaviour defined on the different components (most notably from `decidim-core`).
 
 After making changes to this file you'll need to also restart your application server.
 
@@ -62,7 +66,7 @@ this value for that specific organization.
 == Content Processors
 
 Defines a list of custom content processors. They are used to parse and
-render specific tags inside some user-provided content. Check the xref:develop:content_processor.adoc[Content Processor]
+render specific tags inside some user-provided content. Check the xref:develop:content_processors.adoc[Content Processor]
 docs for more info.
 
 [source,ruby]
@@ -97,7 +101,7 @@ Please refer to:
 
 == Geocoder configuration
 
-Allows to make geographical mapping in some components, like Proposals or Meetings. It must be configured against a OpenStreetMap provider. See xref:services:geocoder.adoc[Geocoder service documentation].
+Allows to make geographical mapping in some components, like Proposals or Meetings. It must be configured against a OpenStreetMap provider. See xref:services:maps.adoc[Geocoder service documentation].
 
 [source,ruby]
 ....
@@ -109,7 +113,7 @@ Allows to make geographical mapping in some components, like Proposals or Meetin
 
 == Custom resource reference
 
-Custom resource reference generator method. See the See xref:admin:system_panel.adoc[System panel docs] for more information.
+Custom resource reference generator method. See the See xref:admin:system.adoc[System panel docs] for more information.
 
 [source,ruby]
 ....
@@ -155,7 +159,7 @@ Mind that this depends on your environment, for instance you could also need to
 
 === User avatar file size
 
-  # The maximum file size for a user avatar
+The maximum file size for a user avatar
 
 Mind that this depends on your environment, for instance you could also need to change your web server configuration (nginx, apache, etc).
 
@@ -200,13 +204,13 @@ Allow organizations admins to track newsletter links, trough UTMs. See https://e
   config.track_newsletter_links = true
 ....
 
-== Data portability expiry time
+== Download your data expiry time
 
-Amount of time that the data portability files will be available in the server.
+Amount of time that the download your data files will be available in the server.
 
 [source,ruby]
 ....
-  config.data_portability_expiry_time = 7.days
+  config.download_your_data_expiry_time = 7.days
 ....
 
 == Throttling settings
@@ -257,7 +261,7 @@ If not set, it will be ignored.
 == SMS gateway configuration
 
 If you want to verify your users by sending a verification code via
-SMS you need to provide a SMS gateway service class.
+xref:services:sms.adoc[SMS] you need to provide a SMS gateway service class.
 
 An example class would be something like:
 
@@ -289,7 +293,7 @@ Used by `decidim-initiatives`.
 
 Provide a class to generate a timestamp for a document. The instances of
 this class are initialized with a hash containing the :document key with
-the document to be timestamped as value. The istances respond to a
+the document to be timestamped as value. The instances respond to a
 timestamp public method with the timestamp.
 
 An example class would be something like:
@@ -358,6 +362,37 @@ xref:services:etherpad.adoc[Etherpad's Decidim docs] in order to set it up.
   }
 ....
 
+==  Machine Translation Configuration
+
+To enable machine translations you need to enable the service and specify the class used for translation (this usually is the one contacting an external API from a 3d party service that actually translates the string).
+
+[source,ruby]
+....
+  config.enable_machine_translations = false
+  config.machine_translation_service = "MyTranslationService"
+....
+
+An example class would be something like:
+
+[source,ruby]
+....
+  class MyTranslationService
+    attr_reader :text, :original_locale, :target_locale
+
+    def initialize(text, original_locale, target_locale)
+      @text = text
+      @original_locale = original_locale
+      @target_locale = target_locale
+    end
+
+    def translate
+      Actual code to translate the text
+    end
+  end
+....
+
+See xref:develop:machine_translations.adoc[Machine Translations] for more information about how it works and how to set it up.
+
 == Default CSV column separator
 
 Sets Decidim::Exporters::CSV's default column separator
diff --git a/docs/modules/customize/assets/images/error_max_budget.png b/docs/modules/customize/assets/images/error_max_budget.png
new file mode 100644
index 0000000000000..ef12a11fe707a
Binary files /dev/null and b/docs/modules/customize/assets/images/error_max_budget.png differ
diff --git a/docs/modules/customize/assets/images/maximum_budget.png b/docs/modules/customize/assets/images/maximum_budget.png
new file mode 100644
index 0000000000000..b62affc988f0c
Binary files /dev/null and b/docs/modules/customize/assets/images/maximum_budget.png differ
diff --git a/docs/modules/customize/pages/code.adoc b/docs/modules/customize/pages/code.adoc
index 7814134f3dd50..97054c4bf6126 100644
--- a/docs/modules/customize/pages/code.adoc
+++ b/docs/modules/customize/pages/code.adoc
@@ -1,17 +1,5 @@
 = Code
 
-Decidim is multiple things:
-
-* A command-line utility, which can create an application
-* A set of libraries, that the application can use
-
-Most of the time, you should work with the generated application. That application (development_app on this docs) should be named as your project, for instance for Barcelona City Council is `DecidimBarcelona`, so for creating it should be:
-
-[source,console]
-----
-decidim DecidimBarcelona
-----
-
 If you want to override/change anything, you can just do it with the same name of the file, through Monkey Patching. Some real world examples of this method:
 
 * https://github.com/gencat/participa/blob/master/app/decorators/decidim/admin/selective_newsletter_form_decorator.rb[Decidim::Admin::SelectiveNewsletterForm]. As it's a decorator you also need to make it available in the https://github.com/gencat/participa/blob/3416992ae095f6ab1e826fee961253514c4ff0ef/config/application.rb#L48[application config]
diff --git a/docs/modules/customize/pages/data_consent.adoc b/docs/modules/customize/pages/data_consent.adoc
new file mode 100644
index 0000000000000..67a76a20a71f0
--- /dev/null
+++ b/docs/modules/customize/pages/data_consent.adoc
@@ -0,0 +1,113 @@
+= Data consent (aka. "cookie consent")
+
+With data consent we can explain better what local data we store in the user's browser, why we are storing this data, and let the user choose which data they allow to store in their browser.
+
+This feature is many times referred to as "cookie consent" due to historic reasons but in Decidim we prefer to call it "data consent" because this can also include other data stored in the user's browser using its APIs, such as data added to LocalStorage.
+
+As many non-technical people are still more familiar with the "cookie" terminology, the user interface talks only about "Cookie consent" to make it easier to understand for non-technical participants.
+
+== Different data consent categories available in Decidim
+
+By default there are four (4) data consent categories: **essential**, **preferences**, **analytics** and **marketing**. To display embedded iframes properly user has to give consent to all categories.
+
+== Adding scripts which require data consent
+
+The recommended place for scripts is ```app/views/layouts/decidim/_head_extra.html.erb```.
+For example, if you want to add a script that requires marketing consent, you can add the following code:
+
+[source,javascript]
+----
+<script type="text/plain" data-consent="marketing">
+  console.log("marketing data consent given");
+</script>
+----
+
+NOTE: Script type should be "text/plain". Without that, user's data consent setting does not have any effect.
+
+== Adding data consent category and related documentation
+
+You are able to modify data consent categories via the `consent_gategories` configuration option.
+
+For example if you want to add a "statistics" category you need to add following code to your app's initializer:
+
+[source,ruby]
+----
+Decidim.configure do |config|
+  config.consent_categories = [
+    {
+      slug: "essential",
+      mandatory: true,
+      items: [
+        {
+          type: "cookie",
+          name: "_session_id"
+        },
+        {
+          type: "cookie",
+          name: Decidim.consent_cookie_name
+        }
+      ]
+    },
+    {
+      slug: "preferences",
+      mandatory: false
+    },
+    {
+      slug: "analytics",
+      mandatory: false
+    },
+    {
+      slug: "marketing",
+      mandatory: false
+    },
+    {
+      slug: "statistics",
+      mandatory: false,
+      items: [
+        type: "cookie",
+        name: "statistics-cookie"
+      ]
+    }
+  ]
+end
+----
+
+When adding categories and items also remember to add the following xref:admin:texts.adoc[translations]:
+
+For category:
+
+[listing]
+----
+layouts.decidim.data_consent.modal.statistics.title
+layouts.decidim.data_consent.modal.statistics.description
+----
+
+For data items (e.g. cookies):
+
+[listing]
+----
+layouts.decidim.data_consent.details.items.statistics-cookie.description
+layouts.decidim.data_consent.details.items.statistics-cookie.service
+----
+
+* Description explains the purpose of using this data
+* Service explains the 3rd party service where this data is coming from
+
+So, for instance for the English language (`en`), it would look like this:
+
+[source,yaml]
+----
+en:
+  layouts:
+    decidim:
+      data_consent:
+        modal:
+          statistics:
+            title: The title for the statistics
+            description: The description for the statistics
+        details:
+          items:
+            statistics-cookie:
+              description: The purpose of the cookie
+              service: The 3rd party service of the cookie
+----
diff --git a/docs/modules/customize/pages/index.adoc b/docs/modules/customize/pages/index.adoc
new file mode 100644
index 0000000000000..3737b67a561c2
--- /dev/null
+++ b/docs/modules/customize/pages/index.adoc
@@ -0,0 +1,28 @@
+= Customize
+
+Decidim is multiple things:
+
+* A command-line utility, which can create an application
+* A set of libraries, that the application can use
+
+Most of the time, you should work with the generated application. That application (development_app on this docs) should be named as your project, for instance for Barcelona City Council is `DecidimBarcelona`, so for creating it should be:
+
+[source,console]
+----
+decidim DecidimBarcelona
+----
+
+Inside of your application you can customize it in different ways:
+
+* xref:customize:authorizations.adoc[Authorizations]
+* xref:customize:code.adoc[Code]
+* xref:customize:gemfile.adoc[Gemfile]
+* xref:customize:images.adoc[Images]
+* xref:customize:javascript.adoc[Javascript]
+* xref:customize:menu.adoc[Menu]
+* xref:customize:oauth.adoc[OAuth]
+* xref:customize:styles.adoc[Styles]
+* xref:customize:texts.adoc[Texts]
+* xref:customize:users_registration_mode.adoc[User registration mode]
+* xref:customize:views.adoc[Views]
+
diff --git a/docs/modules/customize/pages/logic.adoc b/docs/modules/customize/pages/logic.adoc
new file mode 100644
index 0000000000000..eb35f6b1ade93
--- /dev/null
+++ b/docs/modules/customize/pages/logic.adoc
@@ -0,0 +1,103 @@
+= Change Decidim core logic within your application
+
+There are occasions you find yourself in a situation that you need to change Decidim core logic within your application. There are two ways to accomplish this goal, and we are going through these options here.
+As an example, we will add a new validation rule to the Admin panel, where Admin can not add projects with budgets more than half the total budget. Once we applied such limitation, admins should not be able to add a project with the cost of 5,001 euros to a budget with total of 10,000 euros.
+
+[#maximum-budget-rule]
+.Trying to create a project with the budget of €5,001 for a budget with the total amount of €10,000(My budget) reults in error(buttom-right error message)
+
+image::maximum_budget.png[Maximum budget error]
+
+==  1. Direct change from your application
+
+This method is more straight-forward, and easier to learn. To change the logic in Decidim, identify which part of the source code you need to change. The best way to achieve this is to identify the module being responsible for handling the functionality you want to change. Next, copy the file you want to change from the Decidim gems to your application and use exactly the same directory structure as the destination as in the original gem. Finally, change the code as you wish and make sure that the changes are being applied by testing it in your browser.
+To achieve the change we want to accomplish, we need to go through the following steps:
+
+. Investigate the original source code, where the validation for new projects are defined; in this case, it is decidim-budgets/app/form/decidim/budgets/admin/project_form.rb(refer to xref:#explanation[Extra notes] for more information).
+. Create the same directory path inside your application `mkdir -p app/forms/decidim/budgets/admin` as for the original file.
+. Copy the file from `decidim-budgets` to the newly created directory `cp $(bundle show decidim-budgets)/app/forms/decidim/budgets/admin/project_form.rb app/forms/decidim/budgets/admin/`.
+. Implement the change in the copied file, in this case add the following validation as explained below.
+. In the copied file, add/edit a validation for maximum allowable value:
+[source,ruby]
+----
+  #...
+  validates :budget_amount, numericality: { less_than_or_equal_to: :maximum_budget }
+  #...
+  private
+    #...
+    def maximum_budget
+      (budget[:total_budget] * 0.5).round
+    end
+----
+[start=6]
+. Save the file and restart the server from the console (just to be sure), and check if the changes has taken effect by trying to submit the form.
+. Try to create a project with the budget of €5,001 for a budget with the total amount of €10,000 (e.g. "My budget").
+. You should see an error under the project budget field after submitting the form if everything went as expected.
+
+[#maximum-budget-error]
+.Error messages indicating the exceeding the maximum budget rule.
+
+image::error_max_budget.png[Error for reaching maximum budget]
+NOTE: Remember to add tests for your coded wherever it is needed.
+
+== 2. Override logic with a concern
+
+Concerns allow us to add functionality into existing classes so that the including class can use the added functionality. This is a pattern provided by the Rails framework and you can learn more about it from the https://api.rubyonrails.org/classes/ActiveSupport/Concern.html[Rails API documentation]
+Simply put, a concern allows developers to change only the parts of the original code that need to be changed. This might be a block of a code we need to change, or add/edit an existing method, etc.
+
+The benefit of using concerns is that when we update Decidim gems to new versions, we do not have to necessarily go through all our customizations and we can just focus on those parts that we really want to change. This is slightly harder to do than the first example but in the long run it will pay you back as you will save a lot of time when updating Decidim.
+
+Concerns should be placed into the `concerns` folder within the top-level folder where you want to apply these concerns. In this case, we are adding a concern for the forms classes, so we should place the concerns related to forms to `app/forms/concerns`. If you do not have this folder available, create it first `mkdir -p app/forms/concerns`.
+
+Now, let's move our modifications from the first copy-paste example into a concern.
+
+. Create the file `app/forms/concerns/admin_project_form_extensions.rb`, and make the desired changes in that file as follows:
+[source,ruby]
+----
+# frozen_string_literal: true
+module AdminProjectFormExtensions
+  extend ActiveSupport::Concern
+    included do
+      validates :budget_amount, numericality: { less_than_or_equal_to: :maximum_budget }
+    end
+  private
+    def maximum_budget
+      (budget[:total_budget] * 0.5).round
+    end
+end
+----
+[start=2]
+. After the concern is created, we need to apply it to the correct class. We can do this in the `to_prepare` hook in `config/application.rb`:
+[source,ruby]
+----
+  config.to_prepare do
+    Decidim::Budgets::Admin::ProjectForm.include(Decidim::Budgets::Admin::ProjectForm.include(AdminProjectFormExtensions)
+  end
+----
+This applies to almost all classes you want to change in Decidim but controllers and helpers are special cases due to order of how things are loaded in the Decidim boot process. If you want to add any changes to controllers or helpers, you need to wrap the `config.to_prepare` block within an initializer that is run at the correct phase of the boot process as follows:
+[source,ruby]
+----
+  initializer "customizations", after: "decidim.action_controller" do
+    config.to_prepare do
+      # Add the controller/helper customizations here
+    end
+  end
+----
+[start=3]
+. Restart the server to apply these changes, as we changed the configuration of the application.
+
+[#explanation]
+== Extra notes
+
+The following step would help you find original source code:
+
+* Because we are changing something in the budgets component, we expect to find this file from the decidim-budgets module
+* To find where the gem is located, run the following command within your application:
+
+[source,ruby]
+----
+  bundle show decidim-budgets
+----
+
+* Look at the URL in the view which you want to change. This should generally provide you a hint where to find the correct file to change if you are already familiar with the Rails framework to begin with.
+* As we are changing a validation rule, we expect these kinds of rules to be defined in the form objects which control the different forms in Decidim (so look into the app/forms folder within decidim-budgets).
diff --git a/docs/modules/customize/pages/styles.adoc b/docs/modules/customize/pages/styles.adoc
index 6170e145f2de0..a37c118aa9e2d 100644
--- a/docs/modules/customize/pages/styles.adoc
+++ b/docs/modules/customize/pages/styles.adoc
@@ -56,8 +56,8 @@ Decidim uses Webpacker to compile assets. There are two ways to customize CSS:
 
 1. if you want to redefine just CSS vars or Foundation settings, use _decidim-settings.scss
 2. if you want to redefine a specific snippet of CSS (let's say a few classes but not a whole file) you can use decidim_application.scss
-3. and of course you can overwrite whole files by copying them into the application i.e: to replace `decidim-core/app/packs/stylesheets/modules/_cookie-bar.scss` you should create in your Rails app a file in
-  `app/packs/stylesheets/modules/_cookie-bar.scss` and it will have more priority over the Decidim file.
+3. and of course you can overwrite whole files by copying them into the application i.e: to replace `decidim-core/app/packs/stylesheets/decidim/modules/_data-consent.scss` you should create in your Rails app a file in
+  `app/packs/stylesheets/decidim/modules/_data-consent.scss` and it will have more priority over the Decidim file.
 
 We use http://sass-lang.com/guide[SASS, with SCSS syntax] as CSS preprocessor.
 
diff --git a/docs/modules/develop/pages/api.adoc b/docs/modules/develop/pages/api.adoc
index fb4adc0ec924d..1c702df65b5c9 100644
--- a/docs/modules/develop/pages/api.adoc
+++ b/docs/modules/develop/pages/api.adoc
@@ -4,12 +4,8 @@ Decidim comes with a powerful API in read-only mode based in the GraphQL specifi
 
 Documentation for this API is auto-generated in each instance of Decidim, usually under the URL:
 
-`some_domain/api/docs`
+`https://example.org/api/docs`
 
-Accessing that URL will give a full details of all the objects that can be requested and how.
+Accessing that URL will give a full details of all the objects that can be requested and how. It includes the full field types reference.
 
-For a quick introduction about how to use the Decidim API, please refer to this document:
-
-xref:../../decidim-api/docs/usage.adoc[Using the Decidim GraphQL API]
-
-Note that this document is available under the `api/docs` URL nicely formatted as well. It also includes the full field types reference.
+As an alternative, if you can't access that URL on your instance you can read about how this work https://github.com/decidim/decidim/blob/develop/decidim-api/docs/usage.md[Using the Decidim GraphQL API].
diff --git a/docs/modules/develop/pages/guide_development_app.adoc b/docs/modules/develop/pages/guide_development_app.adoc
index 6edf7f25af92a..66a49100b2ae2 100644
--- a/docs/modules/develop/pages/guide_development_app.adoc
+++ b/docs/modules/develop/pages/guide_development_app.adoc
@@ -8,14 +8,15 @@ system and services requirements, like having a working Ruby installation, Postg
 
 You'll need to configure the PostgreSQL database before anything. For this,
 
-1. Configure postgresql with a super-user. For instance, for a user called `decidim_development_app_user` with password `changeme`, it'd be:
+. Configure postgresql with a super-user. For instance, for a user called `decidim_development_app_user` with password `changeme`, it'd be:
 
 [source,console]
 ----
 sudo -u postgres psql -c "CREATE USER decidim_development_app_user WITH SUPERUSER CREATEDB NOCREATEROLE PASSWORD 'changeme'"
 ----
 
-2. Save the database configuration in your environment variables configuration. If you've followed the xref:install:manual.adoc[Decidim installation manual],
+[start=2]
+. Save the database configuration in your environment variables configuration. If you've followed the xref:install:manual.adoc[Decidim installation manual],
 then you should have a working https://github.com/rbenv/rbenv-vars[rbenv-vars] in your environment:
 
 [source,console]
@@ -26,7 +27,8 @@ echo "DATABASE_PASSWORD=changeme" >> ~/.rbenv-vars
 
 Of course you should change the password before anything.
 
-2. Then you can create a `development_app` from inside the project's root folder with the command:
+[start=3]
+. Then you can create a `development_app` from inside the project's root folder with the command:
 
 [source,console]
 ----
diff --git a/docs/modules/develop/pages/guide_development_with_localhost_ssl.adoc b/docs/modules/develop/pages/guide_development_with_localhost_ssl.adoc
index 1e9f8ef7431b5..6a20fca8d32ec 100644
--- a/docs/modules/develop/pages/guide_development_with_localhost_ssl.adoc
+++ b/docs/modules/develop/pages/guide_development_with_localhost_ssl.adoc
@@ -1,47 +1,28 @@
 = Testing SSL in localhost
 
-In some cases is useful to access the `localhost` environment under SSL (ie: `https://localhost:3000/`).
+In some cases is useful to access the `localhost` environment under SSL (ie: `https://localhost:3443/`).
 
 A typical use case is when you want to test login integration with 3rd party systems using OAuth (which in the latest versions only the HTTPS protocol is allowed).
 
-Using Puma, the default server for Rails, you can easily do the trick by creating a self-signed certificate and using it when starting your development environment.
+Using Puma, the default server for Rails, you can easily do the trick by creating a self-signed certificate and using it when starting your development environment. A dummy certificate is shipped within the `decidim-dev` module which is usually included in the `:development` group of your `Gemfile`.
 
-== Create a self-signed certificate for localhost
-
-First you need a SSL certificate for the `localhost` domain (you only need to execute this command once):
-
-[source,bash]
-----
-openssl req -x509 -out localhost.crt -keyout localhost.key \
-  -newkey rsa:2048 -nodes -sha256 \
-  -subj '/CN=localhost' -extensions EXT -config <( \
-   printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
-----
+== Starting development in SSL mode
 
-This will generate two files: `localhost.crt` and `localhost.key`, you can store them anywhere you want to use them later. In this example we'll suppose we have them in the folder `certs` in our root user home:
+If you created the Decidim development app using the default development app generator, you already should have the necessary configurations for starting the development server under SSL. You can start the development server under SSL at port 3443 (default) using the following command:
 
 [source,bash]
 ----
-mkdir ~/certs/
-mv localhost.crt ~/certs/
-mv localhost.key ~/certs/
+DEV_SSL=true bin/rails s
 ----
 
-== Starting development in SSL mode
+Also make sure that the `decidim-dev` gem is included in the `:development` group of your `Gemfile` as it should be unless you changed it.
 
-Once you have your certificate is generated, just use the next command in order to start puma instead of the typical `bin/rails s`:
+After that, you can start the development server under SSL at port 3443 (default) using the following command:
 
-[source,bash]
-----
-bin/rails s -b "ssl://127.0.0.1:3000?key=$HOME/certs/localhost.key&cert=$HOME/certs/localhost.crt"
-----
-
-Now you are ready to visit your favorite browser at the address `https://localhost:3000/` (note "https").
+Now you are ready to visit your favorite browser at the address `https://localhost:3443/` (note "https" and port 3443). If you would like to test the non-SSL "http" version, it is also running normally at port 3000, so you can access that as you normally would.
 
 Note: Your browser is going to complain as this is a self-signed certificate, that's ok for development, just add an exception and accept the certificate.
 
-Also take into account that starting Puma in SSL mode will disable accessing it in non-ssl mode (normal `http` protocol).
-
 == Testing tenants using lvh.me
 
 You can also test the multi-tenant capabilities of Decidim by using alternative domains or subdomains that points to your local machine. `lvh.me` is a service that does just that without configuring anything in your machine (an alternative is to add entries in your `/etc/hosts` with a testing domain of your choice). Just point your browser to any subdomain of `lvh.me` and you'll be in your own machine.
@@ -61,3 +42,39 @@ Finally remember to add the port as `lvh.me` do not forwards anything, for insta
 `https://anotherorg.lvh.me:3000/`
 
 etc.
+
+== Optional: Create your own self-signed certificate for localhost
+
+If you don't want to rely on the dummy certificate shipped with the `decidim-dev` gem, you can also create the certificates yourself.
+
+First you need a SSL certificate for the `localhost` domain (you only need to execute this command once):
+
+[source,bash]
+----
+openssl req -x509 -out localhost.crt -keyout localhost.key \
+  -newkey rsa:2048 -nodes -sha256 \
+  -subj '/CN=localhost' -extensions EXT -config <( \
+   printf "[dn]\nCN=localhost\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth")
+----
+
+This will generate two files: `localhost.crt` and `localhost.key`, you can store them anywhere you want to use them later. In this example we'll suppose we have them in the folder `certs` in our root user home:
+
+[source,bash]
+----
+mkdir ~/certs/
+mv localhost.crt ~/certs/
+mv localhost.key ~/certs/
+----
+
+== Optional: Manually starting development server in SSL mode
+
+Once you have your certificate is generated, just use the next command in order to start puma instead of the typical `bin/rails s`:
+
+[source,bash]
+----
+bin/rails s -b "ssl://127.0.0.1:3443?key=$HOME/certs/localhost.key&cert=$HOME/certs/localhost.crt"
+----
+
+Now you are ready to visit your favorite browser at the address `https://localhost:3443/` (note "https" and port 3443).
+
+Take into account that starting Puma in SSL mode manually will disable accessing it in non-ssl mode (normal `http` protocol).
diff --git a/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc b/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc
index fa50b36d2564a..d851eb9fc1ede 100644
--- a/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc
+++ b/docs/modules/develop/pages/guide_migrate_webpacker_app.adoc
@@ -68,8 +68,8 @@ You can download these files directly with these commands:
 
 [source,console]
 ----
-mkdir -p app/packs/src/decidim app/packs/stylesheets/decidim app/packs/stylesheets/images
-touch app/packs/src/decidim/.keep app/packs/stylesheets/decidim/.keep app/packs/stylesheets/images/.keep
+mkdir -p app/packs/src/decidim app/packs/stylesheets/decidim app/packs/images
+touch app/packs/src/decidim/.keep app/packs/stylesheets/decidim/.keep app/packs/images/.keep
 wget https://raw.githubusercontent.com/decidim/decidim/develop/decidim-generators/lib/decidim/generators/app_templates/decidim_application.js -O app/packs/src/decidim/decidim_application.js
 wget https://raw.githubusercontent.com/decidim/decidim/develop/decidim-generators/lib/decidim/generators/app_templates/decidim_application.scss -O app/packs/stylesheets/decidim/decidim_application.scss
 wget https://raw.githubusercontent.com/decidim/decidim/develop/decidim-generators/lib/decidim/generators/app_templates/_decidim-settings.scss -O app/packs/stylesheets/decidim/_decidim-settings.scss
@@ -84,6 +84,16 @@ Copy the existing images from `app/assets/images` to `app/packs/images`. Images
 cp -rp app/assets/images/* app/packs/images/
 ----
 
+For instance, add the image "app/packs/images/test.png" in a view using the helper:
+
+[source,erb]
+----
+<%= image_pack_tag "media/images/test.png" %>
+----
+
+Note that, by default, all images are flattened in a single directory (any subdirectory structure is lost when requiring an image using the `image_pack_tag`).
+So, if you have a file in a subdirectory such as `app/packs/images/subfolder/test.png`, you still need to call for the image using `image_pack_tag "media/images/test.png"`
+
 === Migrate stylesheets
 
 Existing stylesheets should be moved from `app/assets/stylesheets` to `app/packs/stylesheets` and imported with `@import` into `decidim_application.scss`. Take into account that you might need to adjust a bit the paths of the `@import` to adjust them to the new locations.
@@ -111,6 +121,16 @@ Sometimes assets are included in `vendor/assets/` folder or imported from gems.
 1. if the asset is a javascript that is available as npm package the recommendation is to add it to package.json with `npm install`. If it's not available you might want to copy it to `app/packs/src` and import it.
 2. if the asset is a stylesheet it should be copied to `app/packs/stylesheets` and imported with `@import...` from `_decidim-settings.scss`. Alternatively you can use the optional asset includes as described below to include these in the Decidim main SCSS files.
 
+=== Migrate uploads to ActiveStorage
+
+The old method (CarrierWave) to handle user uploads has changed, now it uses ActiveStorage.
+This means that all the old files need to be migrated to the new system. Use the following rake task to perform this task:
+
+[source,console]
+----
+RAILS_ENV=production bin/rails decidim:active_storage_migrations:migrate_from_carrierwave_to_active_storage
+----
+
 === Optional asset includes
 
 Decidim Webpacker provides a new configuration convention that allows you to add extra configurations for webpacker using a configuration file named `config/assets.rb`. Within this file, you have the following API methods available:
@@ -177,7 +197,7 @@ Decidim.register_assets_path File.expand_path("app/packs", Rails.application.roo
 
 The deployment needs to be updated to manually run `npm install` before assets are precompiled.
 
-In the case of Capistrano this can be done with a before hook:
+In the case of Capistrano this can be done with a before hook (can be added at the end of your `config/deploy.rb` file):
 
 [source,ruby]
 ----
@@ -186,9 +206,7 @@ namespace :deploy do
   task :decidim_webpacker_install do
     on roles(:all) do
       within release_path do
-        with rails_env: fetch(:rails_env) do
-          execute "npm ci"
-        end
+        execute :npm, "install"
       end
     end
   end
@@ -199,6 +217,7 @@ end
 
 Also, in the case of Capistrano it's interesting to add to the shared_paths the following folders:
 
+* `storage` *IMPORTANT!*
 * `tmp/webpacker-cache`
 * `node_modules`
 * `public/decidim-packs`
@@ -215,3 +234,24 @@ npm ERR!
 ----
 
 Then you need to check again that you're using the correct Node.js and NPM versions.
+
+In some case it might be that some packages are not well resolved when installing NPM modules. If you get messages like:
+
+[source,console]
+----
+...
+[webpack-cli] Error: Cannot find module '@rails/webpacker'
+...
+----
+
+These might be due some kind of corruption in your `package-json.lock` file, you can try either to remove this file and recreate it with `npm install` or to add the package `@rails/webpacker` manually in your `package.json` file next to the `@decidim/webpacker` package:
+
+[source,json]
+----
+...
+    "@decidim/webpacker": "^0.25.2",
+    "@rails/webpacker": "^6.0.0-rc.5",
+...
+----
+
+Then execute `npm install`.
diff --git a/docs/modules/develop/pages/maps.adoc b/docs/modules/develop/pages/maps.adoc
index ce61b75772743..fd65ee19a4138 100644
--- a/docs/modules/develop/pages/maps.adoc
+++ b/docs/modules/develop/pages/maps.adoc
@@ -1,6 +1,6 @@
 = Custom map providers
 
-Decidim can be configured to use multiple different xref:/docs/services/maps.adoc[map service providers] but it can be also extended to use any possible service provider out there.
+Decidim can be configured to use multiple different xref:services:maps.adoc[map service providers] but it can be also extended to use any possible service provider out there.
 
 If you want to create your own provider integration, you will need to find a service provider that provides all the following services:
 
@@ -12,12 +12,12 @@ on the proposal pages.
 This service is optional as Decidim will use the dynamic map tiles to generate a similar map element if the static map image cannot be provided.
 
 One option is to host some or all of these services yourself as there are open source alternatives available for all of these services.
-More information about self hosting is available at the link:/docs/services/maps.md#combining-multiple-service-providers[maps and geocoding configuration] documentation.
+More information about self hosting is available at the xref:services:maps.adoc#combining-multiple-service-providers[maps and geocoding configuration documentation].
 
-You may also decide to link:/docs/services/maps.md#disabling[disable some of the services] that are not available at your service provider but in order to get the full out of Decidim, it is recommended to find a service provider with all these services.
+You may also decide to xref:services:maps.adoc#disabling[disable some of the services] that are not available at your service provider but in order to get the full out of Decidim, it is recommended to find a service provider with all these services.
 
 In case you want to use different service providers for the different categories of map services, that is also possible.
-Instructions for this are provided in the link:/docs/services/maps.md#combining-multiple-service-providers[maps and geocoding configuration] documentation.
+Instructions for this are provided in the xref:services:maps.adoc#combining-multiple-service-providers[maps and geocoding configuration documentation].
 
 == Creating your own map service provider
 
@@ -312,7 +312,7 @@ For the dynamic map functionality, you should primarily use a service provider t
 You can also integrate to services that are not compatible with Leaflet but it will cause you more work and is not covered by this guide.
 
 Please note that you don't necessarily even need to create your own dynamic maps utility if your service provider is already compatible with the link:/decidim-core/lib/decidim/map/provider/dynamic_map/osm.rb[`Decidim::Map::Provider::DynamicMap::Osm`] provider.
-In order to configure your custom OSM compatible service provider take a look at the link:/docs/services/maps.md#configuring-open-street-maps-based-service-providers[maps and geocoding configuration] documentation.
+In order to configure your custom OSM compatible service provider take a look at the xref:services:maps.adoc#configuring-open-street-maps-based-service-providers[maps and geocoding configuration] documentation.
 
 If your service provider is not fully compatible with the default OSM provider, you can start writing your customizations by creating an empty dynamic map provider utility with the following code:
 
@@ -496,4 +496,4 @@ In this case, the static map utility can be empty as you won't need any customiz
 
 After you have finished all the steps shown above, you will need to configure your service provider for Decidim.
 The configuration key for the example service provider referred to in this documentation would be `:your_provider`.
-For configuration, refer to the xref:/docs/services/maps.adoc[maps and geocoding configuration] documentation.
+For configuration, refer to the xref:services:maps.adoc[maps and geocoding configuration documentation].
diff --git a/docs/modules/develop/pages/metrics.adoc b/docs/modules/develop/pages/metrics.adoc
index be0e2a7af14c7..2c2cc60d14bf2 100644
--- a/docs/modules/develop/pages/metrics.adoc
+++ b/docs/modules/develop/pages/metrics.adoc
@@ -117,3 +117,7 @@ Relations around `decidim_metrics` table:
                            | [polymorphic]  |
                            +----------------+
 ----
+
+== Troubleshooting
+
+If you find problems in your metrics numbers you can follow the guide xref:develop:troubleshooting_metrics.adoc[Troubleshooting metrics].
diff --git a/docs/modules/develop/pages/modules.adoc b/docs/modules/develop/pages/modules.adoc
index bc28128446eb0..804de0fbe8b11 100644
--- a/docs/modules/develop/pages/modules.adoc
+++ b/docs/modules/develop/pages/modules.adoc
@@ -101,7 +101,7 @@ the https://github.com/decidim/decidim/network/dependents[dependency graph]. See
   . Using the Admin panel
   . Generate logs on Admin panel if admins can operate on it
   . GraphQL API
-  . Data Portability
+  . Download your data
   . Endorsable
   . Followable
   . Embeddable
diff --git a/docs/modules/develop/pages/newsletter_templates.adoc b/docs/modules/develop/pages/newsletter_templates.adoc
index 1fc45b8fa2c1d..9cbe31f54dc4b 100644
--- a/docs/modules/develop/pages/newsletter_templates.adoc
+++ b/docs/modules/develop/pages/newsletter_templates.adoc
@@ -2,7 +2,7 @@
 
 The newsletter templates allow the user to select a template amongst a set of of them, and use it as base to send newsletters. This allow for more customization on newsletter, tematic newsletters, etc.
 
-Code-wise, they use the content blocks system internally, so https://github.com/decidim/decidim/blob/develop/docs/advanced/content_blocks.md[check the docs] for that section first.
+Code-wise, they use the content blocks system internally, so xref:develop:content_blocks.adoc[check the docs] for that section first.
 
 == Adding a new template
 
diff --git a/docs/modules/develop/pages/notifications.adoc b/docs/modules/develop/pages/notifications.adoc
index 81c9e48cb80c7..dfba943a5a863 100644
--- a/docs/modules/develop/pages/notifications.adoc
+++ b/docs/modules/develop/pages/notifications.adoc
@@ -41,7 +41,7 @@ data = {
   followers: [user3, user4]
 }
 
-Decidim::EventsManager.publish(data)
+Decidim::EventsManager.publish(**data)
 ----
 
 Both, `EmailNotificationGenerator` and `NotificationGenerator` are use the same arguments:
diff --git a/docs/modules/develop/pages/releases.adoc b/docs/modules/develop/pages/releases.adoc
index 7477df7c8c817..820ea6a709f40 100644
--- a/docs/modules/develop/pages/releases.adoc
+++ b/docs/modules/develop/pages/releases.adoc
@@ -8,7 +8,7 @@ Remember to follow the Gitflow branching workflow.
 
 . Go to develop with `git checkout develop`
 . Create the release branch `git checkout -b release/x.y-stable && git push origin release/x.y-stable`.
-. If required, add the release branch to Crowdin so that any pending translations will generate a PR to this branch.
+. If required, add the release branch to Crowdin so that any pending translations will generate a PR to this branch. This needs to be done with the generic user `decidim` in the GitHub's Crowdin integration, as this is the user that initially configured the installation and other admins in the Crowdin organization can't change it.
 
 Mark `develop` as the reference to the next release:
 
@@ -92,8 +92,9 @@ If this is a *Release Candidate version* release, the steps to follow are:
 . Run `bin/rake update_versions`, this will update all references to the new version.
 . Run `bin/rake bundle`, this will update all the `Gemfile.lock` files
 . Run `bin/rake webpack`, this will update the JavaScript bundle.
+. Run `bin/rspec`, this will check things like if all the officially supported languages translations are OK.
 . Commit all the changes: `git add . && git commit -m "Bump to rcXX version" && git push origin release/x.y-stable`.
-. Tag the release candidate with `git tag vX.Y.Z.rcN && git push origin vX.Y.Z.rcN`.
+. Run `git pull && bin/rake release_all`, this will create all the tags, push the commits and tags and release the gems to RubyGems.
 
 Usually, at this point, the release branch is deployed to Metadecidim during, at least, one week to validate the stability of the version.
 
diff --git a/docs/modules/develop/pages/reminders.adoc b/docs/modules/develop/pages/reminders.adoc
new file mode 100644
index 0000000000000..1c4f8ae90501e
--- /dev/null
+++ b/docs/modules/develop/pages/reminders.adoc
@@ -0,0 +1,138 @@
+= Reminders
+
+Reminders can be used to remind users about anything they need to know about regarding a specific component. It is assumed the reminders are always related to a component. Currently they are only implemented in the budgets component to remind users if they did not finish their vote but added something to their vote earlier.
+
+The automatic reminder generation should run once every day and the reminder generator will contain the logic that decides who to remind about what. The generator class will queue the reminders that need to be sent.
+
+* To run automatic reminder generator.
++
+[source,ruby]
+----
+bundle exec rake decidim:reminders:all
+----
+
+== Key concepts
+
+Reminders can be created either automatically or through an admin triggered action from the admin panel. For instance, we can send budgeting reminders automatically after two hours, one week and two weeks after voting has been started. If the admin wanted to remind all users at the start of final day of the voting, which would be two days after the last automatic reminder or 2.5 weeks after the voting start, they would have to trigger it manually or change the configuration of the budgeting reminder.
+
+The reminders are controlled by a generator class which generates the reminders to be sent. The generator controls how and when the reminders are generated as it can be very context specific when to send the reminders. For instance, in the budgeting component, we need to find all unfinished orders that have been started more than two hours ago and which have not been already reminded enough many times.
+
+Reminders are defined through their own manifests which defines the following parameters for the reminders:
+
+- The generator class which is used to run the logic for creating the reminders
+- The form class which is used for defining specific parameters for the view where admin users can manually trigger the reminders to be sent
+- The command class which will queue the reminders when admin triggers the reminders manually
+
+=== The reminder objects
+
+Reminders consist of the following database objects:
+
+- Reminder which holds the main reminder object that is attached to a user to be reminded about and the component for which the reminder is created for. The reminder can have many deliveries and many records to be reminded about.
+- ReminderDelivery which holds a log of all deliveries sent to the user. This may be useful in cases where we need to audit the system or solve a user support request asking why they were reminded for a specific thing at a specific time. In the backend, this also lets us do conditional logic based on how many times the user has been reminded and when the last reminder was sent.
+- ReminderRecord which holds information about the records the reminder is related to. This lets us combine reminders that are related to multiple records at a time, so that we don't need to send mulitple emails for each record. For example, the budgeting reminders will contain information about in which budgets the user has pending votes which allows us to combine this information in a single email, instead of sending one email per pending order in each budget.
+
+==== ReminderRecord states
+
+The ReminderRecord object holds a "state" attribute which tells whether the record is in one of the following states:
+
+- `active` - The reminder record is active for the reminder to be sent. Only active records should be included in the reminder.
+- `pending` - The reminder record is "pending" which means that the reminder should probably be sent soon but not for sure. For example, in the budgeting reminders the reminder record is "pending" if voting has been started but it has been started just a moment before automatically sending the reminders. In this situation, we would not want to remind the user if they started the voting process two minutes before the automatic reminder sending was run on the server.
+- `deleted` - The record has been "deleted", so it will not need any further reminders. We still keep the ReminderRecord in order to preserve the backlog about when the previous reminders were sent. For example, in the budgeting reminders, the ReminderRecord is related to a budgeting "order" (or vote) which can be deleted by the user, and therefore won't need any further reminders.
+- `completed` - The record has been "completed", so it will not need any further reminders. The reminders can be specific to the state of the remindable objects, so we change the ReminderRecord state to "completed" when the record will not need any further reminders. For example, in the budgeting reminders, we would not want to remind the user anymore if they completed their vote in a budget but they still have pending order in another budget that will still need further reminders. In this situation, we would want to include only the pending order in the further reminders, still keeping the backlog information about the previous reminders for the already completed budget order (vote).
+
+== Defining a reminder
+
+Reminders can be defined through initializers by defining calling the `registed` method on the reminders registry object at the Decidim main module as follows:
+
+[source,ruby]
+----
+Decidim.reminders_registry.register(:orders) do |reminder_registry|
+  reminder_registry.generator_class_name = "Decidim::YourModule::YourReminderGenerator"
+  reminder_registry.form_class_name = "Decidim::YourModule::Admin::YourReminderForm"
+  reminder_registry.command_class_name = "Decidim::YourModule::Admin::CreateYourReminders"
+
+  # The reminder settings object lets you define configurations that can be changed by the system administrators.
+  # For example, if you want to make the intervals configurable when the reminders will be sent, you can provide a
+  # configuration for that.
+  reminder_registry.settings do |settings|
+    # For example, if your reminder should be automatically sent three times at specific intervals
+    settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+  end
+
+  # The messages that will be shown for the reminder user interface if the admin wants to manually trigger the
+  # reminders. The title is shown at the top of the page and the description will be shown under it where you can
+  # provide information e.g. on how many reminders would be sent if the admin triggered the action.
+  reminder_registry.messages do |msg|
+    msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
+    msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+  end
+end
+----
+
+=== Defining a reminder generator
+
+The generator object holds the main logic for creating the reminders. You can see one example at `Decidim::Budgets::OrderReminderGenerator` which generates the reminders for the pending orders. Another example could be for the upcoming meetings that will be happening in the next two days which could be implemented by defining the following reminder generator:
+
+[source,ruby]
+----
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class is the generator class which creates and updates meeting related reminders,
+    # after reminder is generated it is send to user who are participating to upcoming meetings.
+    class MeetingReminderGenerator
+      attr_reader :reminder_jobs_queued
+
+      def initialize
+        @reminder_manifest = Decidim.reminders_registry.for(:meetings)
+        @reminder_jobs_queued = 0
+        @queued_reminders = []
+      end
+
+      # Creates reminders and updates them if they already exists.
+      def generate
+        Decidim::Component.where(manifest_name: "meetings").each do |component|
+          send_reminders(component)
+        end
+      end
+
+      # This can be called by the admin command that manually triggers the reminders.
+      def generate_for(component)
+        send_reminders(component)
+      end
+
+      private
+
+      attr_reader :reminder_manifest, :queued_reminders
+
+      def send_reminders(component)
+        # before_days could be provided as a configuration option, e.g. `2.days`
+        before_days = reminder_manifest.settings.attributes[:before_days]
+        Decidim::Meetings::Meeting.where(component: component).where(
+          "start_time >= ? AND start_time <= ?",
+          DateTime.now + before_days.days
+          DateTime.now + before_days.days + 1.day
+        ).each do |meeting|
+          Decidim::Meetings::Registration.where(meeting: meeting).each do |registration|
+            reminder = Decidim::Reminder.find_or_create_by(user: registration.user, component: component)
+            record = Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: meeting)
+            record.update(state: "active") unless record.active?
+            reminder.records << record
+            reminder.save!
+            next if queued_reminders.include?(reminder.id)
+
+            Decidim::Meetings::SendMeetingRemindersJob.perform_later(reminder)
+            @reminder_jobs_queued += 1
+            queued_reminders << reminder.id
+          end
+        end
+      end
+    end
+  end
+end
+----
+
+The `Decidim::Meetings::SendMeetingRemindersJob` would be responsible for delivering the emails for the upcoming meetings in the specified component.
+
+In addition, you need to create the Command and the Form objects to handle the manually triggered reminders from the admin panel in case you decide to implement these for the specified component. Please take example from `Decidim::Budgets::Admin::CreateOrderReminders` and `Decidim::Budgets::Admin::OrderReminderForm` to implement these. Also note that providing the admin triggered manual notifications is not necessary when you can omit creating these classes and the related view changes.
diff --git a/docs/modules/develop/pages/testing.adoc b/docs/modules/develop/pages/testing.adoc
index c084994ca7e1a..b1cb53eceab9e 100644
--- a/docs/modules/develop/pages/testing.adoc
+++ b/docs/modules/develop/pages/testing.adoc
@@ -1,6 +1,8 @@
 = How to test Decidim engines
 
-== Requirements
+== RSpec
+
+=== Requirements
 
 You need to create a dummy application to run your tests. Run the following command in the decidim root's folder:
 
@@ -9,7 +11,7 @@ You need to create a dummy application to run your tests. Run the following comm
 bundle exec rake test_app
 ----
 
-== Running a specific test file or just a single spec
+=== Running a specific test file or just a single spec
 
 If you are writing new specs, you can run the tests contained in a single file by opening a console window in the corresponding module and calling ``rspec``on the file. For example:
 
@@ -26,7 +28,14 @@ You can also run a single test by appending its start line number to the command
 bundle exec rspec spec/forms/participatory_process_form_spec.rb:134
 ----
 
-== Running tests for a specific component
+We also have a helper at `bin/rspec` that you can use to run a single spec from the command line:
+
+[source,bash]
+----
+bin/rspec decidim-participatory_processes/spec/forms/participatory_process_form_spec.rb
+----
+
+=== Running tests for a specific component
 
 A Decidim engine can be tested running the rake task named after it. For
 example, to test the proposals engine, you can run:
@@ -36,7 +45,7 @@ example, to test the proposals engine, you can run:
 bundle exec rake test_proposals
 ----
 
-== Running the whole test suite
+=== Running the whole test suite
 
 You can also run the full thing including test application generation and tests
 for all components by running
@@ -48,6 +57,59 @@ bundle exec rake test_all
 
 But beware, it takes a long time... :)
 
+=== Running specs in parallel
+
+We've configured the https://github.com/grosser/parallel_tests[parallel_tests gem]. For
+using it, you'll need to follow these steps:
+
+. Configure the TEST_ENV_NUMBER environment variable with the number of processes that you want to run in parallel.
+. Run the commands to prepare the test database
+
+[source,bash]
+----
+cd spec/decidim_dummy_app/
+bundle exec rake parallel:create
+bundle exec rake parallel:prepare
+cd -
+----
+
+From now on you can use the `bundle exec rake parallel:spec` task, for instance for running all
+the system specs from any module:
+
+[source,bash]
+----
+cd decidim-participatory_processes
+bundle exec rake parallel:spec[spec/system/]
+----
+
+This same commmand without the parallelization (`cd decidim-participatory_processes && bundle exec rspec spec/system/`)
+took 26 minutes 21 seconds. With parallel_specs, this runs in 10 minutes 27 seconds.
+
+[NOTE]
+-----
+These numbers are depend on your machine, the configuration was:
+* TEST_ENV_NUMBER=4
+* Intel(R) Core(TM) i5-6500T CPU @ 2.50GHz
+-----
+
+== Jest
+
+We use Jest for testing our Javascript code.
+
+=== Running a specific test file
+
+[source,bash]
+----
+npx jest decidim-core/app/packs/src/decidim/external_link.test.js
+----
+
+=== Running the whole test suite
+
+[source,bash]
+----
+npm run test
+----
+
 == Continuous integration
 
 The tests are also run when a new commit is added to the `develop` or releases
@@ -58,3 +120,5 @@ This means that the workflows defined for each module in the folder
 `.github/workflows/` should be always updated with the module's dependencies
 list. The script `.github/workflows/dependencies.sh` can be helpful to keep
 those files updated until we have an automatic process to do it.
+
+You can read more about the continuous integration configuration at https://github.com/decidim/decidim/blob/develop/.github/workflows/README.md[GitHub].
diff --git a/docs/modules/develop/pages/how_to_fix_metrics.adoc b/docs/modules/develop/pages/troubleshooting_metrics.adoc
similarity index 100%
rename from docs/modules/develop/pages/how_to_fix_metrics.adoc
rename to docs/modules/develop/pages/troubleshooting_metrics.adoc
diff --git a/docs/modules/install/pages/checklist.adoc b/docs/modules/install/pages/checklist.adoc
index fd0a02e35bdb7..51dc760ece48e 100644
--- a/docs/modules/install/pages/checklist.adoc
+++ b/docs/modules/install/pages/checklist.adoc
@@ -34,6 +34,6 @@ As a technopolitical project, Decidim needs several things to work. This is a no
 . Texts for at least, *terms of use, privacy policy and frequently asked questions*. To show the "Terms and conditions" body text in the "Sign Up Form", it is a requirement that the slug of this page to be equal `terms-and-conditions`.
 . Comply with your current *legal requirements*, like to registrate your privacy policy with the autorities (eg LOPD on Spain).
 . Fill the *Participatory Processes Configuration Form* to prepare your Participatory Process for Decidim.
-. Read the *https://decidim.org/docs/[Administration manual]*.
+. Read the *xref:admin:index.adoc[Administration manual]*.
 . Participate on *http://meta.decidim.org[MetaDecidim]*.
 . Read the Decidim *https://decidim.org/contract/[Social Contract]*.
diff --git a/docs/modules/install/pages/empty-database.adoc b/docs/modules/install/pages/empty-database.adoc
new file mode 100644
index 0000000000000..e744cd6aeb2aa
--- /dev/null
+++ b/docs/modules/install/pages/empty-database.adoc
@@ -0,0 +1,32 @@
+= Empty database installation
+
+You may want to setup your decidim with an empty database.
+In this case, please follow the steps bellow:
+
+. Follow steps 1 through 5 of previous section(xref:install:manual.adoc[Manual Installation] section).
+
+. Run the migrations from the root of your project in the terminal.
+[source,bash]
+----
+bin/rails db:create db:migrate
+----
+[start=3]
+. Now you need to create your admin user, in order to be able to login to the system. in the terminal type the following:
+[source,bash]
+----
+bundle exec rails s
+----
+[start=4]
+. Then you can create a system admin account to log in to the system panel with the following command:
+[source,bash]
+----
+bin/rails decidim_system:create_admin
+----
+
+Follow the CLI to create your admin user. For the sake of conformity with the rest of documentation, you may create a user with email `system@example.org` and password `decidim123456789`. Of course this is not recommended for a production environment as it isn't secure.
+
+Now, you will be able to login to the system panel with the provided credentials.
+
+== Extra notes
+
+The objective of decidim is to define an organizational and representation system capable of transforming into an autonomous entity or association from which the whole community participate. Therefore, creating the organizational account is centric part of the process (refer to xref:admin:system.adoc[System panel] for more information).
diff --git a/docs/modules/install/pages/index.adoc b/docs/modules/install/pages/index.adoc
index 47d2af812c486..7f78967e62315 100644
--- a/docs/modules/install/pages/index.adoc
+++ b/docs/modules/install/pages/index.adoc
@@ -27,12 +27,12 @@ You can see the xref:install:manual.adoc[official manual installation tutorial],
 
 === B. Installation script [experimental]
 
-There's also a installation script made by http://www.platoniq.net/[Platoniq] that allows you to install Decidim automatically. You can even check it on a Vagrant virtual machine if you want to. https://platoniq.github.io/decidim-install/script/[More information].
+There's also an installation script made by http://www.platoniq.net/[Platoniq] that allows you to install Decidim automatically. You can even check it on a Vagrant virtual machine if you want to. https://platoniq.github.io/decidim-install/script/[More information].
 
 [source,console]
 ----
 wget -O install-decidim.sh https://raw.githubusercontent.com/Platoniq/decidim-install/master/script/install-decidim.sh
-chmod +x decidim-install.sh
+chmod +x install-decidim.sh
 ./install-decidim.sh decidim_application
 ----
 
@@ -53,19 +53,19 @@ This will also create some default data so you can start testing the app:
 
 |Decidim::System::Admin
 |system@example.org
-|decidim123456
+|decidim123456789
 |/system
 |Administrator for the multitenant
 
 |Decidim::User
 |admin@example.org
-|decidim123456
+|decidim123456789
 |/admin
 |Administrator for the organization
 
 |Decidim::User
 |user@example.org
-|decidim123456
+|decidim123456789
 |/user/sign_in
 |User for the organization
 
@@ -86,7 +86,7 @@ Visit http://localhost:3000 to see your app running.
 
 == Configuration & setup
 
-Decidim comes pre-configured with some safe defaults, but can be changed through the `config/initializers/decidim.rb` file in your app. Check the comments there or read the comments in https://github.com/decidim/decidim/blob/develop/decidim-core/lib/decidim/core.rb[the source file] (the part with the `config_accessor` calls) for more up-to-date info.
+Decidim comes pre-configured with some safe defaults, but can be changed through xref:configure:environment_variables.adoc[Environment Variables] or the xref:configure:initializer.adoc[Initializer] file in your app.
 
 === Scheduled tasks
 
@@ -96,8 +96,8 @@ You can configure it with `crontab -e`, for instance if you've created your Deci
 
 [source,console]
 ----
-# Remove expired data portability files
-0 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:delete_data_portability_files
+# Remove expired download your data files
+0 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:delete_download_your_data_files
 
 # Compute metrics
 1 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:metrics:all
@@ -107,31 +107,40 @@ You can configure it with `crontab -e`, for instance if you've created your Deci
 
 # Delete old registrations forms
 3 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim_meetings:clean_registration_forms
+
+# Generate reminders
+4 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:reminders:all
+
+# Send notification mail digest daily
+5 0 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:mailers:notifications_digest_daily
+
+# Send notification mail digest weekly on saturdays
+5 0 * * 6 cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim:mailers:notifications_digest_weekly
 ----
 
 === Further configuration
 
-We also have other guides on how to configure some extra components:
+We also have other guides on how to configure some extra mandatory components:
 
 * xref:services:activejob.adoc[ActiveJob]: For background jobs (like sending emails).
-* xref:services:geocoding.adoc[Geocoding]: How to enable geocoding for proposals and meetings.
+* xref:services:maps.adoc[Maps]: How to enable geocoding for proposals and meetings.
+* xref:services:smtp.adoc[SMTP]: For sending emails for account registrations, password reminders, notifications, etc.
 * xref:services:social_providers.adoc[Social providers integration]: Enable sign up from social networks.
 
 == Deploy
 
-Once you've successfully deployed your app to your favorite platform, you'll need to create your `System` user. First you'll need to create your `Decidim::System` user in your production Ruby on Rails console:
+Once you've successfully deployed your app to your favorite platform, you'll need to create your `System` user. First you'll need to create your `Decidim::System` user in your terminal:
 
-[source,ruby]
+[source,console]
 ----
-email = <your email>
-password = <a secure password>
-user = Decidim::System::Admin.new(email: email, password: password, password_confirmation: password)
-user.save!
+bin/rails decidim_system:create_admin
 ----
 
+You'll be asked for an email and a password. For security, the password will not get displayed back at you and you'll need to confirm it.
+
 This will create a system user with the email and password you set. We recommend using a random password generator and saving it to a password manager, so you have a more secure login.
 
-Then, visit the `/system` dashboard and login with the email and passwords you just entered and create your organization. You're done! :tada:
+Then, visit the `/system` dashboard and login with the email and passwords you just entered and create your organization. You're done! 🎉
 
 You can check the https://github.com/decidim/decidim/tree/develop/decidim-system/README.md[`decidim-system` README file] for more info on how organizations work.
 
diff --git a/docs/modules/install/pages/manual.adoc b/docs/modules/install/pages/manual.adoc
index 67bb9e4f35902..ddb93bebec43c 100644
--- a/docs/modules/install/pages/manual.adoc
+++ b/docs/modules/install/pages/manual.adoc
@@ -2,15 +2,15 @@
 
 In order to develop on decidim, you'll need:
 
-* *Git* 2.15+
-* *PostgreSQL* 12.7+
-* *Ruby* 2.7.5
-* *NodeJS* 16.9.x
-* *Npm* 7.21.x
+* *Git* 2.34+
+* *PostgreSQL* 14.5+
+* *Ruby* 3.0.2
+* *NodeJS* 16.18.x
+* *Npm* 8.19.x
 * *ImageMagick*
 * *Chrome* browser and https://sites.google.com/a/chromium.org/chromedriver/[chromedriver].
 
-We're starting with an Ubuntu 20.04.2 LTS. This is an opinionated guide, so you're free to use the technology that you are most comfortable. If you have any doubts and you're blocked you can go and ask on https://matrix.to/#/#decidimdevs:matrix.org[our Matrix.org chat room for developers].
+We're starting with an Ubuntu 22.04.1 LTS. This is an opinionated guide, so you're free to use the technology that you are most comfortable. If you have any doubts and you're blocked you can go and ask on https://matrix.to/#/#decidimdevs:matrix.org[our Matrix.org chat room for developers].
 
 We recommend to have at least some basic proficiency in Ruby on Rails (a good starting point is http://guides.rubyonrails.org/getting_started.html[Getting Started with Ruby on Rails]) and have some knowledge on how gems work.
 
@@ -18,7 +18,7 @@ In this guide, we'll see how to install rbenv, PostgreSQL, Node.js and, Decidim,
 
 == 1. Installing rbenv
 
-First, we're going to install https://github.com/rbenv/rbenv[rbenv], for managing various ruby versions. You could also use https://rvm.io/[rvm] or https://github.com/asdf-vm/asdf[asdf] as alternatives on this step. Mind that at the moment, Decidim isn't compatible with Ruby 3.0.
+First, we're going to install https://github.com/rbenv/rbenv[rbenv], for managing various ruby versions. You could also use https://rvm.io/[rvm] or https://github.com/asdf-vm/asdf[asdf] as alternatives on this step.
 
 [source,bash]
 ----
@@ -29,8 +29,8 @@ echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
 echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 source ~/.bashrc
 git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-rbenv install 2.7.5
-rbenv global 2.7.5
+rbenv install 3.0.2
+rbenv global 3.0.2
 ----
 
 == 2. Installing PostgreSQL
@@ -113,15 +113,19 @@ Be careful where you put the `.rbenv-vars` file, as if you put it in the same fo
 
 == 6. Initializing your app for local development
 
-We should now create your database:
-
+We should now create your database. For a first local installation, we recommend to start with some example contents (also known as seeds).
 [source,bash]
 ----
 bin/rails db:create db:migrate
 bin/rails db:seed
 ----
 
-This will also create some default data so you can start testing the app, with an administrator account with email admin@example.org and password `decidim123456`
+[NOTE]
+====
+Please refer to xref:install:empty-database.adoc[Empty database installation] section if you want to setup your instance on an empty database (without any seeds)
+====
+
+This will also create some default data so you can start testing the app, with an administrator account with email admin@example.org and password `decidim123456789`
 
 == 7. Start your web server
 
@@ -143,8 +147,8 @@ With these steps you would only have an initial installation for trying Decidim,
 
 Other user accounts that you'll have in the seeds are:
 
-* To participate as a regular user, with email `user@example.org` and password `decidim123456`.
-* To manage the Multitenant and being able to log in at `/system`, with email `system@example.org` and password `decidim123456`.
+* To participate as a regular user, with email `user@example.org` and password `decidim123456789`.
+* To manage the Multitenant and being able to log in at `/system`, with email `system@example.org` and password `decidim123456789`.
 
 The seed data won't be created in production environments, if you still want to do it (for instance, for a Demo or Staging server), run:
 
diff --git a/docs/modules/install/pages/update.adoc b/docs/modules/install/pages/update.adoc
index e544f70a34d6f..d344dc9400a61 100644
--- a/docs/modules/install/pages/update.adoc
+++ b/docs/modules/install/pages/update.adoc
@@ -4,7 +4,7 @@ IMPORTANT: This section was initially copied from https://platoniq.github.io/dec
 
 Because Decidim is a gem in our system, to update it we will have to edit our `Gemfile` and specify the new version number.
 
-To keep our system up to date, we can visit the page https://github.com/decidim/decidim/releases and compare with our `Gemfile`. See if the lines specifying the gem called "decidim-something" are followed by the number corresponding to the latest release:
+To keep our system up to date, we can visit the page https://github.com/decidim/decidim/releases[Releases] and compare with our `Gemfile`. See if the lines specifying the gem called "decidim-something" are followed by the number corresponding to the latest release:
 
 [source,ruby]
 ----
@@ -91,5 +91,5 @@ gem "decidim-dev", DECIDIM_VERSION
 
 . Make a full backup of the database before updating, just in case something unexpected happens.
 . If you are more than update away. Always update from one version to the immediately next one and then repeat the process until you are up to date.
-. Always check the instructions for a certain version upgrade in https://github.com/decidim/decidim/releases. Some releases require to perform certain actions as they may change some database structures. Follow that instructions if you are affected.
-. Check also the file https://github.com/decidim/decidim/blob/develop/CHANGELOG.md It may have relevant information for updates between versions.
+. Always check the instructions for a certain version upgrade in https://github.com/decidim/decidim/releases[Releases]. Some releases require to perform certain actions as they may change some database structures. Follow that instructions if you are affected.
+. Check also the file https://github.com/decidim/decidim/blob/develop/CHANGELOG.md[CHANGELOG] It may have relevant information for updates between versions.
diff --git a/docs/modules/services/pages/index.adoc b/docs/modules/services/pages/index.adoc
new file mode 100644
index 0000000000000..eeb1d9fe5772c
--- /dev/null
+++ b/docs/modules/services/pages/index.adoc
@@ -0,0 +1,12 @@
+= Services
+
+There are multiple services that can be enabled in a Decidim installation. It's important to note that the only mandatory services are the xref:services:activejob.adoc[Active Job] queue and the xref:services:smtp.adoc[SMTP] server. The others are optional and depend on your specific usecase.
+
+* xref:services:activejob.adoc[Active Job]
+* xref:services:elections_bulletin_board.adoc[Elections Bulletin Board]
+* xref:services:etherpad.adoc[Etherpad]
+* xref:services:maps.adoc[Maps]
+* xref:services:sms.adoc[SMS]
+* xref:services:smtp.adoc[SMTP]
+* xref:services:social_providers.adoc[Social Providers]
+
diff --git a/docs/modules/services/pages/maps.adoc b/docs/modules/services/pages/maps.adoc
index 8a784d19883da..6d081b3534942 100644
--- a/docs/modules/services/pages/maps.adoc
+++ b/docs/modules/services/pages/maps.adoc
@@ -14,7 +14,7 @@ Decidim has built-in support for the following map service providers:
  ** As an alternative, you may also want to use your own self-hosted map servers (see <<hosting-your-own-map-services,Hosting your own map services>> for more information)
  ** <<configuring-open-street-maps-based-service-providers,Configuring Open Street Maps based service providers>>
 
-If you want to integrate Decidim to some other map service provider, read how to xref:/docs/customization/maps.adoc[write your own integration code] for that.
+If you want to integrate Decidim to some other map service provider, read how to xref:develop:maps.adoc[write your own integration code] for that.
 
 == Configuring maps and geocoding
 
@@ -223,7 +223,7 @@ config.maps = {
 
 === Integrating with a new service provider
 
-If you want to integrate the map functionality with a new service provider, take a look at the xref:/docs/customization/maps.adoc[Custom map providers] documentation.
+If you want to integrate the map functionality with a new service provider, take a look at the xref:develop:maps.adoc[Custom map providers] documentation.
 
 == Enabling maps and geocoding
 
diff --git a/docs/modules/services/pages/sms.adoc b/docs/modules/services/pages/sms.adoc
new file mode 100644
index 0000000000000..ec0dc65ef0e46
--- /dev/null
+++ b/docs/modules/services/pages/sms.adoc
@@ -0,0 +1,32 @@
+= SMS
+
+If you want to verify your users by sending a verification code via SMS you need to provide a SMS gateway service class through the xref:configure:initializer.adoc[initializer].
+
+This service can also be used by some spaces (such as xref:admin:spaces/votings.adoc[Votings]), and external modules could use it too.
+
+An example class would be something like:
+
+[source,ruby]
+....
+class MySMSGatewayService
+  attr_reader :mobile_phone_number, :code
+  def initialize(mobile_phone_number, code)
+    @mobile_phone_number = mobile_phone_number
+    @code = code
+  end
+  def deliver_code
+    # Actual code to deliver the code
+    true
+  end
+end
+....
+
+Then you'll need to configure it in the Decidim initializer:
+
+[source,ruby]
+....
+  config.sms_gateway_service = "MySMSGatewayService"
+....
+
+You can find an example on how this is set up at https://github.com/AjuntamentdeBarcelona/decidim-barcelona/blob/672f5a8938d884940899b4304f0a17e25d42d2a0/app/services/sms_gateway.rb[DecidimBarcelona's app/services/sms_gateway.rb]. Your final implementation will depend on how your SMS provider works.
+
diff --git a/lib/decidim/gem_manager.rb b/lib/decidim/gem_manager.rb
index f742ed283b9a0..dd2ed4d910172 100644
--- a/lib/decidim/gem_manager.rb
+++ b/lib/decidim/gem_manager.rb
@@ -48,9 +48,9 @@ def run(command, out: $stdout)
       end
     end
 
-    def capture(command)
+    def capture(command, env: {}, with_stderr: true)
       interpolated_in_folder(command) do |cmd|
-        self.class.capture(cmd)
+        self.class.capture(cmd, env: env, with_stderr: with_stderr)
       end
     end
 
@@ -79,8 +79,10 @@ def short_name
     end
 
     class << self
-      def capture(cmd, env: {})
-        Open3.capture2e(env, cmd)
+      def capture(cmd, env: {}, with_stderr: true)
+        return Open3.capture2e(env, cmd) if with_stderr
+
+        Open3.capture2(env, cmd)
       end
 
       def run(cmd, out: $stdout)
@@ -164,7 +166,7 @@ def version
       def replace_file(name, regexp, replacement)
         new_content = File.read(name).gsub(regexp, replacement)
 
-        File.open(name, "w") { |f| f.write(new_content) }
+        File.write(name, new_content)
       end
 
       def all_dirs(include_root: true)
diff --git a/lib/decidim/version.rb b/lib/decidim/version.rb
index 2bcc88ede72ff..413c4e38de620 100644
--- a/lib/decidim/version.rb
+++ b/lib/decidim/version.rb
@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.26.4"
+    "0.27.2"
   end
 end
diff --git a/lib/tasks/decidim_tasks.rake b/lib/tasks/decidim_tasks.rake
index 6e3190ef37d85..58a012a624d3a 100644
--- a/lib/tasks/decidim_tasks.rake
+++ b/lib/tasks/decidim_tasks.rake
@@ -25,7 +25,7 @@ namespace :decidim do
             # Successful compilation!
             puts "SUCCESS"
             Dir.chdir(File.join(__dir__, "../..")) do
-              system "cp -r public/* #{Rails.root.join("public")}"
+              system "cp -r public/* #{Rails.public_path}"
             end
           else
             # Failed compilation
@@ -54,7 +54,7 @@ def enhance_assets_precompile
 end
 
 # Compile packs after we've compiled all other assets during precompilation
-skip_webpacker_precompile = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
+skip_webpacker_precompile = %w(no false n f).include?(ENV.fetch("WEBPACKER_PRECOMPILE", nil))
 
 unless skip_webpacker_precompile
   if Rake::Task.task_defined?("assets:precompile")
diff --git a/package-lock.json b/package-lock.json
index 9d5beaabb0b6e..f6644d05168fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,35 +25,47 @@
         "yaml-jest": "^1.0.5"
       },
       "engines": {
-        "node": "^16.9.1",
-        "npm": "^7.21.1"
+        "node": ">=16.9.1",
+        "npm": ">=7.21.1"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.1.2",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@apollo/client": {
-      "version": "3.3.20",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.20.tgz",
-      "integrity": "sha512-hS7UmBwJweudw/J3M0RAcusMHNiRuGqkRH6g91PM2ev8cXScIMdXr/++9jo7wD1nAITMCMF4HQQ3LFaw/Or0Bw==",
+      "version": "3.5.10",
+      "integrity": "sha512-tL3iSpFe9Oldq7gYikZK1dcYxp1c01nlSwtsMz75382HcI6fvQXyFXUCJTTK3wgO2/ckaBvRGw7VqjFREdVoRw==",
       "dependencies": {
         "@graphql-typed-document-node/core": "^3.0.0",
-        "@types/zen-observable": "^0.8.0",
         "@wry/context": "^0.6.0",
         "@wry/equality": "^0.5.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graphql-tag": "^2.12.0",
+        "@wry/trie": "^0.3.0",
+        "graphql-tag": "^2.12.3",
         "hoist-non-react-statics": "^3.3.2",
-        "optimism": "^0.16.0",
+        "optimism": "^0.16.1",
         "prop-types": "^15.7.2",
         "symbol-observable": "^4.0.0",
-        "ts-invariant": "^0.7.0",
-        "tslib": "^1.10.0",
-        "zen-observable": "^0.8.14"
+        "ts-invariant": "^0.9.4",
+        "tslib": "^2.3.0",
+        "zen-observable-ts": "^1.2.0"
       },
       "peerDependencies": {
-        "graphql": "^14.0.0 || ^15.0.0",
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+        "graphql-ws": "^5.5.5",
         "react": "^16.8.0 || ^17.0.0",
-        "subscriptions-transport-ws": "^0.9.0"
+        "subscriptions-transport-ws": "^0.9.0 || ^0.11.0"
       },
       "peerDependenciesMeta": {
+        "graphql-ws": {
+          "optional": true
+        },
         "react": {
           "optional": true
         },
@@ -62,50 +74,49 @@
         }
       }
     },
-    "node_modules/@apollo/client/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    "node_modules/@apollo/client/node_modules/symbol-observable": {
+      "version": "4.0.0",
+      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
+      "engines": {
+        "node": ">=0.10"
+      }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.16.7",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "version": "7.17.0",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
+      "version": "7.17.5",
+      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helpers": "^7.17.2",
+        "@babel/parser": "^7.17.3",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -116,9 +127,8 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.5.tgz",
-      "integrity": "sha512-20BlOHuGf3UXS7z1QPyllM9Gz8SEgcp/UcKeUmdHIFZO6HF1n+3KaLpeyfwWvjY/Os/ynPX3k8qXE/nZ5dw/0g==",
+      "version": "7.17.0",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "dependencies": {
         "eslint-scope": "^5.1.1",
         "eslint-visitor-keys": "^2.1.0",
@@ -129,15 +139,14 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.11.0",
-        "eslint": ">=7.5.0"
+        "eslint": "^7.5.0 || ^8.0.0"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
+      "version": "7.17.3",
+      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
       "dependencies": {
-        "@babel/types": "^7.15.0",
+        "@babel/types": "^7.17.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -146,36 +155,33 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
+      "version": "7.16.7",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
+      "version": "7.16.7",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
+      "version": "7.16.7",
+      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
       "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "@babel/compat-data": "^7.16.4",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -186,16 +192,16 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==",
+      "version": "7.17.6",
+      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -205,12 +211,11 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "version": "7.17.0",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -219,22 +224,9 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-define-map": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.14.5.tgz",
-      "integrity": "sha512-spfQRnoChdYWwyFetQDBSDBgH42VskaquRI52kbLei5MjV7s3NPq30/sh2S3YdT20Ku/ZpaNnTVgmDo20NWylg==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+      "version": "0.3.1",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.13.0",
         "@babel/helper-module-imports": "^7.12.13",
@@ -249,220 +241,212 @@
         "@babel/core": "^7.4.0-0"
       }
     },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+      "version": "7.16.7",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
+      "version": "7.16.7",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
       "dependencies": {
-        "@babel/types": "^7.15.0"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
+      "version": "7.17.6",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+      "version": "7.16.7",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
+      "version": "7.16.8",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
+      "version": "7.16.7",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
+      "version": "7.16.7",
+      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
       "dependencies": {
-        "@babel/types": "^7.14.8"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
+      "version": "7.16.0",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+      "version": "7.16.7",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "version": "7.16.7",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
+      "version": "7.16.8",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
-      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
+      "version": "7.17.2",
+      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
       "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "version": "7.16.10",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -471,9 +455,8 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
-      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
+      "version": "7.17.3",
+      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -481,14 +464,26 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -498,12 +493,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
+      "version": "7.16.8",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -514,12 +508,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "version": "7.16.7",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -529,12 +522,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==",
+      "version": "7.17.6",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -545,11 +537,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "version": "7.16.7",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
@@ -560,11 +551,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "version": "7.16.7",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
@@ -575,11 +565,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
@@ -590,11 +579,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "version": "7.16.7",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -605,11 +593,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "version": "7.16.7",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -620,11 +607,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "version": "7.16.7",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
@@ -635,15 +621,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "version": "7.17.3",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
       "dependencies": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+        "@babel/plugin-transform-parameters": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -653,11 +638,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
@@ -668,12 +652,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -684,12 +667,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "version": "7.16.11",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -699,13 +681,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -716,12 +697,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=4"
@@ -732,7 +712,6 @@
     },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -743,7 +722,6 @@
     },
     "node_modules/@babel/plugin-syntax-bigint": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
       "dependencies": {
@@ -755,7 +733,6 @@
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
@@ -766,7 +743,6 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -780,7 +756,6 @@
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -791,7 +766,6 @@
     },
     "node_modules/@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -802,7 +776,6 @@
     },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
       "dependencies": {
@@ -814,7 +787,6 @@
     },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -824,11 +796,10 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
+      "version": "7.16.7",
+      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -839,7 +810,6 @@
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -850,7 +820,6 @@
     },
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -861,7 +830,6 @@
     },
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -872,7 +840,6 @@
     },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -883,7 +850,6 @@
     },
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -894,7 +860,6 @@
     },
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -905,7 +870,6 @@
     },
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -919,7 +883,6 @@
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -931,12 +894,25 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "version": "7.16.7",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -946,13 +922,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+      "version": "7.16.8",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -962,11 +937,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -976,11 +950,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.16.7",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -990,16 +963,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
+      "version": "7.16.7",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1010,11 +983,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "version": "7.16.7",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1024,11 +996,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "version": "7.17.3",
+      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1038,12 +1009,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "version": "7.16.7",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1053,11 +1023,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "version": "7.16.7",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1067,12 +1036,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "version": "7.16.7",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1082,11 +1050,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
+      "version": "7.16.7",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1096,12 +1063,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1111,11 +1078,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "version": "7.16.7",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1125,11 +1091,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "version": "7.16.7",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1139,12 +1104,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "version": "7.16.7",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1155,13 +1119,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz",
-      "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==",
+      "version": "7.16.8",
+      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1172,14 +1135,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
+      "version": "7.16.7",
+      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
@@ -1190,12 +1152,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "version": "7.16.7",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1205,11 +1166,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "version": "7.16.8",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1219,11 +1179,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1233,12 +1192,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "version": "7.16.7",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1248,11 +1206,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
+      "version": "7.16.7",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1262,26 +1219,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-mutators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.14.5.tgz",
-      "integrity": "sha512-J/KZdYrLy/mugVWk7Q/him83ba0QGI8twLgov130GGerT6UKrNHeSnZANp96H4S6VOecy2S/9rhH4j8nCauoSw==",
+      "version": "7.16.7",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dependencies": {
-        "@babel/helper-define-map": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1291,11 +1232,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz",
-      "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1305,15 +1245,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz",
-      "integrity": "sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==",
+      "version": "7.17.3",
+      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-jsx": "^7.16.7",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1323,11 +1262,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1337,12 +1275,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1352,9 +1289,8 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "version": "7.16.7",
+      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
       "dependencies": {
         "regenerator-transform": "^0.14.2"
       },
@@ -1366,11 +1302,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "version": "7.16.7",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,15 +1315,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz",
-      "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
+      "version": "7.17.0",
+      "integrity": "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1399,11 +1333,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "version": "7.16.7",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1413,12 +1346,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "version": "7.16.7",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1428,11 +1360,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "version": "7.16.7",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1442,11 +1373,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "version": "7.16.7",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1456,11 +1386,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "version": "7.16.7",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1470,11 +1399,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "version": "7.16.7",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1484,12 +1412,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "version": "7.16.7",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1499,30 +1426,30 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
-      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
-      "dependencies": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.14.5",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+      "version": "7.16.11",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "dependencies": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
@@ -1537,44 +1464,44 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.14.5",
-        "@babel/plugin-transform-classes": "^7.14.9",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.14.5",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.14.5",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1585,9 +1512,8 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -1600,16 +1526,15 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+      "version": "7.16.7",
+      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1619,9 +1544,8 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+      "version": "7.17.2",
+      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -1630,13 +1554,11 @@
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz",
-      "integrity": "sha512-cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg==",
+      "version": "7.17.2",
+      "integrity": "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "core-js-pure": "^3.14.0",
+        "core-js-pure": "^3.20.2",
         "regenerator-runtime": "^0.13.4"
       },
       "engines": {
@@ -1644,30 +1566,29 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+      "version": "7.16.7",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
+      "version": "7.17.3",
+      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.3",
+        "@babel/types": "^7.17.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1676,11 +1597,10 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "version": "7.17.0",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1689,13 +1609,11 @@
     },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
     "node_modules/@cnakazawa/watch": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
       "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
       "dev": true,
       "dependencies": {
@@ -1709,12 +1627,175 @@
         "node": ">=0.1.95"
       }
     },
-    "node_modules/@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
+    "node_modules/@codemirror/highlight": {
+      "version": "0.19.7",
+      "integrity": "sha512-3W32hBCY0pbbv/xidismw+RDMKuIag+fo4kZIbD7WoRj+Ttcaxjf+vP6RttRHXLaaqbWh031lTeON8kMlDhMYw==",
+      "dependencies": {
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/rangeset": "^0.19.0",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "node_modules/@codemirror/language": {
+      "version": "0.19.7",
+      "integrity": "sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q==",
+      "dependencies": {
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.5",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "node_modules/@codemirror/rangeset": {
+      "version": "0.19.8",
+      "integrity": "sha512-1vusIkxSD0vK5KQ22JO/4Ejfww5268PgM/CpKNBSpTpWZEFlZbmOPyRiY4HXO2oEzOpypbA/walMiNInWnrT0Q==",
+      "dependencies": {
+        "@codemirror/state": "^0.19.0"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "0.19.9",
+      "integrity": "sha512-psOzDolKTZkx4CgUqhBQ8T8gBc0xN5z4gzed109aF6x7D7umpDRoimacI/O6d9UGuyl4eYuDCZmDFr2Rq7aGOw==",
+      "dependencies": {
+        "@codemirror/text": "^0.19.0"
+      }
+    },
+    "node_modules/@codemirror/stream-parser": {
+      "version": "0.19.6",
+      "integrity": "sha512-dmPtoz/MR3IphxAsgywEyvSjOJCb2ikAgqp6BGIlwBEJVRiap0wFK4b3f/3DKIHUG4GezWRYQumXNyb3GNQevw==",
+      "dependencies": {
+        "@codemirror/highlight": "^0.19.0",
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "node_modules/@codemirror/text": {
+      "version": "0.19.6",
+      "integrity": "sha512-T9jnREMIygx+TPC1bOuepz18maGq/92q2a+n4qTqObKwvNMg+8cMTslb8yxeEDEq7S3kpgGWxgO1UWbQRij0dA=="
+    },
+    "node_modules/@codemirror/view": {
+      "version": "0.19.45",
+      "integrity": "sha512-wR19UBYvJMeV9axa5Xo6ATbAP1jl30BPFZ5buu3cJjYXwlRhJDjzw2wUbxk1zsR1LtAe5jrRNeWEtGA+IPacxw==",
+      "dependencies": {
+        "@codemirror/rangeset": "^0.19.5",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/text": "^0.19.0",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.0.2",
+      "integrity": "sha512-uayvFqfa0hITPwVduxRYNL9YBD/anTqula0tu2llalaxblEd7QPuETSN3gB5PvTYxSfd0d8kS4Fypgo5JaUJ6A==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.0",
+      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.0",
+      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.0",
+      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.0",
+      "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.0",
+      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.0.1",
+      "integrity": "sha512-Bnly2FWWSTZX20hDJLYHpurhp1ot+ZGvojLOsrHa9frzOVruOv4oPYMZ6wQomi9KsbZZ+Af/CuRYaGReTyGtEg==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.2.0",
+      "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
     "node_modules/@decidim/browserslist-config": {
@@ -1726,9 +1807,9 @@
       "link": true
     },
     "node_modules/@decidim/decidim-bulletin_board": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.22.3.tgz",
-      "integrity": "sha512-LN7wIK9IB9Zegr++fvEY2vAWdUvReLPCe3sbPMGadX3b2aurrx/SK3B38OfRdN2eqblksMzyNYtXALszA9dU2w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.23.0.tgz",
+      "integrity": "sha512-kCFVv8bgq5+7cizkS+PchiWczsmsFAqQ4phbDm99xA+wz0Rq0iG4SpkNij5Xin0bvGDdVOQ1sU5HPlIePheEZQ==",
       "dependencies": {
         "@apollo/client": "^3.2.7",
         "core-js": "^3.8.3",
@@ -1740,6 +1821,13 @@
         "webpack-cli": "^4.2.0"
       }
     },
+    "node_modules/@decidim/decidim-bulletin_board/node_modules/graphql": {
+      "version": "15.8.0",
+      "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/@decidim/dev": {
       "resolved": "packages/dev",
       "link": true
@@ -1757,32 +1845,46 @@
       "link": true
     },
     "node_modules/@decidim/voting_schemes-dummy": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.22.3.tgz",
-      "integrity": "sha512-Z5CwSUJNYW2KkoE5anAqAIwHnQHqpgGL4Xu2I7YqEn3thThlbWlY9U9Eq0O6fq7/pfBQLiAFFiBBAnCDv0HC2g=="
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.23.0.tgz",
+      "integrity": "sha512-pTXJm6HsL4RmuR9TfKih8iShUk5WK6jZBUESl+T+XDXs4x60Sxi8xJ8GxUb+keTUgYG3hecYnlPez9Okc4WYqw=="
     },
     "node_modules/@decidim/voting_schemes-electionguard": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.22.3.tgz",
-      "integrity": "sha512-RZn/1GO5PM6a2SuN8h/SoS4EeLYnHPWw6/tl2M26ms/Xzf1ewJIgBSiByxk4qHoqvE892rccH4+G56h6iVrIqg=="
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.23.0.tgz",
+      "integrity": "sha512-o5/UXRc6v0Cp2BG/MtNpVAEtyNO3VdfFjJSX75E5W7G2yIu7na+D1HZyHyqIk1rgHPqdJmdg0DT7JI16fDcbXQ=="
     },
     "node_modules/@decidim/webpacker": {
       "resolved": "packages/webpacker",
       "link": true
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "version": "0.5.6",
+      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
-      "peer": true,
+    "node_modules/@endemolshinegroup/cosmiconfig-typescript-loader": {
+      "version": "3.0.2",
+      "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==",
+      "dependencies": {
+        "lodash.get": "^4",
+        "make-error": "^1",
+        "ts-node": "^9",
+        "tslib": "^2"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "cosmiconfig": ">=6"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1798,10 +1900,17 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1813,9 +1922,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "peer": true,
       "engines": {
@@ -1826,77 +1946,282 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "0.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
-      "integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==",
+      "version": "0.3.0",
+      "integrity": "sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w==",
+      "deprecated": "Please upgrade to 6.1.0. https://fontawesome.com/docs/changelog/",
       "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz",
-      "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==",
+      "version": "1.3.0",
+      "integrity": "sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg==",
+      "deprecated": "Please upgrade to 6.1.0. https://fontawesome.com/docs/changelog/",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.3.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-regular-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==",
+      "version": "5.15.4",
+      "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/@fortawesome/free-regular-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@fortawesome/free-solid-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==",
+      "version": "5.15.4",
+      "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
       "hasInstallScript": true,
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/@fortawesome/free-solid-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@graphiql/toolkit": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.2.2.tgz",
-      "integrity": "sha512-kDgYhqnS4p4LqSo1KvLd3tbX8Hhdj0ZrgQuGsosjjEnahiPYmmylxUL1p9lj6348OsypcTlCncGpEjeb9S3TiQ==",
+      "version": "0.4.2",
+      "integrity": "sha512-14uG67QrONbRrhXwvBJFsMfcQfexmGhj7dgkputesx9xuPUkcCDNmVULnVA8sGYt8P/rSvjkfQYx3rtfW+GhAQ==",
       "dependencies": {
-        "@n1ru4l/push-pull-async-iterable-iterator": "^2.1.4",
-        "graphql-ws": "^4.3.2",
+        "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0",
         "meros": "^1.1.4"
       },
-      "optionalDependencies": {
-        "subscriptions-transport-ws": "^0.9.18"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0",
+        "graphql-ws": ">= 4.5.0"
+      }
+    },
+    "node_modules/@graphql-tools/batch-execute": {
+      "version": "8.3.2",
+      "integrity": "sha512-ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/delegate": {
+      "version": "8.5.1",
+      "integrity": "sha512-/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw==",
+      "dependencies": {
+        "@graphql-tools/batch-execute": "^8.3.2",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "graphql-executor": "0.0.18",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/graphql-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg==",
+      "dependencies": {
+        "@graphql-tools/import": "^6.6.6",
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/import": {
+      "version": "6.6.6",
+      "integrity": "sha512-a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w==",
+      "dependencies": {
+        "@graphql-tools/utils": "8.6.2",
+        "resolve-from": "5.0.0",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/json-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/load": {
+      "version": "7.5.2",
+      "integrity": "sha512-URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g==",
+      "dependencies": {
+        "@graphql-tools/schema": "8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "p-limit": "3.1.0",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/merge": {
+      "version": "8.2.3",
+      "integrity": "sha512-XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw==",
+      "dependencies": {
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/schema": {
+      "version": "8.3.2",
+      "integrity": "sha512-77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg==",
+      "dependencies": {
+        "@graphql-tools/merge": "^8.2.3",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/url-loader": {
+      "version": "7.7.2",
+      "integrity": "sha512-7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA==",
+      "dependencies": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/utils": "^8.6.2",
+        "@graphql-tools/wrap": "^8.4.2",
+        "@n1ru4l/graphql-live-query": "^0.9.0",
+        "@types/websocket": "^1.0.4",
+        "@types/ws": "^8.0.0",
+        "cross-undici-fetch": "^0.1.19",
+        "dset": "^3.1.0",
+        "extract-files": "^11.0.0",
+        "graphql-sse": "^1.0.1",
+        "graphql-ws": "^5.4.1",
+        "isomorphic-ws": "^4.0.1",
+        "meros": "^1.1.4",
+        "subscriptions-transport-ws": "^0.11.0",
+        "sync-fetch": "^0.3.1",
+        "tslib": "^2.3.0",
+        "valid-url": "^1.0.9",
+        "value-or-promise": "^1.0.11",
+        "ws": "^8.3.0"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/url-loader/node_modules/ws": {
+      "version": "8.5.0",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@graphql-tools/utils": {
+      "version": "8.6.2",
+      "integrity": "sha512-x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA==",
+      "dependencies": {
+        "tslib": "~2.3.0"
       },
       "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@graphql-tools/wrap": {
+      "version": "8.4.2",
+      "integrity": "sha512-U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ==",
+      "dependencies": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
     "node_modules/@graphql-typed-document-node/core": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz",
-      "integrity": "sha512-wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg==",
+      "version": "3.1.1",
+      "integrity": "sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==",
       "peerDependencies": {
-        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "peer": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "dependencies": {
@@ -1910,9 +2235,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "engines": {
@@ -1921,7 +2265,6 @@
     },
     "node_modules/@jest/console": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
       "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "dependencies": {
@@ -1938,7 +2281,6 @@
     },
     "node_modules/@jest/console/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -1952,9 +2294,8 @@
       }
     },
     "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -1969,7 +2310,6 @@
     },
     "node_modules/@jest/console/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -1981,13 +2321,11 @@
     },
     "node_modules/@jest/console/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -1996,7 +2334,6 @@
     },
     "node_modules/@jest/console/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2008,7 +2345,6 @@
     },
     "node_modules/@jest/core": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
       "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "dependencies": {
@@ -2047,7 +2383,6 @@
     },
     "node_modules/@jest/core/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2061,9 +2396,8 @@
       }
     },
     "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2078,7 +2412,6 @@
     },
     "node_modules/@jest/core/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2090,13 +2423,11 @@
     },
     "node_modules/@jest/core/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2105,7 +2436,6 @@
     },
     "node_modules/@jest/core/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2117,7 +2447,6 @@
     },
     "node_modules/@jest/environment": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
       "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "dependencies": {
@@ -2132,7 +2461,6 @@
     },
     "node_modules/@jest/fake-timers": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
       "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "dependencies": {
@@ -2149,7 +2477,6 @@
     },
     "node_modules/@jest/globals": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
       "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "dependencies": {
@@ -2163,7 +2490,6 @@
     },
     "node_modules/@jest/reporters": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
       "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "dependencies": {
@@ -2201,7 +2527,6 @@
     },
     "node_modules/@jest/reporters/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2215,9 +2540,8 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2232,7 +2556,6 @@
     },
     "node_modules/@jest/reporters/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2244,22 +2567,33 @@
     },
     "node_modules/@jest/reporters/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/reporters/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/reporters/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2268,7 +2602,6 @@
     },
     "node_modules/@jest/reporters/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2280,7 +2613,6 @@
     },
     "node_modules/@jest/source-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
       "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "dependencies": {
@@ -2294,7 +2626,6 @@
     },
     "node_modules/@jest/source-map/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2303,7 +2634,6 @@
     },
     "node_modules/@jest/test-result": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
       "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "dependencies": {
@@ -2318,7 +2648,6 @@
     },
     "node_modules/@jest/test-sequencer": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
       "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "dependencies": {
@@ -2334,7 +2663,6 @@
     },
     "node_modules/@jest/transform": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
       "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "dependencies": {
@@ -2360,7 +2688,6 @@
     },
     "node_modules/@jest/transform/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2374,9 +2701,8 @@
       }
     },
     "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2391,7 +2717,6 @@
     },
     "node_modules/@jest/transform/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2403,13 +2728,11 @@
     },
     "node_modules/@jest/transform/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/transform/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2418,7 +2741,6 @@
     },
     "node_modules/@jest/transform/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -2427,7 +2749,6 @@
     },
     "node_modules/@jest/transform/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2439,7 +2760,6 @@
     },
     "node_modules/@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
       "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "dependencies": {
@@ -2455,7 +2775,6 @@
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2469,9 +2788,8 @@
       }
     },
     "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2486,7 +2804,6 @@
     },
     "node_modules/@jest/types/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2498,13 +2815,11 @@
     },
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -2513,7 +2828,6 @@
     },
     "node_modules/@jest/types/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2524,15 +2838,15 @@
       }
     },
     "node_modules/@joeattardi/emoji-button": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@joeattardi/emoji-button/-/emoji-button-4.6.0.tgz",
-      "integrity": "sha512-KwOE1j+YxX47JmT0pXNCa+9Ai4Wf2fmABtvuxy6JBJ5QV0HdoThRKjL6CxAreVwwLbNQ/PDoR36xpc5QJjLXPA==",
+      "version": "4.6.2",
+      "integrity": "sha512-FhuzTmW3nVHLVp2BJfNX17CYV77fqtKZlx328D4h6Dw3cPTT1gJRNXN0jV7BvHgsl6Q/tN8DIQQxTUIO4jW3gQ==",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.28",
         "@fortawesome/free-regular-svg-icons": "^5.13.0",
         "@fortawesome/free-solid-svg-icons": "^5.13.0",
         "@popperjs/core": "^2.4.0",
         "@types/twemoji": "^12.1.1",
+        "escape-html": "^1.0.3",
         "focus-trap": "^5.1.0",
         "fuzzysort": "^1.1.4",
         "tiny-emitter": "^2.1.0",
@@ -2540,17 +2854,52 @@
         "twemoji": "^13.0.0"
       }
     },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@lezer/common": {
+      "version": "0.15.11",
+      "integrity": "sha512-vv0nSdIaVCRcJ8rPuDdsrNVfBOYe/4Szr/LhF929XyDmBndLDuWiCCHooGlGlJfzELyO608AyDhVsuX/ZG36NA=="
+    },
+    "node_modules/@lezer/lr": {
+      "version": "0.15.8",
+      "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+      "dependencies": {
+        "@lezer/common": "^0.15.0"
+      }
+    },
+    "node_modules/@n1ru4l/graphql-live-query": {
+      "version": "0.9.0",
+      "integrity": "sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==",
+      "peerDependencies": {
+        "graphql": "^15.4.0 || ^16.0.0"
+      }
+    },
     "node_modules/@n1ru4l/push-pull-async-iterable-iterator": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.4.tgz",
-      "integrity": "sha512-qLIvoOUJ+zritv+BlzcBMePKNjKQzH9Rb2i9W98YXxf/M62Lye8qH0peyiU8yJ1tL0kfulWi31BoK10E6BKJeA==",
+      "version": "3.2.0",
+      "integrity": "sha512-3fkKj25kEjsfObL6IlKPAlHYPq/oYwUkkQ03zsTTiDjD7vg/RxjdiLeCydqtxHZP0JgsXL3D/X5oAkMGzuUp/Q==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
@@ -2562,16 +2911,14 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2580,35 +2927,20 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "version": "2.11.2",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
       }
     },
     "node_modules/@rails/ujs": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@rails/ujs/-/ujs-6.1.3.tgz",
-      "integrity": "sha512-9mip5o+LVouWAqLMNJWhxda+D5uP+4RziNECgOGJlL6k3rc5SC/ljCHpV9Cym4i3oeGZkpZJ2tu4frCwt84kzQ=="
+      "version": "6.1.4",
+      "integrity": "sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw=="
     },
     "node_modules/@rails/webpacker": {
       "version": "6.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@rails/webpacker/-/webpacker-6.0.0-rc.5.tgz",
       "integrity": "sha512-GOEhRs+mRRVZIiZbnLQ1WTxRCuu687rO4cvUVP7WMJ+z5uFr3EQkCaLq5VOtonWHzYbZIBEWH4rCWv0uZnrywQ==",
       "dependencies": {
         "@babel/core": "^7.15.0",
@@ -2634,34 +2966,119 @@
         "yarn": ">=1 <4"
       }
     },
-    "node_modules/@rails/webpacker/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/@rails/webpacker/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/@rails/webpacker/node_modules/compression-webpack-plugin": {
+      "version": "8.0.1",
+      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^6.0.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dev": true,
+    "node_modules/@rails/webpacker/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@rollup/plugin-babel": {
+      "version": "5.3.1",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "@types/babel__core": "^7.1.9",
+        "rollup": "^1.20.0||^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/babel__core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "11.2.1",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-replace": {
+      "version": "2.4.2",
+      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0 || ^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "3.1.0",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
+      "version": "0.0.39",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/fake-timers": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
       "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
       "dev": true,
       "dependencies": {
@@ -2670,7 +3087,6 @@
     },
     "node_modules/@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
       "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
       "dev": true,
       "peer": true,
@@ -2684,8 +3100,8 @@
     },
     "node_modules/@stylelint/postcss-markdown": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
       "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
+      "deprecated": "Use the original unforked package instead: postcss-markdown",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -2697,9 +3113,36 @@
         "postcss-syntax": ">=0.36.2"
       }
     },
+    "node_modules/@surma/rollup-plugin-off-main-thread": {
+      "version": "2.2.3",
+      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "dependencies": {
+        "ejs": "^3.1.6",
+        "json5": "^2.2.0",
+        "magic-string": "^0.25.0",
+        "string.prototype.matchall": "^4.0.6"
+      }
+    },
+    "node_modules/@tarekraafat/autocomplete.js": {
+      "version": "10.2.6",
+      "integrity": "sha512-M3awL75YTQVHev4XlWGRKJalwVG3MGgtNnbRdtNipcyMcAV1sfkireBM8BKL/vhFhrus+6/5KZfj/DJDu8X0mg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/autocompletejs"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/TarekRaafat"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/TarekRaafat"
+        }
+      ]
+    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
       "engines": {
@@ -2707,10 +3150,9 @@
       }
     },
     "node_modules/@types/babel__core": {
-      "version": "7.1.14",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
-      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
-      "dev": true,
+      "version": "7.1.18",
+      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "devOptional": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -2720,82 +3162,65 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
-      "dev": true,
+      "version": "7.6.4",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "devOptional": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
-      "dev": true,
+      "version": "7.4.1",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "devOptional": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
-      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
-      "dev": true,
+      "version": "7.14.2",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "devOptional": true,
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+      "version": "8.4.1",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "version": "3.7.3",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "node_modules/@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
+      "version": "0.0.51",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
       "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "dependencies": {
@@ -2804,7 +3229,6 @@
     },
     "node_modules/@types/istanbul-reports": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
       "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "dependencies": {
@@ -2813,20 +3237,16 @@
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "version": "3.0.10",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -2834,85 +3254,93 @@
       }
     },
     "node_modules/@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.2",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true,
       "peer": true
     },
     "node_modules/@types/node": {
-      "version": "15.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="
+      "version": "17.0.21",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==",
+      "version": "2.4.4",
+      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
       "dev": true
     },
-    "node_modules/@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+    "node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.2",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+    },
     "node_modules/@types/twemoji": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@types/twemoji/-/twemoji-12.1.1.tgz",
-      "integrity": "sha512-dW1B1WHTfrWmEzXb/tp8xsZqQHAyMB9JwLwbBqkIQVzmNUI02R7lJqxUpKFM114ygNZHKA1r74oPugCAiYHt1A=="
+      "version": "12.1.2",
+      "integrity": "sha512-3eMyKenMi0R1CeKzBYtk/Z2JIHsTMQrIrTah0q54o45pHTpWVNofU2oHx0jS8tqsDRhis2TbB6238WP9oh2l2w=="
     },
     "node_modules/@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
+      "version": "2.0.6",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
       "dev": true,
       "peer": true
     },
+    "node_modules/@types/websocket": {
+      "version": "1.0.5",
+      "integrity": "sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.2",
+      "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
-    "node_modules/@types/zen-observable": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz",
-      "integrity": "sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="
+    "node_modules/@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.1",
@@ -2921,22 +3349,18 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
       "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
       "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
       "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
@@ -2946,12 +3370,10 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
       "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -2962,7 +3384,6 @@
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
@@ -2970,7 +3391,6 @@
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "dependencies": {
         "@xtuc/long": "4.2.2"
@@ -2978,12 +3398,10 @@
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
       "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -2998,7 +3416,6 @@
     },
     "node_modules/@webassemblyjs/wasm-gen": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3010,7 +3427,6 @@
     },
     "node_modules/@webassemblyjs/wasm-opt": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3021,7 +3437,6 @@
     },
     "node_modules/@webassemblyjs/wasm-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3034,7 +3449,6 @@
     },
     "node_modules/@webassemblyjs/wast-printer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
@@ -3042,18 +3456,16 @@
       }
     },
     "node_modules/@webpack-cli/configtest": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-      "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+      "version": "1.1.1",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
       "peerDependencies": {
         "webpack": "4.x.x || 5.x.x",
         "webpack-cli": "4.x.x"
       }
     },
     "node_modules/@webpack-cli/info": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-      "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+      "version": "1.4.1",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
       "dependencies": {
         "envinfo": "^7.7.3"
       },
@@ -3062,9 +3474,8 @@
       }
     },
     "node_modules/@webpack-cli/serve": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
+      "version": "1.6.1",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
       "peerDependencies": {
         "webpack-cli": "4.x.x"
       },
@@ -3075,33 +3486,30 @@
       }
     },
     "node_modules/@wry/context": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz",
-      "integrity": "sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==",
+      "version": "0.6.1",
+      "integrity": "sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@wry/equality": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz",
-      "integrity": "sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==",
+      "version": "0.5.2",
+      "integrity": "sha512-oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@wry/trie": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz",
-      "integrity": "sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==",
+      "version": "0.3.1",
+      "integrity": "sha512-WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       },
       "engines": {
         "node": ">=8"
@@ -3109,48 +3517,34 @@
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/@zeitiger/appendaround": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@zeitiger/appendaround/-/appendaround-1.0.0.tgz",
       "integrity": "sha1-v4V4Prdpa6h5Irym42X0O1SH4Ns="
     },
     "node_modules/abab": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "event-target-shim": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6.5"
       }
     },
     "node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "7.4.1",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3160,7 +3554,6 @@
     },
     "node_modules/acorn-globals": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dev": true,
       "dependencies": {
@@ -3168,46 +3561,23 @@
         "acorn-walk": "^7.1.1"
       }
     },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz",
-      "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "peer": true,
+      "version": "5.3.2",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "dependencies": {
@@ -3217,21 +3587,8 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/airbnb-prop-types": {
       "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
       "dev": true,
       "dependencies": {
@@ -3254,7 +3611,6 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -3267,32 +3623,48 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "peer": true,
       "engines": {
@@ -3301,7 +3673,6 @@
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "dependencies": {
@@ -3314,28 +3685,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -3346,8 +3704,8 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3356,64 +3714,18 @@
         "node": ">= 8"
       }
     },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
-    "node_modules/are-we-there-yet/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/are-we-there-yet/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria-query": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
@@ -3424,7 +3736,6 @@
     },
     "node_modules/arr-diff": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true,
       "engines": {
@@ -3433,7 +3744,6 @@
     },
     "node_modules/arr-flatten": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true,
       "engines": {
@@ -3442,40 +3752,22 @@
     },
     "node_modules/arr-union": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
     "node_modules/array-includes": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
-      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3486,7 +3778,6 @@
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "engines": {
         "node": ">=8"
@@ -3494,7 +3785,6 @@
     },
     "node_modules/array-unique": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true,
       "engines": {
@@ -3502,16 +3792,15 @@
       }
     },
     "node_modules/array.prototype.filter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz",
-      "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0",
+        "es-abstract": "^1.19.0",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3521,27 +3810,26 @@
       }
     },
     "node_modules/array.prototype.find": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
-      "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
+      "version": "2.1.2",
+      "integrity": "sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q==",
       "dev": true,
       "dependencies": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "es-abstract": "^1.19.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
-      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3551,16 +3839,13 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
-      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3571,7 +3856,6 @@
     },
     "node_modules/arrify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true,
       "peer": true,
@@ -3579,25 +3863,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true,
       "engines": {
@@ -3606,14 +3873,11 @@
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "peer": true,
       "engines": {
@@ -3621,36 +3885,27 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
     },
-    "node_modules/async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
     },
     "node_modules/atob": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
       "bin": {
@@ -3660,163 +3915,53 @@
         "node": ">= 4.5.0"
       }
     },
-    "node_modules/attrobj": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/attrobj/-/attrobj-3.1.0.tgz",
-      "integrity": "sha512-YFN+wZSEgER2w5IdIkmNkPiGqi6lRrNKL+VPl+7WnAPenZvnPC6bEmQuxka06Ilwx265x/K6QRh9W5Klav738Q=="
-    },
-    "node_modules/aug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/aug/-/aug-4.0.0.tgz",
-      "integrity": "sha512-2cr7AHg5B+Cbjma7qhs+DZbKznzKwpkjfSCb48WVJfEF/+Hwxsu4GPGuqUblt/0gVYBiqdeAIrerlTjt8edyKg=="
-    },
     "node_modules/autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "version": "10.4.2",
+      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
       "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
+        "browserslist": "^4.19.1",
+        "caniuse-lite": "^1.0.30001297",
+        "fraction.js": "^4.1.2",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "bin": {
         "autoprefixer": "bin/autoprefixer"
       },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "engines": {
-        "node": "*"
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "node_modules/axe-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz",
-      "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==",
+      "version": "4.4.1",
+      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.4",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "dependencies": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "node_modules/axobject-query": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-    },
-    "node_modules/babel-code-frame/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dependencies": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "node_modules/babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dependencies": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
+      "dev": true
     },
     "node_modules/babel-jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
       "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "dependencies": {
@@ -3838,7 +3983,6 @@
     },
     "node_modules/babel-jest/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -3852,9 +3996,8 @@
       }
     },
     "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3869,7 +4012,6 @@
     },
     "node_modules/babel-jest/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -3881,13 +4023,11 @@
     },
     "node_modules/babel-jest/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/babel-jest/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -3896,7 +4036,6 @@
     },
     "node_modules/babel-jest/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -3907,9 +4046,8 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.2.3",
+      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
@@ -3924,41 +4062,22 @@
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dependencies": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "node_modules/babel-plugin-__coverage__": {
-      "version": "1.11.111",
-      "resolved": "https://registry.npmjs.org/babel-plugin-__coverage__/-/babel-plugin-__coverage__-1.11.111.tgz",
-      "integrity": "sha1-AdD4396mrPvqJ3U/oteELwZcxXk=",
-      "dependencies": {
-        "babel-helper-function-name": "^6.5.0",
-        "babel-template": "^6.8.0"
-      }
-    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dependencies": {
         "object.assign": "^4.1.0"
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       },
       "engines": {
@@ -3967,7 +4086,6 @@
     },
     "node_modules/babel-plugin-jest-hoist": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
       "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "dependencies": {
@@ -3981,12 +4099,11 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "version": "0.3.1",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "dependencies": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -3994,63 +4111,28 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz",
-      "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==",
+      "version": "0.5.2",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.9.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "version": "0.3.1",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "node_modules/babel-preset-airbnb": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-airbnb/-/babel-preset-airbnb-5.0.0.tgz",
-      "integrity": "sha512-Y5nqHhnhu4RpwbmQj4H+srdk1kb413pX81PfJsT1IZQOuEuRzUDXmgN4Ut1GgpQJnfRpjjEuQy0/uzcLMMP1cQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-transform-classes": "^7.9.2",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-property-mutators": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.4",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0"
-      }
-    },
     "node_modules/babel-preset-current-node-syntax": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "dependencies": {
@@ -4073,7 +4155,6 @@
     },
     "node_modules/babel-preset-jest": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
       "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "dependencies": {
@@ -4087,112 +4168,12 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
-    "node_modules/babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-traverse/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "node_modules/babel-types/node_modules/to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
-    },
     "node_modules/backo2": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "optional": true
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "node_modules/bail": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
       "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
       "dev": true,
       "peer": true,
@@ -4203,12 +4184,10 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/base": {
       "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "dependencies": {
@@ -4226,7 +4205,6 @@
     },
     "node_modules/base/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -4238,7 +4216,6 @@
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
@@ -4257,132 +4234,29 @@
     },
     "node_modules/base64url": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/big.js": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dependencies": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "node_modules/bonjour/node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
     },
     "node_modules/bootstrap-tagsinput": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-tagsinput/-/bootstrap-tagsinput-0.7.1.tgz",
       "integrity": "sha1-/+Owa74qEGlF7ygUVoAFqU8hGTc="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -4391,7 +4265,6 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dependencies": {
         "fill-range": "^7.0.1"
@@ -4402,20 +4275,18 @@
     },
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.16.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
-      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+      "version": "4.19.3",
+      "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001251",
-        "colorette": "^1.3.0",
-        "electron-to-chromium": "^1.3.811",
+        "caniuse-lite": "^1.0.30001312",
+        "electron-to-chromium": "^1.4.71",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.75"
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4430,7 +4301,6 @@
     },
     "node_modules/bser": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
       "dependencies": {
@@ -4439,7 +4309,6 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "funding": [
         {
@@ -4460,6 +4329,11 @@
         "ieee754": "^1.1.13"
       }
     },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha1-MyLNMH2Cltqx9gRhhZOyYaP63o8="
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -4469,53 +4343,21 @@
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "node_modules/buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+      "version": "1.1.2",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+    "node_modules/builtin-modules": {
+      "version": "3.2.0",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
+        "node": ">=6"
       },
-      "engines": {
-        "node": ">= 10"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cache-base": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "dependencies": {
@@ -4535,7 +4377,6 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -4545,39 +4386,8 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dependencies": {
-        "callsites": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-callsite/node_modules/callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dependencies": {
-        "caller-callsite": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "engines": {
         "node": ">=6"
@@ -4585,60 +4395,46 @@
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "optional": true,
+      "version": "6.2.2",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001252",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-      "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "version": "1.0.30001355",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001355.tgz",
+      "integrity": "sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
     },
     "node_modules/capture-exit": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
       "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "dev": true,
       "dependencies": {
@@ -4648,14 +4444,8 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "node_modules/chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -4668,7 +4458,6 @@
     },
     "node_modules/char-regex": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
       "engines": {
@@ -4677,7 +4466,6 @@
     },
     "node_modules/character-entities": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true,
       "peer": true,
@@ -4688,7 +4476,6 @@
     },
     "node_modules/character-entities-legacy": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
       "dev": true,
       "peer": true,
@@ -4699,7 +4486,6 @@
     },
     "node_modules/character-reference-invalid": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true,
       "peer": true,
@@ -4708,14 +4494,8 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-    },
     "node_modules/cheerio": {
       "version": "1.0.0-rc.10",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
       "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
       "dev": true,
       "dependencies": {
@@ -4736,7 +4516,6 @@
     },
     "node_modules/cheerio-select": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
       "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
       "dev": true,
       "dependencies": {
@@ -4750,26 +4529,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "dependencies": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.1"
-      }
-    },
     "node_modules/chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -4780,7 +4539,6 @@
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "engines": {
         "node": ">=6.0"
@@ -4788,19 +4546,16 @@
     },
     "node_modules/ci-info": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
     "node_modules/cjs-module-lexer": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
       "dev": true
     },
     "node_modules/class-utils": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "dependencies": {
@@ -4815,7 +4570,6 @@
     },
     "node_modules/class-utils/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -4827,7 +4581,6 @@
     },
     "node_modules/class-utils/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -4839,7 +4592,6 @@
     },
     "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -4851,7 +4603,6 @@
     },
     "node_modules/class-utils/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -4863,7 +4614,6 @@
     },
     "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -4875,7 +4625,6 @@
     },
     "node_modules/class-utils/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -4889,7 +4638,6 @@
     },
     "node_modules/class-utils/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -4898,20 +4646,10 @@
     },
     "node_modules/classnames": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cliui": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "dependencies": {
@@ -4922,7 +4660,6 @@
     },
     "node_modules/clone": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "engines": {
         "node": ">=0.8"
@@ -4930,7 +4667,6 @@
     },
     "node_modules/clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dependencies": {
         "is-plain-object": "^2.0.4",
@@ -4943,7 +4679,6 @@
     },
     "node_modules/clone-regexp": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
       "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
       "dev": true,
       "peer": true,
@@ -4954,9 +4689,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/clone-regexp/node_modules/is-regexp": {
+      "version": "2.1.0",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true,
       "engines": {
@@ -4964,54 +4707,29 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/codemirror": {
-      "version": "5.61.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
-      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
+      "version": "5.65.2",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "node_modules/codemirror-graphql": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.0.2.tgz",
-      "integrity": "sha512-D4+BdYa6iQnDlio4mBk1Yap5ROCqEWapSFLkiKGatx/I0dF6euzdwd0um3Ndudw6rFQbNuT7hpcH8tnBO6VOfQ==",
+      "version": "1.2.12",
+      "integrity": "sha512-irP+E8HOWtgIdU3PNTU77bNmpEXQYADRRDmKqkjh3w1m0welbxl6HtZgp+c+Mkkz+FXY1+3+gF6nEEj+eJ1xdg==",
       "dependencies": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-parser": "^1.9.0"
+        "@codemirror/stream-parser": "^0.19.2",
+        "graphql-language-service": "^4.1.5"
       },
       "peerDependencies": {
-        "codemirror": "^5.54.0",
-        "graphql": ">= v14.5.0 <= 15.5.0"
+        "codemirror": "^5.58.2",
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
       "dev": true
     },
     "node_modules/collection-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "dependencies": {
@@ -5022,18 +4740,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.4"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
         "color-name": "1.1.3"
@@ -5041,27 +4749,16 @@
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "node_modules/color-string": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-      "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "node_modules/colorette": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
+      "version": "2.0.16",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -5071,54 +4768,29 @@
     },
     "node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "node_modules/component-emitter": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/compression-webpack-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-8.0.1.tgz",
-      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
+      "version": "9.2.0",
+      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
       "dependencies": {
-        "schema-utils": "^3.0.0",
+        "schema-utils": "^4.0.0",
         "serialize-javascript": "^6.0.0"
       },
       "engines": {
@@ -5132,60 +4804,57 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/compression-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/compression-webpack-plugin/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/compression-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+    "node_modules/compression-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dependencies": {
-        "randombytes": "^2.1.0"
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/compression-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/compression-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
       "dependencies": {
-        "ms": "2.0.0"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "node_modules/concat-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
       "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "dev": true,
       "engines": [
@@ -5198,64 +4867,20 @@
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
     },
     "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dependencies": {
         "safe-buffer": "~5.1.1"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true,
       "engines": {
@@ -5264,16 +4889,14 @@
     },
     "node_modules/copy-to-clipboard": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
       "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "dependencies": {
         "toggle-selection": "^1.0.6"
       }
     },
     "node_modules/core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
+      "version": "3.21.1",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -5281,11 +4904,10 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.16.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.4.tgz",
-      "integrity": "sha512-IzCSomxRdahCYb6G3HiN6pl3JCiM0NMunRcNa1pIeC7g17Vd6Ue3AT9anQiENPIm/svThUVer1pIbLMDERIsFw==",
+      "version": "3.21.1",
+      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
       "dependencies": {
-        "browserslist": "^4.16.8",
+        "browserslist": "^4.19.1",
         "semver": "7.0.0"
       },
       "funding": {
@@ -5295,33 +4917,24 @@
     },
     "node_modules/core-js-compat/node_modules/semver": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
       "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
+      "version": "3.21.1",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
       "dev": true,
       "hasInstallScript": true,
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
     "node_modules/cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "version": "7.0.1",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -5333,18 +4946,19 @@
         "node": ">=10"
       }
     },
-    "node_modules/create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
+    "node_modules/cosmiconfig-toml-loader": {
+      "version": "1.0.0",
+      "integrity": "sha512-H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA==",
       "dependencies": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
+        "@iarna/toml": "^2.2.5"
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -5355,135 +4969,83 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
+    "node_modules/cross-undici-fetch": {
+      "version": "0.1.25",
+      "integrity": "sha512-KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw==",
       "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-blank-pseudo": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "abort-controller": "^3.0.0",
+        "form-data-encoder": "^1.7.1",
+        "formdata-node": "^4.3.1",
+        "node-fetch": "^2.6.7",
+        "undici": "^4.9.3",
+        "web-streams-polyfill": "^3.2.0"
       }
     },
-    "node_modules/css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "dependencies": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
+      "version": "3.0.4",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "bin": {
-        "css-has-pseudo": "cli.js"
+        "postcss-selector-parser": "^6.0.9"
       },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
       "bin": {
-        "cssesc": "bin/cssesc"
+        "css-has-pseudo": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz",
-      "integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==",
+      "version": "6.6.0",
+      "integrity": "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==",
       "dependencies": {
-        "camelcase": "^6.0.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.3",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.1",
-        "semver": "^7.3.2"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.5",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.27.0 || ^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/css-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+        "webpack": "^5.0.0"
       }
     },
     "node_modules/css-loader/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -5495,139 +5057,37 @@
         "node": ">=10"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-jFa0Siplmfef4ndKglpVaduY47oHQwioAOEGK0f0vAX0s+vc+SmP6cCMoc+8Adau5600RnOEld5VVdC8CQau7w==",
-      "dependencies": {
-        "cacache": "^15.0.5",
-        "cssnano": "^4.1.10",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.3.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "webpack-sources": "^1.4.3"
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "postcss": "^8.4"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/css-select": {
+      "version": "4.2.1",
+      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "dev": true,
       "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "bin": {
-        "css-prefers-color-scheme": "cli.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "boolbase": "^1.0.0",
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/css-what": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+      "version": "5.1.0",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
       "dev": true,
       "engines": {
         "node": ">= 6"
@@ -5637,13 +5097,11 @@
       }
     },
     "node_modules/cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+      "version": "6.4.0",
+      "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA=="
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "bin": {
         "cssesc": "bin/cssesc"
@@ -5652,186 +5110,13 @@
         "node": ">=4"
       }
     },
-    "node_modules/cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
-      "dependencies": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "dependencies": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/cssnano/node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cssom": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
       "dev": true
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "dependencies": {
@@ -5843,26 +5128,11 @@
     },
     "node_modules/cssstyle/node_modules/cssom": {
       "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
       "dev": true
     },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/d3": {
       "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.4.0.tgz",
       "integrity": "sha1-CQGZqFadHeI9BKP/B/4TYJX+p04=",
       "dependencies": {
         "d3-array": "1",
@@ -5900,17 +5170,14 @@
     },
     "node_modules/d3-array": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
       "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
     },
     "node_modules/d3-axis": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
       "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
     },
     "node_modules/d3-brush": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
       "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -5922,7 +5189,6 @@
     },
     "node_modules/d3-chord": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
       "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
       "dependencies": {
         "d3-array": "1",
@@ -5931,17 +5197,14 @@
     },
     "node_modules/d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "node_modules/d3-color": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
       "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "node_modules/d3-contour": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
       "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
       "dependencies": {
         "d3-array": "^1.1.1"
@@ -5949,12 +5212,10 @@
     },
     "node_modules/d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
       "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
     },
     "node_modules/d3-drag": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
       "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -5963,7 +5224,6 @@
     },
     "node_modules/d3-dsv": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
       "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
       "dependencies": {
         "commander": "2",
@@ -5984,12 +5244,10 @@
     },
     "node_modules/d3-ease": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
       "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
     },
     "node_modules/d3-fetch": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
       "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
       "dependencies": {
         "d3-dsv": "1"
@@ -5997,7 +5255,6 @@
     },
     "node_modules/d3-force": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
       "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
       "dependencies": {
         "d3-collection": "1",
@@ -6008,12 +5265,10 @@
     },
     "node_modules/d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
       "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
     },
     "node_modules/d3-geo": {
       "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
       "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
       "dependencies": {
         "d3-array": "1"
@@ -6021,12 +5276,10 @@
     },
     "node_modules/d3-hierarchy": {
       "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
       "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "node_modules/d3-interpolate": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
       "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "dependencies": {
         "d3-color": "1"
@@ -6034,27 +5287,22 @@
     },
     "node_modules/d3-path": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "node_modules/d3-polygon": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
       "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
     },
     "node_modules/d3-quadtree": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
       "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
     },
     "node_modules/d3-random": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
       "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
     },
     "node_modules/d3-scale": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
       "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "dependencies": {
         "d3-array": "^1.2.0",
@@ -6067,7 +5315,6 @@
     },
     "node_modules/d3-scale-chromatic": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
       "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
       "dependencies": {
         "d3-color": "1",
@@ -6076,12 +5323,10 @@
     },
     "node_modules/d3-selection": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
       "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
     },
     "node_modules/d3-shape": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
       "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "dependencies": {
         "d3-path": "1"
@@ -6089,12 +5334,10 @@
     },
     "node_modules/d3-time": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
       "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "node_modules/d3-time-format": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
       "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
       "dependencies": {
         "d3-time": "1"
@@ -6102,12 +5345,10 @@
     },
     "node_modules/d3-timer": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
       "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
     },
     "node_modules/d3-transition": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
       "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
       "dependencies": {
         "d3-color": "1",
@@ -6120,12 +5361,10 @@
     },
     "node_modules/d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
       "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
     },
     "node_modules/d3-zoom": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
       "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
       "dependencies": {
         "d3-dispatch": "1",
@@ -6136,26 +5375,12 @@
       }
     },
     "node_modules/damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
+      "version": "1.0.8",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
     },
     "node_modules/data-urls": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
       "dev": true,
       "dependencies": {
@@ -6167,10 +5392,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/dataloader": {
+      "version": "2.0.0",
+      "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
+    },
     "node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.3",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6185,15 +5418,14 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/decamelize-keys": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "peer": true,
@@ -6205,24 +5437,35 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "node_modules/decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true,
       "engines": {
         "node": ">=0.10"
       }
     },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "node_modules/deep-equal": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
       "dependencies": {
         "is-arguments": "^1.0.4",
@@ -6237,81 +5480,18 @@
       }
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/default-gateway/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/default-gateway/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-gateway/node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/define-properties": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dependencies": {
         "object-keys": "^1.0.12"
@@ -6322,7 +5502,6 @@
     },
     "node_modules/define-property": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "dependencies": {
@@ -6333,80 +5512,24 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/denque": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz",
-      "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
     "node_modules/diff": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
       "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "engines": {
         "node": ">=0.3.1"
@@ -6414,7 +5537,6 @@
     },
     "node_modules/diff-sequences": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true,
       "engines": {
@@ -6423,7 +5545,6 @@
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dependencies": {
         "path-type": "^4.0.0"
@@ -6434,37 +5555,12 @@
     },
     "node_modules/discontinuous-range": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
       "dev": true
     },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "node_modules/dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "dependencies": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dependencies": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -6474,7 +5570,6 @@
     },
     "node_modules/dom-serializer": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
       "dev": true,
       "dependencies": {
@@ -6486,15 +5581,10 @@
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/domassist": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domassist/-/domassist-2.2.0.tgz",
-      "integrity": "sha512-fz/B/YgI88m+/fw49tFi1syaGuBuBGA8DkS3J53jkzH+9wD0B8zUwdiExZjQnnJAwI1aXTgNj4nlTlx797zFqQ=="
-    },
     "node_modules/domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
       "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -6504,7 +5594,6 @@
     },
     "node_modules/domexception": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
       "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dev": true,
       "dependencies": {
@@ -6516,7 +5605,6 @@
     },
     "node_modules/domexception/node_modules/webidl-conversions": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
       "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
       "dev": true,
       "engines": {
@@ -6524,9 +5612,8 @@
       }
     },
     "node_modules/domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "version": "4.3.0",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
       "dev": true,
       "dependencies": {
         "domelementtype": "^2.2.0"
@@ -6538,20 +5625,9 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/domodule": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/domodule/-/domodule-8.1.0.tgz",
-      "integrity": "sha512-ION9hZ7tFVNkfLSx2t8gOM5YweUNb3jUezD4JXR7Vqb8S9pZt4kyuCJE25JvxozdkDXBIE9RUUAxDaOPUQV8Vw==",
-      "dependencies": {
-        "attrobj": "^3.1.0",
-        "aug": "^4.0.0",
-        "domassist": "^2.2.0"
-      }
-    },
     "node_modules/domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "version": "2.8.0",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "^1.0.1",
@@ -6562,61 +5638,34 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dset": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz",
-      "integrity": "sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
     "node_modules/ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "hasInstallScript": true,
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.824",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.824.tgz",
-      "integrity": "sha512-Fk+5aD0HDi9i9ZKt9n2VPOZO1dQy7PV++hz2wJ/KIn+CvVfu4fny39squHtyVDPuHNuoJGAZIbuReEklqYIqfA=="
+      "version": "1.4.75",
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "node_modules/emittery": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true,
       "engines": {
@@ -6627,39 +5676,27 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "version": "5.9.1",
+      "integrity": "sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6670,7 +5707,6 @@
     },
     "node_modules/enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "peer": true,
       "dependencies": {
@@ -6682,25 +5718,13 @@
     },
     "node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/envinfo": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
       "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
       "bin": {
         "envinfo": "dist/cli.js"
@@ -6711,7 +5735,6 @@
     },
     "node_modules/enzyme": {
       "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
       "dependencies": {
@@ -6744,7 +5767,6 @@
     },
     "node_modules/enzyme-adapter-react-16": {
       "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz",
       "integrity": "sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==",
       "dev": true,
       "dependencies": {
@@ -6769,7 +5791,6 @@
     },
     "node_modules/enzyme-adapter-react-16/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -6778,7 +5799,6 @@
     },
     "node_modules/enzyme-adapter-utils": {
       "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
       "integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
       "dev": true,
       "dependencies": {
@@ -6799,7 +5819,6 @@
     },
     "node_modules/enzyme-adapter-utils/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -6808,7 +5827,6 @@
     },
     "node_modules/enzyme-shallow-equal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
       "integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
       "dev": true,
       "dependencies": {
@@ -6821,28 +5839,30 @@
     },
     "node_modules/error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -6858,18 +5878,15 @@
     },
     "node_modules/es-array-method-boxes-properly": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
     "node_modules/es-module-lexer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-      "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="
+      "version": "0.9.3",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dependencies": {
         "is-callable": "^1.1.4",
@@ -6885,20 +5902,10 @@
     },
     "node_modules/es6-promise": {
       "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
       "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
-    "node_modules/es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dependencies": {
-        "es6-promise": "^4.0.3"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "engines": {
         "node": ">=6"
@@ -6906,12 +5913,10 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "engines": {
         "node": ">=0.8.0"
@@ -6919,7 +5924,6 @@
     },
     "node_modules/escodegen": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "dependencies": {
@@ -6939,9 +5943,44 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/escodegen/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "optional": true,
@@ -6949,14 +5988,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "7.32.0",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "peer": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -7005,12 +6055,48 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "dependencies": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      },
+      "engines": {
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
     "node_modules/eslint-config-prettier": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "version": "8.5.0",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
       "dev": true,
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -7020,7 +6106,6 @@
     },
     "node_modules/eslint-config-standard": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
       "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==",
       "dev": true,
       "peer": true,
@@ -7033,42 +6118,29 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.7.3",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "pkg-dir": "^2.0.0"
+        "find-up": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
@@ -7076,20 +6148,16 @@
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils/node_modules/find-up": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "locate-path": "^2.0.0"
       },
@@ -7099,10 +6167,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/locate-path": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -7113,10 +6179,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/p-limit": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-try": "^1.0.0"
       },
@@ -7126,10 +6190,8 @@
     },
     "node_modules/eslint-module-utils/node_modules/p-locate": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "p-limit": "^1.1.0"
       },
@@ -7137,42 +6199,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-module-utils/node_modules/path-exists": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/eslint-plugin-es": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
       "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "peer": true,
@@ -7191,51 +6227,43 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.25.4",
+      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.2",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.8.0",
+        "is-glob": "^4.0.3",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
+        "object.values": "^1.1.5",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.12.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7243,246 +6271,117 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
-    "node_modules/eslint-plugin-import/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "p-try": "^1.0.0"
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "node_modules/eslint-plugin-node": {
+      "version": "11.1.0",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "p-limit": "^1.1.0"
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+    "node_modules/eslint-plugin-node/node_modules/ignore": {
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 4"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+    "node_modules/eslint-plugin-promise": {
+      "version": "3.8.0",
+      "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.29.2",
+      "integrity": "sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "engines": {
         "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
-        "emoji-regex": "^9.0.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
-        "language-tags": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
       },
       "peerDependencies": {
-        "eslint": ">=5.16.0"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
-      "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.3.0",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
-        "doctrine": "^2.1.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
-        "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
     "node_modules/eslint-plugin-react/node_modules/doctrine": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
       "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7492,10 +6391,8 @@
     },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
       "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
       "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -7506,7 +6403,6 @@
     },
     "node_modules/eslint-plugin-standard": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
       "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
       "dev": true,
       "peer": true,
@@ -7516,7 +6412,6 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -7528,7 +6423,6 @@
     },
     "node_modules/eslint-scope/node_modules/estraverse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "engines": {
         "node": ">=4.0"
@@ -7536,7 +6430,6 @@
     },
     "node_modules/eslint-utils": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "peer": true,
       "dependencies": {
@@ -7551,7 +6444,6 @@
     },
     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "peer": true,
       "engines": {
@@ -7560,7 +6452,6 @@
     },
     "node_modules/eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "engines": {
         "node": ">=10"
@@ -7568,7 +6459,6 @@
     },
     "node_modules/eslint/node_modules/@babel/code-frame": {
       "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
       "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
       "peer": true,
       "dependencies": {
@@ -7577,7 +6467,6 @@
     },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "peer": true,
       "dependencies": {
@@ -7590,10 +6479,17 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "1.0.10",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -7608,7 +6504,6 @@
     },
     "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "peer": true,
       "dependencies": {
@@ -7620,13 +6515,11 @@
     },
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "peer": true
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "peer": true,
       "engines": {
@@ -7637,9 +6530,8 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.9.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-      "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -7653,55 +6545,26 @@
     },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "peer": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "peer": true,
       "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.8.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/eslint/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "peer": true,
       "dependencies": {
@@ -7716,7 +6579,6 @@
     },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "peer": true,
       "dependencies": {
@@ -7726,21 +6588,8 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "peer": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "peer": true,
       "engines": {
@@ -7752,7 +6601,6 @@
     },
     "node_modules/espree": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "peer": true,
       "dependencies": {
@@ -7764,21 +6612,8 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "peer": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "peer": true,
       "engines": {
@@ -7787,7 +6622,6 @@
     },
     "node_modules/esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "bin": {
         "esparse": "bin/esparse.js",
@@ -7799,9 +6633,7 @@
     },
     "node_modules/esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "peer": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -7811,7 +6643,6 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -7821,37 +6652,36 @@
       }
     },
     "node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "5.3.0",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "1.0.1",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
     "node_modules/eventemitter3": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
       "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
     },
     "node_modules/events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "engines": {
         "node": ">=0.8.x"
@@ -7859,13 +6689,11 @@
     },
     "node_modules/exec-sh": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "node_modules/execa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "dependencies": {
@@ -7888,7 +6716,6 @@
     },
     "node_modules/execall": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
       "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
       "dev": true,
       "peer": true,
@@ -7901,7 +6728,6 @@
     },
     "node_modules/exit": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true,
       "engines": {
@@ -7910,7 +6736,6 @@
     },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "dependencies": {
@@ -7928,7 +6753,6 @@
     },
     "node_modules/expand-brackets/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -7937,7 +6761,6 @@
     },
     "node_modules/expand-brackets/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -7949,7 +6772,6 @@
     },
     "node_modules/expand-brackets/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -7961,7 +6783,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -7973,7 +6794,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -7985,7 +6805,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -7997,7 +6816,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -8009,7 +6827,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -8023,7 +6840,6 @@
     },
     "node_modules/expand-brackets/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -8032,7 +6848,6 @@
     },
     "node_modules/expand-brackets/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -8041,13 +6856,11 @@
     },
     "node_modules/expand-brackets/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
     "node_modules/expect": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
       "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "dependencies": {
@@ -8064,7 +6877,6 @@
     },
     "node_modules/expect/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -8079,7 +6891,6 @@
     },
     "node_modules/expect/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -8091,13 +6902,11 @@
     },
     "node_modules/expect/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/expose-loader": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-2.0.0.tgz",
       "integrity": "sha512-WBpSGlNkn7YwbU2us7O+h0XsoFrB43Y/VCNSpRV4OZFXXKgw8W800BgNxLV0S97N3+KGnFYSCAJi1AV86NO22w==",
       "engines": {
         "node": ">= 10.13.0"
@@ -8110,75 +6919,12 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "dependencies": {
@@ -8191,7 +6937,6 @@
     },
     "node_modules/extglob": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "dependencies": {
@@ -8210,7 +6955,6 @@
     },
     "node_modules/extglob/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -8222,7 +6966,6 @@
     },
     "node_modules/extglob/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -8234,158 +6977,84 @@
     },
     "node_modules/extglob/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extract-files": {
+      "version": "11.0.0",
+      "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==",
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jaydenseric"
+      }
+    },
     "node_modules/extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dependencies": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
       },
       "bin": {
         "extract-zip": "cli.js"
-      }
-    },
-    "node_modules/extract-zip/node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/extract-zip/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/extract-zip/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/extract-zip/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/extract-zip/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
       "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.11",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
     },
     "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.13.0",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/fb-watchman": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
       "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "dev": true,
       "dependencies": {
@@ -8402,9 +7071,7 @@
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "peer": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -8412,59 +7079,46 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "engines": {
-        "node": ">= 0.4.0"
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dependencies": {
+        "minimatch": "^5.0.1"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dependencies": {
-        "ms": "2.0.0"
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
     "node_modules/find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "3.3.2",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8479,7 +7133,6 @@
     },
     "node_modules/find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dependencies": {
         "locate-path": "^5.0.0",
@@ -8491,9 +7144,7 @@
     },
     "node_modules/flat-cache": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "peer": true,
       "dependencies": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -8503,19 +7154,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "peer": true
-    },
-    "node_modules/flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+      "version": "3.2.5",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
     },
     "node_modules/focus-trap": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.1.0.tgz",
       "integrity": "sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==",
       "dependencies": {
         "tabbable": "^4.0.0",
@@ -8523,9 +7166,8 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.9",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
       "funding": [
         {
           "type": "individual",
@@ -8543,24 +7185,14 @@
     },
     "node_modules/for-in": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "dependencies": {
@@ -8572,37 +7204,57 @@
         "node": ">= 6"
       }
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+    "node_modules/form-data-encoder": {
+      "version": "1.7.1",
+      "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
+    },
+    "node_modules/formdata-node": {
+      "version": "4.3.2",
+      "integrity": "sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg==",
+      "dependencies": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.1"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12.20"
+      }
+    },
+    "node_modules/formdata-node/node_modules/web-streams-polyfill": {
+      "version": "4.0.0-beta.1",
+      "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==",
+      "engines": {
+        "node": ">= 12"
       }
     },
     "node_modules/foundation-datepicker": {
       "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foundation-datepicker/-/foundation-datepicker-1.5.6.tgz",
       "integrity": "sha1-bciR8/ZCICghn3QoTRaEVIqMpL8="
     },
     "node_modules/foundation-sites": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.7.0.tgz",
-      "integrity": "sha512-dajdL/7i5rn5F70I2FMnfDOlgXD5klCw8OS9a+Y3rM2fyj9f8JZkJ50eYukmeEM4zVnj+Xo6rJfciLxN/QEYWQ==",
-      "dependencies": {
-        "puppeteer": "^1.11.0"
-      },
+      "version": "6.7.4",
+      "integrity": "sha512-2QPaZJ0Od0DyklhQyKC3zPbr8AAUXSkr1scZJrQTgj/KTLresuCgUBfi7ft32NlOWhuqVXisjOgTE8N5EPS3cg==",
       "engines": {
         "node": ">=12.0"
       },
       "peerDependencies": {
-        "jquery": ">=2.2.0",
-        "what-input": ">=4.1.0"
+        "jquery": ">=3.6.0",
+        "motion-ui": "latest",
+        "what-input": ">=5.2.10"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.1.3",
+      "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
       }
     },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "dependencies": {
@@ -8612,17 +7264,8 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -8635,7 +7278,6 @@
     },
     "node_modules/fs-extra/node_modules/jsonfile": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
@@ -8652,43 +7294,22 @@
         "node": ">= 8"
       }
     },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
-      "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
+      "version": "1.1.5",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.0",
         "functions-have-names": "^1.2.2"
       },
       "engines": {
@@ -8700,116 +7321,22 @@
     },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "peer": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "node_modules/functions-have-names": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
       "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fuzzy": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz",
-      "integrity": "sha1-THbsL/CsGjap3M+aAN+GIweNTtg=",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/fuzzysort": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
-      "integrity": "sha512-JzK/lHjVZ6joAg3OnCjylwYXYVjRiwTY6Yb25LvfpJHK8bjisfnZJ5bY8aVWwTwCXgxPNgLAtmHL+Hs5q1ddLQ=="
-    },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "node_modules/gauge/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "globule": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
+      "version": "1.2.1",
+      "integrity": "sha512-egTSF3U6H6T9tXtAhEm5P5guSSDjd96/NUWrbmoGlIu3ATMdXra13gwQdEFRY6ehsFe8xec7UnQz+k34CGWCIg=="
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "engines": {
         "node": ">=6.9.0"
@@ -8817,16 +7344,14 @@
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
       "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -8837,9 +7362,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
     "node_modules/get-package-type": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
       "engines": {
@@ -8847,20 +7375,20 @@
       }
     },
     "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "optional": true,
+      "version": "8.0.0",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/get-stream": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -8871,27 +7399,31 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-value": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8909,7 +7441,6 @@
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -8920,12 +7451,10 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "node_modules/global-modules": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
       "dev": true,
       "peer": true,
@@ -8938,7 +7467,6 @@
     },
     "node_modules/global-prefix": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
       "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
       "dev": true,
       "peer": true,
@@ -8953,7 +7481,6 @@
     },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "peer": true,
@@ -8966,22 +7493,20 @@
     },
     "node_modules/globals": {
       "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -8992,38 +7517,20 @@
       }
     },
     "node_modules/globby/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/globjoin": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true,
       "peer": true
     },
-    "node_modules/globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/gonzales-pe": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
       "dev": true,
       "peer": true,
@@ -9037,416 +7544,190 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/google-protobuf": {
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.20.0.tgz",
+      "integrity": "sha512-hhXv5IKLDIkb0pEm53G053UZGhRAhw3wM5Jk7ly5sGIQRkO1s63FaDqM9QjlrPHygKEE2awUlLP9fFrG6M9vfQ=="
+    },
     "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.9",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "node_modules/graphiql": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.4.2.tgz",
-      "integrity": "sha512-TQDuuU/ZqTWV1yQDpVEiKskg0IYA+Wck37DYrrFzLlpgZWRbWiyab1PyHKiRep7J540CgScBg6C/gGCymKyO3g==",
+      "version": "1.6.0",
+      "integrity": "sha512-VUxnzehiv5BiJzoHQOL7CVFfVjMidate93wSRvFotW7gZluF6PQE45B+LeVWLMRoC59KIUcL+6gtgLHJ5FssvA==",
       "dependencies": {
-        "@graphiql/toolkit": "^0.2.0",
-        "codemirror": "^5.54.0",
-        "codemirror-graphql": "^1.0.0",
+        "@graphiql/toolkit": "^0.4.2",
+        "codemirror": "^5.58.2",
+        "codemirror-graphql": "^1.2.12",
         "copy-to-clipboard": "^3.2.0",
         "dset": "^3.1.0",
         "entities": "^2.0.0",
-        "graphql-language-service": "^3.1.2",
-        "markdown-it": "^10.0.0"
+        "escape-html": "^1.0.3",
+        "graphql-language-service": "^4.1.5",
+        "markdown-it": "^12.2.0"
       },
       "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0",
-        "react": "^16.8.0",
-        "react-dom": "^16.8.0"
+        "graphql": "^15.5.0 || ^16.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/graphql": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
-      "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==",
+      "version": "16.3.0",
+      "integrity": "sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==",
+      "peer": true,
       "engines": {
-        "node": ">= 10.x"
+        "node": "^12.22.0 || ^14.16.0 || >=16.0.0"
       }
     },
-    "node_modules/graphql-docs": {
-      "version": "0.2.1",
-      "resolved": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-      "integrity": "sha512-cfcgxsPudAO5nda6wux/GOJpPVCvuj7oq8DK1CYl91hRijqctyj2ZfM6Q/dxQRNAzkSC1U3o2jmAIrCdrI7Ynw==",
-      "license": "SEE LICENSE IN LICENSE",
+    "node_modules/graphql-config": {
+      "version": "4.1.0",
+      "integrity": "sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==",
       "dependencies": {
-        "marked": "^0.3.5",
-        "react-typeahead": "^2.0.0-alpha.5",
-        "request": "^2.74.0",
-        "yargs": "^5.0.0"
+        "@endemolshinegroup/cosmiconfig-typescript-loader": "3.0.2",
+        "@graphql-tools/graphql-file-loader": "^7.3.2",
+        "@graphql-tools/json-file-loader": "^7.3.2",
+        "@graphql-tools/load": "^7.4.1",
+        "@graphql-tools/merge": "^8.2.1",
+        "@graphql-tools/url-loader": "^7.4.2",
+        "@graphql-tools/utils": "^8.5.1",
+        "cosmiconfig": "7.0.1",
+        "cosmiconfig-toml-loader": "1.0.0",
+        "minimatch": "3.0.4",
+        "string-env-interpolation": "1.0.1"
       },
       "engines": {
-        "node": ">= 4.4.0"
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+    "node_modules/graphql-config/node_modules/minimatch": {
+      "version": "3.0.4",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/graphql-docs/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+    "node_modules/graphql-executor": {
+      "version": "0.0.18",
+      "integrity": "sha512-upUSl7tfZCZ5dWG1XkOvpG70Yk3duZKcCoi/uJso4WxJVT6KIrcK4nZ4+2X/hzx46pL8wAukgYHY6iNmocRN+g==",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "node": "^12.22.0 || ^14.16.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "graphql": "^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+    "node_modules/graphql-language-service": {
+      "version": "4.1.5",
+      "integrity": "sha512-6vvZ+4L1xMNpQdlt6a9BaEzZD3ZIiaTmFdjKu81UTIVRh02QKfbW6tcz4UJNTY+4LsTWjR1rNtG3H4pVNrKJ2Q==",
       "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "graphql-language-service-interface": "^2.10.2",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "graphql": "dist/temp-bin.js"
+      },
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-    },
-    "node_modules/graphql-docs/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+    "node_modules/graphql-language-service-interface": {
+      "version": "2.10.2",
+      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
       "dependencies": {
-        "number-is-nan": "^1.0.0"
+        "graphql-config": "^4.1.0",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1",
+        "vscode-languageserver-types": "^3.15.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+    "node_modules/graphql-language-service-parser": {
+      "version": "1.10.4",
+      "integrity": "sha512-duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA==",
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graphql-language-service-types": "^1.8.7"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+    "node_modules/graphql-language-service-types": {
+      "version": "1.8.7",
+      "integrity": "sha512-LP/Mx0nFBshYEyD0Ny6EVGfacJAGVx+qXtlJP4hLzUdBNOGimfDNtMVIdZANBXHXcM41MDgMHTnyEx2g6/Ttbw==",
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "graphql-config": "^4.1.0",
+        "vscode-languageserver-types": "^3.15.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+    "node_modules/graphql-language-service-utils": {
+      "version": "2.7.1",
+      "integrity": "sha512-Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA==",
       "dependencies": {
-        "pinkie-promise": "^2.0.0"
+        "@types/json-schema": "7.0.9",
+        "graphql-language-service-types": "^1.8.7",
+        "nullthrows": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "graphql": "^15.5.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
+    "node_modules/graphql-sse": {
+      "version": "1.0.6",
+      "integrity": "sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "graphql": ">=0.11 <=16"
       }
     },
-    "node_modules/graphql-docs/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
       "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "tslib": "^2.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/graphql-docs/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
+    "node_modules/graphql-ws": {
+      "version": "5.6.2",
+      "integrity": "sha512-TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ==",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "node_modules/graphql-docs/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-    },
-    "node_modules/graphql-docs/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/y18n": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
-    },
-    "node_modules/graphql-docs/node_modules/yargs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
-      "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
-      "dependencies": {
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "lodash.assign": "^4.2.0",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "window-size": "^0.2.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^3.2.0"
-      }
-    },
-    "node_modules/graphql-docs/node_modules/yargs-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
-      "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "lodash.assign": "^4.1.0"
-      }
-    },
-    "node_modules/graphql-language-service": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-3.1.4.tgz",
-      "integrity": "sha512-AF98AT4wLxkE9q1gRf20Yn0EPgd5SctRiw1IkGFivPr98pEX0sKqUcIcIHePn2mxqf73jlWUJV5v6l/CB1gdqQ==",
-      "dependencies": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-types": "^1.8.0"
-      },
-      "bin": {
-        "graphql": "dist/temp-bin.js"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-interface": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.8.4.tgz",
-      "integrity": "sha512-myW8z7HOZkYfhYGKDc0URFkTZChp41Po890W92zuBIhGccckgtiWSJGXaLX+r9QAwVIeZhKaNgEacsyvQb1f/g==",
-      "dependencies": {
-        "graphql-language-service-parser": "^1.9.0",
-        "graphql-language-service-types": "^1.8.0",
-        "graphql-language-service-utils": "^2.5.1",
-        "vscode-languageserver-types": "^3.15.1"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-parser": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.9.2.tgz",
-      "integrity": "sha512-3txms73cJsXDfJQdR5hI83N2rpTuq9FD6aijdrXAeSuI5B60g32DxjelUkt4Ge+2BvBEDLn5ppXlpVYDC9UQHQ==",
-      "dependencies": {
-        "graphql-language-service-types": "^1.8.0"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-types": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz",
-      "integrity": "sha512-Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw==",
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-language-service-utils": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.5.3.tgz",
-      "integrity": "sha512-ydevEZ0AgzEKQF3hiCbLXuS0o7189Ww/T30WtCKCLaRHDYk9Yyb2PZWdhSTWLxYZTaX2TccV6NtFWvzIC7UP3g==",
-      "dependencies": {
-        "graphql-language-service-types": "^1.8.0",
-        "nullthrows": "^1.0.0"
-      },
-      "peerDependencies": {
-        "graphql": ">= v14.5.0 <= 15.5.0"
-      }
-    },
-    "node_modules/graphql-tag": {
-      "version": "2.12.4",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz",
-      "integrity": "sha512-VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
-      }
-    },
-    "node_modules/graphql-ws": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz",
-      "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": ">=0.11 <=15"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": ">=0.11 <=16"
       }
     },
     "node_modules/growly": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true,
       "optional": true
     },
-    "node_modules/gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dependencies": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/gzip-size/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
       "peer": true,
@@ -9456,12 +7737,10 @@
     },
     "node_modules/harmony-reflect": {
       "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
       "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
     },
     "node_modules/has": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dependencies": {
         "function-bind": "^1.1.1"
@@ -9470,28 +7749,8 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9499,16 +7758,14 @@
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -9516,16 +7773,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true,
-      "peer": true
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/has-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "dependencies": {
@@ -9539,7 +7801,6 @@
     },
     "node_modules/has-values": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "dependencies": {
@@ -9552,7 +7813,6 @@
     },
     "node_modules/has-values/node_modules/is-number": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "dependencies": {
@@ -9564,7 +7824,6 @@
     },
     "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -9576,7 +7835,6 @@
     },
     "node_modules/has-values/node_modules/kind-of": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
       "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
       "dev": true,
       "dependencies": {
@@ -9586,78 +7844,20 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "dependencies": {
         "react-is": "^16.7.0"
       }
     },
-    "node_modules/hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "node_modules/hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
     },
     "node_modules/html-element-map": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
       "dev": true,
       "dependencies": {
@@ -9670,7 +7870,6 @@
     },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
       "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
       "dev": true,
       "dependencies": {
@@ -9680,20 +7879,13 @@
         "node": ">=10"
       }
     },
-    "node_modules/html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
-    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
     "node_modules/html-tags": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
       "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
       "dev": true,
       "peer": true,
@@ -9703,12 +7895,10 @@
     },
     "node_modules/html5sortable": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
       "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
     },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "funding": [
@@ -9725,52 +7915,8 @@
         "entities": "^2.0.0"
       }
     },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
-    },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/http-proxy-agent": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "dependencies": {
@@ -9782,54 +7928,8 @@
         "node": ">= 6"
       }
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/http-proxy/node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dev": true,
       "dependencies": {
@@ -9842,7 +7942,6 @@
     },
     "node_modules/human-signals": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
       "engines": {
@@ -9851,7 +7950,6 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -9861,19 +7959,21 @@
       }
     },
     "node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
+      "version": "5.1.0",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
+    "node_modules/idb": {
+      "version": "6.1.5",
+      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+    },
     "node_modules/identity-obj-proxy": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
       "dependencies": {
         "harmony-reflect": "^1.4.6"
@@ -9884,7 +7984,6 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "funding": [
         {
@@ -9903,16 +8002,17 @@
     },
     "node_modules/ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "peer": true,
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/immutable": {
+      "version": "4.0.0",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -9927,7 +8027,6 @@
     },
     "node_modules/import-fresh/node_modules/resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "engines": {
         "node": ">=4"
@@ -9935,7 +8034,6 @@
     },
     "node_modules/import-lazy": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
       "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
       "dev": true,
       "peer": true,
@@ -9944,9 +8042,8 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -9956,11 +8053,13 @@
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "engines": {
         "node": ">=0.8.19"
@@ -9968,25 +8067,15 @@
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dependencies": {
         "once": "^1.3.0",
@@ -9995,39 +8084,17 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true,
       "peer": true
     },
-    "node_modules/internal-ip": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
-      "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==",
-      "dependencies": {
-        "default-gateway": "^6.0.0",
-        "ipaddr.js": "^1.9.1",
-        "is-ip": "^3.1.0",
-        "p-event": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/internal-ip?sponsor=1"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
       "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
@@ -10039,7 +8106,6 @@
     },
     "node_modules/interpret": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
       "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
       "engines": {
         "node": ">= 0.10"
@@ -10047,69 +8113,21 @@
     },
     "node_modules/intl": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
       "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/invert-kv": {
+    "node_modules/is-accessor-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "node_modules/ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-alphabetical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true,
       "peer": true,
@@ -10120,7 +8138,6 @@
     },
     "node_modules/is-alphanumerical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
       "dev": true,
       "peer": true,
@@ -10134,11 +8151,11 @@
       }
     },
     "node_modules/is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dependencies": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10149,34 +8166,24 @@
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "version": "1.0.4",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "has-bigints": "^1.0.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10187,14 +8194,12 @@
     },
     "node_modules/is-buffer": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10204,7 +8209,6 @@
     },
     "node_modules/is-ci": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "dependencies": {
@@ -10214,23 +8218,9 @@
         "is-ci": "bin.js"
       }
     },
-    "node_modules/is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "dependencies": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
     "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.8.1",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -10240,7 +8230,6 @@
     },
     "node_modules/is-data-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
       "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "dependencies": {
@@ -10251,9 +8240,11 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "version": "1.0.5",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10263,7 +8254,6 @@
     },
     "node_modules/is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "dev": true,
       "peer": true,
@@ -10274,7 +8264,6 @@
     },
     "node_modules/is-descriptor": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
       "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "dependencies": {
@@ -10286,18 +8275,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "optional": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -10310,7 +8292,6 @@
     },
     "node_modules/is-extendable": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
       "dependencies": {
@@ -10322,28 +8303,13 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
         "node": ">=8"
@@ -10351,7 +8317,6 @@
     },
     "node_modules/is-generator-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
       "engines": {
@@ -10359,9 +8324,8 @@
       }
     },
     "node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -10371,7 +8335,6 @@
     },
     "node_modules/is-hexadecimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true,
       "peer": true,
@@ -10380,21 +8343,13 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-ip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
-      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
-      "dependencies": {
-        "ip-regex": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "version": "2.0.2",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10404,16 +8359,17 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10422,42 +8378,23 @@
       }
     },
     "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "version": "1.0.1",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "version": "1.1.0",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dependencies": {
         "isobject": "^3.0.1"
@@ -10468,17 +8405,15 @@
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10488,32 +8423,35 @@
       }
     },
     "node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "peer": true,
+      "version": "1.0.0",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "version": "2.0.1",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "version": "1.0.7",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10523,13 +8461,11 @@
     },
     "node_modules/is-subset": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
       "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
       "dev": true
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dependencies": {
         "has-symbols": "^1.0.2"
@@ -10543,12 +8479,11 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
       "peer": true,
@@ -10559,14 +8494,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-windows": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
       "engines": {
@@ -10575,8 +8514,9 @@
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -10586,45 +8526,44 @@
     },
     "node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "node_modules/isobject": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    "node_modules/isomorphic-ws": {
+      "version": "4.0.1",
+      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
+      "peerDependencies": {
+        "ws": "*"
+      }
     },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.1.0",
+      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -10633,7 +8572,6 @@
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dev": true,
       "dependencies": {
@@ -10647,7 +8585,6 @@
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -10656,7 +8593,6 @@
     },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -10667,9 +8603,8 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "version": "4.0.1",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
@@ -10677,12 +8612,11 @@
         "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "engines": {
@@ -10690,9 +8624,8 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.4",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -10704,73 +8637,29 @@
     },
     "node_modules/iterall": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
-      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
-      "optional": true
-    },
-    "node_modules/jest": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
-      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^26.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^26.6.3"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
-      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "execa": "^4.0.0",
-        "throat": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
+      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="
     },
-    "node_modules/jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
-      "dev": true,
+    "node_modules/jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
       "dependencies": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
       },
       "bin": {
-        "jest": "bin/jest.js"
+        "jake": "bin/cli.js"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
+    "node_modules/jake/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10781,11 +8670,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
+    "node_modules/jake/node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10797,11 +8690,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
+    "node_modules/jake/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10809,26 +8701,23 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-cli/node_modules/color-name": {
+    "node_modules/jake/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/jest-cli/node_modules/has-flag": {
+    "node_modules/jake/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-cli/node_modules/supports-color": {
+    "node_modules/jake/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10836,229 +8725,208 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-config": {
+    "node_modules/jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
-      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.3",
-        "@jest/types": "^26.6.2",
-        "babel-jest": "^26.6.3",
-        "chalk": "^4.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.2",
-        "jest-environment-node": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.3",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2"
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
         "node": ">= 10.14.2"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-changed-files": {
+      "version": "26.6.2",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus": {
+      "version": "27.5.1",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+    "node_modules/jest-circus/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
       "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+    "node_modules/jest-circus/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
       "dev": true,
       "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "node_modules/jest-each": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
-      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
+    "node_modules/jest-circus/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11071,10 +8939,20 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11087,9 +8965,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/color-convert": {
+    "node_modules/jest-circus/node_modules/ci-info": {
+      "version": "3.3.0",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+      "dev": true
+    },
+    "node_modules/jest-circus/node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
+    },
+    "node_modules/jest-circus/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11099,301 +8986,405 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/color-name": {
+    "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/execa": {
+      "version": "5.1.1",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
-      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+    "node_modules/jest-circus/node_modules/expect": {
+      "version": "27.5.1",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
       "dev": true,
       "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jsdom": "^16.4.0"
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
-      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+    "node_modules/jest-circus/node_modules/get-stream": {
+      "version": "6.0.1",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "jest-mock": "^26.6.2",
-        "jest-util": "^26.6.2"
+      "engines": {
+        "node": ">=10"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+    "node_modules/jest-circus/node_modules/human-signals": {
+      "version": "2.1.0",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/jest-haste-map": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
-      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+    "node_modules/jest-circus/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.1.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
-      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+    "node_modules/jest-circus/node_modules/jest-each": {
+      "version": "27.5.1",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
+        "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^26.6.2",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "pretty-format": "^26.6.2",
-        "throat": "^5.0.0"
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/jest-circus/node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
     },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-circus/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+    "node_modules/jest-circus/node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-localstorage-mock": {
-      "version": "2.4.14",
-      "resolved": "https://registry.npmjs.org/jest-localstorage-mock/-/jest-localstorage-mock-2.4.14.tgz",
-      "integrity": "sha512-B+Y0y3J4wBOHdmcFSicWmVYMFAZFbJvjs1EfRIzUJRg2UAK+YVVUgTn7/MdjENey5xbBKmraBmKY5EX+x1NJXA==",
+    "node_modules/jest-circus/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
       "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
       "engines": {
-        "node": ">=6.16.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
-      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dev": true,
       "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-circus/node_modules/jest-validate": {
+      "version": "27.5.1",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-circus/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/jest-circus/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-circus/node_modules/react-is": {
+      "version": "17.0.2",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-circus/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+    "node_modules/jest-circus/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11403,29 +9394,39 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
-      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+    "node_modules/jest-circus/node_modules/throat": {
+      "version": "6.0.1",
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+      "dev": true
+    },
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
+        "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.2"
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
+    "node_modules/jest-cli/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11438,10 +9439,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11454,9 +9454,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-convert": {
+    "node_modules/jest-cli/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11466,24 +9465,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-name": {
+    "node_modules/jest-cli/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-message-util/node_modules/has-flag": {
+    "node_modules/jest-cli/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-message-util/node_modules/supports-color": {
+    "node_modules/jest-cli/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11493,81 +9489,44 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
-      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+    "node_modules/jest-config": {
+      "version": "26.6.3",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
         "@jest/types": "^26.6.2",
-        "@types/node": "*"
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
       },
       "peerDependencies": {
-        "jest-resolve": "*"
+        "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
-        "jest-resolve": {
+        "ts-node": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
-      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.6.2",
-        "read-pkg-up": "^7.0.1",
-        "resolve": "^1.18.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
-      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
+    "node_modules/jest-config/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11580,10 +9539,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11596,9 +9554,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-convert": {
+    "node_modules/jest-config/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11608,24 +9565,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-name": {
+    "node_modules/jest-config/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-resolve/node_modules/has-flag": {
+    "node_modules/jest-config/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-resolve/node_modules/supports-color": {
+    "node_modules/jest-config/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11635,40 +9589,22 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
-      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.7.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-leak-detector": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "jest-runtime": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-worker": "^26.6.2",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
+    "node_modules/jest-diff/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11681,10 +9617,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11697,9 +9632,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/color-convert": {
+    "node_modules/jest-diff/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11709,24 +9643,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/color-name": {
+    "node_modules/jest-diff/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-runner/node_modules/has-flag": {
+    "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runner/node_modules/supports-color": {
+    "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11736,50 +9667,34 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.6.2",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-mock": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-snapshot": "^26.6.2",
+        "jest-get-type": "^26.3.0",
         "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest-runtime": "bin/jest-runtime.js"
+        "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
+    "node_modules/jest-each/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -11792,10 +9707,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -11808,9 +9722,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-convert": {
+    "node_modules/jest-each/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -11820,24 +9733,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-name": {
+    "node_modules/jest-each/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
+    "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-runtime/node_modules/supports-color": {
+    "node_modules/jest-each/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -11847,151 +9757,103 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-serializer": {
+    "node_modules/jest-environment-jsdom": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
-      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "graceful-fs": "^4.2.4"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot": {
+    "node_modules/jest-environment-node": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
-      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.0.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
         "@jest/types": "^26.6.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^26.6.2",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.2",
-        "jest-matcher-utils": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
-        "semver": "^7.3.2"
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-haste-map": {
+      "version": "26.6.2",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">= 10.14.2"
       },
-      "engines": {
-        "node": ">=8"
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
       }
     },
-    "node_modules/jest-util": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+    "node_modules/jest-jasmine2": {
+      "version": "26.6.3",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
         "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
+    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12004,10 +9866,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12020,9 +9881,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-util/node_modules/color-convert": {
+    "node_modules/jest-jasmine2/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12032,24 +9892,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
+    "node_modules/jest-jasmine2/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-util/node_modules/has-flag": {
+    "node_modules/jest-jasmine2/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-util/node_modules/supports-color": {
+    "node_modules/jest-jasmine2/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12059,26 +9916,42 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate": {
+    "node_modules/jest-leak-detector": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-localstorage-mock": {
+      "version": "2.4.19",
+      "integrity": "sha512-TW7Cw6dbg4mgpxVUKmHU/sjOaUrUU2kp1DiWAY7JaPGDN1cRC/yXx1ewcJyPZ4d4qAd0UtJOER50sDjJSwVYGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.16.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "leven": "^3.1.0",
         "pretty-format": "^26.6.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12091,22 +9964,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12119,9 +9979,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/color-convert": {
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12131,24 +9990,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/color-name": {
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-validate/node_modules/has-flag": {
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-validate/node_modules/supports-color": {
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12158,27 +10014,27 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher": {
+    "node_modules/jest-message-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
+        "@babel/code-frame": "^7.0.0",
         "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
+        "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
-        "string-length": "^4.0.1"
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -12191,10 +10047,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -12207,9 +10062,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-convert": {
+    "node_modules/jest-message-util/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -12219,24 +10073,21 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-name": {
+    "node_modules/jest-message-util/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-watcher/node_modules/has-flag": {
+    "node_modules/jest-message-util/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher/node_modules/supports-color": {
+    "node_modules/jest-message-util/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -12246,542 +10097,551 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-worker": {
+    "node_modules/jest-mock": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">=6"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
-    },
-    "node_modules/jquery-serializejson": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-2.9.0.tgz",
-      "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
-    },
-    "node_modules/jquery.autocomplete": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jquery.autocomplete/-/jquery.autocomplete-1.2.0.tgz",
-      "integrity": "sha512-aoJC3KVrPpRGaZBUo9UxhwznYmQ0UuYd+FfjP9RAKmyB+1T3OLIjuQImT8pKX6eKpBt1z9JmD48GiD2Dx303bA==",
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
       "engines": {
-        "node": ">=4.2"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    "node_modules/jest-resolve": {
+      "version": "26.6.2",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     },
-    "node_modules/jsdom": {
-      "version": "16.6.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
-      "integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.5",
-        "xml-name-validator": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
       },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
+    "node_modules/jest-resolve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "peer": true
+    "node_modules/jest-resolve/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    "node_modules/jest-resolve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz",
-      "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
       "dependencies": {
-        "universalify": "^0.1.2"
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
-      "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "array-includes": "^3.1.2",
-        "object.assign": "^4.1.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+    "node_modules/jest-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+    "node_modules/jest-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/known-css-properties": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
-      "peer": true
-    },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
     },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
-        "invert-kv": "^1.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/leaflet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.1.tgz",
-      "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
-    },
-    "node_modules/leaflet-svgicon": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-svgicon/-/leaflet-svgicon-0.0.2.tgz",
-      "integrity": "sha512-9hGBLBHHcCSZAdVLwdiZbU2c/Z47eziDQslDrRQRcBNomEazH4NXvqY8egDMw+zGh/nBQub6jvTl1ty2nlEwmQ==",
+    "node_modules/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
-        "src": "^1.1.2"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/leaflet-tilelayer-here": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-tilelayer-here/-/leaflet-tilelayer-here-1.0.2.tgz",
-      "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
+    "node_modules/jest-runtime/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/leaflet.markercluster": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz",
-      "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
-      "peerDependencies": {
-        "leaflet": "~1.3.1"
+    "node_modules/jest-runtime/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+    "node_modules/jest-serializer": {
+      "version": "26.6.2",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
-    },
-    "node_modules/linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+    "node_modules/jest-snapshot": {
+      "version": "26.6.2",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+    "node_modules/jest-snapshot/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "peer": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+    "node_modules/jest-snapshot/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=6.11.5"
+        "node": ">=10"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/lockfile": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
-      "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
-      "dependencies": {
-        "signal-exit": "^3.0.2"
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "peer": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "node_modules/lodash.escape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
-      "dev": true
-    },
-    "node_modules/lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "node_modules/lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
     },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "peer": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "peer": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
+    "node_modules/jest-validate/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12792,12 +10652,21 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12809,12 +10678,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
+    "node_modules/jest-validate/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12822,29 +10689,23 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/log-symbols/node_modules/color-name": {
+    "node_modules/jest-validate/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
-    "node_modules/log-symbols/node_modules/has-flag": {
+    "node_modules/jest-validate/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
+    "node_modules/jest-validate/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12852,1658 +10713,1662 @@
         "node": ">=8"
       }
     },
-    "node_modules/long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
-    "node_modules/longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+    "node_modules/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/jest-watcher/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "devOptional": true,
-      "peer": true,
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "object-visit": "^1.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dependencies": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
-    },
-    "node_modules/marked": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
-      "bin": {
-        "marked": "bin/marked"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
+        "has-flag": "^4.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
-      "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/jquery-serializejson": {
+      "version": "2.9.0",
+      "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
     },
-    "node_modules/mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
+    "node_modules/js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/mem?sponsor=1"
+        "node": ">=12"
       }
     },
-    "node_modules/mem/node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dependencies": {
-        "fs-monkey": "1.0.3"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">= 4.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
       "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/meow/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/meow/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/meow/node_modules/parse-json": {
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "node_modules/json5": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "optional": true,
-      "peer": true,
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/meow/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsonfile": {
+      "version": "5.0.0",
+      "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
       "dependencies": {
-        "pinkie-promise": "^2.0.0"
+        "universalify": "^0.1.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/meow/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
+    "node_modules/jsonpointer": {
+      "version": "5.0.0",
+      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "optional": true,
-      "peer": true,
+    "node_modules/jsx-ast-utils": {
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
+      "dev": true,
       "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "array-includes": "^3.1.3",
+        "object.assign": "^4.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/meow/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "engines": {
+        "node": ">= 8"
+      }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/meros": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz",
-      "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "@types/node": ">=12"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
+    "node_modules/known-css-properties": {
+      "version": "0.21.0",
+      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.21",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+      "dev": true
     },
-    "node_modules/micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "peer": true,
       "dependencies": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
+        "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
+    "node_modules/leaflet": {
+      "version": "1.3.1",
+      "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
+    "node_modules/leaflet-tilelayer-here": {
+      "version": "1.0.2",
+      "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
+    },
+    "node_modules/leaflet.markercluster": {
+      "version": "1.4.1",
+      "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
+      "peerDependencies": {
+        "leaflet": "~1.3.1"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dependencies": {
-        "mime-db": "1.48.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
       }
     },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz",
-      "integrity": "sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
-      },
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.0.0"
+        "node": ">=6.11.5"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+    "node_modules/loader-utils": {
+      "version": "1.4.0",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+    "node_modules/loader-utils/node_modules/json5": {
+      "version": "1.0.1",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/mini-css-extract-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "node_modules/lockfile": {
+      "version": "1.0.4",
+      "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "signal-exit": "^3.0.2"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    "node_modules/lodash.escape": {
+      "version": "4.0.1",
+      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+      "dev": true
     },
-    "node_modules/minimist-options": {
+    "node_modules/lodash.flattendeep": {
+      "version": "4.4.0",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "node_modules/lodash.has": {
+      "version": "4.5.2",
+      "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "peer": true
+    },
+    "node_modules/log-symbols": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minimist-options/node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/long": {
+      "version": "5.2.0",
+      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
     },
-    "node_modules/moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
-      "engines": {
-        "node": "*"
+    "node_modules/longest-streak": {
+      "version": "2.0.4",
+      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/moo": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
-      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
-      "dev": true
-    },
-    "node_modules/morphdom": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
-      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dependencies": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       },
       "bin": {
-        "multicast-dns": "cli.js"
+        "loose-envify": "cli.js"
       }
     },
-    "node_modules/multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    "node_modules/magic-string": {
+      "version": "0.25.8",
+      "integrity": "sha512-n9NlSgfkB2rPYjSd/EZDoQcsXzwYAv4CIB/vi3ZSvZ2Tjax5W5Ie1NMy4HG3PVdcL4bBMMR20Ng4UcISMzqRLw==",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
     },
-    "node_modules/nearley": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
-      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
-      "dev": true,
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dependencies": {
-        "commander": "^2.19.0",
-        "moo": "^0.5.0",
-        "railroad-diagrams": "^1.0.0",
-        "randexp": "0.4.6"
+        "semver": "^6.0.0"
       },
-      "bin": {
-        "nearley-railroad": "bin/nearley-railroad.js",
-        "nearley-test": "bin/nearley-test.js",
-        "nearley-unparse": "bin/nearley-unparse.js",
-        "nearleyc": "bin/nearleyc.js"
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "individual",
-        "url": "https://nearley.js.org/#give-to-nearley"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "engines": {
-        "node": ">= 0.6"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
     },
-    "node_modules/node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
-      "optional": true,
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
       "engines": {
-        "node": ">= 10.12.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-gyp/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "optional": true,
-      "peer": true,
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "object-visit": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node_modules/node-jose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.0.0.tgz",
-      "integrity": "sha512-j8zoFze1gijl8+DK/dSXXqX7+o2lMYv1XS+ptnXgGV/eloQaqq1YjNtieepbKs9jBS4WTnMOqyKSaQuunJzx0A==",
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dependencies": {
-        "base64url": "^3.0.1",
-        "buffer": "^5.5.0",
-        "es6-promise": "^4.2.8",
-        "lodash": "^4.17.15",
-        "long": "^4.0.0",
-        "node-forge": "^0.10.0",
-        "pako": "^1.0.11",
-        "process": "^0.11.10",
-        "uuid": "^3.3.3"
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
       }
     },
-    "node_modules/node-jose/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/node-notifier": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
-      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+    "node_modules/mdast-util-from-markdown": {
+      "version": "0.8.5",
+      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
       "dev": true,
-      "optional": true,
+      "peer": true,
       "dependencies": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.2.0",
-        "semver": "^7.3.2",
-        "shellwords": "^0.1.1",
-        "uuid": "^8.3.0",
-        "which": "^2.0.2"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-string": "^2.0.0",
+        "micromark": "~2.11.0",
+        "parse-entities": "^2.0.0",
+        "unist-util-stringify-position": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/node-notifier/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/mdast-util-to-markdown": {
+      "version": "0.6.5",
+      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
       "dev": true,
-      "optional": true,
+      "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@types/unist": "^2.0.0",
+        "longest-streak": "^2.0.0",
+        "mdast-util-to-string": "^2.0.0",
+        "parse-entities": "^2.0.0",
+        "repeat-string": "^1.0.0",
+        "zwitch": "^1.0.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/node-releases": {
-      "version": "1.1.75",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
-      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
+    "node_modules/mdast-util-to-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
     },
-    "node_modules/node-sass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
-      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
-      "hasInstallScript": true,
-      "optional": true,
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^7.0.3",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^7.1.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "bin": {
-        "node-sass": "bin/node-sass"
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-sass/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "optional": true,
+    "node_modules/meow/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
       "peer": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "optional": true,
+    "node_modules/meow/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
       "peer": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "optional": true,
+    "node_modules/meow/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "optional": true,
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
+      "engines": {
+        "node": ">=10"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-sass/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
       "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/node-sass/node_modules/supports-color": {
+    "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "optional": true,
-      "peer": true,
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "abbrev": "1"
+    "node_modules/meros": {
+      "version": "1.2.0",
+      "integrity": "sha512-3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ==",
+      "engines": {
+        "node": ">=12"
       },
-      "bin": {
-        "nopt": "bin/nopt.js"
+      "peerDependencies": {
+        "@types/node": ">=12"
       },
-      "engines": {
-        "node": ">=6"
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+    "node_modules/micromark": {
+      "version": "2.11.4",
+      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "peer": true,
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "debug": "^4.0.0",
+        "parse-entities": "^2.0.0"
       }
     },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/micromatch": {
+      "version": "4.0.4",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=8.6"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "dependencies": {
+        "mime-db": "1.51.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.5.3",
+      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
       "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
-      "dev": true,
+    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "boolbase": "^1.0.0"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/nullthrows": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
-      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
+    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
     },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
+    "node_modules/minipass": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
+    "node_modules/moment": {
+      "version": "2.29.1",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/moo": {
+      "version": "0.5.1",
+      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
+      "dev": true
     },
-    "node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/morphdom": {
+      "version": "2.6.1",
+      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
     },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/motion-ui": {
+      "version": "2.0.3",
+      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
+      "peer": true,
+      "peerDependencies": {
+        "jquery": ">=2.2.0"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.1",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.0"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "node_modules/nearley": {
+      "version": "2.20.1",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "nearley-railroad": "bin/nearley-railroad.js",
+        "nearley-test": "bin/nearley-test.js",
+        "nearley-unparse": "bin/nearley-unparse.js",
+        "nearleyc": "bin/nearleyc.js"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "individual",
+        "url": "https://nearley.js.org/#give-to-nearley"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10.5.0"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
-      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
-      "dev": true,
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "4.x || >=6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 6.13.0"
       }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
     },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+    "node_modules/node-jose": {
+      "version": "2.1.0",
+      "integrity": "sha512-Zmm8vFPJabphGBc5Wz1/LUMPS+1cynqw16RIhgVNQMEI2yEQrvl7Gx2EwN9GhP8tkm8f7SH53K2nIx8TeNTIdg==",
       "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "engines": {
-        "node": ">= 0.8"
+        "base64url": "^3.0.1",
+        "buffer": "^6.0.3",
+        "es6-promise": "^4.2.8",
+        "lodash": "^4.17.21",
+        "long": "^5.2.0",
+        "node-forge": "^1.2.1",
+        "pako": "^2.0.4",
+        "process": "^0.11.10",
+        "uuid": "^8.3.2"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "node_modules/node-jose/node_modules/buffer": {
+      "version": "6.0.3",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "wrappy": "1"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
       }
     },
-    "node_modules/open": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
-      "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
+    "node_modules/node-notifier/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "optional": true,
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "lru-cache": "^6.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
+    "node_modules/node-releases": {
+      "version": "2.0.2",
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
-    "node_modules/optimism": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz",
-      "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "dependencies": {
-        "@wry/context": "^0.6.0",
-        "@wry/trie": "^0.3.0"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-each-series": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
-      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "peer": true
     },
-    "node_modules/p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dependencies": {
-        "p-timeout": "^3.1.0"
+        "path-key": "^3.0.0"
       },
       "engines": {
         "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+    "node_modules/nullthrows": {
+      "version": "1.1.1",
+      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "is-descriptor": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
       "dependencies": {
-        "@types/retry": "^0.12.0",
-        "retry": "^0.13.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
       "dependencies": {
-        "p-finally": "^1.0.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.hasown": {
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optimism": {
+      "version": "0.16.1",
+      "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
+      "dependencies": {
+        "@wry/context": "^0.6.0",
+        "@wry/trie": "^0.3.0"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.2.0",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-try": {
+      "version": "2.2.0",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "version": "2.0.4",
+      "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
     },
     "node_modules/parchment": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
       "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dependencies": {
         "callsites": "^3.0.0"
@@ -14514,7 +12379,6 @@
     },
     "node_modules/parse-entities": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "dev": true,
       "peer": true,
@@ -14533,7 +12397,6 @@
     },
     "node_modules/parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
@@ -14550,30 +12413,19 @@
     },
     "node_modules/parse5": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
       "dependencies": {
         "parse5": "^6.0.1"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/pascalcase": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true,
       "engines": {
@@ -14582,12 +12434,10 @@
     },
     "node_modules/path-complete-extname": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
       "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
         "node": ">=8"
@@ -14595,7 +12445,6 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "engines": {
         "node": ">=0.10.0"
@@ -14603,7 +12452,6 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
         "node": ">=8"
@@ -14611,17 +12459,10 @@
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "engines": {
         "node": ">=8"
@@ -14634,13 +12475,15 @@
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
         "node": ">=8.6"
       },
@@ -14650,47 +12493,22 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -14698,95 +12516,8 @@
         "node": ">=8"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pnp-webpack-plugin": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
       "integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
       "dependencies": {
         "ts-pnp": "^1.1.6"
@@ -14795,41 +12526,8 @@
         "node": ">=6"
       }
     },
-    "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true,
       "engines": {
@@ -14837,16 +12535,15 @@
       }
     },
     "node_modules/postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "8.4.7",
+      "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
       "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "nanoid": "^3.3.1",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^10 || ^12 || >=14"
       },
       "funding": {
         "type": "opencollective",
@@ -14854,352 +12551,195 @@
       }
     },
     "node_modules/postcss-attribute-case-insensitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
-      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
+      "version": "5.0.0",
+      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
       "dependencies": {
-        "postcss": "^7.0.2",
         "postcss-selector-parser": "^6.0.2"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "dependencies": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.2"
       }
     },
     "node_modules/postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
+      "version": "4.2.2",
+      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
+      "version": "8.0.3",
+      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
       "dependencies": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
-      "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "7.0.2",
+      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "dependencies": {
-        "postcss": "^7.0.14"
-      },
+      "version": "8.0.0",
+      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "version": "12.1.4",
+      "integrity": "sha512-i6AytuTCoDLJkWN/MtAIGriJz3j7UX6bV7Z5t+KgFz+dwZS15/mlTJY1S0kRizlk6ba0V8u8hN50Fz5Nm7tdZw==",
       "dependencies": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "version": "6.0.0",
+      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+        "node": ">=10.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.1.2"
       }
     },
-    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.4",
+      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
       "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.0",
+      "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+    "node_modules/postcss-env-function": {
+      "version": "4.0.5",
+      "integrity": "sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA==",
       "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-flexbugs-fixes": {
+      "version": "5.0.2",
+      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "peerDependencies": {
+        "postcss": "^8.1.4"
       }
     },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "dependencies": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "dependencies": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dependencies": {
-        "postcss": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
-      "dependencies": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.3",
+      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+    "node_modules/postcss-html": {
+      "version": "0.36.0",
+      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "htmlparser2": "^3.10.0"
       },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "dependencies": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
-      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "htmlparser2": "^3.10.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=5.0.0",
-        "postcss-syntax": ">=0.36.0"
+      "peerDependencies": {
+        "postcss": ">=5.0.0",
+        "postcss-syntax": ">=0.36.0"
       }
     },
     "node_modules/postcss-html/node_modules/dom-serializer": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
       "peer": true,
@@ -15210,7 +12750,6 @@
     },
     "node_modules/postcss-html/node_modules/dom-serializer/node_modules/domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
       "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
       "dev": true,
       "funding": [
@@ -15223,7 +12762,6 @@
     },
     "node_modules/postcss-html/node_modules/dom-serializer/node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
       "peer": true,
@@ -15233,14 +12771,12 @@
     },
     "node_modules/postcss-html/node_modules/domelementtype": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true,
       "peer": true
     },
     "node_modules/postcss-html/node_modules/domhandler": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "peer": true,
@@ -15250,7 +12786,6 @@
     },
     "node_modules/postcss-html/node_modules/domutils": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
       "peer": true,
@@ -15261,14 +12796,12 @@
     },
     "node_modules/postcss-html/node_modules/entities": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true,
       "peer": true
     },
     "node_modules/postcss-html/node_modules/htmlparser2": {
       "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
       "peer": true,
@@ -15282,60 +12815,56 @@
       }
     },
     "node_modules/postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "version": "4.0.6",
+      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
       "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.2",
+      "integrity": "sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==",
       "dependencies": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
-    "node_modules/postcss-import/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-initial": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
-      "integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
-      "dependencies": {
-        "postcss": "^7.0.2"
+      "version": "4.0.1",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "version": "4.1.1",
+      "integrity": "sha512-j3Z0WQCimY2tMle++YcmygnnVbt6XdnrCV1FO2IpzaCSmtTF2oO8h4ZYUA1Q+QHYroIiaWPvNHt9uBR4riCksQ==",
       "dependencies": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-less": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
       "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
       "dev": true,
       "peer": true,
@@ -15346,17 +12875,48 @@
         "node": ">=6.14.4"
       }
     },
+    "node_modules/postcss-less/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/postcss-less/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-less/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "version": "6.2.1",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -15369,7 +12929,6 @@
     },
     "node_modules/postcss-loader/node_modules/semver": {
       "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -15382,617 +12941,335 @@
       }
     },
     "node_modules/postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
+      "version": "5.0.4",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
+      "version": "5.0.0",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-media-query-parser": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true,
       "peer": true
     },
-    "node_modules/postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dependencies": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
+        "icss-utils": "^5.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+    "node_modules/postcss-nesting": {
+      "version": "10.1.2",
+      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
       "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "postcss-selector-parser": "^6.0.8"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
       }
     },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.2",
+      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==",
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
       "engines": {
-        "node": ">= 6"
+        "node": "^12 || ^14 || >=16"
       }
     },
-    "node_modules/postcss-modules-local-by-default": {
+    "node_modules/postcss-overflow-shorthand": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
+      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">= 6"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "peerDependencies": {
+        "postcss": "^8"
       }
     },
-    "node_modules/postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
+    "node_modules/postcss-place": {
+      "version": "7.0.4",
+      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
       "dependencies": {
-        "postcss": "^7.0.2"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dependencies": {
-        "postcss": "^7.0.0"
+    "node_modules/postcss-preset-env": {
+      "version": "7.4.2",
+      "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
+      "dependencies": {
+        "@csstools/postcss-color-function": "^1.0.2",
+        "@csstools/postcss-font-format-keywords": "^1.0.0",
+        "@csstools/postcss-hwb-function": "^1.0.0",
+        "@csstools/postcss-ic-unit": "^1.0.0",
+        "@csstools/postcss-is-pseudo-class": "^2.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.0",
+        "@csstools/postcss-oklab-function": "^1.0.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.2.0",
+        "autoprefixer": "^10.4.2",
+        "browserslist": "^4.19.3",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^6.4.0",
+        "postcss-attribute-case-insensitive": "^5.0.0",
+        "postcss-color-functional-notation": "^4.2.2",
+        "postcss-color-hex-alpha": "^8.0.3",
+        "postcss-color-rebeccapurple": "^7.0.2",
+        "postcss-custom-media": "^8.0.0",
+        "postcss-custom-properties": "^12.1.4",
+        "postcss-custom-selectors": "^6.0.0",
+        "postcss-dir-pseudo-class": "^6.0.4",
+        "postcss-double-position-gradients": "^3.1.0",
+        "postcss-env-function": "^4.0.5",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.3",
+        "postcss-image-set-function": "^4.0.6",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.1.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.2",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.3",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.4",
+        "postcss-pseudo-class-any-link": "^7.1.1",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^5.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.1",
+      "integrity": "sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg==",
       "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "peerDependencies": {
+        "postcss": "^8.0.3"
       }
     },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/postcss-normalize-repeat-style": {
+    "node_modules/postcss-safe-parser": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.26"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    "node_modules/postcss-safe-parser/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true,
+      "peer": true
     },
-    "node_modules/postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+    "node_modules/postcss-safe-parser/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dependencies": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dependencies": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "dependencies": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "dependencies": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
         "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-      "dependencies": {
-        "cssesc": "^2.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dependencies": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
+    "node_modules/postcss-safe-parser/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+    "node_modules/postcss-sass": {
+      "version": "0.4.4",
+      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "postcss": "^7.0.2"
+        "gonzales-pe": "^4.3.0",
+        "postcss": "^7.0.21"
       }
     },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+    "node_modules/postcss-sass/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
       "peer": true
     },
-    "node_modules/postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
+    "node_modules/postcss-sass/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "postcss": "^7.0.26"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
         "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
+    "node_modules/postcss-sass/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "dependencies": {
-        "postcss": "^7.0.6"
-      },
+      "version": "4.0.3",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
       }
     },
     "node_modules/postcss-selector-not": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
-      "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
+      "version": "5.0.0",
+      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "balanced-match": "^1.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.9",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -16001,27 +13278,8 @@
         "node": ">=4"
       }
     },
-    "node_modules/postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "dependencies": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
     "node_modules/postcss-syntax": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
       "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
       "dev": true,
       "peer": true,
@@ -16029,68 +13287,29 @@
         "postcss": ">=5.0.0"
       }
     },
-    "node_modules/postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dependencies": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "node_modules/postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6.14.4"
-      }
+      "version": "4.2.0",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
-    "node_modules/postcss/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "engines": {
         "node": ">=6"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/pretty-format": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
       "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "dependencies": {
@@ -16105,7 +13324,6 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -16120,7 +13338,6 @@
     },
     "node_modules/pretty-format/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -16132,46 +13349,32 @@
     },
     "node_modules/pretty-format/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/pretty-format/node_modules/react-is": {
       "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "node_modules/process": {
       "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
     "node_modules/progress": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
     "node_modules/prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
@@ -16182,18 +13385,16 @@
       }
     },
     "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       }
     },
     "node_modules/prop-types-exact": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
       "dev": true,
       "dependencies": {
@@ -16202,33 +13403,14 @@
         "reflect.ownkeys": "^0.2.0"
       }
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "node_modules/psl": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "node_modules/pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -16236,120 +13418,13 @@
     },
     "node_modules/punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/puppeteer": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
-      "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^2.2.1",
-        "mime": "^2.0.3",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.4.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dependencies": {
-        "es6-promisify": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/https-proxy-agent": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-      "dependencies": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/puppeteer/node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/puppeteer/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/puppeteer/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "funding": [
         {
@@ -16368,7 +13443,6 @@
     },
     "node_modules/quick-lru": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
       "peer": true,
@@ -16378,7 +13452,6 @@
     },
     "node_modules/quill": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
       "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
       "dependencies": {
         "clone": "^2.1.1",
@@ -16391,7 +13464,6 @@
     },
     "node_modules/quill-delta": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
       "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
       "dependencies": {
         "deep-equal": "^1.0.1",
@@ -16404,7 +13476,6 @@
     },
     "node_modules/raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "dependencies": {
         "performance-now": "^2.1.0"
@@ -16412,13 +13483,11 @@
     },
     "node_modules/railroad-diagrams": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
       "dev": true
     },
     "node_modules/randexp": {
       "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
       "dev": true,
       "dependencies": {
@@ -16431,37 +13500,13 @@
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/react": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -16474,7 +13519,6 @@
     },
     "node_modules/react-dom": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -16488,7 +13532,6 @@
     },
     "node_modules/react-i18nify": {
       "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/react-i18nify/-/react-i18nify-1.11.18.tgz",
       "integrity": "sha512-flSSBzMI2gvJvCC+byP6Cl7vtyUsNH88VxjyER4zj8Fdl5rsLmXoJ9K4kNz8A6JUTmdFMWbTIp6aPXVIEbpE8w==",
       "dependencies": {
         "intl": "^1.2",
@@ -16499,39 +13542,12 @@
         "react": "^16.0.0"
       }
     },
-    "node_modules/react-input-autosize": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
-      "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
-      "dependencies": {
-        "prop-types": "^15.5.8"
-      },
-      "peerDependencies": {
-        "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0"
-      }
-    },
     "node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
-      "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
-      "dependencies": {
-        "classnames": "^2.2.4",
-        "prop-types": "^15.5.8",
-        "react-input-autosize": "^2.1.2"
-      },
-      "peerDependencies": {
-        "react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0",
-        "react-dom": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0"
-      }
-    },
     "node_modules/react-test-renderer": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "dev": true,
       "dependencies": {
@@ -16544,28 +13560,8 @@
         "react": "^16.14.0"
       }
     },
-    "node_modules/react-typeahead": {
-      "version": "2.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/react-typeahead/-/react-typeahead-2.0.0-alpha.8.tgz",
-      "integrity": "sha1-fwJfjudCAvBPqEJ8r+onMtUU9Yo=",
-      "dependencies": {
-        "classnames": "^1.2.0",
-        "create-react-class": "^15.5.2",
-        "fuzzy": "^0.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14"
-      }
-    },
-    "node_modules/react-typeahead/node_modules/classnames": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.2.tgz",
-      "integrity": "sha1-6WoqAiLYSSXdj62yBdZuEviI7fk="
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dependencies": {
         "pify": "^2.3.0"
@@ -16573,7 +13569,6 @@
     },
     "node_modules/read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "dependencies": {
@@ -16588,7 +13583,6 @@
     },
     "node_modules/read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "dependencies": {
@@ -16605,7 +13599,6 @@
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
       "engines": {
@@ -16614,7 +13607,6 @@
     },
     "node_modules/read-pkg/node_modules/type-fest": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
       "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true,
       "engines": {
@@ -16623,8 +13615,8 @@
     },
     "node_modules/readable-stream": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -16634,21 +13626,9 @@
         "node": ">= 6"
       }
     },
-    "node_modules/readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
     "node_modules/rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "version": "0.7.1",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
       "dependencies": {
         "resolve": "^1.9.0"
       },
@@ -16657,112 +13637,43 @@
       }
     },
     "node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redent/node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redis": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
-      "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "dependencies": {
-        "denque": "^1.5.0",
-        "redis-commands": "^1.7.0",
-        "redis-errors": "^1.2.0",
-        "redis-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-redis"
-      }
-    },
-    "node_modules/redis-commands": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
-      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
-    },
-    "node_modules/redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/redis-parser": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
-        "redis-errors": "^1.0.0"
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/redis-url": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/redis-url/-/redis-url-0.2.0.tgz",
-      "integrity": "sha1-G3otrMw+qCZLH7ZWwNkB2cqcVHA=",
-      "dependencies": {
-        "redis": ">= 0.0.1"
+        "node": ">=8"
       }
     },
     "node_modules/reflect.ownkeys": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
       "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
       "dev": true
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dependencies": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
       "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -16770,7 +13681,6 @@
     },
     "node_modules/regex-not": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "dependencies": {
@@ -16782,9 +13692,8 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.1",
+      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -16797,10 +13706,8 @@
       }
     },
     "node_modules/regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "peer": true,
+      "version": "3.2.0",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "engines": {
         "node": ">=8"
       },
@@ -16809,30 +13716,27 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+      "version": "0.6.0",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
     },
     "node_modules/regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.8.4",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "dependencies": {
         "jsesc": "~0.5.0"
       },
@@ -16842,7 +13746,6 @@
     },
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
       "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -16850,7 +13753,6 @@
     },
     "node_modules/remark": {
       "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
       "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
       "dev": true,
       "peer": true,
@@ -16866,7 +13768,6 @@
     },
     "node_modules/remark-parse": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
       "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
       "dev": true,
       "peer": true,
@@ -16880,7 +13781,6 @@
     },
     "node_modules/remark-stringify": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
       "peer": true,
@@ -16894,13 +13794,10 @@
     },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "node_modules/repeat-element": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
       "engines": {
@@ -16909,126 +13806,42 @@
     },
     "node_modules/repeat-string": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true,
       "engines": {
         "node": ">=0.10"
       }
     },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "devOptional": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17036,7 +13849,6 @@
     },
     "node_modules/resolve-cwd": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dependencies": {
         "resolve-from": "^5.0.0"
@@ -17047,7 +13859,6 @@
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "engines": {
         "node": ">=8"
@@ -17055,50 +13866,36 @@
     },
     "node_modules/resolve-url": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
+    "node_modules/resolve.exports": {
+      "version": "1.1.0",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ret": {
       "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true,
       "engines": {
         "node": ">=0.12"
       }
     },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "node_modules/rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dependencies": {
         "glob": "^7.1.3"
@@ -17110,9 +13907,41 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rollup": {
+      "version": "2.69.0",
+      "integrity": "sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rollup-plugin-terser": {
+      "version": "7.0.2",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0"
+      }
+    },
+    "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/rst-selector-parser": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
       "dev": true,
       "dependencies": {
@@ -17122,7 +13951,6 @@
     },
     "node_modules/rsvp": {
       "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true,
       "engines": {
@@ -17131,7 +13959,6 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "funding": [
         {
@@ -17153,12 +13980,10 @@
     },
     "node_modules/rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "node_modules/rxjs": {
       "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dependencies": {
         "tslib": "^1.9.0"
@@ -17169,17 +13994,14 @@
     },
     "node_modules/rxjs/node_modules/tslib": {
       "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "dependencies": {
@@ -17188,13 +14010,12 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sane": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
       "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
       "dev": true,
       "dependencies": {
         "@cnakazawa/watch": "^1.0.3",
@@ -17216,7 +14037,6 @@
     },
     "node_modules/sane/node_modules/anymatch": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "dependencies": {
@@ -17226,7 +14046,6 @@
     },
     "node_modules/sane/node_modules/braces": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "dependencies": {
@@ -17247,7 +14066,6 @@
     },
     "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17259,7 +14077,6 @@
     },
     "node_modules/sane/node_modules/cross-spawn": {
       "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "dependencies": {
@@ -17275,7 +14092,6 @@
     },
     "node_modules/sane/node_modules/execa": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "dependencies": {
@@ -17293,7 +14109,6 @@
     },
     "node_modules/sane/node_modules/fill-range": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "dependencies": {
@@ -17308,7 +14123,6 @@
     },
     "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17320,7 +14134,6 @@
     },
     "node_modules/sane/node_modules/get-stream": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
       "dependencies": {
@@ -17332,7 +14145,6 @@
     },
     "node_modules/sane/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -17341,7 +14153,6 @@
     },
     "node_modules/sane/node_modules/is-number": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "dependencies": {
@@ -17353,7 +14164,6 @@
     },
     "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -17365,7 +14175,6 @@
     },
     "node_modules/sane/node_modules/is-stream": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true,
       "engines": {
@@ -17374,7 +14183,6 @@
     },
     "node_modules/sane/node_modules/micromatch": {
       "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "dependencies": {
@@ -17398,7 +14206,6 @@
     },
     "node_modules/sane/node_modules/normalize-path": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "dependencies": {
@@ -17410,7 +14217,6 @@
     },
     "node_modules/sane/node_modules/npm-run-path": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "dependencies": {
@@ -17422,7 +14228,6 @@
     },
     "node_modules/sane/node_modules/path-key": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
       "dev": true,
       "engines": {
@@ -17431,7 +14236,6 @@
     },
     "node_modules/sane/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -17440,7 +14244,6 @@
     },
     "node_modules/sane/node_modules/shebang-command": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "dependencies": {
@@ -17452,7 +14255,6 @@
     },
     "node_modules/sane/node_modules/shebang-regex": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true,
       "engines": {
@@ -17461,7 +14263,6 @@
     },
     "node_modules/sane/node_modules/to-regex-range": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "dependencies": {
@@ -17474,7 +14275,6 @@
     },
     "node_modules/sane/node_modules/which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "dependencies": {
@@ -17484,236 +14284,81 @@
         "which": "bin/which"
       }
     },
-    "node_modules/sass": {
-      "version": "1.34.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
-      "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
+    "node_modules/sass-embedded": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.0.tgz",
+      "integrity": "sha512-WCYA7FR0euku/VkpejpjTE6zjL8+h0eFZrLLjx42wCjb9/qKKyFWLdgsErXwnq3jDOMyUY4dYJfenRIVMcEXog==",
+      "hasInstallScript": true,
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
+        "buffer-builder": "^0.2.0",
+        "extract-zip": "^2.0.1",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "node-fetch": "^2.6.0",
+        "rxjs": "^7.4.0",
+        "semver": "^7.3.5",
+        "shelljs": "^0.8.4",
+        "supports-color": "^8.1.1",
+        "tar": "^6.0.5"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/sass-graph/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/lru-cache": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
+      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/sass-graph/node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/rxjs": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/sass-graph/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/sass-graph/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/semver": {
+      "version": "7.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "lru-cache": "^7.4.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/sass-graph/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "optional": true,
-      "peer": true,
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sass-graph/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sass-graph/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/sass-graph/node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/sass-graph/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.1.1.tgz",
-      "integrity": "sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==",
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
-        "sass": "^1.3.0",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
     "node_modules/saxes": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dev": true,
       "dependencies": {
@@ -17725,7 +14370,6 @@
     },
     "node_modules/scheduler": {
       "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -17734,7 +14378,6 @@
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dependencies": {
         "@types/json-schema": "^7.0.5",
@@ -17749,181 +14392,31 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      }
-    },
-    "node_modules/scss-tokenizer/node_modules/source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
-    },
-    "node_modules/selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
-      "dependencies": {
-        "node-forge": "^0.10.0"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
     "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "6.0.0",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "node_modules/set-value": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "dependencies": {
@@ -17938,7 +14431,6 @@
     },
     "node_modules/set-value/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -17950,21 +14442,14 @@
     },
     "node_modules/set-value/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dependencies": {
         "kind-of": "^6.0.2"
@@ -17975,7 +14460,6 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -17986,25 +14470,55 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/shelljs/node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/shelljs/node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/shellwords": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true,
       "optional": true
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -18015,32 +14529,16 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+      "version": "3.0.7",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "engines": {
         "node": ">=8"
@@ -18048,7 +14546,6 @@
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "peer": true,
       "dependencies": {
@@ -18065,7 +14562,6 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "peer": true,
       "dependencies": {
@@ -18080,7 +14576,6 @@
     },
     "node_modules/slice-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "peer": true,
       "dependencies": {
@@ -18092,13 +14587,11 @@
     },
     "node_modules/slice-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "peer": true
     },
     "node_modules/snapdragon": {
       "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "dependencies": {
@@ -18117,7 +14610,6 @@
     },
     "node_modules/snapdragon-node": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "dependencies": {
@@ -18131,7 +14623,6 @@
     },
     "node_modules/snapdragon-node/node_modules/define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "dependencies": {
@@ -18143,7 +14634,6 @@
     },
     "node_modules/snapdragon-util": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "dependencies": {
@@ -18155,7 +14645,6 @@
     },
     "node_modules/snapdragon-util/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18167,7 +14656,6 @@
     },
     "node_modules/snapdragon/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -18176,7 +14664,6 @@
     },
     "node_modules/snapdragon/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -18188,7 +14675,6 @@
     },
     "node_modules/snapdragon/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "dependencies": {
@@ -18200,7 +14686,6 @@
     },
     "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -18212,7 +14697,6 @@
     },
     "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18224,7 +14708,6 @@
     },
     "node_modules/snapdragon/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -18236,7 +14719,6 @@
     },
     "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18248,7 +14730,6 @@
     },
     "node_modules/snapdragon/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -18262,7 +14743,6 @@
     },
     "node_modules/snapdragon/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
@@ -18271,7 +14751,6 @@
     },
     "node_modules/snapdragon/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
@@ -18280,54 +14759,29 @@
     },
     "node_modules/snapdragon/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/social-share-button": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/social-share-button/-/social-share-button-2.2.0.tgz",
-      "integrity": "sha512-8OatmjB10MFqnbgVFJe4SjRXBIwepla/FOo2gsC6w/PsQ1RuS5oKwe9kixv2TfWcTA1GCcT6m+lEylFRPrr71g==",
-      "dependencies": {
-        "domassist": "^2.2.0",
-        "domodule": "^8.0.0"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/sockjs/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "node_modules/source-map": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-loader": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "dependencies": {
         "async": "^2.5.0",
@@ -18339,8 +14793,8 @@
     },
     "node_modules/source-map-resolve": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
@@ -18351,9 +14805,8 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -18361,7 +14814,6 @@
     },
     "node_modules/source-map-support/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
@@ -18369,14 +14821,22 @@
     },
     "node_modules/source-map-url": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
+    "node_modules/spark-md5": {
+      "version": "3.0.2",
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+    },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -18384,54 +14844,25 @@
     },
     "node_modules/spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
+      "version": "3.0.11",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
     },
     "node_modules/specificity": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
       "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
       "dev": true,
       "peer": true,
@@ -18441,7 +14872,6 @@
     },
     "node_modules/split-string": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "dependencies": {
@@ -18453,75 +14883,21 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "node_modules/src": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/src/-/src-1.1.2.tgz",
-      "integrity": "sha1-eKvdHAjKyibMbPRb1YC1bZOs+38=",
+    "node_modules/stack-utils": {
+      "version": "2.0.5",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "dev": true,
       "dependencies": {
-        "redis-url": "~0.2.0",
-        "underscore": "~1.6.0",
-        "uuid": "~1.4.1"
-      }
-    },
-    "node_modules/src/node_modules/uuid": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz",
-      "integrity": "sha1-RTAZ9oaWam34PNxSROfJkOzDMvw=",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details."
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "escape-string-regexp": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=10"
       }
     },
     "node_modules/stack-utils/node_modules/escape-string-regexp": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
       "engines": {
@@ -18530,7 +14906,6 @@
     },
     "node_modules/static-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "dependencies": {
@@ -18543,7 +14918,6 @@
     },
     "node_modules/static-extend/node_modules/define-property": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
       "dev": true,
       "dependencies": {
@@ -18555,7 +14929,6 @@
     },
     "node_modules/static-extend/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "dependencies": {
@@ -18567,7 +14940,6 @@
     },
     "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18579,7 +14951,6 @@
     },
     "node_modules/static-extend/node_modules/is-data-descriptor": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "dependencies": {
@@ -18591,7 +14962,6 @@
     },
     "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -18603,7 +14973,6 @@
     },
     "node_modules/static-extend/node_modules/is-descriptor": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "dependencies": {
@@ -18617,69 +14986,24 @@
     },
     "node_modules/static-extend/node_modules/kind-of": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/stdout-stream/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/stdout-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/string_decoder/node_modules/safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -18695,9 +15019,12 @@
         }
       ]
     },
+    "node_modules/string-env-interpolation": {
+      "version": "1.0.1",
+      "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "dependencies": {
@@ -18709,28 +15036,28 @@
       }
     },
     "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "node_modules/string.prototype.matchall": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz",
-      "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==",
-      "dev": true,
-      "peer": true,
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
@@ -18742,14 +15069,13 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
-      "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18760,7 +15086,6 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
       "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -18772,7 +15097,6 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
       "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -18782,12 +15106,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/stringify-object": {
+      "version": "3.3.0",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -18795,16 +15130,21 @@
     },
     "node_modules/strip-bom": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true,
       "engines": {
@@ -18813,33 +15153,26 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "optional": true,
+      "version": "3.0.0",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
+        "min-indent": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -18848,90 +15181,31 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
+      "version": "3.3.1",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/style-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/style-loader/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
+    "node_modules/style-mod": {
+      "version": "4.0.0",
+      "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
     },
     "node_modules/style-search": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true,
       "peer": true
     },
-    "node_modules/stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/stylehacks/node_modules/postcss-selector-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-      "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/stylelint": {
       "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz",
       "integrity": "sha512-DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==",
       "dev": true,
       "peer": true,
@@ -18998,7 +15272,6 @@
     },
     "node_modules/stylelint/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "peer": true,
@@ -19012,28 +15285,31 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/stylelint/node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+    "node_modules/stylelint/node_modules/autoprefixer": {
+      "version": "9.8.8",
+      "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001109",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "picocolors": "^0.2.1",
+        "postcss": "^7.0.32",
+        "postcss-value-parser": "^4.1.0"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
       }
     },
     "node_modules/stylelint/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -19049,7 +15325,6 @@
     },
     "node_modules/stylelint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "peer": true,
@@ -19062,27 +15337,12 @@
     },
     "node_modules/stylelint/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true,
       "peer": true
     },
-    "node_modules/stylelint/node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stylelint/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "peer": true,
@@ -19090,218 +15350,133 @@
         "node": ">=8"
       }
     },
-    "node_modules/stylelint/node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/stylelint/node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "peer": true,
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/stylelint/node_modules/map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+    "node_modules/stylelint/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "peer": true
     },
-    "node_modules/stylelint/node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+    "node_modules/stylelint/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/stylelint/node_modules/normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+    "node_modules/stylelint/node_modules/postcss-scss": {
+      "version": "2.1.1",
+      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
+        "postcss": "^7.0.6"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/stylelint/node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+    "node_modules/stylelint/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/stylelint/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/stylelint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/stylelint/node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/subscriptions-transport-ws": {
+      "version": "0.11.0",
+      "integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==",
+      "deprecated": "The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws    For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md",
       "dependencies": {
-        "min-indent": "^1.0.0"
+        "backo2": "^1.0.2",
+        "eventemitter3": "^3.1.0",
+        "iterall": "^1.2.1",
+        "symbol-observable": "^1.0.4",
+        "ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "graphql": "^15.7.2 || ^16.0.0"
       }
     },
-    "node_modules/stylelint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/subscriptions-transport-ws/node_modules/eventemitter3": {
+      "version": "3.1.2",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+    },
+    "node_modules/sugarss": {
+      "version": "2.0.0",
+      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "postcss": "^7.0.2"
       }
     },
-    "node_modules/stylelint/node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+    "node_modules/sugarss/node_modules/picocolors": {
+      "version": "0.2.1",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "peer": true
     },
-    "node_modules/stylelint/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+    "node_modules/sugarss/node_modules/postcss": {
+      "version": "7.0.39",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "peer": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/stylelint/node_modules/yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+    "node_modules/sugarss/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "peer": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/subscriptions-transport-ws": {
-      "version": "0.9.19",
-      "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz",
-      "integrity": "sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==",
-      "optional": true,
-      "dependencies": {
-        "backo2": "^1.0.2",
-        "eventemitter3": "^3.1.0",
-        "iterall": "^1.2.1",
-        "symbol-observable": "^1.0.4",
-        "ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
-      },
-      "peerDependencies": {
-        "graphql": ">=0.10.0"
-      }
-    },
-    "node_modules/subscriptions-transport-ws/node_modules/eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
-      "optional": true
-    },
-    "node_modules/subscriptions-transport-ws/node_modules/symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
     "node_modules/supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -19312,7 +15487,6 @@
     },
     "node_modules/supports-hyperlinks": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "dependencies": {
@@ -19325,7 +15499,6 @@
     },
     "node_modules/supports-hyperlinks/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -19334,7 +15507,6 @@
     },
     "node_modules/supports-hyperlinks/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -19344,151 +15516,74 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true,
       "peer": true
     },
     "node_modules/svg4everybody": {
       "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/svg4everybody/-/svg4everybody-2.1.9.tgz",
       "integrity": "sha1-W9n23vwTOFmgRGRtR0P6vCjbfi0=",
       "engines": {
         "node": ">=0.8.0"
       }
     },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/svgo/node_modules/css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/svgo/node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "node_modules/svgo/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/svgo/node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
     "node_modules/symbol-observable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
-      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
+      "version": "1.2.0",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "node_modules/sync-fetch": {
+      "version": "0.3.1",
+      "integrity": "sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==",
+      "dependencies": {
+        "buffer": "^5.7.0",
+        "node-fetch": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tabbable": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
       "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.0",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "peer": true,
       "dependencies": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -19503,22 +15598,20 @@
     },
     "node_modules/table/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "peer": true
     },
     "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "version": "2.2.1",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -19531,9 +15624,41 @@
         "node": ">= 10"
       }
     },
+    "node_modules/temp-dir": {
+      "version": "2.0.0",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tempy": {
+      "version": "0.6.0",
+      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "dependencies": {
+        "is-stream": "^2.0.0",
+        "temp-dir": "^2.0.0",
+        "type-fest": "^0.16.0",
+        "unique-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tempy/node_modules/type-fest": {
+      "version": "0.16.0",
+      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/terminal-link": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dev": true,
       "dependencies": {
@@ -19548,13 +15673,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "version": "5.12.0",
+      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
       "dependencies": {
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
         "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
       },
       "bin": {
         "terser": "bin/terser"
@@ -19564,16 +15689,14 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-      "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+      "version": "5.3.1",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
       "dependencies": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.7.0"
+        "terser": "^5.7.2"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -19584,20 +15707,29 @@
       },
       "peerDependencies": {
         "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-      "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -19607,26 +15739,11 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
+        "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
         "ajv-keywords": "^3.5.2"
       },
@@ -19638,17 +15755,8 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
@@ -19656,7 +15764,6 @@
     },
     "node_modules/terser-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -19668,9 +15775,18 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/terser/node_modules/source-map": {
       "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "engines": {
         "node": ">= 8"
@@ -19678,7 +15794,6 @@
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "dependencies": {
@@ -19692,40 +15807,24 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "peer": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "node_modules/throat": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
       "dev": true
     },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "node_modules/tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "engines": {
         "node": ">=4"
@@ -19733,7 +15832,6 @@
     },
     "node_modules/to-object-path": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "dependencies": {
@@ -19745,7 +15843,6 @@
     },
     "node_modules/to-object-path/node_modules/kind-of": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "dependencies": {
@@ -19757,7 +15854,6 @@
     },
     "node_modules/to-regex": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "dependencies": {
@@ -19772,7 +15868,6 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -19783,20 +15878,10 @@
     },
     "node_modules/toggle-selection": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/tough-cookie": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "dependencies": {
@@ -19810,7 +15895,6 @@
     },
     "node_modules/tr46": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "dependencies": {
@@ -19822,22 +15906,19 @@
     },
     "node_modules/tributejs": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
       "integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
     },
     "node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "optional": true,
+      "version": "3.0.1",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
       "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/trough": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
       "dev": true,
       "peer": true,
@@ -19846,25 +15927,9 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.1.2"
-      }
-    },
-    "node_modules/tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
     "node_modules/ts-invariant": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.7.3.tgz",
-      "integrity": "sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==",
+      "version": "0.9.4",
+      "integrity": "sha512-63jtX/ZSwnUNi/WhXjnK8kz4cHHpYS60AnmA6ixz17l7E12a5puCWFlNpkne5Rl0J8TBPVHpGjsj4fxs8ObVLQ==",
       "dependencies": {
         "tslib": "^2.1.0"
       },
@@ -19872,9 +15937,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/ts-node": {
+      "version": "9.1.1",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dependencies": {
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.7"
+      }
+    },
+    "node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/ts-pnp": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
       "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
       "engines": {
         "node": ">=6"
@@ -19886,11 +15981,9 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.12.0",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
@@ -19900,10 +15993,8 @@
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -19913,38 +16004,18 @@
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "version": "2.3.1",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "node_modules/twemoji": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-13.1.0.tgz",
       "integrity": "sha512-e3fZRl2S9UQQdBFLYXtTBT6o4vidJMnpWUAhJA+yLGR+kaUTZAt3PixC0cGvvxWSuq2MSz/o0rJraOXrWw/4Ew==",
       "dependencies": {
         "fs-extra": "^8.0.1",
@@ -19955,16 +16026,13 @@
     },
     "node_modules/twemoji-parser": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-13.1.0.tgz",
       "integrity": "sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg=="
     },
     "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+      "version": "0.4.0",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dependencies": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -19972,7 +16040,6 @@
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
       "engines": {
@@ -19981,7 +16048,6 @@
     },
     "node_modules/type-fest": {
       "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "engines": {
@@ -19991,40 +16057,37 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/typedarray": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/typescript": {
+      "version": "4.6.2",
+      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/uc.micro": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
       "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "dependencies": {
         "function-bind": "^1.1.1",
@@ -20036,56 +16099,52 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+    "node_modules/undici": {
+      "version": "4.14.1",
+      "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ==",
+      "engines": {
+        "node": ">=12.18"
+      }
     },
     "node_modules/unfetch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.2.tgz",
       "integrity": "sha512-L0qrK7ZeAudGiKYw6nzFjnJ2D5WHblUBwmHIqtPS6oKUd+Hcpk7/hKsSmcHsTlpd1TbTNsiRBUKRq3bHLNIqIw=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "version": "2.0.0",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "version": "2.0.0",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+      "version": "9.2.2",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -20103,7 +16162,6 @@
     },
     "node_modules/unified/node_modules/is-buffer": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
       "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true,
       "funding": [
@@ -20125,9 +16183,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/unified/node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "dependencies": {
@@ -20142,42 +16208,24 @@
     },
     "node_modules/union-value/node_modules/is-extendable": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "node_modules/uniqs": {
+    "node_modules/unique-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "dependencies": {
-        "imurmurhash": "^0.1.4"
+        "crypto-random-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/unist-util-find-all-after": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
       "dev": true,
       "peer": true,
@@ -20191,7 +16239,6 @@
     },
     "node_modules/unist-util-is": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
       "peer": true,
@@ -20202,7 +16249,6 @@
     },
     "node_modules/unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
       "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "peer": true,
@@ -20216,28 +16262,33 @@
     },
     "node_modules/universalify": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/unpipe": {
+    "node_modules/unixify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=",
+      "dependencies": {
+        "normalize-path": "^2.1.1"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+    "node_modules/unixify/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/unset-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "dependencies": {
@@ -20250,7 +16301,6 @@
     },
     "node_modules/unset-value/node_modules/has-value": {
       "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
       "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
       "dev": true,
       "dependencies": {
@@ -20264,7 +16314,6 @@
     },
     "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
       "dev": true,
       "dependencies": {
@@ -20276,16 +16325,22 @@
     },
     "node_modules/unset-value/node_modules/has-values": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
       "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -20293,28 +16348,12 @@
     },
     "node_modules/urix": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-    },
     "node_modules/use": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true,
       "engines": {
@@ -20323,49 +16362,21 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "optional": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
     },
     "node_modules/v8-to-istanbul": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
       "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "dependencies": {
@@ -20379,55 +16390,34 @@
     },
     "node_modules/v8-to-istanbul/node_modules/source-map": {
       "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true,
       "engines": {
         "node": ">= 8"
       }
     },
+    "node_modules/valid-url": {
+      "version": "1.0.9",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+    "node_modules/value-or-promise": {
+      "version": "1.0.11",
+      "integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "node": ">=12"
       }
     },
     "node_modules/vfile": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
       "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
       "peer": true,
@@ -20444,7 +16434,6 @@
     },
     "node_modules/vfile-message": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
       "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
       "peer": true,
@@ -20459,7 +16448,6 @@
     },
     "node_modules/vfile/node_modules/is-buffer": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
       "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true,
       "funding": [
@@ -20483,21 +16471,22 @@
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
       "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.4",
+      "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw=="
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
       "dependencies": {
@@ -20508,18 +16497,16 @@
       }
     },
     "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "dependencies": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "node_modules/watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
+      "version": "2.3.1",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -20528,17 +16515,15 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
+    "node_modules/web-streams-polyfill": {
+      "version": "3.2.0",
+      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==",
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/webidl-conversions": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true,
       "engines": {
@@ -20546,12 +16531,11 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.51.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz",
-      "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==",
+      "version": "5.69.1",
+      "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.50",
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
@@ -20559,12 +16543,12 @@
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.7.1",
+        "enhanced-resolve": "^5.8.3",
+        "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -20572,8 +16556,8 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^3.2.0"
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -20592,9 +16576,8 @@
       }
     },
     "node_modules/webpack-assets-manifest": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-assets-manifest/-/webpack-assets-manifest-5.0.6.tgz",
-      "integrity": "sha512-CW94ylPHurZTmxnYajSFA8763Cv/QFIKNgBwqBLaIOnBjH1EbDUAf8Eq1/i+o8qaKyKXJ3aX7r4/jtpXD88ldg==",
+      "version": "5.1.0",
+      "integrity": "sha512-kPuTMEjBrqZQVJ5M6yXNBCEdFbQQn7p+loNXt8NOeDFaAbsNFWqqwR0YL1mfG5LbwhK5FLXWXpuK3GuIIZ46rg==",
       "dependencies": {
         "chalk": "^4.0",
         "deepmerge": "^4.0",
@@ -20613,7 +16596,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -20626,9 +16608,8 @@
       }
     },
     "node_modules/webpack-assets-manifest/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -20642,7 +16623,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -20653,23 +16633,20 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/webpack-assets-manifest/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/webpack-assets-manifest/node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "version": "3.1.1",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.6",
+        "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
         "ajv-keywords": "^3.5.2"
       },
@@ -20683,7 +16660,6 @@
     },
     "node_modules/webpack-assets-manifest/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -20692,79 +16668,21 @@
         "node": ">=8"
       }
     },
-    "node_modules/webpack-bundle-analyzer": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
-      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.19",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "bin": {
-        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
-      },
-      "engines": {
-        "node": ">= 6.14.4"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-      "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
     "node_modules/webpack-cli": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
-      "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
+      "version": "4.9.2",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.4",
-        "@webpack-cli/info": "^1.3.0",
-        "@webpack-cli/serve": "^1.5.2",
-        "colorette": "^1.2.1",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
         "commander": "^7.0.0",
         "execa": "^5.0.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^2.2.0",
         "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
         "webpack-merge": "^5.7.3"
       },
       "bin": {
@@ -20793,7 +16711,6 @@
     },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "engines": {
         "node": ">= 10"
@@ -20801,7 +16718,6 @@
     },
     "node_modules/webpack-cli/node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dependencies": {
         "cross-spawn": "^7.0.3",
@@ -20823,7 +16739,6 @@
     },
     "node_modules/webpack-cli/node_modules/get-stream": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "engines": {
         "node": ">=10"
@@ -20834,66 +16749,48 @@
     },
     "node_modules/webpack-cli/node_modules/human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "engines": {
         "node": ">=10.17.0"
       }
     },
-    "node_modules/webpack-config-utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-config-utils/-/webpack-config-utils-2.3.1.tgz",
-      "integrity": "sha512-0uC5uj7sThFTePTQjfpe5Wqcbw3KSCxqswOmW96lwk2ZI2CU098rWY2ZqOVGJQYJ3hfEltmjcLNkKutw8LJAlg==",
-      "bundleDependencies": [
-        "webpack-combine-loaders",
-        "qs"
-      ],
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "dependencies": {
-        "webpack-combine-loaders": "2.0.4"
-      }
-    },
-    "node_modules/webpack-config-utils/node_modules/qs": {
-      "version": "6.5.2",
-      "inBundle": true,
-      "license": "BSD-3-Clause",
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
       "engines": {
-        "node": ">=0.6"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/webpack-config-utils/node_modules/webpack-combine-loaders": {
-      "version": "2.0.4",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "qs": "^6.5.2"
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz",
-      "integrity": "sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==",
-      "dependencies": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
-        "memfs": "^3.2.2",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "acorn": "^8"
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+    "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
       "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -20908,334 +16805,366 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack-dev-server": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz",
-      "integrity": "sha512-ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ==",
-      "dependencies": {
-        "ansi-html": "^0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.1",
-        "colorette": "^1.2.2",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
-        "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
-        "schema-utils": "^3.1.0",
-        "selfsigned": "^1.10.11",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^5.0.0",
-        "ws": "^8.1.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
+    "node_modules/what-input": {
+      "version": "5.2.10",
+      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
+      "peer": true
     },
-    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",
-      "integrity": "sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "engines": {
-        "node": ">= 10"
-      }
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
     },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=10"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz",
-      "integrity": "sha512-UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg==",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dependencies": {
-        "ansi-regex": "^6.0.0"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "node-which": "bin/node-which"
       },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/workbox-background-sync": {
+      "version": "6.5.0",
+      "integrity": "sha512-rrekt/gt6qOIZsisj6QZfmAFPAnocq1Z603zAjt+qHmeXY8DLPOklVtvrXSaHoHH3qIjUq3SQY5s2x240iTIKw==",
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "node_modules/workbox-broadcast-update": {
+      "version": "6.5.0",
+      "integrity": "sha512-JC97c7tYqoGWcCfbKO9KHG6lkU+WhXCnDB2j1oFWEiv53nUHy3yjPpzMmAGNLD9oV5lInO15n6V18HfwgkhISw==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "node_modules/workbox-build": {
+      "version": "6.5.0",
+      "integrity": "sha512-da0/1b6//P9+ts7ofcIKcMVPyN6suJvjJASXokF7DsqvUmgRBPcCVV4KCy8QWjgfcz7mzuTpkSbdVHcPFJ/p0A==",
+      "dependencies": {
+        "@apideck/better-ajv-errors": "^0.3.1",
+        "@babel/core": "^7.11.1",
+        "@babel/preset-env": "^7.11.0",
+        "@babel/runtime": "^7.11.2",
+        "@rollup/plugin-babel": "^5.2.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.4.1",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
+        "ajv": "^8.6.0",
+        "common-tags": "^1.8.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "lodash": "^4.17.20",
+        "pretty-bytes": "^5.3.0",
+        "rollup": "^2.43.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "source-map": "^0.8.0-beta.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^2.0.1",
+        "tempy": "^0.6.0",
+        "upath": "^1.2.0",
+        "workbox-background-sync": "6.5.0",
+        "workbox-broadcast-update": "6.5.0",
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-google-analytics": "6.5.0",
+        "workbox-navigation-preload": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-range-requests": "6.5.0",
+        "workbox-recipes": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0",
+        "workbox-streams": "6.5.0",
+        "workbox-sw": "6.5.0",
+        "workbox-window": "6.5.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==",
+    "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
+      "version": "0.3.3",
+      "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
+      "dependencies": {
+        "json-schema": "^0.4.0",
+        "jsonpointer": "^5.0.0",
+        "leven": "^3.1.0"
+      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "ajv": ">=8"
       }
     },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+    "node_modules/workbox-build/node_modules/ajv": {
+      "version": "8.10.0",
+      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/workbox-build/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=10"
+      }
+    },
+    "node_modules/workbox-build/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/workbox-build/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+    "node_modules/workbox-build/node_modules/source-map": {
+      "version": "0.8.0-beta.0",
+      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
       "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
+        "whatwg-url": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+    "node_modules/workbox-build/node_modules/tr46": {
+      "version": "1.0.1",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/workbox-build/node_modules/universalify": {
+      "version": "2.0.0",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/what-input": {
-      "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
-      "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
-      "peer": true
+    "node_modules/workbox-build/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
+    "node_modules/workbox-build/node_modules/whatwg-url": {
+      "version": "7.1.0",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "dependencies": {
-        "iconv-lite": "0.4.24"
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
       }
     },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
+    "node_modules/workbox-cacheable-response": {
+      "version": "6.5.0",
+      "integrity": "sha512-sqAtWAiBwWvI8HG/2Do7BeKPhHuUczt22ORkAjkH9DfTq9LuWRFd6T4HAMqX5G8F1gM9XA2UPlxRrEeSpFIz/A==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
+      }
     },
-    "node_modules/whatwg-url": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz",
-      "integrity": "sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==",
-      "dev": true,
+    "node_modules/workbox-core": {
+      "version": "6.5.0",
+      "integrity": "sha512-5SPwNipUzYBhrneLVT02JFA0fw3LG82jFAN/G2NzxkIW10t4MVZuML2nU94bbkgjq25u0fkY8+4JXzMfHgxEWQ=="
+    },
+    "node_modules/workbox-expiration": {
+      "version": "6.5.0",
+      "integrity": "sha512-y3WRkKRy/gMuZZNkrLFahjY0QZtLoq+QfhTbVAsOGHVg1CCtnNbeFAnEidQs7UisI2BK76VqQPvM7hEOFyZ92A==",
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/workbox-google-analytics": {
+      "version": "6.5.0",
+      "integrity": "sha512-CHHh55wMNCc/BV1URrzEM2Zjgf6g2CV6QpAAc1pBRqaLY5755PeQZbp3o8KbJEM7YsC9mIBeQVsOkSKkGS30bg==",
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "workbox-background-sync": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+    "node_modules/workbox-navigation-preload": {
+      "version": "6.5.0",
+      "integrity": "sha512-ktrRQzXJ0zFy0puOtCa49wE3BSBGUB8KRMot3tEieikCkSO0wMLmiCb9GwTVvNMJLl0THRlsdFoI93si04nTxA==",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "devOptional": true
+    "node_modules/workbox-precaching": {
+      "version": "6.5.0",
+      "integrity": "sha512-IVLzgHx38T6LphJyEOltd7XAvpDi73p85uCT2ZtT1HHg9FAYC49a+5iHUVOnqye73fLW20eiAMFcnehGxz9RWg==",
+      "dependencies": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-range-requests": {
+      "version": "6.5.0",
+      "integrity": "sha512-+qTELdGZE5rOjuv+ifFrfRDN8Uvzpbm5Fal7qSUqB1V1DLCMxPwHCj6mWwQBRKBpW7G09kAwewH7zA3Asjkf/Q==",
       "dependencies": {
-        "string-width": "^1.0.2 || 2"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/workbox-recipes": {
+      "version": "6.5.0",
+      "integrity": "sha512-7hWZAIcXmvr31NwYSWaQIrnThCH/Dx9+eYv/YdkpUeWIXRiHRkYvP1FdiHItbLSjL4Y6K7cy2Y9y5lGCkgaE4w==",
+      "dependencies": {
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/workbox-routing": {
+      "version": "6.5.0",
+      "integrity": "sha512-w1A9OVa/yYStu9ds0Dj+TC6zOAoskKlczf+wZI5mrM9nFCt/KOMQiFp1/41DMFPrrN/8KlZTS3Cel/Ttutw93Q==",
+      "dependencies": {
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-strategies": {
+      "version": "6.5.0",
+      "integrity": "sha512-Ngnwo+tfGw4uKSlTz3h1fYKb/lCV7SDI/dtTb8VaJzRl0N9XssloDGYERBmF6BN/DV/x3bnRsshfobnKI/3z0g==",
       "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "workbox-core": "6.5.0"
       }
     },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "optional": true,
-      "peer": true,
+    "node_modules/workbox-streams": {
+      "version": "6.5.0",
+      "integrity": "sha512-ZbeaZINkju4x45P9DFyRbOYInE+dyNAJIelflz4f9AOAdm+zZUJCooU4MdfsedVhHiTIA6pCD/3jCmW1XbvlbA==",
       "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0"
       }
     },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    "node_modules/workbox-sw": {
+      "version": "6.5.0",
+      "integrity": "sha512-uPGJ9Yost4yabnCko/IuhouquoQKrWOEqLq7L/xVYtltWe4+J8Hw8iPCVtxvXQ26hffd7MaFWUAN83j2ZWbxRg=="
     },
-    "node_modules/window-size": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=",
-      "bin": {
-        "window-size": "cli.js"
+    "node_modules/workbox-webpack-plugin": {
+      "version": "6.5.0",
+      "integrity": "sha512-wy4uCBJELNfJVf2b4Tg3mjJQySq/aReWv4Q1RxQweJkY9ihq7DOGA3wLlXvoauek+MX/SuQfS3it+eXIfHKjvg==",
+      "dependencies": {
+        "fast-json-stable-stringify": "^2.1.0",
+        "pretty-bytes": "^5.4.1",
+        "upath": "^1.2.0",
+        "webpack-sources": "^1.4.3",
+        "workbox-build": "6.5.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0 || ^5.9.0"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+    "node_modules/workbox-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/workbox-window": {
+      "version": "6.5.0",
+      "integrity": "sha512-DOrhiTnWup/CsNstO2uvfdKM4kdStgHd31xGGvBcoCE3Are3DRcy5s3zz3PedcAR1AKskQj3BXz0UhzQiOq8nA==",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "6.5.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "dependencies": {
@@ -21249,7 +17178,6 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -21264,7 +17192,6 @@
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -21276,18 +17203,15 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "dependencies": {
@@ -21298,10 +17222,8 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "devOptional": true,
+      "version": "7.5.7",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -21320,19 +17242,16 @@
     },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "engines": {
         "node": ">=0.4"
@@ -21340,35 +17259,30 @@
     },
     "node_modules/y18n": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/yaml-jest": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/yaml-jest/-/yaml-jest-1.0.5.tgz",
-      "integrity": "sha1-KI5UG64bVR0RPUhk1suPMW4b0zE=",
+      "version": "1.2.0",
+      "integrity": "sha512-rrUNn3ovs5J8td7i3k6rJfh3leBydnM+3YqKJcVyTFRiSiEAdKMy7uhqBxJfsJ+w1le5AGCkMTldNEMY8oqbPg==",
       "dev": true,
       "dependencies": {
-        "js-yaml": "^3.7.0"
+        "js-yaml": "^4.1.0"
       }
     },
     "node_modules/yargs": {
       "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "dependencies": {
@@ -21390,7 +17304,6 @@
     },
     "node_modules/yargs-parser": {
       "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "dependencies": {
@@ -21410,9 +17323,15 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "engines": {
         "node": ">=10"
@@ -21423,12 +17342,17 @@
     },
     "node_modules/zen-observable": {
       "version": "0.8.15",
-      "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
       "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
     },
+    "node_modules/zen-observable-ts": {
+      "version": "1.2.3",
+      "integrity": "sha512-hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g==",
+      "dependencies": {
+        "zen-observable": "0.8.15"
+      }
+    },
     "node_modules/zwitch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
       "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
       "dev": true,
       "peer": true,
@@ -21439,35 +17363,35 @@
     },
     "packages/browserslist-config": {
       "name": "@decidim/browserslist-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0"
     },
     "packages/core": {
       "name": "@decidim/core",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@joeattardi/emoji-button": "^4.6.0",
+        "@joeattardi/emoji-button": "^4.6.2",
+        "@rails/activestorage": "^6.0.4",
+        "@tarekraafat/autocomplete.js": "^10.2.6",
         "@zeitiger/appendaround": "^1.0.0",
-        "axios": "^0.21.1",
+        "axios": "^0.21.4",
         "bootstrap-tagsinput": "^0.7.1",
         "classnames": "^2.2.5",
         "d3": "5.4.0",
+        "dayjs": "^1.11.0",
         "diff": "^5.0.0",
         "foundation-datepicker": "1.5.6",
         "foundation-sites": "^6.7.0",
-        "graphiql": "^1.4.2",
-        "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
+        "graphiql": "^1.4.7",
         "html5sortable": "0.10.0",
         "identity-obj-proxy": "^3.0.0",
         "jquery": "^3.2.1",
         "jquery-serializejson": "2.9.0",
-        "jquery.autocomplete": "1.2.0",
+        "js-cookie": "^3.0.1",
         "leaflet": "1.3.1",
-        "leaflet-svgicon": "^0.0.2",
         "leaflet-tilelayer-here": "1.0.2",
         "leaflet.markercluster": "1.4.1",
-        "moment": "2.29.1",
         "morphdom": "2.6.1",
         "prop-types": "^15.7.2",
         "quill": "1.3.7",
@@ -21475,22 +17399,22 @@
         "react": "^16.3.0",
         "react-dom": "^16.3.0",
         "react-i18nify": "^1.8.8",
-        "react-select": "^1.2.1",
         "select": "^1.1.2",
-        "social-share-button": "2.2.0",
         "svg4everybody": "2.1.9",
         "tributejs": "5.1.3",
         "unfetch": "^3.0.0",
         "uuid": "^3.2.1"
-      },
-      "engines": {
-        "node": "^16.9.1",
-        "npm": "^7.21.1"
+      }
+    },
+    "packages/core/node_modules/@rails/activestorage": {
+      "version": "6.1.4",
+      "integrity": "sha512-1Tm8uaVBhLTDEG4YaFPvqguhjbUGSPVItm0CfkRpIFZIkybWzFAxatIrk4YVOOxB8ZdXS7GdeYa1qVwjdiDkgQ==",
+      "dependencies": {
+        "spark-md5": "^3.0.0"
       }
     },
     "packages/core/node_modules/uuid": {
       "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "bin": {
@@ -21499,7 +17423,7 @@
     },
     "packages/dev": {
       "name": "@decidim/dev",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "dependencies": {
@@ -21508,17 +17432,17 @@
     },
     "packages/elections": {
       "name": "@decidim/elections",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@decidim/decidim-bulletin_board": "0.22.3",
-        "@decidim/voting_schemes-dummy": "0.22.3",
-        "@decidim/voting_schemes-electionguard": "0.22.3"
+        "@decidim/decidim-bulletin_board": "0.23.0",
+        "@decidim/voting_schemes-dummy": "0.23.0",
+        "@decidim/voting_schemes-electionguard": "0.23.0"
       }
     },
     "packages/eslint-config": {
       "name": "@decidim/eslint-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "peerDependencies": {
@@ -21535,7 +17459,7 @@
     },
     "packages/stylelint-config": {
       "name": "@decidim/stylelint-config",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "dev": true,
       "license": "AGPL-3.0",
       "peerDependencies": {
@@ -21544,1431 +17468,3989 @@
     },
     "packages/webpacker": {
       "name": "@decidim/webpacker",
-      "version": "0.26.4",
+      "version": "0.27.2",
       "license": "AGPL-3.0",
       "dependencies": {
-        "@babel/core": "^7.13.13",
-        "@babel/eslint-parser": "^7.13.14",
-        "@babel/plugin-transform-classes": "^7.13.0",
+        "@babel/core": "^7.15.5",
+        "@babel/eslint-parser": "^7.16.5",
+        "@babel/plugin-transform-classes": "^7.16.7",
         "@babel/plugin-transform-regenerator": "^7.13.15",
-        "@babel/plugin-transform-runtime": "^7.13.15",
-        "@babel/preset-env": "^7.13.5",
+        "@babel/plugin-transform-runtime": "^7.15.0",
+        "@babel/preset-env": "^7.15.6",
         "@babel/preset-react": "^7.12.13",
-        "@babel/types": "^7.0.0-beta.40",
+        "@babel/runtime": "^7.15.4",
         "@rails/ujs": "^6.1.3",
         "@rails/webpacker": "6.0.0-rc.5",
-        "@webpack-cli/serve": "^1.3.1",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.0.4",
-        "babel-plugin-__coverage__": "^1.11.111",
-        "babel-preset-airbnb": "^5.0.0",
-        "core-js": "^3.9.1",
-        "css-loader": "^4.3.0",
-        "css-minimizer-webpack-plugin": "^1.3.0",
+        "autoprefixer": "^10.4.1",
+        "babel-loader": "^8.2.2",
+        "compression-webpack-plugin": "^9.0.0",
+        "css-loader": "^6.5.1",
         "expose-loader": "^2.0.0",
-        "mini-css-extract-plugin": "^1.4.0",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-import": "^12.0.1",
-        "postcss-loader": "^5.2.0",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-scss": "^2.1.1",
-        "sass": "^1.32.8",
-        "sass-loader": "^11.0.1",
+        "glob": "^7.2.0",
+        "js-yaml": "^4.1.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "path-complete-extname": "^1.0.0",
+        "pnp-webpack-plugin": "^1.7.0",
+        "postcss": "^8.4.5",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-import": "^14.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-preset-env": "^7.1.0",
+        "postcss-scss": "^4.0.2",
+        "sass-embedded": "^1.49.9",
         "source-map-loader": "^0.2.4",
-        "style-loader": "^2.0.0",
-        "webpack": "^5.11.0",
-        "webpack-bundle-analyzer": "^3.8.0",
-        "webpack-cli": "^4.2.0",
-        "webpack-config-utils": "^2.3.1",
-        "webpack-dev-server": "^4.0.0"
-      }
-    }
-  },
-  "dependencies": {
-    "@apollo/client": {
-      "version": "3.3.20",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.20.tgz",
-      "integrity": "sha512-hS7UmBwJweudw/J3M0RAcusMHNiRuGqkRH6g91PM2ev8cXScIMdXr/++9jo7wD1nAITMCMF4HQQ3LFaw/Or0Bw==",
-      "requires": {
-        "@graphql-typed-document-node/core": "^3.0.0",
-        "@types/zen-observable": "^0.8.0",
-        "@wry/context": "^0.6.0",
-        "@wry/equality": "^0.5.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graphql-tag": "^2.12.0",
-        "hoist-non-react-statics": "^3.3.2",
-        "optimism": "^0.16.0",
-        "prop-types": "^15.7.2",
-        "symbol-observable": "^4.0.0",
-        "ts-invariant": "^0.7.0",
-        "tslib": "^1.10.0",
-        "zen-observable": "^0.8.14"
+        "style-loader": "^3.0.0",
+        "terser-webpack-plugin": "^5.2.4",
+        "webpack": "^5.53.0",
+        "webpack-assets-manifest": "^5.0.6",
+        "webpack-cli": "^4.8.0",
+        "webpack-merge": "^5.8.0",
+        "webpack-sources": "^3.2.1",
+        "workbox-recipes": "^6.4.2",
+        "workbox-webpack-plugin": "^6.4.2"
       },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+      "devDependencies": {
+        "eslint": "^8.6.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "jest": "^27.4.5"
       }
     },
-    "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
-      "requires": {
-        "@babel/highlight": "^7.14.5"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
-    },
-    "@babel/core": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz",
-      "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helpers": "^7.14.8",
-        "@babel/parser": "^7.15.0",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/eslint-parser": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.5.tgz",
-      "integrity": "sha512-20BlOHuGf3UXS7z1QPyllM9Gz8SEgcp/UcKeUmdHIFZO6HF1n+3KaLpeyfwWvjY/Os/ynPX3k8qXE/nZ5dw/0g==",
-      "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+    "packages/webpacker/node_modules/@eslint/eslintrc": {
+      "version": "1.2.0",
+      "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.1",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/generator": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz",
-      "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==",
-      "requires": {
-        "@babel/types": "^7.15.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+    "packages/webpacker/node_modules/@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
-      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/core": {
+      "version": "27.5.1",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz",
-      "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==",
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
+    "packages/webpacker/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
-      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "regexpu-core": "^4.7.1"
+    "packages/webpacker/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.14.5.tgz",
-      "integrity": "sha512-spfQRnoChdYWwyFetQDBSDBgH42VskaquRI52kbLei5MjV7s3NPq30/sh2S3YdT20Ku/ZpaNnTVgmDo20NWylg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/reporters": {
+      "version": "27.5.1",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
-      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+    "packages/webpacker/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
-      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/test-sequencer": {
+      "version": "27.5.1",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz",
-      "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==",
-      "requires": {
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz",
-      "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.15.0",
-        "@babel/helper-simple-access": "^7.14.8",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/acorn": {
+      "version": "8.7.0",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-wrap-function": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/babel-jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz",
-      "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==",
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.15.0",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/babel-plugin-jest-hoist": {
+      "version": "27.5.1",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
-      "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
-      "requires": {
-        "@babel/types": "^7.14.8"
+    "packages/webpacker/node_modules/babel-preset-jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
-      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/camelcase": {
+      "version": "6.3.0",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/chalk": {
+      "version": "4.1.2",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
+    "packages/webpacker/node_modules/ci-info": {
+      "version": "3.3.0",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+      "dev": true
     },
-    "@babel/helper-wrap-function": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
-      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
+    "packages/webpacker/node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
     },
-    "@babel/helpers": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
-      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
-      "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.15.0",
-        "@babel/types": "^7.15.0"
+    "packages/webpacker/node_modules/cliui": {
+      "version": "7.0.4",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+    "packages/webpacker/node_modules/color-convert": {
+      "version": "2.0.1",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "@babel/parser": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
-      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="
+    "packages/webpacker/node_modules/color-name": {
+      "version": "1.1.4",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+    "packages/webpacker/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz",
-      "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+    "packages/webpacker/node_modules/emittery": {
+      "version": "0.8.1",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
-      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+    "packages/webpacker/node_modules/eslint": {
+      "version": "8.10.0",
+      "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.2.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.6.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
-      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+    "packages/webpacker/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
-      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+    "packages/webpacker/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
       }
     },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
-      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+    "packages/webpacker/node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
-      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+    "packages/webpacker/node_modules/eslint/node_modules/ignore": {
+      "version": "5.2.0",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
-      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+    "packages/webpacker/node_modules/espree": {
+      "version": "9.3.1",
+      "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
-      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+    "packages/webpacker/node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
-      "requires": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+    "packages/webpacker/node_modules/execa": {
+      "version": "5.1.1",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
-      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+    "packages/webpacker/node_modules/expect": {
+      "version": "27.5.1",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
-      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+    "packages/webpacker/node_modules/get-stream": {
+      "version": "6.0.1",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
-      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-create-class-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+    "packages/webpacker/node_modules/globals": {
+      "version": "13.12.1",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
-      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/human-signals": {
+      "version": "2.1.0",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
       }
     },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+    "packages/webpacker/node_modules/jest": {
+      "version": "27.5.1",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-changed-files": {
+      "version": "27.5.1",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-cli": {
+      "version": "27.5.1",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+    "packages/webpacker/node_modules/jest-config": {
+      "version": "27.5.1",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+    "packages/webpacker/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-docblock": {
+      "version": "27.5.1",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz",
-      "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-each": {
+      "version": "27.5.1",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+    "packages/webpacker/node_modules/jest-environment-jsdom": {
+      "version": "27.5.1",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jsdom": "^16.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-environment-node": {
+      "version": "27.5.1",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+    "packages/webpacker/node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-jasmine2": {
+      "version": "27.5.1",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "packages/webpacker/node_modules/jest-leak-detector": {
+      "version": "27.5.1",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
-      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
-      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.14.5"
+    "packages/webpacker/node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "dev": true,
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
-      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-classes": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz",
-      "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "globals": "^11.1.0"
+    "packages/webpacker/node_modules/jest-runner": {
+      "version": "27.5.1",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
-      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
-      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
-      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
-      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-util": {
+      "version": "27.5.1",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
-      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-validate": {
+      "version": "27.5.1",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
-      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-watcher": {
+      "version": "27.5.1",
+      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^27.5.1",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
-      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
-      "requires": {
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
-      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
-      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
-      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "packages/webpacker/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz",
-      "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.8",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
+    "packages/webpacker/node_modules/react-is": {
+      "version": "17.0.2",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
     },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
-      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "packages/webpacker/node_modules/semver": {
+      "version": "7.3.5",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
-      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/source-map": {
+      "version": "0.6.1",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
-      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+    "packages/webpacker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
-      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
+    "packages/webpacker/node_modules/throat": {
+      "version": "6.0.1",
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+      "dev": true
     },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
-      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5"
+    "packages/webpacker/node_modules/type-fest": {
+      "version": "0.20.2",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
-      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/v8-to-istanbul": {
+      "version": "8.1.1",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.12.0"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
-      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.3",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "@babel/plugin-transform-property-mutators": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.14.5.tgz",
-      "integrity": "sha512-J/KZdYrLy/mugVWk7Q/him83ba0QGI8twLgov130GGerT6UKrNHeSnZANp96H4S6VOecy2S/9rhH4j8nCauoSw==",
-      "requires": {
-        "@babel/helper-define-map": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz",
-      "integrity": "sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+    "packages/webpacker/node_modules/y18n": {
+      "version": "5.0.8",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz",
-      "integrity": "sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-jsx": "^7.14.5",
-        "@babel/types": "^7.14.5"
+    "packages/webpacker/node_modules/yargs": {
+      "version": "16.2.0",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz",
-      "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==",
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.14.5"
+    "packages/webpacker/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz",
-      "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==",
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.1.2",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@jridgewell/trace-mapping": "^0.3.0"
       }
     },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
-      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+    "@apollo/client": {
+      "version": "3.5.10",
+      "integrity": "sha512-tL3iSpFe9Oldq7gYikZK1dcYxp1c01nlSwtsMz75382HcI6fvQXyFXUCJTTK3wgO2/ckaBvRGw7VqjFREdVoRw==",
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@graphql-typed-document-node/core": "^3.0.0",
+        "@wry/context": "^0.6.0",
+        "@wry/equality": "^0.5.0",
+        "@wry/trie": "^0.3.0",
+        "graphql-tag": "^2.12.3",
+        "hoist-non-react-statics": "^3.3.2",
+        "optimism": "^0.16.1",
+        "prop-types": "^15.7.2",
+        "symbol-observable": "^4.0.0",
+        "ts-invariant": "^0.9.4",
+        "tslib": "^2.3.0",
+        "zen-observable-ts": "^1.2.0"
+      },
+      "dependencies": {
+        "symbol-observable": {
+          "version": "4.0.0",
+          "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="
+        }
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
-      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+    "@babel/code-frame": {
+      "version": "7.16.7",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz",
-      "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
+    "@babel/compat-data": {
+      "version": "7.17.0",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="
+    },
+    "@babel/core": {
+      "version": "7.17.5",
+      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helpers": "^7.17.2",
+        "@babel/parser": "^7.17.3",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
         "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
-      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+    "@babel/eslint-parser": {
+      "version": "7.17.0",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-spread": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
-      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+    "@babel/generator": {
+      "version": "7.17.3",
+      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+        "@babel/types": "^7.17.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       }
     },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
-      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
-      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
-      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.16.7",
+      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/compat-data": "^7.16.4",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
+        "semver": "^6.3.0"
       }
     },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
-      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.17.6",
+      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       }
     },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
-      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.0",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       }
     },
-    "@babel/preset-env": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz",
-      "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==",
-      "requires": {
-        "@babel/compat-data": "^7.15.0",
-        "@babel/helper-compilation-targets": "^7.15.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.9",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-class-static-block": "^7.14.5",
-        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
-        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-        "@babel/plugin-proposal-json-strings": "^7.14.5",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-private-methods": "^7.14.5",
-        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.14.5",
-        "@babel/plugin-transform-async-to-generator": "^7.14.5",
-        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
-        "@babel/plugin-transform-block-scoping": "^7.14.5",
-        "@babel/plugin-transform-classes": "^7.14.9",
-        "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.7",
-        "@babel/plugin-transform-dotall-regex": "^7.14.5",
-        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
-        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
-        "@babel/plugin-transform-for-of": "^7.14.5",
-        "@babel/plugin-transform-function-name": "^7.14.5",
-        "@babel/plugin-transform-literals": "^7.14.5",
-        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
-        "@babel/plugin-transform-modules-amd": "^7.14.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.15.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
-        "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
-        "@babel/plugin-transform-new-target": "^7.14.5",
-        "@babel/plugin-transform-object-super": "^7.14.5",
-        "@babel/plugin-transform-parameters": "^7.14.5",
-        "@babel/plugin-transform-property-literals": "^7.14.5",
-        "@babel/plugin-transform-regenerator": "^7.14.5",
-        "@babel/plugin-transform-reserved-words": "^7.14.5",
-        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.6",
-        "@babel/plugin-transform-sticky-regex": "^7.14.5",
-        "@babel/plugin-transform-template-literals": "^7.14.5",
-        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
-        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
-        "@babel/plugin-transform-unicode-regex": "^7.14.5",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.2",
-        "babel-plugin-polyfill-corejs3": "^0.2.2",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.16.0",
-        "semver": "^6.3.0"
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       }
     },
-    "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+    "@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/preset-react": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz",
-      "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==",
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-transform-react-display-name": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-react-jsx-development": "^7.14.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/runtime": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
-      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+    "@babel/helper-function-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "@babel/helper-get-function-arity": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/runtime-corejs3": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz",
-      "integrity": "sha512-cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg==",
-      "dev": true,
-      "peer": true,
+    "@babel/helper-get-function-arity": {
+      "version": "7.16.7",
+      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
       "requires": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+    "@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/traverse": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz",
-      "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.15.0",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.15.0",
-        "@babel/types": "^7.15.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+    "@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+    "@babel/helper-module-transforms": {
+      "version": "7.17.6",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
+      }
     },
-    "@cnakazawa/watch": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
-      "dev": true,
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "requires": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
+    "@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="
     },
-    "@decidim/browserslist-config": {
-      "version": "file:packages/browserslist-config"
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
     },
-    "@decidim/core": {
-      "version": "file:packages/core",
+    "@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "requires": {
-        "@joeattardi/emoji-button": "^4.6.0",
-        "@zeitiger/appendaround": "^1.0.0",
-        "axios": "^0.21.1",
-        "bootstrap-tagsinput": "^0.7.1",
-        "classnames": "^2.2.5",
-        "d3": "5.4.0",
-        "diff": "^5.0.0",
-        "foundation-datepicker": "1.5.6",
-        "foundation-sites": "^6.7.0",
-        "graphiql": "^1.4.2",
-        "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-        "html5sortable": "0.10.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jquery": "^3.2.1",
-        "jquery-serializejson": "2.9.0",
-        "jquery.autocomplete": "1.2.0",
-        "leaflet": "1.3.1",
-        "leaflet-svgicon": "^0.0.2",
-        "leaflet-tilelayer-here": "1.0.2",
-        "leaflet.markercluster": "1.4.1",
-        "moment": "2.29.1",
-        "morphdom": "2.6.1",
-        "prop-types": "^15.7.2",
-        "quill": "1.3.7",
-        "raf": "^3.4.1",
-        "react": "^16.3.0",
-        "react-dom": "^16.3.0",
-        "react-i18nify": "^1.8.8",
-        "react-select": "^1.2.1",
-        "select": "^1.1.2",
-        "social-share-button": "2.2.0",
-        "svg4everybody": "2.1.9",
-        "tributejs": "5.1.3",
-        "unfetch": "^3.0.0",
-        "uuid": "^3.2.1"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/decidim-bulletin_board": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.22.3.tgz",
-      "integrity": "sha512-LN7wIK9IB9Zegr++fvEY2vAWdUvReLPCe3sbPMGadX3b2aurrx/SK3B38OfRdN2eqblksMzyNYtXALszA9dU2w==",
+    "@babel/helper-simple-access": {
+      "version": "7.16.7",
+      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
       "requires": {
-        "@apollo/client": "^3.2.7",
-        "core-js": "^3.8.3",
-        "graphql": "^15.4.0",
-        "node-jose": "^2.0.0",
-        "regenerator-runtime": "^0.13.7",
-        "rxjs": "^6.6.3",
-        "webpack": "^5.11.0",
-        "webpack-cli": "^4.2.0"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/dev": {
-      "version": "file:packages/dev",
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "requires": {
-        "axe-core": "^4.1.4"
+        "@babel/types": "^7.16.0"
       }
     },
-    "@decidim/elections": {
-      "version": "file:packages/elections",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "requires": {
-        "@decidim/decidim-bulletin_board": "0.22.3",
-        "@decidim/voting_schemes-dummy": "0.22.3",
-        "@decidim/voting_schemes-electionguard": "0.22.3"
+        "@babel/types": "^7.16.7"
       }
     },
-    "@decidim/eslint-config": {
-      "version": "file:packages/eslint-config",
-      "requires": {}
+    "@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
     },
-    "@decidim/stylelint-config": {
-      "version": "file:packages/stylelint-config",
-      "requires": {}
+    "@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
     },
-    "@decidim/voting_schemes-dummy": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.22.3.tgz",
-      "integrity": "sha512-Z5CwSUJNYW2KkoE5anAqAIwHnQHqpgGL4Xu2I7YqEn3thThlbWlY9U9Eq0O6fq7/pfBQLiAFFiBBAnCDv0HC2g=="
+    "@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "requires": {
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
     },
-    "@decidim/voting_schemes-electionguard": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.22.3.tgz",
-      "integrity": "sha512-RZn/1GO5PM6a2SuN8h/SoS4EeLYnHPWw6/tl2M26ms/Xzf1ewJIgBSiByxk4qHoqvE892rccH4+G56h6iVrIqg=="
+    "@babel/helpers": {
+      "version": "7.17.2",
+      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+      "requires": {
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
+      }
     },
-    "@decidim/webpacker": {
-      "version": "file:packages/webpacker",
+    "@babel/highlight": {
+      "version": "7.16.10",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
       "requires": {
-        "@babel/core": "^7.13.13",
-        "@babel/eslint-parser": "^7.13.14",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-regenerator": "^7.13.15",
-        "@babel/plugin-transform-runtime": "^7.13.15",
-        "@babel/preset-env": "^7.13.5",
-        "@babel/preset-react": "^7.12.13",
-        "@babel/types": "^7.0.0-beta.40",
-        "@rails/ujs": "^6.1.3",
-        "@rails/webpacker": "6.0.0-rc.5",
-        "@webpack-cli/serve": "^1.3.1",
-        "autoprefixer": "^9.8.6",
-        "babel-loader": "^8.0.4",
-        "babel-plugin-__coverage__": "^1.11.111",
-        "babel-preset-airbnb": "^5.0.0",
-        "core-js": "^3.9.1",
-        "css-loader": "^4.3.0",
-        "css-minimizer-webpack-plugin": "^1.3.0",
-        "expose-loader": "^2.0.0",
-        "mini-css-extract-plugin": "^1.4.0",
-        "postcss": "^7.0.36",
-        "postcss-flexbugs-fixes": "^4.2.1",
-        "postcss-import": "^12.0.1",
-        "postcss-loader": "^5.2.0",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-scss": "^2.1.1",
-        "sass": "^1.32.8",
-        "sass-loader": "^11.0.1",
-        "source-map-loader": "^0.2.4",
-        "style-loader": "^2.0.0",
-        "webpack": "^5.11.0",
-        "webpack-bundle-analyzer": "^3.8.0",
-        "webpack-cli": "^4.2.0",
-        "webpack-config-utils": "^2.3.1",
-        "webpack-dev-server": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       }
     },
-    "@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="
+    "@babel/parser": {
+      "version": "7.17.3",
+      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="
     },
-    "@eslint/eslintrc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-      "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
-      "peer": true,
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
       "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "13.9.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
-          "peer": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "peer": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "@fortawesome/fontawesome-common-types": {
-      "version": "0.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
-      "integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw=="
-    },
-    "@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.35",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz",
-      "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==",
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.16.7",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
       }
     },
-    "@fortawesome/free-regular-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==",
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.16.8",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "@fortawesome/free-solid-svg-icons": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
-      "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==",
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.35"
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "@graphiql/toolkit": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.2.2.tgz",
-      "integrity": "sha512-kDgYhqnS4p4LqSo1KvLd3tbX8Hhdj0ZrgQuGsosjjEnahiPYmmylxUL1p9lj6348OsypcTlCncGpEjeb9S3TiQ==",
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.6",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
       "requires": {
-        "@n1ru4l/push-pull-async-iterable-iterator": "^2.1.4",
-        "graphql-ws": "^4.3.2",
-        "meros": "^1.1.4",
-        "subscriptions-transport-ws": "^0.9.18"
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
-    "@graphql-typed-document-node/core": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.0.tgz",
-      "integrity": "sha512-wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg==",
-      "requires": {}
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.16.7",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
     },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.16.7",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
       "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.16.7",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
     },
-    "@jest/console": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
-      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
-      "dev": true,
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.16.7",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
       "requires": {
-        "@jest/types": "^26.6.2",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.16.7",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.17.3",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "requires": {
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.16.7"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.16.7",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.16.11",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.16.7",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.16.7",
+      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.16.7",
+      "integrity": "sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.16.8",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.16.7",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.16.7",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.17.3",
+      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.16.7",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.16.7",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.16.7",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.16.7",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.16.8",
+      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.16.7",
+      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.16.7",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.16.8",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.16.7",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.16.7",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.16.7",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-display-name": {
+      "version": "7.16.7",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.17.3",
+      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-jsx": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-development": {
+      "version": "7.16.7",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+      "requires": {
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.16.7",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.16.7",
+      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.16.7",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.17.0",
+      "integrity": "sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.16.7",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.16.7",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.16.7",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.16.7",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.16.7",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.16.11",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "requires": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.5",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/preset-react": {
+      "version": "7.16.7",
+      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.17.2",
+      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.17.2",
+      "integrity": "sha512-NcKtr2epxfIrNM4VOmPKO46TvDMCBhgi2CrSHaEarrz+Plk2K5r9QemmOFTGpZaoKnWoGH5MO+CzeRsih/Fcgg==",
+      "dev": true,
+      "requires": {
+        "core-js-pure": "^3.20.2",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.16.7",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.17.3",
+      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.3",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.3",
+        "@babel/types": "^7.17.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.17.0",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.4",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@codemirror/highlight": {
+      "version": "0.19.7",
+      "integrity": "sha512-3W32hBCY0pbbv/xidismw+RDMKuIag+fo4kZIbD7WoRj+Ttcaxjf+vP6RttRHXLaaqbWh031lTeON8kMlDhMYw==",
+      "requires": {
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/rangeset": "^0.19.0",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "style-mod": "^4.0.0"
+      }
+    },
+    "@codemirror/language": {
+      "version": "0.19.7",
+      "integrity": "sha512-pNNUtYWMIMG0lUSKyUXJr8U0rFiCKsKFXbA2Oj17PC+S1FY99hV0z1vcntW67ekAIZw9DMEUQnLsKBuIbAUX7Q==",
+      "requires": {
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@codemirror/view": "^0.19.0",
+        "@lezer/common": "^0.15.5",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "@codemirror/rangeset": {
+      "version": "0.19.8",
+      "integrity": "sha512-1vusIkxSD0vK5KQ22JO/4Ejfww5268PgM/CpKNBSpTpWZEFlZbmOPyRiY4HXO2oEzOpypbA/walMiNInWnrT0Q==",
+      "requires": {
+        "@codemirror/state": "^0.19.0"
+      }
+    },
+    "@codemirror/state": {
+      "version": "0.19.9",
+      "integrity": "sha512-psOzDolKTZkx4CgUqhBQ8T8gBc0xN5z4gzed109aF6x7D7umpDRoimacI/O6d9UGuyl4eYuDCZmDFr2Rq7aGOw==",
+      "requires": {
+        "@codemirror/text": "^0.19.0"
+      }
+    },
+    "@codemirror/stream-parser": {
+      "version": "0.19.6",
+      "integrity": "sha512-dmPtoz/MR3IphxAsgywEyvSjOJCb2ikAgqp6BGIlwBEJVRiap0wFK4b3f/3DKIHUG4GezWRYQumXNyb3GNQevw==",
+      "requires": {
+        "@codemirror/highlight": "^0.19.0",
+        "@codemirror/language": "^0.19.0",
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/text": "^0.19.0",
+        "@lezer/common": "^0.15.0",
+        "@lezer/lr": "^0.15.0"
+      }
+    },
+    "@codemirror/text": {
+      "version": "0.19.6",
+      "integrity": "sha512-T9jnREMIygx+TPC1bOuepz18maGq/92q2a+n4qTqObKwvNMg+8cMTslb8yxeEDEq7S3kpgGWxgO1UWbQRij0dA=="
+    },
+    "@codemirror/view": {
+      "version": "0.19.45",
+      "integrity": "sha512-wR19UBYvJMeV9axa5Xo6ATbAP1jl30BPFZ5buu3cJjYXwlRhJDjzw2wUbxk1zsR1LtAe5jrRNeWEtGA+IPacxw==",
+      "requires": {
+        "@codemirror/rangeset": "^0.19.5",
+        "@codemirror/state": "^0.19.3",
+        "@codemirror/text": "^0.19.0",
+        "style-mod": "^4.0.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "@csstools/postcss-color-function": {
+      "version": "1.0.2",
+      "integrity": "sha512-uayvFqfa0hITPwVduxRYNL9YBD/anTqula0tu2llalaxblEd7QPuETSN3gB5PvTYxSfd0d8kS4Fypgo5JaUJ6A==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-font-format-keywords": {
+      "version": "1.0.0",
+      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-hwb-function": {
+      "version": "1.0.0",
+      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-ic-unit": {
+      "version": "1.0.0",
+      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.0",
+      "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      }
+    },
+    "@csstools/postcss-normalize-display-values": {
+      "version": "1.0.0",
+      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-oklab-function": {
+      "version": "1.0.1",
+      "integrity": "sha512-Bnly2FWWSTZX20hDJLYHpurhp1ot+ZGvojLOsrHa9frzOVruOv4oPYMZ6wQomi9KsbZZ+Af/CuRYaGReTyGtEg==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-progressive-custom-properties": {
+      "version": "1.2.0",
+      "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@decidim/browserslist-config": {
+      "version": "file:packages/browserslist-config"
+    },
+    "@decidim/core": {
+      "version": "file:packages/core",
+      "requires": {
+        "@joeattardi/emoji-button": "^4.6.2",
+        "@rails/activestorage": "^6.0.4",
+        "@tarekraafat/autocomplete.js": "^10.2.6",
+        "@zeitiger/appendaround": "^1.0.0",
+        "axios": "^0.21.4",
+        "bootstrap-tagsinput": "^0.7.1",
+        "classnames": "^2.2.5",
+        "d3": "5.4.0",
+        "dayjs": "^1.11.0",
+        "diff": "^5.0.0",
+        "foundation-datepicker": "1.5.6",
+        "foundation-sites": "^6.7.0",
+        "graphiql": "^1.4.7",
+        "html5sortable": "0.10.0",
+        "identity-obj-proxy": "^3.0.0",
+        "jquery": "^3.2.1",
+        "jquery-serializejson": "2.9.0",
+        "js-cookie": "^3.0.1",
+        "leaflet": "1.3.1",
+        "leaflet-tilelayer-here": "1.0.2",
+        "leaflet.markercluster": "1.4.1",
+        "morphdom": "2.6.1",
+        "prop-types": "^15.7.2",
+        "quill": "1.3.7",
+        "raf": "^3.4.1",
+        "react": "^16.3.0",
+        "react-dom": "^16.3.0",
+        "react-i18nify": "^1.8.8",
+        "select": "^1.1.2",
+        "svg4everybody": "2.1.9",
+        "tributejs": "5.1.3",
+        "unfetch": "^3.0.0",
+        "uuid": "^3.2.1"
+      },
+      "dependencies": {
+        "@rails/activestorage": {
+          "version": "6.1.4",
+          "integrity": "sha512-1Tm8uaVBhLTDEG4YaFPvqguhjbUGSPVItm0CfkRpIFZIkybWzFAxatIrk4YVOOxB8ZdXS7GdeYa1qVwjdiDkgQ==",
+          "requires": {
+            "spark-md5": "^3.0.0"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
+      }
+    },
+    "@decidim/decidim-bulletin_board": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/decidim-bulletin_board/-/decidim-bulletin_board-0.23.0.tgz",
+      "integrity": "sha512-kCFVv8bgq5+7cizkS+PchiWczsmsFAqQ4phbDm99xA+wz0Rq0iG4SpkNij5Xin0bvGDdVOQ1sU5HPlIePheEZQ==",
+      "requires": {
+        "@apollo/client": "^3.2.7",
+        "core-js": "^3.8.3",
+        "graphql": "^15.4.0",
+        "node-jose": "^2.0.0",
+        "regenerator-runtime": "^0.13.7",
+        "rxjs": "^6.6.3",
+        "webpack": "^5.11.0",
+        "webpack-cli": "^4.2.0"
+      },
+      "dependencies": {
+        "graphql": {
+          "version": "15.8.0",
+          "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="
+        }
+      }
+    },
+    "@decidim/dev": {
+      "version": "file:packages/dev",
+      "requires": {
+        "axe-core": "^4.1.4"
+      }
+    },
+    "@decidim/elections": {
+      "version": "file:packages/elections",
+      "requires": {
+        "@decidim/decidim-bulletin_board": "0.23.0",
+        "@decidim/voting_schemes-dummy": "0.23.0",
+        "@decidim/voting_schemes-electionguard": "0.23.0"
+      }
+    },
+    "@decidim/eslint-config": {
+      "version": "file:packages/eslint-config",
+      "requires": {}
+    },
+    "@decidim/stylelint-config": {
+      "version": "file:packages/stylelint-config",
+      "requires": {}
+    },
+    "@decidim/voting_schemes-dummy": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-dummy/-/voting_schemes-dummy-0.23.0.tgz",
+      "integrity": "sha512-pTXJm6HsL4RmuR9TfKih8iShUk5WK6jZBUESl+T+XDXs4x60Sxi8xJ8GxUb+keTUgYG3hecYnlPez9Okc4WYqw=="
+    },
+    "@decidim/voting_schemes-electionguard": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@decidim/voting_schemes-electionguard/-/voting_schemes-electionguard-0.23.0.tgz",
+      "integrity": "sha512-o5/UXRc6v0Cp2BG/MtNpVAEtyNO3VdfFjJSX75E5W7G2yIu7na+D1HZyHyqIk1rgHPqdJmdg0DT7JI16fDcbXQ=="
+    },
+    "@decidim/webpacker": {
+      "version": "file:packages/webpacker",
+      "requires": {
+        "@babel/core": "^7.15.5",
+        "@babel/eslint-parser": "^7.16.5",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.13.15",
+        "@babel/plugin-transform-runtime": "^7.15.0",
+        "@babel/preset-env": "^7.15.6",
+        "@babel/preset-react": "^7.12.13",
+        "@babel/runtime": "^7.15.4",
+        "@rails/ujs": "^6.1.3",
+        "@rails/webpacker": "6.0.0-rc.5",
+        "autoprefixer": "^10.4.1",
+        "babel-loader": "^8.2.2",
+        "compression-webpack-plugin": "^9.0.0",
+        "css-loader": "^6.5.1",
+        "eslint": "^8.6.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "expose-loader": "^2.0.0",
+        "glob": "^7.2.0",
+        "jest": "^27.4.5",
+        "js-yaml": "^4.1.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "path-complete-extname": "^1.0.0",
+        "pnp-webpack-plugin": "^1.7.0",
+        "postcss": "^8.4.5",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-import": "^14.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-preset-env": "^7.1.0",
+        "postcss-scss": "^4.0.2",
+        "sass-embedded": "^1.49.9",
+        "source-map-loader": "^0.2.4",
+        "style-loader": "^3.0.0",
+        "terser-webpack-plugin": "^5.2.4",
+        "webpack": "^5.53.0",
+        "webpack-assets-manifest": "^5.0.6",
+        "webpack-cli": "^4.8.0",
+        "webpack-merge": "^5.8.0",
+        "webpack-sources": "^3.2.1",
+        "workbox-recipes": "^6.4.2",
+        "workbox-webpack-plugin": "^6.4.2"
+      },
+      "dependencies": {
+        "@eslint/eslintrc": {
+          "version": "1.2.0",
+          "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.4",
+            "debug": "^4.3.2",
+            "espree": "^9.3.1",
+            "globals": "^13.9.0",
+            "ignore": "^4.0.6",
+            "import-fresh": "^3.2.1",
+            "js-yaml": "^4.1.0",
+            "minimatch": "^3.0.4",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "@humanwhocodes/config-array": {
+          "version": "0.9.5",
+          "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+          "dev": true,
+          "requires": {
+            "@humanwhocodes/object-schema": "^1.2.1",
+            "debug": "^4.1.1",
+            "minimatch": "^3.0.4"
+          }
+        },
+        "@jest/console": {
+          "version": "27.5.1",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/core": {
+          "version": "27.5.1",
+          "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/reporters": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "jest-changed-files": "^27.5.1",
+            "jest-config": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-resolve-dependencies": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "jest-watcher": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "rimraf": "^3.0.0",
+            "slash": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "dev": true,
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/reporters": {
+          "version": "27.5.1",
+          "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+          "dev": true,
+          "requires": {
+            "@bcoe/v8-coverage": "^0.2.3",
+            "@jest/console": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "exit": "^0.1.2",
+            "glob": "^7.1.2",
+            "graceful-fs": "^4.2.9",
+            "istanbul-lib-coverage": "^3.0.0",
+            "istanbul-lib-instrument": "^5.1.0",
+            "istanbul-lib-report": "^3.0.0",
+            "istanbul-lib-source-maps": "^4.0.0",
+            "istanbul-reports": "^3.1.3",
+            "jest-haste-map": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.0",
+            "string-length": "^4.0.1",
+            "terminal-link": "^2.0.0",
+            "v8-to-istanbul": "^8.1.0"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "dev": true,
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/test-sequencer": {
+          "version": "27.5.1",
+          "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+          "dev": true,
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-runtime": "^27.5.1"
+          }
+        },
+        "@jest/transform": {
+          "version": "27.5.1",
+          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^27.5.1",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "babel-jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+          "dev": true,
+          "requires": {
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__core": "^7.1.14",
+            "babel-plugin-istanbul": "^6.1.1",
+            "babel-preset-jest": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "slash": "^3.0.0"
+          }
+        },
+        "babel-plugin-jest-hoist": {
+          "version": "27.5.1",
+          "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.3.3",
+            "@babel/types": "^7.3.3",
+            "@types/babel__core": "^7.0.0",
+            "@types/babel__traverse": "^7.0.6"
+          }
+        },
+        "babel-preset-jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+          "dev": true,
+          "requires": {
+            "babel-plugin-jest-hoist": "^27.5.1",
+            "babel-preset-current-node-syntax": "^1.0.0"
+          }
+        },
+        "camelcase": {
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "ci-info": {
+          "version": "3.3.0",
+          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+          "dev": true
+        },
+        "cjs-module-lexer": {
+          "version": "1.2.2",
+          "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+          "dev": true
+        },
+        "emittery": {
+          "version": "0.8.1",
+          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "eslint": {
+          "version": "8.10.0",
+          "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
+          "dev": true,
+          "requires": {
+            "@eslint/eslintrc": "^1.2.0",
+            "@humanwhocodes/config-array": "^0.9.2",
+            "ajv": "^6.10.0",
+            "chalk": "^4.0.0",
+            "cross-spawn": "^7.0.2",
+            "debug": "^4.3.2",
+            "doctrine": "^3.0.0",
+            "escape-string-regexp": "^4.0.0",
+            "eslint-scope": "^7.1.1",
+            "eslint-utils": "^3.0.0",
+            "eslint-visitor-keys": "^3.3.0",
+            "espree": "^9.3.1",
+            "esquery": "^1.4.0",
+            "esutils": "^2.0.2",
+            "fast-deep-equal": "^3.1.3",
+            "file-entry-cache": "^6.0.1",
+            "functional-red-black-tree": "^1.0.1",
+            "glob-parent": "^6.0.1",
+            "globals": "^13.6.0",
+            "ignore": "^5.2.0",
+            "import-fresh": "^3.0.0",
+            "imurmurhash": "^0.1.4",
+            "is-glob": "^4.0.0",
+            "js-yaml": "^4.1.0",
+            "json-stable-stringify-without-jsonify": "^1.0.1",
+            "levn": "^0.4.1",
+            "lodash.merge": "^4.6.2",
+            "minimatch": "^3.0.4",
+            "natural-compare": "^1.4.0",
+            "optionator": "^0.9.1",
+            "regexpp": "^3.2.0",
+            "strip-ansi": "^6.0.1",
+            "strip-json-comments": "^3.1.0",
+            "text-table": "^0.2.0",
+            "v8-compile-cache": "^2.0.3"
+          },
+          "dependencies": {
+            "eslint-visitor-keys": {
+              "version": "3.3.0",
+              "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+              "dev": true
+            },
+            "ignore": {
+              "version": "5.2.0",
+              "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+              "dev": true
+            }
+          }
+        },
+        "eslint-scope": {
+          "version": "7.1.1",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "eslint-utils": {
+          "version": "3.0.0",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "espree": {
+          "version": "9.3.1",
+          "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+          "dev": true,
+          "requires": {
+            "acorn": "^8.7.0",
+            "acorn-jsx": "^5.3.1",
+            "eslint-visitor-keys": "^3.3.0"
+          },
+          "dependencies": {
+            "eslint-visitor-keys": {
+              "version": "3.3.0",
+              "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+              "dev": true
+            }
+          }
+        },
+        "execa": {
+          "version": "5.1.1",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "expect": {
+          "version": "27.5.1",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        },
+        "globals": {
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+          "dev": true
+        },
+        "jest": {
+          "version": "27.5.1",
+          "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^27.5.1",
+            "import-local": "^3.0.2",
+            "jest-cli": "^27.5.1"
+          }
+        },
+        "jest-changed-files": {
+          "version": "27.5.1",
+          "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "execa": "^5.0.0",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-cli": {
+          "version": "27.5.1",
+          "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "import-local": "^3.0.2",
+            "jest-config": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "prompts": "^2.0.1",
+            "yargs": "^16.2.0"
+          }
+        },
+        "jest-config": {
+          "version": "27.5.1",
+          "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.8.0",
+            "@jest/test-sequencer": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "babel-jest": "^27.5.1",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.9",
+            "jest-circus": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-jasmine2": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "parse-json": "^5.2.0",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-docblock": {
+          "version": "27.5.1",
+          "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+          "dev": true,
+          "requires": {
+            "detect-newline": "^3.0.0"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-environment-jsdom": {
+          "version": "27.5.1",
+          "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jsdom": "^16.6.0"
+          }
+        },
+        "jest-environment-node": {
+          "version": "27.5.1",
+          "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "jest-get-type": {
+          "version": "27.5.1",
+          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^27.5.1",
+            "jest-serializer": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-jasmine2": {
+          "version": "27.5.1",
+          "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "co": "^4.6.0",
+            "expect": "^27.5.1",
+            "is-generator-fn": "^2.0.0",
+            "jest-each": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-leak-detector": {
+          "version": "27.5.1",
+          "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+          "dev": true,
+          "requires": {
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+          "dev": true
+        },
+        "jest-resolve": {
+          "version": "27.5.1",
+          "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-resolve-dependencies": {
+          "version": "27.5.1",
+          "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-snapshot": "^27.5.1"
+          }
+        },
+        "jest-runner": {
+          "version": "27.5.1",
+          "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/environment": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "graceful-fs": "^4.2.9",
+            "jest-docblock": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-leak-detector": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "source-map-support": "^0.5.6",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-serializer": {
+          "version": "27.5.1",
+          "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.9"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "27.5.1",
+          "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "leven": "^3.1.0",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-watcher": {
+          "version": "27.5.1",
+          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+          "dev": true,
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "jest-util": "^27.5.1",
+            "string-length": "^4.0.1"
+          }
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "pretty-format": {
+          "version": "27.5.1",
+          "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+              "dev": true
+            }
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "throat": {
+          "version": "6.0.1",
+          "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        },
+        "v8-to-istanbul": {
+          "version": "8.1.1",
+          "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.1",
+            "convert-source-map": "^1.6.0",
+            "source-map": "^0.7.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.3",
+              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+              "dev": true
+            }
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.9",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true
+        }
+      }
+    },
+    "@discoveryjs/json-ext": {
+      "version": "0.5.6",
+      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="
+    },
+    "@endemolshinegroup/cosmiconfig-typescript-loader": {
+      "version": "3.0.2",
+      "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==",
+      "requires": {
+        "lodash.get": "^4",
+        "make-error": "^1",
+        "ts-node": "^9",
+        "tslib": "^2"
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "0.4.3",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "peer": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "globals": {
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "peer": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "peer": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "peer": true
+        }
+      }
+    },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "0.3.0",
+      "integrity": "sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="
+    },
+    "@fortawesome/fontawesome-svg-core": {
+      "version": "1.3.0",
+      "integrity": "sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.3.0"
+      }
+    },
+    "@fortawesome/free-regular-svg-icons": {
+      "version": "5.15.4",
+      "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      },
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": {
+          "version": "0.2.36",
+          "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+        }
+      }
+    },
+    "@fortawesome/free-solid-svg-icons": {
+      "version": "5.15.4",
+      "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      },
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": {
+          "version": "0.2.36",
+          "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
+        }
+      }
+    },
+    "@graphiql/toolkit": {
+      "version": "0.4.2",
+      "integrity": "sha512-14uG67QrONbRrhXwvBJFsMfcQfexmGhj7dgkputesx9xuPUkcCDNmVULnVA8sGYt8P/rSvjkfQYx3rtfW+GhAQ==",
+      "requires": {
+        "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0",
+        "meros": "^1.1.4"
+      }
+    },
+    "@graphql-tools/batch-execute": {
+      "version": "8.3.2",
+      "integrity": "sha512-ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/delegate": {
+      "version": "8.5.1",
+      "integrity": "sha512-/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw==",
+      "requires": {
+        "@graphql-tools/batch-execute": "^8.3.2",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "dataloader": "2.0.0",
+        "graphql-executor": "0.0.18",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/graphql-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg==",
+      "requires": {
+        "@graphql-tools/import": "^6.6.6",
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      }
+    },
+    "@graphql-tools/import": {
+      "version": "6.6.6",
+      "integrity": "sha512-a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w==",
+      "requires": {
+        "@graphql-tools/utils": "8.6.2",
+        "resolve-from": "5.0.0",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/json-file-loader": {
+      "version": "7.3.4",
+      "integrity": "sha512-1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "globby": "^11.0.3",
+        "tslib": "~2.3.0",
+        "unixify": "^1.0.0"
+      }
+    },
+    "@graphql-tools/load": {
+      "version": "7.5.2",
+      "integrity": "sha512-URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g==",
+      "requires": {
+        "@graphql-tools/schema": "8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "p-limit": "3.1.0",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/merge": {
+      "version": "8.2.3",
+      "integrity": "sha512-XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw==",
+      "requires": {
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/schema": {
+      "version": "8.3.2",
+      "integrity": "sha512-77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg==",
+      "requires": {
+        "@graphql-tools/merge": "^8.2.3",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-tools/url-loader": {
+      "version": "7.7.2",
+      "integrity": "sha512-7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA==",
+      "requires": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/utils": "^8.6.2",
+        "@graphql-tools/wrap": "^8.4.2",
+        "@n1ru4l/graphql-live-query": "^0.9.0",
+        "@types/websocket": "^1.0.4",
+        "@types/ws": "^8.0.0",
+        "cross-undici-fetch": "^0.1.19",
+        "dset": "^3.1.0",
+        "extract-files": "^11.0.0",
+        "graphql-sse": "^1.0.1",
+        "graphql-ws": "^5.4.1",
+        "isomorphic-ws": "^4.0.1",
+        "meros": "^1.1.4",
+        "subscriptions-transport-ws": "^0.11.0",
+        "sync-fetch": "^0.3.1",
+        "tslib": "^2.3.0",
+        "valid-url": "^1.0.9",
+        "value-or-promise": "^1.0.11",
+        "ws": "^8.3.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.5.0",
+          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+          "requires": {}
+        }
+      }
+    },
+    "@graphql-tools/utils": {
+      "version": "8.6.2",
+      "integrity": "sha512-x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA==",
+      "requires": {
+        "tslib": "~2.3.0"
+      }
+    },
+    "@graphql-tools/wrap": {
+      "version": "8.4.2",
+      "integrity": "sha512-U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ==",
+      "requires": {
+        "@graphql-tools/delegate": "^8.5.1",
+        "@graphql-tools/schema": "^8.3.2",
+        "@graphql-tools/utils": "^8.6.2",
+        "tslib": "~2.3.0",
+        "value-or-promise": "1.0.11"
+      }
+    },
+    "@graphql-typed-document-node/core": {
+      "version": "3.1.1",
+      "integrity": "sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==",
+      "requires": {}
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "peer": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "@iarna/toml": {
+      "version": "2.2.5",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "dev": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jest/console": {
+      "version": "26.6.2",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "jest-message-util": "^26.6.2",
@@ -22978,7 +21460,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -22986,9 +21467,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -22997,7 +21477,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23006,19 +21485,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23029,7 +21505,6 @@
     },
     "@jest/core": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
       "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "requires": {
@@ -23065,7 +21540,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23073,9 +21547,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23084,7 +21557,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23093,19 +21565,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23116,7 +21585,6 @@
     },
     "@jest/environment": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
       "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
@@ -23128,7 +21596,6 @@
     },
     "@jest/fake-timers": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
       "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
@@ -23142,7 +21609,6 @@
     },
     "@jest/globals": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
       "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "requires": {
@@ -23153,7 +21619,6 @@
     },
     "@jest/reporters": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
       "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "requires": {
@@ -23186,7 +21651,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23194,9 +21658,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23205,7 +21668,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23214,25 +21676,32 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "istanbul-lib-instrument": {
+          "version": "4.0.3",
+          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.5",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23243,7 +21712,6 @@
     },
     "@jest/source-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
       "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "requires": {
@@ -23254,7 +21722,6 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
@@ -23262,7 +21729,6 @@
     },
     "@jest/test-result": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
       "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "requires": {
@@ -23274,7 +21740,6 @@
     },
     "@jest/test-sequencer": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
       "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "requires": {
@@ -23287,7 +21752,6 @@
     },
     "@jest/transform": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
       "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "requires": {
@@ -23310,7 +21774,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23318,9 +21781,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23329,7 +21791,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23338,25 +21799,21 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23367,7 +21824,6 @@
     },
     "@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
       "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
@@ -23380,7 +21836,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -23388,9 +21843,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23399,7 +21853,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -23408,19 +21861,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -23430,15 +21880,15 @@
       }
     },
     "@joeattardi/emoji-button": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@joeattardi/emoji-button/-/emoji-button-4.6.0.tgz",
-      "integrity": "sha512-KwOE1j+YxX47JmT0pXNCa+9Ai4Wf2fmABtvuxy6JBJ5QV0HdoThRKjL6CxAreVwwLbNQ/PDoR36xpc5QJjLXPA==",
+      "version": "4.6.2",
+      "integrity": "sha512-FhuzTmW3nVHLVp2BJfNX17CYV77fqtKZlx328D4h6Dw3cPTT1gJRNXN0jV7BvHgsl6Q/tN8DIQQxTUIO4jW3gQ==",
       "requires": {
         "@fortawesome/fontawesome-svg-core": "^1.2.28",
         "@fortawesome/free-regular-svg-icons": "^5.13.0",
         "@fortawesome/free-solid-svg-icons": "^5.13.0",
         "@popperjs/core": "^2.4.0",
         "@types/twemoji": "^12.1.1",
+        "escape-html": "^1.0.3",
         "focus-trap": "^5.1.0",
         "fuzzysort": "^1.1.4",
         "tiny-emitter": "^2.1.0",
@@ -23446,14 +21896,44 @@
         "twemoji": "^13.0.0"
       }
     },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "@lezer/common": {
+      "version": "0.15.11",
+      "integrity": "sha512-vv0nSdIaVCRcJ8rPuDdsrNVfBOYe/4Szr/LhF929XyDmBndLDuWiCCHooGlGlJfzELyO608AyDhVsuX/ZG36NA=="
+    },
+    "@lezer/lr": {
+      "version": "0.15.8",
+      "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+      "requires": {
+        "@lezer/common": "^0.15.0"
+      }
+    },
+    "@n1ru4l/graphql-live-query": {
+      "version": "0.9.0",
+      "integrity": "sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==",
+      "requires": {}
+    },
     "@n1ru4l/push-pull-async-iterable-iterator": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-2.1.4.tgz",
-      "integrity": "sha512-qLIvoOUJ+zritv+BlzcBMePKNjKQzH9Rb2i9W98YXxf/M62Lye8qH0peyiU8yJ1tL0kfulWi31BoK10E6BKJeA=="
+      "version": "3.2.0",
+      "integrity": "sha512-3fkKj25kEjsfObL6IlKPAlHYPq/oYwUkkQ03zsTTiDjD7vg/RxjdiLeCydqtxHZP0JgsXL3D/X5oAkMGzuUp/Q=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "requires": {
         "@nodelib/fs.stat": "2.0.5",
@@ -23462,40 +21942,26 @@
     },
     "@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
-    "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "requires": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      }
-    },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.11.2",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
     },
     "@rails/ujs": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@rails/ujs/-/ujs-6.1.3.tgz",
-      "integrity": "sha512-9mip5o+LVouWAqLMNJWhxda+D5uP+4RziNECgOGJlL6k3rc5SC/ljCHpV9Cym4i3oeGZkpZJ2tu4frCwt84kzQ=="
+      "version": "6.1.4",
+      "integrity": "sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw=="
     },
     "@rails/webpacker": {
       "version": "6.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@rails/webpacker/-/webpacker-6.0.0-rc.5.tgz",
       "integrity": "sha512-GOEhRs+mRRVZIiZbnLQ1WTxRCuu687rO4cvUVP7WMJ+z5uFr3EQkCaLq5VOtonWHzYbZIBEWH4rCWv0uZnrywQ==",
       "requires": {
         "@babel/core": "^7.15.0",
@@ -23517,24 +21983,70 @@
         "webpack-sources": "^3.2.0"
       },
       "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        "compression-webpack-plugin": {
+          "version": "8.0.1",
+          "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
+          "requires": {
+            "schema-utils": "^3.0.0",
+            "serialize-javascript": "^6.0.0"
+          }
         },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+        "schema-utils": {
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "argparse": "^2.0.1"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
+    "@rollup/plugin-babel": {
+      "version": "5.3.1",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "11.2.1",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      }
+    },
+    "@rollup/plugin-replace": {
+      "version": "2.4.2",
+      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.1.0",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "dependencies": {
+        "@types/estree": {
+          "version": "0.0.39",
+          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+        }
+      }
+    },
     "@sinonjs/commons": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
       "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
@@ -23543,7 +22055,6 @@
     },
     "@sinonjs/fake-timers": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
       "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
       "dev": true,
       "requires": {
@@ -23552,7 +22063,6 @@
     },
     "@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
       "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
       "dev": true,
       "peer": true,
@@ -23562,7 +22072,6 @@
     },
     "@stylelint/postcss-markdown": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
       "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
       "dev": true,
       "peer": true,
@@ -23571,17 +22080,29 @@
         "unist-util-find-all-after": "^3.0.2"
       }
     },
+    "@surma/rollup-plugin-off-main-thread": {
+      "version": "2.2.3",
+      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "requires": {
+        "ejs": "^3.1.6",
+        "json5": "^2.2.0",
+        "magic-string": "^0.25.0",
+        "string.prototype.matchall": "^4.0.6"
+      }
+    },
+    "@tarekraafat/autocomplete.js": {
+      "version": "10.2.6",
+      "integrity": "sha512-M3awL75YTQVHev4XlWGRKJalwVG3MGgtNnbRdtNipcyMcAV1sfkireBM8BKL/vhFhrus+6/5KZfj/DJDu8X0mg=="
+    },
     "@tootallnate/once": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
     "@types/babel__core": {
-      "version": "7.1.14",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
-      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
-      "dev": true,
+      "version": "7.1.18",
+      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "devOptional": true,
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -23591,82 +22112,65 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
-      "dev": true,
+      "version": "7.6.4",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "devOptional": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
-      "dev": true,
+      "version": "7.4.1",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "devOptional": true,
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__traverse": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
-      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
-      "dev": true,
+      "version": "7.14.2",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "devOptional": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
     "@types/eslint": {
-      "version": "7.2.13",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
-      "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+      "version": "8.4.1",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "version": "3.7.3",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
       }
     },
     "@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
+      "version": "0.0.51",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/graceful-fs": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
       "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "@types/http-proxy": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz",
-      "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "requires": {
@@ -23675,7 +22179,6 @@
     },
     "@types/istanbul-reports": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
       "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
@@ -23684,20 +22187,16 @@
     },
     "@types/json-schema": {
       "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "@types/json5": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "version": "3.0.10",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -23705,85 +22204,93 @@
       }
     },
     "@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.2",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true,
       "peer": true
     },
     "@types/node": {
-      "version": "15.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="
+      "version": "17.0.21",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==",
+      "version": "2.4.4",
+      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
       "dev": true
     },
-    "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
-    },
-    "@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+    "@types/resolve": {
+      "version": "1.17.1",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "@types/trusted-types": {
+      "version": "2.0.2",
+      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+    },
     "@types/twemoji": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@types/twemoji/-/twemoji-12.1.1.tgz",
-      "integrity": "sha512-dW1B1WHTfrWmEzXb/tp8xsZqQHAyMB9JwLwbBqkIQVzmNUI02R7lJqxUpKFM114ygNZHKA1r74oPugCAiYHt1A=="
+      "version": "12.1.2",
+      "integrity": "sha512-3eMyKenMi0R1CeKzBYtk/Z2JIHsTMQrIrTah0q54o45pHTpWVNofU2oHx0jS8tqsDRhis2TbB6238WP9oh2l2w=="
     },
     "@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
+      "version": "2.0.6",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
       "dev": true,
       "peer": true
     },
+    "@types/websocket": {
+      "version": "1.0.5",
+      "integrity": "sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "8.5.2",
+      "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
-    "@types/zen-observable": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz",
-      "integrity": "sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="
+    "@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
@@ -23792,22 +22299,18 @@
     },
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
       "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
       "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
       "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
@@ -23817,12 +22320,10 @@
     },
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
       "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23833,7 +22334,6 @@
     },
     "@webassemblyjs/ieee754": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
@@ -23841,7 +22341,6 @@
     },
     "@webassemblyjs/leb128": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "requires": {
         "@xtuc/long": "4.2.2"
@@ -23849,12 +22348,10 @@
     },
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
       "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23869,7 +22366,6 @@
     },
     "@webassemblyjs/wasm-gen": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23881,7 +22377,6 @@
     },
     "@webassemblyjs/wasm-opt": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23892,7 +22387,6 @@
     },
     "@webassemblyjs/wasm-parser": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23905,7 +22399,6 @@
     },
     "@webassemblyjs/wast-printer": {
       "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
@@ -23913,148 +22406,100 @@
       }
     },
     "@webpack-cli/configtest": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-      "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+      "version": "1.1.1",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
       "requires": {}
     },
     "@webpack-cli/info": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-      "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+      "version": "1.4.1",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
       "requires": {
         "envinfo": "^7.7.3"
       }
     },
     "@webpack-cli/serve": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
+      "version": "1.6.1",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
       "requires": {}
     },
     "@wry/context": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz",
-      "integrity": "sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==",
+      "version": "0.6.1",
+      "integrity": "sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@wry/equality": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz",
-      "integrity": "sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==",
+      "version": "0.5.2",
+      "integrity": "sha512-oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@wry/trie": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz",
-      "integrity": "sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==",
+      "version": "0.3.1",
+      "integrity": "sha512-WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==",
       "requires": {
-        "tslib": "^2.1.0"
+        "tslib": "^2.3.0"
       }
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zeitiger/appendaround": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@zeitiger/appendaround/-/appendaround-1.0.0.tgz",
       "integrity": "sha1-v4V4Prdpa6h5Irym42X0O1SH4Ns="
     },
     "abab": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true,
-      "peer": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+    "abort-controller": {
+      "version": "3.0.0",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "event-target-shim": "^5.0.0"
       }
     },
     "acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="
+      "version": "7.4.1",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        }
       }
     },
-    "acorn-import-assertions": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz",
-      "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==",
-      "requires": {}
-    },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "peer": true,
+      "version": "5.3.2",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
     },
     "agent-base": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "requires": {
         "debug": "4"
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "airbnb-prop-types": {
       "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
       "dev": true,
       "requires": {
@@ -24071,7 +22516,6 @@
     },
     "ajv": {
       "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -24080,52 +22524,53 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-formats": {
+      "version": "2.1.1",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "requires": {
+        "ajv": "^8.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        }
+      }
+    },
     "ajv-keywords": {
       "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "requires": {}
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true,
-      "peer": true
-    },
     "ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "peer": true
     },
     "ansi-escapes": {
       "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.21.3"
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
-    },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "5.0.1",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
         "color-convert": "^1.9.0"
@@ -24133,73 +22578,25 @@
     },
     "anymatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "optional": true,
-      "peer": true
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
+    "arg": {
+      "version": "4.1.3",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "aria-query": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@babel/runtime": "^7.10.2",
         "@babel/runtime-corejs3": "^7.10.2"
@@ -24207,307 +22604,156 @@
     },
     "arr-diff": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
     "arr-flatten": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-union": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "optional": true,
-      "peer": true
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
     "array-includes": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
-      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+      "version": "3.1.4",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       }
     },
     "array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
     },
     "array-unique": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
     "array.prototype.filter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz",
-      "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==",
+      "version": "1.0.1",
+      "integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0",
+        "es-abstract": "^1.19.0",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.5"
+        "is-string": "^1.0.7"
       }
     },
     "array.prototype.find": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
-      "integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
+      "version": "2.1.2",
+      "integrity": "sha512-00S1O4ewO95OmmJW7EesWfQlrCrLEL8kZ40w3+GkLX2yTt0m2ggcePPa2uHPJ9KUmJvwRq+lCV9bD8Yim23x/Q==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.4"
+        "es-abstract": "^1.19.0"
       }
     },
     "array.prototype.flat": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
-      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "version": "1.2.5",
+      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "es-abstract": "^1.19.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
-      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.19.0"
       }
     },
     "arrify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true,
       "peer": true
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
     "assign-symbols": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
     "ast-types-flow": {
       "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "astral-regex": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "peer": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
     },
-    "async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "optional": true,
-      "peer": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
     "atob": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "attrobj": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/attrobj/-/attrobj-3.1.0.tgz",
-      "integrity": "sha512-YFN+wZSEgER2w5IdIkmNkPiGqi6lRrNKL+VPl+7WnAPenZvnPC6bEmQuxka06Ilwx265x/K6QRh9W5Klav738Q=="
-    },
-    "aug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/aug/-/aug-4.0.0.tgz",
-      "integrity": "sha512-2cr7AHg5B+Cbjma7qhs+DZbKznzKwpkjfSCb48WVJfEF/+Hwxsu4GPGuqUblt/0gVYBiqdeAIrerlTjt8edyKg=="
-    },
     "autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "version": "10.4.2",
+      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
       "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
+        "browserslist": "^4.19.1",
+        "caniuse-lite": "^1.0.30001297",
+        "fraction.js": "^4.1.2",
         "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
-    },
     "axe-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz",
-      "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==",
+      "version": "4.4.1",
+      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
       "dev": true
     },
     "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "version": "0.21.4",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "axobject-query": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true,
-      "peer": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
+      "dev": true
     },
     "babel-jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
       "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "requires": {
@@ -24523,7 +22769,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -24531,9 +22776,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -24542,7 +22786,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -24551,19 +22794,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -24573,9 +22813,8 @@
       }
     },
     "babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.2.3",
+      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
       "requires": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
@@ -24583,47 +22822,27 @@
         "schema-utils": "^2.6.5"
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-__coverage__": {
-      "version": "1.11.111",
-      "resolved": "https://registry.npmjs.org/babel-plugin-__coverage__/-/babel-plugin-__coverage__-1.11.111.tgz",
-      "integrity": "sha1-AdD4396mrPvqJ3U/oteELwZcxXk=",
-      "requires": {
-        "babel-helper-function-name": "^6.5.0",
-        "babel-template": "^6.8.0"
-      }
-    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "requires": {
         "object.assign": "^4.1.0"
       }
     },
     "babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       }
     },
     "babel-plugin-jest-hoist": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
       "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "requires": {
@@ -24634,63 +22853,31 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
-      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "version": "0.3.1",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "requires": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz",
-      "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==",
+      "version": "0.5.2",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2",
-        "core-js-compat": "^3.9.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
-      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "version": "0.3.1",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.2"
-      }
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "babel-preset-airbnb": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-airbnb/-/babel-preset-airbnb-5.0.0.tgz",
-      "integrity": "sha512-Y5nqHhnhu4RpwbmQj4H+srdk1kb413pX81PfJsT1IZQOuEuRzUDXmgN4Ut1GgpQJnfRpjjEuQy0/uzcLMMP1cQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-transform-classes": "^7.9.2",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-property-mutators": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.4",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       }
     },
     "babel-preset-current-node-syntax": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "requires": {
@@ -24710,7 +22897,6 @@
     },
     "babel-preset-jest": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
       "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "requires": {
@@ -24718,119 +22904,22 @@
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-        }
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
-    },
     "backo2": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "optional": true
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "bail": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
       "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
       "dev": true,
       "peer": true
     },
     "balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base": {
       "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
@@ -24845,7 +22934,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -24856,123 +22944,27 @@
     },
     "base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "base64url": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
     },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
     "big.js": {
       "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-        }
-      }
-    },
     "boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
     },
     "bootstrap-tagsinput": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-tagsinput/-/bootstrap-tagsinput-0.7.1.tgz",
       "integrity": "sha1-/+Owa74qEGlF7ygUVoAFqU8hGTc="
     },
     "brace-expansion": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
@@ -24981,7 +22973,6 @@
     },
     "braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "requires": {
         "fill-range": "^7.0.1"
@@ -24989,25 +22980,22 @@
     },
     "browser-process-hrtime": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
     "browserslist": {
-      "version": "4.16.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
-      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+      "version": "4.19.3",
+      "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001251",
-        "colorette": "^1.3.0",
-        "electron-to-chromium": "^1.3.811",
+        "caniuse-lite": "^1.0.30001312",
+        "electron-to-chromium": "^1.4.71",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.75"
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
       }
     },
     "bser": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
       "requires": {
@@ -25016,60 +23004,32 @@
     },
     "buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "requires": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
       }
     },
+    "buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha1-MyLNMH2Cltqx9gRhhZOyYaP63o8="
+    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "version": "1.1.2",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "cacache": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
-      "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
-      "requires": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      }
+    "builtin-modules": {
+      "version": "3.2.0",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
     },
     "cache-base": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
@@ -25086,100 +23046,47 @@
     },
     "call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "requires": {
-        "callsites": "^2.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
-        }
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "requires": {
-        "caller-callsite": "^2.0.0"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       }
     },
     "callsites": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "devOptional": true
+      "dev": true
     },
     "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "optional": true,
+      "version": "6.2.2",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001252",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-      "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw=="
+      "version": "1.0.30001355",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001355.tgz",
+      "integrity": "sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g=="
     },
     "capture-exit": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
       "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "dev": true,
       "requires": {
         "rsvp": "^4.8.4"
       }
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
     "chalk": {
       "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -25189,39 +23096,29 @@
     },
     "char-regex": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true
     },
     "character-entities": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true,
       "peer": true
     },
     "character-entities-legacy": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
       "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
       "dev": true,
       "peer": true
     },
     "character-reference-invalid": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true,
       "peer": true
     },
-    "check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
-    },
     "cheerio": {
       "version": "1.0.0-rc.10",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
       "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
       "dev": true,
       "requires": {
@@ -25236,7 +23133,6 @@
     },
     "cheerio-select": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
       "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
       "dev": true,
       "requires": {
@@ -25247,21 +23143,6 @@
         "domutils": "^2.7.0"
       }
     },
-    "chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "requires": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
-      }
-    },
     "chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -25269,24 +23150,20 @@
     },
     "chrome-trace-event": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "ci-info": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
     "cjs-module-lexer": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
       "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
       "dev": true
     },
     "class-utils": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
@@ -25298,7 +23175,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -25307,7 +23183,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -25316,7 +23191,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -25327,7 +23201,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -25336,7 +23209,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -25347,7 +23219,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -25358,7 +23229,6 @@
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
@@ -25366,17 +23236,10 @@
     },
     "classnames": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-    },
     "cliui": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "requires": {
@@ -25387,12 +23250,10 @@
     },
     "clone": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
     },
     "clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "requires": {
         "is-plain-object": "^2.0.4",
@@ -25402,58 +23263,45 @@
     },
     "clone-regexp": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
       "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
       "dev": true,
       "peer": true,
       "requires": {
         "is-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "is-regexp": {
+          "version": "2.1.0",
+          "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "co": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
     "codemirror": {
-      "version": "5.61.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
-      "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
+      "version": "5.65.2",
+      "integrity": "sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA=="
     },
     "codemirror-graphql": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.0.2.tgz",
-      "integrity": "sha512-D4+BdYa6iQnDlio4mBk1Yap5ROCqEWapSFLkiKGatx/I0dF6euzdwd0um3Ndudw6rFQbNuT7hpcH8tnBO6VOfQ==",
+      "version": "1.2.12",
+      "integrity": "sha512-irP+E8HOWtgIdU3PNTU77bNmpEXQYADRRDmKqkjh3w1m0welbxl6HtZgp+c+Mkkz+FXY1+3+gF6nEEj+eJ1xdg==",
       "requires": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-parser": "^1.9.0"
+        "@codemirror/stream-parser": "^0.19.2",
+        "graphql-language-service": "^4.1.5"
       }
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
       "dev": true
     },
     "collection-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
@@ -25461,18 +23309,8 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.4"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "requires": {
         "color-name": "1.1.3"
@@ -25480,126 +23318,84 @@
     },
     "color-name": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "color-string": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-      "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "colorette": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
+      "version": "2.0.16",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
     },
     "combined-stream": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
+    "common-tags": {
+      "version": "1.8.2",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
+    },
     "commondir": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "component-emitter": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+    "compression-webpack-plugin": {
+      "version": "9.2.0",
+      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
       "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "requires": {
-            "ms": "2.0.0"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "compression-webpack-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-8.0.1.tgz",
-      "integrity": "sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==",
-      "requires": {
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "schema-utils": {
+          "version": "4.0.0",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "requires": {
-            "randombytes": "^2.1.0"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
     },
     "concat-map": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
       "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "dev": true,
       "requires": {
@@ -25609,472 +23405,174 @@
         "typedarray": "^0.0.6"
       }
     },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "optional": true,
-      "peer": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "copy-to-clipboard": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
-      "requires": {
-        "toggle-selection": "^1.0.6"
-      }
-    },
-    "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
-    },
-    "core-js-compat": {
-      "version": "3.16.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.4.tgz",
-      "integrity": "sha512-IzCSomxRdahCYb6G3HiN6pl3JCiM0NMunRcNa1pIeC7g17Vd6Ue3AT9anQiENPIm/svThUVer1pIbLMDERIsFw==",
-      "requires": {
-        "browserslist": "^4.16.8",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
-        }
-      }
-    },
-    "core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true,
-      "peer": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
-      "requires": {
-        "loose-envify": "^1.3.1",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      }
-    },
-    "css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "css-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz",
-      "integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==",
-      "requires": {
-        "camelcase": "^6.0.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.3",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.1",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "css-minimizer-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-jFa0Siplmfef4ndKglpVaduY47oHQwioAOEGK0f0vAX0s+vc+SmP6cCMoc+8Adau5600RnOEld5VVdC8CQau7w==",
-      "requires": {
-        "cacache": "^15.0.5",
-        "cssnano": "^4.1.10",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.3.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "webpack-sources": "^1.4.3"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
+    "convert-source-map": {
+      "version": "1.8.0",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "requires": {
-        "postcss": "^7.0.5"
+        "safe-buffer": "~5.1.1"
       }
     },
-    "css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-      "dev": true,
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-to-clipboard": {
+      "version": "3.3.1",
+      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "toggle-selection": "^1.0.6"
       }
     },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
+    "core-js": {
+      "version": "3.21.1",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
     },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+    "core-js-compat": {
+      "version": "3.21.1",
+      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
       "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
+        "browserslist": "^4.19.1",
+        "semver": "7.0.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "semver": {
+          "version": "7.0.0",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
         }
       }
     },
-    "css-what": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+    "core-js-pure": {
+      "version": "3.21.1",
+      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
       "dev": true
     },
-    "cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+    "cosmiconfig": {
+      "version": "7.0.1",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      }
     },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    "cosmiconfig-toml-loader": {
+      "version": "1.0.0",
+      "integrity": "sha512-H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA==",
+      "requires": {
+        "@iarna/toml": "^2.2.5"
+      }
     },
-    "cssnano": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
+    "create-require": {
+      "version": "1.1.1",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.8",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-          "requires": {
-            "import-fresh": "^2.0.0",
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.13.1",
-            "parse-json": "^4.0.0"
-          }
-        },
-        "import-fresh": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-          "requires": {
-            "caller-path": "^2.0.0",
-            "resolve-from": "^3.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
-        }
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
-    "cssnano-preset-default": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.3",
-        "postcss-unique-selectors": "^4.0.1"
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8="
+    "cross-undici-fetch": {
+      "version": "0.1.25",
+      "integrity": "sha512-KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "form-data-encoder": "^1.7.1",
+        "formdata-node": "^4.3.1",
+        "node-fetch": "^2.6.7",
+        "undici": "^4.9.3",
+        "web-streams-polyfill": "^3.2.0"
+      }
     },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0="
+    "crypto-random-string": {
+      "version": "2.0.0",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
     },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+    "css-blank-pseudo": {
+      "version": "3.0.3",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
+    "css-has-pseudo": {
+      "version": "3.0.4",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      }
     },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+    "css-loader": {
+      "version": "6.6.0",
+      "integrity": "sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==",
       "requires": {
-        "css-tree": "^1.1.2"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.5",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.5"
       },
       "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
+            "lru-cache": "^6.0.0"
           }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
+    "css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "requires": {}
+    },
+    "css-select": {
+      "version": "4.2.1",
+      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      }
+    },
+    "css-what": {
+      "version": "5.1.0",
+      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "dev": true
+    },
+    "cssdb": {
+      "version": "6.4.0",
+      "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA=="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    },
     "cssom": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
       "dev": true
     },
     "cssstyle": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "requires": {
@@ -26083,25 +23581,13 @@
       "dependencies": {
         "cssom": {
           "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
           "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
           "dev": true
         }
       }
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "d3": {
       "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-5.4.0.tgz",
       "integrity": "sha1-CQGZqFadHeI9BKP/B/4TYJX+p04=",
       "requires": {
         "d3-array": "1",
@@ -26139,17 +23625,14 @@
     },
     "d3-array": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
       "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
     },
     "d3-axis": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
       "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
     },
     "d3-brush": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz",
       "integrity": "sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==",
       "requires": {
         "d3-dispatch": "1",
@@ -26161,7 +23644,6 @@
     },
     "d3-chord": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
       "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
       "requires": {
         "d3-array": "1",
@@ -26170,17 +23652,14 @@
     },
     "d3-collection": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
       "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "d3-contour": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
       "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
       "requires": {
         "d3-array": "^1.1.1"
@@ -26188,12 +23667,10 @@
     },
     "d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
       "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
     },
     "d3-drag": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
       "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
       "requires": {
         "d3-dispatch": "1",
@@ -26202,7 +23679,6 @@
     },
     "d3-dsv": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
       "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
       "requires": {
         "commander": "2",
@@ -26212,12 +23688,10 @@
     },
     "d3-ease": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz",
       "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ=="
     },
     "d3-fetch": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz",
       "integrity": "sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==",
       "requires": {
         "d3-dsv": "1"
@@ -26225,7 +23699,6 @@
     },
     "d3-force": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
       "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
       "requires": {
         "d3-collection": "1",
@@ -26236,12 +23709,10 @@
     },
     "d3-format": {
       "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
       "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
     },
     "d3-geo": {
       "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
       "integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
       "requires": {
         "d3-array": "1"
@@ -26249,12 +23720,10 @@
     },
     "d3-hierarchy": {
       "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
       "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "d3-interpolate": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
       "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "requires": {
         "d3-color": "1"
@@ -26262,27 +23731,22 @@
     },
     "d3-path": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "d3-polygon": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
       "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
     },
     "d3-quadtree": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
       "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
     },
     "d3-random": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
       "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
     },
     "d3-scale": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
       "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
       "requires": {
         "d3-array": "^1.2.0",
@@ -26295,7 +23759,6 @@
     },
     "d3-scale-chromatic": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
       "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
       "requires": {
         "d3-color": "1",
@@ -26304,12 +23767,10 @@
     },
     "d3-selection": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
       "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
     },
     "d3-shape": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
       "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "requires": {
         "d3-path": "1"
@@ -26317,12 +23778,10 @@
     },
     "d3-time": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
       "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "d3-time-format": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
       "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
       "requires": {
         "d3-time": "1"
@@ -26330,12 +23789,10 @@
     },
     "d3-timer": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
       "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
     },
     "d3-transition": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
       "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
       "requires": {
         "d3-color": "1",
@@ -26348,12 +23805,10 @@
     },
     "d3-voronoi": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
       "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
     },
     "d3-zoom": {
       "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
       "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
       "requires": {
         "d3-dispatch": "1",
@@ -26364,23 +23819,12 @@
       }
     },
     "damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true,
-      "peer": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
+      "version": "1.0.8",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+      "dev": true
     },
     "data-urls": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
       "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
       "dev": true,
       "requires": {
@@ -26389,45 +23833,62 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "dataloader": {
+      "version": "2.0.0",
+      "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="
+    },
+    "dayjs": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
+    },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.3",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "requires": {
         "ms": "2.1.2"
       }
     },
     "decamelize": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
     },
     "decamelize-keys": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
       "dev": true,
       "peer": true,
       "requires": {
         "decamelize": "^1.1.0",
         "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "map-obj": {
+          "version": "1.0.1",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "dedent": {
+      "version": "0.7.0",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "deep-equal": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
       "requires": {
         "is-arguments": "^1.0.4",
@@ -26439,59 +23900,15 @@
       }
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
     },
-    "default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "requires": {
-        "execa": "^5.0.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.0",
-            "human-signals": "^2.1.0",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.1",
-            "onetime": "^5.1.2",
-            "signal-exit": "^3.0.3",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-        },
-        "human-signals": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-        }
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-    },
     "define-properties": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "requires": {
         "object-keys": "^1.0.12"
@@ -26499,7 +23916,6 @@
     },
     "define-property": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
@@ -26507,73 +23923,27 @@
         "isobject": "^3.0.1"
       }
     },
-    "del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "optional": true,
-      "peer": true
-    },
-    "denque": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz",
-      "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
     },
     "detect-newline": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true
     },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
     "diff": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
       "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
     },
     "diff-sequences": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "requires": {
         "path-type": "^4.0.0"
@@ -26581,44 +23951,18 @@
     },
     "discontinuous-range": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
       "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
       "dev": true
     },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
     "doctrine": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "peer": true,
       "requires": {
         "esutils": "^2.0.2"
       }
     },
     "dom-serializer": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
       "dev": true,
       "requires": {
@@ -26627,19 +23971,13 @@
         "entities": "^2.0.0"
       }
     },
-    "domassist": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domassist/-/domassist-2.2.0.tgz",
-      "integrity": "sha512-fz/B/YgI88m+/fw49tFi1syaGuBuBGA8DkS3J53jkzH+9wD0B8zUwdiExZjQnnJAwI1aXTgNj4nlTlx797zFqQ=="
-    },
     "domelementtype": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true
     },
     "domexception": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
       "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dev": true,
       "requires": {
@@ -26648,35 +23986,22 @@
       "dependencies": {
         "webidl-conversions": {
           "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
           "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
           "dev": true
         }
       }
     },
     "domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "version": "4.3.0",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.2.0"
       }
     },
-    "domodule": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/domodule/-/domodule-8.1.0.tgz",
-      "integrity": "sha512-ION9hZ7tFVNkfLSx2t8gOM5YweUNb3jUezD4JXR7Vqb8S9pZt4kyuCJE25JvxozdkDXBIE9RUUAxDaOPUQV8Vw==",
-      "requires": {
-        "attrobj": "^3.1.0",
-        "aug": "^4.0.0",
-        "domassist": "^2.2.0"
-      }
-    },
     "domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "version": "2.8.0",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "requires": {
         "dom-serializer": "^1.0.1",
@@ -26684,82 +24009,47 @@
         "domhandler": "^4.2.0"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "dset": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.0.tgz",
-      "integrity": "sha512-7xTQ5DzyE59Nn+7ZgXDXjKAGSGmXZHqttMVVz1r4QNfmGpyj+cm2YtI3II0c/+4zS4a9yq2mBhgdeq2QnpcYlw=="
-    },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+    "ejs": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "jake": "^10.8.5"
       }
     },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
-    },
     "electron-to-chromium": {
-      "version": "1.3.824",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.824.tgz",
-      "integrity": "sha512-Fk+5aD0HDi9i9ZKt9n2VPOZO1dQy7PV++hz2wJ/KIn+CvVfu4fny39squHtyVDPuHNuoJGAZIbuReEklqYIqfA=="
+      "version": "1.4.75",
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "emittery": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
     },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
     "end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
     },
     "enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "version": "5.9.1",
+      "integrity": "sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==",
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -26767,7 +24057,6 @@
     },
     "enquirer": {
       "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "peer": true,
       "requires": {
@@ -26776,24 +24065,14 @@
     },
     "entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
-    "env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "optional": true,
-      "peer": true
-    },
     "envinfo": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
       "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="
     },
     "enzyme": {
       "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
       "dev": true,
       "requires": {
@@ -26823,7 +24102,6 @@
     },
     "enzyme-adapter-react-16": {
       "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz",
       "integrity": "sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==",
       "dev": true,
       "requires": {
@@ -26840,7 +24118,6 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
@@ -26848,7 +24125,6 @@
     },
     "enzyme-adapter-utils": {
       "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz",
       "integrity": "sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==",
       "dev": true,
       "requires": {
@@ -26863,7 +24139,6 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
@@ -26871,7 +24146,6 @@
     },
     "enzyme-shallow-equal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
       "integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
       "dev": true,
       "requires": {
@@ -26881,28 +24155,30 @@
     },
     "error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "version": "1.19.1",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -26912,18 +24188,15 @@
     },
     "es-array-method-boxes-properly": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
       "dev": true
     },
     "es-module-lexer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-      "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="
+      "version": "0.9.3",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "es-to-primitive": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
       "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "requires": {
         "is-callable": "^1.1.4",
@@ -26933,35 +24206,22 @@
     },
     "es6-promise": {
       "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-    },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "escalade": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
@@ -26972,23 +24232,57 @@
         "source-map": "~0.6.1"
       },
       "dependencies": {
+        "levn": {
+          "version": "0.3.0",
+          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
+          }
+        },
+        "optionator": {
+          "version": "0.8.3",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "dev": true,
+          "requires": {
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.1.2",
+          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
           "optional": true
+        },
+        "type-check": {
+          "version": "0.3.2",
+          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2"
+          }
         }
       }
     },
     "eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "7.32.0",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "peer": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.2",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -27030,7 +24324,6 @@
       "dependencies": {
         "@babel/code-frame": {
           "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
           "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
           "peer": true,
           "requires": {
@@ -27039,17 +24332,23 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "peer": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
+        "argparse": {
+          "version": "1.0.10",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "peer": true,
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "peer": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -27058,7 +24357,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "peer": true,
           "requires": {
@@ -27067,20 +24365,17 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "peer": true
         },
         "escape-string-regexp": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "peer": true
         },
         "globals": {
-          "version": "13.9.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-          "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+          "version": "13.12.1",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
           "peer": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -27088,43 +24383,20 @@
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "peer": true
         },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "peer": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+        "js-yaml": {
+          "version": "3.14.1",
+          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
           "peer": true,
           "requires": {
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-          "peer": true
-        },
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "peer": true,
           "requires": {
@@ -27133,113 +24405,101 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "peer": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
         },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "peer": true,
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        },
         "type-fest": {
           "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
           "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
           "peer": true
         }
       }
     },
+    "eslint-config-airbnb": {
+      "version": "19.0.4",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "requires": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      }
+    },
     "eslint-config-prettier": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-      "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+      "version": "8.5.0",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
       "dev": true,
-      "peer": true,
       "requires": {}
     },
     "eslint-config-standard": {
       "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
       "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==",
       "dev": true,
       "peer": true,
       "requires": {}
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "version": "0.3.6",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "peer": true
         }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
-      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+      "version": "2.7.3",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "debug": "^3.2.7",
-        "pkg-dir": "^2.0.0"
+        "find-up": "^2.1.0"
       },
       "dependencies": {
         "debug": {
           "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "find-up": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
-          "peer": true,
           "requires": {
             "locate-path": "^2.0.0"
           }
         },
         "locate-path": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
           "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-locate": "^2.0.0",
             "path-exists": "^3.0.0"
@@ -27247,53 +24507,29 @@
         },
         "p-limit": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
           "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-try": "^1.0.0"
           }
         },
         "p-locate": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
           "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
-          "peer": true,
           "requires": {
             "p-limit": "^1.1.0"
           }
         },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
+          "dev": true
         }
       }
     },
     "eslint-plugin-es": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
       "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "peer": true,
@@ -27303,185 +24539,69 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.23.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
-      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+      "version": "2.25.4",
+      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flat": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.4",
-        "eslint-module-utils": "^2.6.1",
-        "find-up": "^2.0.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.2",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.8.0",
+        "is-glob": "^4.0.3",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
-        "pkg-up": "^2.0.0",
-        "read-pkg-up": "^3.0.0",
+        "object.values": "^1.1.5",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.12.0"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "peer": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
-          "peer": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "peer": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "peer": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
+          "dev": true
         }
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
-      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
+      "version": "6.5.1",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@babel/runtime": "^7.11.2",
+        "@babel/runtime": "^7.16.3",
         "aria-query": "^4.2.2",
-        "array-includes": "^3.1.1",
+        "array-includes": "^3.1.4",
         "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.0.2",
+        "axe-core": "^4.3.5",
         "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.6",
-        "emoji-regex": "^9.0.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^3.1.0",
-        "language-tags": "^1.0.5"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true,
-          "peer": true
-        }
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
       }
     },
     "eslint-plugin-node": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
       "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
       "peer": true,
@@ -27495,9 +24615,8 @@
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true,
           "peer": true
         }
@@ -27505,48 +24624,43 @@
     },
     "eslint-plugin-promise": {
       "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
       "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
       "dev": true,
       "peer": true
     },
     "eslint-plugin-react": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
-      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
+      "version": "7.29.2",
+      "integrity": "sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.3",
-        "array.prototype.flatmap": "^1.2.4",
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
         "doctrine": "^2.1.0",
-        "has": "^1.0.3",
+        "estraverse": "^5.3.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.0.4",
-        "object.entries": "^1.1.4",
-        "object.fromentries": "^2.0.4",
-        "object.values": "^1.1.4",
-        "prop-types": "^15.7.2",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
         "resolve": "^2.0.0-next.3",
-        "string.prototype.matchall": "^4.0.5"
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "dependencies": {
         "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
           "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
-          "peer": true,
           "requires": {
             "esutils": "^2.0.2"
           }
         },
         "resolve": {
           "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
           "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
           "dev": true,
-          "peer": true,
           "requires": {
             "is-core-module": "^2.2.0",
             "path-parse": "^1.0.6"
@@ -27554,9 +24668,15 @@
         }
       }
     },
+    "eslint-plugin-react-hooks": {
+      "version": "4.3.0",
+      "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
     "eslint-plugin-standard": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
       "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
       "dev": true,
       "peer": true,
@@ -27564,7 +24684,6 @@
     },
     "eslint-scope": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "requires": {
         "esrecurse": "^4.3.0",
@@ -27573,14 +24692,12 @@
       "dependencies": {
         "estraverse": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
           "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         }
       }
     },
     "eslint-utils": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "peer": true,
       "requires": {
@@ -27589,7 +24706,6 @@
       "dependencies": {
         "eslint-visitor-keys": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
           "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "peer": true
         }
@@ -27597,12 +24713,10 @@
     },
     "eslint-visitor-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
     },
     "espree": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "peer": true,
       "requires": {
@@ -27611,15 +24725,8 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "peer": true
-        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
           "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "peer": true
         }
@@ -27627,60 +24734,53 @@
     },
     "esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "peer": true,
       "requires": {
         "estraverse": "^5.1.0"
       }
     },
     "esrecurse": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "requires": {
         "estraverse": "^5.2.0"
       }
     },
     "estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+      "version": "5.3.0",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+    },
+    "estree-walker": {
+      "version": "1.0.1",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
     },
     "esutils": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    "event-target-shim": {
+      "version": "5.0.1",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
     },
     "eventemitter3": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
       "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
     },
     "events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
     "exec-sh": {
       "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
       "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "requires": {
@@ -27697,7 +24797,6 @@
     },
     "execall": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
       "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
       "dev": true,
       "peer": true,
@@ -27707,13 +24806,11 @@
     },
     "exit": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true
     },
     "expand-brackets": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
@@ -27728,7 +24825,6 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -27737,7 +24833,6 @@
         },
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -27746,7 +24841,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -27755,7 +24849,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -27764,7 +24857,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -27775,7 +24867,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -27784,7 +24875,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -27795,7 +24885,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -27806,19 +24895,16 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
@@ -27826,7 +24912,6 @@
     },
     "expect": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
       "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
@@ -27840,7 +24925,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -27849,7 +24933,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -27858,7 +24941,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
@@ -27866,75 +24948,15 @@
     },
     "expose-loader": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-2.0.0.tgz",
       "integrity": "sha512-WBpSGlNkn7YwbU2us7O+h0XsoFrB43Y/VCNSpRV4OZFXXKgw8W800BgNxLV0S97N3+KGnFYSCAJi1AV86NO22w==",
       "requires": {}
     },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
     "extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
@@ -27944,7 +24966,6 @@
     },
     "extglob": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
@@ -27960,7 +24981,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -27969,7 +24989,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -27978,141 +24997,66 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
+    "extract-files": {
+      "version": "11.0.0",
+      "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ=="
+    },
     "extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "requires": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-          "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-diff": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
       "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
     },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.11",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fastest-levenshtein": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
     },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.13.0",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "requires": {
         "reusify": "^1.0.4"
       }
     },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
     "fb-watchman": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
       "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "dev": true,
       "requires": {
@@ -28129,59 +25073,47 @@
     },
     "file-entry-cache": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "peer": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
     },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "minimatch": "^5.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "requires": {
-            "ms": "2.0.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
         }
       }
     },
+    "fill-range": {
+      "version": "7.0.1",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "3.3.2",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "requires": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -28190,7 +25122,6 @@
     },
     "find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "requires": {
         "locate-path": "^5.0.0",
@@ -28199,28 +25130,18 @@
     },
     "flat-cache": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "peer": true,
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
       }
     },
     "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "peer": true
-    },
-    "flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+      "version": "3.2.5",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
     },
     "focus-trap": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.1.0.tgz",
       "integrity": "sha512-CkB/nrO55069QAUjWFBpX6oc+9V90Qhgpe6fBWApzruMq5gnlh90Oo7iSSDK7pKiV5ugG6OY2AXM5mxcmL3lwQ==",
       "requires": {
         "tabbable": "^4.0.0",
@@ -28228,24 +25149,16 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.14.9",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "for-in": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
     "form-data": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
       "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "requires": {
@@ -28254,41 +25167,47 @@
         "mime-types": "^2.1.12"
       }
     },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    "form-data-encoder": {
+      "version": "1.7.1",
+      "integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
+    },
+    "formdata-node": {
+      "version": "4.3.2",
+      "integrity": "sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg==",
+      "requires": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.1"
+      },
+      "dependencies": {
+        "web-streams-polyfill": {
+          "version": "4.0.0-beta.1",
+          "integrity": "sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ=="
+        }
+      }
     },
     "foundation-datepicker": {
       "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foundation-datepicker/-/foundation-datepicker-1.5.6.tgz",
       "integrity": "sha1-bciR8/ZCICghn3QoTRaEVIqMpL8="
     },
     "foundation-sites": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/foundation-sites/-/foundation-sites-6.7.0.tgz",
-      "integrity": "sha512-dajdL/7i5rn5F70I2FMnfDOlgXD5klCw8OS9a+Y3rM2fyj9f8JZkJ50eYukmeEM4zVnj+Xo6rJfciLxN/QEYWQ==",
-      "requires": {
-        "puppeteer": "^1.11.0"
-      }
+      "version": "6.7.4",
+      "integrity": "sha512-2QPaZJ0Od0DyklhQyKC3zPbr8AAUXSkr1scZJrQTgj/KTLresuCgUBfi7ft32NlOWhuqVXisjOgTE8N5EPS3cg==",
+      "requires": {}
+    },
+    "fraction.js": {
+      "version": "4.1.3",
+      "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg=="
     },
     "fragment-cache": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
     },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
     "fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "requires": {
         "graceful-fs": "^4.2.0",
@@ -28298,7 +25217,6 @@
       "dependencies": {
         "jsonfile": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "requires": {
             "graceful-fs": "^4.1.6"
@@ -28314,143 +25232,49 @@
         "minipass": "^3.0.0"
       }
     },
-    "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
     "fs.realpath": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "function.prototype.name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
-      "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
+      "version": "1.1.5",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
+        "es-abstract": "^1.19.0",
         "functions-have-names": "^1.2.2"
       }
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "peer": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "functions-have-names": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
       "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
       "dev": true
     },
-    "fuzzy": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz",
-      "integrity": "sha1-THbsL/CsGjap3M+aAN+GIweNTtg="
-    },
     "fuzzysort": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
-      "integrity": "sha512-JzK/lHjVZ6joAg3OnCjylwYXYVjRiwTY6Yb25LvfpJHK8bjisfnZJ5bY8aVWwTwCXgxPNgLAtmHL+Hs5q1ddLQ=="
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true,
-          "peer": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
+      "version": "1.2.1",
+      "integrity": "sha512-egTSF3U6H6T9tXtAhEm5P5guSSDjd96/NUWrbmoGlIu3ATMdXra13gwQdEFRY6ehsFe8xec7UnQz+k34CGWCIg=="
     },
     "gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "devOptional": true
+      "dev": true
     },
     "get-intrinsic": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
       "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "requires": {
         "function-bind": "^1.1.1",
@@ -28458,46 +25282,44 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
     "get-package-type": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true
     },
     "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "optional": true,
+      "version": "8.0.0",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
       "peer": true
     },
     "get-stream": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
       "requires": {
         "pump": "^3.0.0"
       }
     },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "get-value": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -28509,7 +25331,6 @@
     },
     "glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
@@ -28517,12 +25338,10 @@
     },
     "glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "global-modules": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
       "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
       "dev": true,
       "peer": true,
@@ -28532,7 +25351,6 @@
     },
     "global-prefix": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
       "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
       "dev": true,
       "peer": true,
@@ -28544,7 +25362,6 @@
       "dependencies": {
         "which": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "peer": true,
@@ -28556,51 +25373,34 @@
     },
     "globals": {
       "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "11.1.0",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
         }
       }
     },
     "globjoin": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true,
       "peer": true
     },
-    "globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      }
-    },
     "gonzales-pe": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
       "dev": true,
       "peer": true,
@@ -28608,381 +25408,172 @@
         "minimist": "^1.2.5"
       }
     },
+    "google-protobuf": {
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.20.0.tgz",
+      "integrity": "sha512-hhXv5IKLDIkb0pEm53G053UZGhRAhw3wM5Jk7ly5sGIQRkO1s63FaDqM9QjlrPHygKEE2awUlLP9fFrG6M9vfQ=="
+    },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+      "version": "4.2.9",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "graphiql": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.4.2.tgz",
-      "integrity": "sha512-TQDuuU/ZqTWV1yQDpVEiKskg0IYA+Wck37DYrrFzLlpgZWRbWiyab1PyHKiRep7J540CgScBg6C/gGCymKyO3g==",
+      "version": "1.6.0",
+      "integrity": "sha512-VUxnzehiv5BiJzoHQOL7CVFfVjMidate93wSRvFotW7gZluF6PQE45B+LeVWLMRoC59KIUcL+6gtgLHJ5FssvA==",
       "requires": {
-        "@graphiql/toolkit": "^0.2.0",
-        "codemirror": "^5.54.0",
-        "codemirror-graphql": "^1.0.0",
+        "@graphiql/toolkit": "^0.4.2",
+        "codemirror": "^5.58.2",
+        "codemirror-graphql": "^1.2.12",
         "copy-to-clipboard": "^3.2.0",
         "dset": "^3.1.0",
         "entities": "^2.0.0",
-        "graphql-language-service": "^3.1.2",
-        "markdown-it": "^10.0.0"
+        "escape-html": "^1.0.3",
+        "graphql-language-service": "^4.1.5",
+        "markdown-it": "^12.2.0"
       }
     },
     "graphql": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
-      "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA=="
+      "version": "16.3.0",
+      "integrity": "sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==",
+      "peer": true
     },
-    "graphql-docs": {
-      "version": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
-      "integrity": "sha512-cfcgxsPudAO5nda6wux/GOJpPVCvuj7oq8DK1CYl91hRijqctyj2ZfM6Q/dxQRNAzkSC1U3o2jmAIrCdrI7Ynw==",
+    "graphql-config": {
+      "version": "4.1.0",
+      "integrity": "sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==",
       "requires": {
-        "marked": "^0.3.5",
-        "react-typeahead": "^2.0.0-alpha.5",
-        "request": "^2.74.0",
-        "yargs": "^5.0.0"
+        "@endemolshinegroup/cosmiconfig-typescript-loader": "3.0.2",
+        "@graphql-tools/graphql-file-loader": "^7.3.2",
+        "@graphql-tools/json-file-loader": "^7.3.2",
+        "@graphql-tools/load": "^7.4.1",
+        "@graphql-tools/merge": "^8.2.1",
+        "@graphql-tools/url-loader": "^7.4.2",
+        "@graphql-tools/utils": "^8.5.1",
+        "cosmiconfig": "7.0.1",
+        "cosmiconfig-toml-loader": "1.0.0",
+        "minimatch": "3.0.4",
+        "string-env-interpolation": "1.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          }
-        },
-        "y18n": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
-          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
-        },
-        "yargs": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
-          "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
-          "requires": {
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "lodash.assign": "^4.2.0",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "window-size": "^0.2.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^3.2.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
-          "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
+        "minimatch": {
+          "version": "3.0.4",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "requires": {
-            "camelcase": "^3.0.0",
-            "lodash.assign": "^4.1.0"
+            "brace-expansion": "^1.1.7"
           }
         }
       }
     },
+    "graphql-executor": {
+      "version": "0.0.18",
+      "integrity": "sha512-upUSl7tfZCZ5dWG1XkOvpG70Yk3duZKcCoi/uJso4WxJVT6KIrcK4nZ4+2X/hzx46pL8wAukgYHY6iNmocRN+g==",
+      "requires": {}
+    },
     "graphql-language-service": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-3.1.4.tgz",
-      "integrity": "sha512-AF98AT4wLxkE9q1gRf20Yn0EPgd5SctRiw1IkGFivPr98pEX0sKqUcIcIHePn2mxqf73jlWUJV5v6l/CB1gdqQ==",
+      "version": "4.1.5",
+      "integrity": "sha512-6vvZ+4L1xMNpQdlt6a9BaEzZD3ZIiaTmFdjKu81UTIVRh02QKfbW6tcz4UJNTY+4LsTWjR1rNtG3H4pVNrKJ2Q==",
       "requires": {
-        "graphql-language-service-interface": "^2.8.2",
-        "graphql-language-service-types": "^1.8.0"
+        "graphql-language-service-interface": "^2.10.2",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1"
       }
     },
     "graphql-language-service-interface": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.8.4.tgz",
-      "integrity": "sha512-myW8z7HOZkYfhYGKDc0URFkTZChp41Po890W92zuBIhGccckgtiWSJGXaLX+r9QAwVIeZhKaNgEacsyvQb1f/g==",
+      "version": "2.10.2",
+      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
       "requires": {
-        "graphql-language-service-parser": "^1.9.0",
-        "graphql-language-service-types": "^1.8.0",
-        "graphql-language-service-utils": "^2.5.1",
+        "graphql-config": "^4.1.0",
+        "graphql-language-service-parser": "^1.10.4",
+        "graphql-language-service-types": "^1.8.7",
+        "graphql-language-service-utils": "^2.7.1",
         "vscode-languageserver-types": "^3.15.1"
       }
     },
     "graphql-language-service-parser": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.9.2.tgz",
-      "integrity": "sha512-3txms73cJsXDfJQdR5hI83N2rpTuq9FD6aijdrXAeSuI5B60g32DxjelUkt4Ge+2BvBEDLn5ppXlpVYDC9UQHQ==",
+      "version": "1.10.4",
+      "integrity": "sha512-duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA==",
       "requires": {
-        "graphql-language-service-types": "^1.8.0"
+        "graphql-language-service-types": "^1.8.7"
       }
     },
     "graphql-language-service-types": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.8.2.tgz",
-      "integrity": "sha512-Sj07RHnMwAhEvAt7Jdt1l/x56ZpoNh+V6g+T58CF6GiYqI5l4vXqqRB4d4xHDcNQX98GpJfnf3o8BqPgP3C5Sw==",
-      "requires": {}
+      "version": "1.8.7",
+      "integrity": "sha512-LP/Mx0nFBshYEyD0Ny6EVGfacJAGVx+qXtlJP4hLzUdBNOGimfDNtMVIdZANBXHXcM41MDgMHTnyEx2g6/Ttbw==",
+      "requires": {
+        "graphql-config": "^4.1.0",
+        "vscode-languageserver-types": "^3.15.1"
+      }
     },
     "graphql-language-service-utils": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-utils/-/graphql-language-service-utils-2.5.3.tgz",
-      "integrity": "sha512-ydevEZ0AgzEKQF3hiCbLXuS0o7189Ww/T30WtCKCLaRHDYk9Yyb2PZWdhSTWLxYZTaX2TccV6NtFWvzIC7UP3g==",
+      "version": "2.7.1",
+      "integrity": "sha512-Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA==",
       "requires": {
-        "graphql-language-service-types": "^1.8.0",
+        "@types/json-schema": "7.0.9",
+        "graphql-language-service-types": "^1.8.7",
         "nullthrows": "^1.0.0"
       }
     },
+    "graphql-sse": {
+      "version": "1.0.6",
+      "integrity": "sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==",
+      "requires": {}
+    },
     "graphql-tag": {
-      "version": "2.12.4",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz",
-      "integrity": "sha512-VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww==",
+      "version": "2.12.6",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
       "requires": {
         "tslib": "^2.1.0"
       }
     },
     "graphql-ws": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz",
-      "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==",
+      "version": "5.6.2",
+      "integrity": "sha512-TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ==",
       "requires": {}
     },
     "growly": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true,
       "optional": true
     },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "hard-rejection": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true,
       "peer": true
     },
     "harmony-reflect": {
       "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
       "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
     },
     "has": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        }
-      }
-    },
     "has-bigints": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
     },
     "has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+      "version": "1.0.3",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "optional": true,
-      "peer": true
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
     },
     "has-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
@@ -28993,7 +25584,6 @@
     },
     "has-values": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
@@ -29003,7 +25593,6 @@
       "dependencies": {
         "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
@@ -29012,7 +25601,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -29023,7 +25611,6 @@
         },
         "kind-of": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
@@ -29032,77 +25619,20 @@
         }
       }
     },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
     "hoist-non-react-statics": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "requires": {
         "react-is": "^16.7.0"
       }
     },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
-    },
     "hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
     },
     "html-element-map": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
       "dev": true,
       "requires": {
@@ -29112,39 +25642,29 @@
     },
     "html-encoding-sniffer": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
       "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
       "dev": true,
       "requires": {
         "whatwg-encoding": "^1.0.5"
       }
     },
-    "html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
-    },
     "html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
     "html-tags": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
       "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
       "dev": true,
       "peer": true
     },
     "html5sortable": {
       "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
       "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
     },
     "htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "requires": {
@@ -29154,55 +25674,8 @@
         "entities": "^2.0.0"
       }
     },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "dependencies": {
-        "eventemitter3": {
-          "version": "4.0.7",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-          "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-        }
-      }
-    },
     "http-proxy-agent": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "requires": {
@@ -29211,38 +25684,8 @@
         "debug": "4"
       }
     },
-    "http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
-      "requires": {
-        "@types/http-proxy": "^1.17.5",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-          "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dev": true,
       "requires": {
@@ -29252,29 +25695,27 @@
     },
     "human-signals": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true
     },
     "iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
+      "version": "5.1.0",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "requires": {}
+    },
+    "idb": {
+      "version": "6.1.5",
+      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
     },
     "identity-obj-proxy": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
       "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
       "requires": {
         "harmony-reflect": "^1.4.6"
@@ -29282,18 +25723,18 @@
     },
     "ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "peer": true
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+    },
+    "immutable": {
+      "version": "4.0.0",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
     },
     "import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "requires": {
         "parent-module": "^1.0.0",
@@ -29302,22 +25743,19 @@
       "dependencies": {
         "resolve-from": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
     "import-lazy": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
       "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
       "dev": true,
       "peer": true
     },
     "import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "requires": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -29325,27 +25763,16 @@
     },
     "imurmurhash": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "indent-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "peer": true
     },
     "inflight": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
         "once": "^1.3.0",
@@ -29354,33 +25781,17 @@
     },
     "inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true,
       "peer": true
     },
-    "internal-ip": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
-      "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==",
-      "requires": {
-        "default-gateway": "^6.0.0",
-        "ipaddr.js": "^1.9.1",
-        "is-ip": "^3.1.0",
-        "p-event": "^4.2.0"
-      }
-    },
     "internal-slot": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
       "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "peer": true,
       "requires": {
         "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
@@ -29389,50 +25800,14 @@
     },
     "interpret": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
       "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="
     },
     "intl": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
       "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94="
     },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "ip-regex": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
-    },
     "is-accessor-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
       "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
@@ -29441,14 +25816,12 @@
     },
     "is-alphabetical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true,
       "peer": true
     },
     "is-alphanumerical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
       "dev": true,
       "peer": true,
@@ -29458,83 +25831,58 @@
       }
     },
     "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "version": "1.0.4",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "requires": {
-        "binary-extensions": "^2.0.0"
+        "has-bigints": "^1.0.1"
       }
     },
     "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "version": "1.1.2",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "requires": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-buffer": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
+      "version": "1.2.4",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
     "is-ci": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "requires": {
         "ci-info": "^2.0.0"
       }
     },
-    "is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "requires": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
     "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.8.1",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
       "requires": {
         "has": "^1.0.3"
       }
     },
     "is-data-descriptor": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
       "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
@@ -29542,20 +25890,20 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
+      "version": "1.0.5",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "dev": true,
       "peer": true
     },
     "is-descriptor": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
       "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "requires": {
@@ -29564,19 +25912,14 @@
         "kind-of": "^6.0.2"
       }
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
-    },
     "is-docker": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "optional": true
     },
     "is-extendable": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
       "requires": {
@@ -29585,90 +25928,61 @@
     },
     "is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "optional": true,
-      "peer": true
-    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-generator-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
     },
     "is-hexadecimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true,
       "peer": true
     },
-    "is-ip": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
-      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
-      "requires": {
-        "ip-regex": "^4.0.0"
-      }
+    "is-module": {
+      "version": "1.0.0",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
     },
     "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+      "version": "2.0.2",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
     "is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
+      "version": "1.0.6",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+      "version": "1.0.1",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
     },
     "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "version": "1.1.0",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true,
       "peer": true
     },
     "is-plain-object": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
         "isobject": "^3.0.1"
@@ -29676,50 +25990,43 @@
     },
     "is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "version": "1.1.4",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "peer": true
+      "version": "1.0.0",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    "is-shared-array-buffer": {
+      "version": "1.0.1",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="
     },
     "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+      "version": "2.0.1",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
     },
     "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
+      "version": "1.0.7",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-subset": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
       "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
       "dev": true
     },
     "is-symbol": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
       "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "requires": {
         "has-symbols": "^1.0.2"
@@ -29727,76 +26034,73 @@
     },
     "is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
       "peer": true
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    "is-weakref": {
+      "version": "1.0.2",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "is-windows": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
     "is-wsl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
       "requires": {
         "is-docker": "^2.0.0"
       }
     },
     "isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    "isomorphic-ws": {
+      "version": "4.0.1",
+      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
+      "requires": {}
     },
     "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.1.0",
+      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       }
     },
     "istanbul-lib-report": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dev": true,
       "requires": {
@@ -29807,59 +26111,112 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.4",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "iterall": {
+      "version": "1.3.0",
+      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg=="
+    },
+    "jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "requires": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "async": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "iterall": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
-      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
-      "optional": true
-    },
     "jest": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
       "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "requires": {
@@ -29870,7 +26227,6 @@
     },
     "jest-changed-files": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
       "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "requires": {
@@ -29879,9 +26235,513 @@
         "throat": "^5.0.0"
       }
     },
+    "jest-circus": {
+      "version": "27.5.1",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
+      },
+      "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "dev": true,
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "dev": true,
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "dev": true,
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/transform": {
+          "version": "27.5.1",
+          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^27.5.1",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "camelcase": {
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "ci-info": {
+          "version": "3.3.0",
+          "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+          "dev": true
+        },
+        "cjs-module-lexer": {
+          "version": "1.2.2",
+          "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+          "dev": true
+        },
+        "execa": {
+          "version": "5.1.1",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "expect": {
+          "version": "27.5.1",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+          "dev": true
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-get-type": {
+          "version": "27.5.1",
+          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "27.5.1",
+          "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^27.5.1",
+            "jest-serializer": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+          "dev": true
+        },
+        "jest-resolve": {
+          "version": "27.5.1",
+          "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-serializer": {
+          "version": "27.5.1",
+          "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.9"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "27.5.1",
+          "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "leven": "^3.1.0",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "pretty-format": {
+          "version": "27.5.1",
+          "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+              "dev": true
+            }
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "throat": {
+          "version": "6.0.1",
+          "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+          "dev": true
+        }
+      }
+    },
     "jest-cli": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
       "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
       "dev": true,
       "requires": {
@@ -29902,7 +26762,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -29910,9 +26769,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -29921,7 +26779,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -29930,19 +26787,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -29953,7 +26807,6 @@
     },
     "jest-config": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
       "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "requires": {
@@ -29979,7 +26832,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -29987,9 +26839,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -29998,7 +26849,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30007,19 +26857,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30030,7 +26877,6 @@
     },
     "jest-diff": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
       "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
@@ -30042,7 +26888,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30050,9 +26895,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30061,7 +26905,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30070,19 +26913,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30093,7 +26933,6 @@
     },
     "jest-docblock": {
       "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
       "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
       "dev": true,
       "requires": {
@@ -30102,7 +26941,6 @@
     },
     "jest-each": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
       "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
@@ -30115,7 +26953,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30123,9 +26960,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30134,7 +26970,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30143,19 +26978,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30166,7 +26998,6 @@
     },
     "jest-environment-jsdom": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
       "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
@@ -30181,7 +27012,6 @@
     },
     "jest-environment-node": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
       "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "requires": {
@@ -30195,13 +27025,11 @@
     },
     "jest-get-type": {
       "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
       "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true
     },
     "jest-haste-map": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
       "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "requires": {
@@ -30223,7 +27051,6 @@
     },
     "jest-jasmine2": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
       "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "requires": {
@@ -30249,7 +27076,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30257,9 +27083,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30268,7 +27093,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30277,19 +27101,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30300,7 +27121,6 @@
     },
     "jest-leak-detector": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
       "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "requires": {
@@ -30309,14 +27129,12 @@
       }
     },
     "jest-localstorage-mock": {
-      "version": "2.4.14",
-      "resolved": "https://registry.npmjs.org/jest-localstorage-mock/-/jest-localstorage-mock-2.4.14.tgz",
-      "integrity": "sha512-B+Y0y3J4wBOHdmcFSicWmVYMFAZFbJvjs1EfRIzUJRg2UAK+YVVUgTn7/MdjENey5xbBKmraBmKY5EX+x1NJXA==",
+      "version": "2.4.19",
+      "integrity": "sha512-TW7Cw6dbg4mgpxVUKmHU/sjOaUrUU2kp1DiWAY7JaPGDN1cRC/yXx1ewcJyPZ4d4qAd0UtJOER50sDjJSwVYGQ==",
       "dev": true
     },
     "jest-matcher-utils": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
       "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
@@ -30328,7 +27146,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30336,9 +27153,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30347,7 +27163,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30356,19 +27171,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30379,7 +27191,6 @@
     },
     "jest-message-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
       "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
@@ -30396,7 +27207,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30404,9 +27214,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30415,7 +27224,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30424,19 +27232,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30447,7 +27252,6 @@
     },
     "jest-mock": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
       "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
@@ -30457,20 +27261,17 @@
     },
     "jest-pnp-resolver": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "dev": true,
       "requires": {}
     },
     "jest-regex-util": {
       "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
       "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
       "dev": true
     },
     "jest-resolve": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
       "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
@@ -30486,7 +27287,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30494,9 +27294,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30505,7 +27304,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30514,19 +27312,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30537,7 +27332,6 @@
     },
     "jest-resolve-dependencies": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
       "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "requires": {
@@ -30548,7 +27342,6 @@
     },
     "jest-runner": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
       "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "dev": true,
       "requires": {
@@ -30576,7 +27369,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30584,9 +27376,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30595,7 +27386,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30604,19 +27394,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30627,7 +27414,6 @@
     },
     "jest-runtime": {
       "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
       "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "requires": {
@@ -30662,7 +27448,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30670,9 +27455,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30681,7 +27465,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30690,19 +27473,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30713,7 +27493,6 @@
     },
     "jest-serializer": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
       "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "requires": {
@@ -30723,7 +27502,6 @@
     },
     "jest-snapshot": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
       "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
@@ -30747,7 +27525,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30755,9 +27532,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30766,7 +27542,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30775,19 +27550,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
@@ -30796,7 +27568,6 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30807,7 +27578,6 @@
     },
     "jest-util": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
       "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
       "dev": true,
       "requires": {
@@ -30821,7 +27591,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30829,9 +27598,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30840,7 +27608,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30849,19 +27616,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30872,7 +27636,6 @@
     },
     "jest-validate": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
       "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
@@ -30886,7 +27649,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30894,15 +27656,13 @@
           }
         },
         "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "version": "6.3.0",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30911,7 +27671,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30920,19 +27679,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -30943,7 +27699,6 @@
     },
     "jest-watcher": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
       "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
@@ -30958,7 +27713,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -30966,9 +27720,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -30977,7 +27730,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -30986,19 +27738,16 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -31009,7 +27758,6 @@
     },
     "jest-worker": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
       "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "requires": {
         "@types/node": "*",
@@ -31019,12 +27767,10 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -31034,49 +27780,31 @@
     },
     "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
       "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
     "jquery-serializejson": {
       "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-2.9.0.tgz",
       "integrity": "sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA=="
     },
-    "jquery.autocomplete": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jquery.autocomplete/-/jquery.autocomplete-1.2.0.tgz",
-      "integrity": "sha512-aoJC3KVrPpRGaZBUo9UxhwznYmQ0UuYd+FfjP9RAKmyB+1T3OLIjuQImT8pKX6eKpBt1z9JmD48GiD2Dx303bA=="
-    },
-    "js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
-      "optional": true,
-      "peer": true
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
     },
     "js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "4.1.0",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
     "jsdom": {
-      "version": "16.6.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
-      "integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
+      "version": "16.7.0",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "requires": {
         "abab": "^2.0.5",
@@ -31104,49 +27832,43 @@
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
         "whatwg-url": "^8.5.0",
-        "ws": "^7.4.5",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "dev": true
+        }
       }
     },
     "jsesc": {
       "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "peer": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
     "json5": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "requires": {
         "minimist": "^1.2.5"
@@ -31154,184 +27876,99 @@
     },
     "jsonfile": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz",
       "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
       "requires": {
         "graceful-fs": "^4.1.6",
         "universalify": "^0.1.2"
       }
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
+    "jsonpointer": {
+      "version": "5.0.0",
+      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="
     },
     "jsx-ast-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
-      "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+      "version": "3.2.1",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "array-includes": "^3.1.2",
+        "array-includes": "^3.1.3",
         "object.assign": "^4.1.2"
       }
     },
     "kind-of": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "kleur": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
     "klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
+      "version": "2.0.5",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
     },
     "known-css-properties": {
       "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
       "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
       "dev": true,
       "peer": true
     },
     "language-subtag-registry": {
       "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
       "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "language-tags": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
       "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
-      "peer": true,
       "requires": {
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
     "leaflet": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.1.tgz",
       "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
     },
-    "leaflet-svgicon": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-svgicon/-/leaflet-svgicon-0.0.2.tgz",
-      "integrity": "sha512-9hGBLBHHcCSZAdVLwdiZbU2c/Z47eziDQslDrRQRcBNomEazH4NXvqY8egDMw+zGh/nBQub6jvTl1ty2nlEwmQ==",
-      "requires": {
-        "src": "^1.1.2"
-      }
-    },
     "leaflet-tilelayer-here": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/leaflet-tilelayer-here/-/leaflet-tilelayer-here-1.0.2.tgz",
       "integrity": "sha512-PQytY0goCZLANGabPCPQJDhCrXrwdVP6F5NEgw/zjunrfFhQ1XwnBUNCWi0irUWQsETNntcwfkomikhlQ7uCRQ=="
     },
     "leaflet.markercluster": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz",
       "integrity": "sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==",
       "requires": {}
     },
     "leven": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
     },
     "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
+      "version": "0.4.1",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       }
     },
     "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+      "version": "1.2.4",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "linkify-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "version": "3.0.3",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "requires": {
         "uc.micro": "^1.0.1"
       }
     },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "peer": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "loader-runner": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
       "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
     },
     "loader-utils": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
       "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "requires": {
         "big.js": "^5.2.2",
@@ -31341,7 +27978,6 @@
       "dependencies": {
         "json5": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "requires": {
             "minimist": "^1.2.0"
@@ -31351,7 +27987,6 @@
     },
     "locate-path": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "requires": {
         "p-locate": "^4.1.0"
@@ -31359,7 +27994,6 @@
     },
     "lockfile": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
       "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
       "requires": {
         "signal-exit": "^3.0.2"
@@ -31367,78 +28001,50 @@
     },
     "lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "peer": true
-    },
     "lodash.debounce": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
     "lodash.escape": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
       "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
       "dev": true
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
       "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
       "dev": true
     },
     "lodash.get": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
     "lodash.has": {
       "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
       "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
     },
     "lodash.isequal": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
       "dev": true
     },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
     "lodash.merge": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "peer": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
     "lodash.truncate": {
       "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "peer": true
     },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
-    },
     "log-symbols": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "peer": true,
@@ -31449,7 +28055,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "peer": true,
@@ -31458,9 +28063,8 @@
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -31470,7 +28074,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "peer": true,
@@ -31480,21 +28083,18 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "peer": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "peer": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "peer": true,
@@ -31505,85 +28105,68 @@
       }
     },
     "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.0",
+      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
     },
     "longest-streak": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
       "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
       "dev": true,
       "peer": true
     },
     "loose-envify": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
     "lru-cache": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "requires": {
         "yallist": "^4.0.0"
       }
     },
+    "magic-string": {
+      "version": "0.25.8",
+      "integrity": "sha512-n9NlSgfkB2rPYjSd/EZDoQcsXzwYAv4CIB/vi3ZSvZ2Tjax5W5Ie1NMy4HG3PVdcL4bBMMR20Ng4UcISMzqRLw==",
+      "requires": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
     "make-dir": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "requires": {
         "semver": "^6.0.0"
       }
     },
+    "make-error": {
+      "version": "1.3.6",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+    },
     "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
       "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
+        "tmpl": "1.0.5"
       }
     },
     "map-cache": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
     "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "devOptional": true,
+      "version": "4.3.0",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
       "peer": true
     },
     "map-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
@@ -31591,39 +28174,30 @@
       }
     },
     "markdown-it": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+      "version": "12.3.2",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "requires": {
-        "argparse": "^1.0.7",
-        "entities": "~2.0.0",
-        "linkify-it": "^2.0.0",
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
       },
       "dependencies": {
         "entities": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-          "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
+          "version": "2.1.0",
+          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
         }
       }
     },
-    "marked": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
-    },
     "mathml-tag-names": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true,
       "peer": true
     },
     "mdast-util-from-markdown": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
       "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
       "dev": true,
       "peer": true,
@@ -31637,7 +28211,6 @@
     },
     "mdast-util-to-markdown": {
       "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
       "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
       "dev": true,
       "peer": true,
@@ -31652,190 +28225,93 @@
     },
     "mdast-util-to-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
       "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
       "dev": true,
       "peer": true
     },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
     "mdurl": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
-      "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-      "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
-        }
-      }
-    },
-    "memfs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
-      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
-      "requires": {
-        "fs-monkey": "1.0.3"
-      }
-    },
     "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "optional": true,
+      "version": "9.0.0",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "optional": true,
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "lru-cache": "^6.0.0"
           }
         },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "optional": true,
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
           }
         },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "optional": true,
+        "semver": {
+          "version": "7.3.5",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
           "peer": true,
           "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
+            "lru-cache": "^6.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
+        "type-fest": {
+          "version": "0.18.1",
+          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+          "dev": true,
+          "peer": true
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
+        "yargs-parser": {
+          "version": "20.2.9",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true,
+          "peer": true
         }
       }
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
     "merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
     "meros": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/meros/-/meros-1.1.4.tgz",
-      "integrity": "sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==",
+      "version": "1.2.0",
+      "integrity": "sha512-3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ==",
       "requires": {}
     },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
     "micromark": {
       "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
       "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
       "dev": true,
       "peer": true,
@@ -31846,110 +28322,87 @@
     },
     "micromatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
       "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
         "braces": "^3.0.1",
         "picomatch": "^2.2.3"
       }
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
     "mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "requires": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.51.0"
       }
     },
     "mimic-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "min-indent": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
       "peer": true
     },
     "mini-css-extract-plugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz",
-      "integrity": "sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw==",
+      "version": "2.5.3",
+      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
       "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
+        "schema-utils": "^4.0.0"
       },
       "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+        "schema-utils": {
+          "version": "4.0.0",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "minimist-options": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
       "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
       "peer": true,
@@ -31957,49 +28410,16 @@
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
         "kind-of": "^6.0.3"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-          "dev": true,
-          "peer": true
-        }
       }
     },
     "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
       "requires": {
         "yallist": "^4.0.0"
       }
     },
-    "minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
@@ -32011,7 +28431,6 @@
     },
     "mixin-deep": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
@@ -32026,49 +28445,33 @@
     },
     "moment": {
       "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "moo": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
       "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
       "dev": true
     },
     "morphdom": {
       "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
       "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
     },
+    "motion-ui": {
+      "version": "2.0.3",
+      "integrity": "sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==",
+      "peer": true,
+      "requires": {}
+    },
     "ms": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "optional": true,
-      "peer": true
+    "nanoid": {
+      "version": "3.3.1",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
     },
     "nanomatch": {
       "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
@@ -32087,12 +28490,10 @@
     },
     "natural-compare": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "nearley": {
       "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
       "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
       "dev": true,
       "requires": {
@@ -32102,96 +28503,81 @@
         "randexp": "0.4.6"
       }
     },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
     "neo-async": {
       "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "nice-try": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+    "node-domexception": {
+      "version": "1.0.0",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
     },
-    "node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
-      "optional": true,
-      "peer": true,
+    "node-fetch": {
+      "version": "2.6.7",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
+        "whatwg-url": "^5.0.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "optional": true,
-          "peer": true,
+        "tr46": {
+          "version": "0.0.3",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
           "requires": {
-            "lru-cache": "^6.0.0"
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
           }
         }
       }
     },
+    "node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+    },
     "node-int64": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true
     },
     "node-jose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.0.0.tgz",
-      "integrity": "sha512-j8zoFze1gijl8+DK/dSXXqX7+o2lMYv1XS+ptnXgGV/eloQaqq1YjNtieepbKs9jBS4WTnMOqyKSaQuunJzx0A==",
+      "version": "2.1.0",
+      "integrity": "sha512-Zmm8vFPJabphGBc5Wz1/LUMPS+1cynqw16RIhgVNQMEI2yEQrvl7Gx2EwN9GhP8tkm8f7SH53K2nIx8TeNTIdg==",
       "requires": {
         "base64url": "^3.0.1",
-        "buffer": "^5.5.0",
+        "buffer": "^6.0.3",
         "es6-promise": "^4.2.8",
-        "lodash": "^4.17.15",
-        "long": "^4.0.0",
-        "node-forge": "^0.10.0",
-        "pako": "^1.0.11",
+        "lodash": "^4.17.21",
+        "long": "^5.2.0",
+        "node-forge": "^1.2.1",
+        "pako": "^2.0.4",
         "process": "^0.11.10",
-        "uuid": "^3.3.3"
+        "uuid": "^8.3.2"
       },
       "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        "buffer": {
+          "version": "6.0.3",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
         }
       }
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
     "node-notifier": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
       "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
@@ -32206,7 +28592,6 @@
       "dependencies": {
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "optional": true,
@@ -32217,106 +28602,13 @@
       }
     },
     "node-releases": {
-      "version": "1.1.75",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
-      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
-    },
-    "node-sass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
-      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^7.0.3",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^7.1.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true,
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "optional": true,
-          "peer": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "abbrev": "1"
-      }
+      "version": "2.0.2",
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
     "normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -32326,58 +28618,36 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
     "normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
     },
     "normalize-selector": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true,
       "peer": true
     },
-    "normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
-    },
     "npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "requires": {
         "path-key": "^3.0.0"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
     "nth-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-      "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
+      "version": "2.0.1",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
       "dev": true,
       "requires": {
         "boolbase": "^1.0.0"
@@ -32385,38 +28655,25 @@
     },
     "nullthrows": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
       "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
     },
     "num2fraction": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true,
+      "peer": true
     },
     "nwsapi": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
@@ -32427,7 +28684,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -32436,7 +28692,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -32445,7 +28700,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -32454,7 +28708,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -32465,7 +28718,6 @@
           "dependencies": {
             "kind-of": {
               "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
               "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
               "dev": true
             }
@@ -32473,7 +28725,6 @@
         },
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -32483,13 +28734,11 @@
       }
     },
     "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+      "version": "1.12.0",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
     },
     "object-is": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "requires": {
         "call-bind": "^1.0.2",
@@ -32498,12 +28747,10 @@
     },
     "object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object-visit": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
@@ -32512,7 +28759,6 @@
     },
     "object.assign": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
       "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
         "call-bind": "^1.0.0",
@@ -32522,41 +28768,36 @@
       }
     },
     "object.entries": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
-      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
+      "version": "1.1.5",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "object.fromentries": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
-      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
+      "version": "2.0.5",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "es-abstract": "^1.19.1"
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+    "object.hasown": {
+      "version": "1.1.0",
+      "integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "object.pick": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
@@ -32564,36 +28805,17 @@
       }
     },
     "object.values": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
-      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "version": "1.1.5",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
+        "es-abstract": "^1.19.1"
       }
     },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
     "once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
         "wrappy": "1"
@@ -32601,30 +28823,13 @@
     },
     "onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "requires": {
         "mimic-fn": "^2.1.0"
       }
     },
-    "open": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
-      "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
-    },
     "optimism": {
       "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.16.1.tgz",
       "integrity": "sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==",
       "requires": {
         "@wry/context": "^0.6.0",
@@ -32632,110 +28837,69 @@
       }
     },
     "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "version": "0.9.1",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "requires": {
-        "lcid": "^1.0.0"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       }
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
     "p-each-series": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
       "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
-    "p-event": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
-      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
-      "requires": {
-        "p-timeout": "^3.1.0"
-      }
-    },
     "p-finally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
     },
     "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.1.0",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "requires": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "requires": {
         "p-limit": "^2.2.0"
-      }
-    },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-      "requires": {
-        "@types/retry": "^0.12.0",
-        "retry": "^0.13.1"
-      }
-    },
-    "p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "requires": {
-        "p-finally": "^1.0.0"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "2.3.0",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        }
       }
     },
     "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+      "version": "1.0.0",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
     },
     "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+      "version": "2.0.4",
+      "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
     },
     "parchment": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
       "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
     },
     "parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "requires": {
         "callsites": "^3.0.0"
@@ -32743,7 +28907,6 @@
     },
     "parse-entities": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "dev": true,
       "peer": true,
@@ -32758,7 +28921,6 @@
     },
     "parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -32769,63 +28931,44 @@
     },
     "parse5": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
       "requires": {
         "parse5": "^6.0.1"
       }
     },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
     "pascalcase": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
     "path-complete-extname": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
       "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
     },
     "path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
     "path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pend": {
@@ -32835,446 +28978,153 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "version": "2.3.1",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.5",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true
     },
     "pkg-dir": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "requires": {
         "find-up": "^4.0.0"
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true,
-          "peer": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
     "pnp-webpack-plugin": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz",
       "integrity": "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==",
       "requires": {
         "ts-pnp": "^1.1.6"
       }
     },
-    "portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
     "posix-character-classes": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
     "postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "version": "8.4.7",
+      "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
       "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "nanoid": "^3.3.1",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-attribute-case-insensitive": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
-      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
+      "version": "5.0.0",
+      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
       "requires": {
-        "postcss": "^7.0.2",
         "postcss-selector-parser": "^6.0.2"
       }
     },
-    "postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
-      "requires": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
     "postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
+      "version": "4.2.2",
+      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
-      "requires": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
-      }
-    },
-    "postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
+      "version": "8.0.3",
+      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "version": "7.0.2",
+      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
       "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
+      "version": "8.0.0",
+      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
+      "requires": {}
     },
     "postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "version": "12.1.4",
+      "integrity": "sha512-i6AytuTCoDLJkWN/MtAIGriJz3j7UX6bV7Z5t+KgFz+dwZS15/mlTJY1S0kRizlk6ba0V8u8hN50Fz5Nm7tdZw==",
       "requires": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "version": "6.0.0",
+      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
+        "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "version": "6.0.4",
+      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
+      "version": "3.1.0",
+      "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
       "requires": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+      "version": "4.0.5",
+      "integrity": "sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-flexbugs-fixes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
-      "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
-      "requires": {
-        "postcss": "^7.0.26"
-      }
+      "version": "5.0.2",
+      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "requires": {}
     },
     "postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
+      "version": "6.0.4",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "requires": {
-        "postcss": "^7.0.2"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
+      "version": "5.0.4",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "requires": {
-        "postcss": "^7.0.2"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-font-variant": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
-      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.0",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "requires": {}
     },
     "postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.3",
+      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
+      "requires": {}
     },
     "postcss-html": {
       "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
       "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
       "dev": true,
       "peer": true,
@@ -33284,7 +29134,6 @@
       "dependencies": {
         "dom-serializer": {
           "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
           "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
           "dev": true,
           "peer": true,
@@ -33295,14 +29144,12 @@
           "dependencies": {
             "domelementtype": {
               "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
               "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
               "dev": true,
               "peer": true
             },
             "entities": {
               "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
               "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
               "dev": true,
               "peer": true
@@ -33311,14 +29158,12 @@
         },
         "domelementtype": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
           "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
           "dev": true,
           "peer": true
         },
         "domhandler": {
           "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
           "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
           "dev": true,
           "peer": true,
@@ -33328,7 +29173,6 @@
         },
         "domutils": {
           "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
           "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
           "dev": true,
           "peer": true,
@@ -33339,14 +29183,12 @@
         },
         "entities": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
           "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
           "dev": true,
           "peer": true
         },
         "htmlparser2": {
           "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
           "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
           "dev": true,
           "peer": true,
@@ -33362,73 +29204,78 @@
       }
     },
     "postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "version": "4.0.6",
+      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "14.0.2",
+      "integrity": "sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==",
       "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
+        "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
       }
     },
     "postcss-initial": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
-      "integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.1",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "requires": {}
     },
     "postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "version": "4.1.1",
+      "integrity": "sha512-j3Z0WQCimY2tMle++YcmygnnVbt6XdnrCV1FO2IpzaCSmtTF2oO8h4ZYUA1Q+QHYroIiaWPvNHt9uBR4riCksQ==",
       "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-less": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
       "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.14"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "version": "6.2.1",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "requires": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
       },
       "dependencies": {
         "semver": {
           "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
             "lru-cache": "^6.0.0"
@@ -33437,610 +29284,251 @@
       }
     },
     "postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.4",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "requires": {}
     },
     "postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "5.0.0",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "requires": {}
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true,
       "peer": true
     },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
     "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
+      "version": "3.0.0",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+      "version": "4.0.0",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "requires": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
+        "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "version": "3.0.0",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "version": "4.0.0",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "requires": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
+        "icss-utils": "^5.0.0"
       }
     },
     "postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "version": "10.1.2",
+      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-selector-parser": "^6.0.8"
       }
     },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
-      }
+    "postcss-opacity-percentage": {
+      "version": "1.1.2",
+      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w=="
     },
     "postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.3",
+      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
+      "requires": {}
     },
     "postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "3.0.4",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "requires": {}
     },
     "postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
+      "version": "7.0.4",
+      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
       "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "requires": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
+      "version": "7.4.2",
+      "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
+      "requires": {
+        "@csstools/postcss-color-function": "^1.0.2",
+        "@csstools/postcss-font-format-keywords": "^1.0.0",
+        "@csstools/postcss-hwb-function": "^1.0.0",
+        "@csstools/postcss-ic-unit": "^1.0.0",
+        "@csstools/postcss-is-pseudo-class": "^2.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.0",
+        "@csstools/postcss-oklab-function": "^1.0.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.2.0",
+        "autoprefixer": "^10.4.2",
+        "browserslist": "^4.19.3",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^6.4.0",
+        "postcss-attribute-case-insensitive": "^5.0.0",
+        "postcss-color-functional-notation": "^4.2.2",
+        "postcss-color-hex-alpha": "^8.0.3",
+        "postcss-color-rebeccapurple": "^7.0.2",
+        "postcss-custom-media": "^8.0.0",
+        "postcss-custom-properties": "^12.1.4",
+        "postcss-custom-selectors": "^6.0.0",
+        "postcss-dir-pseudo-class": "^6.0.4",
+        "postcss-double-position-gradients": "^3.1.0",
+        "postcss-env-function": "^4.0.5",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.3",
+        "postcss-image-set-function": "^4.0.6",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.1.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.2",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.3",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.4",
+        "postcss-pseudo-class-any-link": "^7.1.1",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^5.0.0",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "version": "7.1.1",
+      "integrity": "sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg==",
       "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.0",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "requires": {}
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
       "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
       "dev": true,
       "peer": true
     },
     "postcss-safe-parser": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
       "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.26"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-sass": {
       "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
       "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
       "dev": true,
       "peer": true,
       "requires": {
         "gonzales-pe": "^4.3.0",
         "postcss": "^7.0.21"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "requires": {
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
+      "version": "4.0.3",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "requires": {}
     },
     "postcss-selector-not": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
-      "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
+      "version": "5.0.0",
+      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
       "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
+        "balanced-match": "^1.0.0"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.9",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "requires": {
         "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        }
+        "util-deprecate": "^1.0.2"
       }
     },
     "postcss-syntax": {
       "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
       "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
       "dev": true,
       "peer": true,
       "requires": {}
     },
-    "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
     "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
+      "version": "4.2.0",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+      "version": "1.2.1",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+    },
+    "pretty-bytes": {
+      "version": "5.6.0",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="
     },
     "pretty-format": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
       "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
@@ -34052,7 +29540,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -34061,7 +29548,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -34070,13 +29556,11 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "react-is": {
           "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
           "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
           "dev": true
         }
@@ -34084,28 +29568,16 @@
     },
     "process": {
       "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
     "progress": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "peer": true
     },
     "prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
@@ -34113,18 +29585,16 @@
       }
     },
     "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       }
     },
     "prop-types-exact": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
       "dev": true,
       "requires": {
@@ -34133,30 +29603,14 @@
         "reflect.ownkeys": "^0.2.0"
       }
     },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "psl": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -34164,104 +29618,20 @@
     },
     "punycode": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "puppeteer": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
-      "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
-      "requires": {
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^2.2.1",
-        "mime": "^2.0.3",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-          "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.2.7",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-              "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            }
-          }
-        },
-        "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
     "queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "quick-lru": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true,
       "peer": true
     },
     "quill": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
       "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
       "requires": {
         "clone": "^2.1.1",
@@ -34274,7 +29644,6 @@
     },
     "quill-delta": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
       "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
       "requires": {
         "deep-equal": "^1.0.1",
@@ -34284,7 +29653,6 @@
     },
     "raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "requires": {
         "performance-now": "^2.1.0"
@@ -34292,13 +29660,11 @@
     },
     "railroad-diagrams": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
       "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
       "dev": true
     },
     "randexp": {
       "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
       "dev": true,
       "requires": {
@@ -34308,31 +29674,13 @@
     },
     "randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "requires": {
         "safe-buffer": "^5.1.0"
       }
     },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "react": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -34342,7 +29690,6 @@
     },
     "react-dom": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -34353,7 +29700,6 @@
     },
     "react-i18nify": {
       "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/react-i18nify/-/react-i18nify-1.11.18.tgz",
       "integrity": "sha512-flSSBzMI2gvJvCC+byP6Cl7vtyUsNH88VxjyER4zj8Fdl5rsLmXoJ9K4kNz8A6JUTmdFMWbTIp6aPXVIEbpE8w==",
       "requires": {
         "intl": "^1.2",
@@ -34361,32 +29707,12 @@
         "prop-types": "^15.6.1"
       }
     },
-    "react-input-autosize": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
-      "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.3.0.tgz",
-      "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
-      "requires": {
-        "classnames": "^2.2.4",
-        "prop-types": "^15.5.8",
-        "react-input-autosize": "^2.1.2"
-      }
-    },
     "react-test-renderer": {
       "version": "16.14.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
       "dev": true,
       "requires": {
@@ -34396,27 +29722,8 @@
         "scheduler": "^0.19.1"
       }
     },
-    "react-typeahead": {
-      "version": "2.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/react-typeahead/-/react-typeahead-2.0.0-alpha.8.tgz",
-      "integrity": "sha1-fwJfjudCAvBPqEJ8r+onMtUU9Yo=",
-      "requires": {
-        "classnames": "^1.2.0",
-        "create-react-class": "^15.5.2",
-        "fuzzy": "^0.1.0",
-        "prop-types": "^15.5.10"
-      },
-      "dependencies": {
-        "classnames": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.2.tgz",
-          "integrity": "sha1-6WoqAiLYSSXdj62yBdZuEviI7fk="
-        }
-      }
-    },
     "read-cache": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "requires": {
         "pify": "^2.3.0"
@@ -34424,7 +29731,6 @@
     },
     "read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "requires": {
@@ -34436,7 +29742,6 @@
       "dependencies": {
         "type-fest": {
           "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
           "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
           "dev": true
         }
@@ -34444,7 +29749,6 @@
     },
     "read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "requires": {
@@ -34455,7 +29759,6 @@
       "dependencies": {
         "type-fest": {
           "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
           "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
         }
@@ -34463,117 +29766,53 @@
     },
     "readable-stream": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
         "util-deprecate": "^1.0.1"
       }
     },
-    "readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
     "rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "version": "0.7.1",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
       "requires": {
         "resolve": "^1.9.0"
       }
     },
     "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "dependencies": {
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        }
-      }
-    },
-    "redis": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
-      "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "requires": {
-        "denque": "^1.5.0",
-        "redis-commands": "^1.7.0",
-        "redis-errors": "^1.2.0",
-        "redis-parser": "^3.0.0"
-      }
-    },
-    "redis-commands": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
-      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
-    },
-    "redis-errors": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
-      "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60="
-    },
-    "redis-parser": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
-      "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=",
-      "requires": {
-        "redis-errors": "^1.0.0"
-      }
-    },
-    "redis-url": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/redis-url/-/redis-url-0.2.0.tgz",
-      "integrity": "sha1-G3otrMw+qCZLH7ZWwNkB2cqcVHA=",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "peer": true,
       "requires": {
-        "redis": ">= 0.0.1"
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
       }
     },
     "reflect.ownkeys": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
       "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
       "dev": true
     },
     "regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "requires": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+      "version": "0.13.9",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
       "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "requires": {
         "@babel/runtime": "^7.8.4"
@@ -34581,7 +29820,6 @@
     },
     "regex-not": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
@@ -34590,56 +29828,48 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.1",
+      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "peer": true
+      "version": "3.2.0",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
     "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+      "version": "0.6.0",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
     },
     "regjsparser": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
-      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "version": "0.8.4",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "requires": {
         "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
         }
       }
     },
     "remark": {
       "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
       "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
       "dev": true,
       "peer": true,
@@ -34651,7 +29881,6 @@
     },
     "remark-parse": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
       "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
       "dev": true,
       "peer": true,
@@ -34661,7 +29890,6 @@
     },
     "remark-stringify": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
       "peer": true,
@@ -34671,119 +29899,43 @@
     },
     "remove-trailing-separator": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
     },
     "require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
     "require-main-filename": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "devOptional": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "dev": true
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-cwd": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "requires": {
         "resolve-from": "^5.0.0"
@@ -34791,52 +29943,62 @@
     },
     "resolve-from": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
     },
     "resolve-url": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "resolve.exports": {
+      "version": "1.1.0",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "dev": true
+    },
     "ret": {
       "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
-    },
     "reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
     "rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "requires": {
         "glob": "^7.1.3"
       }
     },
+    "rollup": {
+      "version": "2.69.0",
+      "integrity": "sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==",
+      "requires": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "rollup-plugin-terser": {
+      "version": "7.0.2",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "dependencies": {
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        }
+      }
+    },
     "rst-selector-parser": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
       "dev": true,
       "requires": {
@@ -34846,13 +30008,11 @@
     },
     "rsvp": {
       "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true
     },
     "run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "requires": {
         "queue-microtask": "^1.2.2"
@@ -34860,12 +30020,10 @@
     },
     "rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "rxjs": {
       "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "requires": {
         "tslib": "^1.9.0"
@@ -34873,19 +30031,16 @@
       "dependencies": {
         "tslib": {
           "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
           "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
     "safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -34894,12 +30049,10 @@
     },
     "safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sane": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
       "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
       "dev": true,
       "requires": {
@@ -34916,7 +30069,6 @@
       "dependencies": {
         "anymatch": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
           "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
@@ -34926,7 +30078,6 @@
         },
         "braces": {
           "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
@@ -34944,7 +30095,6 @@
           "dependencies": {
             "extend-shallow": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
@@ -34955,7 +30105,6 @@
         },
         "cross-spawn": {
           "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
@@ -34968,7 +30117,6 @@
         },
         "execa": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
@@ -34983,7 +30131,6 @@
         },
         "fill-range": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
@@ -34995,7 +30142,6 @@
           "dependencies": {
             "extend-shallow": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
@@ -35006,7 +30152,6 @@
         },
         "get-stream": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
@@ -35015,13 +30160,11 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
@@ -35030,7 +30173,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35041,13 +30183,11 @@
         },
         "is-stream": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
           "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "micromatch": {
           "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
@@ -35068,7 +30208,6 @@
         },
         "normalize-path": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
@@ -35077,7 +30216,6 @@
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
           "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
@@ -35086,19 +30224,16 @@
         },
         "path-key": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
           "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
         "shebang-command": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
           "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
@@ -35107,13 +30242,11 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
           "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "to-regex-range": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
           "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
@@ -35123,7 +30256,6 @@
         },
         "which": {
           "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
@@ -35132,181 +30264,61 @@
         }
       }
     },
-    "sass": {
-      "version": "1.34.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
-      "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
+    "sass-embedded": {
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.50.0.tgz",
+      "integrity": "sha512-WCYA7FR0euku/VkpejpjTE6zjL8+h0eFZrLLjx42wCjb9/qKKyFWLdgsErXwnq3jDOMyUY4dYJfenRIVMcEXog==",
       "requires": {
-        "chokidar": ">=3.0.0 <4.0.0"
-      }
-    },
-    "sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+        "buffer-builder": "^0.2.0",
+        "extract-zip": "^2.0.1",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "node-fetch": "^2.6.0",
+        "rxjs": "^7.4.0",
+        "semver": "^7.3.5",
+        "shelljs": "^0.8.4",
+        "supports-color": "^8.1.1",
+        "tar": "^6.0.5"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "optional": true,
-          "peer": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "optional": true,
-          "peer": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "optional": true,
-          "peer": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "optional": true,
-          "peer": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "optional": true,
-          "peer": true,
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "lru-cache": {
+          "version": "7.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
+          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw=="
+        },
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
           "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "tslib": "^2.1.0"
           }
         },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "optional": true,
-          "peer": true,
+        "semver": {
+          "version": "7.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
+          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
+            "lru-cache": "^7.4.0"
           }
         },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "optional": true,
-          "peer": true,
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "sass-loader": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.1.1.tgz",
-      "integrity": "sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA==",
-      "requires": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
     "saxes": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dev": true,
       "requires": {
@@ -35315,7 +30327,6 @@
     },
     "scheduler": {
       "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
       "requires": {
         "loose-envify": "^1.1.0",
@@ -35324,7 +30335,6 @@
     },
     "schema-utils": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "requires": {
         "@types/json-schema": "^7.0.5",
@@ -35332,171 +30342,28 @@
         "ajv-keywords": "^3.5.2"
       }
     },
-    "scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
-    },
-    "selfsigned": {
-      "version": "1.10.11",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
-      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
-      "requires": {
-        "node-forge": "^0.10.0"
-      }
-    },
     "semver": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
     "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "6.0.0",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "requires": {
         "randombytes": "^2.1.0"
       }
     },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-value": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
@@ -35508,7 +30375,6 @@
       "dependencies": {
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -35517,20 +30383,13 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
     "shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "requires": {
         "kind-of": "^6.0.2"
@@ -35538,7 +30397,6 @@
     },
     "shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "requires": {
         "shebang-regex": "^3.0.0"
@@ -35546,22 +30404,42 @@
     },
     "shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
+    "shelljs": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "dependencies": {
+        "interpret": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+          "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
+        },
+        "rechoir": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+          "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+          "requires": {
+            "resolve": "^1.1.6"
+          }
+        }
+      }
+    },
     "shellwords": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true,
       "optional": true
     },
     "side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "peer": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -35569,39 +30447,20 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        }
-      }
+      "version": "3.0.7",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slice-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "peer": true,
       "requires": {
@@ -35612,7 +30471,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "peer": true,
           "requires": {
@@ -35621,7 +30479,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "peer": true,
           "requires": {
@@ -35630,7 +30487,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "peer": true
         }
@@ -35638,7 +30494,6 @@
     },
     "snapdragon": {
       "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
@@ -35654,7 +30509,6 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -35663,7 +30517,6 @@
         },
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -35672,7 +30525,6 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -35681,7 +30533,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -35690,7 +30541,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35701,7 +30551,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -35710,7 +30559,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -35721,7 +30569,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -35732,19 +30579,16 @@
         },
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
@@ -35752,7 +30596,6 @@
     },
     "snapdragon-node": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
@@ -35763,7 +30606,6 @@
       "dependencies": {
         "define-property": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
@@ -35774,7 +30616,6 @@
     },
     "snapdragon-util": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
@@ -35783,7 +30624,6 @@
       "dependencies": {
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -35792,45 +30632,20 @@
         }
       }
     },
-    "social-share-button": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/social-share-button/-/social-share-button-2.2.0.tgz",
-      "integrity": "sha512-8OatmjB10MFqnbgVFJe4SjRXBIwepla/FOo2gsC6w/PsQ1RuS5oKwe9kixv2TfWcTA1GCcT6m+lEylFRPrr71g==",
-      "requires": {
-        "domassist": "^2.2.0",
-        "domodule": "^8.0.0"
-      }
-    },
-    "sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^3.4.0",
-        "websocket-driver": "^0.7.4"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
     "source-list-map": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "source-map": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "source-map-js": {
+      "version": "1.0.2",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    },
     "source-map-loader": {
       "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "requires": {
         "async": "^2.5.0",
@@ -35839,7 +30654,6 @@
     },
     "source-map-resolve": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
@@ -35851,9 +30665,8 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -35861,21 +30674,27 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
     "source-map-url": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
+    "spark-md5": {
+      "version": "3.0.2",
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="
+    },
     "spdx-correct": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -35883,58 +30702,31 @@
     },
     "spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
     },
     "spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
-      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
+      "version": "3.0.11",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
     },
     "specificity": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
       "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
       "dev": true,
       "peer": true
     },
     "split-string": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
@@ -35943,59 +30735,11 @@
     },
     "sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "src": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/src/-/src-1.1.2.tgz",
-      "integrity": "sha1-eKvdHAjKyibMbPRb1YC1bZOs+38=",
-      "requires": {
-        "redis-url": "~0.2.0",
-        "underscore": "~1.6.0",
-        "uuid": "~1.4.1"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-1.4.2.tgz",
-          "integrity": "sha1-RTAZ9oaWam34PNxSROfJkOzDMvw="
-        }
-      }
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "requires": {
-        "minipass": "^3.1.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
     "stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -36003,7 +30747,6 @@
       "dependencies": {
         "escape-string-regexp": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
           "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
           "dev": true
         }
@@ -36011,7 +30754,6 @@
     },
     "static-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
@@ -36021,7 +30763,6 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -36030,7 +30771,6 @@
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
@@ -36039,7 +30779,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -36050,7 +30789,6 @@
         },
         "is-data-descriptor": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
@@ -36059,7 +30797,6 @@
           "dependencies": {
             "kind-of": {
               "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
@@ -36070,7 +30807,6 @@
         },
         "is-descriptor": {
           "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
           "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
@@ -36081,73 +30817,32 @@
         },
         "kind-of": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
     },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
-    "stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "optional": true,
-          "peer": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
     "string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.2.0"
       },
       "dependencies": {
         "safe-buffer": {
           "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
         }
       }
     },
+    "string-env-interpolation": {
+      "version": "1.0.1",
+      "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="
+    },
     "string-length": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
@@ -36156,25 +30851,27 @@
       }
     },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "8.0.0",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        }
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz",
-      "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==",
-      "dev": true,
-      "peer": true,
+      "version": "4.0.6",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.2",
+        "es-abstract": "^1.19.1",
         "get-intrinsic": "^1.1.1",
         "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
@@ -36183,19 +30880,17 @@
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
-      "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==",
+      "version": "1.2.5",
+      "integrity": "sha512-Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "es-abstract": "^1.19.1"
       }
     },
     "string.prototype.trimend": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
       "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
       "requires": {
         "call-bind": "^1.0.2",
@@ -36204,117 +30899,76 @@
     },
     "string.prototype.trimstart": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
       "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
+    "stringify-object": {
+      "version": "3.3.0",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "requires": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      }
+    },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true
     },
+    "strip-comments": {
+      "version": "2.0.1",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="
+    },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
     "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "optional": true,
+      "version": "3.0.0",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "min-indent": "^1.0.0"
       }
     },
     "strip-json-comments": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "peer": true
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "style-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
+      "version": "3.3.1",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "requires": {}
+    },
+    "style-mod": {
+      "version": "4.0.0",
+      "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
     },
     "style-search": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true,
       "peer": true
     },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
     "stylelint": {
       "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz",
       "integrity": "sha512-DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==",
       "dev": true,
       "peer": true,
@@ -36371,7 +31025,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "peer": true,
@@ -36379,22 +31032,24 @@
             "color-convert": "^2.0.1"
           }
         },
-        "camelcase-keys": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-          "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+        "autoprefixer": {
+          "version": "9.8.8",
+          "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "camelcase": "^5.3.1",
-            "map-obj": "^4.0.0",
-            "quick-lru": "^4.0.1"
+            "browserslist": "^4.12.0",
+            "caniuse-lite": "^1.0.30001109",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "picocolors": "^0.2.1",
+            "postcss": "^7.0.32",
+            "postcss-value-parser": "^4.1.0"
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "peer": true,
           "requires": {
@@ -36404,7 +31059,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "peer": true,
@@ -36413,153 +31067,68 @@
           }
         },
         "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "peer": true
-        },
-        "get-stdin": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-          "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+          "version": "1.1.4",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "peer": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "peer": true
         },
-        "hosted-git-info": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "version": "5.2.0",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true,
           "peer": true
         },
-        "map-obj": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-          "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true,
           "peer": true
         },
-        "meow": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-          "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/minimist": "^1.2.0",
-            "camelcase-keys": "^6.2.2",
-            "decamelize": "^1.2.0",
-            "decamelize-keys": "^1.1.0",
-            "hard-rejection": "^2.1.0",
-            "minimist-options": "4.1.0",
-            "normalize-package-data": "^3.0.0",
-            "read-pkg-up": "^7.0.1",
-            "redent": "^3.0.0",
-            "trim-newlines": "^3.0.0",
-            "type-fest": "^0.18.0",
-            "yargs-parser": "^20.2.3"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-          "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "redent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-          "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "indent-string": "^4.0.0",
-            "strip-indent": "^3.0.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+        "postcss-scss": {
+          "version": "2.1.1",
+          "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
           "dev": true,
           "peer": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "postcss": "^7.0.6"
           }
         },
-        "strip-indent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true,
-          "peer": true,
-          "requires": {
-            "min-indent": "^1.0.0"
-          }
+          "peer": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "peer": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "trim-newlines": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-          "dev": true,
-          "peer": true
-        },
-        "type-fest": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-          "dev": true,
-          "peer": true
-        },
-        "yargs-parser": {
-          "version": "20.2.7",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-          "dev": true,
-          "peer": true
         }
       }
     },
     "subscriptions-transport-ws": {
-      "version": "0.9.19",
-      "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz",
-      "integrity": "sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==",
-      "optional": true,
+      "version": "0.11.0",
+      "integrity": "sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==",
       "requires": {
         "backo2": "^1.0.2",
         "eventemitter3": "^3.1.0",
@@ -36570,31 +31139,45 @@
       "dependencies": {
         "eventemitter3": {
           "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
-          "optional": true
-        },
-        "symbol-observable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-          "optional": true
+          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
         }
       }
     },
     "sugarss": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
       "dev": true,
       "peer": true,
       "requires": {
         "postcss": "^7.0.2"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true,
+          "peer": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "peer": true
+        }
       }
     },
     "supports-color": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
         "has-flag": "^3.0.0"
@@ -36602,7 +31185,6 @@
     },
     "supports-hyperlinks": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
@@ -36612,13 +31194,11 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -36627,131 +31207,56 @@
         }
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true,
       "peer": true
     },
     "svg4everybody": {
       "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/svg4everybody/-/svg4everybody-2.1.9.tgz",
       "integrity": "sha1-W9n23vwTOFmgRGRtR0P6vCjbfi0="
     },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-          "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^3.2.1",
-            "domutils": "^1.7.0",
-            "nth-check": "^1.0.2"
-          }
-        },
-        "css-what": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-          "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
-        },
-        "dom-serializer": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-          "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "entities": "^2.0.0"
-          }
-        },
-        "domutils": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          },
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.3.1",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-              "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-            }
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        }
-      }
-    },
     "symbol-observable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
-      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="
+      "version": "1.2.0",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
     },
     "symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "sync-fetch": {
+      "version": "0.3.1",
+      "integrity": "sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==",
+      "requires": {
+        "buffer": "^5.7.0",
+        "node-fetch": "^2.6.1"
+      }
+    },
     "tabbable": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
       "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.0",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "peer": true,
       "requires": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-          "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
           "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -36762,21 +31267,19 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "peer": true
         }
       }
     },
     "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="
+      "version": "2.2.1",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -36786,9 +31289,28 @@
         "yallist": "^4.0.0"
       }
     },
+    "temp-dir": {
+      "version": "2.0.0",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
+    },
+    "tempy": {
+      "version": "0.6.0",
+      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "requires": {
+        "is-stream": "^2.0.0",
+        "temp-dir": "^2.0.0",
+        "type-fest": "^0.16.0",
+        "unique-string": "^2.0.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.16.0",
+          "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="
+        }
+      }
+    },
     "terminal-link": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dev": true,
       "requires": {
@@ -36797,84 +31319,64 @@
       }
     },
     "terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "version": "5.12.0",
+      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
       "requires": {
+        "acorn": "^8.5.0",
         "commander": "^2.20.0",
         "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
       },
       "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
+        },
         "source-map": {
           "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-      "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+      "version": "5.3.1",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
       "requires": {
-        "jest-worker": "^27.0.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
         "source-map": "^0.6.1",
-        "terser": "^5.7.0"
+        "terser": "^5.7.2"
       },
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-worker": {
-          "version": "27.0.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
-          "integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
+          "version": "27.5.1",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
           "requires": {
             "@types/node": "*",
             "merge-stream": "^2.0.0",
             "supports-color": "^8.0.0"
           }
         },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
+            "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
         },
-        "serialize-javascript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-          "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
           "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -36884,7 +31386,6 @@
     },
     "test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "requires": {
@@ -36895,45 +31396,28 @@
     },
     "text-table": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "peer": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "throat": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
       "dev": true
     },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
     "to-object-path": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
@@ -36942,7 +31426,6 @@
       "dependencies": {
         "kind-of": {
           "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
@@ -36953,7 +31436,6 @@
     },
     "to-regex": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
@@ -36965,7 +31447,6 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "requires": {
         "is-number": "^7.0.0"
@@ -36973,17 +31454,10 @@
     },
     "toggle-selection": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
     "tough-cookie": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "requires": {
@@ -36994,7 +31468,6 @@
     },
     "tr46": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "requires": {
@@ -37003,57 +31476,53 @@
     },
     "tributejs": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
       "integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
     },
     "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "optional": true,
+      "version": "3.0.1",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
       "peer": true
     },
     "trough": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
       "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
       "dev": true,
       "peer": true
     },
-    "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "optional": true,
-      "peer": true,
+    "ts-invariant": {
+      "version": "0.9.4",
+      "integrity": "sha512-63jtX/ZSwnUNi/WhXjnK8kz4cHHpYS60AnmA6ixz17l7E12a5puCWFlNpkne5Rl0J8TBPVHpGjsj4fxs8ObVLQ==",
       "requires": {
-        "glob": "^7.1.2"
+        "tslib": "^2.1.0"
       }
     },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
-    "ts-invariant": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.7.3.tgz",
-      "integrity": "sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==",
+    "ts-node": {
+      "version": "9.1.1",
+      "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
       "requires": {
-        "tslib": "^2.1.0"
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "4.0.2",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+        }
       }
     },
     "ts-pnp": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
       "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
     },
     "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.12.0",
+      "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
@@ -37063,44 +31532,25 @@
       "dependencies": {
         "json5": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
-          "peer": true,
           "requires": {
             "minimist": "^1.2.0"
           }
         },
         "strip-bom": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
     "tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "version": "2.3.1",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "twemoji": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-13.1.0.tgz",
       "integrity": "sha512-e3fZRl2S9UQQdBFLYXtTBT6o4vidJMnpWUAhJA+yLGR+kaUTZAt3PixC0cGvvxWSuq2MSz/o0rJraOXrWw/4Ew==",
       "requires": {
         "fs-extra": "^8.0.1",
@@ -37111,61 +31561,49 @@
     },
     "twemoji-parser": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-13.1.0.tgz",
       "integrity": "sha512-AQOzLJpYlpWMy8n+0ATyKKZzWlZBJN+G0C+5lhX7Ftc2PeEVdUU/7ns2Pn2vVje26AIZ/OHwFoUbdv6YYD/wGg=="
     },
     "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+      "version": "0.4.0",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       }
     },
     "type-detect": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true
     },
     "type-fest": {
       "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
     "typedarray": {
       "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
       "requires": {
         "is-typedarray": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "4.6.2",
+      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "peer": true
+    },
     "uc.micro": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "unbox-primitive": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
       "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "requires": {
         "function-bind": "^1.1.1",
@@ -37174,44 +31612,37 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+    "undici": {
+      "version": "4.14.1",
+      "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ=="
     },
     "unfetch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.2.tgz",
       "integrity": "sha512-L0qrK7ZeAudGiKYw6nzFjnJ2D5WHblUBwmHIqtPS6oKUd+Hcpk7/hKsSmcHsTlpd1TbTNsiRBUKRq3bHLNIqIw=="
     },
     "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
+      "version": "2.0.0",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
     },
     "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="
+      "version": "2.0.0",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
+      "version": "2.0.0",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
     },
     "unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+      "version": "9.2.2",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -37225,16 +31656,20 @@
       "dependencies": {
         "is-buffer": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
           "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
           "dev": true,
           "peer": true
+        },
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+          "dev": true,
+          "peer": true
         }
       }
     },
     "union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
@@ -37246,41 +31681,20 @@
       "dependencies": {
         "is-extendable": {
           "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
           "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
           "dev": true
         }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "uniqs": {
+    "unique-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "crypto-random-string": "^2.0.0"
       }
     },
     "unist-util-find-all-after": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
       "dev": true,
       "peer": true,
@@ -37290,14 +31704,12 @@
     },
     "unist-util-is": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
       "peer": true
     },
     "unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
       "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "peer": true,
@@ -37307,22 +31719,26 @@
     },
     "universalify": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
-    "unpipe": {
+    "unixify": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+      "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=",
+      "requires": {
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
     },
     "unset-value": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
@@ -37332,7 +31748,6 @@
       "dependencies": {
         "has-value": {
           "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
@@ -37343,7 +31758,6 @@
           "dependencies": {
             "isobject": {
               "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
               "dev": true,
               "requires": {
@@ -37354,15 +31768,17 @@
         },
         "has-values": {
           "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
         }
       }
     },
+    "upath": {
+      "version": "1.2.0",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+    },
     "uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
@@ -37370,68 +31786,28 @@
     },
     "urix": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        }
-      }
-    },
     "use": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
     "uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
     },
     "v8-to-istanbul": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
       "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
@@ -37442,44 +31818,30 @@
       "dependencies": {
         "source-map": {
           "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         }
       }
     },
+    "valid-url": {
+      "version": "1.0.9",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
+    "value-or-promise": {
+      "version": "1.0.11",
+      "integrity": "sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg=="
     },
     "vfile": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
       "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
       "peer": true,
@@ -37492,7 +31854,6 @@
       "dependencies": {
         "is-buffer": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
           "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
           "dev": true,
           "peer": true
@@ -37501,7 +31862,6 @@
     },
     "vfile-message": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
       "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
       "peer": true,
@@ -37512,21 +31872,22 @@
     },
     "vscode-languageserver-types": {
       "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
       "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
       "requires": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
+    "w3c-keyname": {
+      "version": "2.2.4",
+      "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw=="
+    },
     "w3c-xmlserializer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
       "requires": {
@@ -37534,44 +31895,36 @@
       }
     },
     "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "requires": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "watchpack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
-      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
+      "version": "2.3.1",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
       }
     },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
+    "web-streams-polyfill": {
+      "version": "3.2.0",
+      "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA=="
     },
     "webidl-conversions": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true
     },
     "webpack": {
-      "version": "5.51.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz",
-      "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==",
+      "version": "5.69.1",
+      "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
       "requires": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.50",
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
@@ -37579,12 +31932,12 @@
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.7.1",
+        "enhanced-resolve": "^5.8.3",
+        "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -37592,13 +31945,21 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.2.0",
-        "webpack-sources": "^3.2.0"
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
       },
       "dependencies": {
+        "acorn": {
+          "version": "8.7.0",
+          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
+        },
+        "acorn-import-assertions": {
+          "version": "1.8.0",
+          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+          "requires": {}
+        },
         "schema-utils": {
           "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -37609,9 +31970,8 @@
       }
     },
     "webpack-assets-manifest": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-assets-manifest/-/webpack-assets-manifest-5.0.6.tgz",
-      "integrity": "sha512-CW94ylPHurZTmxnYajSFA8763Cv/QFIKNgBwqBLaIOnBjH1EbDUAf8Eq1/i+o8qaKyKXJ3aX7r4/jtpXD88ldg==",
+      "version": "5.1.0",
+      "integrity": "sha512-kPuTMEjBrqZQVJ5M6yXNBCEdFbQQn7p+loNXt8NOeDFaAbsNFWqqwR0YL1mfG5LbwhK5FLXWXpuK3GuIIZ46rg==",
       "requires": {
         "chalk": "^4.0",
         "deepmerge": "^4.0",
@@ -37624,16 +31984,14 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "requires": {
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -37641,7 +31999,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
             "color-name": "~1.1.4"
@@ -37649,27 +32006,23 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "version": "3.1.1",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "requires": {
-            "@types/json-schema": "^7.0.6",
+            "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
             "has-flag": "^4.0.0"
@@ -37677,77 +32030,30 @@
         }
       }
     },
-    "webpack-bundle-analyzer": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
-      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.19",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
     "webpack-cli": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
-      "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
+      "version": "4.9.2",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.4",
-        "@webpack-cli/info": "^1.3.0",
-        "@webpack-cli/serve": "^1.5.2",
-        "colorette": "^1.2.1",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
         "commander": "^7.0.0",
         "execa": "^5.0.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^2.2.0",
         "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
         "webpack-merge": "^5.7.3"
       },
       "dependencies": {
         "commander": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
         },
         "execa": {
           "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
           "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "requires": {
             "cross-spawn": "^7.0.3",
@@ -37763,133 +32069,16 @@
         },
         "get-stream": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
           "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
         },
         "human-signals": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
           "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
         }
       }
     },
-    "webpack-config-utils": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-config-utils/-/webpack-config-utils-2.3.1.tgz",
-      "integrity": "sha512-0uC5uj7sThFTePTQjfpe5Wqcbw3KSCxqswOmW96lwk2ZI2CU098rWY2ZqOVGJQYJ3hfEltmjcLNkKutw8LJAlg==",
-      "requires": {
-        "webpack-combine-loaders": "2.0.4"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "bundled": true
-        },
-        "webpack-combine-loaders": {
-          "version": "2.0.4",
-          "bundled": true,
-          "requires": {
-            "qs": "^6.5.2"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz",
-      "integrity": "sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==",
-      "requires": {
-        "colorette": "^1.2.2",
-        "mem": "^8.1.1",
-        "memfs": "^3.2.2",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz",
-      "integrity": "sha512-ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ==",
-      "requires": {
-        "ansi-html": "^0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.1",
-        "colorette": "^1.2.2",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
-        "internal-ip": "^6.2.0",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
-        "schema-utils": "^3.1.0",
-        "selfsigned": "^1.10.11",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^5.0.0",
-        "ws": "^8.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",
-          "integrity": "sha512-tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ=="
-        },
-        "ipaddr.js": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-          "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
-        },
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz",
-          "integrity": "sha512-UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg==",
-          "requires": {
-            "ansi-regex": "^6.0.0"
-          }
-        },
-        "ws": {
-          "version": "8.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-          "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
-          "requires": {}
-        }
-      }
-    },
     "webpack-merge": {
       "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
       "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "requires": {
         "clone-deep": "^4.0.1",
@@ -37897,34 +32086,16 @@
       }
     },
     "webpack-sources": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz",
-      "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+      "version": "3.2.3",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
     },
     "what-input": {
       "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/what-input/-/what-input-5.2.10.tgz",
       "integrity": "sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==",
       "peer": true
     },
     "whatwg-encoding": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
       "dev": true,
       "requires": {
@@ -37933,14 +32104,12 @@
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz",
-      "integrity": "sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==",
+      "version": "8.7.0",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "requires": {
         "lodash": "^4.7.0",
@@ -37950,7 +32119,6 @@
     },
     "which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "requires": {
         "isexe": "^2.0.0"
@@ -37958,7 +32126,6 @@
     },
     "which-boxed-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "requires": {
         "is-bigint": "^1.0.1",
@@ -37970,75 +32137,274 @@
     },
     "which-module": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "devOptional": true
+      "dev": true
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "optional": true,
-      "peer": true,
+    "wildcard": {
+      "version": "2.0.0",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
+    "workbox-background-sync": {
+      "version": "6.5.0",
+      "integrity": "sha512-rrekt/gt6qOIZsisj6QZfmAFPAnocq1Z603zAjt+qHmeXY8DLPOklVtvrXSaHoHH3qIjUq3SQY5s2x240iTIKw==",
       "requires": {
-        "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "optional": true,
-          "peer": true
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-broadcast-update": {
+      "version": "6.5.0",
+      "integrity": "sha512-JC97c7tYqoGWcCfbKO9KHG6lkU+WhXCnDB2j1oFWEiv53nUHy3yjPpzMmAGNLD9oV5lInO15n6V18HfwgkhISw==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-build": {
+      "version": "6.5.0",
+      "integrity": "sha512-da0/1b6//P9+ts7ofcIKcMVPyN6suJvjJASXokF7DsqvUmgRBPcCVV4KCy8QWjgfcz7mzuTpkSbdVHcPFJ/p0A==",
+      "requires": {
+        "@apideck/better-ajv-errors": "^0.3.1",
+        "@babel/core": "^7.11.1",
+        "@babel/preset-env": "^7.11.0",
+        "@babel/runtime": "^7.11.2",
+        "@rollup/plugin-babel": "^5.2.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.4.1",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
+        "ajv": "^8.6.0",
+        "common-tags": "^1.8.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "lodash": "^4.17.20",
+        "pretty-bytes": "^5.3.0",
+        "rollup": "^2.43.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "source-map": "^0.8.0-beta.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^2.0.1",
+        "tempy": "^0.6.0",
+        "upath": "^1.2.0",
+        "workbox-background-sync": "6.5.0",
+        "workbox-broadcast-update": "6.5.0",
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-google-analytics": "6.5.0",
+        "workbox-navigation-preload": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-range-requests": "6.5.0",
+        "workbox-recipes": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0",
+        "workbox-streams": "6.5.0",
+        "workbox-sw": "6.5.0",
+        "workbox-window": "6.5.0"
+      },
+      "dependencies": {
+        "@apideck/better-ajv-errors": {
+          "version": "0.3.3",
+          "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
+          "requires": {
+            "json-schema": "^0.4.0",
+            "jsonpointer": "^5.0.0",
+            "leven": "^3.1.0"
+          }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "optional": true,
-          "peer": true
+        "ajv": {
+          "version": "8.10.0",
+          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "optional": true,
-          "peer": true,
+        "fs-extra": {
+          "version": "9.1.0",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "optional": true,
-          "peer": true,
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.8.0-beta.0",
+          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+          "requires": {
+            "whatwg-url": "^7.0.0"
+          }
+        },
+        "tr46": {
+          "version": "1.0.1",
+          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        },
+        "webidl-conversions": {
+          "version": "4.0.2",
+          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+        },
+        "whatwg-url": {
+          "version": "7.1.0",
+          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
           }
         }
       }
     },
-    "wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
+    "workbox-cacheable-response": {
+      "version": "6.5.0",
+      "integrity": "sha512-sqAtWAiBwWvI8HG/2Do7BeKPhHuUczt22ORkAjkH9DfTq9LuWRFd6T4HAMqX5G8F1gM9XA2UPlxRrEeSpFIz/A==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
     },
-    "window-size": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
+    "workbox-core": {
+      "version": "6.5.0",
+      "integrity": "sha512-5SPwNipUzYBhrneLVT02JFA0fw3LG82jFAN/G2NzxkIW10t4MVZuML2nU94bbkgjq25u0fkY8+4JXzMfHgxEWQ=="
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    "workbox-expiration": {
+      "version": "6.5.0",
+      "integrity": "sha512-y3WRkKRy/gMuZZNkrLFahjY0QZtLoq+QfhTbVAsOGHVg1CCtnNbeFAnEidQs7UisI2BK76VqQPvM7hEOFyZ92A==",
+      "requires": {
+        "idb": "^6.1.4",
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-google-analytics": {
+      "version": "6.5.0",
+      "integrity": "sha512-CHHh55wMNCc/BV1URrzEM2Zjgf6g2CV6QpAAc1pBRqaLY5755PeQZbp3o8KbJEM7YsC9mIBeQVsOkSKkGS30bg==",
+      "requires": {
+        "workbox-background-sync": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-navigation-preload": {
+      "version": "6.5.0",
+      "integrity": "sha512-ktrRQzXJ0zFy0puOtCa49wE3BSBGUB8KRMot3tEieikCkSO0wMLmiCb9GwTVvNMJLl0THRlsdFoI93si04nTxA==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-precaching": {
+      "version": "6.5.0",
+      "integrity": "sha512-IVLzgHx38T6LphJyEOltd7XAvpDi73p85uCT2ZtT1HHg9FAYC49a+5iHUVOnqye73fLW20eiAMFcnehGxz9RWg==",
+      "requires": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-range-requests": {
+      "version": "6.5.0",
+      "integrity": "sha512-+qTELdGZE5rOjuv+ifFrfRDN8Uvzpbm5Fal7qSUqB1V1DLCMxPwHCj6mWwQBRKBpW7G09kAwewH7zA3Asjkf/Q==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-recipes": {
+      "version": "6.5.0",
+      "integrity": "sha512-7hWZAIcXmvr31NwYSWaQIrnThCH/Dx9+eYv/YdkpUeWIXRiHRkYvP1FdiHItbLSjL4Y6K7cy2Y9y5lGCkgaE4w==",
+      "requires": {
+        "workbox-cacheable-response": "6.5.0",
+        "workbox-core": "6.5.0",
+        "workbox-expiration": "6.5.0",
+        "workbox-precaching": "6.5.0",
+        "workbox-routing": "6.5.0",
+        "workbox-strategies": "6.5.0"
+      }
+    },
+    "workbox-routing": {
+      "version": "6.5.0",
+      "integrity": "sha512-w1A9OVa/yYStu9ds0Dj+TC6zOAoskKlczf+wZI5mrM9nFCt/KOMQiFp1/41DMFPrrN/8KlZTS3Cel/Ttutw93Q==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-strategies": {
+      "version": "6.5.0",
+      "integrity": "sha512-Ngnwo+tfGw4uKSlTz3h1fYKb/lCV7SDI/dtTb8VaJzRl0N9XssloDGYERBmF6BN/DV/x3bnRsshfobnKI/3z0g==",
+      "requires": {
+        "workbox-core": "6.5.0"
+      }
+    },
+    "workbox-streams": {
+      "version": "6.5.0",
+      "integrity": "sha512-ZbeaZINkju4x45P9DFyRbOYInE+dyNAJIelflz4f9AOAdm+zZUJCooU4MdfsedVhHiTIA6pCD/3jCmW1XbvlbA==",
+      "requires": {
+        "workbox-core": "6.5.0",
+        "workbox-routing": "6.5.0"
+      }
+    },
+    "workbox-sw": {
+      "version": "6.5.0",
+      "integrity": "sha512-uPGJ9Yost4yabnCko/IuhouquoQKrWOEqLq7L/xVYtltWe4+J8Hw8iPCVtxvXQ26hffd7MaFWUAN83j2ZWbxRg=="
+    },
+    "workbox-webpack-plugin": {
+      "version": "6.5.0",
+      "integrity": "sha512-wy4uCBJELNfJVf2b4Tg3mjJQySq/aReWv4Q1RxQweJkY9ihq7DOGA3wLlXvoauek+MX/SuQfS3it+eXIfHKjvg==",
+      "requires": {
+        "fast-json-stable-stringify": "^2.1.0",
+        "pretty-bytes": "^5.4.1",
+        "upath": "^1.2.0",
+        "webpack-sources": "^1.4.3",
+        "workbox-build": "6.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "workbox-window": {
+      "version": "6.5.0",
+      "integrity": "sha512-DOrhiTnWup/CsNstO2uvfdKM4kdStgHd31xGGvBcoCE3Are3DRcy5s3zz3PedcAR1AKskQj3BXz0UhzQiOq8nA==",
+      "requires": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "6.5.0"
+      }
     },
     "wrap-ansi": {
       "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "requires": {
@@ -38049,7 +32415,6 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -38058,7 +32423,6 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -38067,7 +32431,6 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
@@ -38075,12 +32438,10 @@
     },
     "wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "requires": {
@@ -38091,57 +32452,47 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "devOptional": true,
+      "version": "7.5.7",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
     "xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "xtend": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "devOptional": true
+      "dev": true
     },
     "yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yaml-jest": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/yaml-jest/-/yaml-jest-1.0.5.tgz",
-      "integrity": "sha1-KI5UG64bVR0RPUhk1suPMW4b0zE=",
+      "version": "1.2.0",
+      "integrity": "sha512-rrUNn3ovs5J8td7i3k6rJfh3leBydnM+3YqKJcVyTFRiSiEAdKMy7uhqBxJfsJ+w1le5AGCkMTldNEMY8oqbPg==",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.7.0"
+        "js-yaml": "^4.1.0"
       }
     },
     "yargs": {
       "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "requires": {
@@ -38160,7 +32511,6 @@
     },
     "yargs-parser": {
       "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "requires": {
@@ -38177,19 +32527,27 @@
         "fd-slicer": "~1.1.0"
       }
     },
+    "yn": {
+      "version": "3.1.1",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    },
     "yocto-queue": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     },
     "zen-observable": {
       "version": "0.8.15",
-      "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
       "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
     },
+    "zen-observable-ts": {
+      "version": "1.2.3",
+      "integrity": "sha512-hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g==",
+      "requires": {
+        "zen-observable": "0.8.15"
+      }
+    },
     "zwitch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
       "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
       "dev": true,
       "peer": true
diff --git a/package.json b/package.json
index d58443c2ba8bf..7023f9cd50702 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Note: this is not a package, just the dependencies for the project in the dev environment.",
   "private": true,
   "engines": {
-    "node": "^16.9.1",
-    "npm": "^7.21.1"
+    "node": ">=16.9.1",
+    "npm": ">=7.21.1"
   },
   "files": [
     "packages/**/*"
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 036979a3b8d61..4e8a3c428d035 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/browserslist-config",
   "description": "The Browserslist configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/core/package.json b/packages/core/package.json
index 028cc4436b852..8c15e8f48782a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/core",
   "description": "The core dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -9,32 +9,28 @@
   },
   "author": "Decidim Contributors",
   "license": "AGPL-3.0",
-  "engines": {
-    "node": "^16.9.1",
-    "npm": "^7.21.1"
-  },
   "dependencies": {
-    "@joeattardi/emoji-button": "^4.6.0",
+    "@joeattardi/emoji-button": "^4.6.2",
+    "@rails/activestorage": "^6.0.4",
+    "@tarekraafat/autocomplete.js": "^10.2.6",
     "@zeitiger/appendaround": "^1.0.0",
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "bootstrap-tagsinput": "^0.7.1",
     "classnames": "^2.2.5",
     "d3": "5.4.0",
+    "dayjs": "^1.11.0",
     "diff": "^5.0.0",
     "foundation-datepicker": "1.5.6",
     "foundation-sites": "^6.7.0",
-    "graphiql": "^1.4.2",
-    "graphql-docs": "https://github.com/decidim/graphql-docs/raw/master/graphql-docs-0.2.1.tgz",
+    "graphiql": "^1.4.7",
     "html5sortable": "0.10.0",
     "identity-obj-proxy": "^3.0.0",
     "jquery": "^3.2.1",
     "jquery-serializejson": "2.9.0",
-    "jquery.autocomplete": "1.2.0",
+    "js-cookie": "^3.0.1",
     "leaflet": "1.3.1",
-    "leaflet-svgicon": "^0.0.2",
     "leaflet-tilelayer-here": "1.0.2",
     "leaflet.markercluster": "1.4.1",
-    "moment": "2.29.1",
     "morphdom": "2.6.1",
     "prop-types": "^15.7.2",
     "quill": "1.3.7",
@@ -42,12 +38,10 @@
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-i18nify": "^1.8.8",
-    "react-select": "^1.2.1",
     "select": "^1.1.2",
-    "social-share-button": "2.2.0",
     "svg4everybody": "2.1.9",
     "tributejs": "5.1.3",
     "unfetch": "^3.0.0",
     "uuid": "^3.2.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/dev/package.json b/packages/dev/package.json
index 5d7e41d108ba9..0d33b3c597716 100644
--- a/packages/dev/package.json
+++ b/packages/dev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/dev",
   "description": "The dev dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/elections/package.json b/packages/elections/package.json
index 792013cb0df5d..225820a042aa9 100644
--- a/packages/elections/package.json
+++ b/packages/elections/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/elections",
   "description": "The elections and votings dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -10,8 +10,8 @@
   "author": "Decidim Contributors",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@decidim/decidim-bulletin_board": "0.22.3",
-    "@decidim/voting_schemes-dummy": "0.22.3",
-    "@decidim/voting_schemes-electionguard": "0.22.3"
+    "@decidim/decidim-bulletin_board": "0.23.0",
+    "@decidim/voting_schemes-dummy": "0.23.0",
+    "@decidim/voting_schemes-electionguard": "0.23.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index df75dded763a3..3a74b428dfb15 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/eslint-config",
   "description": "The eslint configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index e1fce92515b18..0735561300951 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/stylelint-config",
   "description": "The stylelint configuration for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
diff --git a/packages/webpacker/index.js b/packages/webpacker/index.js
index 4b8d8bfd81dea..33298453eb095 100644
--- a/packages/webpacker/index.js
+++ b/packages/webpacker/index.js
@@ -1,6 +1,7 @@
-const webpacker = require("@rails/webpacker");
+const { webpackConfig, ...restOpts } = require("@rails/webpacker");
 const overrideConfig = require("./src/override-config");
 
-module.exports = Object.assign(webpacker, { // eslint-disable-line
-  webpackConfig: overrideConfig(webpacker.webpackConfig)
-});
+module.exports = {
+  webpackConfig: overrideConfig(webpackConfig),
+  ...restOpts
+};
diff --git a/packages/webpacker/package.json b/packages/webpacker/package.json
index 9f4da510d2b29..88234c13de886 100644
--- a/packages/webpacker/package.json
+++ b/packages/webpacker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@decidim/webpacker",
   "description": "The webpacker dependencies for Decidim",
-  "version": "0.26.4",
+  "version": "0.27.2",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git",
@@ -11,40 +11,51 @@
   "license": "AGPL-3.0",
   "main": "index.js",
   "dependencies": {
-    "@babel/core": "^7.13.13",
-    "@babel/eslint-parser": "^7.13.14",
-    "@babel/plugin-transform-classes": "^7.13.0",
+    "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/plugin-transform-runtime": "^7.15.0",
+    "@babel/plugin-transform-classes": "^7.16.7",
     "@babel/plugin-transform-regenerator": "^7.13.15",
-    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/preset-env": "^7.13.5",
+    "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.12.13",
-    "@babel/types": "^7.0.0-beta.40",
+    "@babel/runtime": "^7.15.4",
     "@rails/ujs": "^6.1.3",
     "@rails/webpacker": "6.0.0-rc.5",
-    "@webpack-cli/serve": "^1.3.1",
-    "autoprefixer": "^9.8.6",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-__coverage__": "^1.11.111",
-    "babel-preset-airbnb": "^5.0.0",
-    "core-js": "^3.9.1",
-    "css-loader": "^4.3.0",
-    "css-minimizer-webpack-plugin": "^1.3.0",
+    "autoprefixer": "^10.4.1",
+    "babel-loader": "^8.2.2",
+    "compression-webpack-plugin": "^9.0.0",
+    "css-loader": "^6.5.1",
     "expose-loader": "^2.0.0",
-    "mini-css-extract-plugin": "^1.4.0",
-    "postcss": "^7.0.36",
-    "postcss-flexbugs-fixes": "^4.2.1",
-    "postcss-import": "^12.0.1",
-    "postcss-loader": "^5.2.0",
-    "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^2.1.1",
-    "sass": "^1.32.8",
-    "sass-loader": "^11.0.1",
+    "glob": "^7.2.0",
+    "js-yaml": "^4.1.0",
+    "mini-css-extract-plugin": "^2.4.5",
+    "path-complete-extname": "^1.0.0",
+    "postcss": "^8.4.5",
+    "postcss-flexbugs-fixes": "^5.0.2",
+    "postcss-import": "^14.0.2",
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "^7.1.0",
+    "postcss-scss": "^4.0.2",
+    "pnp-webpack-plugin": "^1.7.0",
+    "sass-embedded": "^1.49.9",
     "source-map-loader": "^0.2.4",
-    "style-loader": "^2.0.0",
-    "webpack": "^5.11.0",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-cli": "^4.2.0",
-    "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^4.0.0"
+    "style-loader": "^3.0.0",
+    "terser-webpack-plugin": "^5.2.4",
+    "webpack": "^5.53.0",
+    "webpack-assets-manifest": "^5.0.6",
+    "webpack-cli": "^4.8.0",
+    "webpack-merge": "^5.8.0",
+    "webpack-sources": "^3.2.1",
+    "workbox-recipes": "^6.4.2",
+    "workbox-webpack-plugin": "^6.4.2"
+  },
+  "devDependencies": {
+    "eslint": "^8.6.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.28.0",
+    "jest": "^27.4.5"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/webpacker/src/loaders/decidim-sass-loader.js b/packages/webpacker/src/loaders/decidim-sass-loader.js
new file mode 100644
index 0000000000000..393267179e59f
--- /dev/null
+++ b/packages/webpacker/src/loaders/decidim-sass-loader.js
@@ -0,0 +1,88 @@
+const sass = require("sass-embedded");
+const url = require("url");
+const path = require("path");
+const { config: { additional_paths: loadPaths, stylesheet_imports: stylesheetImports  } } = require("@rails/webpacker");
+
+const decidimImporter = {
+  canonicalize(importUrl, options) {
+    if (!options.fromImport) {
+      return null;
+    }
+    if (!importUrl.startsWith("!decidim-style-")) {
+      return null;
+    }
+    return new URL(`decidim:${importUrl}`);
+  },
+  load(canonicalUrl) {
+    const matches = decodeURI(canonicalUrl.toString()).match(/^decidim:!decidim-style-([^[]+)\[([^\]]+)\]$/);
+    if (!matches) {
+      return { contents: "", syntax: "scss" };
+    }
+
+    if (!stylesheetImports) {
+      return { contents: "", syntax: "scss" };
+    }
+
+    const type = matches[1];
+    const group = matches[2];
+    if (!stylesheetImports[type] || !stylesheetImports[type][group]) {
+      // If the group is not defined, return an empty configuration because
+      // otherwise the importer would continue finding the asset through
+      // paths which obviously fails.
+      return { contents: "", syntax: "scss" };
+    }
+
+    const statements = stylesheetImports[type][group].map((style) => `@import "${style}";`);
+
+    return { contents: statements.join("\n"), syntax: "scss" };
+  }
+};
+
+/**
+ * Custom loader for compiling Sass.
+ *
+ * @param {String} content The content to compile
+ * @returns {void}
+ */
+module.exports = function(content) { // eslint-disable-line no-undef
+  const callback = this.async();
+
+  let result = null;
+
+  try {
+    result = sass.compileString(
+      content,
+      {
+        loadPaths,
+        importers: [decidimImporter],
+        sourceMap: true,
+        sourceMapIncludeSources: true,
+        style: "expanded"
+      },
+    );
+  } catch (error) {
+    if (error.span && typeof error.span.url !== "undefined") {
+      this.addDependency(url.fileURLToPath(error.span.url));
+    }
+
+    callback(error);
+
+    return;
+  }
+
+  if (typeof result.loadedUrls !== "undefined") {
+    result.loadedUrls.forEach((includedFile) => {
+      if (includedFile.protocol !== "file:") {
+        return;
+      }
+      const normalizedIncludedFile = url.fileURLToPath(includedFile);
+
+      // Custom `importer` can return only `contents` so includedFile will be relative
+      if (path.isAbsolute(normalizedIncludedFile)) {
+        this.addDependency(normalizedIncludedFile);
+      }
+    });
+  }
+
+  callback(null, result.css.toString(), result.sourceMap);
+};
diff --git a/packages/webpacker/src/override-config.js b/packages/webpacker/src/override-config.js
index d5f11ee7b50ba..1de9ccb0919a5 100644
--- a/packages/webpacker/src/override-config.js
+++ b/packages/webpacker/src/override-config.js
@@ -1,52 +1,53 @@
-const { config } = require("@rails/webpacker");
+const path = require("path");
+const miniCssExtractPlugin = require("mini-css-extract-plugin");
+const { inliningCss } = require("@rails/webpacker");
 
 const overrideSassRule = (modifyConfig) => {
+  const sassLoaderPath = path.resolve(__dirname, "loaders/decidim-sass-loader") // eslint-disable-line no-undef
+
   const sassRule = modifyConfig.module.rules.find(
     (rule) => rule.test.toString() === "/\\.(scss|sass)(\\.erb)?$/i"
   );
-  if (!sassRule) {
-    return modifyConfig;
-  }
-
-  const sassLoader = sassRule.use.find((use) => {
-    return (typeof use === "object") && use.loader.match(/sass-loader/);
-  });
-  if (!sassLoader) {
-    return modifyConfig;
-  }
+  if (sassRule) {
+    const existingLoader = sassRule.use.find((use) => {
+      return (typeof use === "object") && use.loader.match(/sass-loader/);
+    });
+    if (existingLoader) {
+      existingLoader.loader = sassLoaderPath;
+    } else {
+      sassRule.use.push({ loader: sassLoaderPath });
+    }
+  } else {
+    // Add the sass rule
+    let baseLoader = "style-loader";
+    if (!inliningCss) {
+      baseLoader = miniCssExtractPlugin.loader;
+    }
 
-  const imports = config.stylesheet_imports;
-  if (!imports) {
-    return modifyConfig;
+    modifyConfig.module.rules.push({
+      test: /\.(scss|sass)(\.erb)?$/i,
+      use: [
+        baseLoader,
+        {
+          loader: require.resolve("css-loader"),
+          options: {
+            sourceMap: true,
+            importLoaders: 2
+          }
+        },
+        {
+          loader: "postcss-loader",
+          options: { sourceMap: true }
+        },
+        {
+          loader: sassLoaderPath
+        }
+      ]
+    })
   }
 
-  // Add the extra importer to the sass-loader to load the import statements for
-  // Decidim modules.
-  sassLoader.options.sassOptions.importer = [
-    (url) => {
-      const matches = url.match(/^!decidim-style-([^[]+)\[([^\]]+)\]$/);
-      if (!matches) {
-        return null;
-      }
-
-      const type = matches[1];
-      const group = matches[2];
-      if (!imports[type] || !imports[type][group]) {
-        // If the group is not defined, return an empty configuration because
-        // otherwise the importer would continue finding the asset through
-        // paths which obviously fails.
-        return { contents: "" };
-      }
-
-      const statements = imports[type][group].map((style) => `@import "${style}";`);
-
-      return { contents: statements.join("\n") };
-    }
-  ];
-
   return modifyConfig;
 }
 
-module.exports = (originalConfig) => { // eslint-disable-line
-  return overrideSassRule(originalConfig);
-};
+// Since all modifiers are functions, we can use a reduce clause to apply all them
+module.exports = (originalConfig) => [overrideSassRule].reduce((acc, modifier) => modifier(acc), originalConfig)
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 27492bc898aae..0f7b0c967e95e 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -24,12 +24,12 @@
 
   it "does not have missing keys" do
     expect(missing_keys).to be_empty,
-                            "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
+                            "Missing #{missing_keys.leaves.count} i18n keys, please run `bundle exec i18n-tasks missing --locales #{locales}' to show them"
   end
 
   it "does not have unused keys" do
     expect(unused_keys).to be_empty,
-                           "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
+                           "#{unused_keys.leaves.count} unused i18n keys, please run `bundle exec i18n-tasks unused --locales #{locales}' to show them"
   end
 
   unless ENV["SKIP_NORMALIZATION"]
@@ -44,7 +44,7 @@
 
   it "does not have inconsistent interpolations" do
     error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
-                    "Run `i18n-tasks check-consistent-interpolations' to show them"
+                    "Please run `bundle exec i18n-tasks check-consistent-interpolations --locales #{locales}` to show them"
     expect(inconsistent_interpolations).to be_empty, error_message
   end
 end